From 2b21dc28dc926756677b6202d3460c3a195460c4 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 15 Jan 2014 22:23:10 +0100 Subject: [PATCH 1/4] Translated using Weblate (Greek) Currently translated at 100.0% (2749 of 2749) --- po/el.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/el.po b/po/el.po index 5d44ca2fc8..b3c7915d4a 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-15 08:42-0500\n" -"PO-Revision-Date: 2013-12-30 18:49+0200\n" +"PO-Revision-Date: 2014-01-15 22:23+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -1579,7 +1579,7 @@ msgstr "Φόρτωση…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "Το Αίτημα Διακόπηκε!!" #: js/messages.php:231 msgid "Processing Request" @@ -4475,7 +4475,6 @@ msgid "Highlight pointer" msgstr "Δείκτης επισήμανσης" #: libraries/config/messages.inc.php:28 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import and export operations" @@ -4484,7 +4483,7 @@ msgid "" "import operations" msgstr "" "Ενεργοποίηση της συμπίεσης [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] " -"για λειτουργίες εισαγωγής και εξαγωγής" +"για λειτουργίες εισαγωγής" #: libraries/config/messages.inc.php:29 msgid "Bzip2" @@ -4560,7 +4559,6 @@ msgid "Check config file permissions" msgstr "Ελέξτε τα δικαιώματα του αρχείου ρυθμίσεων" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "" #| "Compress gzip/bzip2 exports on the fly without the need for much memory; " #| "if you encounter problems with created gzip/bzip2 files disable this " @@ -4569,9 +4567,9 @@ msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature" msgstr "" -"Η συμπίεση gzip/bzip2 εξάγει άμεσα χωρίς την ανάγκη για πολύ μνήμη, για αυτό " -"αν παρουσιάστηκαν προβλήματα με τα δημιουργηθέντα αρχεία gzip/bzip2 " -"απενεργοποιήστε αυτό το χαρακτηριστικό" +"Η συμπίεση gzip εξάγει άμεσα χωρίς την ανάγκη για πολύ μνήμη, για αυτό αν " +"παρουσιάστηκαν προβλήματα με τα δημιουργηθέντα αρχεία gzip απενεργοποιήστε " +"αυτό το χαρακτηριστικό" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" From b2e1bd230603660634ef78df441ca4fa0f7fc7a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Thu, 16 Jan 2014 15:38:35 +0100 Subject: [PATCH 2/4] Translated using Weblate (Spanish) Currently translated at 100.0% (2749 of 2749) --- po/es.po | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/po/es.po b/po/es.po index 841d5cdede..11c3017f4b 100644 --- a/po/es.po +++ b/po/es.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-15 08:42-0500\n" -"PO-Revision-Date: 2013-12-27 21:02+0200\n" +"PO-Revision-Date: 2014-01-16 15:38+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -1582,7 +1582,7 @@ msgstr "Cargando…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "¡Pedido cancelado!" #: js/messages.php:231 msgid "Processing Request" @@ -4501,7 +4501,6 @@ msgid "Highlight pointer" msgstr "Resaltar puntero" #: libraries/config/messages.inc.php:28 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import and export operations" @@ -4510,7 +4509,7 @@ msgid "" "import operations" msgstr "" "Habilitar la compresión [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] para " -"las operaciones de importación y exportación" +"las operaciones de importación" #: libraries/config/messages.inc.php:29 msgid "Bzip2" @@ -4585,7 +4584,6 @@ msgid "Check config file permissions" msgstr "Revise los permisos en el archivo de configuración" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "" #| "Compress gzip/bzip2 exports on the fly without the need for much memory; " #| "if you encounter problems with created gzip/bzip2 files disable this " @@ -4594,9 +4592,9 @@ msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature" msgstr "" -"Comprima archivos exportados con gzip/bzip2 sobre la marcha sin necesidad de " -"mucha memoria; si halla problemas con archivos comprimidos con gzip/bzip2 " -"deshabilite esta opción" +"Comprima archivos exportados con gzip sobre la marcha sin necesidad de mucha " +"memoria; si halla problemas con archivos comprimidos con gzip deshabilite " +"esta opción" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" From a5b2314bf9341fed715ea918ef635d11189106b4 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 17 Jan 2014 08:14:41 -0500 Subject: [PATCH 3/4] 4.1.6-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 4ddba45eec..4fac09eabc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.1.5.0 (not yet released) +4.1.6.0 (not yet released) + +4.1.5.0 (2014-01-17) - bug #3780 Allow aborting loading pages - bug #4223 Database list: Create database misses collation column - bug #4224 Empty table names when a table is "inuse" diff --git a/README b/README index 615a94c554..e6427484d8 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.1.5-dev +Version 4.1.6-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 0f5614a9f9..adce81ea3c 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.1.5-dev' +version = '4.1.6-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 361495819a..46da6c871e 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.1.5-dev'); + $this->set('PMA_VERSION', '4.1.6-dev'); /** * @deprecated */ From 8d2b2ce89456e57da65d88ace6539849c2b6ecc1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 17 Jan 2014 08:15:51 -0500 Subject: [PATCH 4/4] 4.1.6-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2a704e0373..70487fdf29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,9 @@ phpMyAdmin - ChangeLog + rfe #1479 Relations edit form for larger monitors + rfe #1475 Inline query box vertical resize -4.1.5.0 (not yet released) +4.1.6.0 (not yet released) + +4.1.5.0 (2014-01-17) - bug #3780 Allow aborting loading pages - bug #4223 Database list: Create database misses collation column - bug #4224 Empty table names when a table is "inuse"