May 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3292-gccd8da0
by Marc Delisle 14 May '10

14 May '10

The branch, master has been updated via ccd8da050198688febbc47bf918845d333cef1e1 (commit) from 25f7b894435f0565840f0397728ff5462b767735 (commit) - Log ----------------------------------------------------------------- commit ccd8da050198688febbc47bf918845d333cef1e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 14 13:34:25 2010 -0400 typo; wiki ref for translators ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4bf19ed..fc2af1f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4365,7 +4365,7 @@ chmod o+rwx tmp <a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?</a></h4> -<p> Always use latest Git versoin of po file to translate. You can optionally +<p> Always use latest Git version of po file to translate. You can optionally translate online at our <a href="http://l10n.cihar.com/">translation server</a> where you can also get latest po files and merge them with your translations. For creating new translation simply use @@ -4373,7 +4373,7 @@ chmod o+rwx tmp <code>po/LANG_CODE.po</code> for your language (you can use <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> to do this) or ask on mailing list to add the translation to the web - interface. + interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our wiki</a>.</p> </p> <p> Please note that we try not to use HTML entities like &eacute; in hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3291-g25f7b89
by Marc Delisle 14 May '10

14 May '10

The branch, master has been updated via 25f7b894435f0565840f0397728ff5462b767735 (commit) from 211299621773591d15ed16bfab93143aa24cab97 (commit) - Log ----------------------------------------------------------------- commit 25f7b894435f0565840f0397728ff5462b767735 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 14 12:43:23 2010 -0400 gettext conversion ----------------------------------------------------------------------- Summary of changes: setup/frames/config.inc.php | 4 ++-- setup/frames/index.inc.php | 36 ++++++++++++++++++------------------ setup/frames/menu.inc.php | 8 ++++---- setup/frames/servers.inc.php | 4 ++-- setup/lib/FormDisplay.tpl.php | 4 ++-- setup/lib/form_processing.lib.php | 2 +- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/setup/frames/config.inc.php b/setup/frames/config.inc.php index 22d8718..4e925d9 100644 --- a/setup/frames/config.inc.php +++ b/setup/frames/config.inc.php @@ -22,7 +22,7 @@ $config_writable = false; $config_exists = false; check_config_rw($config_readable, $config_writable, $config_exists); ?> -<h2><?php echo $GLOBALS['strSetupConfigurationFile'] ?></h2> +<h2><?php echo __('Configuration file') ?></h2> <?php display_form_top('config.php'); ?> <input type="hidden" name="eol" value="<?php echo htmlspecialchars(PMA_ifSetOr($_GET['eol'], 'unix')) ?>" /> <?php display_fieldset_top('', '', null, array('class' => 'simple')); ?> @@ -35,7 +35,7 @@ check_config_rw($config_readable, $config_writable, $config_exists); </tr> <tr> <td class="lastrow" style="text-align: left"> - <input type="submit" name="submit_download" value="<?php echo $GLOBALS['strSetupDownload'] ?>" class="green" /> + <input type="submit" name="submit_download" value="<?php echo __('Download') ?>" class="green" /> <input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> /> </td> </tr> diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 7e383f5..43b6574 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -55,7 +55,7 @@ if (!$config_writable || !$config_readable) { // $is_https = !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on'; if (!$is_https) { - $text = $GLOBALS['strSetupInsecureConnectionMsg1']; + $text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!'); if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) { $text .= ' ' . PMA_lang('InsecureConnectionMsg2', 'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'])); @@ -84,7 +84,7 @@ if (!$is_https) { </select> </form> -<h2><?php echo $GLOBALS['strSetupOverview'] ?></h2> +<h2><?php echo __('Overview') ?></h2> <?php // message handling @@ -92,7 +92,7 @@ messages_end(); messages_show_html(); ?> -<a href="#" id="show_hidden_messages" style="display:none"><?php echo $GLOBALS['strSetupShowHiddenMessages'] ?></a> +<a href="#" id="show_hidden_messages" style="display:none"><?php echo __('Show hidden messages (#MSG_COUNT)') ?></a> <h3><?php echo __('Servers') ?></h3> <?php @@ -132,7 +132,7 @@ display_form_top('index.php', 'get', array( <table width="100%"> <tr> <td> - <i><?php echo $GLOBALS['strSetupNoServers'] ?></i> + <i><?php echo __('There are no configured servers') ?></i> </td> </tr> </table> @@ -140,7 +140,7 @@ display_form_top('index.php', 'get', array( <table width="100%"> <tr> <td class="lastrow" style="text-align: left"> - <input type="submit" name="submit" value="<?php echo $GLOBALS['strSetupNewServer'] ?>" /> + <input type="submit" name="submit" value="<?php echo __('New server') ?>" /> </td> </tr> </table> @@ -149,7 +149,7 @@ display_form_top('index.php', 'get', array( display_form_bottom(); ?> -<h3><?php echo $GLOBALS['strSetupConfigurationFile'] ?></h3> +<h3><?php echo __('Configuration file') ?></h3> <?php // // Display config file settings and load/save form @@ -169,7 +169,7 @@ foreach ($all_languages as $each_lang_key => $each_lang) { $lang_name = PMA_langName($each_lang); $opts['values'][$each_lang_key] = $lang_name; } -display_input('DefaultLang', $GLOBALS['strSetupDefaultLanguage'], '', 'select', +display_input('DefaultLang', __('Default language'), '', 'select', $cf->getValue('DefaultLang'), true, $opts); // Display server list @@ -179,7 +179,7 @@ $opts = array( 'values' => array(), 'values_disabled' => array()); if ($cf->getServerCount() > 0) { - $opts['values']['0'] = $GLOBALS['strSetupLetUserChoose']; + $opts['values']['0'] = __('let the user choose'); $opts['values']['-'] = '------------------------------'; if ($cf->getServerCount() == 1) { $opts['values_disabled'][] = '0'; @@ -190,10 +190,10 @@ if ($cf->getServerCount() > 0) { $opts['values'][(string)$id] = $cf->getServerName($id) . " [$id]"; } } else { - $opts['values']['1'] = $GLOBALS['strSetupOptionNone']; + $opts['values']['1'] = __('- none -'); $opts['values_escaped'] = true; } -display_input('ServerDefault', $GLOBALS['strSetupDefaultServer'], '', 'select', +display_input('ServerDefault', __('Default server'), '', 'select', $cf->getValue('ServerDefault'), true, $opts); // Display EOL list @@ -203,19 +203,19 @@ $opts = array( 'win' => 'Windows (\r\n)'), 'values_escaped' => true); $eol = PMA_ifSetOr($_SESSION['eol'], (PMA_IS_WINDOWS ? 'win' : 'unix')); -display_input('eol', $GLOBALS['strSetupEndOfLine'], '', 'select', +display_input('eol', __('End of line'), '', 'select', $eol, true, $opts); ?> <tr> <td colspan="2" class="lastrow" style="text-align: left"> - <input type="submit" name="submit_display" value="<?php echo $GLOBALS['strSetupDisplay'] ?>" /> - <input type="submit" name="submit_download" value="<?php echo $GLOBALS['strSetupDownload'] ?>" /> + <input type="submit" name="submit_display" value="<?php echo __('Display') ?>" /> + <input type="submit" name="submit_download" value="<?php echo __('Download') ?>" />     <input type="submit" name="submit_save" value="<?php echo __('Save') ?>"<?php if (!$config_writable) echo ' disabled="disabled"' ?> /> - <input type="submit" name="submit_load" value="<?php echo $GLOBALS['strSetupLoad'] ?>"<?php if (!$config_exists) echo ' disabled="disabled"' ?> /> + <input type="submit" name="submit_load" value="<?php echo __('Load') ?>"<?php if (!$config_exists) echo ' disabled="disabled"' ?> /> <input type="submit" name="submit_delete" value="<?php echo __('Delete') ?>"<?php if (!$config_exists || !$config_writable) echo ' disabled="disabled"' ?> />     - <input type="submit" name="submit_clear" value="<?php echo $GLOBALS['strSetupClear'] ?>" class="red" /> + <input type="submit" name="submit_clear" value="<?php echo __('Clear') ?>" class="red" /> </td> </tr> <?php @@ -223,7 +223,7 @@ display_fieldset_bottom_simple(); display_form_bottom(); ?> <div id="footer"> - <a href="http://phpmyadmin.net"><?php echo $GLOBALS['strSetupHomepageLink'] ?></a> - <a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php echo $GLOBALS['strSetupDonateLink'] ?></a> - <a href="?version_check=1<?php echo "{$separator}token=" . $_SESSION[' PMA_token '] ?>"><?php echo $GLOBALS['strSetupVersionCheckLink'] ?></a> + <a href="http://phpmyadmin.net"><?php echo __('phpMyAdmin homepage') ?></a> + <a href="http://sourceforge.net/donate/index.php?group_id=23067"><?php echo __('Donate') ?></a> + <a href="?version_check=1<?php echo "{$separator}token=" . $_SESSION[' PMA_token '] ?>"><?php echo __('Check for latest version') ?></a> </div> diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php index c72adc7..1da3851 100644 --- a/setup/frames/menu.inc.php +++ b/setup/frames/menu.inc.php @@ -14,10 +14,10 @@ if (!defined('PHPMYADMIN')) { $separator = PMA_get_arg_separator('html'); ?> <ul> - <li><a href="index.php"><?php echo $GLOBALS['strSetupOverview'] ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo $GLOBALS['strSetupFormset_features'] ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo $GLOBALS['strSetupForm_Left_frame'] ?></a></li> - <li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo $GLOBALS['strSetupForm_Main_frame'] ?></a></li> + <li><a href="index.php"><?php echo __('Overview') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo __('Features') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo __('Navigation frame') ?></a></li> + <li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo __('Main frame') ?></a></li> <li><a href="?page=form<?php echo $separator ?>formset=import"><?php echo __('Import') ?></a></li> <li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li> </ul> diff --git a/setup/frames/servers.inc.php b/setup/frames/servers.inc.php index ee5b2af..17ff2f9 100644 --- a/setup/frames/servers.inc.php +++ b/setup/frames/servers.inc.php @@ -25,7 +25,7 @@ $cf = ConfigFile::getInstance(); $server_exists = !empty($id) && $cf->get("Servers/$id") !== null; if ($mode == 'edit' && $server_exists) { - $page_title = $GLOBALS['strSetupServersEdit'] + $page_title = __('Edit server') . ' ' . $id . ' <small>(' . $cf->getServerDSN($id) . ')</small>'; } elseif ($mode == 'remove' && $server_exists) { $cf->removeServer($id); @@ -34,7 +34,7 @@ if ($mode == 'edit' && $server_exists) { } elseif ($mode == 'revert' && $server_exists) { // handled by process_formset() } else { - $page_title = $GLOBALS['strSetupServersAdd']; + $page_title = __('Add a new server'); $id = 0; } if (isset($page_title)) { diff --git a/setup/lib/FormDisplay.tpl.php b/setup/lib/FormDisplay.tpl.php index b5e512d..f6cb5a5 100644 --- a/setup/lib/FormDisplay.tpl.php +++ b/setup/lib/FormDisplay.tpl.php @@ -179,12 +179,12 @@ function display_input($path, $name, $description = '', $type, $value, $value_is } if (isset($opts['setvalue']) && $opts['setvalue']) { ?> - <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf($GLOBALS['strSetupSetValue'], htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a> + <a class="set-value" href="#<?php echo "$path={$opts['setvalue']}" ?>" title="<?php echo sprintf(__('Set value: %s'), htmlspecialchars($opts['setvalue'])) ?>" style="display:none"><img alt="set-value" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/b_edit.png" width="16" height="16" /></a> <?php } if (isset($opts['show_restore_default']) && $opts['show_restore_default']) { ?> - <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo $GLOBALS['strSetupRestoreDefaultValue'] ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a> + <a class="restore-default" href="#<?php echo $path ?>" title="<?php echo __('Restore default value') ?>" style="display:none"><img alt="restore-default" src="../<?php echo $GLOBALS['cfg']['ThemePath'] ?>/original/img/s_reload.png" width="16" height="16" /></a> <?php } // this must match with displayErrors() in scripts.js diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php index da72f57..7128a61 100644 --- a/setup/lib/form_processing.lib.php +++ b/setup/lib/form_processing.lib.php @@ -40,7 +40,7 @@ function process_formset(FormDisplay $form_display) { $id = $id ? "{$separator}id=$id" : ''; ?> <div class="warning"> - <h4><?php echo $GLOBALS['strSetupWarning'] ?></h4> + <h4><?php echo __('Warning') ?></h4> <?php echo PMA_lang('error_form') ?><br /> <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert"><?php echo PMA_lang('RevertErroneousFields') ?></a> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3290-g2112996
by Michal Čihař 14 May '10

14 May '10

The branch, master has been updated via 211299621773591d15ed16bfab93143aa24cab97 (commit) via 4d77222f973fca1c93ff074db558343a7eeafda1 (commit) via 3b54cd4018c23ac259a8122125bf79d6d2b9de2d (commit) via 6db45a52f5ebb582f201e8025621f75dbe67eb43 (commit) via 1e2ef68b24542566f0e6f4c4ab67e7815106f496 (commit) via 632db85e88bfa7bd794f5d7fb14723c884ae1752 (commit) via 26e66769470a0bf4dc5280a522896f44bef347b2 (commit) via 791aadcd661317aa3e7a5c3c1625680357cba928 (commit) from 5d05a5311233deb85c2b8e1fca2816c2c9fe1a03 (commit) - Log ----------------------------------------------------------------- commit 211299621773591d15ed16bfab93143aa24cab97 Merge: 5d05a5311233deb85c2b8e1fca2816c2c9fe1a03 4d77222f973fca1c93ff074db558343a7eeafda1 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri May 14 13:54:45 2010 +0200 Merge remote branch 'pootle/master' Conflicts: po/ur.po commit 4d77222f973fca1c93ff074db558343a7eeafda1 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:35:57 2010 +0200 Translation update done using Pootle. commit 3b54cd4018c23ac259a8122125bf79d6d2b9de2d Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:35:39 2010 +0200 Translation update done using Pootle. commit 6db45a52f5ebb582f201e8025621f75dbe67eb43 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:35:30 2010 +0200 Translation update done using Pootle. commit 1e2ef68b24542566f0e6f4c4ab67e7815106f496 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:34:31 2010 +0200 Translation update done using Pootle. commit 632db85e88bfa7bd794f5d7fb14723c884ae1752 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:34:15 2010 +0200 Translation update done using Pootle. commit 26e66769470a0bf4dc5280a522896f44bef347b2 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:34:01 2010 +0200 Translation update done using Pootle. commit 791aadcd661317aa3e7a5c3c1625680357cba928 Author: monymirza <monymirza(a)gmail.com> Date: Fri May 14 12:33:40 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ur.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/ur.po b/po/ur.po index 28c8cc8..68d7036 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-14 07:48-0400\n" -"PO-Revision-Date: 2010-04-09 14:02+0200\n" -"Last-Translator: Michal <michal(a)cihar.com>\n" +"PO-Revision-Date: 2010-05-14 12:35+0200\n" +"Last-Translator: <monymirza(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -21,14 +21,14 @@ msgstr "" #: libraries/display_tbl.lib.php:417 libraries/messages.inc.php:866 #: server_privileges.php:1475 msgid "Show all" -msgstr "" +msgstr "سبھی دکھاو" #: browse_foreigners.php:82 db_operations.php:648 #: libraries/common.lib.php:2304 libraries/display_tbl.lib.php:394 #: libraries/export/pdf.php:147 libraries/messages.inc.php:593 #: pdf_schema.php:283 pdf_schema.php:1123 pdf_schema.php:1139 msgid "Page number:" -msgstr "" +msgstr "صفحہ نمبر" #: browse_foreigners.php:132 libraries/messages.inc.php:1238 msgid "" @@ -42,7 +42,7 @@ msgstr "" #: db_structure.php:106 libraries/db_links.inc.php:75 #: libraries/messages.inc.php:837 libraries/tbl_links.inc.php:63 msgid "Search" -msgstr "" +msgstr "تلاش" #: browse_foreigners.php:153 db_operations.php:383 db_operations.php:425 #: db_operations.php:495 db_operations.php:603 db_operations.php:696 @@ -71,25 +71,25 @@ msgstr "" #: tbl_structure.php:598 tbl_tracking.php:395 tbl_tracking.php:512 #: view_create.php:182 view_operations.php:101 msgid "Go" -msgstr "" +msgstr "جائو" #: browse_foreigners.php:168 browse_foreigners.php:172 #: libraries/Index.class.php:442 libraries/messages.inc.php:455 #: tbl_tracking.php:320 msgid "Keyname" -msgstr "" +msgstr "کی نیم" #: browse_foreigners.php:169 browse_foreigners.php:171 #: libraries/messages.inc.php:248 server_collations.php:55 #: server_collations.php:67 server_engines.php:59 server_status.php:628 msgid "Description" -msgstr "" +msgstr "وضاحت" #: browse_foreigners.php:247 browse_foreigners.php:256 #: browse_foreigners.php:268 browse_foreigners.php:276 #: libraries/messages.inc.php:1214 msgid "Use this value" -msgstr "" +msgstr "یہ ویلیو استعمال کریں" #: db_create.php:46 libraries/messages.inc.php:211 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3281-gb05a903
by Marc Delisle 14 May '10

14 May '10

The branch, master has been updated via b05a903dc32e99365775b29fa101ce087ba2f64e (commit) from d904da4fd4eb04cfdb52fbc99b08cca070e8f42b (commit) - Log ----------------------------------------------------------------- commit b05a903dc32e99365775b29fa101ce087ba2f64e Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 14 07:47:50 2010 -0400 gettext conversion ----------------------------------------------------------------------- Summary of changes: import.php | 2 +- libraries/Message.class.php | 10 ++++---- libraries/common.inc.php | 2 +- libraries/export/codegen.php | 4 +- libraries/export/csv.php | 18 +++++++------- libraries/export/excel.php | 12 +++++----- libraries/export/htmlword.php | 12 +++++----- libraries/export/latex.php | 32 +++++++++++++------------- libraries/export/mediawiki.php | 4 +- libraries/export/ods.php | 8 +++--- libraries/export/odt.php | 18 +++++++------- libraries/export/pdf.php | 8 +++--- libraries/export/php_array.php | 4 +- libraries/export/sql.php | 49 ++++++++++++++++++++------------------- libraries/export/texytext.php | 12 +++++----- libraries/export/xls.php | 8 +++--- libraries/export/xlsx.php | 8 +++--- libraries/export/xml.php | 18 +++++++------- libraries/export/yaml.php | 2 +- libraries/import/csv.php | 20 ++++++++-------- libraries/import/docsql.php | 6 ++-- libraries/import/ldi.php | 20 ++++++++-------- libraries/import/ods.php | 12 +++++----- libraries/import/sql.php | 8 +++--- libraries/import/xls.php | 6 ++-- libraries/import/xlsx.php | 6 ++-- libraries/import/xml.php | 4 +- libraries/relation.lib.php | 18 +++++++------- libraries/session.inc.php | 2 +- pmd_display_field.php | 2 +- pmd_relation_new.php | 10 ++++---- pmd_relation_upd.php | 2 +- pmd_save_pos.php | 2 +- sql.php | 2 +- 34 files changed, 176 insertions(+), 175 deletions(-) diff --git a/import.php b/import.php index 88ffc47..0fb559b 100644 --- a/import.php +++ b/import.php @@ -423,7 +423,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) { if ($timeout_passed) { $message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.')); if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) { - $message->addString('strTimeoutNothingParsed'); + $message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won't be able to finish this import unless you increase php time limits.')); } } diff --git a/libraries/Message.class.php b/libraries/Message.class.php index c31d353..ffddb87 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -182,13 +182,13 @@ class PMA_Message * @static * @uses PMA_Message as returned object * @uses PMA_Message::SUCCESS - * @param string $string a localized string e.g. 'strSuccess' + * @param string $string a localized string e.g. __('Your SQL query has been executed successfully') * @return PMA_Message */ static public function success($string = '') { if (empty($string)) { - $string = 'strSuccess'; + $string = __('Your SQL query has been executed successfully'); } return new PMA_Message($string, PMA_Message::SUCCESS); @@ -202,13 +202,13 @@ class PMA_Message * @static * @uses PMA_Message as returned object * @uses PMA_Message::ERROR - * @param string $string a localized string e.g. 'strError' + * @param string $string a localized string e.g. __('Error') * @return PMA_Message */ static public function error($string = '') { if (empty($string)) { - $string = 'strError'; + $string = __('Error'); } return new PMA_Message($string, PMA_Message::ERROR); @@ -238,7 +238,7 @@ class PMA_Message * @static * @uses PMA_Message as returned object * @uses PMA_Message::NOTICE - * @param string $string a localized string e.g. 'strRelationNotWorking' + * @param string $string a localized string e.g. __('The additional features for working with linked tables have been deactivated. To find out why click %shere%s.') * @return PMA_Message */ static public function notice($string) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index f53caef..710ecdf 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -923,7 +923,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { * - > 5.0.15 */ if (PMA_MYSQL_INT_VERSION < 50015) { - PMA_fatalError('strUpgrade', array('MySQL', '5.0.15')); + PMA_fatalError(__('You should upgrade to %s %s or later.'), array('MySQL', '5.0.15')); } /** diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index e234f78..506240c 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -34,9 +34,9 @@ if (isset($plugin_list)) { 'mime_type' => 'text/cs', 'options' => array( array('type' => 'hidden', 'name' => 'data'), - array('type' => 'select', 'name' => 'format', 'text' => 'strFormat', 'values' => $CG_FORMATS), + array('type' => 'select', 'name' => 'format', 'text' => __('Format'), 'values' => $CG_FORMATS), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 7573836..5bc490d 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -14,20 +14,20 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['csv'] = array( - 'text' => 'strCSV', + 'text' => __('CSV'), 'extension' => 'csv', 'mime_type' => 'text/comma-separated-values', 'options' => array( - array('type' => 'text', 'name' => 'separator', 'text' => 'strFieldsTerminatedBy'), - array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy'), - array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy'), - array('type' => 'text', 'name' => 'terminated', 'text' => 'strLinesTerminatedBy'), - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'text', 'name' => 'separator', 'text' => __('Fields terminated by')), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by')), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by')), + array('type' => 'text', 'name' => 'terminated', 'text' => __('Lines terminated by')), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/excel.php b/libraries/export/excel.php index d4b8e1a..92d0bce 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -15,13 +15,13 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['excel'] = array( - 'text' => 'strStrucExcelCSV', + 'text' => __('CSV for MS Excel'), 'extension' => 'csv', 'mime_type' => 'text/comma-separated-values', 'options' => array( - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'removeCRLF', 'text' => 'strRemoveCRLF'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array( 'type' => 'select', 'name' => 'edition', @@ -29,10 +29,10 @@ if (isset($plugin_list)) { 'win' => 'Windows', 'mac_excel2003' => 'Excel 2003 / Macintosh', 'mac_excel2008' => 'Excel 2008 / Macintosh'), - 'text' => 'strExcelEdition'), + 'text' => __('Excel edition')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { /* Everything rest is coded in csv plugin */ diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index b0ea10b..2f4441a 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -15,18 +15,18 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['htmlword'] = array( - 'text' => 'strHTMLWord', + 'text' => __('Microsoft Word 2000'), 'extension' => 'doc', 'mime_type' => 'application/vnd.ms-word', 'force_file' => true, 'options' => array( - array('type' => 'bool', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'), - array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'), - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'bool', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'), + array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array('type' => 'egroup'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/latex.php b/libraries/export/latex.php index e11af47..232d378 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -19,50 +19,50 @@ if (isset($plugin_list)) { $hide_structure = true; } $plugin_list['latex'] = array( - 'text' => 'strLaTeX', + 'text' => __('LaTeX'), 'extension' => 'tex', 'mime_type' => 'application/x-tex', 'options' => array( - array('type' => 'bool', 'name' => 'caption', 'text' => 'strLatexIncludeCaption'), + array('type' => 'bool', 'name' => 'caption', 'text' => __('Include table caption')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* Structure options */ if (!$hide_structure) { $plugin_list['latex']['options'][] = - array('type' => 'bgroup', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'); + array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_caption', 'text' => 'strLatexCaption'); + array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => 'strLatexContinuedCaption'); + array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'structure_label', 'text' => 'strLatexLabel'); + array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key')); if (!empty($GLOBALS['cfgRelation']['relation'])) { $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); + array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations')); } $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments'); + array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments')); if (!empty($GLOBALS['cfgRelation']['mimework'])) { $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); + array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type')); } $plugin_list['latex']['options'][] = array('type' => 'egroup'); } /* Data */ $plugin_list['latex']['options'][] = - array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'); + array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_caption', 'text' => 'strLatexCaption'); + array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_continued_caption', 'text' => 'strLatexContinuedCaption'); + array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'data_label', 'text' => 'strLatexLabel'); + array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key')); $plugin_list['latex']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'); + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')); $plugin_list['latex']['options'][] = array('type' => 'egroup'); } else { diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php index d1369cb..7e19b83 100644 --- a/libraries/export/mediawiki.php +++ b/libraries/export/mediawiki.php @@ -12,13 +12,13 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['mediawiki'] = array( - 'text' => 'strMediaWiki', + 'text' => __('MediaWiki Table'), 'extension' => 'txt', 'mime_type' => 'text/plain', 'options' => array( array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 50d7393..c8dee56 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['ods'] = array( - 'text' => 'strOpenDocumentSpreadsheet', + 'text' => __('Open Document Spreadsheet'), 'extension' => 'ods', 'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet', 'force_file' => true, 'options' => array( - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/odt.php b/libraries/export/odt.php index a63d4c5..9b3239b 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -19,37 +19,37 @@ if (isset($plugin_list)) { $hide_structure = true; } $plugin_list['odt'] = array( - 'text' => 'strOpenDocumentText', + 'text' => __('Open Document Text'), 'extension' => 'odt', 'mime_type' => 'application/vnd.oasis.opendocument.text', 'force_file' => true, 'options' => array(), /* Filled later */ - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* Structure options */ if (!$hide_structure) { $plugin_list['odt']['options'][] = - array('type' => 'bgroup', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'); + array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'); if (!empty($GLOBALS['cfgRelation']['relation'])) { $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); + array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations')); } $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'comments', 'text' => 'strComments'); + array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments')); if (!empty($GLOBALS['cfgRelation']['mimework'])) { $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); + array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type')); } $plugin_list['odt']['options'][] = array('type' => 'egroup'); } /* Data */ $plugin_list['odt']['options'][] = - array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'); + array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); $plugin_list['odt']['options'][] = - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'); + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')); $plugin_list['odt']['options'][] = array('type' => 'egroup'); } else { diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 437e760..c4111e2 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['pdf'] = array( - 'text' => 'strPDF', + 'text' => __('PDF'), 'extension' => 'pdf', 'mime_type' => 'application/pdf', 'force_file' => true, 'options' => array( - array('type' => 'message_only', 'name' => 'explanation', 'text' => 'strPDFReportExplanation'), - array('type' => 'text', 'name' => 'report_title', 'text' => 'strPDFReportTitle'), + array('type' => 'message_only', 'name' => 'explanation', 'text' => __('(Generates a report containing the data of a single table)')), + array('type' => 'text', 'name' => 'report_title', 'text' => __('Report title')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php index f1f3a87..7d1fb5e 100644 --- a/libraries/export/php_array.php +++ b/libraries/export/php_array.php @@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['php_array'] = array( - 'text' => 'strPhpArray', + 'text' => __('PHP array'), 'extension' => 'php', 'mime_type' => 'text/plain', 'options' => array( @@ -22,7 +22,7 @@ if (isset($plugin_list)) { 'name' => 'data', ), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 47f9003..1b2b1d1 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -22,16 +22,17 @@ if (isset($plugin_list)) { } if (!$hide_sql) { $plugin_list['sql'] = array( - 'text' => 'strSQL', + 'text' => __('SQL'), 'extension' => 'sql', 'mime_type' => 'text/x-sql', 'options' => array( - array('type' => 'text', 'name' => 'header_comment', 'text' => 'strAddHeaderComment'), - array('type' => 'bool', 'name' => 'include_comments', 'text' => 'strComments'), - array('type' => 'bool', 'name' => 'use_transaction', 'text' => 'strEncloseInTransaction'), - array('type' => 'bool', 'name' => 'disable_fk', 'text' => 'strDisableForeignChecks'), + array('type' => 'text', 'name' => 'header_comment', 'text' => __('Add custom comment into header ( + splits lines)')), + array('type' => 'bool', 'name' => 'include_comments', 'text' => __('Comments')), + array('type' => 'bool', 'name' => 'use_transaction', 'text' => __('Enclose export in a transaction')), + array('type' => 'bool', 'name' => 'disable_fk', 'text' => __('Disable foreign key checks')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); $compats = PMA_DBI_getCompatibilities(); if (count($compats) > 0) { @@ -40,14 +41,14 @@ if (isset($plugin_list)) { $values[$val] = $val; } $plugin_list['sql']['options'][] = - array('type' => 'select', 'name' => 'compatibility', 'text' => 'strSQLCompatibility', 'values' => $values, 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode')); + array('type' => 'select', 'name' => 'compatibility', 'text' => __('SQL compatibility mode'), 'values' => $values, 'doc' => array('manual_MySQL_Database_Administration', 'Server_SQL_mode')); unset($values); } /* Server export options */ if ($plugin_param['export_type'] == 'server') { $plugin_list['sql']['options'][] = - array('type' => 'bgroup', 'text' => 'strDatabaseExportOptions'); + array('type' => 'bgroup', 'text' => __('Database export options')); $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'drop_database', 'text' => sprintf(__('Add %s'), 'DROP DATABASE')); $plugin_list['sql']['options'][] = @@ -57,7 +58,7 @@ if (isset($plugin_list)) { /* Structure options */ if (!$hide_structure) { $plugin_list['sql']['options'][] = - array('type' => 'bgroup', 'name' => 'structure', 'text' => 'strStructure', 'force' => 'data'); + array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'); if ($plugin_param['export_type'] == 'table') { if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) { $drop_clause = 'DROP VIEW'; @@ -75,24 +76,24 @@ if (isset($plugin_list)) { $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf(__('Add %s'), 'IF NOT EXISTS')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'auto_increment', 'text' => 'strAddAutoIncrement'); + array('type' => 'bool', 'name' => 'auto_increment', 'text' => __('Add AUTO_INCREMENT value')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'backquotes', 'text' => 'strUseBackquotes'); + array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and field names with backquotes')); $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : ''))); /* MIME stuff etc. */ $plugin_list['sql']['options'][] = - array('type' => 'bgroup', 'text' => 'strAddIntoComments'); + array('type' => 'bgroup', 'text' => __('Add into comments')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'dates', 'text' => 'strCreationDates'); + array('type' => 'bool', 'name' => 'dates', 'text' => __('Creation/Update/Check dates')); if (!empty($GLOBALS['cfgRelation']['relation'])) { $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'relation', 'text' => 'strRelations'); + array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations')); } if (!empty($GLOBALS['cfgRelation']['mimework'])) { $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'mime', 'text' => 'strMIME_MIMEtype'); + array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type')); } $plugin_list['sql']['options'][] = array('type' => 'egroup'); @@ -103,23 +104,23 @@ if (isset($plugin_list)) { /* Data */ $plugin_list['sql']['options'][] = - array('type' => 'bgroup', 'name' => 'data', 'text' => 'strData', 'force' => 'structure'); + array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => 'strCompleteInserts', 'doc' => array('programs', 'mysqldump', 'option_mysqldump_complete-insert-option')); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Complete inserts'), 'doc' => array('programs', 'mysqldump', 'option_mysqldump_complete-insert-option')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'extended', 'text' => 'strExtendedInserts', 'doc' => array('programs', 'mysqldump', 'option_mysqldump_extended-insert-option')); + array('type' => 'bool', 'name' => 'extended', 'text' => __('Extended inserts'), 'doc' => array('programs', 'mysqldump', 'option_mysqldump_extended-insert-option')); $plugin_list['sql']['options'][] = - array('type' => 'text', 'name' => 'max_query_size', 'text' => 'strMaximalQueryLength'); + array('type' => 'text', 'name' => 'max_query_size', 'text' => __('Maximal length of created query')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'delayed', 'text' => 'strDelayedInserts'); + array('type' => 'bool', 'name' => 'delayed', 'text' => __('Use delayed inserts')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreInserts'); + array('type' => 'bool', 'name' => 'ignore', 'text' => __('Use ignore inserts')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'hex_for_blob', 'text' => 'strHexForBLOB'); + array('type' => 'bool', 'name' => 'hex_for_blob', 'text' => __('Use hexadecimal for BLOB')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'utc_time', 'text' => 'strSQLExportUTC'); + array('type' => 'bool', 'name' => 'utc_time', 'text' => __('Export time in UTC')); $plugin_list['sql']['options'][] = - array('type' => 'select', 'name' => 'type', 'text' => 'strSQLExportType', 'values' => array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE', 'REPLACE' => 'REPLACE')); + array('type' => 'select', 'name' => 'type', 'text' => __('Export type'), 'values' => array('INSERT' => 'INSERT', 'UPDATE' => 'UPDATE', 'REPLACE' => 'REPLACE')); $plugin_list['sql']['options'][] = array('type' => 'egroup'); } diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index fbe6580..4eeba65 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -14,27 +14,27 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['texytext'] = array( - 'text' => 'strTexyText', + 'text' => __('Texy! text'), 'extension' => 'txt', 'mime_type' => 'text/plain', 'options' => array( array('type' => 'bool', 'name' => 'structure', - 'text' => 'strStructure', + 'text' => __('Structure'), 'force' => 'data'), array('type' => 'bgroup', 'name' => 'data', - 'text' => 'strData', + 'text' => __('Data'), 'force' => 'structure'), array('type' => 'text', 'name' => 'null', - 'text' => 'strReplaceNULLBy'), + 'text' => __('Replace NULL by')), array('type' => 'bool', 'name' => 'columns', - 'text' => 'strPutColNames'), + 'text' => __('Put fields names in the first row')), array('type' => 'egroup'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/xls.php b/libraries/export/xls.php index efbb481..ed13c15 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['xls'] = array( - 'text' => 'strImportXLS', + 'text' => __('Excel 97-2003 XLS Workbook'), 'extension' => 'xls', 'mime_type' => 'application/vnd.ms-excel', 'force_file' => true, 'options' => array( - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index 1b24c4c..fb323bf 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -15,16 +15,16 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['xlsx'] = array( - 'text' => 'strImportXLSX', + 'text' => __('Excel 2007 XLSX Workbook'), 'extension' => 'xlsx', 'mime_type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'force_file' => true, 'options' => array( - array('type' => 'text', 'name' => 'null', 'text' => 'strReplaceNULLBy'), - array('type' => 'bool', 'name' => 'columns', 'text' => 'strPutColNames'), + array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 2930f70..be005bf 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -15,34 +15,34 @@ if (strlen($GLOBALS['db'])) { /* Can't do server export */ if (isset($plugin_list)) { $plugin_list['xml'] = array( - 'text' => 'strXML', + 'text' => __('XML'), 'extension' => 'xml', 'mime_type' => 'text/xml', 'options' => array( array('type' => 'hidden', 'name' => 'data'), ), - 'options_text' => 'strOptions' + 'options_text' => __('Options') ); /* Export structure */ $plugin_list['xml']['options'][] = - array('type' => 'bgroup', 'name' => 'export_struc', 'text' => 'strXMLExportStructs'); + array('type' => 'bgroup', 'name' => 'export_struc', 'text' => __('Export Structure Schemas (recommended)')); $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_functions', 'text' => 'strXMLExportFunctions'); + array('type' => 'bool', 'name' => 'export_functions', 'text' => __('Export functions')); $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_procedures', 'text' => 'strXMLExportProcedures'); + array('type' => 'bool', 'name' => 'export_procedures', 'text' => __('Export procedures')); $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_tables', 'text' => 'strXMLExportTables'); + array('type' => 'bool', 'name' => 'export_tables', 'text' => __('Export tables')); $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_triggers', 'text' => 'strXMLExportTriggers'); + array('type' => 'bool', 'name' => 'export_triggers', 'text' => __('Export triggers')); $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_views', 'text' => 'strXMLExportViews'); + array('type' => 'bool', 'name' => 'export_views', 'text' => __('Export views')); $plugin_list['xml']['options'][] = array('type' => 'egroup'); /* Data */ $plugin_list['xml']['options'][] = - array('type' => 'bool', 'name' => 'export_contents', 'text' => 'strXMLExportContents'); + array('type' => 'bool', 'name' => 'export_contents', 'text' => __('Export contents')); } else { /** diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index d1ba38e..7091272 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -25,7 +25,7 @@ if (isset($plugin_list)) { 'name' => 'data', ), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); } else { diff --git a/libraries/import/csv.php b/libraries/import/csv.php index ee25739..d10d6df 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -19,25 +19,25 @@ if ($plugin_param !== 'table') { if (isset($plugin_list)) { $plugin_list['csv'] = array( - 'text' => 'strCSV', + 'text' => __('CSV'), 'extension' => 'csv', 'options' => array( - array('type' => 'bool', 'name' => 'replace', 'text' => 'strReplaceTable'), - array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreDuplicates'), - array('type' => 'text', 'name' => 'terminated', 'text' => 'strFieldsTerminatedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'new_line', 'text' => 'strLinesTerminatedBy', 'size' => 2), + array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), + array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), + array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); if ($plugin_param !== 'table') { $plugin_list['csv']['options'][] = - array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'); + array('type' => 'bool', 'name' => 'col_names', 'text' => __('Column names in first row')); } else { $plugin_list['csv']['options'][] = - array('type' => 'text', 'name' => 'columns', 'text' => 'strColumnNames'); + array('type' => 'text', 'name' => 'columns', 'text' => __('Column names')); } /* We do not define function when plugin is just queried for information above */ diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index 6a1ee0b..fa458ac 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -26,12 +26,12 @@ if ($plugin_param !== 'database' || $GLOBALS['num_tables'] < 1 if (isset($plugin_list)) { $plugin_list['docsql'] = array( // set name of your plugin - 'text' => 'strDocSQL', // text to be displayed as choice + 'text' => __('DocSQL'), // text to be displayed as choice 'extension' => '', // extension this plugin can handle 'options' => array( // array of options for your plugin (optional) - array('type' => 'text', 'name' => 'table', 'text' => 'strTableName'), + array('type' => 'text', 'name' => 'table', 'text' => __('Table name')), ), - 'options_text' => 'strOptions', // text to describe plugin options (must be set if options are used) + 'options_text' => __('Options'), // text to describe plugin options (must be set if options are used) ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 4124ca2..47516aa 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -32,19 +32,19 @@ if (isset($plugin_list)) { unset($result); } $plugin_list['ldi'] = array( - 'text' => 'strLDI', + 'text' => __('CSV using LOAD DATA'), 'extension' => 'ldi', // This is nonsense, however we want to default to our parser for csv 'options' => array( - array('type' => 'bool', 'name' => 'replace', 'text' => 'strReplaceTable'), - array('type' => 'bool', 'name' => 'ignore', 'text' => 'strIgnoreDuplicates'), - array('type' => 'text', 'name' => 'terminated', 'text' => 'strFieldsTerminatedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'enclosed', 'text' => 'strFieldsEnclosedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'escaped', 'text' => 'strFieldsEscapedBy', 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'new_line', 'text' => 'strLinesTerminatedBy', 'size' => 2), - array('type' => 'text', 'name' => 'columns', 'text' => 'strColumnNames'), - array('type' => 'bool', 'name' => 'local_option', 'text' => 'strLDILocal'), + array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), + array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), + array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2), + array('type' => 'text', 'name' => 'columns', 'text' => __('Column names')), + array('type' => 'bool', 'name' => 'local_option', 'text' => __('Use LOCAL keyword')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 81aed5e..729c55e 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -19,15 +19,15 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['ods'] = array( - 'text' => 'strImportODS', + 'text' => __('Open Document Spreadsheet'), 'extension' => 'ods', 'options' => array( - array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'), - array('type' => 'bool', 'name' => 'empty_rows', 'text' => 'strImportEmptyRows'), - array('type' => 'bool', 'name' => 'recognize_percentages', 'text' => 'strImportODSPercents'), - array('type' => 'bool', 'name' => 'recognize_currency', 'text' => 'strImportODSCurrency'), + array('type' => 'bool', 'name' => 'col_names', 'text' => __('Column names in first row')), + array('type' => 'bool', 'name' => 'empty_rows', 'text' => __('Do not import empty rows')), + array('type' => 'bool', 'name' => 'recognize_percentages', 'text' => __('Import percentages as proper decimals (12.00% to .12)')), + array('type' => 'bool', 'name' => 'recognize_currency', 'text' => __('Import currencies (.00 to 5.00)')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/import/sql.php b/libraries/import/sql.php index d736bbe..0241d71 100644 --- a/libraries/import/sql.php +++ b/libraries/import/sql.php @@ -15,9 +15,9 @@ if (! defined('PHPMYADMIN')) { */ if (isset($plugin_list)) { $plugin_list['sql'] = array( - 'text' => 'strSQL', + 'text' => __('SQL'), 'extension' => 'sql', - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); $compats = PMA_DBI_getCompatibilities(); if (count($compats) > 0) { @@ -29,7 +29,7 @@ if (isset($plugin_list)) { array( 'type' => 'select', 'name' => 'compatibility', - 'text' => 'strSQLCompatibility', + 'text' => __('SQL compatibility mode'), 'values' => $values, 'doc' => array( 'manual_MySQL_Database_Administration', @@ -39,7 +39,7 @@ if (isset($plugin_list)) { array( 'type' => 'bool', 'name' => 'no_auto_value_on_zero', - 'text' => 'strDoNotAutoIncrementZeroValues', + 'text' => __('Do not use AUTO_INCREMENT for zero values'), 'doc' => array( 'manual_MySQL_Database_Administration', 'Server_SQL_mode', diff --git a/libraries/import/xls.php b/libraries/import/xls.php index 3fc9c32..ca4778f 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['xls'] = array( - 'text' => 'strImportXLS', + 'text' => __('Excel 97-2003 XLS Workbook'), 'extension' => 'xls', 'options' => array( - array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'), + array('type' => 'bool', 'name' => 'col_names', 'text' => __('Column names in first row')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 82cb1ea..80d79e5 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -18,12 +18,12 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['xlsx'] = array( - 'text' => 'strImportXLSX', + 'text' => __('Excel 2007 XLSX Workbook'), 'extension' => 'xlsx', 'options' => array( - array('type' => 'bool', 'name' => 'col_names', 'text' => 'strImportColNames'), + array('type' => 'bool', 'name' => 'col_names', 'text' => __('Column names in first row')), ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/import/xml.php b/libraries/import/xml.php index a4c873b..4984e45 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -18,11 +18,11 @@ if (! defined('PHPMYADMIN')) { if (isset($plugin_list)) { $plugin_list['xml'] = array( - 'text' => 'strXML', + 'text' => __('XML'), 'extension' => 'xml', 'options' => array( ), - 'options_text' => 'strOptions', + 'options_text' => __('Options'), ); /* We do not define function when plugin is just queried for information above */ return; diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index c02a8b1..205bb7a 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -116,23 +116,23 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) PMA_printDiagMessageForParameter('relation', isset($cfgRelation['relation']), $messages, 'relation'); - PMA_printDiagMessageForFeature('strGeneralRelationFeat', 'relwork', $messages); + PMA_printDiagMessageForFeature(__('General relation features'), 'relwork', $messages); PMA_printDiagMessageForParameter('table_info', isset($cfgRelation['table_info']), $messages, 'table_info'); - PMA_printDiagMessageForFeature('strDisplayFeat', 'displaywork', $messages); + PMA_printDiagMessageForFeature(__('Display Features'), 'displaywork', $messages); PMA_printDiagMessageForParameter('table_coords', isset($cfgRelation['table_coords']), $messages, 'table_coords'); PMA_printDiagMessageForParameter('pdf_pages', isset($cfgRelation['pdf_pages']), $messages, 'table_coords'); - PMA_printDiagMessageForFeature('strCreatePdfFeat', 'pdfwork', $messages); + PMA_printDiagMessageForFeature(__('Creation of PDFs'), 'pdfwork', $messages); PMA_printDiagMessageForParameter('column_info', isset($cfgRelation['column_info']), $messages, 'col_com'); - PMA_printDiagMessageForFeature('strColComFeat', 'commwork', $messages, false); + PMA_printDiagMessageForFeature(__('Displaying Column Comments'), 'commwork', $messages, false); - PMA_printDiagMessageForFeature('strMIME_transformation', 'mimework', $messages); + PMA_printDiagMessageForFeature(__('Browser transformation'), 'mimework', $messages); if ($cfgRelation['commwork'] && ! $cfgRelation['mimework']) { echo '<tr><td colspan=2 align="left">' . __('Please see the documentation on how to update your column_comments table') . '</td></tr>' . "\n"; @@ -140,19 +140,19 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) PMA_printDiagMessageForParameter('bookmarktable', isset($cfgRelation['bookmark']), $messages, 'bookmark'); - PMA_printDiagMessageForFeature('strBookmarkQuery', 'bookmarkwork', $messages); + PMA_printDiagMessageForFeature(__('Bookmarked SQL query'), 'bookmarkwork', $messages); PMA_printDiagMessageForParameter('history', isset($cfgRelation['history']), $messages, 'history'); - PMA_printDiagMessageForFeature('strQuerySQLHistory', 'historywork', $messages); + PMA_printDiagMessageForFeature(__('SQL history'), 'historywork', $messages); PMA_printDiagMessageForParameter('designer_coords', isset($cfgRelation['designer_coords']), $messages, 'designer_coords'); - PMA_printDiagMessageForFeature('strDesigner', 'designerwork', $messages); + PMA_printDiagMessageForFeature(__('Designer'), 'designerwork', $messages); PMA_printDiagMessageForParameter('tracking', isset($cfgRelation['tracking']), $messages, 'tracking'); - PMA_printDiagMessageForFeature('strTracking', 'trackingwork', $messages); + PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages); echo '</table>' . "\n"; diff --git a/libraries/session.inc.php b/libraries/session.inc.php index 8b92f37..372c1ad 100644 --- a/libraries/session.inc.php +++ b/libraries/session.inc.php @@ -81,7 +81,7 @@ if (! isset($_COOKIE[$session_name])) { $r = session_start(); if ($r !== true || $orig_error_count != $GLOBALS['error_handler']->countErrors()) { setcookie($session_name, '', 1); - PMA_fatalError('strSessionStartupErrorGeneral'); + PMA_fatalError(__('Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.')); } unset($orig_error_count); } else { diff --git a/pmd_display_field.php b/pmd_display_field.php index 9e55e09..fc4f540 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -45,5 +45,5 @@ if ($cfgRelation['displaywork']) { header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); -die("<root act='save_pos' return='strModifications'></root>"); +die("<root act='save_pos' return=__('Modifications have been saved')></root>"); ?> diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 4d77ef6..5dc8754 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -28,7 +28,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && $existrel_foreign = PMA_getForeigners($db, $T2, '', 'foreign'); if (isset($existrel_foreign[$F2]) && isset($existrel_foreign[$F2]['constraint'])) { - PMD_return_new(0,'strErrorRelationExists'); + PMD_return_new(0,__('Error: relation already exists.')); } // note: in InnoDB, the index does not requires to be on a PRIMARY // or UNIQUE key @@ -60,8 +60,8 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && if ($on_update != 'nix') { $upd_query .= ' ON UPDATE ' . $on_update; } - PMA_DBI_try_query($upd_query) or PMD_return_new(0,'strErrorRelationAdded'); - PMD_return_new(1,'strForeignKeyRelationAdded'); + PMA_DBI_try_query($upd_query) or PMD_return_new(0,__('Error: Relation not added.')); + PMD_return_new(1,__('FOREIGN KEY relation added')); } // internal (pmadb) relation @@ -83,9 +83,9 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && . '\'' . PMA_sqlAddslashes($F1) . '\')'; if (PMA_query_as_controluser($q , false, PMA_DBI_QUERY_STORE)) { - PMD_return_new(1, 'strInternalRelationAdded'); + PMD_return_new(1, __('Internal relation added')); } else { - PMD_return_new(0, 'strErrorRelationAdded'); + PMD_return_new(0, __('Error: Relation not added.')); } } } diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 98f145c..eb4e17b 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -46,7 +46,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && . ' AND foreign_field = \'' . PMA_sqlAddslashes($F1) . '\'' , FALSE, PMA_DBI_QUERY_STORE); } -PMD_return_upd(1, 'strRelationDeleted'); +PMD_return_upd(1, __('Relation deleted')); function PMD_return_upd($b,$ret) { diff --git a/pmd_save_pos.php b/pmd_save_pos.php index 90c20cc..63e19e5 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -51,7 +51,7 @@ if(! empty($die_save_pos)) { header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); ?> -<root act='save_pos' return='<?php echo 'strModifications'; ?>'></root> +<root act='save_pos' return='<?php echo __('Modifications have been saved'); ?>'></root> <?php } ?> diff --git a/sql.php b/sql.php index ccc7729..288f150 100644 --- a/sql.php +++ b/sql.php @@ -623,7 +623,7 @@ else { } if (isset($label)) { - $message = PMA_message::success('strBookmarkCreated'); + $message = PMA_message::success(__('Bookmark %s created')); $message->addParam($label); $message->display(); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 92242986348cf1f843909b308e375983ad22823b
by Michal Čihař 14 May '10

14 May '10

The branch, master has been updated via 92242986348cf1f843909b308e375983ad22823b (commit) from 238f4997c5dc4ffddb98aad0534fe38867ee3587 (commit) - Log ----------------------------------------------------------------- commit 92242986348cf1f843909b308e375983ad22823b Author: Michal Čihař <mcihar(a)novell.com> Date: Fri May 14 09:27:13 2010 +0200 Update translation section to mention gettext and not old system. ----------------------------------------------------------------------- Summary of changes: templates/improve.tpl | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/improve.tpl b/templates/improve.tpl index 7a2e353..aa9b2e5 100644 --- a/templates/improve.tpl +++ b/templates/improve.tpl @@ -119,11 +119,12 @@ our wiki</a>. <h2><a id="translate"></a>Translating</h2> <p> -For localization, phpMyAdmin uses its own simple localization system - each -translation has its own PHP file with all texts. All these files are encoded in -UTF-8 (if you see another encoding, you're using an old version). To translate, -you have to follow steps described in <a -href="http://wiki.phpmyadmin.net/pma/FAQ_7.2">FAQ 7.2</a>. +For localization, phpMyAdmin uses Gettext, you can find po files for each +translation in <code>po</code> directory in phpMyAdmin sources. You can +translate them using usual tools for handling Gettext translations or use our +<a href="https://l10n.cihar.com/projects/phpmyadmin/">translation server</a>. +More information about translating can be found in +<a href="http://www.phpmyadmin.net/documentation/#faq7_2">FAQ 7.2</a>. </p> <p> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3280-gd904da4
by Michal Čihař 14 May '10

14 May '10

The branch, master has been updated via d904da4fd4eb04cfdb52fbc99b08cca070e8f42b (commit) via 6103610a70ab1986818513e56c698ae027a308d5 (commit) via 460ccb93d14e5e31de6351b1f76f790a6d14873f (commit) via 5afefc683a2754946806820e7d59d422fc187dd3 (commit) via 6f680bb101042ea8286160144d7628d2bde72355 (commit) via 5ee0b1af7ba4f0d5afad6b811d204001b676b044 (commit) via b6c1a7d8c481908eb7ace5e1d85302a9a965e239 (commit) via 484bf0698c88206f4854de2f291e2667f4809d56 (commit) via db9e346946fa3d60f59701dbc962468d149e7c14 (commit) via 59fcc6f7764ad856334bbe763c33f8e102207d3b (commit) via 7d6f2ecd39199fab28f264d6725e9f991b9f73a4 (commit) via f88eb16541173c6bd3ee573c1257ae203c2ea5cd (commit) via 244aec9a55a613d1eeeca57a59afeab3e8f6b959 (commit) via 727389790b100e2c40e5f78d4717a72f5a4933c1 (commit) via f1c53ec86f8e91625dd65c2f2ec637edddb26c2f (commit) via e14258cd7e90be19e36085984cef43f256266b77 (commit) via 6b3f365063e7dc21a23fca0e4640001f27ff810b (commit) via d825410601e5cd17d5d908d4dc1c38bf685cfa55 (commit) via 9118fb9b1a4fe4a5e74d474d4690f458d25e7998 (commit) via f399cc039a62c73cde88f2ab93e4a9749b610e73 (commit) from 5266e03e72c0a00fe600e603f10c8d25fe3dd859 (commit) - Log ----------------------------------------------------------------- commit d904da4fd4eb04cfdb52fbc99b08cca070e8f42b Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:22:36 2010 +0200 Translation update done using Pootle. commit 6103610a70ab1986818513e56c698ae027a308d5 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:21:37 2010 +0200 Translation update done using Pootle. commit 460ccb93d14e5e31de6351b1f76f790a6d14873f Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:20:37 2010 +0200 Translation update done using Pootle. commit 5afefc683a2754946806820e7d59d422fc187dd3 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:20:20 2010 +0200 Translation update done using Pootle. commit 6f680bb101042ea8286160144d7628d2bde72355 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:19:03 2010 +0200 Translation update done using Pootle. commit 5ee0b1af7ba4f0d5afad6b811d204001b676b044 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:17:28 2010 +0200 Translation update done using Pootle. commit b6c1a7d8c481908eb7ace5e1d85302a9a965e239 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:17:05 2010 +0200 Translation update done using Pootle. commit 484bf0698c88206f4854de2f291e2667f4809d56 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:16:37 2010 +0200 Translation update done using Pootle. commit db9e346946fa3d60f59701dbc962468d149e7c14 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:16:05 2010 +0200 Translation update done using Pootle. commit 59fcc6f7764ad856334bbe763c33f8e102207d3b Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:15:48 2010 +0200 Translation update done using Pootle. commit 7d6f2ecd39199fab28f264d6725e9f991b9f73a4 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:15:32 2010 +0200 Translation update done using Pootle. commit f88eb16541173c6bd3ee573c1257ae203c2ea5cd Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:15:22 2010 +0200 Translation update done using Pootle. commit 244aec9a55a613d1eeeca57a59afeab3e8f6b959 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:15:13 2010 +0200 Translation update done using Pootle. commit 727389790b100e2c40e5f78d4717a72f5a4933c1 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:14:51 2010 +0200 Translation update done using Pootle. commit f1c53ec86f8e91625dd65c2f2ec637edddb26c2f Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:14:30 2010 +0200 Translation update done using Pootle. commit e14258cd7e90be19e36085984cef43f256266b77 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:13:56 2010 +0200 Translation update done using Pootle. commit 6b3f365063e7dc21a23fca0e4640001f27ff810b Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:13:34 2010 +0200 Translation update done using Pootle. commit d825410601e5cd17d5d908d4dc1c38bf685cfa55 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:13:03 2010 +0200 Translation update done using Pootle. commit 9118fb9b1a4fe4a5e74d474d4690f458d25e7998 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:12:58 2010 +0200 Translation update done using Pootle. commit f399cc039a62c73cde88f2ab93e4a9749b610e73 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 08:11:49 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/hi.po | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/po/hi.po b/po/hi.po index 045a5b8..ba4dc65 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-13 11:30+0200\n" -"PO-Revision-Date: 2010-05-14 06:41+0200\n" +"PO-Revision-Date: 2010-05-14 08:22+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" "Language: hi\n" @@ -768,7 +768,7 @@ msgstr "एक्सपोर्ट" #: db_tracking.php:66 libraries/messages.inc.php:1147 msgid "Tracked tables" -msgstr "ट्रैक कि गए तालिकाएं." +msgstr "ट्रैक की गयी तालिकाएं" #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 @@ -784,15 +784,15 @@ msgstr " डाटाबेस" #: db_tracking.php:73 libraries/messages.inc.php:1142 msgid "Last version" -msgstr "" +msgstr "पिछला संस्करण" #: db_tracking.php:74 libraries/messages.inc.php:1141 tbl_tracking.php:594 msgid "Created" -msgstr "" +msgstr "बनाया" #: db_tracking.php:75 libraries/messages.inc.php:1143 tbl_tracking.php:595 msgid "Updated" -msgstr "" +msgstr "अद्यतन" #: db_tracking.php:77 libraries/Index.class.php:440 #: libraries/db_structure.lib.php:53 libraries/messages.inc.php:23 @@ -803,64 +803,66 @@ msgstr "कार्य" #: db_tracking.php:88 db_tracking.php:120 libraries/messages.inc.php:243 msgid "Delete tracking data for this table" -msgstr "" +msgstr "इस तालिका के लिए ट्रैकिंग डेटा हटाएँ" #: db_tracking.php:106 libraries/messages.inc.php:1138 tbl_tracking.php:548 #: tbl_tracking.php:606 tbl_tracking.php:613 msgid "active" -msgstr "" +msgstr "सक्रिय" #: db_tracking.php:108 libraries/messages.inc.php:1139 tbl_tracking.php:550 #: tbl_tracking.php:608 tbl_tracking.php:610 msgid "not active" -msgstr "" +msgstr "निष्क्रिय" #: db_tracking.php:121 libraries/messages.inc.php:1156 msgid "Versions" -msgstr "" +msgstr "संस्करण" #: db_tracking.php:122 libraries/messages.inc.php:1128 tbl_tracking.php:379 #: tbl_tracking.php:624 msgid "Tracking report" -msgstr "" +msgstr "ट्रैकिंग रिपोर्ट" #: db_tracking.php:123 libraries/messages.inc.php:1140 tbl_tracking.php:251 #: tbl_tracking.php:624 msgid "Structure snapshot" -msgstr "" +msgstr "संरचना स्नैपशॉट" #: db_tracking.php:152 libraries/messages.inc.php:1150 msgid "Untracked tables" -msgstr "" +msgstr "लापता तालिकाएं" #: db_tracking.php:172 db_tracking.php:174 libraries/messages.inc.php:1149 #: tbl_structure.php:529 tbl_structure.php:531 msgid "Track table" -msgstr "" +msgstr "तालिकाओं को ट्रैक करें" #: db_tracking.php:200 libraries/messages.inc.php:1117 msgid "Database Log" -msgstr "" +msgstr "डेटाबेस लॉग" #: export.php:62 libraries/messages.inc.php:308 msgid "Selected export type has to be saved in file!" -msgstr "" +msgstr "चयनित निर्यात टाइप को फाइल में सेव करने की आवश्यकता है!" #: export.php:154 export.php:179 export.php:627 libraries/messages.inc.php:563 #, php-format msgid "Insufficient space to save the file %s." -msgstr "" +msgstr "%s फाइल को सेव करने के लिए अपर्याप्त जगह पायी गयी है." #: export.php:294 libraries/messages.inc.php:320 #, php-format msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" +"%s फाइल पहले से ही सर्वर पर मौजूद है, फ़ाइल नाम परिवर्तन अधिलेखित या विकल्प " +"की जाँच करें." #: export.php:298 export.php:302 libraries/messages.inc.php:558 #, php-format msgid "The web server does not have permission to save the file %s." -msgstr "" +msgstr "वेब सर्वर के पास फ़ाइल %s को सेव करने की अनुमति नहीं है." #: export.php:629 libraries/messages.inc.php:272 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3260-g5266e03
by Michal Čihař 14 May '10

14 May '10

The branch, master has been updated via 5266e03e72c0a00fe600e603f10c8d25fe3dd859 (commit) via 0dfeb445c68a7dddb2827be548f80ff21d88df3a (commit) via 94e5999dd81216583aeeac88b31e8fc42797365f (commit) via cecc8bb0c59a80756f58e119020d55e6ffd516a1 (commit) via 67f3d246f6379a98d66ebdb3837187b659619a32 (commit) via 38f6e7186470691b4a6a9e37b047597eabf309a4 (commit) via 678c57431d44f1ab88e42902206948ce5d96a43c (commit) via eaae93c94a6982b7d1ad47db91a3554f20973af6 (commit) via 4d359029c1a22d6d1ac019b4a4ea0a11de7aa652 (commit) via bfb44a4d506cc32e04e511909675b86fd384cca2 (commit) via 9da3ad896e8729ae2099ae0c11f2e4375b21a1aa (commit) via b0f65dd209a3ef02f0c2618577c20163c6342646 (commit) via 22bd74a6e3a8b7a9851bb7aae6d178234d3b9d29 (commit) via 9608ed6ef646d4be1ddb8f68e3f57ad7f3b42bed (commit) via 16f30754f6edab98ce0f4fe88f69fac3f10a9630 (commit) via 55ab76b1842d6b9a5db2067d54a04583eab3de72 (commit) via 64a89c86957983c81ab656e45f42a2e3c3402ae2 (commit) via 65e2aed585cbb0989ec8259e4038c2b6e5e8faff (commit) via cf21d7a0b602ffd78306b27f93ea65fd3e4dd381 (commit) via 86aa237dfe2fc4a624f1770f41b9bfa2a118e1d4 (commit) via 9f36a3cb787c8559c4e230116ed2fcca916e32ba (commit) via aab1984d2771f1a8660cb5ead84b221a5791538a (commit) via c6426d4e04c8c6aa9d4684608a8139d23b031db3 (commit) via 17cd48f6a6248a8dae3a4ec2433fbc2bfa865dc2 (commit) via 8cd7a1a4623263c10cf1554a9adc3a96340ca251 (commit) via 8055a4b48481f2adb3fa8ac8da9a4e710a681913 (commit) via ae77c7a03ed84a2e215f07d1f9112c34b6268131 (commit) via 4929f2909c286094bcfe67549fedb55b1188f1b1 (commit) via 5a7db4a2432d0c17f45980b4d0360eabec25dad7 (commit) via 798d9c583e6a4d5ef8ea4358efff700e539b236e (commit) via 94e2c68d846d810ba1e12842553293edce43ca70 (commit) via efb37dfc7ee9b5fa2ea224f15ac9385d293c27c7 (commit) via 5d8f252c5219297577f3a6584497902e0995ecd4 (commit) via b43bb942c4b692778ff5eb42371b4c72982961ae (commit) via f561dceb91a39e40763ae4a138855180264f5f78 (commit) via 19bada9f46f104a4e8cb2bb9999f1b285f936e9e (commit) via cb700380f1933c9c63af75e566b688a93c1e08ff (commit) via cd8b6b5107673d734e02d7921f7e2d9cde3ae03e (commit) via 76440ba48d90e275683cbedeac4f49d711f93266 (commit) via 3fdc285c46ca6a4704099342689d143e6eb75e24 (commit) via 8a43ee442e80cdafd38009d1ad458ce81434a728 (commit) via 19f1159d7d174e620b165db15417b1320fe052e3 (commit) via a4915d9b9b0274fa2c504288bd4ec72077cf0e78 (commit) from 560104da7293c533f86cdc7087498979491bed26 (commit) - Log ----------------------------------------------------------------- commit 5266e03e72c0a00fe600e603f10c8d25fe3dd859 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:41:07 2010 +0200 Translation update done using Pootle. commit 0dfeb445c68a7dddb2827be548f80ff21d88df3a Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:40:18 2010 +0200 Translation update done using Pootle. commit 94e5999dd81216583aeeac88b31e8fc42797365f Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:39:22 2010 +0200 Translation update done using Pootle. commit cecc8bb0c59a80756f58e119020d55e6ffd516a1 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:37:52 2010 +0200 Translation update done using Pootle. commit 67f3d246f6379a98d66ebdb3837187b659619a32 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:37:45 2010 +0200 Translation update done using Pootle. commit 38f6e7186470691b4a6a9e37b047597eabf309a4 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:37:12 2010 +0200 Translation update done using Pootle. commit 678c57431d44f1ab88e42902206948ce5d96a43c Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:35:01 2010 +0200 Translation update done using Pootle. commit eaae93c94a6982b7d1ad47db91a3554f20973af6 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:34:27 2010 +0200 Translation update done using Pootle. commit 4d359029c1a22d6d1ac019b4a4ea0a11de7aa652 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:34:15 2010 +0200 Translation update done using Pootle. commit bfb44a4d506cc32e04e511909675b86fd384cca2 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:34:01 2010 +0200 Translation update done using Pootle. commit 9da3ad896e8729ae2099ae0c11f2e4375b21a1aa Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:31:15 2010 +0200 Translation update done using Pootle. commit b0f65dd209a3ef02f0c2618577c20163c6342646 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:30:55 2010 +0200 Translation update done using Pootle. commit 22bd74a6e3a8b7a9851bb7aae6d178234d3b9d29 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:30:38 2010 +0200 Translation update done using Pootle. commit 9608ed6ef646d4be1ddb8f68e3f57ad7f3b42bed Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:30:27 2010 +0200 Translation update done using Pootle. commit 16f30754f6edab98ce0f4fe88f69fac3f10a9630 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:29:37 2010 +0200 Translation update done using Pootle. commit 55ab76b1842d6b9a5db2067d54a04583eab3de72 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:29:09 2010 +0200 Translation update done using Pootle. commit 64a89c86957983c81ab656e45f42a2e3c3402ae2 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:28:47 2010 +0200 Translation update done using Pootle. commit 65e2aed585cbb0989ec8259e4038c2b6e5e8faff Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:28:17 2010 +0200 Translation update done using Pootle. commit cf21d7a0b602ffd78306b27f93ea65fd3e4dd381 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:26:10 2010 +0200 Translation update done using Pootle. commit 86aa237dfe2fc4a624f1770f41b9bfa2a118e1d4 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:25:40 2010 +0200 Translation update done using Pootle. commit 9f36a3cb787c8559c4e230116ed2fcca916e32ba Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:25:16 2010 +0200 Translation update done using Pootle. commit aab1984d2771f1a8660cb5ead84b221a5791538a Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:24:17 2010 +0200 Translation update done using Pootle. commit c6426d4e04c8c6aa9d4684608a8139d23b031db3 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:24:06 2010 +0200 Translation update done using Pootle. commit 17cd48f6a6248a8dae3a4ec2433fbc2bfa865dc2 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:23:37 2010 +0200 Translation update done using Pootle. commit 8cd7a1a4623263c10cf1554a9adc3a96340ca251 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:22:05 2010 +0200 Translation update done using Pootle. commit 8055a4b48481f2adb3fa8ac8da9a4e710a681913 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:21:23 2010 +0200 Translation update done using Pootle. commit ae77c7a03ed84a2e215f07d1f9112c34b6268131 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:20:40 2010 +0200 Translation update done using Pootle. commit 4929f2909c286094bcfe67549fedb55b1188f1b1 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:19:57 2010 +0200 Translation update done using Pootle. commit 5a7db4a2432d0c17f45980b4d0360eabec25dad7 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:18:49 2010 +0200 Translation update done using Pootle. commit 798d9c583e6a4d5ef8ea4358efff700e539b236e Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:18:40 2010 +0200 Translation update done using Pootle. commit 94e2c68d846d810ba1e12842553293edce43ca70 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:17:56 2010 +0200 Translation update done using Pootle. commit efb37dfc7ee9b5fa2ea224f15ac9385d293c27c7 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:17:40 2010 +0200 Translation update done using Pootle. commit 5d8f252c5219297577f3a6584497902e0995ecd4 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:17:21 2010 +0200 Translation update done using Pootle. commit b43bb942c4b692778ff5eb42371b4c72982961ae Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:16:52 2010 +0200 Translation update done using Pootle. commit f561dceb91a39e40763ae4a138855180264f5f78 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:16:38 2010 +0200 Translation update done using Pootle. commit 19bada9f46f104a4e8cb2bb9999f1b285f936e9e Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:16:17 2010 +0200 Translation update done using Pootle. commit cb700380f1933c9c63af75e566b688a93c1e08ff Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:16:00 2010 +0200 Translation update done using Pootle. commit cd8b6b5107673d734e02d7921f7e2d9cde3ae03e Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:15:26 2010 +0200 Translation update done using Pootle. commit 76440ba48d90e275683cbedeac4f49d711f93266 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:14:32 2010 +0200 Translation update done using Pootle. commit 3fdc285c46ca6a4704099342689d143e6eb75e24 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:13:32 2010 +0200 Translation update done using Pootle. commit 8a43ee442e80cdafd38009d1ad458ce81434a728 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:13:26 2010 +0200 Translation update done using Pootle. commit 19f1159d7d174e620b165db15417b1320fe052e3 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:12:48 2010 +0200 Translation update done using Pootle. commit a4915d9b9b0274fa2c504288bd4ec72077cf0e78 Author: u4663530 <u4663530(a)anu.edu.au> Date: Fri May 14 06:12:01 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/hi.po | 82 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 42 insertions(+), 40 deletions(-) diff --git a/po/hi.po b/po/hi.po index b270eeb..045a5b8 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-13 11:30+0200\n" -"PO-Revision-Date: 2010-05-13 09:11+0200\n" +"PO-Revision-Date: 2010-05-14 06:41+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -422,40 +422,40 @@ msgstr "उपयोग में" #: libraries/export/sql.php:514 libraries/messages.inc.php:1028 #: pdf_schema.php:1241 tbl_printview.php:434 tbl_structure.php:810 msgid "Creation" -msgstr "" +msgstr "रचना" #: db_printview.php:196 libraries/db_info.inc.php:93 #: libraries/export/sql.php:519 libraries/messages.inc.php:1032 #: pdf_schema.php:1246 tbl_printview.php:444 tbl_structure.php:818 msgid "Last update" -msgstr "" +msgstr "पिछला नवीनीकरण" #: db_printview.php:205 libraries/db_info.inc.php:98 #: libraries/export/sql.php:524 libraries/messages.inc.php:1027 #: pdf_schema.php:1251 tbl_printview.php:454 tbl_structure.php:826 msgid "Last check" -msgstr "" +msgstr "पिछली जाँच" #: db_printview.php:222 db_structure.php:480 libraries/messages.inc.php:1081 #, php-format msgid "%s table(s)" -msgstr " %s टेबल(s)" +msgstr " %s टेबल(s)" #: db_qbe.php:29 libraries/display_tbl.lib.php:1981 #: libraries/messages.inc.php:1047 libraries/sql_query_form.lib.php:140 #: tbl_operations.php:213 tbl_relation.php:292 tbl_row_action.php:131 #: view_operations.php:62 msgid "Your SQL query has been executed successfully" -msgstr "आपकी SQL-query सफलता से पूरा किया" +msgstr "आपकी SQL कुएरी सफलता के साथ पूरी की गई है." #: db_qbe.php:42 libraries/messages.inc.php:367 msgid "You have to choose at least one column to display" -msgstr "" +msgstr "आपको कम से कम एक स्तंभ प्रदर्शित करने के लिए चयन करना है." #: db_qbe.php:200 libraries/db_structure.lib.php:104 #: libraries/display_tbl.lib.php:866 libraries/messages.inc.php:1010 msgid "Sort" -msgstr "" +msgstr "सॉर्ट" #: db_qbe.php:209 db_qbe.php:243 libraries/db_structure.lib.php:111 #: libraries/display_tbl.lib.php:523 libraries/display_tbl.lib.php:828 @@ -469,7 +469,7 @@ msgstr "आरोही" #: libraries/messages.inc.php:247 server_databases.php:170 #: server_databases.php:187 tbl_operations.php:261 tbl_select.php:315 msgid "Descending" -msgstr "" +msgstr "अवरोही" #: db_qbe.php:264 db_tracking.php:78 libraries/display_tbl.lib.php:308 #: libraries/messages.inc.php:884 tbl_change.php:277 tbl_tracking.php:597 @@ -478,12 +478,12 @@ msgstr "दिखाओ" #: db_qbe.php:300 libraries/messages.inc.php:198 msgid "Criteria" -msgstr "" +msgstr "मापदंड" #: db_qbe.php:353 db_qbe.php:435 db_qbe.php:527 db_qbe.php:558 #: libraries/messages.inc.php:714 msgid "Ins" -msgstr "" +msgstr "इन्सर्ट" #: db_qbe.php:357 db_qbe.php:439 db_qbe.php:524 db_qbe.php:555 #: libraries/messages.inc.php:52 @@ -493,7 +493,7 @@ msgstr "और" #: db_qbe.php:366 db_qbe.php:447 db_qbe.php:529 db_qbe.php:560 #: libraries/messages.inc.php:713 msgid "Del" -msgstr "" +msgstr "हटाइए" #: db_qbe.php:370 db_qbe.php:451 db_qbe.php:522 db_qbe.php:553 #: libraries/display_import.lib.php:166 libraries/messages.inc.php:588 @@ -504,7 +504,7 @@ msgstr "अथवा" #: db_qbe.php:507 libraries/messages.inc.php:512 msgid "Modify" -msgstr "" +msgstr "संशोधित" #: db_qbe.php:584 libraries/messages.inc.php:29 msgid "Add/Delete Criteria Row" @@ -516,20 +516,20 @@ msgstr "क्षेत्र कोलम जोडें/हटायें" #: db_qbe.php:609 db_qbe.php:634 libraries/messages.inc.php:1188 msgid "Update Query" -msgstr " क्वरी अपडेट करो" +msgstr "क्वरी का नवीनीकरण करें" #: db_qbe.php:617 libraries/messages.inc.php:1212 msgid "Use Tables" -msgstr " टेबल का उपयोग करो" +msgstr "टेबल का उपयोग करो" #: db_qbe.php:640 libraries/messages.inc.php:719 #, php-format msgid "SQL query on database <b>%s</b>:" -msgstr "" +msgstr "डेटाबेस <b>%s<b> पर SQL प्रश्न:" #: db_qbe.php:934 libraries/common.lib.php:1223 libraries/messages.inc.php:819 msgid "Submit Query" -msgstr "" +msgstr "प्रश्न प्रस्तुत करें" #: db_search.php:68 libraries/auth/config.auth.lib.php:84 #: libraries/auth/config.auth.lib.php:103 @@ -552,17 +552,17 @@ msgstr "यथार्थ वाक्यांश" #: db_search.php:83 db_search.php:314 libraries/messages.inc.php:835 msgid "as regular expression" -msgstr "" +msgstr "नियमित अभिव्यक्ति के रूप में" #: db_search.php:242 libraries/messages.inc.php:836 #, php-format msgid "Search results for \"<i>%s</i>\" %s:" -msgstr "\"<i>%s</i>\" %s के लिये सर्च के परिणाम :" +msgstr "<i>%s</i> %s के लिये परिणाम खोजें:" #: db_search.php:260 libraries/messages.inc.php:575 #, php-format msgid "%s match(es) inside table <i>%s</i>" -msgstr "" +msgstr "<i>%s</i> तालिका के अंदर %s मैच हैं." #: db_search.php:267 db_structure.php:77 db_structure.php:78 #: db_structure.php:90 db_structure.php:92 db_structure.php:103 @@ -579,16 +579,16 @@ msgstr "ब्राउज़" #: setup/frames/index.inc.php:125 setup/frames/index.inc.php:216 #: tbl_row_action.php:63 msgid "Delete" -msgstr "डिलीट" +msgstr "मिटाएँ" #: db_search.php:285 libraries/messages.inc.php:576 #, php-format msgid "<b>Total:</b> <i>%s</i> match(es)" -msgstr "" +msgstr "<b>कुल:</b> <i>%s</i> मैच" #: db_search.php:299 libraries/messages.inc.php:828 msgid "Search in database" -msgstr "डाटाबेस में सर्च करें" +msgstr "डाटाबेस में खोजें" #: db_search.php:302 libraries/messages.inc.php:831 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" @@ -600,7 +600,7 @@ msgstr "खोजो:" #: db_search.php:311 db_search.php:312 libraries/messages.inc.php:1013 msgid "Words are separated by a space character (\" \")." -msgstr "शब्दों में space (\" \") से अंतर करें." +msgstr "शब्द स्पेस(\" \") करक्टेर से अलग किये गए हैं." #: db_search.php:325 libraries/messages.inc.php:830 msgid "Inside table(s):" @@ -608,7 +608,7 @@ msgstr " टेबल में:" #: db_search.php:355 libraries/messages.inc.php:829 msgid "Inside field:" -msgstr "" +msgstr "क्षेत्र के अंदर:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 @@ -635,7 +635,7 @@ msgstr "संरचना" #: tbl_structure.php:27 tbl_structure.php:151 tbl_structure.php:152 #: tbl_structure.php:472 msgid "Drop" -msgstr " ड्रोप" +msgstr "छोड़ें" #: db_structure.php:86 db_structure.php:87 db_structure.php:99 #: db_structure.php:100 db_structure.php:112 db_structure.php:113 @@ -649,27 +649,27 @@ msgstr "खाली करें" #: libraries/tbl_links.inc.php:100 #, php-format msgid "Table %s has been emptied" -msgstr " टेबल %s को खाली किया" +msgstr " टेबल %s को खाली किया गया है." #: db_structure.php:326 libraries/messages.inc.php:1225 #: libraries/tbl_links.inc.php:133 #, php-format msgid "View %s has been dropped" -msgstr "" +msgstr "वीयू %s छोड़ दिया गया है." #: db_structure.php:326 libraries/messages.inc.php:1070 #: libraries/tbl_links.inc.php:133 #, php-format msgid "Table %s has been dropped" -msgstr " टेबल %s को ड्रोप किया" +msgstr " टेबल %s को ड्रोप किया गया है." #: db_structure.php:333 libraries/messages.inc.php:1124 msgid "Tracking is active." -msgstr "" +msgstr "ट्रैकिंग सक्रिय है" #: db_structure.php:335 libraries/messages.inc.php:1125 msgid "Tracking is not active." -msgstr "" +msgstr "ट्रैकिंग सक्रिय नहीं है." #: db_structure.php:420 libraries/display_tbl.lib.php:1944 #: libraries/messages.inc.php:1224 @@ -678,18 +678,20 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" +"इस वियु में कम से कम इतनी पंक्तियाँ हैं. और जानने के लिए %s दोक्युमेंताशन%s " +" पढ़ें." #: db_structure.php:434 db_structure.php:448 libraries/header.inc.php:126 #: libraries/messages.inc.php:1229 libraries/tbl_info.inc.php:66 #: tbl_structure.php:185 test/theme.php:74 msgid "View" -msgstr "" +msgstr "दृश्य" #: db_structure.php:485 libraries/db_structure.lib.php:49 #: libraries/messages.inc.php:769 libraries/server_links.inc.php:70 #: server_replication.php:33 server_replication.php:164 server_status.php:258 msgid "Replication" -msgstr "" +msgstr "प्रतिकृति" #: db_structure.php:489 libraries/messages.inc.php:1049 msgid "Sum" @@ -699,7 +701,7 @@ msgstr "जोड" #: libraries/messages.inc.php:235 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s इस MySQL सर्वर पर डिफ़ॉल्ट भंडारण इंजन है." #: db_structure.php:524 db_structure.php:541 db_structure.php:542 #: libraries/display_tbl.lib.php:2081 libraries/display_tbl.lib.php:2086 @@ -724,25 +726,25 @@ msgstr " सभी को अनचेक करें" #: db_structure.php:536 libraries/messages.inc.php:146 msgid "Check tables having overhead" -msgstr "" +msgstr " ओवर्हेअद वाली तालुकाओं को चेक करें." #: db_structure.php:547 db_structure.php:548 db_structure.php:599 #: libraries/display_tbl.lib.php:2180 libraries/messages.inc.php:668 #: libraries/mult_submits.inc.php:28 tbl_structure.php:493 #: tbl_structure.php:495 msgid "Print view" -msgstr "" +msgstr "छापने वाला द्रश्य." #: db_structure.php:549 db_structure.php:550 libraries/messages.inc.php:149 #: libraries/mult_submits.inc.php:42 tbl_operations.php:579 msgid "Check table" -msgstr " टेबल को चेक करें" +msgstr " टेबल को चेक करें" #: db_structure.php:551 db_structure.php:552 libraries/messages.inc.php:586 #: libraries/mult_submits.inc.php:47 tbl_operations.php:619 #: tbl_structure.php:710 tbl_structure.php:712 msgid "Optimize table" -msgstr " टेबल को Optimize करें" +msgstr "तालिका को अनुकूलित करें" #: db_structure.php:553 db_structure.php:554 libraries/messages.inc.php:754 #: libraries/mult_submits.inc.php:52 tbl_operations.php:609 @@ -766,7 +768,7 @@ msgstr "एक्सपोर्ट" #: db_tracking.php:66 libraries/messages.inc.php:1147 msgid "Tracked tables" -msgstr "" +msgstr "ट्रैक कि गए तालिकाएं." #: db_tracking.php:71 libraries/export/htmlword.php:86 #: libraries/export/latex.php:148 libraries/export/odt.php:113 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3217-g560104d
by Michal Čihař 13 May '10

13 May '10

The branch, master has been updated via 560104da7293c533f86cdc7087498979491bed26 (commit) from 3436ce42cc81fc14854b188fd7ad8dcb7103343b (commit) - Log ----------------------------------------------------------------- commit 560104da7293c533f86cdc7087498979491bed26 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu May 13 11:34:52 2010 +0200 Ignore generated docs. ----------------------------------------------------------------------- Summary of changes: .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index bae35cb..3e12f7d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ locale *~ # Javascript sources sources +# API documentation +apidoc hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3214-g588a63e
by Michal Čihař 13 May '10

13 May '10

The branch, master has been updated via 588a63e6c00ce7c8148bbb12c673d35fe8b35625 (commit) from 00d7b8a659fd08fb06eaf253eefee3ce631c4572 (commit) - Log ----------------------------------------------------------------- commit 588a63e6c00ce7c8148bbb12c673d35fe8b35625 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu May 13 11:23:57 2010 +0200 These globals are no longer needed. ----------------------------------------------------------------------- Summary of changes: test/PMA_localisedDateTimespan_test.php | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/test/PMA_localisedDateTimespan_test.php b/test/PMA_localisedDateTimespan_test.php index 2925bd5..e472373 100644 --- a/test/PMA_localisedDateTimespan_test.php +++ b/test/PMA_localisedDateTimespan_test.php @@ -49,7 +49,7 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase $this->tmpGlobals = $GLOBALS; $this->tmpSession = $_SESSION; - $this->tmpTimezone = date_default_timezone_get(); + $this->tmpTimezone = date_default_timezone_get(); date_default_timezone_set('Europe/London'); } @@ -81,10 +81,6 @@ class PMA_localisedDateTimespan_test extends PHPUnit_Framework_TestCase */ public function testLocalisedDate($a, $b, $e) { - $GLOBALS['day_of_week'] = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); - $GLOBALS['month'] = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'); - $GLOBALS['datefmt'] = '%B %d, %Y at %I:%M %p'; - $this->assertEquals($e, PMA_localisedDate($a, $b)); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-3210-g1a76ffe
by Michal Čihař 13 May '10

13 May '10

The branch, master has been updated via 1a76ffe3245be13192fa6949a529260f56ba7861 (commit) via bebea4c6753739312efe1060e69386796af50b10 (commit) via 92343e1b8cacd0ef7794fb6c1f3de2ad9ac5d061 (commit) via c7d795ce01b2f89dabecc19020448b8f5f8b835f (commit) via b200624e6803b0bf2226192cc9ef6f28bd2b518a (commit) via 3216d4bb34b8e1796ce57ccf7a7a86654f8a1cdc (commit) via 030acfc80c5461acc6b9cc7dc46a51d9c8a12a3c (commit) via e94ddb04942cc9b94a1f995ca200b577321005e8 (commit) via c9eaff30d0670861dde9ff47e079c3b5ca55aa02 (commit) via fe77eaaf57118aee052f0efb6a57992a1352a0e2 (commit) via df69f785fdb9693f40af3a41116652311b6c0c33 (commit) via ea25c18bdc733962b1e8f8d37073c9bb5b104629 (commit) via 008aedbc1fdab6837488208714253eef639aa987 (commit) from 89183886a69f8b4e00ec222de792f42c39a48cf7 (commit) - Log ----------------------------------------------------------------- commit 1a76ffe3245be13192fa6949a529260f56ba7861 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:11:40 2010 +0200 Translation update done using Pootle. commit bebea4c6753739312efe1060e69386796af50b10 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:11:06 2010 +0200 Translation update done using Pootle. commit 92343e1b8cacd0ef7794fb6c1f3de2ad9ac5d061 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:10:37 2010 +0200 Translation update done using Pootle. commit c7d795ce01b2f89dabecc19020448b8f5f8b835f Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:09:32 2010 +0200 Translation update done using Pootle. commit b200624e6803b0bf2226192cc9ef6f28bd2b518a Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:08:23 2010 +0200 Translation update done using Pootle. commit 3216d4bb34b8e1796ce57ccf7a7a86654f8a1cdc Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:06:54 2010 +0200 Translation update done using Pootle. commit 030acfc80c5461acc6b9cc7dc46a51d9c8a12a3c Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:06:15 2010 +0200 Translation update done using Pootle. commit e94ddb04942cc9b94a1f995ca200b577321005e8 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:00:44 2010 +0200 Translation update done using Pootle. commit c9eaff30d0670861dde9ff47e079c3b5ca55aa02 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 09:00:08 2010 +0200 Translation update done using Pootle. commit fe77eaaf57118aee052f0efb6a57992a1352a0e2 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 08:59:45 2010 +0200 Translation update done using Pootle. commit df69f785fdb9693f40af3a41116652311b6c0c33 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 08:59:26 2010 +0200 Translation update done using Pootle. commit ea25c18bdc733962b1e8f8d37073c9bb5b104629 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 08:58:55 2010 +0200 Translation update done using Pootle. commit 008aedbc1fdab6837488208714253eef639aa987 Author: u4663530 <u4663530(a)anu.edu.au> Date: Thu May 13 08:58:19 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/hi.po | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/po/hi.po b/po/hi.po index 3351db9..0de2744 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-11 13:05-0400\n" -"PO-Revision-Date: 2010-05-13 05:52+0200\n" +"PO-Revision-Date: 2010-05-13 09:11+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" "Language: hi\n" @@ -337,18 +337,20 @@ msgid "" "The additional features for working with linked tables have been " "deactivated. To find out why click %shere%s." msgstr "" +"लिंक्ड तालिकाओं के साथ काम करने के लिए अतिरिक्त सुविधाओं को निष्क्रिय कर " +"दिया गया है. क्यों ये किया गया है, जानने के लिए %shere%s पर क्लिक करें." #: db_operations.php:645 libraries/messages.inc.php:272 pdf_pages.php:528 msgid "Display PDF schema" -msgstr "PDF schema दिखाओ" +msgstr "PDF स्कीमा दिखाओ" #: db_operations.php:661 libraries/messages.inc.php:885 pdf_pages.php:529 msgid "Show grid" -msgstr "grid दिखाओ" +msgstr "ग्रिड दिखाओ" #: db_operations.php:664 libraries/messages.inc.php:882 pdf_pages.php:530 msgid "Show color" -msgstr "रंगीन दिखाओ" +msgstr "रंग दिखाओ" #: db_operations.php:666 libraries/messages.inc.php:1006 pdf_pages.php:531 msgid "Show dimension of tables" @@ -361,7 +363,7 @@ msgstr "समान चौड़ाई के सभी टेबल को प #: db_operations.php:672 db_structure.php:606 libraries/messages.inc.php:235 #: pdf_pages.php:533 msgid "Data Dictionary" -msgstr "" +msgstr "डेटा शब्दकोश" #: db_operations.php:674 libraries/messages.inc.php:892 pdf_pages.php:534 msgid "Only show keys" @@ -369,11 +371,11 @@ msgstr "" #: db_operations.php:676 libraries/messages.inc.php:883 pdf_pages.php:535 msgid "Data Dictionary Format" -msgstr "" +msgstr "डेटा शब्दकोश प्रारूप" #: db_operations.php:678 libraries/messages.inc.php:472 pdf_pages.php:537 msgid "Landscape" -msgstr "" +msgstr "परिदृश्य" #: db_operations.php:679 libraries/messages.inc.php:671 pdf_pages.php:538 msgid "Portrait" @@ -381,11 +383,11 @@ msgstr "" #: db_operations.php:682 libraries/messages.inc.php:607 pdf_pages.php:541 msgid "Paper size" -msgstr "" +msgstr "पेपर आकार" #: db_operations.php:706 libraries/messages.inc.php:289 msgid "Edit PDF Pages" -msgstr "PDF पेज एडिट करें" +msgstr "पीडीएफ पृष्ठों को संपादित करें" #: db_printview.php:96 db_qbe.php:102 db_structure.php:51 db_tracking.php:35 #: export.php:359 libraries/messages.inc.php:576 navigation.php:346 @@ -404,17 +406,17 @@ msgstr " टेबल " #: db_printview.php:105 libraries/db_structure.lib.php:56 #: libraries/messages.inc.php:743 msgid "Records" -msgstr "" +msgstr "अभिलेख" #: db_printview.php:109 libraries/db_structure.lib.php:67 #: libraries/messages.inc.php:1011 tbl_indexes.php:190 msgid "Size" -msgstr "" +msgstr "आकार" #: db_printview.php:162 db_structure.php:457 libraries/export/sql.php:559 #: libraries/export/sql.php:899 libraries/messages.inc.php:444 msgid "in use" -msgstr "" +msgstr "उपयोग में" #: db_printview.php:187 libraries/db_info.inc.php:88 #: libraries/export/sql.php:514 libraries/messages.inc.php:1040 hooks/post-receive -- phpMyAdmin

1 0