From ef075ea270ee4e71342dcc6576c72357e3f7151c Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Thu, 9 Oct 2014 09:45:21 +0200 Subject: [PATCH 1/4] Translated using Weblate (German) Currently translated at 99.5% (2756 of 2768 strings) [CI skip] --- po/de.po | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index 891f7c1cd5..ae94911882 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-10-09 02:20+0200\n" +"PO-Revision-Date: 2014-10-09 09:45+0200\n" "Last-Translator: Michael Koch \n" "Language-Team: German " "\n" @@ -6336,13 +6336,11 @@ msgid "Maximal number of table preferences to store" msgstr "Maximale Anzahl der zu speichernden Tabelleneinstellungen" #: libraries/config/messages.inc.php:613 -#, fuzzy #| msgid "See slave status table" msgid "QBE saved searches table" -msgstr "Die Slave Statustabelle sehen" +msgstr "Beispielabfragentabelle" #: libraries/config/messages.inc.php:615 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/" #| "kbd]" @@ -6350,8 +6348,8 @@ msgid "" "Leave blank for no QBE saved searches support, suggested: [kbd]" "pma__savedsearches[/kbd]." msgstr "" -"Leer lassen für keine PDF-Schema-Unterstützung, Vorschlag: [kbd]" -"pma__pdf_pages[/kbd]" +"Leer lassen um keine Beispielabfragen nutzen zu können, Vorschlag: " +"[kbd]pma__savedsearches[/kbd]." #: libraries/config/messages.inc.php:619 #| msgid "Try to connect without password" @@ -6634,6 +6632,9 @@ msgid "" "configurable menus feature; leaving either one of them blank will disable " "this feature, suggested: [kbd]pma__users[/kbd]." msgstr "" +"Sowohl diese Tabelle als auch die Nutzergruppentabelle sind nötig um " +"konfigurierbare Menüs zu nutzen; wenn eines von beiden leer gelassen wird " +"wird dieses Feature deaktiviert, Vorschlag: [kbd]pma__users[/kbd]." #: libraries/config/messages.inc.php:710 msgid "Users table" @@ -6645,13 +6646,15 @@ msgid "" "menus feature; leaving either one of them blank will disable this feature, " "suggested: [kbd]pma__usergroups[/kbd]." msgstr "" +"Sowohl diese Tabelle als auch die Nutzergruppentabelle sind nötig um " +"konfigurierbare Menüs zu nutzen; wenn eines von beiden leer gelassen wird " +"wird dieses Feature deaktiviert, Vorschlag: [kbd]pma__usergroups[/kbd]." #: libraries/config/messages.inc.php:712 msgid "User groups table" msgstr "Benutzergruppen-Tabelle" #: libraries/config/messages.inc.php:713 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma__userconfig[/kbd]" @@ -6659,8 +6662,8 @@ msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]." msgstr "" -"Leer lassen, um die Benutzereinstellungen nicht in der Datenbank zu " -"speichern, Vorschlag: [kbd]pma__userconfig[/kbd]" +"Leer lassen, um die Navigation anzuzeigen oder zu verstecken, Vorschlag: " +"[kbd]pma__userconfig[/kbd]." #: libraries/config/messages.inc.php:714 msgid "Hidden navigation items table" @@ -9114,10 +9117,9 @@ msgid "Constraints for table" msgstr "Constraints der Tabelle" #: libraries/plugins/export/ExportSql.class.php:1279 -#, fuzzy #| msgid "Constraints for dumped tables" msgid "Indexes for dumped tables" -msgstr "Constraints der exportierten Tabellen" +msgstr "Indizes der exportierten Tabellen" #: libraries/plugins/export/ExportSql.class.php:1289 #| msgid "Inside tables:" @@ -9125,10 +9127,9 @@ msgid "Indexes for table" msgstr "Indizes für die Tabelle" #: libraries/plugins/export/ExportSql.class.php:1315 -#, fuzzy #| msgid "Do not use AUTO_INCREMENT for zero values" msgid "AUTO_INCREMENT for dumped tables" -msgstr "AUTO_INCREMENT nicht für Nullwerte verwenden" +msgstr "AUTO_INCREMENT für exportierte Tabellen" #: libraries/plugins/export/ExportSql.class.php:1325 #| msgid "Add AUTO_INCREMENT value" @@ -9533,7 +9534,7 @@ msgstr "Navigations-Elemente aus-/einblenden" #: libraries/relation.lib.php:291 msgid "Saving Query-By-Example searches" -msgstr "" +msgstr "Suchen als Beispielabfragen speichern" #: libraries/relation.lib.php:297 msgid "Quick steps to setup advanced features:" @@ -12726,7 +12727,7 @@ msgstr "Zeitleiste" #: libraries/tbl_chart.lib.php:64 msgctxt "Chart type" msgid "Scatter" -msgstr "" +msgstr "Punkte" #: libraries/tbl_chart.lib.php:82 msgid "Stacked" @@ -13719,10 +13720,10 @@ msgid "Description" msgstr "Beschreibung" #: url.php:31 -#, fuzzy, php-format +#, php-format #| msgid "Tracking report" msgid "Taking you to %s." -msgstr "Verfolgungs-Bericht" +msgstr "Führt sie zu %s." #: user_password.php:29 msgid "You don't have sufficient privileges to be here right now!" From d275e429c4527c7583379fda56fbeb18c608b481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=20=ED=98=95=EC=A7=84?= Date: Fri, 10 Oct 2014 07:47:24 +0200 Subject: [PATCH 2/4] Translated using Weblate (Korean) Currently translated at 84.9% (2352 of 2768 strings) [CI skip] --- po/ko.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index c7d2c3f5a0..94c84fd915 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,9 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-09-24 15:04+0200\n" -"Last-Translator: Dong-bum Kim \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2014-10-10 07:47+0200\n" +"Last-Translator: 이 형진 \n" +"Language-Team: Korean " +"\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1835,6 +1836,8 @@ msgid "" "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.
- Control+Click to remove column from ORDER BY clause" msgstr "" +"Shift+Click 으로 ORDER BY 절에 이 컬럼을 추가하거나 내림차순/오름차순 토글
- Control+Click 으로 " +"ORDER BY 절로부터 이 컬럼 제거" #: js/messages.php:346 msgid "Click to mark/unmark." From 4fb60125fba90a4da3f116314f21f4a17d2787f3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Oct 2014 07:49:52 -0400 Subject: [PATCH 3/4] 4.2.11-dev Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7eedad5e20..18fd9667d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.11.0 (not yet released) + 4.2.10.0 (not yet released) - bug #4361 Can't change font size (when config.inc.php not present) - bug #4542 Tab key in column name not shown diff --git a/README b/README index 16267d601f..2233e54b76 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.10-dev +Version 4.2.11-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index b308f0078f..cf10d02cc6 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.2.10-dev' +version = '4.2.11-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d06bba8585..6ed4046c35 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.2.10-dev'); + $this->set('PMA_VERSION', '4.2.11-dev'); /** * @deprecated */ From e8c57794cd4f62858c8a653550fd7f5f4f8253e6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 11 Oct 2014 07:51:11 -0400 Subject: [PATCH 4/4] 4.2.11-dev Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5e5fa85819..a9e7a974ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ phpMyAdmin - ChangeLog - bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries + rfe #1535 Keyword-based autocompletion in SQL query editors +4.2.11.0 (not yet released) + 4.2.10.0 (not yet released) - bug #4361 Can't change font size (when config.inc.php not present) - bug #4542 Tab key in column name not shown