From cd6de027a449b9ca6bd9837891457268de95907b Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Tue, 2 Jun 2015 21:45:12 +0200 Subject: [PATCH 1/3] Translated using Weblate (Slovak) Currently translated at 84.1% (2555 of 3035 strings) [CI skip] --- po/sk.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/sk.po b/po/sk.po index e0e09db5a5..52e90fcf1c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-05-30 21:58+0200\n" -"Last-Translator: Patrik Kollmann \n" +"PO-Revision-Date: 2015-06-02 21:45+0200\n" +"Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" "Language: sk\n" @@ -2866,7 +2866,7 @@ msgstr "zdieľaný" #: libraries/Console.class.php:116 #, php-format msgid "%1$s, %2$s and %3$s bookmarks included" -msgstr "" +msgstr "Zahrnuté záložky %1$s, %2$s a %3$s" #: libraries/Console.class.php:122 msgid "No bookmarks" @@ -6378,7 +6378,6 @@ msgid "Minimum number of databases to display the database filter box" msgstr "Minimálny počet databáz pre zobrazenie filtra databáz" #: libraries/config/messages.inc.php:456 -#, fuzzy #| msgid "" #| "Group items in the navigation tree (determined by the separator defined " #| "below)." @@ -6386,8 +6385,8 @@ msgid "" "Group items in the navigation tree (determined by the separator defined in " "the Databases and Tables tabs above)." msgstr "" -"Zoskupovať položky v navigačnom paneli (určené oddeľovačom nastaveným " -"nižšie)." +"Zoskupovať položky v navigačnom paneli (určené oddeľovačom nastaveným v " +"záložke Databázy a tabuľky vyššie)." #: libraries/config/messages.inc.php:458 msgid "Group items in the tree" From 9014e10c7756204ac6581f4f9b839a9ebcd09bda Mon Sep 17 00:00:00 2001 From: Domen Date: Wed, 3 Jun 2015 20:58:56 +0200 Subject: [PATCH 2/3] Translated using Weblate (Slovenian) Currently translated at 99.9% (3033 of 3035 strings) [CI skip] --- po/sl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9f01ece177..25af358a7b 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-05-05 15:46-0400\n" -"PO-Revision-Date: 2015-05-27 22:44+0200\n" +"PO-Revision-Date: 2015-06-03 20:58+0200\n" "Last-Translator: Domen \n" "Language-Team: Slovenian " "\n" @@ -11272,12 +11272,12 @@ msgstr "Oprostite, zavržene rutine nam ni uspelo obnoviti." #: libraries/rte/rte_routines.lib.php:345 #, php-format msgid "Routine %1$s has been modified." -msgstr "Rutina %1$s je bila spremenjena." +msgstr "Rutino %1$s smo spremenili." #: libraries/rte/rte_routines.lib.php:366 #, php-format msgid "Routine %1$s has been created." -msgstr "Rutina %1$s je bila ustvarjena." +msgstr "Rutino %1$s smo ustvarili." #: libraries/rte/rte_routines.lib.php:451 msgid "Edit routine" From 715cde85b48c9a8745fb83106cb255313a8c8a83 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 4 Jun 2015 13:03:59 -0400 Subject: [PATCH 3/3] 4.4.10-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e45e4f02b7..fbf4c21bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.4.9.0 (not yet released) +4.4.10.0 (not yet released) + +4.4.9.0 (2015-06-04) - bug #4920 relation view doesn't list fields of table in other database - bug #4905 Sorting by an alias - bug #4931 False error before entering reCAPTCHA diff --git a/README b/README index 996a31b232..681fa0f98a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.9-dev +Version 4.4.10-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 740ff66e6e..6fd6498932 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.4.9-dev' +version = '4.4.10-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8a7a6a6d7f..741a6d6e35 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.9-dev'); + $this->set('PMA_VERSION', '4.4.10-dev'); /** * @deprecated */