From e75e67cf34f47b0fe0514131dfde645074cc716a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 18 Nov 2016 10:33:54 +0000 Subject: [PATCH 1/3] Translated using Weblate (Swedish) Currently translated at 97.6% (3147 of 3222 strings) [CI skip] --- po/sv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/sv.po b/po/sv.po index a50e451f15..54f8cd43e9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:39+0100\n" -"PO-Revision-Date: 2016-10-18 20:28+0000\n" -"Last-Translator: Erik Sundin \n" -"Language-Team: Swedish \n" +"PO-Revision-Date: 2016-11-18 10:33+0000\n" +"Last-Translator: Michal Čihař \n" +"Language-Team: Swedish " +"\n" "Language: sv\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: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.10-dev\n" #: changelog.php:38 license.php:33 #, php-format @@ -2289,7 +2289,7 @@ msgid "" "ORDER BY clause" msgstr "" "Skift-klicka för att lägga till kolumnen i \"SORTERA VID\"-sats eller att " -"växla ASC/DESC.< br />-Ctrl-klicka eller Alt-klicka (Mac: Skift+Alt+klicka) " +"växla ASC/DESC.
-Ctrl-klicka eller Alt-klicka (Mac: Skift+Alt+klicka) " "för att ta bort kolumnen från SORTERA VID-instruktionen" #: js/messages.php:580 From 43134b79f5a71b9b5035a70f1feb311935c52aac Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 19 Nov 2016 12:34:52 +0000 Subject: [PATCH 2/3] Translated using Weblate (French) Currently translated at 99.3% (3210 of 3232 strings) [CI skip] --- po/fr.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5d77a69066..a458ca3d18 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-11-10 09:40+0100\n" -"PO-Revision-Date: 2016-11-16 13:27+0000\n" +"PO-Revision-Date: 2016-11-19 12:34+0000\n" "Last-Translator: Marc Delisle \n" "Language-Team: French " "\n" @@ -3942,12 +3942,11 @@ msgid "Language" msgstr "Langue" #: libraries/Linter.php:99 -#, fuzzy msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" -"L'indentation automatique et les commentaires sont désactivés pour cette " -"requête car elle dépasse la longueur maximum." +"Le peluchage est désactivé pour cette requête, car elle dépasse la longueur " +"maximale." #: libraries/Linter.php:165 #, php-format @@ -5001,7 +5000,6 @@ msgid "Attribute" msgstr "Attribut" #: libraries/central_columns.lib.php:709 libraries/central_columns.lib.php:1387 -#, fuzzy msgid "A_I" msgstr "Incrémentation automatique" @@ -7632,18 +7630,14 @@ msgid "Show last check timestamp" msgstr "Montrer la date de dernière vérification" #: libraries/config/messages.inc.php:858 -#, fuzzy -#| msgid "Show or hide a column displaying the comments for all tables." msgid "Show or hide a column displaying the charset for all tables." msgstr "" -"Montrer ou cacher une colonne affichant les commentaires pour toutes les " -"tables." +"Montrer ou cacher une colonne affichant le jeu de charactères pour toutes " +"les tables." #: libraries/config/messages.inc.php:860 -#, fuzzy -#| msgid "Show table comments" msgid "Show table charset" -msgstr "Montrer les commentaires de table" +msgstr "Montrer le jeu de caractères de la table" #: libraries/config/messages.inc.php:862 msgid "" From 5ae4fdfcff9cb48b341bd3b2848a93debd73c167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 21 Nov 2016 15:17:39 +0100 Subject: [PATCH 3/3] Update composer dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Especially switch from 0.x in our own libs to stable versions. Signed-off-by: Michal Čihař --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 5144b07cbd..2a039ea866 100644 --- a/composer.json +++ b/composer.json @@ -29,12 +29,12 @@ "php": ">=5.5.0", "ext-mbstring": "*", "ext-xml": "*", - "phpmyadmin/sql-parser": "~3.4", + "phpmyadmin/sql-parser": "^3.4", "phpmyadmin/motranslator": "^2.0", - "phpmyadmin/shapefile": "~0.1 || ~1.0", - "tecnickcom/tcpdf": "~6.2", - "phpseclib/phpseclib": "~2.0", - "google/recaptcha": "~1.1" + "phpmyadmin/shapefile": "^1.0", + "tecnickcom/tcpdf": "^6.2", + "phpseclib/phpseclib": "^2.0", + "google/recaptcha": "^1.1" }, "suggest": { "ext-zlib": "For gz import and export", @@ -44,7 +44,7 @@ "tecnickcom/tcpdf": "For PDF support" }, "require-dev": { - "satooshi/php-coveralls": "~0.6", + "satooshi/php-coveralls": "^1.0", "phpunit/phpunit": "~4.1", "codacy/coverage": "dev-master", "phpunit/phpunit-selenium": "~1.2",