diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php index 34cdffa0b7..eb742dac7d 100644 --- a/wp-admin/edit-attachment-rows.php +++ b/wp-admin/edit-attachment-rows.php @@ -62,7 +62,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) { if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) { ?> - "> + @@ -74,7 +74,7 @@ foreach ($posts_columns as $column_name => $column_display_name ) { case 'media': ?> -
$column_display_name ) { $actions['edit'] = '' . __('Edit') . ''; if ( current_user_can('delete_post', $post->ID) ) $actions['delete'] = "ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . ""; - $actions['view'] = '' . __('View') . ''; + $actions['view'] = '' . __('View') . ''; $action_count = count($actions); $i = 0; echo '
'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'
'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'
'; echo ''.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'
'; + echo ''.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn’t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'
'; echo ''.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'
'; echo ''.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'
'; + echo ''.__('Also, since you’re coming from DotClear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me… You’ll want it.').'
'; echo ''.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'
'; echo ''.sprintf(__('That\'s it! What are you waiting for? Go login!'), '../wp-login.php').'
'; + echo ''.sprintf(__('That’s it! What are you waiting for? Go login!'), '../wp-login.php').'
'; } function db_form() diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 2d54e139af..f16ec43571 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -61,9 +61,9 @@ class GM_Import {- | |||||||||||
' . __('Link text, e.g. "Still Alive by Jonathan Coulton"') . ' | |||||||||||
' . __('Link text, e.g. “Still Alive by Jonathan Coulton”') . ' | |||||||||||
@@ -1974,7 +1974,7 @@ function type_url_form_video() { | |||||||||||
' . __('Link text, e.g. "Lucy on YouTube"') . ' | |||||||||||
' . __('Link text, e.g. “Lucy on YouTube“') . ' | |||||||||||
@@ -2009,7 +2009,7 @@ function type_url_form_file() { | |||||||||||
' . __('Link text, e.g. "Ransom Demands (PDF)"') . ' | |||||||||||
' . __('Link text, e.g. “Ransom Demands (PDF)”') . ' | |||||||||||
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 94466a9460..9133bed9bb 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -125,7 +125,7 @@ function _cat_row( $category, $level, $name_override = false ) {
$name = ( $name_override ? $name_override : $pad . ' ' . $category->name );
$edit_link = "categories.php?action=edit&cat_ID=$category->term_id";
if ( current_user_can( 'manage_categories' ) ) {
- $edit = "name)) . "'>" . attr( $name ) . ' '; + $edit = "name)) . "'>" . attr( $name ) . ' '; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; @@ -296,7 +296,7 @@ function link_cat_row( $category, $name_override = false ) { $name = ( $name_override ? $name_override : $category->name ); $edit_link = "link-category.php?action=edit&cat_ID=$category->term_id"; if ( current_user_can( 'manage_categories' ) ) { - $edit = "name)) . "'>$name "; + $edit = "name)) . "'>$name "; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; @@ -658,7 +658,7 @@ function _tag_row( $tag, $class = '', $taxonomy = 'post_tag' ) { $out .= ' | '; break; case 'name': - $out .= ' | ' . $name . ' '; + $out .= ' | ' . $name . ' '; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; $actions['inline hide-if-no-js'] = '' . __('Quick Edit') . ''; @@ -1436,7 +1436,7 @@ function _post_row($a_post, $pending_comments, $mode) { case 'title': $attributes = 'class="post-title column-title"' . $style; ?> - | >ID ) ) { ?>"> + | >ID ) ) { ?> post_status, array('pending', 'draft')) ) { if ( current_user_can('edit_post', $post->ID) ) - $actions['view'] = '' . __('Preview') . ''; + $actions['view'] = '' . __('Preview') . ''; } else { - $actions['view'] = '' . __('View') . ''; + $actions['view'] = '' . __('View') . ''; } $actions = apply_filters('post_row_actions', $actions, $post); $action_count = count($actions); @@ -1652,7 +1652,7 @@ foreach ($posts_columns as $column_name=>$column_display_name) { $attributes = 'class="post-title page-title column-title"' . $style; $edit_link = get_edit_post_link( $page->ID ); ?> - | >ID ) ) { ?>"> + | >ID ) ) { ?>
ID) ) {
@@ -1662,9 +1662,9 @@ foreach ($posts_columns as $column_name=>$column_display_name) {
}
if ( in_array($post->post_status, array('pending', 'draft')) ) {
if ( current_user_can('edit_page', $page->ID) )
- $actions['view'] = '' . __('Preview') . '';
+ $actions['view'] = '' . __('Preview') . '';
} else {
- $actions['view'] = '' . __('View') . '';
+ $actions['view'] = '' . __('View') . '';
}
$actions = apply_filters('page_row_actions', $actions, $page);
$action_count = count($actions);
@@ -3508,7 +3508,7 @@ function screen_meta($screen) {
$contextual_help = '';
if ( isset($_wp_contextual_help[$screen]) ) {
if ( !empty($title) )
- $contextual_help .= '' . sprintf(__('Get help with "%s"'), $title) . ''; + $contextual_help .= '' . sprintf(__('Get help with “%s”'), $title) . ''; else $contextual_help .= '' . __('Get help with this page') . ''; $contextual_help .= ' \n"; diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php index c6ebbca3ab..f137cbbe45 100644 --- a/wp-admin/includes/theme-install.php +++ b/wp-admin/includes/theme-install.php @@ -301,8 +301,8 @@ function display_theme($theme, $actions = null, $show_details = true) { if ( !is_array($actions) ) { $actions = array(); $actions[] = '' . __('Install') . ''; - $actions[] = '' . __('Preview') . ''; + '&TB_iframe=true&tbWidth=500&tbHeight=350') . '" class="thickbox thickbox-preview onclick" title="' . attr(sprintf(__('Install “%s”'), $name)) . '">' . __('Install') . ''; + $actions[] = '' . __('Preview') . ''; $actions = apply_filters('theme_install_action_links', $actions, $theme); } @@ -310,7 +310,7 @@ function display_theme($theme, $actions = null, $show_details = true) { ?> '> + title=''> diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 652b70ce4d..e9f96796b7 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -169,7 +169,7 @@ function edit_user( $user_id = 0 ) { if ( empty ( $user->user_email ) ) { $errors->add( 'empty_email', __( 'ERROR: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) ); } elseif (!is_email( $user->user_email ) ) { - $errors->add( 'invalid_email', __( "ERROR: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) ); + $errors->add( 'invalid_email', __( 'ERROR: The e-mail address isn’t correct.' ), array( 'form-field' => 'email' ) ); } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) { $errors->add( 'email_exists', __('ERROR: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) ); } diff --git a/wp-admin/install.php b/wp-admin/install.php index 370c34b190..ce3b7beeeb 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -82,11 +82,11 @@ switch($step) { display_header(); ?> -ReadMe documentation at your leisure. Otherwise, just fill in the information below and you\'ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?> +ReadMe documentation at your leisure. Otherwise, just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.'), '../readme.html'); ?> - + diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index b676ba4147..8dff2b6a18 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -194,7 +194,7 @@ if ( $links ) { break; case 'name': - echo " | link_name)) . "'>$link->link_name "; + echo " | link_name)) . "'>$link->link_name "; $actions = array(); $actions['edit'] = '' . __('Edit') . ''; $actions['delete'] = "link_id) . "' onclick=\"if ( confirm('" . js_escape(sprintf( __("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete') . ""; diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 6899961d75..367a45142b 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -127,7 +127,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each |
---|