← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phpmyadmin/trusty-proposed

« back to all changes in this revision

Viewing changes to libraries/config/messages.inc.php

  • Committer: Package Import Robot
  • Author(s): Michal Čihař, Thijs Kinkhorst, Michal Čihař
  • Date: 2013-06-05 13:20:57 UTC
  • mfrom: (1.2.41)
  • Revision ID: package-import@ubuntu.com-20130605132057-b72idv8ayo5v5h29
Tags: 4:4.0.3-1
http://bugs.debian.org/711027
http://bugs.debian.org/710087
[ Thijs Kinkhorst ]
* Explicitly depend on php5-json (closes: #711027).

[ Michal Čihař ]
* Fixed wrong path in postinst script (Closes: #710087).
* New upstream release.
  - Fixes XSS issue PMASA-2013-6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/config/messages.inc.php
183
183
$strConfigForm_Main_panel = __('Main panel');
184
184
$strConfigForm_Microsoft_Office = __('Microsoft Office');
185
185
$strConfigForm_Microsoft_Office_desc = __('Customize default options');
186
 
$strConfigForm_Open_Document = __('Open Document');
 
186
$strConfigForm_Open_Document = 'OpenDocument';
187
187
$strConfigForm_Open_Document_desc = __('Customize default options');
188
188
$strConfigForm_Other_core_settings = __('Other core settings');
189
189
$strConfigForm_Other_core_settings_desc = __('Settings that didn\'t fit anywhere else');
386
386
$strConfigServers_controluser_name = __('Control user');
387
387
$strConfigServers_controlhost_desc = __('An alternate host to hold the configuration storage; leave blank to use the already defined host');
388
388
$strConfigServers_controlhost_name = __('Control host');
389
 
$strConfigServers_CountTables_desc = __('Count tables when showing database list');
390
 
$strConfigServers_CountTables_name = __('Count tables');
391
389
$strConfigServers_designer_coords_desc = __('Leave blank for no Designer support, suggested: [kbd]pma__designer_coords[/kbd]');
392
390
$strConfigServers_designer_coords_name = __('Designer table');
393
391
$strConfigServers_DisableIS_desc = __('More information on [a@https://sourceforge.net/p/phpmyadmin/bugs/2606/]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]');