gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-02-02 11:19:33 +01:00
commit 691bfccb9a
20 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/Message.class.php
View File

@ -177,7 +177,7 @@ class PMA_Message
static public function success($string = '')
{
if (empty($string)) {
$string = __('Your SQL query has been executed successfully');
$string = __('Your SQL query has been executed successfully.');
}
return new PMA_Message($string, PMA_Message::SUCCESS);

4
libraries/config/Validator.class.php
View File

@ -366,12 +366,12 @@ class PMA_Validator
$result = array();
if ($values['Servers/1/controluser'] == '') {
$result['Servers/1/controluser']
= __('Empty phpMyAdmin control user while using pmadb');
= __('Empty phpMyAdmin control user while using pmadb!');
$error = true;
}
if ($values['Servers/1/controlpass'] == '') {
$result['Servers/1/controlpass']
= __('Empty phpMyAdmin control user password while using pmadb');
= __('Empty phpMyAdmin control user password while using pmadb!');
$error = true;
}
if (! $error) {

6
libraries/import.lib.php
View File

@ -1225,9 +1225,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null,
$message = '<br /><br />';
$message .= '<strong>' . __('The following structures have either been created or altered. Here you can:') . '</strong><br />';
$message .= '<ul><li>' . __("View a structure's contents by clicking on its name") . '</li>';
$message .= '<li>' . __('Change any of its settings by clicking the corresponding "Options" link') . '</li>';
$message .= '<li>' . __('Edit structure by following the "Structure" link') . '</li>';
$message .= '<ul><li>' . __("View a structure's contents by clicking on its name.") . '</li>';
$message .= '<li>' . __('Change any of its settings by clicking the corresponding "Options" link.') . '</li>';
$message .= '<li>' . __('Edit structure by following the "Structure" link.') . '</li>';
$message .= sprintf(
'<br /><li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">'
. __('Options') . '</a>)</li>',

2
libraries/insert_edit.lib.php
View File

@ -655,7 +655,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
if (strlen($special_chars) > 32000) {
$html_output .= "</td>\n";
$html_output .= '<td>' . __(
'Because of its length,<br /> this column might not be editable'
'Because of its length,<br /> this column might not be editable.'
);
}

4
libraries/plugins/import/ImportShp.class.php
View File

@ -202,7 +202,7 @@ class ImportShp extends ImportPlugin
$message = PMA_Message::error(
__(
'You tried to import an invalid file or the imported file'
. ' contains invalid data'
. ' contains invalid data!'
)
);
} else {
@ -255,7 +255,7 @@ class ImportShp extends ImportPlugin
if (count($rows) == 0) {
$error = true;
$message = PMA_Message::error(
__('The imported file does not contain any data')
__('The imported file does not contain any data!')
);
return;
}

4
libraries/replication_gui.lib.php
View File

@ -994,11 +994,11 @@ function PMA_handleRequestForSlaveChangeMaster()
) {
$_SESSION['replication']['sr_action_status'] = 'error';
$_SESSION['replication']['sr_action_info']
= __('Unable to change master');
= __('Unable to change master!');
} else {
$_SESSION['replication']['sr_action_status'] = 'success';
$_SESSION['replication']['sr_action_info'] = sprintf(
__('Master server changed successfully to %s'),
__('Master server changed successfully to %s.'),
htmlspecialchars($sr['hostname'])
);
}

4
libraries/rte/rte_events.lib.php
View File

@ -570,14 +570,14 @@ function PMA_EVN_getQueryFromRequest()
$query .= 'DEFINER=' . PMA_Util::backquote($arr[0]);
$query .= '@' . PMA_Util::backquote($arr[1]) . ' ';
} else {
$errors[] = __('The definer must be in the "username@hostname" format');
$errors[] = __('The definer must be in the "username@hostname" format!');
}
}
$query .= 'EVENT ';
if (! empty($_REQUEST['item_name'])) {
$query .= PMA_Util::backquote($_REQUEST['item_name']) . ' ';
} else {
$errors[] = __('You must provide an event name');
$errors[] = __('You must provide an event name!');
}
$query .= 'ON SCHEDULE ';
if (! empty($_REQUEST['item_type'])

6
libraries/rte/rte_routines.lib.php
View File

@ -1120,7 +1120,7 @@ function PMA_RTN_getQueryFromRequest()
$query .= 'DEFINER=' . PMA_Util::backquote($arr[0]);
$query .= '@' . PMA_Util::backquote($arr[1]) . ' ';
} else {
$errors[] = __('The definer must be in the "username@hostname" format');
$errors[] = __('The definer must be in the "username@hostname" format!');
}
}
if ($_REQUEST['item_type'] == 'FUNCTION'
@ -1136,7 +1136,7 @@ function PMA_RTN_getQueryFromRequest()
if (! empty($_REQUEST['item_name'])) {
$query .= PMA_Util::backquote($_REQUEST['item_name']);
} else {
$errors[] = __('You must provide a routine name');
$errors[] = __('You must provide a routine name!');
}
$params = '';
$warned_about_dir = false;
@ -1464,7 +1464,7 @@ function PMA_RTN_handleExecute()
$output .= "</fieldset>";
$message = __('Your SQL query has been executed successfully');
$message = __('Your SQL query has been executed successfully.');
if ($routine['item_type'] == 'PROCEDURE') {
$message .= '<br />';

10
libraries/rte/rte_triggers.lib.php
View File

@ -448,28 +448,28 @@ function PMA_TRI_getQueryFromRequest()
$query .= 'DEFINER=' . PMA_Util::backquote($arr[0]);
$query .= '@' . PMA_Util::backquote($arr[1]) . ' ';
} else {
$errors[] = __('The definer must be in the "username@hostname" format');
$errors[] = __('The definer must be in the "username@hostname" format!');
}
}
$query .= 'TRIGGER ';
if (! empty($_REQUEST['item_name'])) {
$query .= PMA_Util::backquote($_REQUEST['item_name']) . ' ';
} else {
$errors[] = __('You must provide a trigger name');
$errors[] = __('You must provide a trigger name!');
}
if (! empty($_REQUEST['item_timing'])
&& in_array($_REQUEST['item_timing'], $action_timings)
) {
$query .= $_REQUEST['item_timing'] . ' ';
} else {
$errors[] = __('You must provide a valid timing for the trigger');
$errors[] = __('You must provide a valid timing for the trigger!');
}
if (! empty($_REQUEST['item_event'])
&& in_array($_REQUEST['item_event'], $event_manipulations)
) {
$query .= $_REQUEST['item_event'] . ' ';
} else {
$errors[] = __('You must provide a valid event for the trigger');
$errors[] = __('You must provide a valid event for the trigger!');
}
$query .= 'ON ';
if (! empty($_REQUEST['item_table'])
@ -477,7 +477,7 @@ function PMA_TRI_getQueryFromRequest()
) {
$query .= PMA_Util::backquote($_REQUEST['item_table']);
} else {
$errors[] = __('You must provide a valid table name');
$errors[] = __('You must provide a valid table name!');
}
$query .= ' FOR EACH ROW ';
if (! empty($_REQUEST['item_definition'])) {

6
libraries/server_privileges.lib.php
View File

@ -826,7 +826,7 @@ function PMA_getHtmlForTableSpecificPrivileges(
. '<fieldset id="fieldset_user_priv">' . "\n"
. '<legend data-submenu-label="Table">' . __('Table-specific privileges')
. PMA_Util::showHint(
__('Note: MySQL privilege names are expressed in English')
__('Note: MySQL privilege names are expressed in English.')
)
. '</legend>' . "\n";
@ -1011,7 +1011,7 @@ function PMA_getHtmlForGlobalOrDbSpecificPrivs($db, $table, $row)
. '<label for="addUsersForm_checkall">' . __('Check All') . '</label> '
. '</legend>'
. '<p><small><i>'
. __('Note: MySQL privilege names are expressed in English')
. __('Note: MySQL privilege names are expressed in English.')
. '</i></small></p>';
// Output the Global privilege tables with checkboxes
@ -2935,7 +2935,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
. '<th>' . __('Password') . '</th>' . "\n"
. '<th>' . __('Global privileges') . ' '
. PMA_Util::showHint(
__('Note: MySQL privilege names are expressed in English')
__('Note: MySQL privilege names are expressed in English.')
)
. '</th>' . "\n";
if ($GLOBALS['cfgRelation']['menuswork']) {

2
libraries/sql_query_form.lib.php
View File

@ -108,7 +108,7 @@ function PMA_getHtmlForSqlQueryForm(
. '<input type="hidden" name="goto" value="'
. htmlspecialchars($goto) . '" />' . "\n"
. '<input type="hidden" name="message_to_show" value="'
. __('Your SQL query has been executed successfully') . '" />'
. __('Your SQL query has been executed successfully.') . '" />'
. "\n" . '<input type="hidden" name="prev_sql_query" value="'
. htmlspecialchars($query) . '" />' . "\n";

5
libraries/tbl_columns_definition_form.lib.php
View File

@ -1039,9 +1039,8 @@ function PMA_getHtmlForColumnLength($columnNumber, $ci, $ci_offset,
. '<p class="enum_notice" id="enum_notice_' . $columnNumber . '_'
. ($ci - $ci_offset)
. '">';
$html .= __('ENUM or SET data too long?')
. '<a href="#" class="open_enum_editor"> '
. __('Get more editing space') . '</a>'
$html .= '<a href="#" class="open_enum_editor"> '
. __('Edit ENUM/SET values') . '</a>'
. '</p>';
return $html;

2
libraries/tbl_relation.lib.php
View File

@ -892,7 +892,7 @@ function PMA_handleUpdatesForForeignKeys($destination_foreign_db,
if (! empty($display_query) && ! $seen_error) {
$GLOBALS['display_query'] = $display_query;
$html_output = PMA_Util::getMessage(
__('Your SQL query has been executed successfully'),
__('Your SQL query has been executed successfully.'),
null, 'success'
);
}

6
pmd_pdf.php
View File

@ -125,10 +125,10 @@ if ($GLOBALS['dbi']->numRows($table_info_result) > 0) {
}
echo '</select>';
echo '</p>';
$choices['import'] = __('Import from selected page');
$choices['export'] = __('Export to selected page');
$choices['import'] = __('Import from selected page.');
$choices['export'] = __('Export to selected page.');
}
$choices['create_export'] = __('Create a page and export to it');
$choices['create_export'] = __('Create a page and export to it.');
if (1 == count($choices)) {
echo $choices['create_export'];

2
prefs_forms.php
View File

@ -83,7 +83,7 @@ if ($form_display->hasErrors()) {
// form has errors
?>
<div class="error config-form">
<b><?php echo __('Cannot save settings, submitted form contains errors') ?></b>
<b><?php echo __('Cannot save settings, submitted form contains errors!') ?></b>
<?php $form_display->displayErrors(); ?>
</div>
<?php

2
setup/frames/form.inc.php
View File

@ -22,7 +22,7 @@ require './libraries/config/setup.forms.php';
$formset_id = filter_input(INPUT_GET, 'formset');
$mode = filter_input(INPUT_GET, 'mode');
if (! isset($forms[$formset_id])) {
PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php'));
PMA_fatalError(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php!'));
}
if (isset($GLOBALS['strConfigFormset_' . $formset_id])) {

2
tbl_find_replace.php
View File

@ -46,7 +46,7 @@ if (isset($_POST['replace'])) {
$connectionCharSet
);
$htmlOutput .= PMA_Util::getMessage(
__('Your SQL query has been executed successfully'),
__('Your SQL query has been executed successfully.'),
null, 'success'
);
}

2
tbl_operations.php
View File

@ -182,7 +182,7 @@ if (isset($result) && empty($message_to_show)) {
if (empty($_message)) {
$_message = $result
? PMA_Message::success(
__('Your SQL query has been executed successfully')
__('Your SQL query has been executed successfully.')
)
: PMA_Message::error(__('Error'));
// $result should exist, regardless of $_message

2
tbl_row_action.php
View File

@ -108,7 +108,7 @@ if (!empty($submit_mult)) {
if ((! empty($submit_mult) || isset($_REQUEST['mult_btn']))
&& ! empty($sql_query)
) {
$disp_message = __('Your SQL query has been executed successfully');
$disp_message = __('Your SQL query has been executed successfully.');
$disp_query = $sql_query;
}

2
view_operations.php
View File

@ -59,7 +59,7 @@ if (isset($result)) {
$_type = 'success';
if (empty($_message)) {
$_message = $result
? __('Your SQL query has been executed successfully')
? __('Your SQL query has been executed successfully.')
: __('Error');
// $result should exist, regardless of $_message
$_type = $result ? 'success' : 'error';