Changeset 1057367

Timestamp:

12/31/2014 10:01:15 AM (11 years ago)

Author:

chsxf

Message:

Merge branch 'master' of ​https://github.com/xhaleera/mqtranslate

Location:

mqtranslate/trunk

Files:

• .gitignore (added)
• README.md (modified) (2 diffs)
• lang/mqtranslate-fr_FR.mo (modified) (previous)
• lang/mqtranslate-fr_FR.po (modified) (29 diffs)
• lang/mqtranslate-hu_HU.mo (modified) (previous)
• lang/mqtranslate-hu_HU.po (modified) (31 diffs)
• lang/mqtranslate.pot (modified) (24 diffs)
• mqtranslate.php (modified) (3 diffs)
• mqtranslate_configuration.php (modified) (3 diffs)
• mqtranslate_core.php (modified) (15 diffs)
• mqtranslate_javascript.php (modified) (1 diff)
• mqtranslate_widget.php (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

mqtranslate/trunk/README.md

@@ -5 +5 @@
 Requires at least: 3.9  
 Tested up to: 4.1  
-Stable tag: 2.9  
+Stable tag: 2.9.1
 Donate Link: http://www.xhaleera.com/  
 License: GPLv2
@@ -76 +76 @@
 ---------
 
+2.9.1:
+
+- Improved activation process in case qTranslate or another fork is already active
+- Added client-side cookie to memorize language selection
+- Added optimization settings section (first setting allows disabling the filtering of all WordPress options)
+- Fixed potential bug with ACF additional wysiwyg fields (thanks to Fabien MOTTA from com1fruit.com)
+
 2.9:
 

mqtranslate/trunk/lang/mqtranslate-fr_FR.po

@@ -3 +3 @@
 "Project-Id-Version: mqTranslate 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-07 18:45+0100\n"
-"PO-Revision-Date: 2014-12-07 18:46+0100\n"
+"POT-Creation-Date: 2014-12-27 21:42+0100\n"
+"PO-Revision-Date: 2014-12-27 21:44+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17 +17 @@
 "X-Poedit-SearchPath-0: ..\n"
 
+#: ../mqtranslate.php:99
+#, php-format
+msgid ""
+"Sorry, but mqTranslate can not be activated. You have to deactivate %s first."
+msgstr ""
+"Désolé, mais mqTranslate ne peut être activé. Vous devez désactiver %s "
+"d'abord."
+
 #: ../mqtranslate_configuration.php:25
 msgid "Language Management"
 msgstr "Gestion des langues"
 
-#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:655
+#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:670
 #: ../mqtranslate_hooks.php:180
 msgid "Languages"
@@ -152 +160 @@
 msgstr "mqTranslate à été réinitialisé."
 
-#: ../mqtranslate_configuration.php:246
+#: ../mqtranslate_configuration.php:248
 msgid "Gettext databases updated."
 msgstr "Bases de données Gettext mises à jour."
 
-#: ../mqtranslate_configuration.php:251
+#: ../mqtranslate_configuration.php:253
 msgid "The Language must have a Not-Available Message!"
 msgstr "La langue doit avoir un Message \"non disponible\" !"
 
-#: ../mqtranslate_configuration.php:252
+#: ../mqtranslate_configuration.php:254
 msgid "The Language must have a Locale!"
 msgstr "La langue doit avoir un code local !"
 
-#: ../mqtranslate_configuration.php:253
+#: ../mqtranslate_configuration.php:255
 msgid "The Language must have a name!"
 msgstr "La langue doit avoir un nom !"
 
-#: ../mqtranslate_configuration.php:254
+#: ../mqtranslate_configuration.php:256
 msgid "Language Code has to be 2 characters long!"
 msgstr "Le code de la langue doit être long de 2 caractères !"
 
-#: ../mqtranslate_configuration.php:258 ../mqtranslate_configuration.php:264
+#: ../mqtranslate_configuration.php:260 ../mqtranslate_configuration.php:266
 msgid "There is already a language with the same Language Code!"
 msgstr "Il y a déjà une langue avec le même code !"
 
-#: ../mqtranslate_configuration.php:369
+#: ../mqtranslate_configuration.php:371
 msgid "Language is already enabled or invalid!"
 msgstr "La langue est déjà active ou est invalide !"
 
-#: ../mqtranslate_configuration.php:374
+#: ../mqtranslate_configuration.php:376
 msgid "Cannot disable Default Language!"
 msgstr "Impossible de désactiver la langue par défaut !"
 
-#: ../mqtranslate_configuration.php:377 ../mqtranslate_configuration.php:384
-#: ../mqtranslate_configuration.php:400
+#: ../mqtranslate_configuration.php:379 ../mqtranslate_configuration.php:386
+#: ../mqtranslate_configuration.php:402
 msgid "No such language!"
 msgstr "Aucune langue !"
 
-#: ../mqtranslate_configuration.php:380
+#: ../mqtranslate_configuration.php:382
 msgid "Language is already disabled!"
 msgstr "La langue est déjà désactivée !"
 
-#: ../mqtranslate_configuration.php:388
+#: ../mqtranslate_configuration.php:390
 msgid "Language is already first!"
 msgstr "La langue est déjà en premier !"
 
-#: ../mqtranslate_configuration.php:394 ../mqtranslate_configuration.php:410
+#: ../mqtranslate_configuration.php:396 ../mqtranslate_configuration.php:412
 msgid "New order saved."
 msgstr "Nouvel ordre sauvegardé."
 
-#: ../mqtranslate_configuration.php:404
+#: ../mqtranslate_configuration.php:406
 msgid "Language is already last!"
 msgstr "La langue est déjà en dernier !"
 
-#: ../mqtranslate_configuration.php:421
+#: ../mqtranslate_configuration.php:423
 msgid "Options saved."
 msgstr "Options enregistrées."
 
-#: ../mqtranslate_configuration.php:426
+#: ../mqtranslate_configuration.php:428
 #, php-format
 msgid "Could not write to \"%s\", Gettext Databases could not be downloaded!"
@@ -216 +224 @@
 "être téléchargées !"
 
-#: ../mqtranslate_configuration.php:448
+#: ../mqtranslate_configuration.php:450
 msgid "Edit Language"
 msgstr "Editer la langue"
 
-#: ../mqtranslate_configuration.php:451
+#: ../mqtranslate_configuration.php:453
 msgid "Save Changes »"
 msgstr "Enregistrer les modifications »"
 
-#: ../mqtranslate_configuration.php:456
+#: ../mqtranslate_configuration.php:458
 msgid "Language Management (mqTranslate Configuration)"
 msgstr "Gestion des langues (Configuration de mqTranslate)"
 
-#: ../mqtranslate_configuration.php:457
+#: ../mqtranslate_configuration.php:459
 #, php-format
 msgid ""
@@ -238 +246 @@
 "d'entraide</a>."
 
-#: ../mqtranslate_configuration.php:459
+#: ../mqtranslate_configuration.php:461
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: ../mqtranslate_configuration.php:462
+#: ../mqtranslate_configuration.php:464
 msgid "Default Language / Order"
 msgstr "Langue par défaut / Ordre"
 
-#: ../mqtranslate_configuration.php:464 ../mqtranslate_xhaleera_addons.php:141
+#: ../mqtranslate_configuration.php:466 ../mqtranslate_xhaleera_addons.php:141
 #: ../mqtranslate_xhaleera_addons.php:155
 msgid "Default Language"
 msgstr "Langue par défaut"
 
-#: ../mqtranslate_configuration.php:479
+#: ../mqtranslate_configuration.php:481
 #, php-format
 msgid ""
@@ -262 +270 @@
 "sur les flèches ci-dessus."
 
-#: ../mqtranslate_configuration.php:484
+#: ../mqtranslate_configuration.php:486
 msgid "Hide Untranslated Content"
 msgstr "Masquer le contenu non traduit"
 
-#: ../mqtranslate_configuration.php:486
+#: ../mqtranslate_configuration.php:488
 msgid "Hide Content which is not available for the selected language."
 msgstr "Masque le contenu s'il n'est pas traduit dans la langue selectionnée."
 
-#: ../mqtranslate_configuration.php:489
+#: ../mqtranslate_configuration.php:491
 msgid ""
 "When checked, posts will be hidden if the content is not available for the "
@@ -281 +289 @@
 "contenu est disponible."
 
-#: ../mqtranslate_configuration.php:490
+#: ../mqtranslate_configuration.php:492
 msgid ""
 "This function will not work correctly if you installed mqTranslate on a blog "
@@ -291 +299 @@
 "d'aller voir \"Convertir la base de données\" dans \"Paramètres avancés\"."
 
-#: ../mqtranslate_configuration.php:493
+#: ../mqtranslate_configuration.php:495
 msgid ""
 "Show displayed language prefix when Content is not available for the "
@@ -299 +307 @@
 "pour la langue sélectionnée."
 
-#: ../mqtranslate_configuration.php:498
+#: ../mqtranslate_configuration.php:500
 msgid "Detect Browser Language"
 msgstr "Détecter la langue du navigateur"
 
-#: ../mqtranslate_configuration.php:500
+#: ../mqtranslate_configuration.php:502
 msgid "Detect the language of the browser and redirect accordingly."
 msgstr "Détecte la langue du navigateur et redirige en fonction."
 
-#: ../mqtranslate_configuration.php:503
+#: ../mqtranslate_configuration.php:505
 msgid ""
 "When the frontpage is visited via bookmark/external link/type-in, the "
@@ -317 +325 @@
 "par son navigateur."
 
-#: ../mqtranslate_configuration.php:508
+#: ../mqtranslate_configuration.php:510
 msgid "Advanced Settings"
 msgstr "Paramètres avancés"
 
-#: ../mqtranslate_configuration.php:508 ../mqtranslate_services.php:370
+#: ../mqtranslate_configuration.php:510 ../mqtranslate_services.php:370
 #: ../mqtranslate_xhaleera_addons.php:279
 msgid "Show / Hide"
 msgstr "Montrer / Cacher"
 
-#: ../mqtranslate_configuration.php:511 ../mqtranslate_configuration.php:513
+#: ../mqtranslate_configuration.php:513 ../mqtranslate_configuration.php:515
 msgid "URL Modification Mode"
 msgstr "Mode de modification de l'URL"
 
-#: ../mqtranslate_configuration.php:514
+#: ../mqtranslate_configuration.php:516
 msgid "Use Query Mode (?lang=en)"
 msgstr "Utiliser le mode Query (?lang=fr)"
 
-#: ../mqtranslate_configuration.php:515
+#: ../mqtranslate_configuration.php:517
 msgid "Use Pre-Path Mode (Default, puts /en/ in front of URL)"
 msgstr "Utiliser le mode chemin (Par défaut, ajoute /fr/ devant l'URL)"
 
-#: ../mqtranslate_configuration.php:516
+#: ../mqtranslate_configuration.php:518
 msgid "Use Pre-Domain Mode (uses http://en.yoursite.com)"
 msgstr "Utiliser le mode sous-domaine (http://fr.votresite.com)"
 
-#: ../mqtranslate_configuration.php:519
+#: ../mqtranslate_configuration.php:521
 msgid ""
 "Pre-Path and Pre-Domain mode will only work with mod_rewrite/pretty "
@@ -351 +359 @@
 "mode sous-domaine !"
 
-#: ../mqtranslate_configuration.php:522
+#: ../mqtranslate_configuration.php:524
 msgid "Hide URL language information for default language."
 msgstr "Masquer l'information de langue dans l'URL pour la langue par défaut."
 
-#: ../mqtranslate_configuration.php:526
+#: ../mqtranslate_configuration.php:528
 msgid "Flag Image Path"
 msgstr "Chemin des images de drapeaux"
 
-#: ../mqtranslate_configuration.php:530
+#: ../mqtranslate_configuration.php:532
 msgid ""
 "Path to the flag images under wp-content, with trailing slash. (Default: "
@@ -367 +375 @@
 "mqtranslate/flags/)"
 
-#: ../mqtranslate_configuration.php:534
+#: ../mqtranslate_configuration.php:536
 msgid "Ignore Links"
 msgstr "Ignorer les liens"
 
-#: ../mqtranslate_configuration.php:538
+#: ../mqtranslate_configuration.php:540
 msgid ""
 "Don't convert Links to files of the given file types. (Default: gif,jpg,jpeg,"
@@ -380 +388 @@
 "js)"
 
-#: ../mqtranslate_configuration.php:542
+#: ../mqtranslate_configuration.php:544
 msgid "Remove plugin CSS from head"
 msgstr "Supprimer le CSS du plugin de l'en-tête"
 
-#: ../mqtranslate_configuration.php:544
+#: ../mqtranslate_configuration.php:546
 msgid "Remove inline CSS code added by plugin from the head"
 msgstr "Supprimer le code CSS en ligne ajouté par le plugin de l'en-tête"
 
-#: ../mqtranslate_configuration.php:546
+#: ../mqtranslate_configuration.php:548
 msgid ""
 "This will remove default styles applyied to mqTranslate Language Chooser"
@@ -395 +403 @@
 "mqTranslate"
 
-#: ../mqtranslate_configuration.php:550
-msgid "Use Secure Cookie"
-msgstr "Utiliser les Cookies sécurisés"
-
 #: ../mqtranslate_configuration.php:552
+msgid "Cookie Settings"
+msgstr "Réglages des cookies"
+
+#: ../mqtranslate_configuration.php:554
+msgid "Disable all client cookies"
+msgstr "Désactiver tous les cookies clients"
+
+#: ../mqtranslate_configuration.php:556
+msgid "If checked, language will not be saved for visitors between sessions."
+msgstr ""
+"Si coché, la langue ne sera plus sauvegardée pour les visiteurs entre les "
+"sessions."
+
+#: ../mqtranslate_configuration.php:559
 msgid "Make mqTranslate cookie available only through HTTPS connections"
 msgstr ""
@@ -405 +423 @@
 "HTTPS"
 
-#: ../mqtranslate_configuration.php:554
+#: ../mqtranslate_configuration.php:561
 msgid "Don't check this if you don't know what you're doing!"
 msgstr "Ne pas cocher si vous ne savez pas ce que vous faîtes"
 
-#: ../mqtranslate_configuration.php:558
+#: ../mqtranslate_configuration.php:565
 msgid "Allowed Custom Post Types"
 msgstr "Types d'Articles Personnalisés Autorisés"
 
-#: ../mqtranslate_configuration.php:562
+#: ../mqtranslate_configuration.php:569
 msgid ""
 "Comma-separated list of the custom post types for which you want mqTranslate "
@@ -421 +439 @@
 "lesquels vous voulez que mqTranslate conserve des valeurs multilingues."
 
-#: ../mqtranslate_configuration.php:566
+#: ../mqtranslate_configuration.php:573
 msgid "Update Gettext Databases"
 msgstr "Mettre à jour les bases de données Gettext"
 
-#: ../mqtranslate_configuration.php:568
+#: ../mqtranslate_configuration.php:575
 msgid "Automatically check for .mo-Database Updates of installed languages."
 msgstr ""
@@ -431 +449 @@
 "langues installées"
 
-#: ../mqtranslate_configuration.php:570
+#: ../mqtranslate_configuration.php:577
 msgid "Update Gettext databases now."
 msgstr "Mettre à jour les bases de données Gettext maintenant."
 
-#: ../mqtranslate_configuration.php:572
+#: ../mqtranslate_configuration.php:579
 msgid ""
 "mqTranslate will query the Wordpress Localisation Repository every week and "
@@ -444 +462 @@
 "Gettext (fichiers .mo)"
 
-#: ../mqtranslate_configuration.php:576
+#: ../mqtranslate_configuration.php:583
 msgid "Date / Time Conversion"
 msgstr "Conversion de Date / Heure"
 
-#: ../mqtranslate_configuration.php:578
+#: ../mqtranslate_configuration.php:585
 msgid "Use emulated date function."
 msgstr "Utilisez la fonction de date générée."
 
-#: ../mqtranslate_configuration.php:579
+#: ../mqtranslate_configuration.php:586
 msgid ""
 "Use emulated date function and replace formats with the predefined formats "
@@ -460 +478 @@
 "formats prédefinis pour chaque langue."
 
-#: ../mqtranslate_configuration.php:580
+#: ../mqtranslate_configuration.php:587
 msgid "Use strftime instead of date."
 msgstr "Utiliser strftime au lieu de date."
 
-#: ../mqtranslate_configuration.php:581
+#: ../mqtranslate_configuration.php:588
 msgid ""
 "Use strftime instead of date and replace formats with the predefined formats "
@@ -472 +490 @@
 "prédefinis pour chaque langue."
 
-#: ../mqtranslate_configuration.php:582
+#: ../mqtranslate_configuration.php:589
 msgid ""
 "Depending on the mode selected, additional customizations of the theme may "
@@ -479 +497 @@
 "Dépend du mode sélectionné, une modification du thème peut-être nécessaire."
 
-#: ../mqtranslate_configuration.php:586
+#: ../mqtranslate_configuration.php:593
+msgid "Optimization Settings"
+msgstr "Réglages d'optimisation"
+
+#: ../mqtranslate_configuration.php:595
+msgid "Filter all WordPress options"
+msgstr "Filtrer toutes les options de WordPress"
+
+#: ../mqtranslate_configuration.php:597
+msgid ""
+"If unchecked, some texts may not be translated anymore. However, disabling "
+"this feature may greatly improve loading times."
+msgstr ""
+"Si décoché, certains textes pourraient ne plus être traduits. Cependant, "
+"désactiver cette fonctionnalité peut grandement améliorer les temps de "
+"chargement."
+
+#: ../mqtranslate_configuration.php:601
 msgid "Reset mqTranslate"
 msgstr "Réinitialiser mqTranslate"
 
-#: ../mqtranslate_configuration.php:588
+#: ../mqtranslate_configuration.php:603
 msgid ""
 "Check this box and click Save Changes to reset all mqTranslate settings."
@@ -490 +525 @@
 "supprimer tous les paramètres de mqTranslate."
 
-#: ../mqtranslate_configuration.php:590
+#: ../mqtranslate_configuration.php:605
 msgid "Yes, I really want to reset mqTranslate."
 msgstr "Oui, je veux vraiment réinitialiser mqTranslate."
 
-#: ../mqtranslate_configuration.php:592
+#: ../mqtranslate_configuration.php:607
 msgid "Also delete Translations for Categories/Tags/Link Categories."
 msgstr ""
 "Supprimer également les traductions pour Catégories/Tags/Liens de catégories."
 
-#: ../mqtranslate_configuration.php:594
+#: ../mqtranslate_configuration.php:609
 msgid ""
 "If something isn't working correctly, you can always try to reset all "
@@ -510 +545 @@
 "les langues ajoutées)."
 
-#: ../mqtranslate_configuration.php:598
+#: ../mqtranslate_configuration.php:613
 msgid "Convert Database"
 msgstr "Convertir la base de données"
 
-#: ../mqtranslate_configuration.php:600
+#: ../mqtranslate_configuration.php:615
 #, php-format
 msgid ""
@@ -524 +559 @@
 "langue."
 
-#: ../mqtranslate_configuration.php:601
+#: ../mqtranslate_configuration.php:616
 #, php-format
 msgid ""
@@ -538 +573 @@
 "dans la langue par défaut."
 
-#: ../mqtranslate_configuration.php:602
+#: ../mqtranslate_configuration.php:617
 msgid ""
 "Both processes are <b>irreversible</b>! Be sure to make a full database "
@@ -547 +582 @@
 "liens."
 
-#: ../mqtranslate_configuration.php:606
+#: ../mqtranslate_configuration.php:621
 msgid "Settings Migration"
 msgstr "Migration de Paramètres"
 
-#: ../mqtranslate_configuration.php:608
+#: ../mqtranslate_configuration.php:623
 msgid "Do not migrate any setting"
 msgstr "Ne migrer aucun paramètre"
 
-#: ../mqtranslate_configuration.php:610
+#: ../mqtranslate_configuration.php:625
 msgid "Import settings from qTranslate"
 msgstr "Importer les paramètres depuis qTranslate"
 
-#: ../mqtranslate_configuration.php:612
+#: ../mqtranslate_configuration.php:627
 msgid "Export settings to qTranslate"
 msgstr "Exporter les paramètres vers qTranslate"
 
-#: ../mqtranslate_configuration.php:614
+#: ../mqtranslate_configuration.php:629
 msgid "Export settings only if qTranslate is installed."
 msgstr "N'exporter les paramètres que si qTranslate est installé."
 
-#: ../mqtranslate_configuration.php:618
+#: ../mqtranslate_configuration.php:633
 msgid "Debugging Information"
 msgstr "Informations de Débogage"
 
-#: ../mqtranslate_configuration.php:620
+#: ../mqtranslate_configuration.php:635
 #, php-format
 msgid ""
@@ -583 +618 @@
 "configuration."
 
-#: ../mqtranslate_configuration.php:648
+#: ../mqtranslate_configuration.php:663
 msgid "Save Changes"
 msgstr "Enregistrer les modifications"
 
-#: ../mqtranslate_configuration.php:679
+#: ../mqtranslate_configuration.php:694
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../mqtranslate_configuration.php:679
+#: ../mqtranslate_configuration.php:694
 msgid "Enable"
 msgstr "Activer"
 
-#: ../mqtranslate_configuration.php:680
+#: ../mqtranslate_configuration.php:695
 msgid "Edit"
 msgstr "Editer"
 
-#: ../mqtranslate_configuration.php:681
+#: ../mqtranslate_configuration.php:696
 msgid "Default"
 msgstr "Défaut"
 
-#: ../mqtranslate_configuration.php:681
+#: ../mqtranslate_configuration.php:696
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../mqtranslate_configuration.php:686
+#: ../mqtranslate_configuration.php:701
 msgid ""
 "Enabling a language will cause mqTranslate to update the Gettext-Database "
@@ -617 +652 @@
 "de la vitesse de connexion de votre serveur."
 
-#: ../mqtranslate_configuration.php:693
+#: ../mqtranslate_configuration.php:708
 msgid "Add Language"
 msgstr "Ajouter une langue"
 
-#: ../mqtranslate_configuration.php:696
+#: ../mqtranslate_configuration.php:711
 msgid "Add Language &raquo;"
 msgstr "Ajouter la langue &raquo;"
@@ -1107 +1142 @@
 "Lorsqu'elle est activée, cette option vous permet de sélectionner quelles "
 "langues peuvent être éditées utilisateur par utilisateur."
+
+#~ msgid "Use Secure Cookie"
+#~ msgstr "Utiliser les Cookies sécurisés"

mqtranslate/trunk/lang/mqtranslate-hu_HU.po

@@ -3 +3 @@
 "Project-Id-Version: mqTranslate 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-10 16:30+0200\n"
-"PO-Revision-Date: 2011-03-03 19:33+0100\n"
-"Last-Translator: Németh Balázs <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-12-27 21:39+0100\n"
+"PO-Revision-Date: 2014-12-27 21:39+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: hu_HU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.1\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-KeywordsList: __;_e\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../mqtranslate.php:99
+#, php-format
+msgid ""
+"Sorry, but mqTranslate can not be activated. You have to deactivate %s first."
+msgstr ""
 
 #: ../mqtranslate_configuration.php:25
@@ -16 +28 @@
 msgstr "Nyelvek kezelése"
 
-#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:637
+#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:670
 #: ../mqtranslate_hooks.php:180
 msgid "Languages"
@@ -128 +140 @@
 
 #: ../mqtranslate_configuration.php:199
-#, fuzzy
 msgid "Switching Language"
-msgstr "Nyelv szerkesztése"
+msgstr "Nyelv-váltás"
 
 #: ../mqtranslate_configuration.php:199
@@ -138 +149 @@
 "href=\"%2$s\" title=\"Dashboard\">link</a>."
 msgstr ""
+"Nyelv váltása erre: %1$s... Ha a Vezérlőpult nem tölt be, akkor használja <a "
+"href=\"%2$s\" title=\"Dashboard\">ezt a linket</a>!"
 
 #: ../mqtranslate_configuration.php:220
-#, fuzzy
 msgid "mqTranslate has been reset."
-msgstr "A qTranslate alaphelyzetbe lett állítva."
-
-#: ../mqtranslate_configuration.php:244
+msgstr "Az mqTranslate alaphelyzetbe lett állítva."
+
+#: ../mqtranslate_configuration.php:248
 msgid "Gettext databases updated."
 msgstr "Gettext adatbázis frissítve."
 
-#: ../mqtranslate_configuration.php:249
+#: ../mqtranslate_configuration.php:253
 msgid "The Language must have a Not-Available Message!"
 msgstr "A nyelvhez meg kell adni a nem elérhető üzenetet!"
 
-#: ../mqtranslate_configuration.php:250
+#: ../mqtranslate_configuration.php:254
 msgid "The Language must have a Locale!"
 msgstr "A nyelvhez kell Locale!"
 
-#: ../mqtranslate_configuration.php:251
+#: ../mqtranslate_configuration.php:255
 msgid "The Language must have a name!"
 msgstr "A nyelvnek meg kell adni a nevét!"
 
-#: ../mqtranslate_configuration.php:252
+#: ../mqtranslate_configuration.php:256
 msgid "Language Code has to be 2 characters long!"
 msgstr "A nyelvi kódnak pontosan 2 betűből kell állnia!"
 
-#: ../mqtranslate_configuration.php:256 ../mqtranslate_configuration.php:262
+#: ../mqtranslate_configuration.php:260 ../mqtranslate_configuration.php:266
 msgid "There is already a language with the same Language Code!"
 msgstr "Már létezik nyelv ezzel a nyelvi kóddal!"
 
-#: ../mqtranslate_configuration.php:367
+#: ../mqtranslate_configuration.php:371
 msgid "Language is already enabled or invalid!"
 msgstr "A nyelv már engedélyezve van vagy érvénytelen!"
 
-#: ../mqtranslate_configuration.php:372
+#: ../mqtranslate_configuration.php:376
 msgid "Cannot disable Default Language!"
 msgstr "Az alap nyelvet nem lehet kikapcsolni!"
 
-#: ../mqtranslate_configuration.php:375 ../mqtranslate_configuration.php:382
-#: ../mqtranslate_configuration.php:398
+#: ../mqtranslate_configuration.php:379 ../mqtranslate_configuration.php:386
+#: ../mqtranslate_configuration.php:402
 msgid "No such language!"
 msgstr "Nincs ilyen nyelv!"
 
-#: ../mqtranslate_configuration.php:378
+#: ../mqtranslate_configuration.php:382
 msgid "Language is already disabled!"
 msgstr "A nyelv már ki van kapcsolva!"
 
-#: ../mqtranslate_configuration.php:386
+#: ../mqtranslate_configuration.php:390
 msgid "Language is already first!"
 msgstr "A nyelv már az első!"
 
-#: ../mqtranslate_configuration.php:392 ../mqtranslate_configuration.php:408
+#: ../mqtranslate_configuration.php:396 ../mqtranslate_configuration.php:412
 msgid "New order saved."
 msgstr "Új sorrend elmentve."
 
-#: ../mqtranslate_configuration.php:402
+#: ../mqtranslate_configuration.php:406
 msgid "Language is already last!"
 msgstr "A nyelv már az utolsó!"
 
-#: ../mqtranslate_configuration.php:419
+#: ../mqtranslate_configuration.php:423
 msgid "Options saved."
 msgstr "Beállítások mentve."
 
-#: ../mqtranslate_configuration.php:424
+#: ../mqtranslate_configuration.php:428
 #, php-format
 msgid "Could not write to \"%s\", Gettext Databases could not be downloaded!"
@@ -207 +219 @@
 "Nem sikerült írni \"%s\", a Gettext adatbázisokat nem sikerült letölteni!"
 
-#: ../mqtranslate_configuration.php:446
+#: ../mqtranslate_configuration.php:450
 msgid "Edit Language"
 msgstr "Nyelv szerkesztése"
 
-#: ../mqtranslate_configuration.php:449
+#: ../mqtranslate_configuration.php:453
 msgid "Save Changes &raquo;"
 msgstr "Változások mentése &raquo;"
 
-#: ../mqtranslate_configuration.php:454
-#, fuzzy
+#: ../mqtranslate_configuration.php:458
 msgid "Language Management (mqTranslate Configuration)"
-msgstr "Nyelv kezelő (qTranslate beállítások)"
-
-#: ../mqtranslate_configuration.php:455
-#, fuzzy, php-format
+msgstr "Nyelv kezelő (mqTranslate beállítások)"
+
+#: ../mqtranslate_configuration.php:459
+#, php-format
 msgid ""
 "For help on how to configure mqTranslate correctly, take a look at the <a "
 "href=\"%1$s\">qTranslate FAQ</a> and the <a href=\"%2$s\">Support Forum</a>."
 msgstr ""
-"A qTranslate helyes beállításához, tekintse meg a <a href=\"%1$s"
+"Az mqTranslate helyes beállításához, tekintse meg a <a href=\"%1$s"
 "\">qTranslate GyIK</a> és a <a href=\"%2$s\">Fórum</a> oldalakat."
 
-#: ../mqtranslate_configuration.php:457
+#: ../mqtranslate_configuration.php:461
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: ../mqtranslate_configuration.php:460
+#: ../mqtranslate_configuration.php:464
 msgid "Default Language / Order"
 msgstr "Alap nyelv / sorrend"
 
-#: ../mqtranslate_configuration.php:462 ../mqtranslate_xhaleera_addons.php:141
+#: ../mqtranslate_configuration.php:466 ../mqtranslate_xhaleera_addons.php:141
 #: ../mqtranslate_xhaleera_addons.php:155
 msgid "Default Language"
 msgstr "Alap nyelv"
 
-#: ../mqtranslate_configuration.php:477
+#: ../mqtranslate_configuration.php:481
 #, php-format
 msgid ""
@@ -252 +263 @@
 "itt: %s. A nyelvek sorrendje is megváltoztatható a nyilakra kattintva."
 
-#: ../mqtranslate_configuration.php:482
+#: ../mqtranslate_configuration.php:486
 msgid "Hide Untranslated Content"
 msgstr "Lefordítatlan tartalom elrejtése"
 
-#: ../mqtranslate_configuration.php:484
+#: ../mqtranslate_configuration.php:488
 msgid "Hide Content which is not available for the selected language."
 msgstr "Tartalom elrejtése, ami nem érhető el a kiválasztott nyelven."
 
-#: ../mqtranslate_configuration.php:487
+#: ../mqtranslate_configuration.php:491
 msgid ""
 "When checked, posts will be hidden if the content is not available for the "
@@ -270 +281 @@
 "jelenik meg a bejegyzés elérhető nyelveinek listájával."
 
-#: ../mqtranslate_configuration.php:488
-#, fuzzy
+#: ../mqtranslate_configuration.php:492
 msgid ""
 "This function will not work correctly if you installed mqTranslate on a blog "
@@ -277 +287 @@
 "\"Convert Database\" under \"Advanced Settings\"."
 msgstr ""
-"Ez a funkció nem fog jól működni, ha a qTranslate beépülőt a bejgyzések "
+"Ez a funkció nem fog jól működni, ha az mqTranslate beépülőt a bejgyzések "
 "felvitele után telepítette. Ebben az esetben, tekintse meg az „Adatbázis "
 "átalakítása” részt a „Haladó beállítások” között!"
 
-#: ../mqtranslate_configuration.php:491
-#, fuzzy
+#: ../mqtranslate_configuration.php:495
 msgid ""
 "Show displayed language prefix when Content is not available for the "
 "selected language."
-msgstr "Tartalom elrejtése, ami nem érhető el a kiválasztott nyelven."
-
-#: ../mqtranslate_configuration.php:496
+msgstr ""
+"Ha egy tartalom nem érhető el egy nyelven, akkor a használt nyelv neve "
+"jelenjen meg a cím elején zárójelben."
+
+#: ../mqtranslate_configuration.php:500
 msgid "Detect Browser Language"
 msgstr "Böngésző nyelvének felismerése"
 
-#: ../mqtranslate_configuration.php:498
+#: ../mqtranslate_configuration.php:502
 msgid "Detect the language of the browser and redirect accordingly."
 msgstr "Átirányítás a böngésző nyelvének megfelelő nyelvű oldalra."
 
-#: ../mqtranslate_configuration.php:501
+#: ../mqtranslate_configuration.php:505
 msgid ""
 "When the frontpage is visited via bookmark/external link/type-in, the "
@@ -306 +317 @@
 "re lesz átirányítva."
 
-#: ../mqtranslate_configuration.php:506
+#: ../mqtranslate_configuration.php:510
 msgid "Advanced Settings"
 msgstr "Haladó beállítások"
 
-#: ../mqtranslate_configuration.php:506 ../mqtranslate_services.php:370
+#: ../mqtranslate_configuration.php:510 ../mqtranslate_services.php:370
 #: ../mqtranslate_xhaleera_addons.php:279
 msgid "Show / Hide"
-msgstr ""
-
-#: ../mqtranslate_configuration.php:509 ../mqtranslate_configuration.php:511
+msgstr "mutat / elrejt"
+
+#: ../mqtranslate_configuration.php:513 ../mqtranslate_configuration.php:515
 msgid "URL Modification Mode"
 msgstr "URL módosítás módja"
 
-#: ../mqtranslate_configuration.php:512
+#: ../mqtranslate_configuration.php:516
 msgid "Use Query Mode (?lang=en)"
 msgstr "Query mód (?lang=en)"
 
-#: ../mqtranslate_configuration.php:513
+#: ../mqtranslate_configuration.php:517
 msgid "Use Pre-Path Mode (Default, puts /en/ in front of URL)"
 msgstr "Előtag mód (alapértelmezett, /en/ az URL elejére)"
 
-#: ../mqtranslate_configuration.php:514
+#: ../mqtranslate_configuration.php:518
 msgid "Use Pre-Domain Mode (uses http://en.yoursite.com)"
 msgstr "Aldomain mód (http://en.te-oldalad.hu)"
 
-#: ../mqtranslate_configuration.php:517
+#: ../mqtranslate_configuration.php:521
 msgid ""
 "Pre-Path and Pre-Domain mode will only work with mod_rewrite/pretty "
@@ -339 +350 @@
 "működik. Az aldomain módhoz további beállítás szükséges!"
 
-#: ../mqtranslate_configuration.php:520
+#: ../mqtranslate_configuration.php:524
 msgid "Hide URL language information for default language."
 msgstr "Nyelvi információ elrejtése az URL-ből alap nyelv esetén."
 
-#: ../mqtranslate_configuration.php:524
+#: ../mqtranslate_configuration.php:528
 msgid "Flag Image Path"
 msgstr "Zászló képek elérési útja"
 
-#: ../mqtranslate_configuration.php:528
-#, fuzzy
+#: ../mqtranslate_configuration.php:532
 msgid ""
 "Path to the flag images under wp-content, with trailing slash. (Default: "
@@ -354 +364 @@
 msgstr ""
 "Elérési út a zászló képekhez a wp-content mappán belül, lezáró per jellel. "
-"(Alapérték: plugins/qtranslate/flags/)"
-
-#: ../mqtranslate_configuration.php:532
+"(Alapérték: plugins/mqtranslate/flags/)"
+
+#: ../mqtranslate_configuration.php:536
 msgid "Ignore Links"
 msgstr "Egynyelvű hivatkozások"
 
-#: ../mqtranslate_configuration.php:536
+#: ../mqtranslate_configuration.php:540
 msgid ""
 "Don't convert Links to files of the given file types. (Default: gif,jpg,jpeg,"
@@ -368 +378 @@
 "(Alapérték: gif,jpg,jpeg,png,pdf,swf,tif,rar,zip,7z,mpg,divx,mpeg,avi,css,js)"
 
-#: ../mqtranslate_configuration.php:540
+#: ../mqtranslate_configuration.php:544
+msgid "Remove plugin CSS from head"
+msgstr "Bővítmény CSS nem kell"
+
+#: ../mqtranslate_configuration.php:546
+msgid "Remove inline CSS code added by plugin from the head"
+msgstr "Ne rakjon CSS kódot a bővítmény a &lt;head&gt; elembe"
+
+#: ../mqtranslate_configuration.php:548
+msgid ""
+"This will remove default styles applyied to mqTranslate Language Chooser"
+msgstr ""
+"Eltávolítja az mqTranslate nyelv-választóra érvényesülő alap stílusokat"
+
+#: ../mqtranslate_configuration.php:552
+msgid "Cookie Settings"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:554
+msgid "Disable all client cookies"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:556
+msgid "If checked, language will not be saved for visitors between sessions."
+msgstr ""
+
+#: ../mqtranslate_configuration.php:559
+msgid "Make mqTranslate cookie available only through HTTPS connections"
+msgstr "Az mqTranslate sütije csak HTTPS kapcsolat esetén legyen elérhető."
+
+#: ../mqtranslate_configuration.php:561
+msgid "Don't check this if you don't know what you're doing!"
+msgstr "Ne jelölje be, ha nem érti, hogy mit jelent!"
+
+#: ../mqtranslate_configuration.php:565
 msgid "Allowed Custom Post Types"
-msgstr ""
-
-#: ../mqtranslate_configuration.php:544
+msgstr "Többnyelvű egyedi bejegyzés típusok"
+
+#: ../mqtranslate_configuration.php:569
 msgid ""
 "Comma-separated list of the custom post types for which you want mqTranslate "
 "to keep multi-language values."
 msgstr ""
-
-#: ../mqtranslate_configuration.php:548
+"Azon egyedi bejegyzés típusok vesszővel elválasztott listája, amiknél az "
+"mqTranslate bővítménynek kell kezelni a többnyelvű tartalmat."
+
+#: ../mqtranslate_configuration.php:573
 msgid "Update Gettext Databases"
 msgstr "Gettext adatbázis frissítése"
 
-#: ../mqtranslate_configuration.php:550
+#: ../mqtranslate_configuration.php:575
 msgid "Automatically check for .mo-Database Updates of installed languages."
 msgstr "Automatikusan figyeli és letölti a telepített nyelvek .mo adatbázisát."
 
-#: ../mqtranslate_configuration.php:552
+#: ../mqtranslate_configuration.php:577
 msgid "Update Gettext databases now."
 msgstr "Gettext adatbázis frissítése most."
 
-#: ../mqtranslate_configuration.php:554
-#, fuzzy
+#: ../mqtranslate_configuration.php:579
 msgid ""
 "mqTranslate will query the Wordpress Localisation Repository every week and "
 "download the latest Gettext Databases (.mo Files)."
 msgstr ""
-"A qTranslate lekérdezi a WordPress fordítás tárat minden héten és letölti a "
-"legújabb gettext adatbázist (.mo fájlok)."
-
-#: ../mqtranslate_configuration.php:558
+"Az mqTranslate lekérdezi a WordPress fordítás tárat minden héten, és letölti "
+"a legújabb gettext adatbázist (.mo fájlok)."
+
+#: ../mqtranslate_configuration.php:583
 msgid "Date / Time Conversion"
 msgstr "Dátum / idő átalakítás"
 
-#: ../mqtranslate_configuration.php:560
+#: ../mqtranslate_configuration.php:585
 msgid "Use emulated date function."
 msgstr "Emulált date függvény használata"
 
-#: ../mqtranslate_configuration.php:561
+#: ../mqtranslate_configuration.php:586
 msgid ""
 "Use emulated date function and replace formats with the predefined formats "
@@ -415 +460 @@
 "minden nyelvnél."
 
-#: ../mqtranslate_configuration.php:562
+#: ../mqtranslate_configuration.php:587
 msgid "Use strftime instead of date."
 msgstr "strftime használata a date helyett"
 
-#: ../mqtranslate_configuration.php:563
+#: ../mqtranslate_configuration.php:588
 msgid ""
 "Use strftime instead of date and replace formats with the predefined formats "
@@ -427 +472 @@
 "minden nyelvnél."
 
-#: ../mqtranslate_configuration.php:564
+#: ../mqtranslate_configuration.php:589
 msgid ""
 "Depending on the mode selected, additional customizations of the theme may "
@@ -435 +480 @@
 "szükség."
 
-#: ../mqtranslate_configuration.php:568
-#, fuzzy
+#: ../mqtranslate_configuration.php:593
+msgid "Optimization Settings"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:595
+msgid "Filter all WordPress options"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:597
+msgid ""
+"If unchecked, some texts may not be translated anymore. However, disabling "
+"this feature may greatly improve loading times."
+msgstr ""
+
+#: ../mqtranslate_configuration.php:601
 msgid "Reset mqTranslate"
-msgstr "qTranslate alap helyzetbe állítása"
-
-#: ../mqtranslate_configuration.php:570
-#, fuzzy
+msgstr "mqTranslate alaphelyzetbe állítása"
+
+#: ../mqtranslate_configuration.php:603
 msgid ""
 "Check this box and click Save Changes to reset all mqTranslate settings."
 msgstr ""
-"Jelölje be ezt a jelölőnégyzetet és kattintson a Változások mentése gombra a "
-"qTranslate beállításainak alaphelyzetbe állításához."
-
-#: ../mqtranslate_configuration.php:572
-#, fuzzy
+"Jelölje be ezt a jelölőnégyzetet és kattintson a Változások mentése gombra "
+"az mqTranslate beállításainak alaphelyzetbe állításához."
+
+#: ../mqtranslate_configuration.php:605
 msgid "Yes, I really want to reset mqTranslate."
-msgstr "Igen, tényleg alapra szeretném állítani a qTranslate beépülőt."
-
-#: ../mqtranslate_configuration.php:574
+msgstr "Igen, tényleg alapra szeretném állítani az mqTranslate bővítményt."
+
+#: ../mqtranslate_configuration.php:607
 msgid "Also delete Translations for Categories/Tags/Link Categories."
 msgstr "A kategóriák, címkék és link kategóriák fordításait is törölje."
 
-#: ../mqtranslate_configuration.php:576
-#, fuzzy
+#: ../mqtranslate_configuration.php:609
 msgid ""
 "If something isn't working correctly, you can always try to reset all "
@@ -464 +519 @@
 "settings (including all languages added)."
 msgstr ""
-"Ha valami nem működik mindig meg lehet próbálni alaphelyzetre állítani a "
-"qTranslate beállításait. Az alapraállítás nem töröl egy bejegyzést se, de "
-"minden beállítást (a hozzáadott nyelveket is) eltávolít."
-
-#: ../mqtranslate_configuration.php:580
+"Ha valami nem jól működik, mindig meg lehet próbálni alaphelyzetre állítani "
+"az mqTranslate beállításait. Az alapra állítás nem töröl egy bejegyzést se, "
+"de minden beállítást eltávolít (a hozzáadott nyelveket is)."
+
+#: ../mqtranslate_configuration.php:613
 msgid "Convert Database"
 msgstr "Adatbázis átalakítása"
 
-#: ../mqtranslate_configuration.php:582
+#: ../mqtranslate_configuration.php:615
 #, php-format
 msgid ""
@@ -481 +536 @@
 "\">kattintson ide</a> a bejgeyzések új nyelvi tag formátumra konvertálásához."
 
-#: ../mqtranslate_configuration.php:583
-#, fuzzy, php-format
+#: ../mqtranslate_configuration.php:616
+#, php-format
 msgid ""
 "If you have installed mqTranslate for the first time on a Wordpress with "
@@ -489 +544 @@
 "existing posts as written in the default language."
 msgstr ""
-"Ha először telepítette a qTranslate beépülőt egy bejegyzéseket már "
+"Ha először telepítette az mqTranslate beépülőt egy bejegyzéseket már "
 "tartalmazó Wordpress oldara, akkor vagy egyesével újra menti a "
 "bejegyzéseket, vagy <a href=\"%s\">ide kattinthat</a> a bejegyzések "
 "alapértelmezett nyelvűként megjelöléséhez."
 
-#: ../mqtranslate_configuration.php:584
+#: ../mqtranslate_configuration.php:617
 msgid ""
 "Both processes are <b>irreversible</b>! Be sure to make a full database "
 "backup before clicking one of the links."
 msgstr ""
-"Mindkét művelet <b>megfordíthatatlan</b>! Készítsen teljes biztonsági "
+"Mindkét művelet <b>visszavonhatatlan</b>! Készítsen teljes biztonsági "
 "másolatot az adatbázisról, mielőtt a linkek bármelyikére kattint!"
 
-#: ../mqtranslate_configuration.php:588
-#, fuzzy
+#: ../mqtranslate_configuration.php:621
 msgid "Settings Migration"
-msgstr "Beállítások"
-
-#: ../mqtranslate_configuration.php:590
+msgstr "Migrációs beállítások"
+
+#: ../mqtranslate_configuration.php:623
 msgid "Do not migrate any setting"
-msgstr ""
-
-#: ../mqtranslate_configuration.php:592
+msgstr "Ne migráljon semilyen beállítást"
+
+#: ../mqtranslate_configuration.php:625
 msgid "Import settings from qTranslate"
-msgstr ""
-
-#: ../mqtranslate_configuration.php:594
-#, fuzzy
+msgstr "Beállítások átvétele a qTranslate bővítményből"
+
+#: ../mqtranslate_configuration.php:627
 msgid "Export settings to qTranslate"
-msgstr "qTranslate alap helyzetbe állítása"
-
-#: ../mqtranslate_configuration.php:596
+msgstr "Bállítások exportálása a qTranslate bővítménybe"
+
+#: ../mqtranslate_configuration.php:629
 msgid "Export settings only if qTranslate is installed."
-msgstr ""
-
-#: ../mqtranslate_configuration.php:600
+msgstr "Csak akkor exportálja a beállításokat, ha a qTranslate telepítve van."
+
+#: ../mqtranslate_configuration.php:633
 msgid "Debugging Information"
-msgstr "Rovarkereső indormáció"
-
-#: ../mqtranslate_configuration.php:602
+msgstr "Rovarkereső információ"
+
+#: ../mqtranslate_configuration.php:635
 #, php-format
 msgid ""
@@ -540 +593 @@
 "felfedezésében."
 
-#: ../mqtranslate_configuration.php:630
+#: ../mqtranslate_configuration.php:663
 msgid "Save Changes"
 msgstr "Változások mentése"
 
-#: ../mqtranslate_configuration.php:661
+#: ../mqtranslate_configuration.php:694
 msgid "Disable"
 msgstr "Kikapcsol"
 
-#: ../mqtranslate_configuration.php:661
+#: ../mqtranslate_configuration.php:694
 msgid "Enable"
 msgstr "Bekapcsol"
 
-#: ../mqtranslate_configuration.php:662
+#: ../mqtranslate_configuration.php:695
 msgid "Edit"
 msgstr "Szerkeszt"
 
-#: ../mqtranslate_configuration.php:663
+#: ../mqtranslate_configuration.php:696
 msgid "Default"
 msgstr "Alap"
 
-#: ../mqtranslate_configuration.php:663
+#: ../mqtranslate_configuration.php:696
 msgid "Delete"
 msgstr "Törlés"
 
-#: ../mqtranslate_configuration.php:668
-#, fuzzy
+#: ../mqtranslate_configuration.php:701
 msgid ""
 "Enabling a language will cause mqTranslate to update the Gettext-Database "
@@ -571 +623 @@
 "connection speed."
 msgstr ""
-"Egy nyelv engedélyezésekor a qTranslate megpróbálja frissíteni a nyelv "
+"Egy nyelv engedélyezésekor az mqTranslate megpróbálja frissíteni a nyelv "
 "gettext adatbázisát. Ez az Internet sebességének függvényében eltarthat egy "
 "ideig."
 
-#: ../mqtranslate_configuration.php:675
+#: ../mqtranslate_configuration.php:708
 msgid "Add Language"
 msgstr "Nyelv hozzáadása"
 
-#: ../mqtranslate_configuration.php:678
+#: ../mqtranslate_configuration.php:711
 msgid "Add Language &raquo;"
 msgstr "Nyelv hozzáadása &raquo;"
@@ -634 +686 @@
 #: ../mqtranslate_services.php:331
 msgid "Please save your post first."
-msgstr ""
+msgstr "Kérem, előbb mentse a bejegyzést."
 
 #: ../mqtranslate_services.php:359
@@ -675 +727 @@
 
 #: ../mqtranslate_services.php:378
-#, fuzzy
 msgid ""
 "With qTranslate Services, you will be able to use professional human "
@@ -681 +732 @@
 msgstr ""
 "A qTranslate szolgáltatások segítségével profi emberi fordító "
-"szolgáltatásokat vehet igénybe néhány kattintással. (OpenSSL kell hozzá)"
+"szolgáltatásokat vehet igénybe néhány kattintással."
 
 #: ../mqtranslate_services.php:388
@@ -843 +894 @@
 #: ../mqtranslate_services.php:730 ../mqtranslate_services.php:733
 msgid "Confirm Order"
-msgstr ""
+msgstr "Rendelés megerősítése"
 
 #: ../mqtranslate_services.php:732
-#, fuzzy
 msgid "Please confirm your order."
-msgstr "A rendszer nem tudta feldolgozni a megrendelését."
+msgstr "Kérem, erősítse meg rendelését."
 
 #: ../mqtranslate_services.php:740 ../mqtranslate_services.php:875
@@ -855 +905 @@
 
 #: ../mqtranslate_services.php:742
-#, fuzzy
 msgid "Javascript is required for qTranslate Services"
-msgstr "qTranslate szolgáltatások engedélyezése"
+msgstr "Javascript szükséges a qTranslate szolgáltatásokhoz"
 
 #: ../mqtranslate_services.php:743
 msgid "Please choose a service first"
-msgstr ""
+msgstr "Előbb válasszon ki egy szolgáltatást"
 
 #: ../mqtranslate_services.php:752
@@ -871 +920 @@
 
 #: ../mqtranslate_services.php:760
-#, fuzzy
 msgid "Translation Service"
-msgstr "qTranslate szolgáltatások"
+msgstr "Fordítás szolgáltatás"
 
 #: ../mqtranslate_services.php:776
@@ -886 +934 @@
 #: ../mqtranslate_services.php:791
 msgid "<p><img src=\"images/wpspin_light.gif\"> Getting Quote...</p>"
-msgstr ""
+msgstr "<p><img src=\"images/wpspin_light.gif\"> Idézet lekérése...</p>"
 
 #: ../mqtranslate_services.php:812
 msgid "Click to toggle"
-msgstr ""
+msgstr "Kattintson a váltáshoz"
 
 #: ../mqtranslate_services.php:813
 msgid "Review Article"
-msgstr ""
+msgstr "Cikk átnézése"
 
 #: ../mqtranslate_services.php:819
@@ -910 +958 @@
 #: ../mqtranslate_services.php:858 ../mqtranslate_services.php:865
 msgid "unavailable"
-msgstr ""
+msgstr "nem elérhető"
 
 #: ../mqtranslate_services.php:863
 msgid "free"
-msgstr ""
+msgstr "ingyenes"
 
 #: ../mqtranslate_services.php:870
 #, php-format
 msgid "<p>Price: %1$s %2$s</p>"
-msgstr ""
+msgstr "<p>Ár: %1$s %2$s</p>"
 
 #: ../mqtranslate_services.php:871
 #, php-format
 msgid "~ %1$s %2$s"
-msgstr ""
+msgstr "~ %1$s %2$s"
 
 #: ../mqtranslate_services.php:878
-#, fuzzy
 msgid "An error occured!"
-msgstr "Egy hiba lépett föl: %s"
+msgstr "Hiba történt!"
 
 #: ../mqtranslate_services.php:896
@@ -942 +989 @@
 #: ../mqtranslate_widget.inc.php:25
 #: ../mqtranslate_widget_qtranslate-slug.php:25
-#, fuzzy
 msgid "mqTranslate Language Chooser"
-msgstr "qTranslate nyelv választó"
+msgstr "mqTranslate nyelv-választó"
 
 #: ../mqtranslate_widget.inc.php:32
@@ -986 +1032 @@
 "target=\"_blank\">corresponding version</a>."
 msgstr ""
-
-#: ../mqtranslate_wphacks.php:358
+"Az mqTranslate szerkesztő letiltotta magát, mert a WordPress ezen "
+"verziójával még nem lett tesztelve. Így elkerülhető a WordPress hibás "
+"működése. E figyelmeztetés eltüntetéséhez, frissítse az mqTranslate "
+"bővítményt a <a href=\"http://wordpress.org/plugins/mqtranslate/\" target="
+"\"_blank\">megfelelő verzióra</a>."
+
+#: ../mqtranslate_wphacks.php:360
 msgid "Title"
 msgstr "Cím"
 
-#: ../mqtranslate_wphacks.php:360 ../mqtranslate_wphacks.php:405
-#, fuzzy
+#: ../mqtranslate_wphacks.php:362 ../mqtranslate_wphacks.php:407
 msgid "Read only"
-msgstr "Csak szöveg"
+msgstr "Csak olvasható"
 
 #: ../mqtranslate_xhaleera_addons.php:76
-#, fuzzy
 msgid "mqTranslate User Language Settings"
-msgstr "qTranslate szolgáltatás beállítások"
+msgstr "mqTranslate felhasználói nyelv beállítások"
 
 #: ../mqtranslate_xhaleera_addons.php:87
 msgid "You can edit posts in"
-msgstr ""
+msgstr "Ezeken a nyelveken szerkeszthet:"
 
 #: ../mqtranslate_xhaleera_addons.php:89
 msgid "This user can edit posts in"
-msgstr ""
+msgstr "Ezeket a nyelveket szerkesztheti:"
 
 #: ../mqtranslate_xhaleera_addons.php:94
 #: ../mqtranslate_xhaleera_addons.php:103
-#, fuzzy
 msgid "No language available"
-msgstr "A nyelv már ki van kapcsolva!"
+msgstr "Nincs elérhető nyelv"
 
 #: ../mqtranslate_xhaleera_addons.php:96
 msgid "As an Administrator, you can edit posts in all languages."
-msgstr ""
+msgstr "Mint admin, minden nyelvű tartalmat szerkeszthetsz."
 
 #: ../mqtranslate_xhaleera_addons.php:98
 msgid "As an Administrator, this user can edit posts in all languages."
-msgstr ""
+msgstr "Mint admin, ez a felhasználó minden nyelvű tartalmat szerkeszthet."
 
 #: ../mqtranslate_xhaleera_addons.php:119
 msgid "No language selected"
-msgstr ""
+msgstr "Nincs kiválasztva nyelv"
 
 #: ../mqtranslate_xhaleera_addons.php:134
-#, fuzzy
 msgid "Master language"
-msgstr "Célnyelv"
+msgstr "Fő nyelv"
 
 #: ../mqtranslate_xhaleera_addons.php:137
 msgid "Not applicable to Administrators"
-msgstr ""
+msgstr "Nem vonatkozik adminokra"
 
 #: ../mqtranslate_xhaleera_addons.php:150
 msgid "Language from which texts should be translated by this user"
-msgstr ""
+msgstr "Erről a nyelvről fordíthat ez a felhasználó"
 
 #: ../mqtranslate_xhaleera_addons.php:279
-#, fuzzy
 msgid "mqTranslate Team Settings"
-msgstr "qTranslate szolgáltatás beállítások"
+msgstr "mqTranslate csapat beállítások"
 
 #: ../mqtranslate_xhaleera_addons.php:282
 msgid "User-level Language Protection"
-msgstr ""
+msgstr "Felhasználónként megadható nyelvek"
 
 #: ../mqtranslate_xhaleera_addons.php:284
 msgid "Enable user-level language protection"
-msgstr ""
+msgstr "Felhasználói szintű nyelv-védelem engedélyezése"
 
 #: ../mqtranslate_xhaleera_addons.php:286
@@ -1058 +1104 @@
 "a user-level account basis."
 msgstr ""
+"Ha be van kapcsolva, akkor minden admin felhasználónál megadható, hogy "
+"melyik nyelvek tartalmát szerkesztheti."
+
+#~ msgid "Use Secure Cookie"
+#~ msgstr "Biztonságos süti"
 
 #~ msgid ""
-#~ "Adds userfriendly multilingual content support into Wordpress. For "
-#~ "Problems visit the <a href=\"http://www.qianqin.de/qtranslate/forum/"
-#~ "\">Support Forum</a>."
+#~ "Adds userfriendly multilingual content support into Wordpress. "
+#~ "mqTranslate is a fork of the well-known <a href=\"http://www.qianqin.de/"
+#~ "mqtranslate/\">qTranslate</a> plugin by <a href=\"http://www.qianqin.de/"
+#~ "\">Qian Qin</a>, extending the original software with collaborative and "
+#~ "team-oriented features."
 #~ msgstr ""
-#~ "Felhasználóbarát többnyelvűség a Wordpresshez. Problémák esetén látogassa "
-#~ "meg a <a href=\"http://www.qianqin.de/qtranslate/forum/\">Segítő fórum</"
-#~ "a>ot."
-
-#~ msgid "Category Name"
-#~ msgstr "Kategória név"
-
-#~ msgid "Please review your article and <a href=\"%s\">edit</a> it if needed."
-#~ msgstr ""
-#~ "Kérem vizsgálja felül a bejegyzést, és <a href=\"%s\">szerkessze</a> ha "
-#~ "szükséges."
-
-#~ msgid "Qian Qin"
-#~ msgstr "Qian Qin"
-
-#~ msgid "Save after enabling to see more Configuration options."
-#~ msgstr "Mentsen a bekapcsolás után, hogy az összes beállítást lássa."
-
-#~ msgid "Show"
-#~ msgstr "mutat"
-
-#~ msgid "Tag Name"
-#~ msgstr "Címke név"
-
-#~ msgid ""
-#~ "This version of qTranslate has not been tested with your Wordpress "
-#~ "version. To prevent Wordpress from malfunctioning, the qTranslate Editor "
-#~ "has been disabled. You can reenable it by <a href=\"javascript:"
-#~ "qtrans_editorInit();\" title=\"Activate qTranslate\" id=\"qtrans_imsg_link"
-#~ "\">clicking here</a> (may cause <b>data loss</b>!). To remove this "
-#~ "message, please update qTranslate to the <a href=\"http://www.qianqin.de/"
-#~ "qtranslate/download/\">corresponding version</a>."
-#~ msgstr ""
-#~ "A qTranslate ezen verziója nem lett letesztelve a Wordpress ezzen "
-#~ "verziójával. A Wordpress hibás működését elkerülendő a qTranslate "
-#~ "szerkesztő ki lett kapcsolva. Újra engedélyezheti, ha <a href="
-#~ "\"javascript:qtrans_editorInit();\" title=\"qTranslate bekapcsolása\" id="
-#~ "\"qtrans_imsg_link\">ide kattint</a> (<b>adatvesztés</b>t okozhat!). Az "
-#~ "üzenet megszüntetéséhez kérem frissítse a qTranslate beépülőt a <a href="
-#~ "\"http://www.qianqin.de/qtranslate/download/\">megfelelő verzió</a>ra."
-
-#~ msgid "Use the following Translation Service:"
-#~ msgstr "A következő fordítási szolgáltatás használata:"
-
-#~ msgid "http://www.qianqin.de"
-#~ msgstr "http://www.qianqin.de"
-
-#~ msgid "http://www.qianqin.de/qtranslate/"
-#~ msgstr "http://www.qianqin.de/qtranslate/"
-
-#~ msgid "language_name"
-#~ msgstr "language_name"
-
-#~ msgid ""
-#~ "multilingual, multi, language, admin, tinymce, qTranslate, Polyglot, "
-#~ "bilingual, widget, switcher, professional, human, translation, service"
-#~ msgstr ""
-#~ "multilingual, multi, language, admin, tinymce, qTranslate, Polyglot, "
-#~ "bilingual, widget, switcher, professional, human, translation, service"
-
-#~ msgid "qTranslate"
-#~ msgstr "qTranslate"
-
-#~ msgid "service_description"
-#~ msgstr "szolgáltatás_leírás"
-
-#~ msgid "service_name"
-#~ msgstr "szolgáltatás_név"
+#~ "Felhasználóbarát több nyelv támogatás WordPresshez. Az mqTranslate a jól "
+#~ "ismert <a href=\"http://www.qianqin.de/mqtranslate/\">qTranslate</a> "
+#~ "bővítmény leágazása (eredeti szerző: <a href=\"http://www.qianqin.de/"
+#~ "\">Qian Qin</a>). Új funkciók: csapat-alapú képességek."

mqtranslate/trunk/lang/mqtranslate.pot

@@ -8 +8 @@
 "Project-Id-Version: mqTranslate 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-13 14:33+0100\n"
-"PO-Revision-Date: 2014-09-13 14:33+0100\n"
+"POT-Creation-Date: 2014-12-27 21:41+0100\n"
+"PO-Revision-Date: 2014-12-27 21:41+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.7.1\n"
 "X-Poedit-KeywordsList: _e;__\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: ..\n"
 
+#: ../mqtranslate.php:99
+#, php-format
+msgid ""
+"Sorry, but mqTranslate can not be activated. You have to deactivate %s first."
+msgstr ""
+
 #: ../mqtranslate_configuration.php:25
 msgid "Language Management"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:646
+#: ../mqtranslate_configuration.php:25 ../mqtranslate_configuration.php:670
 #: ../mqtranslate_hooks.php:180
 msgid "Languages"
@@ -137 +143 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:245
+#: ../mqtranslate_configuration.php:248
 msgid "Gettext databases updated."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:250
+#: ../mqtranslate_configuration.php:253
 msgid "The Language must have a Not-Available Message!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:251
+#: ../mqtranslate_configuration.php:254
 msgid "The Language must have a Locale!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:252
+#: ../mqtranslate_configuration.php:255
 msgid "The Language must have a name!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:253
+#: ../mqtranslate_configuration.php:256
 msgid "Language Code has to be 2 characters long!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:257 ../mqtranslate_configuration.php:263
+#: ../mqtranslate_configuration.php:260 ../mqtranslate_configuration.php:266
 msgid "There is already a language with the same Language Code!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:368
+#: ../mqtranslate_configuration.php:371
 msgid "Language is already enabled or invalid!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:373
+#: ../mqtranslate_configuration.php:376
 msgid "Cannot disable Default Language!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:376 ../mqtranslate_configuration.php:383
-#: ../mqtranslate_configuration.php:399
+#: ../mqtranslate_configuration.php:379 ../mqtranslate_configuration.php:386
+#: ../mqtranslate_configuration.php:402
 msgid "No such language!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:379
+#: ../mqtranslate_configuration.php:382
 msgid "Language is already disabled!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:387
+#: ../mqtranslate_configuration.php:390
 msgid "Language is already first!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:393 ../mqtranslate_configuration.php:409
+#: ../mqtranslate_configuration.php:396 ../mqtranslate_configuration.php:412
 msgid "New order saved."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:403
+#: ../mqtranslate_configuration.php:406
 msgid "Language is already last!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:420
+#: ../mqtranslate_configuration.php:423
 msgid "Options saved."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:425
+#: ../mqtranslate_configuration.php:428
 #, php-format
 msgid "Could not write to \"%s\", Gettext Databases could not be downloaded!"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:447
+#: ../mqtranslate_configuration.php:450
 msgid "Edit Language"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:450
+#: ../mqtranslate_configuration.php:453
 msgid "Save Changes &raquo;"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:455
+#: ../mqtranslate_configuration.php:458
 msgid "Language Management (mqTranslate Configuration)"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:456
+#: ../mqtranslate_configuration.php:459
 #, php-format
 msgid ""
@@ -218 +224 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:458
+#: ../mqtranslate_configuration.php:461
 msgid "General Settings"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:461
+#: ../mqtranslate_configuration.php:464
 msgid "Default Language / Order"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:463 ../mqtranslate_xhaleera_addons.php:141
+#: ../mqtranslate_configuration.php:466 ../mqtranslate_xhaleera_addons.php:141
 #: ../mqtranslate_xhaleera_addons.php:155
 msgid "Default Language"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:478
+#: ../mqtranslate_configuration.php:481
 #, php-format
 msgid ""
@@ -239 +245 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:483
+#: ../mqtranslate_configuration.php:486
 msgid "Hide Untranslated Content"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:485
+#: ../mqtranslate_configuration.php:488
 msgid "Hide Content which is not available for the selected language."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:488
+#: ../mqtranslate_configuration.php:491
 msgid ""
 "When checked, posts will be hidden if the content is not available for the "
@@ -254 +260 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:489
+#: ../mqtranslate_configuration.php:492
 msgid ""
 "This function will not work correctly if you installed mqTranslate on a blog "
@@ -261 +267 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:492
+#: ../mqtranslate_configuration.php:495
 msgid ""
 "Show displayed language prefix when Content is not available for the "
@@ -267 +273 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:497
+#: ../mqtranslate_configuration.php:500
 msgid "Detect Browser Language"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:499
+#: ../mqtranslate_configuration.php:502
 msgid "Detect the language of the browser and redirect accordingly."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:502
+#: ../mqtranslate_configuration.php:505
 msgid ""
 "When the frontpage is visited via bookmark/external link/type-in, the "
@@ -282 +288 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:507
+#: ../mqtranslate_configuration.php:510
 msgid "Advanced Settings"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:507 ../mqtranslate_services.php:370
+#: ../mqtranslate_configuration.php:510 ../mqtranslate_services.php:370
 #: ../mqtranslate_xhaleera_addons.php:279
 msgid "Show / Hide"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:510 ../mqtranslate_configuration.php:512
+#: ../mqtranslate_configuration.php:513 ../mqtranslate_configuration.php:515
 msgid "URL Modification Mode"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:513
+#: ../mqtranslate_configuration.php:516
 msgid "Use Query Mode (?lang=en)"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:514
+#: ../mqtranslate_configuration.php:517
 msgid "Use Pre-Path Mode (Default, puts /en/ in front of URL)"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:515
+#: ../mqtranslate_configuration.php:518
 msgid "Use Pre-Domain Mode (uses http://en.yoursite.com)"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:518
+#: ../mqtranslate_configuration.php:521
 msgid ""
 "Pre-Path and Pre-Domain mode will only work with mod_rewrite/pretty "
@@ -313 +319 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:521
+#: ../mqtranslate_configuration.php:524
 msgid "Hide URL language information for default language."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:525
+#: ../mqtranslate_configuration.php:528
 msgid "Flag Image Path"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:529
+#: ../mqtranslate_configuration.php:532
 msgid ""
 "Path to the flag images under wp-content, with trailing slash. (Default: "
@@ -327 +333 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:533
+#: ../mqtranslate_configuration.php:536
 msgid "Ignore Links"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:537
+#: ../mqtranslate_configuration.php:540
 msgid ""
 "Don't convert Links to files of the given file types. (Default: gif,jpg,jpeg,"
@@ -337 +343 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:541
+#: ../mqtranslate_configuration.php:544
 msgid "Remove plugin CSS from head"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:543
+#: ../mqtranslate_configuration.php:546
 msgid "Remove inline CSS code added by plugin from the head"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:545
+#: ../mqtranslate_configuration.php:548
 msgid ""
 "This will remove default styles applyied to mqTranslate Language Chooser"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:549
+#: ../mqtranslate_configuration.php:552
+msgid "Cookie Settings"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:554
+msgid "Disable all client cookies"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:556
+msgid "If checked, language will not be saved for visitors between sessions."
+msgstr ""
+
+#: ../mqtranslate_configuration.php:559
+msgid "Make mqTranslate cookie available only through HTTPS connections"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:561
+msgid "Don't check this if you don't know what you're doing!"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:565
 msgid "Allowed Custom Post Types"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:553
+#: ../mqtranslate_configuration.php:569
 msgid ""
 "Comma-separated list of the custom post types for which you want mqTranslate "
@@ -360 +386 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:557
+#: ../mqtranslate_configuration.php:573
 msgid "Update Gettext Databases"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:559
+#: ../mqtranslate_configuration.php:575
 msgid "Automatically check for .mo-Database Updates of installed languages."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:561
+#: ../mqtranslate_configuration.php:577
 msgid "Update Gettext databases now."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:563
+#: ../mqtranslate_configuration.php:579
 msgid ""
 "mqTranslate will query the Wordpress Localisation Repository every week and "
@@ -378 +404 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:567
+#: ../mqtranslate_configuration.php:583
 msgid "Date / Time Conversion"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:569
+#: ../mqtranslate_configuration.php:585
 msgid "Use emulated date function."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:570
+#: ../mqtranslate_configuration.php:586
 msgid ""
 "Use emulated date function and replace formats with the predefined formats "
@@ -392 +418 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:571
+#: ../mqtranslate_configuration.php:587
 msgid "Use strftime instead of date."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:572
+#: ../mqtranslate_configuration.php:588
 msgid ""
 "Use strftime instead of date and replace formats with the predefined formats "
@@ -402 +428 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:573
+#: ../mqtranslate_configuration.php:589
 msgid ""
 "Depending on the mode selected, additional customizations of the theme may "
@@ -408 +434 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:577
+#: ../mqtranslate_configuration.php:593
+msgid "Optimization Settings"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:595
+msgid "Filter all WordPress options"
+msgstr ""
+
+#: ../mqtranslate_configuration.php:597
+msgid ""
+"If unchecked, some texts may not be translated anymore. However, disabling "
+"this feature may greatly improve loading times."
+msgstr ""
+
+#: ../mqtranslate_configuration.php:601
 msgid "Reset mqTranslate"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:579
+#: ../mqtranslate_configuration.php:603
 msgid ""
 "Check this box and click Save Changes to reset all mqTranslate settings."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:581
+#: ../mqtranslate_configuration.php:605
 msgid "Yes, I really want to reset mqTranslate."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:583
+#: ../mqtranslate_configuration.php:607
 msgid "Also delete Translations for Categories/Tags/Link Categories."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:585
+#: ../mqtranslate_configuration.php:609
 msgid ""
 "If something isn't working correctly, you can always try to reset all "
@@ -432 +472 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:589
+#: ../mqtranslate_configuration.php:613
 msgid "Convert Database"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:591
+#: ../mqtranslate_configuration.php:615
 #, php-format
 msgid ""
@@ -443 +483 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:592
+#: ../mqtranslate_configuration.php:616
 #, php-format
 msgid ""
@@ -452 +492 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:593
+#: ../mqtranslate_configuration.php:617
 msgid ""
 "Both processes are <b>irreversible</b>! Be sure to make a full database "
@@ -458 +498 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:597
+#: ../mqtranslate_configuration.php:621
 msgid "Settings Migration"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:599
+#: ../mqtranslate_configuration.php:623
 msgid "Do not migrate any setting"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:601
+#: ../mqtranslate_configuration.php:625
 msgid "Import settings from qTranslate"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:603
+#: ../mqtranslate_configuration.php:627
 msgid "Export settings to qTranslate"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:605
+#: ../mqtranslate_configuration.php:629
 msgid "Export settings only if qTranslate is installed."
 msgstr ""
 
-#: ../mqtranslate_configuration.php:609
+#: ../mqtranslate_configuration.php:633
 msgid "Debugging Information"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:611
+#: ../mqtranslate_configuration.php:635
 #, php-format
 msgid ""
@@ -490 +530 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:639
+#: ../mqtranslate_configuration.php:663
 msgid "Save Changes"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:670
+#: ../mqtranslate_configuration.php:694
 msgid "Disable"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:670
+#: ../mqtranslate_configuration.php:694
 msgid "Enable"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:671
+#: ../mqtranslate_configuration.php:695
 msgid "Edit"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:672
+#: ../mqtranslate_configuration.php:696
 msgid "Default"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:672
+#: ../mqtranslate_configuration.php:696
 msgid "Delete"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:677
+#: ../mqtranslate_configuration.php:701
 msgid ""
 "Enabling a language will cause mqTranslate to update the Gettext-Database "
@@ -521 +561 @@
 msgstr ""
 
-#: ../mqtranslate_configuration.php:684
+#: ../mqtranslate_configuration.php:708
 msgid "Add Language"
 msgstr ""
 
-#: ../mqtranslate_configuration.php:687
+#: ../mqtranslate_configuration.php:711
 msgid "Add Language &raquo;"
 msgstr ""
@@ -897 +937 @@
 msgstr ""
 
-#: ../mqtranslate_wphacks.php:358
+#: ../mqtranslate_wphacks.php:360
 msgid "Title"
 msgstr ""
 
-#: ../mqtranslate_wphacks.php:360 ../mqtranslate_wphacks.php:405
+#: ../mqtranslate_wphacks.php:362 ../mqtranslate_wphacks.php:407
 msgid "Read only"
 msgstr ""

mqtranslate/trunk/mqtranslate.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/plugins/mqtranslate/
 Description: Adds userfriendly multilingual content support into Wordpress. mqTranslate is a fork of the well-known <a href="http://www.qianqin.de/mqtranslate/">qTranslate</a> plugin by <a href="http://www.qianqin.de/">Qian Qin</a>, extending the original software with collaborative and team-oriented features.
-Version: 2.9
+Version: 2.9.1
 Author: xhaleera
 Author URI: http://www.xhaleera.com
@@ -88 +88 @@
     All Supporters! Thanks for all the donations!
 */
+
+function mqtranslate_activation_check() {
+    $plugins = array(
+            'qTranslate' => 'qtranslate/qtranslate.php',
+            'zTranslate' => 'ztranslate/ztranslate.php',
+            'qTranslate-X' => 'qtranslate-x/qtranslate.php',
+            'qTranslate Plus' => 'qtranslate-xp/ppqtranslate.php'
+    );
+    
+    $msg = __("Sorry, but mqTranslate can not be activated. You have to deactivate %s first.", 'mqtranslate');
+    
+    foreach ($plugins as $k => $v) {
+        if ( is_plugin_active( $v ) ) {
+            deactivate_plugins(__FILE__); // Deactivate ourself
+            wp_die( sprintf($msg, $k) );
+        }
+    }
+}
+register_activation_hook(__FILE__, 'mqtranslate_activation_check');
+
+if (function_exists('qtrans_init'))
+    return;
+
 /* DEFAULT CONFIGURATION PART BEGINS HERE */
 
@@ -471 +494 @@
 $q_config['disable_header_css'] = 0;
 
-// Use secure cookie
+// Cookie settings
+$q_config['disable_client_cookies'] = 0;
 $q_config['use_secure_cookie'] = 0;
 
-// Load mqTranslate
-require_once(dirname(__FILE__)."/mqtranslate_javascript.php");
-require_once(dirname(__FILE__)."/mqtranslate_utils.php");
-require_once(dirname(__FILE__)."/mqtranslate_core.php");
-require_once(dirname(__FILE__)."/mqtranslate_wphacks.php");
-require_once(dirname(__FILE__)."/mqtranslate_widget.php");
-require_once(dirname(__FILE__)."/mqtranslate_configuration.php");
-
-// load qTranslate Services if available
-if(file_exists(dirname(__FILE__)."/mqtranslate_services.php"))
-    require_once(dirname(__FILE__)."/mqtranslate_services.php");
-
-// set hooks at the end
-require_once(dirname(__FILE__)."/mqtranslate_hooks.php");
-
-require_once(dirname(__FILE__)."/mqtranslate_xhaleera_addons.php");
-?>
+// Optimisation settings
+$q_config['filter_all_options'] = 1;
+
+if (!function_exists('is_plugin_active') || is_plugin_active( 'mqtranslate/mqtranslate.php' )) {
+    // Load mqTranslate
+    require_once(dirname(__FILE__)."/mqtranslate_javascript.php");
+    require_once(dirname(__FILE__)."/mqtranslate_utils.php");
+    require_once(dirname(__FILE__)."/mqtranslate_core.php");
+    require_once(dirname(__FILE__)."/mqtranslate_wphacks.php");
+    require_once(dirname(__FILE__)."/mqtranslate_widget.php");
+    require_once(dirname(__FILE__)."/mqtranslate_configuration.php");
+    
+    // load qTranslate Services if available
+    if(file_exists(dirname(__FILE__)."/mqtranslate_services.php"))
+        require_once(dirname(__FILE__)."/mqtranslate_services.php");
+    
+    // set hooks at the end
+    require_once(dirname(__FILE__)."/mqtranslate_hooks.php");
+    
+    require_once(dirname(__FILE__)."/mqtranslate_xhaleera_addons.php");
+}

mqtranslate/trunk/mqtranslate_configuration.php

@@ -232 +232 @@
         qtrans_checkSetting('hide_default_language',    true, QT_BOOLEAN);
         qtrans_checkSetting('disable_header_css',       true, QT_BOOLEAN);
+        qtrans_checkSetting('disable_client_cookies',   true, QT_BOOLEAN);
         qtrans_checkSetting('use_secure_cookie',        true, QT_BOOLEAN);
+        qtrans_checkSetting('filter_all_options',       true, QT_BOOLEAN);
         
         if (isset($_POST['allowed_custom_post_types']))
@@ -548 +550 @@
             </tr>
             <tr valign="top">
-                <th scope="row"><?php _e('Use Secure Cookie', 'mqtranslate'); ?></th>
-                <td>
+                <th scope="row"><?php _e('Cookie Settings', 'mqtranslate'); ?></th>
+                <td>
+                    <label for="disable_client_cookies"><input type="checkbox" name="disable_client_cookies" id="disable_client_cookies" value="1"<?php echo empty($q_config['disable_client_cookies']) ? '' : ' checked="checked"' ?> /> <?php _e('Disable all client cookies', 'mqtranslate'); ?> </label>
+                    <br />
+                    <small><?php _e("If checked, language will not be saved for visitors between sessions.", 'mqtranslate') ?></small>
+                    <br /><br />
+                
                     <label for="use_secure_cookie"><input type="checkbox" name="use_secure_cookie" id="use_secure_cookie" value="1"<?php echo empty($q_config['use_secure_cookie']) ? '' : ' checked="checked"' ?> /> <?php _e('Make mqTranslate cookie available only through HTTPS connections', 'mqtranslate'); ?> </label>
                     <br />
@@ -581 +588 @@
                     <label><input type="radio" name="use_strftime" value="<?php echo QT_STRFTIME_OVERRIDE; ?>" <?php echo ($q_config['use_strftime']==QT_STRFTIME_OVERRIDE)?' checked="checked"':''; ?>/> <?php _e('Use strftime instead of date and replace formats with the predefined formats for each language.', 'mqtranslate'); ?></label><br />
                     <small><?php _e('Depending on the mode selected, additional customizations of the theme may be needed.', 'mqtranslate'); ?></small>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><?php _e('Optimization Settings', 'mqtranslate'); ?></th>
+                <td>
+                    <label for="filter_all_options"><input type="checkbox" name="filter_all_options" id="filter_all_options" value="1"<?php echo empty($q_config['filter_all_options']) ? '' : ' checked="checked"' ?> /> <?php _e('Filter all WordPress options', 'mqtranslate'); ?> </label>
+                    <br />
+                    <small><?php _e("If unchecked, some texts may not be translated anymore. However, disabling this feature may greatly improve loading times.", 'mqtranslate') ?></small>
                 </td>
             </tr>

mqtranslate/trunk/mqtranslate_core.php

@@ -49 +49 @@
         delete_option('mqtranslate_allowed_custom_post_types');
         delete_option('mqtranslate_disable_header_css');
+        delete_option('mqtranslate_disable_client_cookies');
         delete_option('mqtranslate_use_secure_cookie');
+        delete_option('mqtranslate_filter_all_options');
         if(isset($_POST['mqtranslate_reset3'])) {
             delete_option('mqtranslate_term_name');
@@ -84 +86 @@
     
     // set test cookie
-    setcookie('qtrans_cookie_test', 'mqTranslate Cookie Test', 0, $q_config['url_info']['home'], $q_config['url_info']['host'], !empty($q_config['use_secure_cookie']));
+    if (empty($q_config['disable_client_cookies']) || defined('WP_ADMIN'))
+        setcookie('qtrans_cookie_test', 1, 0, $q_config['url_info']['home'], $q_config['url_info']['host_wo_port'], !empty($q_config['use_secure_cookie']));
     // check cookies for admin
     if(defined('WP_ADMIN')) {
         if(isset($_GET['lang']) && qtrans_isEnabled($_GET['lang'])) {
-            $q_config['language'] = $q_config['url_info']['language'];
-            setcookie('qtrans_admin_language', $q_config['language'], time()+60*60*24*30, !empty($q_config['use_secure_cookie']));
-        } elseif(isset($_COOKIE['qtrans_admin_language']) && qtrans_isEnabled($_COOKIE['qtrans_admin_language'])) {
-            $q_config['language'] = $_COOKIE['qtrans_admin_language'];
-        } else {
-            $q_config['language'] = $q_config['default_language'];
-        }
-    } else {
-        $q_config['language'] = $q_config['url_info']['language'];
-    }
-    
-    $q_config['language'] = apply_filters('mqtranslate_language', $q_config['language']);
+            qtrans_setLanguage($q_config['url_info']['language']);
+            setcookie('qtrans_admin_language', $q_config['language'], time()+60*60*24*30, NULL, NULL, !empty($q_config['use_secure_cookie']));
+        }
+        elseif (isset($_COOKIE['qtrans_admin_language']) && qtrans_isEnabled($_COOKIE['qtrans_admin_language']))
+            qtrans_setLanguage($_COOKIE['qtrans_admin_language']);
+        else
+            qtrans_setLanguage($q_config['default_language']);
+    }
+    else {
+        if (!isset($_COOKIE['qtrans_client_language']) || !qtrans_isEnabled($_COOKIE['qtrans_client_language'])
+                || (($q_config['url_info']['language'] != $q_config['default_language'] || $q_config['url_info']['explicit_default_language']) && $q_config['url_info']['language'] != $_COOKIE['qtrans_client_language'])) {
+            qtrans_setLanguage($q_config['url_info']['language']);
+            if (empty($q_config['disable_client_cookies']))
+                setcookie('qtrans_client_language', $q_config['language'], time() + 86400 * 30, $q_config['url_info']['home'], $q_config['url_info']['host_wo_port'], !empty($q_config['use_secure_cookie']));
+        }
+        else
+            qtrans_setLanguage($_COOKIE['qtrans_client_language']);
+    }
     
     // detect language and forward if needed
@@ -143 +152 @@
     
     // Filter all options for language tags
-    if(!defined('WP_ADMIN')) {
+    if(!defined('WP_ADMIN') && !empty($q_config['filter_all_options'])) {
         $alloptions = wp_load_alloptions();
         foreach($alloptions as $option => $value) {
@@ -159 +168 @@
     // fix url to prevent xss
     $q_config['url_info']['url'] = qtrans_convertURL(add_query_arg('lang',$q_config['default_language'],$q_config['url_info']['url']));
+}
+
+function qtrans_setLanguage($lang) {
+    global $q_config;
+    
+    $q_config['language'] = apply_filters('mqtranslate_language', $lang);
 }
 
@@ -198 +213 @@
     
     switch($q_config['url_mode']) {
+        case QT_URL_QUERY:
+            $result['explicit_default_language'] = (!empty($_GET['lang']) && $_GET['lang'] == $q_config['default_language']);
+            break;
         case QT_URL_PATH:
             // pre url
@@ -220 +238 @@
                         // found language information
                         $result['language'] = $match[1];
+                        $result['explicit_default_language'] = ($match[1] == $q_config['default_language']);
                         $result['host'] = substr($host, 3);
                     }
@@ -255 +274 @@
         }
     }
+    
+    $result['host_wo_port'] = preg_replace('#:.+$#', '', $result['host']);
     
     return $result;
@@ -288 +309 @@
     $allowed_custom_post_types = get_option('mqtranslate_allowed_custom_post_types');
     $disable_header_css = get_option('mqtranslate_disable_header_css');
+    $disable_client_cookies = get_option('mqtranslate_disable_client_cookies');
     $use_secure_cookie = get_option('mqtranslate_use_secure_cookie');
+    $filter_all_options = get_option('mqtranslate_filter_all_options');
     
     // default if not set
@@ -319 +342 @@
     $hide_default_language = qtrans_validateBool($hide_default_language, $q_config['hide_default_language']);
     $disable_header_css = qtrans_validateBool($disable_header_css, $q_config['disable_header_css']);
+    $disable_client_cookies = qtrans_validateBool($disable_client_cookies, $q_config['disable_client_cookies']);
     $use_secure_cookie = qtrans_validateBool($use_secure_cookie, $q_config['use_secure_cookie']);
+    $filter_all_options = qtrans_validateBool($filter_all_options, $q_config['filter_all_options']);
     
     // url fix for upgrading users
@@ -349 +374 @@
     $q_config['allowed_custom_post_types'] = $allowed_custom_post_types;
     $q_config['disable_header_css'] = $disable_header_css;
+    $q_config['disable_client_cookies'] = $disable_client_cookies;
     $q_config['use_secure_cookie'] = $use_secure_cookie;
+    $q_config['filter_all_options'] = $filter_all_options;
     
     do_action('mqtranslate_loadConfig');
@@ -395 +422 @@
     update_option('mqtranslate_allowed_custom_post_types', implode(',', $q_config['allowed_custom_post_types']));
     update_option('mqtranslate_disable_header_css', $q_config['disable_header_css'] ? '1' : '0');
+    update_option('mqtranslate_disable_client_cookies', $q_config['disable_client_cookies'] ? '1' : '0');
     update_option('mqtranslate_use_secure_cookie', $q_config['use_secure_cookie'] ? '1' : '0');
+    update_option('mqtranslate_filter_all_options', $q_config['filter_all_options'] ? '1' : '0');
         
     do_action('mqtranslate_saveConfig');
@@ -678 +707 @@
     
     // check for query language information and remove if found
-    if(preg_match("#(&|\?)lang=([^&\#]+)#i",$url,$match) && qtrans_isEnabled($match[2])) {
+    if (preg_match("#(&|\?)lang=([^&\#]+)#i",$url,$match) && qtrans_isEnabled($match[2]))
         $url = preg_replace("#(&|\?)lang=".$match[2]."&?#i","$1",$url);
-    }
     
     // remove any slashes out front
@@ -712 +740 @@
                 }
             }
-            if(!$q_config['hide_default_language']||$lang!=$q_config['default_language']||$forceaddlang) $url = $lang."/".$url;
+            if(!$q_config['hide_default_language']||$lang!=$q_config['default_language']||$forceaddlang)
+                $url = $lang."/".$url;
             break;
-        case QT_URL_DOMAIN: // pre domain 
-            if(!$q_config['hide_default_language']||$lang!=$q_config['default_language']) $home = preg_replace("#//#","//".$lang.".",$home,1);
+        case QT_URL_DOMAIN: // pre domain
+            // might already have language information
+            if (preg_match('#//([a-z]{2})\.#i', $url, $_match)) {
+                if (qtrans_isEnabled($_match[1]))
+                    $url = preg_replace("#//{$_match[1]}\.#i", '//', $url);
+            } 
+            if (!$q_config['hide_default_language']||$lang!=$q_config['default_language']||$forceaddlang)
+                $home = preg_replace("#//#","//{$lang}.",$home,1);
             break;
         default: // query
-            if(!$q_config['hide_default_language']||$lang!=$q_config['default_language']){
-                if(strpos($url,'?')===false) {
+            // might already have language information
+            if (preg_match('#(&|\?)lang=([a-zA-Z]{2})&?#', $url, $_match)) {
+                if (qtrans_isEnabled($_match[1]))
+                    $url = preg_replace("#(&|/?)lang={$_match[1]}&?#", "$1", $url);
+            }
+            if(!$q_config['hide_default_language']||$lang!=$q_config['default_language']||$forceaddlang){
+                if (strpos($url,'?') === false)
                     $url .= '?';
-                } else {
+                else
                     $url .= '&';
-                }
                 $url .= "lang=".$lang;
             }
@@ -731 +770 @@
     if(!$q_config['cookie_enabled'] && !$q_config['url_info']['internal_referer'] && $urlinfo['path'] == '' && $lang == $q_config['default_language'] && $q_config['language'] != $q_config['default_language'] && $q_config['hide_default_language'] && !empty($match[2])) {
         // :( now we have to make unpretty URLs
-        $url = preg_replace("#(&|\?)lang=".$match[2]."&?#i","$1",$url);
+        $url = preg_replace("#(&|\?)lang=[^&]+&?#i","$1",$url);
         if(strpos($url,'?')===false) {
             $url .= '?';
@@ -742 +781 @@
     // & workaround
     $complete = str_replace('&','&',$home."/".$url);
-
+    
     // remove trailing slash if there wasn't one to begin with
     if($nottrailing && strpos($complete,'?')===false && strpos($complete,'#')===false && substr($complete,-1,1)=='/')

mqtranslate/trunk/mqtranslate_javascript.php

@@ -305 +305 @@
             tinyMCEPreInit.mceInit[id].setup = function(ed) {
                 ed.on('SaveContent', function(e) {
-                    if (!ed.isHidden()) {
+                    if (!ed.isHidden() && ed.id.match(/^qtrans_/)) {
                         e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p>&nbsp;</p>' );
                         if ( ed.getParam( 'wpautop', true ) )

mqtranslate/trunk/mqtranslate_widget.php

@@ -41 +41 @@
                     if($language == $q_config['language'])
                         $classes[] = 'active';
-                    echo '<li class="'. implode(' ', $classes) .'"><a href="'.qtrans_convertURL($url, $language).'"';
+                    echo '<li class="'. implode(' ', $classes) .'"><a href="'.qtrans_convertURL($url, $language, false, true).'"';
                     // set hreflang
                     echo ' hreflang="'.$language.'" title="'.$q_config['language_name'][$language].'"';
@@ -60 +60 @@
                     // create dropdown fields for each language
                     foreach(qtrans_getSortedLanguages() as $language) {
-                        echo qtrans_insertDropDownElement($language, qtrans_convertURL($url, $language), $id);
+                        echo qtrans_insertDropDownElement($language, qtrans_convertURL($url, $language, false, true), $id);
                     }
                     // hide html language chooser text
@@ -74 +74 @@
                     if($language == $q_config['language'])
                         echo ' class="active"';
-                    echo '><a href="'.qtrans_convertURL($url, $language).'"';
+                    echo '><a href="'.qtrans_convertURL($url, $language, false, true).'"';
                     echo ' class="qtrans_flag_'.$language.' qtrans_flag_and_text" title="'.$q_config['language_name'][$language].'"';
                     echo '><span>'.$q_config['language_name'][$language].'</span></a></li>';

mqtranslate/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.9
 Tested up to: 4.1
-Stable tag: 2.9
+Stable tag: 2.9.1
 Donate Link: http://www.xhaleera.com/
 License: GPLv2
@@ -78 +78 @@
 == Changelog ==
 
+2.9.1:
+
+- Improved activation process in case qTranslate or another fork is already active
+- Added client-side cookie to memorize language selection
+- Added optimization settings section (first setting allows disabling the filtering of all WordPress options)
+- Fixed potential bug with ACF additional wysiwyg fields (thanks to Fabien MOTTA from com1fruit.com)
+
 2.9: