Fix merge conflict

phpmyadmin · May 17, 2013 · 51b7426 · 51b7426
2 parents 78e5e4d + dd07a4a
commit 51b7426
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 + rfe #1412 Creating a view from an empty set of results
 + Improved layout on db and table operations pages
 + rfe #1410 Added support for AES_ENCRYPT for blob fields
++ rfe #1423 Clarify option text for icon/text settings
 
 4.0.2.0 (not yet released)
 - bug #3902 Cannot browse when table name contains keyword "call"

diff --git a/libraries/config.values.php b/libraries/config.values.php
@@ -46,8 +46,8 @@
 $cfg_db['NavigationTreeDbSeparator'] = 'short_string';
 $cfg_db['NavigationTreeTableSeparator'] = 'short_string';
 $cfg_db['NavigationBarIconic'] = array(
-    true   => __('Yes'),
-    false  => __('No'),
+    true   => __('Icons'),
+    false  => __('Text'),
     'both' => __('Both')
 );
 $cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
@@ -61,8 +61,8 @@
 $cfg_db['DefaultDisplay'] = array('horizontal', 'vertical', 'horizontalflipped');
 $cfg_db['CharEditing'] = array('input', 'textarea');
 $cfg_db['PropertiesIconic'] = array(
-    true   => __('Yes'),
-    false  => __('No'),
+    true   => __('Icons'),
+    false  => __('Text'),
     'both' => __('Both')
 );
 $cfg_db['GridEditing'] = array(