Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-01 22:21:37 +02:00
commit ba9b58ca64
2 changed files with 2 additions and 2 deletions

View File

@ -303,7 +303,7 @@ $js_messages['strContinue'] = __('Continue');
/** For normalization */
$js_messages['strAddUniqueIndex'] = __('Add unique/primary index');
$js_messages['uniqueColAdded'] = __('Unique column(s) added.');
$js_messages['toNextStep'] = __('Taking you to next step ...');
$js_messages['toNextStep'] = __('Taking you to next step');
$js_messages['strFinishMsg'] = __("The first step of normalization is complete for table '%s'.");
$js_messages['strEndStep'] = __("End of step");

View File

@ -178,7 +178,7 @@ function PMA_getHtmlContentsFor1NFStep2($db, $table)
$extra = '';
if ($hasPrimaryKey) {
$headText = __("Unique column(s) already exist");
$subText = __("Taking you to next step ...");
$subText = __("Taking you to next step");
} else {
$headText = __(
"There are no unique columns. Add a unique column "