From ae976ff6c051d1c50883f9038cf270045d3af83f Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Wed, 5 Jun 2013 13:39:16 +0200 Subject: [PATCH 1/2] Translated using Weblate (Dutch) Currently translated at 100.0% (2603 of 2603) --- po/nl.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index feb38a39e3..13be7deca1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-05-25 13:57+0200\n" +"PO-Revision-Date: 2013-06-05 13:39+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.6-dev\n" @@ -9886,7 +9886,6 @@ msgid "After %s" msgstr "Na %s" #: libraries/structure.lib.php:1670 -#, fuzzy #| msgid "Row Statistics" msgid "Row statistics" msgstr "Rijstatistieken" From eb12fe41a7e7a98b6a76d20978b06b7fa5507e0f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 6 Jun 2013 08:47:59 -0400 Subject: [PATCH 2/2] bug #3960 NavigationBarIconic config not honored --- ChangeLog | 1 + doc/config.rst | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52a087075e..c3552b12a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #3961 Avoid Suhosin warning when in simulation mode - bug #3897 Row Statistics and Space usage bugs - bug #3966 Only display "table has no unique column" message when applicable +- bug #3960 NavigationBarIconic config not honored 4.0.3.0 (2013-06-05) - bug #3941 Recent tables list always empty diff --git a/doc/config.rst b/doc/config.rst index af97c493b8..2b9ced27b8 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1486,9 +1486,9 @@ Browse mode :type: string :default: true - Defines whether navigation bar buttons and the right panel top menu - contain text or symbols only. A value of true displays icons, false - displays text and 'both' displays both icons and text. + Defines whether navigation bar buttons contain text or symbols only. A + value of true displays icons, false displays text and 'both' displays + both icons and text. .. config:option:: $cfg['ShowAll'] @@ -1679,8 +1679,8 @@ Tabs display settings If set to ``true``, will display icons instead of text for db and table properties links (like :guilabel:`Browse`, :guilabel:`Select`, - :guilabel:`Insert`, ...). Can be set to ``'both'`` if you want icons AND - text. When set to ``false``, will only show text. + :guilabel:`Insert`, ...) and for the menu tabs. Can be set to ``'both'`` + if you want icons AND text. When set to ``false``, will only show text. .. config:option:: $cfg['PropertiesNumColumns']