From 23494011be7a05cd827d810d93b17abd61b59f94 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 1 Jan 2015 15:17:29 +0100 Subject: [PATCH 1/3] Translated using Weblate (French) Currently translated at 100.0% (2982 of 2982 strings) [CI skip] --- po/fr.po | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0e61aaa5aa..98176cff05 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-01 13:55+0200\n" +"PO-Revision-Date: 2015-01-01 15:17+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -9254,7 +9254,7 @@ msgstr "" "qu'une colonne." #: libraries/normalization.lib.php:381 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above partial dependencies, in order to put the original table " #| "'%1$s' into Second normal form we need to create the following tables:" @@ -9262,9 +9262,8 @@ msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "" -"Conformément aux dépendances partielles ci-dessus, afin de transformer la " -"table d'origine «%1$s» en deuxième forme normale nous avons besoin de créer " -"les tables suivantes :" +"Afin de transformer la table d'origine «%1$s» en deuxième forme normale nous " +"avons besoin de créer les tables suivantes :" #: libraries/normalization.lib.php:417 #, php-format @@ -9278,7 +9277,7 @@ msgid "Error in processing!" msgstr "Erreur de traitement !" #: libraries/normalization.lib.php:501 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above dependencies, in order to put the original table '%1$s' into " #| "Third normal form we need to create the following tables:" @@ -9286,9 +9285,8 @@ msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "" -"Conformément aux dépendances ci-dessus, nous avons besoin de créer les " -"tables suivantes afin de transformer la table d'origine «%1$s» en troisième " -"forme normale :" +"Afin de transformer la table d'origine «%1$s» en troisième forme normale, " +"nous avons besoin de créer les tables suivantes :" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." From c69cf0b74dcc3f88aab0f9149768e420807d254c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 1 Jan 2015 10:42:44 -0500 Subject: [PATCH 2/3] Based on http://stackoverflow.com/questions/766809/whats-the-difference-between-utf8-general-ci-and-utf8-unicode-ci, changed the default connection collation to improve sort accuracy. Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/config.default.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a5198295b7..83596b6e87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4679 Setup does not allow providing a name for favorites table - bug #4680 Number of favorite table are not configurable in setup - bug #4681 'Central columns table' field in setup does not have a description +- bug #4318 Default connection collation and sorting --- Older ChangeLogs can be found on our project website --- http://www.phpmyadmin.net/old-stuff/ChangeLogs/ diff --git a/libraries/config.default.php b/libraries/config.default.php index e4f38be69a..47a5288b38 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2417,7 +2417,7 @@ $cfg['DefaultLang'] = 'en'; * * @global string $cfg['DefaultConnectionCollation'] */ -$cfg['DefaultConnectionCollation'] = 'utf8_general_ci'; +$cfg['DefaultConnectionCollation'] = 'utf8_unicode_ci'; /** * Force: always use this language From ca6bc114f316c2db4e6a4a054b56d737e1c5d058 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Thu, 1 Jan 2015 16:38:44 +0100 Subject: [PATCH 3/3] Translated using Weblate (Slovak) Currently translated at 73.6% (2195 of 2979 strings) [CI skip] --- po/sk.po | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/po/sk.po b/po/sk.po index 0655f5b824..ee1d1806bf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2014-12-31 08:54+0200\n" +"PO-Revision-Date: 2015-01-01 16:38+0200\n" "Last-Translator: Martin Lacina \n" -"Language-Team: Slovak \n" +"Language-Team: Slovak " +"\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5123,7 +5123,6 @@ msgid "Allow login to any MySQL server" msgstr "Povoliť prihlásenie k ľubovoľnému MySQL serveru" #: libraries/config/messages.inc.php:21 -#, fuzzy #| msgid "" #| "Enabling this allows a page located on a different domain to call " #| "phpMyAdmin inside a frame, and is a potential [strong]security hole[/" @@ -5134,8 +5133,8 @@ msgid "" "cross-frame scripting (XSS) attacks." msgstr "" "Povolením tejto možnosti umožníte stránke umiestnenej na inej doméne zavolať " -"phpMyAdmina vo vnútri rámca a je potenciálnou [strong]bezpečnostnou dierou[/" -"strong] dovoľujúcou XFS (cross-frame scripting) útoky" +"phpMyAdmina vo vnútri rámca a je potenciálnou [strong]bezpečnostnou " +"dierou[/strong] dovoľujúcou XSS (cross-frame scripting) útoky." #: libraries/config/messages.inc.php:25 msgid "Allow third party framing" @@ -5606,18 +5605,16 @@ msgid "Browse mode" msgstr "Režim prezerania" #: libraries/config/messages.inc.php:205 -#, fuzzy #| msgid "Customize browse mode" msgid "Customize browse mode." -msgstr "Prispôsobiť režim prezerania" +msgstr "Prispôsobiť režim prezerania." #: libraries/config/messages.inc.php:207 libraries/config/messages.inc.php:209 #: libraries/config/messages.inc.php:227 libraries/config/messages.inc.php:238 #: libraries/config/messages.inc.php:240 libraries/config/messages.inc.php:286 -#, fuzzy #| msgid "Customize default options" msgid "Customize default options." -msgstr "Prispôsobenie východzích nastavení" +msgstr "Prispôsobenie východzích nastavení." #: libraries/config/messages.inc.php:208 libraries/config/setup.forms.php:247 #: libraries/config/setup.forms.php:324 @@ -5631,30 +5628,27 @@ msgid "Developer" msgstr "Vývojár" #: libraries/config/messages.inc.php:211 -#, fuzzy #| msgid "Settings for phpMyAdmin developers" msgid "Settings for phpMyAdmin developers." -msgstr "Nastavenia pre vývojára phpMyAdmina" +msgstr "Nastavenia pre vývojárov phpMyAdmina." #: libraries/config/messages.inc.php:212 msgid "Edit mode" msgstr "Režim úprav" #: libraries/config/messages.inc.php:213 -#, fuzzy #| msgid "Customize edit mode" msgid "Customize edit mode." -msgstr "Prispôsobenie režimu úprav" +msgstr "Prispôsobenie režimu úprav." #: libraries/config/messages.inc.php:215 msgid "Export defaults" msgstr "Východzie nastavenia exportu" #: libraries/config/messages.inc.php:216 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default export options." -msgstr "Prispôsobiť východzie nastavenia exportu" +msgstr "Prispôsobiť východzie nastavenia exportu." #: libraries/config/messages.inc.php:217 libraries/config/messages.inc.php:278 #: setup/frames/menu.inc.php:22 @@ -5666,40 +5660,36 @@ msgid "General" msgstr "Všeobecné" #: libraries/config/messages.inc.php:219 -#, fuzzy #| msgid "Set some commonly used options" msgid "Set some commonly used options." -msgstr "Nastaviť zvyčajne používané nastavenia" +msgstr "Nastaviť často používané nastavenia." #: libraries/config/messages.inc.php:221 msgid "Import defaults" msgstr "Východzie nastavenia importu" #: libraries/config/messages.inc.php:222 -#, fuzzy #| msgid "Customize default common import options" msgid "Customize default common import options." -msgstr "Prispôsobiť východzie nastavenia importu" +msgstr "Prispôsobiť východzie nastavenia importu." #: libraries/config/messages.inc.php:223 msgid "Import / export" msgstr "Import / export" #: libraries/config/messages.inc.php:225 -#, fuzzy #| msgid "Set import and export directories and compression options" msgid "Set import and export directories and compression options." -msgstr "Nastaví adresáre pre import a export a voľby kompresie" +msgstr "Nastaví adresáre pre import a export a voľby kompresie." #: libraries/config/messages.inc.php:226 msgid "LaTeX" msgstr "LaTeX" #: libraries/config/messages.inc.php:229 -#, fuzzy #| msgid "Databases display options" msgid "Databases display options." -msgstr "Nastavenia zobrazenia databáz" +msgstr "Nastavenia zobrazenia databáz." #: libraries/config/messages.inc.php:230 setup/frames/menu.inc.php:24 msgid "Navigation panel"