diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 8bfef6bc3..d04709265 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1754,7 +1754,7 @@ function wp_handle_upload(&$file, $overrides = false) { // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; if ( false === move_uploaded_file($file['tmp_name'], $new_file) ) - die('The uploaded file could not be moved to $file.'); + die(__('The uploaded file could not be moved to $file.')); // Set correct file permissions $stat = stat(dirname($new_file)); diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index c4bd95c8c..c03d3a886 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -133,7 +133,7 @@ function newCatAddIn() { newcatSub.type = 'button'; newcatSub.name = 'Button'; newcatSub.id = 'catadd'; - newcatSub.value = ''; + newcatSub.value = ''; newcatSub.onclick = ajaxNewCat; ajaxcat.appendChild(newcat); @@ -141,7 +141,7 @@ function newCatAddIn() { document.getElementById('jaxcat').appendChild(ajaxcat); howto = document.createElement('span'); - howto.innerHTML = ''; + howto.innerHTML = ''; howto.id = 'howto'; ajaxcat.appendChild(howto); } @@ -160,17 +160,17 @@ function getResponseElement() { function newCatLoading() { var p = getResponseElement(); - p.innerHTML = 'Sending Data...'; + p.innerHTML = ''; } function newCatLoaded() { var p = getResponseElement(); - p.innerHTML = 'Data Sent...'; + p.innerHTML = ''; } function newCatInteractive() { var p = getResponseElement(); - p.innerHTML = 'Processing Request...'; + p.innerHTML = ''; } function newCatCompletion() { @@ -186,11 +186,11 @@ function newCatCompletion() { id = ids[i]; // alert(id); if ( id == '-1' ) { - p.innerHTML = "You don't have permission to do that."; + p.innerHTML = ""; return; } if ( id == '0' ) { - p.innerHTML = "That category name is invalid. Try something else."; + p.innerHTML = ""; return; } diff --git a/wp-admin/execute-pings.php b/wp-admin/execute-pings.php index 6dc575f15..69811f744 100644 --- a/wp-admin/execute-pings.php +++ b/wp-admin/execute-pings.php @@ -2,7 +2,7 @@ require_once('admin.php'); if ( ! current_user_can('edit_posts') ) - die ("Cheatin' uh?"); + die (__("Cheatin' uh?")); echo '/* No Styles Here */'; register_shutdown_function('execute_all_pings'); diff --git a/wp-admin/index.php b/wp-admin/index.php index 8f9f8ac82..d6d407edc 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -129,7 +129,7 @@ if (0 < $numcats) $numcats = number_format($numcats); $rss = @fetch_rss('http://wordpress.org/development/feed/'); if ( isset($rss->items) && 0 != count($rss->items) ) { ?> -
It will just set them back to the default category %s.'), get_linkcatname(1)) ?>
Inserted %s
"), $names[$i]); + echo sprintf(''.__('Inserted %s').'
', $names[$i]); } ?>manage those links
.'), $link_count, $cat_id, 'link-manager.php') ?> diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index ab2014d51..4c1a2f878 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -291,7 +291,7 @@ function checkAll(form) echo " selected='selected'"; echo ">".$row->cat_id.": ".wp_specialchars($row->cat_name); if ($row->auto_toggle == 'Y') - echo ' (auto toggle)'; + echo ' '.__('(auto toggle)'); echo "\n"; } echo " \n"; diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php index 8ec046584..196f3cb0d 100644 --- a/wp-admin/link-parse-opml.php +++ b/wp-admin/link-parse-opml.php @@ -55,11 +55,11 @@ $xml_parser = xml_parser_create(); xml_set_element_handler($xml_parser, "startElement", "endElement"); if (!xml_parse($xml_parser, $opml, true)) { - echo(sprintf("XML error: %s at line %d", + echo(sprintf(__('XML error: %1$s at line %2$s'), xml_error_string(xml_get_error_code($xml_parser)), xml_get_current_line_number($xml_parser))); } // Free up memory used by the XML parser xml_parser_free($xml_parser); -?> \ No newline at end of file +?> diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index 2d443ad87..a3c3d7f49 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -32,7 +32,7 @@ switch($action) { case 'update': if ( ! current_user_can('moderate_comments') ) - die(__('Your level is not high enough to moderate comments.
')); + die(''.__('Your level is not high enough to moderate comments.').'
'); $item_ignored = 0; $item_deleted = 0; @@ -84,30 +84,30 @@ if ( isset($_GET['deleted']) || isset($_GET['approved']) || isset($_GET['ignored $spam = (int) $_GET['spam']; if ($approved) { if ('1' == $approved) { - echo __("1 comment approved'.__("Currently there are no comments for you to moderate.") . "
\n"; } ?> diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index a429d37cd..37aed6b0c 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -35,7 +35,7 @@ switch($action) { case 'update': if ( !current_user_can('edit_plugins') ) - die(__('You have do not have sufficient permissions to edit templates for this blog.
')); + die(''.__('You have do not have sufficient permissions to edit templates for this blog.').'
'); $newcontent = stripslashes($_POST['newcontent']); if (is_writeable($real_file)) { @@ -55,7 +55,7 @@ default: require_once('admin-header.php'); if ( !current_user_can('edit_plugins') ) - die(__('You have do not have sufficient permissions to edit plugins for this blog.
')); + die(''.__('You have do not have sufficient permissions to edit plugins for this blog.').'
'); update_recently_edited("wp-content/plugins/$file"); diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 1e414b4a9..d06a22c1a 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -72,7 +72,9 @@ if ( get_settings('active_plugins') ) $plugins = get_plugins(); if (empty($plugins)) { - _e("Couldn't open plugins directory or there are no plugins available.
"); // TODO: make more helpful + echo ''; + _e("Couldn't open plugins directory or there are no plugins available."); // TODO: make more helpful + echo '
'; } else { ?>{$plugin_data['Title']} | {$plugin_data['Version']} | -{$plugin_data['Description']} By {$plugin_data['Author']}. | +{$plugin_data['Description']} ".sprintf(__('By %s'), $plugin_data['Author']).". | $action |