diff --git a/readme.html b/readme.html index 885494b..1f66b20 100644 --- a/readme.html +++ b/readme.html @@ -8,7 +8,7 @@

WordPress -
Version 3.5.1 +
Version 3.5.2

Semantic Personal Publishing Platform

diff --git a/wp-admin/about.php b/wp-admin/about.php index 3f908f0..552437d 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -34,7 +34,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

+

Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', 12 ), '3.5.2', number_format_i18n( 12 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_3.5.2' ); ?> +

Version %1$s addressed some security issues and fixed %2$s bug.', 'Version %1$s addressed some security issues and fixed %2$s bugs.', 37 ), '3.5.1', number_format_i18n( 37 ) ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_3.5.1' ); ?> diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 7d142d9..fdf2113 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -144,7 +144,7 @@ if ( post_type_supports($post_type, 'trackbacks') ) if ( post_type_supports($post_type, 'custom-fields') ) add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core'); -do_action('dbx_post_advanced'); +do_action('dbx_post_advanced', $post); if ( post_type_supports($post_type, 'comments') ) add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core'); @@ -296,7 +296,7 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create

-
> +> @@ -354,7 +354,7 @@ wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); @@ -383,16 +383,16 @@ if ( post_type_supports($post_type, 'editor') ) {
- +
diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php index 0cfc9fe..0268e7e 100644 --- a/wp-admin/includes/class-wp-importer.php +++ b/wp-admin/includes/class-wp-importer.php @@ -183,6 +183,7 @@ class WP_Importer { $headers = array(); $args = array(); + $args['reject_unsafe_urls'] = true; if ( true === $head ) $args['method'] = 'HEAD'; if ( !empty( $username ) && !empty( $password ) ) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index ef8fb5f..6315592 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -98,7 +98,7 @@ class WP_Upgrader { break; default: if ( ! $wp_filesystem->find_folder($dir) ) - return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir)); + return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) ); break; } } @@ -1133,7 +1133,7 @@ class WP_Upgrader_Skin { } elseif ( is_wp_error($errors) && $errors->get_error_code() ) { foreach ( $errors->get_error_messages() as $message ) { if ( $errors->get_error_data() ) - $this->feedback($message . ' ' . $errors->get_error_data() ); + $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) ); else $this->feedback($message); } @@ -1147,8 +1147,11 @@ class WP_Upgrader_Skin { if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); - if ( !empty($args) ) + if ( $args ) { + $args = array_map( 'strip_tags', $args ); + $args = array_map( 'esc_html', $args ); $string = vsprintf($string, $args); + } } if ( empty($string) ) return; @@ -1188,11 +1191,11 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin { function after() { $this->plugin = $this->upgrader->plugin_info(); if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ - echo ''; + echo ''; } $update_actions = array( - 'activate_plugin' => '' . __('Activate Plugin') . '', + 'activate_plugin' => '' . __('Activate Plugin') . '', 'plugins_page' => '' . __('Return to Plugins page') . '' ); if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) @@ -1244,8 +1247,11 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); - if ( !empty($args) ) + if ( $args ) { + $args = array_map( 'strip_tags', $args ); + $args = array_map( 'esc_html', $args ); $string = vsprintf($string, $args); + } } if ( empty($string) ) return; @@ -1269,7 +1275,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin { if ( is_wp_error($error) ) { foreach ( $error->get_error_messages() as $emessage ) { if ( $error->get_error_data() ) - $messages[] = $emessage . ' ' . $error->get_error_data(); + $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() ); else $messages[] = $emessage; } @@ -1430,12 +1436,12 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { $from = isset($_GET['from']) ? stripslashes($_GET['from']) : 'plugins'; if ( 'import' == $from ) - $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; + $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; else - $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; + $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { - $install_actions['network_activate'] = '' . __('Network Activate') . ''; + $install_actions['network_activate'] = '' . __('Network Activate') . ''; unset( $install_actions['activate_plugin'] ); } @@ -1670,4 +1676,4 @@ class File_Upload_Upgrader { return true; } -} \ No newline at end of file +} diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 942f347..96b6db4 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -328,8 +328,14 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) { // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; - if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) - return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); + if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) { + if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) + $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; + else + $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; + + return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); + } // Set correct file permissions $stat = stat( dirname( $new_file )); @@ -452,7 +458,11 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) { // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; if ( false === @ rename( $file['tmp_name'], $new_file ) ) { - return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); + if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) + $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; + else + $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; + return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); } // Set correct file permissions @@ -487,7 +497,7 @@ function download_url( $url, $timeout = 300 ) { if ( ! $tmpfname ) return new WP_Error('http_no_file', __('Could not create Temporary file.')); - $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) ); + $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname, 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) { unlink( $tmpfname ); diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index a8751f1..3938943 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -2270,9 +2270,7 @@ function multisite_over_quota_message() { * * @since 3.5.0 */ -function edit_form_image_editor() { - $post = get_post(); - +function edit_form_image_editor( $post ) { $open = isset( $_GET['image-editor'] ); if ( $open ) require_once ABSPATH . 'wp-admin/includes/image-edit.php'; diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index e4866ad..f3ba569 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -65,15 +65,24 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { } } - if ( ! $update && isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] ) + if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] ) && ! current_user_can( $ptype->cap->edit_others_posts ) ) { - - if ( 'page' == $post_data['post_type'] ) - return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) ); - else - return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) ); + if ( $update ) { + if ( 'page' == $post_data['post_type'] ) + return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) ); + else + return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) ); + } else { + if ( 'page' == $post_data['post_type'] ) + return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) ); + else + return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) ); + } } + if ( ! empty( $post_data['post_status'] ) ) + $post_data['post_status'] = sanitize_key( $post_data['post_status'] ); + // What to do based on which button they pressed if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) $post_data['post_status'] = 'draft'; @@ -92,10 +101,12 @@ function _wp_translate_postdata( $update = false, $post_data = null ) { $post_id = false; $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false; + $published_statuses = array( 'publish', 'future' ); + // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. - if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->cap->publish_posts )) ) - if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) ) + if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) + if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) ) $post_data['post_status'] = 'pending'; if ( ! isset($post_data['post_status']) ) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 5dfb41b..f042fdd 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -536,7 +536,7 @@ function populate_options() { 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app', - 'autoembed_urls', 'default_post_edit_rows', + 'embed_autourls', 'default_post_edit_rows', ); foreach ( $unusedoptions as $option ) delete_option($option); diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 795567e..daf7734 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -536,6 +536,8 @@ $_old_files = array( 'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js', 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js', 'wp-admin/options-privacy.php', +// 3.5.2 +'wp-includes/js/swfupload/swfupload-all.js', ); /** diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index c192cf3..d22922e 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1277,6 +1277,16 @@ function upgrade_network() { // 3.5 if ( $wp_current_db_version < 21823 ) update_site_option( 'ms_files_rewriting', '1' ); + + // 3.5.2 + if ( $wp_current_db_version < 22442 ) { + $illegal_names = get_site_option( 'illegal_names' ); + if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) { + $illegal_name = reset( $illegal_names ); + $illegal_names = explode( ' ', $illegal_name ); + update_site_option( 'illegal_names', $illegal_names ); + } + } } // The functions we use to actually do stuff diff --git a/wp-admin/update.php b/wp-admin/update.php index 687142e..caed6e7 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -57,7 +57,7 @@ if ( isset($_GET['action']) ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-plugin_' . $plugin; - $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin; + $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin ); $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) ); $upgrader->upgrade($plugin); @@ -70,9 +70,9 @@ if ( isset($_GET['action']) ) { check_admin_referer('activate-plugin_' . $plugin); if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { - wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) ); + wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true ); - wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) ); + wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); die(); } iframe_header( __('Plugin Reactivation'), true ); @@ -107,7 +107,7 @@ if ( isset($_GET['action']) ) { $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-plugin_' . $plugin; - $url = 'update.php?action=install-plugin&plugin=' . $plugin; + $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin ); if ( isset($_GET['from']) ) $url .= '&from=' . urlencode(stripslashes($_GET['from'])); @@ -132,7 +132,7 @@ if ( isset($_GET['action']) ) { $submenu_file = 'plugin-install.php'; require_once(ABSPATH . 'wp-admin/admin-header.php'); - $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) ); + $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'plugin-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin'); $type = 'upload'; //Install plugin type, From Web or an Upload. @@ -160,7 +160,7 @@ if ( isset($_GET['action']) ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-theme_' . $theme; - $url = 'update.php?action=upgrade-theme&theme=' . $theme; + $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme ); $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) ); $upgrader->upgrade($theme); @@ -213,7 +213,7 @@ if ( isset($_GET['action']) ) { $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-theme_' . $theme; - $url = 'update.php?action=install-theme&theme=' . $theme; + $url = 'update.php?action=install-theme&theme=' . urlencode( $theme ); $type = 'web'; //Install theme type, From Web or an Upload. $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) ); @@ -238,7 +238,7 @@ if ( isset($_GET['action']) ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); - $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) ); + $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'theme-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme'); $type = 'upload'; //Install plugin type, From Web or an Upload. diff --git a/wp-content/languages/admin-nb_NO.mo b/wp-content/languages/admin-nb_NO.mo index d2bd65a..ae853fa 100644 Binary files a/wp-content/languages/admin-nb_NO.mo and b/wp-content/languages/admin-nb_NO.mo differ diff --git a/wp-content/languages/admin-nb_NO.po b/wp-content/languages/admin-nb_NO.po index a778bd4..227e91f 100644 --- a/wp-content/languages/admin-nb_NO.po +++ b/wp-content/languages/admin-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Administration package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:46+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:28+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2407,27 +2407,27 @@ msgstr "Den opplastede filen er større enn upload_max_filesize-regelen i php.in msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." msgstr "Den opplastede filen er større enn MAX_FILE_SIZE-regelen som ble spesifisert i HTML-skjemaet." -#: wp-admin/includes/file.php:260 wp-admin/includes/file.php:387 +#: wp-admin/includes/file.php:260 wp-admin/includes/file.php:393 msgid "The uploaded file was only partially uploaded." msgstr "Filen ble bare delvis lastet opp." -#: wp-admin/includes/file.php:261 wp-admin/includes/file.php:388 +#: wp-admin/includes/file.php:261 wp-admin/includes/file.php:394 msgid "No file was uploaded." msgstr "Ingen fil ble lastet opp." -#: wp-admin/includes/file.php:263 wp-admin/includes/file.php:390 +#: wp-admin/includes/file.php:263 wp-admin/includes/file.php:396 msgid "Missing a temporary folder." msgstr "Mangler en midlertidig mappe." -#: wp-admin/includes/file.php:264 wp-admin/includes/file.php:391 +#: wp-admin/includes/file.php:264 wp-admin/includes/file.php:397 msgid "Failed to write file to disk." msgstr "Klarte ikke å skrive til disken." -#: wp-admin/includes/file.php:265 wp-admin/includes/file.php:392 +#: wp-admin/includes/file.php:265 wp-admin/includes/file.php:398 msgid "File upload stopped by extension." msgstr "Opplasting av fil ble stoppet av utvidelse." -#: wp-admin/includes/file.php:282 wp-admin/includes/file.php:408 +#: wp-admin/includes/file.php:282 wp-admin/includes/file.php:414 msgid "Invalid form submission." msgstr "Ugyldig sending av skjemaet." @@ -2443,137 +2443,137 @@ msgstr "Filen er tom. Vennligst last opp noe mer innholdsrikt. Denne feilen kan msgid "Specified file failed upload test." msgstr "Filen du angav strøk på opplastingstesten." -#: wp-admin/includes/file.php:312 wp-admin/includes/file.php:433 +#: wp-admin/includes/file.php:312 wp-admin/includes/file.php:439 msgid "Sorry, this file type is not permitted for security reasons." msgstr "Beklager, denne filtypen er ikke tillatt av sikkerhetsgrunner." -#: wp-admin/includes/file.php:332 wp-admin/includes/file.php:455 +#: wp-admin/includes/file.php:337 wp-admin/includes/file.php:465 msgid "The uploaded file could not be moved to %s." msgstr "Filen som ble lastet opp kunne ikke flyttes til %s." -#: wp-admin/includes/file.php:385 +#: wp-admin/includes/file.php:391 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." msgstr "Filen du har lastet opp overstiger direktivet upload_max_filesize i php.ini." -#: wp-admin/includes/file.php:386 +#: wp-admin/includes/file.php:392 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form." msgstr "Filen du har lastet opp overstiger direktivet MAX_FILE_SIZE som er satt i HTML-skjemaet." -#: wp-admin/includes/file.php:416 +#: wp-admin/includes/file.php:422 msgid "File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini." msgstr "Filen er tom. Vennligst last opp noe mer innholdsrikt. Denne feilen kan også komme av at opplasting er deaktivert i php.ini." -#: wp-admin/includes/file.php:420 +#: wp-admin/includes/file.php:426 msgid "Specified file does not exist." msgstr "Spesifisert fil finnes ikke." -#: wp-admin/includes/file.php:484 +#: wp-admin/includes/file.php:494 msgid "Invalid URL Provided." msgstr "Ugyldig URL angitt." -#: wp-admin/includes/file.php:488 +#: wp-admin/includes/file.php:498 msgid "Could not create Temporary file." msgstr "Kunne ikke lage midlertidig fil." -#: wp-admin/includes/file.php:582 wp-admin/includes/file.php:676 +#: wp-admin/includes/file.php:592 wp-admin/includes/file.php:686 msgid "Incompatible Archive." msgstr "Ikke kompatibelt arkiv." -#: wp-admin/includes/file.php:586 wp-admin/includes/file.php:622 +#: wp-admin/includes/file.php:596 wp-admin/includes/file.php:632 msgid "Could not retrieve file from archive." msgstr "Kunne ikke hente fil fra arkivet." -#: wp-admin/includes/file.php:632 +#: wp-admin/includes/file.php:642 msgid "Could not extract file from archive." msgstr "Kunne ikke pakke ut fil fra arkivet." -#: wp-admin/includes/file.php:635 wp-admin/includes/file.php:721 -#: wp-admin/includes/file.php:762 wp-admin/includes/update-core.php:638 -#: wp-admin/includes/update-core.php:731 wp-admin/includes/update-core.php:823 +#: wp-admin/includes/file.php:645 wp-admin/includes/file.php:731 +#: wp-admin/includes/file.php:772 wp-admin/includes/update-core.php:640 +#: wp-admin/includes/update-core.php:733 wp-admin/includes/update-core.php:825 msgid "Could not copy file." msgstr "Kunne ikke kopiere fil." -#: wp-admin/includes/file.php:679 +#: wp-admin/includes/file.php:689 msgid "Empty archive." msgstr "Tomt arkiv." -#: wp-admin/includes/file.php:952 +#: wp-admin/includes/file.php:962 msgid "ERROR: There was an error connecting to the server, Please verify the settings are correct." msgstr "FEIL: Det skjedde en feil i servertilkoblingen, vennligst kontroller innstillingene." -#: wp-admin/includes/file.php:960 +#: wp-admin/includes/file.php:970 msgid "FTP" msgstr "FTP" -#: wp-admin/includes/file.php:962 +#: wp-admin/includes/file.php:972 msgid "FTPS (SSL)" msgstr "FTPS (SSL)" -#: wp-admin/includes/file.php:964 +#: wp-admin/includes/file.php:974 msgid "SSH2" msgstr "SSH2" -#: wp-admin/includes/file.php:985 +#: wp-admin/includes/file.php:995 msgid "Connection Information" msgstr "Tilkoblingsinformasjon" -#: wp-admin/includes/file.php:989 +#: wp-admin/includes/file.php:999 msgid "To perform the requested action, WordPress needs to access your web server." msgstr "For å utføre denne handlingen trenger WordPress å lese filer på din server." -#: wp-admin/includes/file.php:993 +#: wp-admin/includes/file.php:1003 msgid "Please enter your FTP or SSH credentials to proceed." msgstr "Vennligst skriv inn dine FTP- eller SSH-detaljer for å fortsette." -#: wp-admin/includes/file.php:994 +#: wp-admin/includes/file.php:1004 msgid "FTP/SSH Username" msgstr "FTP/SSH brukernavn" -#: wp-admin/includes/file.php:995 +#: wp-admin/includes/file.php:1005 msgid "FTP/SSH Password" msgstr "FTP/SSH passord" -#: wp-admin/includes/file.php:997 +#: wp-admin/includes/file.php:1007 msgid "Please enter your FTP credentials to proceed." msgstr "Vennligst skriv inn innloggingsdetaljene for FTP-tilgang for å fortsette." -#: wp-admin/includes/file.php:998 +#: wp-admin/includes/file.php:1008 msgid "FTP Username" msgstr "FTP brukernavn" -#: wp-admin/includes/file.php:999 +#: wp-admin/includes/file.php:1009 msgid "FTP Password" msgstr "FTP passord" -#: wp-admin/includes/file.php:1003 +#: wp-admin/includes/file.php:1013 msgid "If you do not remember your credentials, you should contact your web host." msgstr "Hvis du ikke husker brukernavn og passord, bør du kontakte din nettjener." -#: wp-admin/includes/file.php:1007 +#: wp-admin/includes/file.php:1017 msgid "Hostname" msgstr "Servernavn" -#: wp-admin/includes/file.php:1023 +#: wp-admin/includes/file.php:1033 msgid "Authentication Keys" msgstr "Autentiseringsnøkler" -#: wp-admin/includes/file.php:1025 +#: wp-admin/includes/file.php:1035 msgid "Public Key:" msgstr "Offentlig nøkkel:" -#: wp-admin/includes/file.php:1026 +#: wp-admin/includes/file.php:1036 msgid "Private Key:" msgstr "Privat nøkkel:" -#: wp-admin/includes/file.php:1029 +#: wp-admin/includes/file.php:1039 msgid "Enter the location on the server where the keys are located. If a passphrase is needed, enter that in the password field above." msgstr "Skriv inn stedet på serveren hvor nøklene er. Bruk passordfeltet over hvis et passord kreves." -#: wp-admin/includes/file.php:1034 wp-admin/includes/file.php:1036 +#: wp-admin/includes/file.php:1044 wp-admin/includes/file.php:1046 msgid "Connection Type" msgstr "Tilkoblingstype" -#: wp-admin/includes/file.php:1055 +#: wp-admin/includes/file.php:1065 msgid "Proceed" msgstr "Fortsett" @@ -2852,11 +2852,11 @@ msgstr "Vis" msgid "Hide" msgstr "Skjul" -#: wp-admin/includes/media.php:1155 wp-admin/includes/media.php:2367 +#: wp-admin/includes/media.php:1155 wp-admin/includes/media.php:2365 msgid "File name:" msgstr "Filnavn:" -#: wp-admin/includes/media.php:1156 wp-admin/includes/media.php:2370 +#: wp-admin/includes/media.php:1156 wp-admin/includes/media.php:2368 msgid "File type:" msgstr "Filtype:" @@ -2864,7 +2864,7 @@ msgstr "Filtype:" msgid "Upload date:" msgstr "Opplastet dato:" -#: wp-admin/includes/media.php:1159 wp-admin/includes/media.php:2380 +#: wp-admin/includes/media.php:1159 wp-admin/includes/media.php:2378 msgid "Dimensions:" msgstr "Dimensjoner:" @@ -3028,7 +3028,7 @@ msgstr "Skalere bilder for å matche den store størrelsen som er valgt i %1$sbi msgid "Sorry, you have used all of your storage quota of %s MB." msgstr "Beklager, du har brukt opp din lagringskvote på %s MB." -#: wp-admin/includes/media.php:2363 +#: wp-admin/includes/media.php:2361 msgid "File URL:" msgstr "Fil-URL:" @@ -3851,67 +3851,67 @@ msgstr "Denne utvidelsen har ikke en gyldig beskrivelse." msgid "The \"%s\" options group has been removed. Use another settings group." msgstr "Gruppen med innstillinger for \"%s\" har blitt fjernet. Bruk en annen gruppe med innstillinger." -#: wp-admin/includes/post.php:33 +#: wp-admin/includes/post.php:33 wp-admin/includes/post.php:72 msgid "You are not allowed to edit pages as this user." msgstr "Du har ikke lov til å redigere sider som denne brukeren." -#: wp-admin/includes/post.php:35 +#: wp-admin/includes/post.php:35 wp-admin/includes/post.php:74 msgid "You are not allowed to edit posts as this user." msgstr "Du har ikke lov til å redigere innlegg som denne brukeren." -#: wp-admin/includes/post.php:287 +#: wp-admin/includes/post.php:298 msgid "You are not allowed to edit pages." msgstr "Du har ikke lov til å redigere sider." -#: wp-admin/includes/post.php:289 +#: wp-admin/includes/post.php:300 msgid "You are not allowed to edit posts." msgstr "Du har ikke lov til å redigere innlegg." -#: wp-admin/includes/post.php:436 +#: wp-admin/includes/post.php:447 msgid "Auto Draft" msgstr "Automatisk kladd" -#: wp-admin/includes/post.php:527 +#: wp-admin/includes/post.php:538 msgid "You are not allowed to create pages on this site." msgstr "Du har ikke lov til å lage sider på dette nettstedet." -#: wp-admin/includes/post.php:529 +#: wp-admin/includes/post.php:540 msgid "You are not allowed to create posts or drafts on this site." msgstr "Du har ikke lov til å lage innlegg eller kladder på dette nettstedet." -#: wp-admin/includes/post.php:1055 +#: wp-admin/includes/post.php:1066 msgid "Click to edit this part of the permalink" msgstr "Klikk for å redigere denne delen av permalenken" -#: wp-admin/includes/post.php:1057 +#: wp-admin/includes/post.php:1068 msgid "Temporary permalink. Click to edit this part." msgstr "Midlertidig permalenke. Klikk for å endre denne delen." -#: wp-admin/includes/post.php:1061 wp-admin/includes/post.php:1089 +#: wp-admin/includes/post.php:1072 wp-admin/includes/post.php:1100 msgid "Permalink:" msgstr "Permalenke:" -#: wp-admin/includes/post.php:1063 +#: wp-admin/includes/post.php:1074 msgid "Change Permalinks" msgstr "Endre permalenker" -#: wp-admin/includes/post.php:1130 +#: wp-admin/includes/post.php:1141 msgid "Remove featured image" msgstr "Slett fremhevet bilde" -#: wp-admin/includes/post.php:1201 +#: wp-admin/includes/post.php:1212 msgid "Warning: %s is currently editing this post" msgstr "Advarsel: %s redigerer dette innlegget nå" -#: wp-admin/includes/post.php:1204 +#: wp-admin/includes/post.php:1215 msgid "Warning: %s is currently editing this page" msgstr "Advarsel: %s redigerer denne siden nå" -#: wp-admin/includes/post.php:1207 +#: wp-admin/includes/post.php:1218 msgid "Warning: %s is currently editing this." msgstr "Advarsel: %s redigerer dette nå" -#: wp-admin/includes/post.php:1268 +#: wp-admin/includes/post.php:1279 msgid "Preview not available. Please save as a draft first." msgstr "Forhåndsvisning ikke tilgjengelig. Vennligst lagre som kladd først." @@ -4180,10 +4180,6 @@ msgctxt "post state" msgid "Pending" msgstr "Ventende" -#: wp-admin/includes/template.php:1609 wp-admin/options.php:225 -msgid "Save Changes" -msgstr "Lagre endringene" - #: wp-admin/includes/template.php:1764 msgid "New Feature: Toolbar" msgstr "Ny funksjon: Verktøylinje" @@ -4434,39 +4430,39 @@ msgstr "Fotoblogging" msgid "Seasonal" msgstr "Sesong" -#: wp-admin/includes/update-core.php:619 +#: wp-admin/includes/update-core.php:621 msgid "Verifying the unpacked files…" msgstr "Verifiserer utpakkede filer…" -#: wp-admin/includes/update-core.php:630 +#: wp-admin/includes/update-core.php:632 msgid "The update could not be unpacked" msgstr "Oppdateringen kunne ikke pakkes ut" -#: wp-admin/includes/update-core.php:659 +#: wp-admin/includes/update-core.php:661 msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s." msgstr "Oppdateringen kunne ikke installeres fordi WordPress %1$s krever PHP versjon %2$s eller høyere og MySQL versjon %3$s eller høyere. Du bruker PHP versjon %4$s og MySQL verson %5$s." -#: wp-admin/includes/update-core.php:661 +#: wp-admin/includes/update-core.php:663 msgid "The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s." msgstr "Oppdateringen kunne ikke installeres fordi WordPress %1$s krever PHP versjon %2$s eller høyere. Du bruker versjon %3$s." -#: wp-admin/includes/update-core.php:663 +#: wp-admin/includes/update-core.php:665 msgid "The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s." msgstr "Oppdateringen kunne ikke installeres fordi WordPress %1$s krever MySQL versjon %2$s eller høyere. Du bruker versjon %3$s." -#: wp-admin/includes/update-core.php:761 +#: wp-admin/includes/update-core.php:763 msgid "Upgrading database…" msgstr "Oppgraderer database…" -#: wp-admin/includes/update-core.php:863 wp-admin/update-core.php:356 +#: wp-admin/includes/update-core.php:865 wp-admin/update-core.php:356 msgid "WordPress updated successfully" msgstr "Oppdateringen av WordPress var vellykket" -#: wp-admin/includes/update-core.php:866 wp-admin/update-core.php:357 +#: wp-admin/includes/update-core.php:868 wp-admin/update-core.php:357 msgid "Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click here." msgstr "Velkommen til WordPress %1$s. Du vil bli omdirigert til Om WordPress-skjermen. Hvis ikke, klikk her." -#: wp-admin/includes/update-core.php:867 wp-admin/update-core.php:358 +#: wp-admin/includes/update-core.php:869 wp-admin/update-core.php:358 msgid "Welcome to WordPress %1$s. Learn more." msgstr "Velkommen til WordPress %1$s. Lær mer." @@ -5241,11 +5237,6 @@ msgstr "Frem til WordPress versjon 3.0, måtte det som nå heter Nettstedsnettve msgid "Documentation on My Sites" msgstr "Dokumentasjon om Mine nettsteder" -#: wp-admin/my-sites.php:55 wp-admin/options-head.php:16 -#: wp-admin/options.php:164 -msgid "Settings saved." -msgstr "Innstillinger lagret." - #: wp-admin/my-sites.php:64 msgid "You must be a member of at least one site to use this page." msgstr "Du må være medlem på minst ett nettsted for å bruke denne siden." @@ -5752,7 +5743,7 @@ msgstr[1] "Innslipp (%s)" #: wp-admin/includes/class-wp-plugins-list-table.php:240 #: wp-admin/includes/class-wp-plugins-list-table.php:345 -#: wp-admin/includes/class-wp-upgrader.php:1438 +#: wp-admin/includes/class-wp-upgrader.php:1444 msgid "Network Activate" msgstr "Aktiver nettverk" @@ -5787,7 +5778,7 @@ msgid "Deactivate this plugin" msgstr "Deaktiver denne utvidelsen" #: wp-admin/includes/class-wp-plugins-list-table.php:345 -#: wp-admin/includes/class-wp-upgrader.php:1438 +#: wp-admin/includes/class-wp-upgrader.php:1444 msgid "Activate this plugin for all sites in this network" msgstr "Aktiver utvidelsen for alle nettstedene i nettverket" @@ -5797,9 +5788,9 @@ msgid "Delete this plugin" msgstr "Slett denne utvidelsen" #: wp-admin/includes/class-wp-plugins-list-table.php:353 -#: wp-admin/includes/class-wp-upgrader.php:1195 -#: wp-admin/includes/class-wp-upgrader.php:1433 -#: wp-admin/includes/class-wp-upgrader.php:1435 +#: wp-admin/includes/class-wp-upgrader.php:1198 +#: wp-admin/includes/class-wp-upgrader.php:1439 +#: wp-admin/includes/class-wp-upgrader.php:1441 msgid "Activate this plugin" msgstr "Aktiver denne utvidelsen" @@ -5860,10 +5851,10 @@ msgstr "Slett dette permanent" #: wp-admin/includes/class-wp-posts-list-table.php:559 #: wp-admin/includes/class-wp-theme-install-list-table.php:188 #: wp-admin/includes/class-wp-themes-list-table.php:140 -#: wp-admin/includes/class-wp-upgrader.php:1515 -#: wp-admin/includes/class-wp-upgrader.php:1516 -#: wp-admin/includes/class-wp-upgrader.php:1582 -#: wp-admin/includes/class-wp-upgrader.php:1583 +#: wp-admin/includes/class-wp-upgrader.php:1521 +#: wp-admin/includes/class-wp-upgrader.php:1522 +#: wp-admin/includes/class-wp-upgrader.php:1588 +#: wp-admin/includes/class-wp-upgrader.php:1589 msgid "Preview “%s”" msgstr "Forhåndsvis «%s»" @@ -6025,14 +6016,14 @@ msgid "Only the current theme is available to you. Contact the %s administrator msgstr "Kun det aktive temaet er tilgjengelig for deg nå. Kontakt administratoren på %s for informasjon om hvordan du får tilgang til flere temaer." #: wp-admin/includes/class-wp-themes-list-table.php:137 -#: wp-admin/includes/class-wp-upgrader.php:1517 -#: wp-admin/includes/class-wp-upgrader.php:1584 +#: wp-admin/includes/class-wp-upgrader.php:1523 +#: wp-admin/includes/class-wp-upgrader.php:1590 msgid "Activate “%s”" msgstr "Aktiver «%s»" #: wp-admin/includes/class-wp-themes-list-table.php:144 -#: wp-admin/includes/class-wp-upgrader.php:1516 -#: wp-admin/includes/class-wp-upgrader.php:1583 +#: wp-admin/includes/class-wp-upgrader.php:1522 +#: wp-admin/includes/class-wp-upgrader.php:1589 msgid "Live Preview" msgstr "Live forhåndsvisning" @@ -6060,7 +6051,7 @@ msgstr "http://codex.wordpress.org/Child_Themes" msgid "Invalid Data provided." msgstr "Ugyldig data angitt" -#: wp-admin/includes/class-wp-upgrader.php:42 wp-admin/includes/file.php:522 +#: wp-admin/includes/class-wp-upgrader.php:42 wp-admin/includes/file.php:532 #: wp-admin/includes/plugin.php:710 wp-admin/includes/theme.php:53 msgid "Could not access filesystem." msgstr "Kunne ikke lese filsystemet." @@ -6095,7 +6086,7 @@ msgid "Download failed." msgstr "Nedlasting feilet." #: wp-admin/includes/class-wp-upgrader.php:52 -#: wp-admin/includes/update-core.php:665 +#: wp-admin/includes/update-core.php:667 msgid "Installing the latest version…" msgstr "Installerer den nyeste versjonen…" @@ -6103,9 +6094,9 @@ msgstr "Installerer den nyeste versjonen…" msgid "Destination folder already exists." msgstr "Målmappen finnes allerede." -#: wp-admin/includes/class-wp-upgrader.php:54 wp-admin/includes/file.php:616 -#: wp-admin/includes/file.php:708 wp-admin/includes/file.php:767 -#: wp-admin/includes/update-core.php:828 +#: wp-admin/includes/class-wp-upgrader.php:54 wp-admin/includes/file.php:626 +#: wp-admin/includes/file.php:718 wp-admin/includes/file.php:777 +#: wp-admin/includes/update-core.php:830 msgid "Could not create directory." msgstr "Kunne ikke lage mappe." @@ -6274,120 +6265,120 @@ msgstr "Kunne ikke kopiere filer." msgid "Could not copy files. You may have run out of disk space." msgstr "Kunne ikke kopiere filer. Du kan ha gått tom for lagringsplass." -#: wp-admin/includes/class-wp-upgrader.php:1177 wp-admin/update.php:54 +#: wp-admin/includes/class-wp-upgrader.php:1180 wp-admin/update.php:54 msgid "Update Plugin" msgstr "Oppdater utvidelse" -#: wp-admin/includes/class-wp-upgrader.php:1195 -#: wp-admin/includes/class-wp-upgrader.php:1435 +#: wp-admin/includes/class-wp-upgrader.php:1198 +#: wp-admin/includes/class-wp-upgrader.php:1441 msgid "Activate Plugin" msgstr "Aktiver utvidelse" -#: wp-admin/includes/class-wp-upgrader.php:1196 -#: wp-admin/includes/class-wp-upgrader.php:1349 +#: wp-admin/includes/class-wp-upgrader.php:1199 +#: wp-admin/includes/class-wp-upgrader.php:1355 msgid "Go to plugins page" msgstr "Gå til siden med utvidelser" -#: wp-admin/includes/class-wp-upgrader.php:1196 -#: wp-admin/includes/class-wp-upgrader.php:1349 -#: wp-admin/includes/class-wp-upgrader.php:1447 +#: wp-admin/includes/class-wp-upgrader.php:1199 +#: wp-admin/includes/class-wp-upgrader.php:1355 +#: wp-admin/includes/class-wp-upgrader.php:1453 msgid "Return to Plugins page" msgstr "Gå tilbake til siden med utvidelser" -#: wp-admin/includes/class-wp-upgrader.php:1233 +#: wp-admin/includes/class-wp-upgrader.php:1236 msgid "The update process is starting. This process may take a while on some hosts, so please be patient." msgstr "Oppdateringen starter. Denne prosessen kan ta en stund på noen verter, så vær tålmodig." -#: wp-admin/includes/class-wp-upgrader.php:1234 +#: wp-admin/includes/class-wp-upgrader.php:1237 msgid "An error occurred while updating %1$s: %2$s." msgstr "En feil skjedde under oppdateringen av %1$s: %2$s." -#: wp-admin/includes/class-wp-upgrader.php:1235 +#: wp-admin/includes/class-wp-upgrader.php:1238 msgid "The update of %1$s failed." msgstr "Oppdatering av %1$s feilet." -#: wp-admin/includes/class-wp-upgrader.php:1236 +#: wp-admin/includes/class-wp-upgrader.php:1239 msgid "%1$s updated successfully." msgstr "Oppdateringen av %1$s var vellykket." -#: wp-admin/includes/class-wp-upgrader.php:1236 +#: wp-admin/includes/class-wp-upgrader.php:1239 msgid "Show Details" msgstr "Vis detaljer" -#: wp-admin/includes/class-wp-upgrader.php:1236 +#: wp-admin/includes/class-wp-upgrader.php:1239 msgid "Hide Details" msgstr "Skjul detaljer" -#: wp-admin/includes/class-wp-upgrader.php:1237 +#: wp-admin/includes/class-wp-upgrader.php:1240 msgid "All updates have been completed." msgstr "Alle oppgraderinger har blitt fullført." -#: wp-admin/includes/class-wp-upgrader.php:1336 +#: wp-admin/includes/class-wp-upgrader.php:1342 msgid "Updating Plugin %1$s (%2$d/%3$d)" msgstr "Oppdaterer utvidelse %1$s (%2$d/%3$d)" -#: wp-admin/includes/class-wp-upgrader.php:1350 -#: wp-admin/includes/class-wp-upgrader.php:1385 +#: wp-admin/includes/class-wp-upgrader.php:1356 +#: wp-admin/includes/class-wp-upgrader.php:1391 msgid "Go to WordPress Updates page" msgstr "Gå til siden for WordPress-oppdateringer" -#: wp-admin/includes/class-wp-upgrader.php:1350 -#: wp-admin/includes/class-wp-upgrader.php:1385 +#: wp-admin/includes/class-wp-upgrader.php:1356 +#: wp-admin/includes/class-wp-upgrader.php:1391 msgid "Return to WordPress Updates" msgstr "Gå tilbake til WordPress-oppdateringer" -#: wp-admin/includes/class-wp-upgrader.php:1370 +#: wp-admin/includes/class-wp-upgrader.php:1376 msgid "Updating Theme %1$s (%2$d/%3$d)" msgstr "Oppdaterer tema %1$s (%2$d/%3$d)" -#: wp-admin/includes/class-wp-upgrader.php:1384 +#: wp-admin/includes/class-wp-upgrader.php:1390 msgid "Go to themes page" msgstr "Gå til temasiden" -#: wp-admin/includes/class-wp-upgrader.php:1384 -#: wp-admin/includes/class-wp-upgrader.php:1525 -#: wp-admin/includes/class-wp-upgrader.php:1591 +#: wp-admin/includes/class-wp-upgrader.php:1390 +#: wp-admin/includes/class-wp-upgrader.php:1531 +#: wp-admin/includes/class-wp-upgrader.php:1597 msgid "Return to Themes page" msgstr "Gå tilbake til temasiden" -#: wp-admin/includes/class-wp-upgrader.php:1421 +#: wp-admin/includes/class-wp-upgrader.php:1427 msgid "Successfully installed the plugin %s %s." msgstr "Installerte utvidelsen %s %s." -#: wp-admin/includes/class-wp-upgrader.php:1433 +#: wp-admin/includes/class-wp-upgrader.php:1439 msgid "Activate Plugin & Run Importer" msgstr "Aktiver utvidelse & kjør import" -#: wp-admin/includes/class-wp-upgrader.php:1443 +#: wp-admin/includes/class-wp-upgrader.php:1449 msgid "Return to Importers" msgstr "Gå tilbake til importererne" -#: wp-admin/includes/class-wp-upgrader.php:1445 +#: wp-admin/includes/class-wp-upgrader.php:1451 msgid "Return to Plugin Installer" msgstr "Gå tilbake til installering av utvidelser" -#: wp-admin/includes/class-wp-upgrader.php:1520 +#: wp-admin/includes/class-wp-upgrader.php:1526 msgid "Enable this theme for all sites in this network" msgstr "Gjør dette temaet tilgjengelig for alle nettsteder i nettverket" -#: wp-admin/includes/class-wp-upgrader.php:1523 +#: wp-admin/includes/class-wp-upgrader.php:1529 msgid "Return to Theme Installer" msgstr "Gå tilbake til temainstallasjon" -#: wp-admin/includes/class-wp-upgrader.php:1525 +#: wp-admin/includes/class-wp-upgrader.php:1531 msgid "Themes page" msgstr "Tema side" -#: wp-admin/includes/class-wp-upgrader.php:1549 wp-admin/update.php:157 +#: wp-admin/includes/class-wp-upgrader.php:1555 wp-admin/update.php:157 msgid "Update Theme" msgstr "Oppdater tema" -#: wp-admin/includes/class-wp-upgrader.php:1580 wp-admin/themes.php:124 +#: wp-admin/includes/class-wp-upgrader.php:1586 wp-admin/themes.php:124 msgid "Customize “%s”" msgstr "Tilpass temaet «%s»" -#: wp-admin/includes/class-wp-upgrader.php:1616 -#: wp-admin/includes/class-wp-upgrader.php:1650 +#: wp-admin/includes/class-wp-upgrader.php:1622 +#: wp-admin/includes/class-wp-upgrader.php:1656 msgid "Please select a file" msgstr "Vennligst velg en fil" @@ -6642,7 +6633,7 @@ msgid "This dashboard widget queries G msgstr "Denne kontrollpanelwidgeten spør Google blogg søk så andre blogger som lenker til deg, vil vises her. Ingen innkommende lenker er funnet ennå. Det er helt i orden, intet hastverk." #: wp-admin/includes/dashboard.php:820 wp-admin/includes/dashboard.php:822 -#: wp-admin/includes/post.php:1197 +#: wp-admin/includes/post.php:1208 msgid "Somebody" msgstr "Noen" @@ -7213,7 +7204,7 @@ msgstr "Aktiver" #: wp-admin/includes/class-wp-ms-themes-list-table.php:233 #: wp-admin/includes/class-wp-ms-themes-list-table.php:276 -#: wp-admin/includes/class-wp-upgrader.php:1520 +#: wp-admin/includes/class-wp-upgrader.php:1526 msgid "Network Enable" msgstr "Gjør tilgjengelig i nettverk" @@ -7440,193 +7431,193 @@ msgstr "Takk til" msgid "Freedoms" msgstr "Friheter" -#: wp-admin/about.php:45 wp-admin/includes/template.php:1830 +#: wp-admin/about.php:49 wp-admin/includes/template.php:1830 msgid "New Media Manager" msgstr "Ny mediehåndtering" -#: wp-admin/about.php:51 +#: wp-admin/about.php:55 msgid "Beautiful Interface" msgstr "Nydelig grensesnitt" -#: wp-admin/about.php:52 +#: wp-admin/about.php:56 msgid "Adding media has been streamlined with an all-new experience, making it a breeze to upload files and place them into your posts." msgstr "Å legge til media har blitt strømlinjeformet med en helt ny opplevelse som gjør det enkelt å laste opp filer og plassere dem inn i innleggene." -#: wp-admin/about.php:55 +#: wp-admin/about.php:59 msgid "Picturesque Galleries" msgstr "Enklere gallerier" -#: wp-admin/about.php:56 +#: wp-admin/about.php:60 msgid "Creating image galleries is faster with drag and drop reordering, inline caption editing, and simplified controls for layout." msgstr "Å lage gallerier går raskere med dra-og-slipp for å endre rekkefølge, enkel redigering av bildetekster og enklere kontroller for utseende." -#: wp-admin/about.php:62 +#: wp-admin/about.php:66 msgid "New Default Theme" msgstr "Nytt standardtema" -#: wp-admin/about.php:66 +#: wp-admin/about.php:70 msgid "Introducing Twenty Twelve" msgstr "Vi introduserer Twenty Twelve" -#: wp-admin/about.php:67 +#: wp-admin/about.php:71 msgid "The newest default theme for WordPress is simple, flexible, and elegant." msgstr "Det nyeste standardtemaet for WordPress er enkelt, fleksibelt og elegant." -#: wp-admin/about.php:68 +#: wp-admin/about.php:72 msgid "What makes it really shine are the design details, like the gorgeous Open Sans typeface and a fully responsive design that looks great on any device." msgstr "Det som virkelig gjør dette temaet bra er designdetaljene, som Open Sans-fonten, og et helt responsivt design som ser bra ut både på mobil, nettbrett og datamaskin." -#: wp-admin/about.php:69 +#: wp-admin/about.php:73 msgid "Naturally, Twenty Twelve supports all the theme features you’ve come to know and love, but it is also designed to be as great for a website as it is for a blog." msgstr "Naturligvis støtter Twenty Twelve alle temafunksjonene som du har blitt kjent med, men det er også designet for å fungere like bra for nettsteder som for blogger." -#: wp-admin/about.php:74 +#: wp-admin/about.php:78 msgid "Retina Ready" msgstr "Retina-klart" -#: wp-admin/about.php:78 +#: wp-admin/about.php:82 msgid "So Sharp You Can’t See the Pixels" msgstr "Så skarpt at du ikke kan se pikslene" -#: wp-admin/about.php:79 +#: wp-admin/about.php:83 msgid "The WordPress dashboard now looks beautiful on high-resolution screens like those found on the iPad, Kindle Fire HD, Nexus 10, and MacBook Pro with Retina Display. Icons and other visual elements are crystal clear and full of detail." msgstr "Kontrollpanelet til WordPress ser nydelig ut på skjermer med høy oppløsning, som de du finner på iPad, Kindle Fire HD, Nexus 10 og MacBook Pro med Retina Display. Ikoner og andre visuelle elementer er krystallklare og fulle av detaljer." -#: wp-admin/about.php:84 +#: wp-admin/about.php:88 msgid "Smoother Experience" msgstr "Bedre flyt" -#: wp-admin/about.php:88 +#: wp-admin/about.php:92 msgid "Better Accessibility" msgstr "Bedre tilgjengelighet" -#: wp-admin/about.php:89 +#: wp-admin/about.php:93 msgid "WordPress supports more usage modes than ever before. Screenreaders, touch devices, and mouseless workflows all have improved ease of use and accessibility." msgstr "WordPress støtter flere bruksmåter enn noensinne. Skjermlesere, touch-enheter og musløs arbeidsflyt har forbedret tilgjengelighet og gjort det enklere." -#: wp-admin/about.php:91 +#: wp-admin/about.php:95 msgid "More Polish" msgstr "Bedre polert" -#: wp-admin/about.php:92 +#: wp-admin/about.php:96 msgid "A number of screens and controls have been refined. For example, a new color picker makes it easier for you to choose that perfect shade of blue." msgstr "En rekke skjermer og kontroller har blitt forbedret. For eksempel, en ny fargevelger gjør det enklere for deg å velge den perfekte blånyansen." -#: wp-admin/about.php:97 +#: wp-admin/about.php:101 msgid "Under the Hood" msgstr "Under panseret" -#: wp-admin/about.php:101 +#: wp-admin/about.php:105 msgid "Meta Query Additions" msgstr "Meta Query-tillegg" -#: wp-admin/about.php:102 +#: wp-admin/about.php:106 msgid "The WP_Comment_Query and WP_User_Query classes now support meta queries just like WP_Query. Meta queries now support querying for objects without a particular meta key." msgstr "WP_Comment_Query- og WP_User_Query-klassene støtter nå metaspørringer akkurat som WP_Query. Metaspørringer støtter å søke etter objekter uten en bestemt meta-nøkkel." -#: wp-admin/about.php:105 +#: wp-admin/about.php:109 msgid "Post Objects" msgstr "Post Objects" -#: wp-admin/about.php:106 +#: wp-admin/about.php:110 msgid "Post objects are now instances of a WP_Post class, which improves performance by loading selected properties on demand." msgstr "Post objects er nå instanser av WP_Post-klassen, som øker ytelsen ved å laste inn valgte attributter når det trengs." -#: wp-admin/about.php:109 +#: wp-admin/about.php:113 msgid "Image Editing API" msgstr "Bilderedigerings-API" -#: wp-admin/about.php:110 +#: wp-admin/about.php:114 msgid "The WP_Image_Editor class abstracts image editing functionality such as cropping and scaling, and uses ImageMagick when available." msgstr "WP_Image_Editor-klassen kan redigere bilder, for eksempel ved hjelp av utsnitt og skalering, og bruker ImageMagick når det er tilgjengelig." -#: wp-admin/about.php:116 +#: wp-admin/about.php:120 msgid "Multisite Improvements" msgstr "Forbedringer for nettstedsnettverk" -#: wp-admin/about.php:117 +#: wp-admin/about.php:121 msgid "switch_to_blog() is now significantly faster and more reliable." msgstr "switch_to_blog() er nå betydelig raskere og mer stabil." -#: wp-admin/about.php:120 +#: wp-admin/about.php:124 msgid "XML-RPC API" msgstr "XML-RPC-API" -#: wp-admin/about.php:121 +#: wp-admin/about.php:125 msgid "The WordPress API is now always enabled, and supports fetching users, editing profiles, managing post revisions, and searching posts." msgstr "WordPress API er nå alltid aktivert, og støtter å hente brukere, redigering av profiler, hndtering av innleggsrevisjoner og søk etter innlegg." -#: wp-admin/about.php:121 +#: wp-admin/about.php:125 msgid "http://codex.wordpress.org/XML-RPC_WordPress_API" msgstr "http://codex.wordpress.org/XML-RPC_WordPress_API" -#: wp-admin/about.php:124 wp-admin/credits.php:160 +#: wp-admin/about.php:128 wp-admin/credits.php:160 msgid "External Libraries" msgstr "Eksterne programbibliotek" -#: wp-admin/about.php:125 +#: wp-admin/about.php:129 msgid "WordPress now includes the Underscore and Backbone JavaScript libraries. TinyMCE, jQuery, jQuery UI, and SimplePie have all been updated to the latest versions." msgstr "WordPress inkluderer nå JavaScript-bibliotekene Underscore og Backbone . TinyMCE, jQuery, jQuery UI og SimplePie har alle blitt oppdatert til siste versjon." -#: wp-admin/about.php:133 +#: wp-admin/about.php:137 msgid "Return to Updates" msgstr "Tilbake til oppdateringer" -#: wp-admin/about.php:133 +#: wp-admin/about.php:137 msgid "Return to Dashboard → Updates" msgstr "Tilbake til Kontrollpanel → Oppdateringer" -#: wp-admin/about.php:137 +#: wp-admin/about.php:141 msgid "Go to Dashboard → Home" msgstr "Gå til Kontrollpanel → Hjem" -#: wp-admin/about.php:137 +#: wp-admin/about.php:141 msgid "Go to Dashboard" msgstr "Gå til kontrollpanel" -#: wp-admin/about.php:148 +#: wp-admin/about.php:152 msgid "Maintenance Release" msgid_plural "Maintenance Releases" msgstr[0] "Vedlikeholdsoppdatering" msgstr[1] "Vedlikeholdsoppdateringer" -#: wp-admin/about.php:149 +#: wp-admin/about.php:153 msgid "Security Release" msgid_plural "Security Releases" msgstr[0] "Sikkerhetsoppdatering" msgstr[1] "Sikkerhetsoppdateringer" -#: wp-admin/about.php:37 wp-admin/about.php:150 +#: wp-admin/about.php:37 wp-admin/about.php:154 msgid "Maintenance and Security Release" msgid_plural "Maintenance and Security Releases" msgstr[0] "Vedlikeholds- og sikkerhetsoppdatering" msgstr[1] "Vedlikeholds- og sikkerhetsoppdateringer" -#: wp-admin/about.php:153 +#: wp-admin/about.php:157 msgid "Version %1$s addressed a security issue." msgid_plural "Version %1$s addressed some security issues." msgstr[0] "Versjon %1$s tettet et sikkerhetshull" msgstr[1] "Versjon %1$s tettet noen sikkerhetshull." -#: wp-admin/about.php:157 +#: wp-admin/about.php:161 msgid "Version %1$s addressed %2$s bug." msgid_plural "Version %1$s addressed %2$s bugs." msgstr[0] "Versjon %1$s rettet %2$s programfeil." msgstr[1] "Versjon %1$s rettet %2$s programfeil." -#: wp-admin/about.php:161 +#: wp-admin/about.php:165 msgid "Version %1$s addressed a security issue and fixed %2$s bug." msgid_plural "Version %1$s addressed a security issue and fixed %2$s bugs." msgstr[0] "Versjon %1$s tettet et sikkerhetshull og rettet %2$s programfeil." msgstr[1] "Versjon %1$s tettet et sikkerhetshull og rettet %2$s programfeil." -#: wp-admin/about.php:38 wp-admin/about.php:165 +#: wp-admin/about.php:38 wp-admin/about.php:42 wp-admin/about.php:169 msgid "Version %1$s addressed some security issues and fixed %2$s bug." msgid_plural "Version %1$s addressed some security issues and fixed %2$s bugs." msgstr[0] "Versjon %1$s tettet noen sikkerhetshull og rettet %2$s programfeil." msgstr[1] "Versjon %1$s tettet noen sikkerhetshull og rettet %2$s programfeil." -#: wp-admin/about.php:40 wp-admin/about.php:168 +#: wp-admin/about.php:40 wp-admin/about.php:44 wp-admin/about.php:172 msgid "For more information, see the release notes." msgstr "For mer informasjon, se versjonsmerknadene." @@ -9234,14 +9225,14 @@ msgid "%s is currently editing this article. If you update it, you will overwrit msgstr "%s redigerer denne artikkelen nå. Hvis du oppdaterer den, vil du overskrive endringene." #: wp-admin/includes/ajax-actions.php:1071 -#: wp-admin/includes/ajax-actions.php:1314 wp-admin/includes/post.php:166 -#: wp-admin/includes/post.php:1284 +#: wp-admin/includes/ajax-actions.php:1314 wp-admin/includes/post.php:177 +#: wp-admin/includes/post.php:1295 msgid "You are not allowed to edit this page." msgstr "Du har ikke lov til å redigere denne siden." #: wp-admin/includes/ajax-actions.php:1074 -#: wp-admin/includes/ajax-actions.php:1317 wp-admin/includes/post.php:168 -#: wp-admin/includes/post.php:1287 wp-admin/press-this.php:35 +#: wp-admin/includes/ajax-actions.php:1317 wp-admin/includes/post.php:179 +#: wp-admin/includes/post.php:1298 wp-admin/press-this.php:35 #: wp-admin/upload.php:62 msgid "You are not allowed to edit this post." msgstr "Du har ikke lov til å redigere dette innlegget." diff --git a/wp-content/languages/admin-network-nb_NO.mo b/wp-content/languages/admin-network-nb_NO.mo index f150fed..7fb189f 100644 Binary files a/wp-content/languages/admin-network-nb_NO.mo and b/wp-content/languages/admin-network-nb_NO.mo differ diff --git a/wp-content/languages/admin-network-nb_NO.po b/wp-content/languages/admin-network-nb_NO.po index dd3fa3d..f5b52c1 100644 --- a/wp-content/languages/admin-network-nb_NO.po +++ b/wp-content/languages/admin-network-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Network Admin package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:46+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:29+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,6 +10,10 @@ msgstr "" "X-Generator: GlotPress/0.1\n" "Project-Id-Version: Network Admin\n" +#: wp-admin/network/settings.php:78 +msgid "Options saved." +msgstr "Innstillinger lagret." + #: wp-admin/network/settings.php:146 msgid "Banned Names" msgstr "Forbudte navn" diff --git a/wp-content/languages/continents-cities-nb_NO.mo b/wp-content/languages/continents-cities-nb_NO.mo index 5fb1584..3f9dcd2 100644 Binary files a/wp-content/languages/continents-cities-nb_NO.mo and b/wp-content/languages/continents-cities-nb_NO.mo differ diff --git a/wp-content/languages/continents-cities-nb_NO.po b/wp-content/languages/continents-cities-nb_NO.po index 0f179b0..16fe154 100644 --- a/wp-content/languages/continents-cities-nb_NO.po +++ b/wp-content/languages/continents-cities-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Continents & Cities package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:44+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:27+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/wp-content/languages/nb_NO.mo b/wp-content/languages/nb_NO.mo index 1e4c764..bd8c193 100644 Binary files a/wp-content/languages/nb_NO.mo and b/wp-content/languages/nb_NO.mo differ diff --git a/wp-content/languages/nb_NO.po b/wp-content/languages/nb_NO.po index a0b84f8..77f3244 100644 --- a/wp-content/languages/nb_NO.po +++ b/wp-content/languages/nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the 3.5.x package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:44+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:27+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -10,71 +10,143 @@ msgstr "" "X-Generator: GlotPress/0.1\n" "Project-Id-Version: 3.5.x\n" -#: wp-login.php:492 +#: wp-content/plugins/akismet/admin.php:161 +msgid "Your Akismet account has been successfully set up and activated. Happy blogging!" +msgstr "Din Akismet-konto har blitt satt opp og aktivert. God blogging!" + +#: wp-content/plugins/akismet/admin.php:165 +msgid "Please enter an API key" +msgstr "Vennligst skriv inn en API-nøkkel" + +#: wp-content/plugins/akismet/admin.php:177 +msgid "Akismet Stats" +msgstr "Akismet Statistikk" + +#: wp-content/plugins/akismet/admin.php:180 +msgid "Akismet eliminates the comment and trackback spam you get on your site. To use Akismet you may need to sign up for an API key. Click the button below to get started." +msgstr "Akismet fjerner kommentar- og tilbakesporingsspam på ditt nettsted. For å bruke Akismet må du kanskje registrere en konto for å få en API-nøkkel. Klikk på knappen nedenfor for å komme i gang." + +#: wp-content/plugins/akismet/admin.php:185 +msgid "Create a new Akismet Key" +msgstr "Lag ny Akismet-nøkkel" + +#: wp-content/plugins/akismet/admin.php:188 +msgid "I already have a key" +msgstr "Jeg har allerede en nøkkel" + +#: wp-content/plugins/akismet/admin.php:192 +msgid "Settings saved." +msgstr "Innstillinger lagret." + +#: wp-content/plugins/akismet/admin.php:207 +msgid "You must enter a valid Akismet API key here. If you need an API key, you can create one here" +msgstr "Du må skrive inn en gyldig API-nøkkel her. Hvis du trenger en API-nøkkel, kan du lage en her" + +#: wp-content/plugins/akismet/admin.php:215 +msgid "Auto-detete old spam" +msgstr "Auto-slett gammel spam" + +#: wp-content/plugins/akismet/admin.php:216 +msgid "Show approved comments" +msgstr "Vis godkjente kommentarer" + +#: wp-content/plugins/akismet/admin.php:225 +msgid "Save Changes" +msgstr "Lagre innstillinger" + +#: wp-content/plugins/akismet/admin.php:235 +msgid "Server Status" +msgstr "Serverstatus" + +#: wp-content/plugins/akismet/admin.php:281 +msgid "Check Network Status" +msgstr "Sjekk nettverksstatus" + +#: wp-content/plugins/akismet/admin.php:286 +msgid "Last Checked" +msgstr "Sist sjekket" + +#: wp-content/plugins/akismet/admin.php:288 +msgid "%s Ago" +msgstr "%s siden" + +#: wp-content/plugins/akismet/admin.php:288 +msgid "Not yet" +msgstr "Ikke ennå" + +#: wp-content/plugins/akismet/admin.php:289 +msgid "You can confirm that Akismet.com is up by clicking here." +msgstr "Du kan bekrefte at Akismet.com fungerer ved å klikke her." + +#: wp-content/plugins/akismet/admin.php:348 +msgid "Akismet Error Code" +msgstr "Akismet feilkode" + +#: wp-login.php:489 msgid "New password" msgstr "Nytt passord" -#: wp-login.php:496 +#: wp-login.php:493 msgid "Confirm new password" msgstr "Bekreft nytt passord" -#: wp-login.php:501 +#: wp-login.php:498 msgid "Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! \" ? $ % ^ & )." msgstr "Tips: Passordet bør være minst syv tegn langt. Bruk store og små bokstaver, tall og symboler som ! \" ? $ % ^ & ) for å gjøre det bedre." -#: wp-login.php:544 +#: wp-login.php:541 msgid "Registration Form" msgstr "Registreringsskjema" -#: wp-login.php:544 +#: wp-login.php:541 msgid "Register For This Site" msgstr "Registrer deg for dette nettstedet" -#: wp-login.php:557 +#: wp-login.php:554 msgid "A password will be e-mailed to you." msgstr "Et passord blir sendt til deg på e-post." -#: wp-login.php:565 wp-login.php:710 wp-login.php:712 +#: wp-login.php:562 wp-login.php:707 wp-login.php:709 msgid "Password Lost and Found" msgstr "Hittegodskontor for passord" -#: wp-login.php:565 wp-login.php:710 wp-login.php:712 +#: wp-login.php:562 wp-login.php:707 wp-login.php:709 msgid "Lost your password?" msgstr "Mistet passordet ditt?" -#: wp-login.php:614 +#: wp-login.php:611 msgid "You have logged in successfully." msgstr "Du har logget inn." -#: wp-login.php:651 +#: wp-login.php:648 msgid "ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress." msgstr "FEIL: Informasjonskapsler er blokkert eller ikke støttet av din nettleser. Du må slå på informasjonskapsler for å bruke WordPress." -#: wp-login.php:655 +#: wp-login.php:652 msgid "You are now logged out." msgstr "Du er nå logget ut." -#: wp-login.php:657 +#: wp-login.php:654 msgid "User registration is currently not allowed." msgstr "Registrering av brukere er for tiden ikke tillatt." -#: wp-login.php:659 +#: wp-login.php:656 msgid "Check your e-mail for the confirmation link." msgstr "Bekreftelseslenken finner du i e-posten din." -#: wp-login.php:661 +#: wp-login.php:658 msgid "Check your e-mail for your new password." msgstr "Det nye passordet finner du i e-posten din." -#: wp-login.php:663 +#: wp-login.php:660 msgid "Registration complete. Please check your e-mail." msgstr "Registreringen er ferdig. Vennligst sjekk e-posten din." -#: wp-login.php:665 +#: wp-login.php:662 msgid "Your session has expired. Please log-in again." msgstr "Din sesjon har utløpt. Vennligst logg inn på nytt." -#: wp-login.php:667 +#: wp-login.php:664 msgid "You have successfully updated WordPress! Please log back in to experience the awesomeness." msgstr "Du har klart å oppgradere WordPress! Vennligst logg inn på nytt for å oppleve hvor flott det har blitt." @@ -621,7 +693,7 @@ msgid "Plugin" msgstr "Utvidelse" #: wp-includes/js/tinymce/langs/wp-langs.php:342 -#: wp-includes/post-template.php:1443 wp-includes/theme-compat/sidebar.php:21 +#: wp-includes/post-template.php:1440 wp-includes/theme-compat/sidebar.php:21 msgid "Author" msgstr "Forfatter" @@ -1737,7 +1809,7 @@ msgstr "Beskrivelse" msgid "Edit" msgstr "Rediger" -#: wp-includes/media-template.php:248 wp-includes/script-loader.php:435 +#: wp-includes/media-template.php:248 wp-includes/script-loader.php:428 msgid "Clear" msgstr "Tøm" @@ -1754,11 +1826,11 @@ msgstr "Lenk til" msgid "Custom URL" msgstr "Tilpasset URL" -#: wp-includes/media-template.php:298 wp-includes/media-template.php:354 +#: wp-includes/media-template.php:298 wp-includes/media-template.php:351 msgid "Attachment Page" msgstr "Vedleggsside" -#: wp-includes/media-template.php:295 wp-includes/media-template.php:351 +#: wp-includes/media-template.php:295 wp-includes/media-template.php:354 msgid "Media File" msgstr "Mediefil" @@ -1782,7 +1854,7 @@ msgstr "Tilfeldig rekkefølge" msgid "No editor could be selected." msgstr "Ingen redigerer kunne velges." -#: wp-includes/media.php:1273 wp-includes/script-loader.php:323 +#: wp-includes/media.php:1273 wp-includes/script-loader.php:316 msgid "Allowed Files" msgstr "Godkjente filtyper" @@ -2459,72 +2531,72 @@ msgstr "(mer...)" msgid "There is no excerpt because this is a protected post." msgstr "Det finnes ikke utdrag siden innlegget er beskyttet." -#: wp-includes/post-template.php:633 +#: wp-includes/post-template.php:630 msgid "Pages:" msgstr "Sider:" -#: wp-includes/post-template.php:635 +#: wp-includes/post-template.php:632 msgid "Next page" msgstr "Neste side" -#: wp-includes/post-template.php:636 +#: wp-includes/post-template.php:633 msgid "Previous page" msgstr "Forrige side" -#: wp-includes/post-template.php:899 +#: wp-includes/post-template.php:896 msgid "Home" msgstr "Hjem" -#: wp-includes/post-template.php:1226 +#: wp-includes/post-template.php:1223 msgid "This post is password protected. To view it please enter your password below:" msgstr "Dette innlegget er passordbeskyttet. Du må oppgi passord nedenfor for å se det." -#: wp-includes/post-template.php:1227 +#: wp-includes/post-template.php:1224 msgid "Submit" msgstr "Send" -#: wp-includes/post-template.php:1304 +#: wp-includes/post-template.php:1301 msgctxt "revision date format" msgid "j F, Y @ G:i" msgstr "j. F Y @ H:i" -#: wp-includes/post-template.php:1306 +#: wp-includes/post-template.php:1303 msgid "%1$s [Autosave]" msgstr "%1$s [Autolagre]" -#: wp-includes/post-template.php:1308 +#: wp-includes/post-template.php:1305 msgid "%1$s [Current Revision]" msgstr "%1$s [Gjeldende revisjon]" -#: wp-includes/post-template.php:1374 +#: wp-includes/post-template.php:1371 msgctxt "post revision" msgid "%1$s by %2$s" msgstr "%1$s av %2$s" -#: wp-includes/post-template.php:1401 +#: wp-includes/post-template.php:1398 msgid "Restore" msgstr "Gjenopprett" -#: wp-includes/post-template.php:1424 +#: wp-includes/post-template.php:1421 msgid "Compare Revisions" msgstr "Sammenlign revisjoner" -#: wp-includes/post-template.php:1440 +#: wp-includes/post-template.php:1437 msgctxt "revisions column name" msgid "Old" msgstr "Gammel" -#: wp-includes/post-template.php:1441 +#: wp-includes/post-template.php:1438 msgctxt "revisions column name" msgid "New" msgstr "Ny" -#: wp-includes/post-template.php:1442 +#: wp-includes/post-template.php:1439 msgctxt "revisions column name" msgid "Date Created" msgstr "Dato opprettet" -#: wp-includes/post-template.php:1444 +#: wp-includes/post-template.php:1441 msgid "Actions" msgstr "Handlinger" @@ -2643,256 +2715,256 @@ msgid_plural "Trash (%s)" msgstr[0] "Papirkurv (%s)" msgstr[1] "Papirkurv (%s)" -#: wp-includes/post.php:808 +#: wp-includes/post.php:805 msgid "Invalid post" msgstr "Ugyldig innlegg" -#: wp-includes/post.php:866 wp-includes/post.php:887 +#: wp-includes/post.php:863 wp-includes/post.php:884 msgid "Draft" msgstr "Kladd" -#: wp-includes/post.php:867 +#: wp-includes/post.php:864 msgid "Pending Review" msgstr "Venter på gjennomgang" -#: wp-includes/post.php:868 wp-includes/post.php:888 -#: wp-includes/script-loader.php:385 +#: wp-includes/post.php:865 wp-includes/post.php:885 +#: wp-includes/script-loader.php:378 msgid "Private" msgstr "Privat" -#: wp-includes/post.php:869 wp-includes/post.php:889 -#: wp-includes/script-loader.php:390 +#: wp-includes/post.php:866 wp-includes/post.php:886 +#: wp-includes/script-loader.php:383 msgid "Published" msgstr "Publisert" -#: wp-includes/post.php:1238 +#: wp-includes/post.php:1235 msgid "Post types cannot exceed 20 characters in length" msgstr "Navn på innleggstyper kan ikke overstige 20 tegn" -#: wp-includes/post.php:1496 +#: wp-includes/post.php:1493 msgctxt "post type general name" msgid "Posts" msgstr "Innlegg" -#: wp-includes/post.php:1496 +#: wp-includes/post.php:1493 msgctxt "post type general name" msgid "Pages" msgstr "Sider" -#: wp-includes/post.php:1497 +#: wp-includes/post.php:1494 msgctxt "post type singular name" msgid "Post" msgstr "Innlegg" -#: wp-includes/post.php:1497 +#: wp-includes/post.php:1494 msgctxt "post type singular name" msgid "Page" msgstr "Side" -#: wp-includes/post.php:1498 +#: wp-includes/post.php:1495 msgctxt "post" msgid "Add New" msgstr "Legg til nytt" -#: wp-includes/post.php:1498 +#: wp-includes/post.php:1495 msgctxt "page" msgid "Add New" msgstr "Legg til ny" -#: wp-includes/post.php:1499 +#: wp-includes/post.php:1496 msgid "Add New Post" msgstr "Legg til nytt innlegg" -#: wp-includes/post.php:1499 +#: wp-includes/post.php:1496 msgid "Add New Page" msgstr "Legg til ny side" -#: wp-includes/post.php:1500 +#: wp-includes/post.php:1497 msgid "Edit Post" msgstr "Rediger innlegg" -#: wp-includes/post.php:1500 +#: wp-includes/post.php:1497 msgid "Edit Page" msgstr "Rediger side" -#: wp-includes/post.php:1501 +#: wp-includes/post.php:1498 msgid "New Page" msgstr "Ny side" -#: wp-includes/post.php:1502 +#: wp-includes/post.php:1499 msgid "View Page" msgstr "Vis side" -#: wp-includes/post.php:1503 +#: wp-includes/post.php:1500 msgid "Search Posts" msgstr "Søk i innlegg" -#: wp-includes/post.php:1503 +#: wp-includes/post.php:1500 msgid "Search Pages" msgstr "Søk i sider" -#: wp-includes/post.php:1504 +#: wp-includes/post.php:1501 msgid "No posts found." msgstr "Ingen innlegg funnet." -#: wp-includes/post.php:1504 +#: wp-includes/post.php:1501 msgid "No pages found." msgstr "Ingen sider funnet." -#: wp-includes/post.php:1505 +#: wp-includes/post.php:1502 msgid "No posts found in Trash." msgstr "Ingen innlegg funnet i papirkurven." -#: wp-includes/post.php:1505 +#: wp-includes/post.php:1502 msgid "No pages found in Trash." msgstr "Ingen sider funnet i papirkurven." -#: wp-includes/post.php:1506 +#: wp-includes/post.php:1503 msgid "Parent Page:" msgstr "Forelderside:" -#: wp-includes/post.php:1507 +#: wp-includes/post.php:1504 msgid "All Posts" msgstr "Alle innlegg" -#: wp-includes/post.php:1507 +#: wp-includes/post.php:1504 msgid "All Pages" msgstr "Alle sider" -#: wp-includes/post.php:2194 +#: wp-includes/post.php:2191 msgid "Images" msgstr "Bilder" -#: wp-includes/post.php:2194 +#: wp-includes/post.php:2191 msgid "Manage Images" msgstr "Håndter bilder" -#: wp-includes/post.php:2194 +#: wp-includes/post.php:2191 msgid "Image (%s)" msgid_plural "Images (%s)" msgstr[0] "Bilde (%s)" msgstr[1] "Bilder (%s)" -#: wp-includes/post.php:2195 +#: wp-includes/post.php:2192 msgid "Audio" msgstr "Lyd" -#: wp-includes/post.php:2195 +#: wp-includes/post.php:2192 msgid "Manage Audio" msgstr "Håndter lyd" -#: wp-includes/post.php:2195 +#: wp-includes/post.php:2192 msgid "Audio (%s)" msgid_plural "Audio (%s)" msgstr[0] "Lyd (%s)" msgstr[1] "Lyd (%s)" -#: wp-includes/post.php:2196 +#: wp-includes/post.php:2193 msgid "Video" msgstr "Video" -#: wp-includes/post.php:2196 +#: wp-includes/post.php:2193 msgid "Manage Video" msgstr "Håndter video" -#: wp-includes/post.php:2196 +#: wp-includes/post.php:2193 msgid "Video (%s)" msgid_plural "Video (%s)" msgstr[0] "Video (%s)" msgstr[1] "Video (%s)" -#: wp-includes/post.php:2633 +#: wp-includes/post.php:2630 msgid "Passing an integer number of posts is deprecated. Pass an array of arguments instead." msgstr "Passing an integer number of posts is deprecated. Pass an array of arguments instead." -#: wp-includes/post.php:2731 +#: wp-includes/post.php:2728 msgid "Content, title, and excerpt are empty." msgstr "Innhold, tittel og utdrag er tomme." -#: wp-includes/post.php:2797 +#: wp-includes/post.php:2794 msgid "Whoops, the provided date is invalid." msgstr "Beklager, den angitte datoen er ugyldig." -#: wp-includes/post.php:2872 +#: wp-includes/post.php:2869 msgid "Could not update post in the database" msgstr "Kunne ikke oppdatere innlegget i databasen" -#: wp-includes/post.php:2888 +#: wp-includes/post.php:2885 msgid "Could not insert post into the database" msgstr "Kunne ikke lagre innlegget i databasen" -#: wp-includes/post.php:2935 +#: wp-includes/post.php:2932 msgid "The page template is invalid." msgstr "Sidemalen er ugyldig." -#: wp-includes/post.php:3203 wp-includes/script-loader.php:391 -#: wp-includes/script-loader.php:416 +#: wp-includes/post.php:3200 wp-includes/script-loader.php:384 +#: wp-includes/script-loader.php:409 msgctxt "tag delimiter" msgid "," msgstr "," -#: wp-includes/post.php:4882 +#: wp-includes/post.php:4879 msgid "Content" msgstr "Innhold" -#: wp-includes/post.php:4883 +#: wp-includes/post.php:4880 msgid "Excerpt" msgstr "Utdrag" -#: wp-includes/post.php:5076 +#: wp-includes/post.php:5073 msgid "Cannot create a revision of a revision" msgstr "Kan ikke lage en revisjon av en revisjon." -#: wp-includes/post.php:5251 +#: wp-includes/post.php:5248 msgid "You do not have permission to preview drafts." msgstr "Du har ikke lov til å forhåndsvise kladder." -#: wp-includes/post.php:5325 +#: wp-includes/post.php:5322 msgctxt "Post format" msgid "Standard" msgstr "Standard" -#: wp-includes/post.php:5326 +#: wp-includes/post.php:5323 msgctxt "Post format" msgid "Aside" msgstr "Notis" -#: wp-includes/post.php:5327 +#: wp-includes/post.php:5324 msgctxt "Post format" msgid "Chat" msgstr "Chat" -#: wp-includes/post.php:5328 +#: wp-includes/post.php:5325 msgctxt "Post format" msgid "Gallery" msgstr "Galleri" -#: wp-includes/post.php:5329 +#: wp-includes/post.php:5326 msgctxt "Post format" msgid "Link" msgstr "Lenke" -#: wp-includes/post.php:5330 +#: wp-includes/post.php:5327 msgctxt "Post format" msgid "Image" msgstr "Bilde" -#: wp-includes/post.php:5331 +#: wp-includes/post.php:5328 msgctxt "Post format" msgid "Quote" msgstr "Sitat" -#: wp-includes/post.php:5332 +#: wp-includes/post.php:5329 msgctxt "Post format" msgid "Status" msgstr "Status" -#: wp-includes/post.php:5333 +#: wp-includes/post.php:5330 msgctxt "Post format" msgid "Video" msgstr "Video" -#: wp-includes/post.php:5334 +#: wp-includes/post.php:5331 msgctxt "Post format" msgid "Audio" msgstr "Lyd" @@ -2977,11 +3049,11 @@ msgstr "tekstretning" msgid "Toggle Editor Text Direction" msgstr "Veksle tekstretning i tekstredigering" -#: wp-includes/script-loader.php:100 wp-includes/script-loader.php:353 +#: wp-includes/script-loader.php:100 wp-includes/script-loader.php:346 msgid "You do not have permission to do that." msgstr "Du har ikke lov til å gjøre det." -#: wp-includes/script-loader.php:101 wp-includes/script-loader.php:354 +#: wp-includes/script-loader.php:101 wp-includes/script-loader.php:347 msgid "An unidentified error has occurred." msgstr "En ikke identifisert feil har oppstått." @@ -3097,173 +3169,173 @@ msgstr "flyttet til papirkurven." msgid "“%s” has failed to upload." msgstr "«%s» ble ikke lastet opp." -#: wp-includes/script-loader.php:271 wp-login.php:500 +#: wp-includes/script-loader.php:264 wp-login.php:497 msgid "Strength indicator" msgstr "Styrkeindikator" -#: wp-includes/script-loader.php:272 +#: wp-includes/script-loader.php:265 msgid "Very weak" msgstr "Veldig svakt" -#: wp-includes/script-loader.php:273 +#: wp-includes/script-loader.php:266 msgid "Weak" msgstr "Svakt" -#: wp-includes/script-loader.php:275 +#: wp-includes/script-loader.php:268 msgctxt "password strength" msgid "Medium" msgstr "Medium" -#: wp-includes/script-loader.php:276 +#: wp-includes/script-loader.php:269 msgid "Strong" msgstr "Sterk" -#: wp-includes/script-loader.php:277 +#: wp-includes/script-loader.php:270 msgid "Mismatch" msgstr "Passer ikke" -#: wp-includes/script-loader.php:291 wp-includes/script-loader.php:415 +#: wp-includes/script-loader.php:284 wp-includes/script-loader.php:408 msgid "(no title)" msgstr "(ingen tittel)" -#: wp-includes/script-loader.php:292 +#: wp-includes/script-loader.php:285 msgid "No matches found." msgstr "Ingen treff funnet." -#: wp-includes/script-loader.php:315 +#: wp-includes/script-loader.php:308 msgid "Save & Activate" msgstr "Lagre & aktiver" -#: wp-includes/script-loader.php:316 +#: wp-includes/script-loader.php:309 msgid "Save & Publish" msgstr "Lagre & publiser" -#: wp-includes/script-loader.php:317 +#: wp-includes/script-loader.php:310 msgid "Saved" msgstr "Lagret" -#: wp-includes/script-loader.php:345 +#: wp-includes/script-loader.php:338 msgid "Add" msgstr "Legg til" -#: wp-includes/script-loader.php:346 +#: wp-includes/script-loader.php:339 msgid "Separate multiple categories with commas." msgstr "Skill mellom flere kategorier med komma." -#: wp-includes/script-loader.php:363 +#: wp-includes/script-loader.php:356 msgid "Approve and Reply" msgstr "Godkjenn og send" -#: wp-includes/script-loader.php:373 +#: wp-includes/script-loader.php:366 msgid "OK" msgstr "OK" -#: wp-includes/script-loader.php:375 +#: wp-includes/script-loader.php:368 msgid "Publish on:" msgstr "Publiseres den:" -#: wp-includes/script-loader.php:376 +#: wp-includes/script-loader.php:369 msgid "Schedule for:" msgstr "Planlegg:" -#: wp-includes/script-loader.php:377 +#: wp-includes/script-loader.php:370 msgid "Published on:" msgstr "Publisert:" -#: wp-includes/script-loader.php:378 +#: wp-includes/script-loader.php:371 msgid "Show more comments" msgstr "Vis flere kommentarer" -#: wp-includes/script-loader.php:379 +#: wp-includes/script-loader.php:372 msgid "No more comments found." msgstr "Ingen flere kommentarer funnet." -#: wp-includes/script-loader.php:380 +#: wp-includes/script-loader.php:373 msgid "Publish" msgstr "Publiser" -#: wp-includes/script-loader.php:381 +#: wp-includes/script-loader.php:374 msgid "Schedule" msgstr "Planlegg" -#: wp-includes/script-loader.php:383 +#: wp-includes/script-loader.php:376 msgid "Save as Pending" msgstr "Lagre som ventende" -#: wp-includes/script-loader.php:384 +#: wp-includes/script-loader.php:377 msgid "Save Draft" msgstr "Lagre kladd" -#: wp-includes/script-loader.php:386 +#: wp-includes/script-loader.php:379 msgid "Public" msgstr "Offentlig" -#: wp-includes/script-loader.php:387 +#: wp-includes/script-loader.php:380 msgid "Public, Sticky" msgstr "Offentlig, klebrig" -#: wp-includes/script-loader.php:388 +#: wp-includes/script-loader.php:381 msgid "Password Protected" msgstr "Passordbeskyttet" -#: wp-includes/script-loader.php:389 +#: wp-includes/script-loader.php:382 msgid "Privately Published" msgstr "Privat publisert" -#: wp-includes/script-loader.php:399 +#: wp-includes/script-loader.php:392 msgid "Submitted on:" msgstr "Sendt:" -#: wp-includes/script-loader.php:413 wp-includes/script-loader.php:421 +#: wp-includes/script-loader.php:406 wp-includes/script-loader.php:414 msgid "Error while saving the changes." msgstr "Feil under lagring av endringer." -#: wp-includes/script-loader.php:414 +#: wp-includes/script-loader.php:407 msgid "Remove From Bulk Edit" msgstr "Fjern fra masseredigering" -#: wp-includes/script-loader.php:426 +#: wp-includes/script-loader.php:419 msgid "Plugin Information:" msgstr "Utvidelsesinformasjon:" -#: wp-includes/script-loader.php:427 +#: wp-includes/script-loader.php:420 msgid "Are you sure you want to install this plugin?" msgstr "Er du sikker på at du vil installere denne utvidelsen?" -#: wp-includes/script-loader.php:437 +#: wp-includes/script-loader.php:430 msgid "Select Color" msgstr "Velg farge" -#: wp-includes/script-loader.php:438 +#: wp-includes/script-loader.php:431 msgid "Current Color" msgstr "Gjeldende farge" -#: wp-includes/script-loader.php:449 +#: wp-includes/script-loader.php:442 msgid "Could not load the preview image. Please reload the page and try again." msgstr "Kunne ikke laste forhåndsvisningen. Vennligst oppdater siden og prøv igjen." -#: wp-includes/script-loader.php:454 +#: wp-includes/script-loader.php:447 msgid "Use as featured image" msgstr "Bruk som fremhevet bilde" -#: wp-includes/script-loader.php:455 +#: wp-includes/script-loader.php:448 msgid "Saving..." msgstr "Lagrer..." -#: wp-includes/script-loader.php:456 +#: wp-includes/script-loader.php:449 msgid "Could not set that as the thumbnail image. Try a different attachment." msgstr "Kunne ikke sette det som miniatyrbilde. Prøv et annet vedlegg." -#: wp-includes/script-loader.php:457 +#: wp-includes/script-loader.php:450 msgid "Done" msgstr "Ferdig" -#: wp-includes/script-loader.php:463 +#: wp-includes/script-loader.php:456 msgctxt "search results" msgid "No results found." msgstr "Ingen resultater funnet." -#: wp-includes/script-loader.php:464 +#: wp-includes/script-loader.php:457 msgid "" "You are about to permanently delete this menu. \n" " 'Cancel' to stop, 'OK' to delete." @@ -3271,7 +3343,7 @@ msgstr "" "Du er i ferd med å permanent slette denne menyen.\n" " 'Avbryt' for å stoppe, 'OK' for å slette." -#: wp-includes/script-loader.php:576 +#: wp-includes/script-loader.php:569 msgid "Saving Draft…" msgstr "Lagrer kladd…" @@ -3505,7 +3577,7 @@ msgstr "Avsnitt og linjeskift lages automatisk, e-postadressen din vil aldri vis msgid "Logged in as %2$s. Log out »" msgstr "Logget inn som %2$s. Logg ut »" -#: wp-includes/theme-compat/comments-popup.php:80 wp-login.php:553 +#: wp-includes/theme-compat/comments-popup.php:80 wp-login.php:550 msgid "E-mail" msgstr "E-post" @@ -3753,7 +3825,7 @@ msgstr "WordPress database feil %1$s for spørring %2$s gjort av %3$s" msgid "WordPress database error %1$s for query %2$s" msgstr "WordPress database feil %1$s for spørring %2$s" -#: wp-includes/wp-db.php:1148 +#: wp-includes/wp-db.php:1150 msgid "" "\n" "

Error establishing a database connection

\n" @@ -3775,7 +3847,7 @@ msgstr "" "\n" "

Hvis du er usikker på hva disse uttrykkene betyr bør du kontakte tjenestetilbyderen din. Hvis du fortsatt trenger hjelp kan du besøke WordPress support-forum.

\n" -#: wp-includes/wp-db.php:1655 +#: wp-includes/wp-db.php:1658 msgid "ERROR: WordPress %1$s requires MySQL %2$s or higher" msgstr "FEIL: WordPress %1$s krever MySQL %2$s eller høyere" @@ -3883,43 +3955,43 @@ msgstr "Feil: Denne e-post er allerede registrert. Vennligst ve msgid "ERROR: Couldn’t register you... please contact the webmaster !" msgstr "Feil: Kunne ikke registrere deg... vennligst kontakt administrator !" -#: wp-login.php:428 +#: wp-login.php:425 msgid "Sorry, that key does not appear to be valid." msgstr "Beklager, men den nøkkelen er tydeligvis ikke gyldig." -#: wp-login.php:432 +#: wp-login.php:429 msgid "Lost Password" msgstr "Tapt passord" -#: wp-login.php:432 +#: wp-login.php:429 msgid "Please enter your username or email address. You will receive a link to create a new password via email." msgstr "Vennligst skriv inn brukernavn eller e-postadresse. Du vil motta en lenke for å opprette et nytt passord via e-post." -#: wp-login.php:440 +#: wp-login.php:437 msgid "Username or E-mail:" msgstr "Brukernavn eller e-post:" -#: wp-login.php:445 +#: wp-login.php:442 msgid "Get New Password" msgstr "Få nytt passord" -#: wp-login.php:471 +#: wp-login.php:468 msgid "The passwords do not match." msgstr "Passordene samsvarer ikke." -#: wp-login.php:477 +#: wp-login.php:474 msgid "Password Reset" msgstr "Passord tilbakestilt" -#: wp-login.php:477 +#: wp-login.php:474 msgid "Your password has been reset." msgstr "Ditt passord er tilbakestilt." -#: wp-login.php:485 wp-login.php:504 +#: wp-login.php:482 wp-login.php:501 msgid "Reset Password" msgstr "Tilbakestill passord" -#: wp-login.php:485 +#: wp-login.php:482 msgid "Enter your new password below." msgstr "Skriv inn ditt nye passord nedenfor." @@ -3955,7 +4027,7 @@ msgstr "En feil oppstod under aktivering" msgid "Username:" msgstr "Brukernavn:" -#: wp-activate.php:104 wp-includes/post-template.php:1227 +#: wp-activate.php:104 wp-includes/post-template.php:1224 msgid "Password:" msgstr "Passord:" @@ -3999,295 +4071,247 @@ msgstr "Vennligst oppgrader WordPress til en gjeldende versjo msgid "Comment History" msgstr "Kommentarhistorikk" -#: wp-content/plugins/akismet/admin.php:58 +#: wp-content/plugins/akismet/admin.php:59 +#: wp-content/plugins/akismet/admin.php:212 +#: wp-content/plugins/akismet/admin.php:214 msgid "Settings" msgstr "Innstillinger" -#: wp-content/plugins/akismet/admin.php:71 +#: wp-content/plugins/akismet/admin.php:80 #: wp-includes/class-wp-customize-manager.php:83 -#: wp-includes/script-loader.php:320 +#: wp-includes/script-loader.php:313 msgid "Cheatin’ uh?" msgstr "Jukser vi?" -#: wp-content/plugins/akismet/admin.php:134 +#: wp-content/plugins/akismet/admin.php:160 msgid "Your key has been cleared." msgstr "Din nøkkel har blitt slettet." -#: wp-content/plugins/akismet/admin.php:135 -msgid "Your key has been verified. Happy blogging!" -msgstr "Din nøkkel har blitt verifisert. God blogging!" - -#: wp-content/plugins/akismet/admin.php:136 +#: wp-content/plugins/akismet/admin.php:162 msgid "The key you entered is invalid. Please double-check it." msgstr "Nøkkelen du skrev inn er ikke gyldig. Vennligst kontroller den." -#: wp-content/plugins/akismet/admin.php:137 +#: wp-content/plugins/akismet/admin.php:163 msgid "The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration." msgstr "Nøkkelen du skrev inn kunne ikke verifiseres fordi tilkobling til akismet.com feilet. Vennligst kontroller konfigurasjon av tjeneren din." -#: wp-content/plugins/akismet/admin.php:138 +#: wp-content/plugins/akismet/admin.php:164 msgid "There was a problem connecting to the Akismet server. Please check your server configuration." msgstr "Kunne ikke koble til akismet.com. Vennligst kontroller konfigurasjon av tjeneren din." -#: wp-content/plugins/akismet/admin.php:139 -msgid "Please enter an API key. (Get your key.)" -msgstr "Vennligst skriv inn API nøkkel. (Hent nøkkel.)" - -#: wp-content/plugins/akismet/admin.php:140 -msgid "This key is valid." -msgstr "Denne nøkkelen er gyldig." - -#: wp-content/plugins/akismet/admin.php:141 +#: wp-content/plugins/akismet/admin.php:166 msgid "This key is invalid." msgstr "Ugyldig nøkkel." -#: wp-content/plugins/akismet/admin.php:142 +#: wp-content/plugins/akismet/admin.php:167 msgid "The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration." msgstr "Nøkkelen under ble tidligere verifisert, men en tilkobling til akismet.com feilet nå. Vennligst kontroller konfigurasjon av tjeneren din." -#: wp-content/plugins/akismet/admin.php:143 +#: wp-content/plugins/akismet/admin.php:168 msgid "Your WordPress home URL %s is invalid. Please fix the home option." msgstr "Din WordPress hjem-URL %s er ugyldig. Fiks hjem-valget." -#: wp-content/plugins/akismet/admin.php:147 -msgid "Options saved." -msgstr "Innstillinger lagret." - -#: wp-content/plugins/akismet/admin.php:150 -#: wp-content/plugins/akismet/admin.php:827 -#: wp-content/plugins/akismet/admin.php:830 -msgid "Akismet Configuration" -msgstr "Akismet innstillinger" - -#: wp-content/plugins/akismet/admin.php:152 +#: wp-content/plugins/akismet/admin.php:195 msgid "Sign up success! Please check your email for your Akismet API Key and enter it below." msgstr "Registrering vellykket! Sjekk e-posten for din Akismet API-nøkkel, og skriv den inn nedenfor." -#: wp-content/plugins/akismet/admin.php:157 -msgid "For many people, Akismet will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as \"spam\" on the moderation screen and Akismet will learn from the mistakes. If you don't have an API key yet, you can get one at Akismet.com." -msgstr "For mange vil Akismet dramatisk redusere eller totalt eliminere useriøse kommentarer og tilbakesporinger som nettstedet mottar. Hvis en kommer feilaktig igjennom, merk den som \"useriøs\" på modereringssiden så Akismet lærer av feilene sine. Hvis du ikke har en API-nøkkel ennå, kan du få en på Akismet.com." - -#: wp-content/plugins/akismet/admin.php:159 +#: wp-content/plugins/akismet/admin.php:204 msgid "Akismet API Key" msgstr "Akismet API-nøkkel" -#: wp-content/plugins/akismet/admin.php:163 -msgid "What is this?" -msgstr "Hva er dette?" - -#: wp-content/plugins/akismet/admin.php:165 -msgid "Why might my key be invalid?" -msgstr "Hvorfor kan min nøkkel være ugyldig?" - -#: wp-content/plugins/akismet/admin.php:166 -msgid "This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar." -msgstr "Dette kan bety en av to ting. Enten at du kopierte feil nøkkel eller at utvidelsen ikke kunne nå frem til Akismet-verten. Det siste er ofte forårsaket av din nettvert, brannmur eller lignende." - -#: wp-content/plugins/akismet/admin.php:170 +#: wp-content/plugins/akismet/admin.php:215 msgid "Auto-delete spam submitted on posts more than a month old." msgstr "Slett automatisk useriøse kommentarer som er skrevet til innlegg som er eldre enn en måned." -#: wp-content/plugins/akismet/admin.php:171 +#: wp-content/plugins/akismet/admin.php:216 msgid "Show the number of comments you've approved beside each comment author." msgstr "Vis antall kommentarer du har godkjent ved siden av hver kommentarforfatter." -#: wp-content/plugins/akismet/admin.php:172 -msgid "Update options »" -msgstr "Lagre endringene »" - -#: wp-content/plugins/akismet/admin.php:177 +#: wp-content/plugins/akismet/admin.php:230 msgid "Server Connectivity" msgstr "Server tilkoblingsstatus" -#: wp-content/plugins/akismet/admin.php:181 +#: wp-content/plugins/akismet/admin.php:238 msgid "Network functions are disabled." msgstr "Nettverksfunksjoner er deaktivert." -#: wp-content/plugins/akismet/admin.php:182 +#: wp-content/plugins/akismet/admin.php:239 msgid "Your web host or server administrator has disabled PHP's fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet's system requirements." msgstr "Din nettjener eller administrator har deaktivert PHP sine fsockopen- eller gethostbynamel-funksjoner. Akismet virker ikke før dette er fikset. Vennligst kontakt administratoren for tjeneren eller brannmuren din og oppgi denne informasjonen om systemkrav for Akismet." -#: wp-content/plugins/akismet/admin.php:190 +#: wp-content/plugins/akismet/admin.php:245 msgid "Unable to reach some Akismet servers." msgstr "Noen Akismet-servere kunne ikke nås." -#: wp-content/plugins/akismet/admin.php:191 +#: wp-content/plugins/akismet/admin.php:246 msgid "A network problem or firewall is blocking some connections from your web server to Akismet.com. Akismet is working but this may cause problems during times of network congestion. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls." msgstr "Et nettverksproblem eller en brannmur blokkerer for noen forbindelser imellom nettserveren din og Akismet.com. Akismet virker men dette kan føre til problemer i perioder med mye nettverkstrafikk. Vennligst kontakt administrator for serveren din og oppgi denne informasjonen om Akismet og brannmurer." -#: wp-content/plugins/akismet/admin.php:195 +#: wp-content/plugins/akismet/admin.php:248 msgid "Unable to reach any Akismet servers." msgstr "Kunne ikke kommunisere med en eneste Akismet-server." -#: wp-content/plugins/akismet/admin.php:196 +#: wp-content/plugins/akismet/admin.php:249 msgid "A network problem or firewall is blocking all connections from your web server to Akismet.com. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls." msgstr "Et nettverksproblem eller en brannmur blokkerer for alle forbindelser imellom nettserveren din og Akismet.com. Akismet virker ikke før dette er fikset. Vennligst kontakt administrator for serveren din og oppgi denne informasjonen om Akismet og brannmurer." -#: wp-content/plugins/akismet/admin.php:200 +#: wp-content/plugins/akismet/admin.php:251 msgid "All Akismet servers are available." msgstr "Alle Akismet-tjenere er tilgjengelig." -#: wp-content/plugins/akismet/admin.php:201 +#: wp-content/plugins/akismet/admin.php:252 msgid "Akismet is working correctly. All servers are accessible." msgstr "Akismet virker som den skal. Alle servere er tilgjengelige." -#: wp-content/plugins/akismet/admin.php:206 +#: wp-content/plugins/akismet/admin.php:255 msgid "Unable to find Akismet servers." msgstr "Kunne ikke finne Akismet-servere." -#: wp-content/plugins/akismet/admin.php:207 +#: wp-content/plugins/akismet/admin.php:256 msgid "A DNS problem or firewall is preventing all access from your web server to Akismet.com. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls." msgstr "Et DNS-problem eller en brannmur blokkerer all tilgang imellom nettserveren din og Akismet.com. Akismet virker ikke før dette er fikset. Vennligst kontakt administrator for serveren din og oppgi denne informasjonen om Akismet og brannmurer." -#: wp-content/plugins/akismet/admin.php:215 +#: wp-content/plugins/akismet/admin.php:267 msgid "Akismet server" msgstr "Akismet-server" -#: wp-content/plugins/akismet/admin.php:215 +#: wp-content/plugins/akismet/admin.php:263 +#: wp-content/plugins/akismet/admin.php:267 msgid "Network Status" msgstr "Nettverksstatus" -#: wp-content/plugins/akismet/admin.php:224 +#: wp-content/plugins/akismet/admin.php:275 msgid "Accessible" msgstr "Tilgjengelig" -#: wp-content/plugins/akismet/admin.php:224 +#: wp-content/plugins/akismet/admin.php:275 msgid "Re-trying" msgstr "Sjekker på nytt" -#: wp-content/plugins/akismet/admin.php:232 -msgid "Last checked %s ago." -msgstr "Sist kontrollert for %s siden." - -#: wp-content/plugins/akismet/admin.php:233 -msgid "Check network status »" -msgstr "Kontroller status for nettverk »" - -#: wp-content/plugins/akismet/admin.php:234 -msgid "Click here to confirm that Akismet.com is up." -msgstr "Klikk her for å bekrefte at Akismet.com er oppe." - -#: wp-content/plugins/akismet/admin.php:265 +#: wp-content/plugins/akismet/admin.php:322 msgctxt "comments" msgid "Spam" msgstr "Useriøse" -#: wp-content/plugins/akismet/admin.php:271 +#: wp-content/plugins/akismet/admin.php:328 msgid "Akismet has protected your site from %3$s spam comments." msgid_plural "Akismet has protected your site from %3$s spam comments." msgstr[0] "Akismet har beskyttet nettstedet ditt fra %3$s useriøse kommentarer." msgstr[1] "Akismet har beskyttet nettstedet ditt fra %3$s useriøse kommentarer." -#: wp-content/plugins/akismet/admin.php:305 +#: wp-content/plugins/akismet/admin.php:309 msgid "Akismet is almost ready." msgstr "Akismet er nesten klar." -#: wp-content/plugins/akismet/admin.php:305 +#: wp-content/plugins/akismet/admin.php:309 msgid "You must enter your Akismet API key for it to work." msgstr "Du må skrive inn din Akismet API-nøkkel for at dette skal fungere." -#: wp-content/plugins/akismet/admin.php:318 +#: wp-content/plugins/akismet/admin.php:400 msgid "Akismet has detected a problem." msgstr "Akismet har oppdaget et problem." -#: wp-content/plugins/akismet/admin.php:318 +#: wp-content/plugins/akismet/admin.php:400 msgid "Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist." msgstr "Noen kommentarer har ikke blitt sjekket for spam av Akismet ennå. De har midlertidig blitt holdt tilbake for moderering. Sjekk dine Akismet-innstillinger og kontakt din netthotell-tilbyder hvis problemet vedvarer." -#: wp-content/plugins/akismet/admin.php:340 +#: wp-content/plugins/akismet/admin.php:422 msgid "Awaiting spam check" msgstr "Avventer spam-sjekk" -#: wp-content/plugins/akismet/admin.php:344 +#: wp-content/plugins/akismet/admin.php:426 msgid "Flagged as spam by Akismet" msgstr "Merket som useriøst av Akismet" -#: wp-content/plugins/akismet/admin.php:346 +#: wp-content/plugins/akismet/admin.php:428 msgid "Cleared by Akismet" msgstr "Godkjent av Akismet" -#: wp-content/plugins/akismet/admin.php:350 +#: wp-content/plugins/akismet/admin.php:432 msgid "Flagged as spam by %s" msgstr "Merket som useriøs av %s" -#: wp-content/plugins/akismet/admin.php:352 +#: wp-content/plugins/akismet/admin.php:434 msgid "Un-spammed by %s" msgstr "Merket som ikke useriøs av %s" -#: wp-content/plugins/akismet/admin.php:364 -#: wp-content/plugins/akismet/admin.php:372 +#: wp-content/plugins/akismet/admin.php:446 +#: wp-content/plugins/akismet/admin.php:454 msgid "View comment history" msgstr "Se kommentarhistorikk" -#: wp-content/plugins/akismet/admin.php:364 +#: wp-content/plugins/akismet/admin.php:446 msgid "History" msgstr "Historikk" -#: wp-content/plugins/akismet/admin.php:377 +#: wp-content/plugins/akismet/admin.php:459 msgid "%s approved" msgid_plural "%s approved" msgstr[0] "%s godkjent" msgstr[1] "%s godkjente" -#: wp-content/plugins/akismet/admin.php:392 -#: wp-content/plugins/akismet/admin.php:420 +#: wp-content/plugins/akismet/admin.php:474 +#: wp-content/plugins/akismet/admin.php:502 msgid "%s ago" msgstr "%s siden" -#: wp-content/plugins/akismet/admin.php:404 +#: wp-content/plugins/akismet/admin.php:175 +#: wp-content/plugins/akismet/admin.php:486 +#: wp-content/plugins/akismet/admin.php:905 +#: wp-content/plugins/akismet/admin.php:908 msgid "Akismet" msgstr "Akismet" -#: wp-content/plugins/akismet/admin.php:462 +#: wp-content/plugins/akismet/admin.php:542 msgid "Akismet has protected your site from %2$s spam comment already. " msgid_plural "Akismet has protected your site from %2$s spam comments already. " msgstr[0] "Akismet har beskyttet din side mot %2$s useriøs kommentar allerede." msgstr[1] "Akismet har beskyttet din side mot %2$s useriøse kommentarer allerede." -#: wp-content/plugins/akismet/admin.php:468 +#: wp-content/plugins/akismet/admin.php:548 msgid "Akismet blocks spam from getting to your blog. " msgstr "Akismet blokkerer useriøse kommentarer til ditt nettsted." -#: wp-content/plugins/akismet/admin.php:473 +#: wp-content/plugins/akismet/admin.php:553 msgid "There's %1$s comment in your spam queue right now." msgid_plural "There are %1$s comments in your spam queue right now." msgstr[0] "Det er %1$s kommentar i kø som er merket useriøs." msgstr[1] "Det er %1$s kommentarer i kø som er merket useriøse." -#: wp-content/plugins/akismet/admin.php:479 +#: wp-content/plugins/akismet/admin.php:559 msgid "There's nothing in your spam queue at the moment." msgstr "Det er ingenting i din useriøs-kø i øyeblikket." -#: wp-content/plugins/akismet/admin.php:497 +#: wp-content/plugins/akismet/admin.php:577 msgid "Check for Spam" msgstr "Se etter useriøse" -#: wp-content/plugins/akismet/admin.php:543 +#: wp-content/plugins/akismet/admin.php:622 msgid "%s reported this comment as not spam" msgstr "%s rapporterte denne kommentaren som ikke useriøs" -#: wp-content/plugins/akismet/admin.php:595 +#: wp-content/plugins/akismet/admin.php:673 msgid "%s reported this comment as spam" msgstr "%s rapporterte denne kommentaren som useriøs" -#: wp-content/plugins/akismet/admin.php:643 +#: wp-content/plugins/akismet/admin.php:721 msgid "%s changed the comment status to %s" msgstr "%s endret status for kommentaren til %s" -#: wp-content/plugins/akismet/admin.php:712 +#: wp-content/plugins/akismet/admin.php:790 msgid "Akismet re-checked and caught this comment as spam" msgstr "Akismet re-sjekket og fanget denne kommentaren som useriøs" -#: wp-content/plugins/akismet/admin.php:717 +#: wp-content/plugins/akismet/admin.php:795 msgid "Akismet re-checked and cleared this comment" msgstr "Akismet re-sjekket og klarerte denne kommentaren" -#: wp-content/plugins/akismet/admin.php:721 +#: wp-content/plugins/akismet/admin.php:799 msgid "Akismet was unable to re-check this comment (response: %s)" msgstr "Akismet klarte ikke å re-sjekke denne kommentaren (respons:%s)" -#: wp-content/plugins/akismet/admin.php:828 -#: wp-content/plugins/akismet/admin.php:831 +#: wp-content/plugins/akismet/admin.php:906 +#: wp-content/plugins/akismet/admin.php:909 msgid "Akismet Stats" msgstr "Akismet statistikk" @@ -4411,7 +4435,7 @@ msgstr "IP:" msgid "Not Spam" msgstr "Ikke useriøs" -#: wp-content/plugins/akismet/legacy.php:294 wp-includes/post.php:1502 +#: wp-content/plugins/akismet/legacy.php:294 wp-includes/post.php:1499 msgid "View Post" msgstr "Vis innlegg" @@ -4507,7 +4531,7 @@ msgstr "Min konto" msgid "Edit My Profile" msgstr "Rediger min profil" -#: wp-includes/admin-bar.php:198 wp-includes/class-wp-admin-bar.php:357 +#: wp-includes/admin-bar.php:198 wp-includes/class-wp-admin-bar.php:358 msgid "Log Out" msgstr "Logg ut" @@ -4554,7 +4578,7 @@ msgstr "Brukere" msgid "Visit Network" msgstr "Besøk nettverk" -#: wp-includes/admin-bar.php:370 wp-includes/post.php:1501 +#: wp-includes/admin-bar.php:370 wp-includes/post.php:1498 msgid "New Post" msgstr "Nytt innlegg" @@ -4600,7 +4624,7 @@ msgstr "Temaer" msgid "Customize" msgstr "Tilpass" -#: wp-includes/admin-bar.php:598 wp-includes/functions.php:2691 +#: wp-includes/admin-bar.php:598 wp-includes/functions.php:2693 msgid "Widgets" msgstr "Widgeter" @@ -4687,33 +4711,33 @@ msgstr "Nyhetsstrøm for alle innlegg arkivert under %s" msgid "Tags: " msgstr "Stikkord: " -#: wp-includes/class-http.php:122 wp-includes/class-wp-xmlrpc-server.php:5314 +#: wp-includes/class-http.php:129 wp-includes/class-wp-xmlrpc-server.php:5314 msgid "A valid URL was not provided." msgstr "En gyldig URL ble ikke angitt" -#: wp-includes/class-http.php:125 +#: wp-includes/class-http.php:132 msgid "User has blocked requests through HTTP." msgstr "Bruker har blokkert for forespørseler igjennom HTTP." -#: wp-includes/class-http.php:145 +#: wp-includes/class-http.php:152 msgid "Destination directory for file streaming does not exist or is not writable." msgstr "Nedlastingsmappen for filer finnes ikke eller er ikke skrivbar." -#: wp-includes/class-http.php:244 +#: wp-includes/class-http.php:251 msgid "There are no HTTP transports available which can complete the requested request." msgstr "Det er ingen HTTP transportør tilgjengelig som kan fullføre den forespurte forespørselen." -#: wp-includes/class-http.php:742 wp-includes/class-http.php:924 -#: wp-includes/class-http.php:943 wp-includes/class-http.php:1123 +#: wp-includes/class-http.php:749 wp-includes/class-http.php:932 +#: wp-includes/class-http.php:951 wp-includes/class-http.php:1136 msgid "Could not open handle for fopen() to %s" msgstr "Klarte ikke åpne peker for fopen() til %s" -#: wp-includes/class-http.php:782 wp-includes/class-http.php:966 -#: wp-includes/class-http.php:1164 wp-includes/class-http.php:1183 +#: wp-includes/class-http.php:789 wp-includes/class-http.php:975 +#: wp-includes/class-http.php:1177 wp-includes/class-http.php:1196 msgid "Too many redirects." msgstr "For mange redirigeringer." -#: wp-includes/class-http.php:866 +#: wp-includes/class-http.php:873 msgid "Malformed URL: %s" msgstr "Feil sammensatt URL: %s" @@ -4812,7 +4836,7 @@ msgstr "— Velg —" #: wp-includes/class-wp-customize-control.php:739 #: wp-includes/class-wp-customize-control.php:768 #: wp-includes/js/tinymce/langs/wp-langs.php:249 -#: wp-includes/script-loader.php:436 +#: wp-includes/script-loader.php:429 msgid "Default" msgstr "Standard" @@ -5023,7 +5047,7 @@ msgstr "Engelsk=en,Dansk=da,Nederlandsk=nl,Finsk=fi,Fransk=fr,Tysk=de,Italiensk= #: wp-includes/class-wp-editor.php:664 #: wp-includes/js/tinymce/langs/wp-langs.php:21 -#: wp-includes/script-loader.php:289 wp-includes/script-loader.php:382 +#: wp-includes/script-loader.php:282 wp-includes/script-loader.php:375 msgid "Update" msgstr "Oppdater" @@ -5117,7 +5141,7 @@ msgstr "URL" #: wp-includes/js/tinymce/langs/wp-langs.php:382 #: wp-includes/js/tinymce/langs/wp-langs.php:547 #: wp-includes/media-template.php:222 wp-includes/media-template.php:379 -#: wp-includes/post.php:4881 +#: wp-includes/post.php:4878 msgid "Title" msgstr "Tittel" @@ -5133,13 +5157,13 @@ msgstr "Eller lag lenke til eksisterende innhold" msgid "No search term specified. Showing recent items." msgstr "Ingen søkeord spesifisert. Viser nye elementer." -#: wp-includes/class-wp-editor.php:853 wp-includes/script-loader.php:290 +#: wp-includes/class-wp-editor.php:853 wp-includes/script-loader.php:283 msgid "Add Link" msgstr "Legg til lenke" #: wp-includes/class-wp-editor.php:856 #: wp-includes/js/tinymce/langs/wp-langs.php:22 wp-includes/media.php:1503 -#: wp-includes/script-loader.php:318 wp-includes/script-loader.php:374 +#: wp-includes/script-loader.php:311 wp-includes/script-loader.php:367 msgid "Cancel" msgstr "Avbryt" @@ -5226,7 +5250,7 @@ msgstr "Gå til forfatterens nettside" msgid "Anonymous" msgstr "Anonym" -#: wp-includes/class-wp-theme.php:663 wp-includes/formatting.php:3054 +#: wp-includes/class-wp-theme.php:663 wp-includes/formatting.php:3055 msgid ", " msgstr ", " @@ -5794,7 +5818,7 @@ msgstr "Er det ingen lenke til oss?" #: wp-includes/class-wp-xmlrpc-server.php:5359 #: wp-includes/class-wp-xmlrpc-server.php:5366 #: wp-includes/class-wp-xmlrpc-server.php:5373 -#: wp-includes/class-wp-xmlrpc-server.php:5480 +#: wp-includes/class-wp-xmlrpc-server.php:5481 msgid "The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource." msgstr "Spesifisert mål-URL kan ikke brukes som mål. Enten eksisterer det ikke, eller så er det ikke en plass med mulighet for tilbakeping." @@ -5806,23 +5830,23 @@ msgstr "Kilde URL og mål URL kan ikke begge peke til samme plass." msgid "The pingback has already been registered." msgstr "Tilbakeping har allerede blitt registrert." -#: wp-includes/class-wp-xmlrpc-server.php:5385 +#: wp-includes/class-wp-xmlrpc-server.php:5386 msgid "The source URL does not exist." msgstr "Kilde URL finnes ikke." -#: wp-includes/class-wp-xmlrpc-server.php:5397 +#: wp-includes/class-wp-xmlrpc-server.php:5398 msgid "We cannot find a title on that page." msgstr "Vi kan ikke finne en tittel på den siden." -#: wp-includes/class-wp-xmlrpc-server.php:5433 +#: wp-includes/class-wp-xmlrpc-server.php:5434 msgid "The source URL does not contain a link to the target URL, and so cannot be used as a source." msgstr "Kilde URL inneholder ikke en lenke til mål URL, og kan ikke brukes som kilde." -#: wp-includes/class-wp-xmlrpc-server.php:5454 +#: wp-includes/class-wp-xmlrpc-server.php:5455 msgid "Pingback from %1$s to %2$s registered. Keep the web talking! :-)" msgstr "Tilbakeping fra %1$s til %2$s registrert. La webben snakke! :-)" -#: wp-includes/class-wp-xmlrpc-server.php:5487 +#: wp-includes/class-wp-xmlrpc-server.php:5488 msgid "The specified target URL does not exist." msgstr "Spesifisert mål URL finnes ikke." @@ -5867,7 +5891,7 @@ msgstr "Skriv inn passordet ditt for å se kommentarer." msgid "Comment on %s" msgstr "Kommenter %s" -#: wp-includes/comment-template.php:1038 wp-includes/script-loader.php:364 +#: wp-includes/comment-template.php:1038 wp-includes/script-loader.php:357 msgid "Reply" msgstr "Svar" @@ -6004,7 +6028,7 @@ msgid "Your site’s WordPress Pages" msgstr "Ditt nettsted sine WordPress-sider" #: wp-includes/default-widgets.php:18 wp-includes/default-widgets.php:24 -#: wp-includes/post-template.php:818 wp-includes/theme-compat/sidebar.php:55 +#: wp-includes/post-template.php:815 wp-includes/theme-compat/sidebar.php:55 msgid "Pages" msgstr "Sider" @@ -6307,7 +6331,7 @@ msgstr "Ingen" msgid "Last updated" msgstr "Sist oppdatert" -#: wp-includes/deprecated.php:1898 wp-includes/post-template.php:1166 +#: wp-includes/deprecated.php:1898 wp-includes/post-template.php:1163 msgid "Missing Attachment" msgstr "Mangler vedlegg" @@ -6319,7 +6343,7 @@ msgstr "Første innlegg" msgid "Last Post" msgstr "Siste innlegg" -#: wp-includes/deprecated.php:3175 wp-includes/functions.php:2002 +#: wp-includes/deprecated.php:3175 wp-includes/functions.php:2004 msgid "Are you sure you want to do this?" msgstr "Sikker på at det er dette du vil?" @@ -6363,7 +6387,7 @@ msgstr "Kommentarer til: %s" msgid "Protected Comments: Please enter your password to view comments." msgstr "Beskyttede kommentarer. Vennligst skriv inn passordet ditt for å se kommentarene." -#: wp-includes/formatting.php:37 wp-includes/formatting.php:3270 +#: wp-includes/formatting.php:37 wp-includes/formatting.php:3271 msgctxt "opening curly double quote" msgid "“" msgstr "«" @@ -6430,128 +6454,128 @@ msgstr[1] "%s dager" msgid "…" msgstr "…" -#: wp-includes/formatting.php:2180 wp-includes/script-loader.php:303 +#: wp-includes/formatting.php:2180 wp-includes/script-loader.php:296 msgctxt "word count: words or characters?" msgid "words" msgstr "words" -#: wp-includes/formatting.php:2763 +#: wp-includes/formatting.php:2764 msgid "The email address entered did not appear to be a valid email address. Please enter a valid email address." msgstr "E-postadressen som du skrev inn virker ikke å være en gyldig adresse. Vennligst skriv inn en gyldig e-postadresse." -#: wp-includes/formatting.php:2850 +#: wp-includes/formatting.php:2851 msgid "The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL." msgstr "WordPress-adressen som du skrev inn virker ikke å være en gyldig URL. Vennligst skriv inn en gyldig URL." -#: wp-includes/formatting.php:2860 +#: wp-includes/formatting.php:2861 msgid "The Site address you entered did not appear to be a valid URL. Please enter a valid URL." msgstr "Nettstedsadressen du skrev inn virker ikke å være en gyldig URL. Vennligst skriv inn en gyldig URL." -#: wp-includes/formatting.php:2901 +#: wp-includes/formatting.php:2902 msgid "The timezone you have entered is not valid. Please select a valid timezone." msgstr "Tidssonen du har skrevet inn er ikke gyldig. Vennligst velg en gyldig tidssone." -#: wp-includes/formatting.php:3056 +#: wp-includes/formatting.php:3057 msgid ", and " msgstr " og " -#: wp-includes/formatting.php:3058 +#: wp-includes/formatting.php:3059 msgid " and " msgstr " og " -#: wp-includes/functions.php:1009 +#: wp-includes/functions.php:1011 msgid "ERROR: %s is not a valid feed template." msgstr "FEIL: %s er ikke en gyldig mal Atom- eller RSS-strømmer." -#: wp-includes/functions.php:1153 +#: wp-includes/functions.php:1155 msgid "One or more database tables are unavailable. The database may need to be repaired." msgstr "En eller flere av tabellene i databasen er utilgjengelige. Databasen må kanskje repareres." -#: wp-includes/functions.php:1602 wp-includes/functions.php:1725 +#: wp-includes/functions.php:1604 wp-includes/functions.php:1727 msgid "Unable to create directory %s. Is its parent directory writable by the server?" msgstr "Kan ikke lage mappen %s. Er mappen der du vil lage den skrivbar for serveren?" -#: wp-includes/functions.php:1699 +#: wp-includes/functions.php:1701 msgid "Empty filename" msgstr "Tomt filnavn" -#: wp-includes/functions.php:1703 +#: wp-includes/functions.php:1705 msgid "Invalid file type" msgstr "Ugyldig filtype" -#: wp-includes/functions.php:1731 +#: wp-includes/functions.php:1733 msgid "Could not write file %s" msgstr "Kunne ikke lagre filen %s" -#: wp-includes/functions.php:1997 +#: wp-includes/functions.php:1999 msgid "WordPress Failure Notice" msgstr "WordPress feilnote" -#: wp-includes/functions.php:1999 +#: wp-includes/functions.php:2001 msgid "You are attempting to log out of %s" msgstr "Du forsøker å logge ut av %s" -#: wp-includes/functions.php:2000 +#: wp-includes/functions.php:2002 msgid "Do you really want to log out?" msgstr "Vil du virkelig logge ut?" -#: wp-includes/functions.php:2004 wp-includes/ms-functions.php:1641 +#: wp-includes/functions.php:2006 wp-includes/ms-functions.php:1641 msgid "Please try again." msgstr "Vennligst prøv igjen." -#: wp-includes/functions.php:2078 +#: wp-includes/functions.php:2080 msgid "« Back" msgstr "« Tilbake" -#: wp-includes/functions.php:2090 wp-load.php:62 +#: wp-includes/functions.php:2092 wp-load.php:62 msgid "WordPress › Error" msgstr "WordPress › Feil" -#: wp-includes/functions.php:2749 +#: wp-includes/functions.php:2751 msgid "Database Error" msgstr "Databasefeil" -#: wp-includes/functions.php:2753 wp-includes/ms-load.php:237 +#: wp-includes/functions.php:2755 wp-includes/ms-load.php:237 msgid "Error establishing a database connection" msgstr "Feil: klarte ikke å etablere databasetilkobling" -#: wp-includes/functions.php:2839 wp-includes/functions.php:2879 +#: wp-includes/functions.php:2841 wp-includes/functions.php:2881 msgid "%1$s is deprecated since version %2$s! Use %3$s instead." msgstr "%1$s er utgått siden versjon %2$s! Bruk %3$s isteden." -#: wp-includes/functions.php:2841 wp-includes/functions.php:2881 +#: wp-includes/functions.php:2843 wp-includes/functions.php:2883 msgid "%1$s is deprecated since version %2$s with no alternative available." msgstr "%1$s er utgått siden versjon %2$s med ingen alternativer tilgjengelig." -#: wp-includes/functions.php:2923 +#: wp-includes/functions.php:2925 msgid "%1$s was called with an argument that is deprecated since version %2$s! %3$s" msgstr "%1$s ble forespurt med et argument som er utgått siden versjon %2$s! %3$s" -#: wp-includes/functions.php:2925 +#: wp-includes/functions.php:2927 msgid "%1$s was called with an argument that is deprecated since version %2$s with no alternative available." msgstr "%1$s ble forespurt med et argument som er utgått siden versjon %2$s! med ingen alternativer tilgjengelige." -#: wp-includes/functions.php:2957 +#: wp-includes/functions.php:2960 msgid "(This message was added in version %s.)" msgstr "(Denne meldingen ble lagt i versjon %s.)" -#: wp-includes/functions.php:2958 +#: wp-includes/functions.php:2961 msgid "Please see Debugging in WordPress for more information." msgstr "Vennligst se Debugging i WordPress for mer informasjon." -#: wp-includes/functions.php:2959 +#: wp-includes/functions.php:2962 msgid "%1$s was called incorrectly. %2$s %3$s" msgstr "%1$s ble kalt feil. %2$s %3$s" -#: wp-includes/functions.php:3354 +#: wp-includes/functions.php:3362 msgid "Select a city" msgstr "Velg en by" -#: wp-includes/functions.php:3399 wp-includes/functions.php:3403 +#: wp-includes/functions.php:3407 wp-includes/functions.php:3411 msgid "UTC" msgstr "UTC" -#: wp-includes/functions.php:3407 +#: wp-includes/functions.php:3415 msgid "Manual Offsets" msgstr "Manuelle offset" @@ -6576,8 +6600,8 @@ msgstr "Scripts og stiler bør ikke være registrert eller \"enqueued\" foran %1 msgid "Search for:" msgstr "Søk etter:" -#: wp-includes/general-template.php:189 wp-login.php:449 wp-login.php:477 -#: wp-login.php:508 wp-login.php:564 +#: wp-includes/general-template.php:189 wp-login.php:446 wp-login.php:474 +#: wp-login.php:505 wp-login.php:561 msgid "Log in" msgstr "Logg inn" @@ -6585,24 +6609,24 @@ msgstr "Logg inn" msgid "Log out" msgstr "Logg ut" -#: wp-includes/general-template.php:261 wp-login.php:549 wp-login.php:682 +#: wp-includes/general-template.php:261 wp-login.php:546 wp-login.php:679 msgid "Username" msgstr "Brukernavn" -#: wp-includes/general-template.php:262 wp-login.php:686 +#: wp-includes/general-template.php:262 wp-login.php:683 msgid "Password" msgstr "Passord" -#: wp-includes/general-template.php:263 wp-login.php:690 +#: wp-includes/general-template.php:263 wp-login.php:687 msgid "Remember Me" msgstr "Husk meg" -#: wp-includes/general-template.php:264 wp-login.php:673 wp-login.php:692 +#: wp-includes/general-template.php:264 wp-login.php:670 wp-login.php:689 msgid "Log In" msgstr "Logg inn" -#: wp-includes/general-template.php:341 wp-login.php:451 wp-login.php:510 -#: wp-login.php:560 wp-login.php:709 +#: wp-includes/general-template.php:341 wp-login.php:448 wp-login.php:507 +#: wp-login.php:557 wp-login.php:706 msgid "Register" msgstr "Registrer" @@ -6708,8 +6732,8 @@ msgstr "Sett inn" #: wp-includes/js/tinymce/langs/wp-langs.php:23 #: wp-includes/js/tinymce/wp-mce-help.php:245 wp-includes/media-template.php:32 -#: wp-includes/script-loader.php:187 wp-includes/script-loader.php:319 -#: wp-login.php:620 +#: wp-includes/script-loader.php:187 wp-includes/script-loader.php:312 +#: wp-login.php:617 msgid "Close" msgstr "Lukk" @@ -7193,7 +7217,7 @@ msgstr "Sett inn/rediger bilde" #: wp-includes/js/tinymce/langs/wp-langs.php:152 #: wp-includes/js/tinymce/langs/wp-langs.php:377 -#: wp-includes/script-loader.php:288 +#: wp-includes/script-loader.php:281 msgid "Insert/edit link" msgstr "Sett inn/rediger lenke" @@ -7335,7 +7359,7 @@ msgid "Cell" msgstr "Felt" #: wp-includes/js/tinymce/langs/wp-langs.php:206 -#: wp-includes/script-loader.php:465 wp-includes/script-loader.php:577 +#: wp-includes/script-loader.php:458 wp-includes/script-loader.php:570 msgid "The changes you made will be lost if you navigate away from this page." msgstr "Endringene du gjorde vil bli borte hvis du navigerer bort fra denne siden." diff --git a/wp-content/languages/themes/twentyeleven-nb_NO.mo b/wp-content/languages/themes/twentyeleven-nb_NO.mo index 234d968..7c90886 100644 Binary files a/wp-content/languages/themes/twentyeleven-nb_NO.mo and b/wp-content/languages/themes/twentyeleven-nb_NO.mo differ diff --git a/wp-content/languages/themes/twentyeleven-nb_NO.po b/wp-content/languages/themes/twentyeleven-nb_NO.po index cb9ace9..45e81cf 100644 --- a/wp-content/languages/themes/twentyeleven-nb_NO.po +++ b/wp-content/languages/themes/twentyeleven-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Twenty Eleven package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:47+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:29+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/wp-content/languages/themes/twentyten-nb_NO.mo b/wp-content/languages/themes/twentyten-nb_NO.mo index 0922155..4506392 100644 Binary files a/wp-content/languages/themes/twentyten-nb_NO.mo and b/wp-content/languages/themes/twentyten-nb_NO.mo differ diff --git a/wp-content/languages/themes/twentyten-nb_NO.po b/wp-content/languages/themes/twentyten-nb_NO.po index ce084b6..2459ac1 100644 --- a/wp-content/languages/themes/twentyten-nb_NO.po +++ b/wp-content/languages/themes/twentyten-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Twenty Ten package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:46+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:29+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/wp-content/languages/themes/twentytwelve-nb_NO.mo b/wp-content/languages/themes/twentytwelve-nb_NO.mo index 602a8ba..4ebd1b6 100644 Binary files a/wp-content/languages/themes/twentytwelve-nb_NO.mo and b/wp-content/languages/themes/twentytwelve-nb_NO.mo differ diff --git a/wp-content/languages/themes/twentytwelve-nb_NO.po b/wp-content/languages/themes/twentytwelve-nb_NO.po index 9d39b51..ed17a99 100644 --- a/wp-content/languages/themes/twentytwelve-nb_NO.po +++ b/wp-content/languages/themes/twentytwelve-nb_NO.po @@ -2,7 +2,7 @@ # This file is distributed under the same license as the Twenty Twelve package. msgid "" msgstr "" -"PO-Revision-Date: 2013-01-25 11:15:47+0000\n" +"PO-Revision-Date: 2013-06-23 15:59:30+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -230,7 +230,7 @@ msgstr "Vis alle innlegg av %s" #: functions.php:352 msgid "This entry was posted in %1$s and tagged %2$s on %3$s by %4$s." -msgstr "Dette innlegget ble skrevet i %1$s og market %2$s, %3$s av %4$s." +msgstr "Dette innlegget ble skrevet i %1$s og merket %2$s, %3$s av %4$s." #: functions.php:354 msgid "This entry was posted in %1$s on %3$s by %4$s." diff --git a/wp-content/plugins/akismet/.htaccess b/wp-content/plugins/akismet/.htaccess index 18eed64..cfad468 100644 --- a/wp-content/plugins/akismet/.htaccess +++ b/wp-content/plugins/akismet/.htaccess @@ -3,4 +3,9 @@ Deny from all Allow from all + + +#allow access to any image + + Allow from all \ No newline at end of file diff --git a/wp-content/plugins/akismet/admin.php b/wp-content/plugins/akismet/admin.php index 9d7673f..481b0f3 100644 --- a/wp-content/plugins/akismet/admin.php +++ b/wp-content/plugins/akismet/admin.php @@ -10,9 +10,9 @@ function akismet_admin_init() { if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) { function akismet_version_warning() { - echo " -

".sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) ." ".sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "

- "; + echo ' +

'.sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) .' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). '

+ '; } add_action('admin_notices', 'akismet_version_warning'); @@ -31,13 +31,14 @@ add_action( 'admin_enqueue_scripts', 'akismet_load_js_and_css' ); function akismet_load_js_and_css() { global $hook_suffix; - if ( - $hook_suffix == 'index.php' # dashboard - || $hook_suffix == 'edit-comments.php' - || $hook_suffix == 'comment.php' - || $hook_suffix == 'post.php' - || $hook_suffix == 'plugins_page_akismet-key-config' - ) { + if ( in_array( $hook_suffix, array( + 'index.php', # dashboard + 'edit-comments.php', + 'comment.php', + 'post.php', + 'plugins_page_akismet-key-config', + 'jetpack_page_akismet-key-config', + ) ) ) { wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.4.4' ); wp_enqueue_style( 'akismet.css'); @@ -64,35 +65,51 @@ function akismet_plugin_action_links( $links, $file ) { add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 ); function akismet_conf() { - global $akismet_nonce, $wpcom_api_key; + global $akismet_nonce, $current_user; + + $new_key_link = 'https://akismet.com/get/'; + $api_key = akismet_get_key(); + $show_key_form = $api_key; + $key_status = 'empty'; + $saved_ok = false; + + $ms = array(); - if ( isset($_POST['submit']) ) { + if ( isset( $_POST['submit'] ) ) { if ( function_exists('current_user_can') && !current_user_can('manage_options') ) die(__('Cheatin’ uh?')); + + $show_key_form = true; check_admin_referer( $akismet_nonce ); - $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] ); + $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] ); $home_url = parse_url( get_bloginfo('url') ); - - if ( empty($key) ) { - $key_status = 'empty'; - $ms[] = 'new_key_empty'; - delete_option('wordpress_api_key'); - } elseif ( empty($home_url['host']) ) { - $key_status = 'empty'; + + if ( empty( $home_url['host'] ) ) $ms[] = 'bad_home_url'; - } else { - $key_status = akismet_verify_key( $key ); - } - if ( $key_status == 'valid' ) { + if ( empty( $key ) ) { + if ( $api_key ) { + delete_option('wordpress_api_key'); + $saved_ok = true; + $ms[] = 'new_key_empty'; + } + else + $ms[] = 'key_empty'; + } + else + $key_status = akismet_verify_key( $key ); + + if ( $key != $api_key && $key_status == 'valid' ) { update_option('wordpress_api_key', $key); $ms[] = 'new_key_valid'; - } else if ( $key_status == 'invalid' ) { - $ms[] = 'new_key_invalid'; - } else if ( $key_status == 'failed' ) { - $ms[] = 'new_key_failed'; } + elseif ( $key_status == 'invalid' ) + $ms[] = 'new_key_invalid'; + elseif ( $key_status == 'failed' ) + $ms[] = 'new_key_failed'; + + $api_key = $key_status == 'valid' ? $key : false; if ( isset( $_POST['akismet_discard_month'] ) ) update_option( 'akismet_discard_month', 'true' ); @@ -103,157 +120,197 @@ function akismet_conf() { update_option( 'akismet_show_user_comments_approved', 'true' ); else update_option( 'akismet_show_user_comments_approved', 'false' ); + + if ( empty( $ms ) ) + $saved_ok = true; - } elseif ( isset($_POST['check']) ) { + } + elseif ( isset( $_POST['check'] ) ) { + $show_key_form = true; + check_admin_referer( $akismet_nonce ); akismet_get_server_connectivity(0); } - - if ( empty( $key_status) || $key_status != 'valid' ) { - $key = get_option('wordpress_api_key'); - if ( empty( $key ) ) { - if ( empty( $key_status ) || $key_status != 'failed' ) { - if ( akismet_verify_key( '1234567890ab' ) == 'failed' ) - $ms[] = 'no_connection'; - else - $ms[] = 'key_empty'; - } - $key_status = 'empty'; - } else { - $key_status = akismet_verify_key( $key ); + + if ( $show_key_form ) { + //check current key status + //only get this if showing the key form otherwise takes longer for page to load for new user + //no need to get it if we already know it and its valid + if ( in_array( $key_status, array( 'invalid', 'failed', 'empty' ) ) ) { + $key = get_option('wordpress_api_key'); + if ( empty( $key ) ) { + //no key saved yet - maybe connection to Akismet down? + if ( in_array( $key_status, array( 'invalid', 'empty' ) ) ) { + if ( akismet_verify_key( '1234567890ab' ) == 'failed' ) + $ms[] = 'no_connection'; + } + } + else + $key_status = akismet_verify_key( $key ); } - if ( $key_status == 'valid' ) { - $ms[] = 'key_valid'; - } else if ( $key_status == 'invalid' ) { - $ms[] = 'key_invalid'; - } else if ( !empty($key) && $key_status == 'failed' ) { - $ms[] = 'key_failed'; + + if ( !isset( $_POST['submit'] ) ) { + if ( $key_status == 'invalid' ) + $ms[] = 'key_invalid'; + elseif ( !empty( $key ) && $key_status == 'failed' ) + $ms[] = 'key_failed'; } } $messages = array( - 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')), - 'new_key_valid' => array('color' => '4AB915', 'text' => __('Your key has been verified. Happy blogging!')), - 'new_key_invalid' => array('color' => '888', 'text' => __('The key you entered is invalid. Please double-check it.')), - 'new_key_failed' => array('color' => '888', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')), - 'no_connection' => array('color' => '888', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')), - 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (Get your key.)'), 'http://akismet.com/get/?return=true')), - 'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')), - 'key_invalid' => array('color' => '888', 'text' => __('This key is invalid.')), - 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')), - 'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ), + 'new_key_empty' => array( 'class' => 'updated fade', 'text' => __('Your key has been cleared.' ) ), + 'new_key_valid' => array( 'class' => 'updated fade', 'text' => __('Your Akismet account has been successfully set up and activated. Happy blogging!' ) ), + 'new_key_invalid' => array( 'class' => 'error', 'text' => __('The key you entered is invalid. Please double-check it.' ) ), + 'new_key_failed' => array( 'class' => 'error', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' ) ), + 'no_connection' => array( 'class' => 'error', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.' ) ), + 'key_empty' => array( 'class' => 'updated fade', 'text' => __('Please enter an API key' ) ), + 'key_invalid' => array( 'class' => 'error', 'text' => __('This key is invalid.' ) ), + 'key_failed' => array( 'class' => 'error', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.' ) ), + 'bad_home_url' => array( 'class' => 'error', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ) ); ?> - -

- + +
-

- -

Sign up success! Please check your email for your Akismet API Key and enter it below.' ); ?>

- -
- - -

Akismet will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at Akismet.com.'), 'http://akismet.com/?return=true', 'http://akismet.com/get/?return=true'); ?>

- -

- -

- -

(What is this?'); ?>)

- -

-

- - - -

-

-

- - -
- -

- -

-

fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { - // some connections work, some fail - if ( $fail_count > 0 && $fail_count < count($servers) ) { ?> -

-

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { ?> -

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- -

-

- -

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- - - - - $status ) { - $color = ( $status ? '#4AB915' : '#888'); - ?> - - - + +

+ +

Stats' ), esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) ) ); ?>

+ +
+

+ + + + + + +
+ +
+
+ +

+ + +

Sign up success! Please check your email for your Akismet API Key and enter it below.') ?>

+ + +

+ +
+
+ + + + + + + + + + + + +
+
+

create one here'), '#' );?>

+
+
+
+ +
+
+ +

+ +

+ - - - -

-

-

Click here to confirm that Akismet.com is up.'), 'http://status.automattic.com/9931/136079/Akismet-API', 'http://status.automattic.com/9931/136079/Akismet-API' ); ?>

- - -
+ +

+
+ + + + + + + + + + + + + + + + +
+ +

+

fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ 0 ) { + if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?> +

+

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ 0 ) { // all connections fail ?> +

+

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ +

+

+ +

+

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

+ +
+ + + + + + $status ) : ?> + + + + + + +
+
+ +
+

+

clicking here.'), 'http://status.automattic.com/9931/136079/Akismet-API' ); ?>

+
+ +
+ +
-
- -
- + +
+

enter your Akismet API key for it to work.' ), esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), admin_url( 'admin.php' ) ) ) );?>

+ +
-

Akismet Error Code:

+

:

-

More information is available at https://akismet.com/errors/

+

%s' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?> +

".__('Akismet is almost ready.')." ".sprintf(__('You must enter your Akismet API key for it to work.'), "admin.php?page=akismet-key-config")."

- "; + global $hook_suffix, $current_user; + + if ( $hook_suffix == 'plugins.php' ) { + echo ' +
+ +
+ + + +
+
A
+
+
+
Activate your Akismet account
+
+
+
Almost done - activate your account and say goodbye to comment spam.
+
+
+
+ '; + } } + add_action('admin_notices', 'akismet_warning'); return; } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) { @@ -314,9 +396,9 @@ function akismet_admin_warnings() { $waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ); $next_check = wp_next_scheduled('akismet_schedule_cron_recheck'); if ( $waiting > 0 && $next_check > time() ) - echo " -

".__('Akismet has detected a problem.')." ".sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config')."

- "; + echo ' +

'.__('Akismet has detected a problem.').' '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'

+ '; } add_action('admin_notices', 'akismet_warning'); return; @@ -332,8 +414,8 @@ function akismet_comment_row_action( $a, $comment ) { return $a; $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true ); - $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true ); - $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true); + $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true ); + $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true); $comment_status = wp_get_comment_status( $comment->comment_ID ); $desc = null; if ( $akismet_error ) { @@ -369,7 +451,7 @@ function akismet_comment_row_action( $a, $comment ) { } if ( $desc ) - echo ''.htmlspecialchars($desc).''; + echo ''.esc_html( $desc ).''; if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) { $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url ); @@ -390,7 +472,7 @@ function akismet_comment_status_meta_box($comment) { foreach ( $history as $row ) { $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT'; echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' - '; - echo htmlspecialchars( $row['message'] ) . '
'; + echo esc_html( $row['message'] ) . ''; } echo ''; @@ -418,7 +500,7 @@ function akismet_comment_column_row( $column, $comment_id ) { echo '
'; foreach ( $history as $row ) { echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '
'; - echo '
' . htmlspecialchars( $row['message'] ) . '
'; + echo '
' . esc_html( $row['message'] ) . '
'; } echo '
'; @@ -430,18 +512,16 @@ function akismet_comment_column_row( $column, $comment_id ) { // END FIXME // call out URLS in comments -function akismet_text_add_link_callback( $m ) { - - // bare link? - if ( $m[4] == $m[2] ) - return ''.$m[4].''; - else - return ''.$m[4].''; +function akismet_text_add_link_callback( $m ) { + // bare link? + if ( $m[4] == $m[2] ) + return ''.$m[4].''; + else + return ''.$m[4].''; } function akismet_text_add_link_class( $comment_text ) { - - return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text ); + return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text ); } add_filter('comment_text', 'akismet_text_add_link_class'); @@ -516,7 +596,6 @@ function akismet_submit_nonspam_comment ( $comment_id ) { $comment->blog_lang = get_locale(); $comment->blog_charset = get_option('blog_charset'); $comment->permalink = get_permalink($comment->comment_post_ID); - $comment->reporter_ip = $_SERVER['REMOTE_ADDR']; if ( is_object($current_user) ) { $comment->reporter = $current_user->user_login; } @@ -568,7 +647,6 @@ function akismet_submit_spam_comment ( $comment_id ) { $comment->blog_lang = get_locale(); $comment->blog_charset = get_option('blog_charset'); $comment->permalink = get_permalink($comment->comment_post_ID); - $comment->reporter_ip = $_SERVER['REMOTE_ADDR']; if ( is_object($current_user) ) { $comment->reporter = $current_user->user_login; } @@ -822,12 +900,12 @@ function akismet_admin_menu() { } } -function akismet_load_menu() { +function akismet_load_menu() { if ( class_exists( 'Jetpack' ) ) { - add_submenu_page( 'jetpack', __( 'Akismet Configuration' ), __( 'Akismet Configuration' ), 'manage_options', 'akismet-key-config', 'akismet_conf' ); + add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' ); add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' ); } else { - add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf'); + add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf'); add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display'); } } diff --git a/wp-content/plugins/akismet/akismet.css b/wp-content/plugins/akismet/akismet.css index dccc9c4..e96bc8a 100644 --- a/wp-content/plugins/akismet/akismet.css +++ b/wp-content/plugins/akismet/akismet.css @@ -1,12 +1 @@ -#submitted-on { position: relative; } -#the-comment-list .author .akismet-user-comment-count { display: inline; } -#the-comment-list .author a span { text-decoration: none; color: #999; } -#the-comment-list .remove_url { margin-left: 3px; color: #999; padding: 2px 3px 2px 0; } -#the-comment-list .remove_url:hover { color: #A7301F; font-weight: bold; padding: 2px 2px 2px 0; } -#dashboard_recent_comments .akismet-status { display: none; } /* never show the flagged by text on the dashboard */ -.akismet-status { float: right; } -.akismet-status a { color: #AAA; font-style: italic; } -span.comment-link a { text-decoration: underline; } -span.comment-link:after { content: " " attr(title) " "; color: #aaa; text-decoration: none; } -.mshot-arrow { width: 0; height: 0; border-top: 10px solid transparent; border-bottom: 10px solid transparent; border-right:10px solid #5C5C5C; position: absolute; left: -6px; top: 91px; } -.mshot-container { background: #5C5C5C; position: absolute; top: -94px; padding: 7px; width: 450px; height: 338px; z-index: 20000; -moz-border-radius:6px; border-radius:6px; -webkit-border-radius:6px; } \ No newline at end of file +#submitted-on{position:relative}#the-comment-list .author .akismet-user-comment-count{display:inline}#the-comment-list .author a span{text-decoration:none;color:#999}#the-comment-list .remove_url{margin-left:3px;color:#999;padding:2px 3px 2px 0}#the-comment-list .remove_url:hover{color:#A7301F;font-weight:bold;padding:2px 2px 2px 0}#dashboard_recent_comments .akismet-status{display:none}.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}span.comment-link a{text-decoration:underline}span.comment-link:after{content:" "attr(title) " ";color:#aaa;text-decoration:none}.mshot-arrow{width:0;height:0;border-top:10px solid transparent;border-bottom:10px solid transparent;border-right:10px solid #5C5C5C;position:absolute;left:-6px;top:91px}.mshot-container{background:#5C5C5C;position:absolute;top:-94px;padding:7px;width:450px;height:338px;z-index:20000;-moz-border-radius:6px;border-radius:6px;-webkit-border-radius:6px}h2.ak-header{padding-left:38px;background:url('img/logo.png') no-repeat 0 9px;margin-bottom:14px;line-height:32px}.key-status{padding:0.4em 1em;color:#fff;font-weight:bold;text-align:center;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;max-width:23.3em}input#key{width:25.3em !important}input#key.valid{border-color:#4F800D}input#key.invalid,input#key.failed{border-color:#888}.key-status.under-input{margin-top:-5px;padding-bottom:0px}.key-status.invalid,.key-status.failed{background-color:#888}.key-status.valid{background-color:#4F800D}.key-status.some{background-color:#993300}.key-status.empty{display:none}table.network-status th,table.network-status td{padding:0.4em;margin:0;text-align:center}table.network-status{border-color:#dfdfdf;border-width:0 0 1px 1px;border-style:solid;border-spacing:0;width:25.6em}table.network-status th,table.network-status td{border-color:#dfdfdf;border-width:1px 1px 0 0;border-style:solid;margin:0;border-spacing:0}table.network-status td.key-status{border-radius:0px;-webkit-border-radius:0px} \ No newline at end of file diff --git a/wp-content/plugins/akismet/akismet.js b/wp-content/plugins/akismet/akismet.js index 8925c51..f3da8fd 100644 --- a/wp-content/plugins/akismet/akismet.js +++ b/wp-content/plugins/akismet/akismet.js @@ -1,4 +1,16 @@ jQuery(document).ready(function () { + jQuery( '.switch-have-key' ).click( function() { + var no_key = jQuery( this ).parents().find('div.no-key'); + var have_key = jQuery( this ).parents().find('div.have-key'); + + no_key.addClass( 'hidden' ); + have_key.removeClass( 'hidden' ); + + return false; + }); + jQuery( 'p.need-key a' ).click( function(){ + document.akismet_activate.submit(); + }); jQuery('.akismet-status').each(function () { var thisId = jQuery(this).attr('commentid'); jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child'); diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php index 682b87f..15a1b2c 100644 --- a/wp-content/plugins/akismet/akismet.php +++ b/wp-content/plugins/akismet/akismet.php @@ -6,7 +6,7 @@ Plugin Name: Akismet Plugin URI: http://akismet.com/?return=true Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) Sign up for an Akismet API key, and 3) Go to your Akismet configuration page, and save your API key. -Version: 2.5.7 +Version: 2.5.8 Author: Automattic Author URI: http://automattic.com/wordpress-plugins/ License: GPLv2 or later @@ -34,7 +34,7 @@ if ( !function_exists( 'add_action' ) ) { exit; } -define('AKISMET_VERSION', '2.5.7'); +define('AKISMET_VERSION', '2.5.8'); define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ )); /** If you hardcode a WP.com API key here, all key config screens will be hidden */ diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt index 4d61fe9..597749e 100644 --- a/wp-content/plugins/akismet/readme.txt +++ b/wp-content/plugins/akismet/readme.txt @@ -1,9 +1,9 @@ === Akismet === -Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic +Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, automattic Tags: akismet, comments, spam Requires at least: 3.0 -Tested up to: 3.5 -Stable tag: 2.5.7 +Tested up to: 3.6 +Stable tag: 2.5.8 License: GPLv2 or later Akismet checks your comments against the Akismet web service to see if they look like spam or not. @@ -31,6 +31,11 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co == Changelog == += 2.5.8 = +* Simplify the activation process for new users +* Remove the reporter_ip parameter +* Minor preventative security improvements + = 2.5.7 = * FireFox Stats iframe preview bug * Fix mshots preview when using https diff --git a/wp-content/plugins/wordpress-seo/CONTRIBUTING.md b/wp-content/plugins/wordpress-seo/CONTRIBUTING.md new file mode 100644 index 0000000..0d241f9 --- /dev/null +++ b/wp-content/plugins/wordpress-seo/CONTRIBUTING.md @@ -0,0 +1,38 @@ +#Contribute To WordPress SEO + +Community made patches, localisations, bug reports and contributions are very welcome and help make WordPress SEO the #1 SEO plugin for WordPress. + +When contributing please ensure you follow the guidelines below so that we can keep on top of things. + +__Please Note:__ GitHub is for bug reports and contributions only - if you have a support question or a request for a customisation don't post here, go to our [Support Forum](http://wordpress.org/support/plugin/wordpress-seo) instead. + +For localization, please refer to [translate.yoast.com](http://translate.yoast.com/projects/wordpress-seo), though bugs with strings that can't be translated are welcome here. + +## Getting Started + +* Submit a ticket for your issue, assuming one does not already exist. + * Raise it on our [Issue Tracker](https://github.com/jdevalk/wordpress-seo/issues) + * Clearly describe the issue including steps to reproduce the bug. + * Make sure you fill in the earliest version that you know has the issue as well as the version of WordPress you're using. + +## Making Changes + +* Fork the repository on GitHub +* Make the changes to your forked repository + * Ensure you stick to the [WordPress Coding Standards](http://codex.wordpress.org/WordPress_Coding_Standards) and have properly documented any new functions. +* When committing, reference your issue (if present) and include a note about the fix. +* Push the changes to your fork and submit a pull request to the 'master' branch of the WordPress SEO repository. + +## Code Documentation + +* We ensure that every WordPress SEO function is documented well and follows the standards set by phpDoc. +* An example function can be found [here](https://gist.github.com/jdevalk/5574677) +* Please make sure that every function is documented so that when we update our API Documentation things don't go awry! +* Finally, please use tabs and not spaces. The tab indent size should be 8 for all WordPress SEO code. + +At this point you're waiting on us to merge your pull request. We'll review all pull requests, and make suggestions and changes if necessary. + +# Additional Resources +* [WordPress SEO API](http://yoast.com/wordpress/seo/api/) +* [General GitHub Documentation](http://help.github.com/) +* [GitHub Pull Request documentation](http://help.github.com/send-pull-requests/) diff --git a/wp-content/plugins/wordpress-seo/README.md b/wp-content/plugins/wordpress-seo/README.md new file mode 100644 index 0000000..83c1e13 --- /dev/null +++ b/wp-content/plugins/wordpress-seo/README.md @@ -0,0 +1,45 @@ +WordPress SEO by Yoast +====================== + +[![Build Status](https://travis-ci.org/jdevalk/wordpress-seo.png?branch=master)](https://travis-ci.org/jdevalk/wordpress-seo) + +Welcome to the WordPress SEO Github repository +---------------------------------------------- + +While the documenation for the [WordPress SEO plugin](http://yoast.com/wordpress/seo/) can be found on yoast.com, here +you can browse the source of the project, find and discuss open issues and even +[contribute yourself](https://github.com/jdevalk/wordpress-seo/blob/master/CONTRIBUTING.md). + +Installation +------------ + +Here's a [guide on how to install WordPress SEO in your WordPress site](http://yoast.com/wordpress/seo/installation/). +If you want to run the Git version though, you have two options: + +* You can clone the GitHub repository: https://github.com/jdevalk/wordpress-seo.git +* Download it directly as a ZIP file: https://github.com/jdevalk/wordpress-seo/archive/master.zip + +This will download the latest development version of WordPress SEO by Yoast. While this version is usually stable, +it is not recommended for use in a production environment. + +Bugs +---- +If you find an issue, [let us know here](https://github.com/jdevalk/wordpress-seo/issues/new)! + +Support +------- +This is a developer's portal for WordPress SEO by Yoast and should not be used for support. Please visit the +[support forums](http://wordpress.org/support/plugin/wordpress-seo). + +Contributions +------------- +Anyone is welcome to contribute to WordPress SEO. Please +[read the guidelines](https://github.com/jdevalk/wordpress-seo/blob/master/CONTRIBUTING.md) for contributing to this +repository. + +There are various ways you can contribute: + +* [Raise an issue](https://github.com/jdevalk/wordpress-seo/issues) on GitHub. +* Send us a Pull Request with your bug fixes and/or new features. +* [Translate WordPress SEO by Yoast into different languages](http://translate.yoast.com/projects/wordpress-seo/). +* Provide feedback and [suggestions on enhancements](https://github.com/jdevalk/wordpress-seo/issues?direction=desc&labels=Enhancement&page=1&sort=created&state=open). diff --git a/wp-content/plugins/wordpress-seo/admin/class-admin.php b/wp-content/plugins/wordpress-seo/admin/class-admin.php index 8dae60c..8fd0286 100644 --- a/wp-content/plugins/wordpress-seo/admin/class-admin.php +++ b/wp-content/plugins/wordpress-seo/admin/class-admin.php @@ -48,6 +48,9 @@ class WPSEO_Admin { add_action( 'edit_user_profile', array( $this, 'user_profile' ) ); add_action( 'personal_options_update', array( $this, 'process_user_option_update' ) ); add_action( 'edit_user_profile_update', array( $this, 'process_user_option_update' ) ); + add_action( 'personal_options_update', array( $this, 'update_user_profile' ) ); + add_action( 'edit_user_profile_update', array( $this, 'update_user_profile' ) ); + add_filter( 'user_contactmethods', array( $this, 'update_contactmethods' ), 10, 1 ); add_action( 'update_option_wpseo_titles', array( $this, 'clear_cache' ) ); @@ -55,6 +58,9 @@ class WPSEO_Admin { add_action( 'update_option_wpseo_permalinks', array( $this, 'clear_rewrites' ) ); add_action( 'update_option_wpseo_xml', array( $this, 'clear_rewrites' ) ); + + add_action( 'after_switch_theme', array( $this, 'switch_theme' ) ); + add_action( 'switch_theme', array( $this, 'switch_theme' ) ); } /** @@ -133,7 +139,7 @@ class WPSEO_Admin { * @global array $submenu used to change the label on the first item. */ function register_settings_page() { - add_menu_page( __( 'WordPress SEO Configuration', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( $this, 'config_page' ), WPSEO_URL . 'images/yoast-icon.png' ); + add_menu_page( __( 'WordPress SEO Configuration', 'wordpress-seo' ), __( 'SEO', 'wordpress-seo' ), 'manage_options', 'wpseo_dashboard', array( $this, 'config_page' ), WPSEO_URL . 'images/yoast-icon.png', '99.31337' ); add_submenu_page( 'wpseo_dashboard', __( 'Titles & Metas', 'wordpress-seo' ), __( 'Titles & Metas', 'wordpress-seo' ), 'manage_options', 'wpseo_titles', array( $this, 'titles_page' ) ); add_submenu_page( 'wpseo_dashboard', __( 'Social', 'wordpress-seo' ), __( 'Social', 'wordpress-seo' ), 'manage_options', 'wpseo_social', array( $this, 'social_page' ) ); add_submenu_page( 'wpseo_dashboard', __( 'XML Sitemaps', 'wordpress-seo' ), __( 'XML Sitemaps', 'wordpress-seo' ), 'manage_options', 'wpseo_xml', array( $this, 'xml_sitemaps_page' ) ); @@ -295,18 +301,20 @@ class WPSEO_Admin { } /** - * Filter the $contactmethods array and add Google+ and Twitter. + * Filter the $contactmethods array and add Facebook, Google+ and Twitter. * - * These are used with the rel="author" and Twitter cards implementation. + * These are used with the Facebook author, rel="author" and Twitter cards implementation. * * @param array $contactmethods currently set contactmethods. * @return array $contactmethods with added contactmethods. */ function update_contactmethods( $contactmethods ) { // Add Google+ - $contactmethods['googleplus'] = 'Google+'; + $contactmethods['googleplus'] = __( "Google+", 'wordpress-seo' ); // Add Twitter $contactmethods['twitter'] = __( 'Twitter username (without @)', 'wordpress-seo' ); + // Add Facebook + $contactmethods['facebook'] = __( 'Facebook profile URL', 'wordpress-seo' ); return $contactmethods; } @@ -561,6 +569,25 @@ class WPSEO_Admin { return false; } + + /** + * Log the timestamp when a user profile has been updated + */ + function update_user_profile($user_id) { + if ( current_user_can( 'edit_user', $user_id ) ) { + update_user_meta( $user_id, '_yoast_wpseo_profile_updated', time() ); + } + } + + /** + * Log the updated timestamp for user profiles when theme is changed + */ + function switch_theme() { + foreach ( get_users( array( 'who' => 'authors' ) ) as $user ) { + update_user_meta( $user->ID, '_yoast_wpseo_profile_updated', time() ); + } + } + } // Globalize the var first as it's needed globally. diff --git a/wp-content/plugins/wordpress-seo/admin/class-config.php b/wp-content/plugins/wordpress-seo/admin/class-config.php index e811061..8537528 100644 --- a/wp-content/plugins/wordpress-seo/admin/class-config.php +++ b/wp-content/plugins/wordpress-seo/admin/class-config.php @@ -107,6 +107,13 @@ class WPSEO_Admin_Pages { 'alt' => 'Banner WordPress SEO Video manual', ); } + if ( !defined( 'WPSEO_LOCAL_VERSION' ) ) { + $banners[] = array( + 'url' => 'http://yoast.com/wordpress/local-seo/#utm_source=wordpress-seo-config&utm_medium=banner&utm_campaign=local-seo-banner', + 'img' => 'banner-local-seo.png', + 'alt' => 'Banner Local SEO plugin', + ); + } shuffle( $banners ); ?>
@@ -261,6 +268,9 @@ class WPSEO_Admin_Pages { wp_enqueue_style( 'global' ); wp_enqueue_style( 'wp-admin' ); wp_enqueue_style( 'yoast-admin-css', WPSEO_URL . 'css/yst_plugin_tools.css', WPSEO_VERSION ); + + if ( is_rtl() ) + wp_enqueue_style( 'wpseo-rtl', WPSEO_URL . 'css/wpseo-rtl.css', WPSEO_VERSION ); } } @@ -269,6 +279,7 @@ class WPSEO_Admin_Pages { */ function config_page_scripts() { global $pagenow; + if ( $pagenow == 'admin.php' && isset( $_GET['page'] ) && in_array( $_GET['page'], $this->adminpages ) ) { wp_enqueue_script( 'wpseo-admin-script', WPSEO_URL . 'js/wp-seo-admin.js', array( 'jquery' ), WPSEO_VERSION, true ); wp_enqueue_script( 'postbox' ); diff --git a/wp-content/plugins/wordpress-seo/admin/class-metabox.php b/wp-content/plugins/wordpress-seo/admin/class-metabox.php index 9cdf634..7dc62aa 100644 --- a/wp-content/plugins/wordpress-seo/admin/class-metabox.php +++ b/wp-content/plugins/wordpress-seo/admin/class-metabox.php @@ -101,7 +101,6 @@ class WPSEO_Metabox { * Outputs the page analysis score in the Publish Box. */ public function publish_box() { - echo '
'; echo '
'; if ( wpseo_get_value( 'meta-robots-noindex' ) == 1 ) { @@ -131,10 +130,11 @@ class WPSEO_Metabox { } } if ( !isset( $title ) ) - $title = ucfirst( $score ); + $title = wpseo_translate_score( $score, $css = false ); + $result = '
'; - echo 'SEO: ' . $result . ' Check'; + echo __( 'SEO: ', 'wordpress-seo' ) . $result . ' ' . __( 'Check', 'wordpress-seo' ) . ''; echo '
'; } @@ -262,7 +262,7 @@ class WPSEO_Metabox { "type" => "text", "title" => __( 'Focus Keyword', 'wordpress-seo' ), "autocomplete" => "off", - "help" => sprintf( "Pick the main keyword or keyphrase that this post/page is about.

Read %sthis post%s for more info.", "", '' ), + "help" => sprintf( __( "Pick the main keyword or keyphrase that this post/page is about.

Read %sthis post%s for more info.", 'wordpress-seo' ), "", '' ), "description" => "
", ); $mbs['title'] = array( @@ -326,8 +326,8 @@ class WPSEO_Metabox { "type" => "select", "options" => array( "0" => sprintf( __( "Default for post type, currently: %s", 'wordpress-seo' ), ( isset( $options['noindex-' . $post_type] ) && $options['noindex-' . $post_type] ) ? 'noindex' : 'index' ), - "2" => "index", - "1" => "noindex", + "2" => __( "index", 'wordpress-seo' ), + "1" => __( "noindex", 'wordpress-seo' ), ), ); $mbs['meta-robots-nofollow'] = array( @@ -396,14 +396,26 @@ class WPSEO_Metabox { ), ); } - $mbs['canonical'] = array( + $mbs['sitemap-html-include'] = array( + "name" => "sitemap-html-include", + "std" => "-", + "type" => "select", + "title" => __( "Include in HTML Sitemap", 'wordpress-seo' ), + "description" => __( "Should this page be in the HTML Sitemap at all times, regardless of Robots Meta settings?", 'wordpress-seo' ), + "options" => array( + "-" => __( "Auto detect", 'wordpress-seo' ), + "always" => __( "Always include", 'wordpress-seo' ), + "never" => __( "Never include", 'wordpress-seo' ), + ), + ); + $mbs['canonical'] = array( "name" => "canonical", "std" => "", "type" => "text", "title" => __( "Canonical URL", 'wordpress-seo' ), "description" => sprintf( __( "The canonical URL that this page should point to, leave empty to default to permalink. %sCross domain canonical%s supported too.", 'wordpress-seo' ), "", "" ) ); - $mbs['redirect'] = array( + $mbs['redirect'] = array( "name" => "redirect", "std" => "", "type" => "text", @@ -451,7 +463,7 @@ class WPSEO_Metabox { $this->do_tab( 'linkdex', __( 'Page Analysis', 'wordpress-seo' ), $this->linkdex_output( $post ) ); - if ( current_user_can( 'edit_users' ) || !isset( $options['disableadvanced_meta'] ) || !$options['disableadvanced_meta'] ) { + if ( current_user_can( 'manage_options' ) || !isset( $options['disableadvanced_meta'] ) || !$options['disableadvanced_meta'] ) { $content = ''; foreach ( $this->get_advanced_meta_boxes() as $meta_box ) { $content .= $this->do_meta_box( $meta_box ); @@ -758,6 +770,16 @@ class WPSEO_Metabox { wp_enqueue_script( 'jquery-ui-autocomplete', WPSEO_URL . 'js/jquery-ui-autocomplete.min.js', array( 'jquery', 'jquery-ui-core' ), WPSEO_VERSION, true ); wp_enqueue_script( 'jquery-qtip', WPSEO_URL . 'js/jquery.qtip.min.js', array( 'jquery' ), '1.0.0-RC3', true ); wp_enqueue_script( 'wp-seo-metabox', WPSEO_URL . 'js/wp-seo-metabox.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-autocomplete' ), WPSEO_VERSION, true ); + + // Text strings to pass to metabox for keyword analysis + wp_localize_script( 'wp-seo-metabox', 'objectL10n', array( + 'keyword_header' => __( 'Your focus keyword was found in:', 'wordpress-seo' ), + 'article_header_text' => __( 'Article Heading: ', 'wordpress-seo' ), + 'page_title_text' => __( 'Page title: ', 'wordpress-seo' ), + 'page_url_text' => __( 'Page URL: ', 'wordpress-seo' ), + 'content_text' => __( 'Content: ', 'wordpress-seo' ), + 'meta_description_text' => __( 'Meta description: ', 'wordpress-seo' ), + ) ); } } @@ -772,7 +794,7 @@ class WPSEO_Metabox { return false; echo ''; $content .= '

'; $content .= '

' . __( 'Import settings from other plugins', 'wordpress-seo' ) . '

'; $content .= $wpseo_admin_pages->checkbox( 'importrobotsmeta', __( 'Import from Robots Meta (by Yoast)?', 'wordpress-seo' ) ); $content .= $wpseo_admin_pages->checkbox( 'importrssfooter', __( 'Import from RSS Footer (by Yoast)?', 'wordpress-seo' ) ); $content .= $wpseo_admin_pages->checkbox( 'importbreadcrumbs', __( 'Import from Yoast Breadcrumbs?', 'wordpress-seo' ) ); +$content .= '
'; $content .= ''; $content .= '
'; diff --git a/wp-content/plugins/wordpress-seo/admin/pages/metas.php b/wp-content/plugins/wordpress-seo/admin/pages/metas.php index 80228b5..9a7fb03 100644 --- a/wp-content/plugins/wordpress-seo/admin/pages/metas.php +++ b/wp-content/plugins/wordpress-seo/admin/pages/metas.php @@ -31,7 +31,7 @@ if ( ( isset( $_GET[ 'updated' ] ) && $_GET[ 'updated' ] == 'true' ) || ( isset(

-
+

' . __( 'Author metadata', 'wordpress-seo' ) . '

'; - echo ''; - wp_dropdown_users( array( 'show_option_none' => "Don't show", 'name' => 'wpseo_titles[plus-author]', 'class' => 'select', 'selected' => isset( $options[ 'plus-author' ] ) ? $options[ 'plus-author' ] : '' ) ); - echo '

' . __( 'Choose the user that should be used for the rel="author" on the blog homepage. Make sure the user has filled out his/her Google+ profile link on their profile page.', 'wordpress-seo' ) . '

'; - echo $wpseo_admin_pages->textinput( 'plus-publisher', __( 'Google Publisher Page', 'wordpress-seo' ) ); - echo '

' . __( 'If you have a Google+ page for your business, add that URL here and link it on your Google+ page\'s about page.', 'wordpress-seo' ) . '

'; + // TODO: Please remove...Depreciated: moved over to the social tab + // echo '

' . __( 'Author metadata', 'wordpress-seo' ) . '

'; + // echo ''; + // wp_dropdown_users( array( 'show_option_none' => __( "Don't show", 'wordpress-seo' ), 'name' => 'wpseo_titles[plus-author]', 'class' => 'select', 'selected' => isset( $options[ 'plus-author' ] ) ? $options[ 'plus-author' ] : '' ) ); + // echo '

' . __( 'Choose the user that should be used for the rel="author" on the blog homepage. Make sure the user has filled out his/her Google+ profile link on their profile page.', 'wordpress-seo' ) . '

'; + // echo $wpseo_admin_pages->textinput( 'plus-publisher-old', __( 'Google Publisher Page', 'wordpress-seo' ) ); + // echo '

' . __( 'If you have a Google+ page for your business, add that URL here and link it on your Google+ page\'s about page.', 'wordpress-seo' ) . '

'; ?>
@@ -108,6 +109,7 @@ if ( ( isset( $_GET[ 'updated' ] ) && $_GET[ 'updated' ] == 'true' ) || ( isset( if ( isset( $options[ 'usemetakeywords' ] ) && $options[ 'usemetakeywords' ] ) echo $wpseo_admin_pages->textinput( 'metakey-' . $name, __( 'Meta keywords template', 'wordpress-seo' ) ); echo $wpseo_admin_pages->checkbox( 'noindex-' . $name, 'noindex, follow', __( 'Meta Robots', 'wordpress-seo' ) ); + echo $wpseo_admin_pages->checkbox( 'noauthorship-' . $name, __( 'Don\'t show rel="author"', 'wordpress-seo' ), __( 'Authorship', 'wordpress-seo' ) ); echo $wpseo_admin_pages->checkbox( 'showdate-' . $name, __( 'Show date in snippet preview?', 'wordpress-seo' ), __( 'Date in Snippet Preview', 'wordpress-seo' ) ); echo $wpseo_admin_pages->checkbox( 'hideeditbox-' . $name, __( 'Hide', 'wordpress-seo' ), __( 'WordPress SEO Meta Box', 'wordpress-seo' ) ); echo '
'; @@ -322,6 +324,7 @@ if ( ( isset( $_GET[ 'updated' ] ) && $_GET[ 'updated' ] == 'true' ) || ( isset( echo '

' . __( 'Variables', 'wordpress-seo' ) . '

'; echo $content; ?> -
admin_footer(); \ No newline at end of file +$wpseo_admin_pages->admin_footer(); +?> +
diff --git a/wp-content/plugins/wordpress-seo/admin/pages/rss.php b/wp-content/plugins/wordpress-seo/admin/pages/rss.php index 54c24b7..f0728b5 100644 --- a/wp-content/plugins/wordpress-seo/admin/pages/rss.php +++ b/wp-content/plugins/wordpress-seo/admin/pages/rss.php @@ -11,7 +11,7 @@ if ( !defined('WPSEO_VERSION') ) { global $wpseo_admin_pages; $options = get_wpseo_options(); -$wpseo_admin_pages->admin_header( 'RSS', true, 'yoast_wpseo_rss_options', 'wpseo_rss' ); +$wpseo_admin_pages->admin_header( __( 'RSS', 'wordpress-seo' ), true, 'yoast_wpseo_rss_options', 'wpseo_rss' ); $content = '

' . __( "This feature is used to automatically add content to your RSS, more specifically, it's meant to add links back to your blog and your blog posts, so dumb scrapers will automatically add these links too, helping search engines identify you as the original source of the content.", 'wordpress-seo' ) . '

'; $rows = array(); diff --git a/wp-content/plugins/wordpress-seo/admin/pages/social.php b/wp-content/plugins/wordpress-seo/admin/pages/social.php index f2b819d..67f37e7 100644 --- a/wp-content/plugins/wordpress-seo/admin/pages/social.php +++ b/wp-content/plugins/wordpress-seo/admin/pages/social.php @@ -135,25 +135,55 @@ $wpseo_admin_pages->admin_header( __( 'Social', 'wordpress-seo' ), true, 'yoast_ if ( $error ) settings_errors(); -echo '

' . __( 'Facebook OpenGraph', 'wordpress-seo' ) . '

'; -echo $wpseo_admin_pages->checkbox( 'opengraph', '' ); -echo'

' . __( 'Add OpenGraph meta data to your site\'s <head> section. You can specify some of the ID\'s that are sometimes needed below:', 'wordpress-seo' ) . '

'; -echo $fbconnect; -echo '

' . __( 'Frontpage settings', 'wordpress-seo' ) . '

'; -echo $wpseo_admin_pages->textinput( 'og_frontpage_image', __( 'Image URL', 'wordpress-seo' ) ); -echo $wpseo_admin_pages->textinput( 'og_frontpage_desc', __( 'Description', 'wordpress-seo' ) ); -echo '

' . __( 'These are the image and description used in the OpenGraph meta tags on the frontpage of your site.', 'wordpress-seo' ) . '

'; -echo '

' . __( 'Default settings', 'wordpress-seo' ) . '

'; -echo $wpseo_admin_pages->textinput( 'og_default_image', __( 'Image URL', 'wordpress-seo' ) ); -echo '

' . __( 'This image is used if the post/page being shared does not contain any images.', 'wordpress-seo' ) . '

'; +?> -do_action('wpseo_admin_opengraph_section'); + -echo '

' . __( 'Twitter', 'wordpress-seo' ) . '

'; -echo $wpseo_admin_pages->checkbox( 'twitter', '' ); -echo'

' . __( 'Add Twitter card meta data to your site\'s <head> section.', 'wordpress-seo' ) . '

'; -echo $wpseo_admin_pages->textinput( 'twitter_site', __( 'Site Twitter Username', 'wordpress-seo' ) ); +
+ '; + echo $wpseo_admin_pages->checkbox( 'opengraph', '' ); + echo '

'; + echo'

' . __( 'Add Open Graph meta data to your site\'s <head> section. You can specify some of the ID\'s that are sometimes needed below:', 'wordpress-seo' ) . '

'; + echo $fbconnect; + echo $wpseo_admin_pages->textinput( 'facebook_site', __( 'Facebook Page URL', 'wordpress-seo' ) ); + echo '

' . __( 'Frontpage settings', 'wordpress-seo' ) . '

'; + echo $wpseo_admin_pages->textinput( 'og_frontpage_image', __( 'Image URL', 'wordpress-seo' ) ); + echo $wpseo_admin_pages->textinput( 'og_frontpage_desc', __( 'Description', 'wordpress-seo' ) ); + echo '

' . __( 'These are the image and description used in the Open Graph meta tags on the frontpage of your site.', 'wordpress-seo' ) . '

'; + echo '

' . __( 'Default settings', 'wordpress-seo' ) . '

'; + echo $wpseo_admin_pages->textinput( 'og_default_image', __( 'Image URL', 'wordpress-seo' ) ); + echo '

' . __( 'This image is used if the post/page being shared does not contain any images.', 'wordpress-seo' ) . '

'; + do_action('wpseo_admin_opengraph_section'); + ?> +
-do_action('wpseo_admin_twitter_section'); +
+ '; + echo $wpseo_admin_pages->checkbox( 'twitter', '' ); + echo '

'; + echo'

' . __( 'Add Twitter card meta data to your site\'s <head> section.', 'wordpress-seo' ) . '

'; + echo $wpseo_admin_pages->textinput( 'twitter_site', __( 'Site Twitter Username', 'wordpress-seo' ) ); + do_action('wpseo_admin_twitter_section'); + ?> +
+
+ ' . __( 'Author metadata', 'wordpress-seo' ) . ''; + echo ''; + wp_dropdown_users( array( 'show_option_none' => __( "Don't show", 'wordpress-seo' ), 'name' => 'wpseo_social[plus-author]', 'class' => 'select', 'selected' => isset( $options[ 'plus-author' ] ) ? $options[ 'plus-author' ] : '' ) ); + echo '

' . __( 'Choose the user that should be used for the rel="author" on the blog homepage. Make sure the user has filled out his/her Google+ profile link on their profile page.', 'wordpress-seo' ) . '

'; + echo $wpseo_admin_pages->textinput( 'plus-publisher', __( 'Google Publisher Page', 'wordpress-seo' ) ); + echo '

' . __( 'If you have a Google+ page for your business, add that URL here and link it on your Google+ page\'s about page.', 'wordpress-seo' ) . '

'; + do_action('wpseo_admin_googleplus_section'); + ?> +
+ +admin_footer(); \ No newline at end of file diff --git a/wp-content/plugins/wordpress-seo/admin/pages/xml-sitemaps.php b/wp-content/plugins/wordpress-seo/admin/pages/xml-sitemaps.php index 284735e..89e2568 100644 --- a/wp-content/plugins/wordpress-seo/admin/pages/xml-sitemaps.php +++ b/wp-content/plugins/wordpress-seo/admin/pages/xml-sitemaps.php @@ -3,53 +3,60 @@ * @package Admin */ -if ( !defined('WPSEO_VERSION') ) { - header('HTTP/1.0 403 Forbidden'); +if ( !defined( 'WPSEO_VERSION' ) ) { + header( 'HTTP/1.0 403 Forbidden' ); die; } global $wpseo_admin_pages; -$wpseo_admin_pages->admin_header( 'XML Sitemaps', true, 'yoast_wpseo_xml_sitemap_options', 'wpseo_xml' ); +$wpseo_admin_pages->admin_header( __( 'XML Sitemaps', 'wordpress-seo' ), true, 'yoast_wpseo_xml_sitemap_options', 'wpseo_xml' ); $options = get_option( 'wpseo_xml' ); -$base = $GLOBALS[ 'wp_rewrite' ]->using_index_permalinks() ? 'index.php/' : ''; +$base = $GLOBALS['wp_rewrite']->using_index_permalinks() ? 'index.php/' : ''; $content = $wpseo_admin_pages->checkbox( 'enablexmlsitemap', __( 'Check this box to enable XML sitemap functionality.', 'wordpress-seo' ), false ); $content .= '
'; -if ( isset($_SERVER['SERVER_SOFTWARE']) && stristr($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false ) { +if ( isset( $_SERVER['SERVER_SOFTWARE'] ) && stristr( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false ) { $content .= '
'; - $content .= '

'.__('As you\'re on NGINX, you\'ll need the following rewrites:','wordpress-seo').'

'; + $content .= '

' . __( 'As you\'re on NGINX, you\'ll need the following rewrites:', 'wordpress-seo' ) . '

'; $content .= '
rewrite ^/sitemap_index\.xml$ /index.php?sitemap=1 last;
 rewrite ^/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;
'; $content .= '
'; } -if ( isset( $options[ 'enablexmlsitemap' ] ) && $options[ 'enablexmlsitemap' ] ) +if ( isset( $options['enablexmlsitemap'] ) && $options['enablexmlsitemap'] ) $content .= '

' . sprintf( __( 'You can find your XML Sitemap here: %sXML Sitemap%s', 'wordpress-seo' ), '', '' ) . '

' . __( 'You do not need to generate the XML sitemap, nor will it take up time to generate after publishing a post.', 'wordpress-seo' ) . '

'; else $content .= '

' . __( 'Save your settings to activate XML Sitemaps.', 'wordpress-seo' ) . '

'; -$content .= '' . __( 'General settings', 'wordpress-seo' ) . '
'; + +$content .= '

' . __( 'User sitemap', 'wordpress-seo' ) . '

'; +$content .= $wpseo_admin_pages->checkbox( 'disable_author_sitemap', __( "Disable author/user sitemap", 'wordpress-seo' ), false ); +$content .= '
'; +$content .= '

' . __( 'General settings', 'wordpress-seo' ) . '

'; $content .= '

' . __( 'After content publication, the plugin automatically pings Google and Bing, do you need it to ping other search engines too? If so, check the box:', 'wordpress-seo' ) . '

'; $content .= $wpseo_admin_pages->checkbox( 'xml_ping_yahoo', __( "Ping Yahoo!", 'wordpress-seo' ), false ); $content .= $wpseo_admin_pages->checkbox( 'xml_ping_ask', __( "Ping Ask.com", 'wordpress-seo' ), false ); -$content .= '
' . __( 'Exclude post types', 'wordpress-seo' ) . '
'; +$content .= '

' . __( 'Exclude post types', 'wordpress-seo' ) . '

'; $content .= '

' . __( 'Please check the appropriate box below if there\'s a post type that you do NOT want to include in your sitemap:', 'wordpress-seo' ) . '

'; -foreach ( get_post_types( array( 'public' => true ), 'objects' ) as $pt ) { + +$post_types = apply_filters( 'wpseo_sitemaps_supported_post_types', get_post_types( array( 'public' => true ), 'objects' ) ); +foreach ( $post_types as $pt ) { $content .= $wpseo_admin_pages->checkbox( 'post_types-' . $pt->name . '-not_in_sitemap', $pt->labels->name . ' (' . $pt->name . ')' ); } -$content .= '
'; -$content .= '' . __( 'Exclude taxonomies', 'wordpress-seo' ) . '
'; +$content .= '

' . __( 'Exclude taxonomies', 'wordpress-seo' ) . '

'; $content .= '

' . __( 'Please check the appropriate box below if there\'s a taxonomy that you do NOT want to include in your sitemap:', 'wordpress-seo' ) . '

'; -foreach ( get_taxonomies( array( 'public' => true ), 'objects' ) as $tax ) { + +$taxonomies = apply_filters( 'wpseo_sitemaps_supported_taxonomies', get_taxonomies( array( 'public' => true ), 'objects' ) ); +foreach ( $taxonomies as $tax ) { if ( isset( $tax->labels->name ) && trim( $tax->labels->name ) != '' ) $content .= $wpseo_admin_pages->checkbox( 'taxonomies-' . $tax->name . '-not_in_sitemap', $tax->labels->name . ' (' . $tax->name . ')' ); } $content .= '
'; -$content .= '' . __( 'Entries per page', 'wordpress-seo' ) . '
'; +$content .= '

' . __( 'Entries per page', 'wordpress-seo' ) . '

'; $content .= '

' . __( 'Please enter the maximum number of entries per sitemap page (defaults to 1000, you might want to lower this to prevent memory issues on some installs):', 'wordpress-seo' ) . '

'; $content .= $wpseo_admin_pages->textinput( 'entries-per-page', __( 'Max entries per sitemap page', 'wordpress-seo' ) ); diff --git a/wp-content/plugins/wordpress-seo/css/metabox-tabs.css b/wp-content/plugins/wordpress-seo/css/metabox-tabs.css index 0a10c56..076acef 100644 --- a/wp-content/plugins/wordpress-seo/css/metabox-tabs.css +++ b/wp-content/plugins/wordpress-seo/css/metabox-tabs.css @@ -283,6 +283,7 @@ table.wpseoanalysis td.score { background-image: url(../images/score_buttons.png); background-repeat: no-repeat; padding: 0 0 0 0; + vertical-align: bottom; } .wpseo_score_img.good { background-position: -2px -2px; diff --git a/wp-content/plugins/wordpress-seo/css/wpseo-rtl.css b/wp-content/plugins/wordpress-seo/css/wpseo-rtl.css new file mode 100644 index 0000000..2f76e1d --- /dev/null +++ b/wp-content/plugins/wordpress-seo/css/wpseo-rtl.css @@ -0,0 +1,70 @@ +/** + * RTL support + */ + +p.desc { + padding: 0 22px 8px 0; +} + +p.desc.label { + padding: 2px 180px 10px 0; +} + +div.yoastbox ul { + margin-right: 20px; + margin-left: auto; +} + +.postbox { + margin: 10px 0 0 10px; +} + +label { + float: right; + margin-right: 6px; + margin-left: auto; +} + +input.textinput, textarea.textinput, select.select, input.checkbox { + float: right; + margin: 12px 0 0 3px; +} + +label.radio { + margin-left: 20px; + margin-left: auto; +} + +table.yoast_help th, table.yoast_help td { + text-align: right; +} + +.button.fixit { + float: left; +} + +pre { + direction: ltr; +} + +#pointer-primary { + margin: 0 0 0 5px; +} + +.wpseo-heading { + padding-left: 0; + padding-right: 10px; +} + +.wpseo_yahoo_kw { + margin: 3px 0 3px 8px; +} + +table.wpseoanalysis th { + text-align: right; +} + +table.wpseoanalysis td.score { + padding-left: 0; + padding-right: 10px; +} diff --git a/wp-content/plugins/wordpress-seo/css/yst_plugin_tools.css b/wp-content/plugins/wordpress-seo/css/yst_plugin_tools.css index d7360d5..a78a00a 100644 --- a/wp-content/plugins/wordpress-seo/css/yst_plugin_tools.css +++ b/wp-content/plugins/wordpress-seo/css/yst_plugin_tools.css @@ -201,4 +201,8 @@ h2 code { #wpseo-conf { max-width: 600px; +} + +#pointer-primary { + margin: 0 5px 0 0; } \ No newline at end of file diff --git a/wp-content/plugins/wordpress-seo/frontend/class-frontend.php b/wp-content/plugins/wordpress-seo/frontend/class-frontend.php index d8b067a..78c86cb 100644 --- a/wp-content/plugins/wordpress-seo/frontend/class-frontend.php +++ b/wp-content/plugins/wordpress-seo/frontend/class-frontend.php @@ -739,13 +739,11 @@ class WPSEO_Frontend { } /** - * Output the rel=publisher code on the frontpage of the site. + * Output the rel=publisher code on every page of the site. */ public function publisher() { - if ( is_front_page() ) { - if ( isset( $this->options['plus-publisher'] ) && !empty( $this->options['plus-publisher'] ) ) - echo '' . "\n"; - } + if ( isset( $this->options['plus-publisher'] ) && !empty( $this->options['plus-publisher'] ) ) + echo '' . "\n"; } /** @@ -757,6 +755,12 @@ class WPSEO_Frontend { if ( is_singular() ) { global $post; $gplus = get_the_author_meta( 'googleplus', $post->post_author ); + + // unset gplus when authorship is disabled for this post type + if ( isset( $this->options['noauthorship-' . $post->post_type] ) && $this->options['noauthorship-' . $post->post_type] ) { + $gplus = false; + } + } else if ( is_home() ) { if ( isset( $this->options['plus-author'] ) ) $gplus = get_the_author_meta( 'googleplus', $this->options['plus-author'] ); diff --git a/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php b/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php index 09f5783..85b4d4c 100644 --- a/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php +++ b/wp-content/plugins/wordpress-seo/frontend/class-opengraph.php @@ -43,6 +43,9 @@ class WPSEO_OpenGraph extends WPSEO_Frontend { add_action( 'wpseo_opengraph', array( $this, 'description'), 11 ); add_action( 'wpseo_opengraph', array( $this, 'url'), 12 ); add_action( 'wpseo_opengraph', array( $this, 'site_name'), 13 ); + add_action( 'wpseo_opengraph', array( $this, 'article_author_facebook'), 14 ); + add_action( 'wpseo_opengraph', array( $this, 'website_facebook'), 15 ); + add_action( 'wpseo_opengraph', array( $this, 'type'), 5 ); add_action( 'wpseo_opengraph', array( $this, 'image'), 30 ); } @@ -54,6 +57,7 @@ class WPSEO_OpenGraph extends WPSEO_Frontend { * Main OpenGraph output. */ public function opengraph() { + wp_reset_query(); do_action( 'wpseo_opengraph' ); } @@ -88,6 +92,32 @@ class WPSEO_OpenGraph extends WPSEO_Frontend { return $input . ' prefix="og: http://ogp.me/ns#' . ( ( isset( $this->options['fbadminapp'] ) || isset( $this->options['fb_admins'] ) ) ? ' fb: http://ogp.me/ns/fb#' : '' ) . '"'; } + /** + * Outputs the authors FB page. + * + * @link https://developers.facebook.com/blog/post/2013/06/19/platform-updates--new-open-graph-tags-for-media-publishers-and-more/ + */ + public function article_author_facebook() { + if ( !is_singular() ) + return; + + global $post; + $facebook = get_the_author_meta( 'facebook', $post->post_author ); + + if ( $facebook && !empty( $facebook ) ) + echo "\n"; + } + + /** + * Outputs the websites FB page. + * + * @link https://developers.facebook.com/blog/post/2013/06/19/platform-updates--new-open-graph-tags-for-media-publishers-and-more/ + */ + public function website_facebook() { + if ( isset( $this->options['facebook_site'] ) && $this->options['facebook_site'] ) + echo "\n"; + } + /** * Outputs the site owner */ @@ -242,14 +272,15 @@ class WPSEO_OpenGraph extends WPSEO_Frontend { * @return bool */ public function image() { + + global $post; + + if ( is_front_page() ) { + if ( isset( $this->options['og_frontpage_image'] ) ) + $this->image_output( $this->options['og_frontpage_image'] ); + } + if ( is_singular() ) { - global $post; - - if ( is_front_page() ) { - if ( isset( $this->options['og_frontpage_image'] ) ) - $this->image_output( $this->options['og_frontpage_image'] ); - } - if ( function_exists( 'has_post_thumbnail' ) && has_post_thumbnail( $post->ID ) ) { $thumb = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), apply_filters( 'wpseo_opengraph_image_size', 'large' ) ); $this->image_output( $thumb[0] ); @@ -276,10 +307,22 @@ class WPSEO_OpenGraph extends WPSEO_Frontend { * @return string $ogdesc */ public function description( $echo = true ) { - $ogdesc = wpseo_get_value( 'opengraph-description' ); + $ogdesc = ''; + + if ( is_front_page() ) { + if ( isset( $this->options['og_frontpage_desc'] ) ) + $ogdesc = $this->options['og_frontpage_desc']; + } - if ( !$ogdesc ) - $ogdesc = $this->metadesc( false ); + if ( is_singular() ) { + $ogdesc = wpseo_get_value( 'opengraph-description' ); + if ( !$ogdesc ) + $ogdesc = $this->metadesc( false ); + + // og:description is still blank so grab it from get_the_excerpt() + if ( !$ogdesc ) + $ogdesc = strip_tags( get_the_excerpt() ); + } $ogdesc = apply_filters( 'wpseo_opengraph_desc', $ogdesc ); diff --git a/wp-content/plugins/wordpress-seo/frontend/class-twitter.php b/wp-content/plugins/wordpress-seo/frontend/class-twitter.php index ef19ba6..a55ea1d 100644 --- a/wp-content/plugins/wordpress-seo/frontend/class-twitter.php +++ b/wp-content/plugins/wordpress-seo/frontend/class-twitter.php @@ -40,15 +40,15 @@ class WPSEO_Twitter extends WPSEO_Frontend { $this->type(); $this->site_twitter(); + $this->site_domain(); $this->author_twitter(); // No need to show these when OpenGraph is also showing, as it'd be the same contents and Twitter // would fallback to OpenGraph anyway. $this->image(); $options = get_wpseo_options(); - $this->twitter_description(); - if ( !isset( $options['opengraph'] ) || !$options['opengraph'] ) { + $this->twitter_description(); $this->twitter_title(); $this->twitter_url(); } @@ -70,17 +70,27 @@ class WPSEO_Twitter extends WPSEO_Frontend { */ public function site_twitter() { if ( isset( $this->options['twitter_site'] ) ) - echo '' . "\n"; + echo '' . "\n"; + } + + /** + * Displays the domain tag for the site. + */ + public function site_domain() { + echo '' . "\n"; } /** * Displays the authors Twitter account. */ public function author_twitter() { - $twitter = trim( get_the_author_meta( 'twitter' ) ); + $twitter = ltrim( trim( get_the_author_meta( 'twitter' ) ), '@' ); if ( $twitter && !empty( $twitter ) ) - echo '' . "\n"; + echo '' . "\n"; + + else if ( isset( $this->options['twitter_site'] ) ) + echo '' . "\n"; } /** @@ -89,7 +99,7 @@ class WPSEO_Twitter extends WPSEO_Frontend { * Only used when OpenGraph is inactive. */ public function twitter_title() { - echo '' . "\n"; + echo '' . "\n"; } /** @@ -101,14 +111,14 @@ class WPSEO_Twitter extends WPSEO_Frontend { $metadesc = trim( $this->metadesc( false ) ); if ( empty( $metadesc ) ) $metadesc = false; - if ( $metadesc && isset( $options['opengraph'] ) && $options['opengraph'] ) { + if ( $metadesc && isset( $this->options['opengraph'] ) && $this->options['opengraph'] ) { // Already output the same description in opengraph, no need to repeat. return; } else if ( !$metadesc ) { $metadesc = strip_tags( get_the_excerpt() ); } - echo '' . "\n"; + echo '' . "\n"; } /** @@ -127,21 +137,78 @@ class WPSEO_Twitter extends WPSEO_Frontend { */ public function image() { global $post; - - if ( function_exists( 'has_post_thumbnail' ) && has_post_thumbnail( $post->ID ) ) { - $featured_img = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), apply_filters( 'wpseo_opengraph_image_size', 'medium' ) ); - - if ( $featured_img ) { - $img = apply_filters( 'wpseo_opengraph_image', $featured_img[0] ); - echo "\n"; + + $shown_images = array(); + + if ( is_singular() ) { + + if ( is_front_page() ) { + + if ( isset( $this->options['og_frontpage_image'] ) ) { + + $escaped_img = esc_attr( $this->options['og_frontpage_image'] ); + + if ( ! empty( $escaped_img ) ) { + echo '' . "\n"; + + // No images yet, don't test + array_push( $shown_images, $escaped_img ); + + } + + } + } - } else { - $options = get_wpseo_options(); - if ( isset( $options['og_frontpage_image'] ) && !empty( $options['og_frontpage_image'] ) ) - echo "\n"; + + if ( function_exists( 'has_post_thumbnail' ) && has_post_thumbnail( $post->ID ) ) { + + $featured_img = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), apply_filters( 'wpseo_opengraph_image_size', 'medium' ) ); + + if ( $featured_img ) { + + $escaped_img = esc_attr( apply_filters( 'wpseo_opengraph_image', $featured_img[0] ) ); + + if ( ! empty( $escaped_img ) && ! in_array( $escaped_img, $shown_images ) ) { + + echo '' . "\n"; + + array_push( $shown_images, $escaped_img ); + + } + + } + + } + + if ( preg_match_all( '/]+>/', $post->post_content, $matches ) ) { + + foreach ( $matches[0] as $img ) { + + if ( preg_match( '/src=("|\')(.*?)\1/', $img, $match ) ) { + + $escaped_match = esc_attr( $match[2] ); + + if ( ! empty( $escaped_match ) && ! in_array( $escaped_match, $shown_images ) ) { + + echo '' . "\n"; + + array_push( $shown_images, $escaped_match ); + + } + + } + + } + + } + } + + if ( count( $shown_images ) == 0 && isset( $this->options['og_default_image'] ) ) + echo '' . "\n"; } + } global $wpseo_twitter; diff --git a/wp-content/plugins/wordpress-seo/images/banner-website-review.png b/wp-content/plugins/wordpress-seo/images/banner-website-review.png index 86b18ef..ca8cc0f 100644 Binary files a/wp-content/plugins/wordpress-seo/images/banner-website-review.png and b/wp-content/plugins/wordpress-seo/images/banner-website-review.png differ diff --git a/wp-content/plugins/wordpress-seo/images/twitter-icon.png b/wp-content/plugins/wordpress-seo/images/twitter-icon.png deleted file mode 100644 index bf6b990..0000000 Binary files a/wp-content/plugins/wordpress-seo/images/twitter-icon.png and /dev/null differ diff --git a/wp-content/plugins/wordpress-seo/inc/class-sitemap-walker.php b/wp-content/plugins/wordpress-seo/inc/class-sitemap-walker.php new file mode 100644 index 0000000..76c4191 --- /dev/null +++ b/wp-content/plugins/wordpress-seo/inc/class-sitemap-walker.php @@ -0,0 +1,81 @@ +cat_ID : $object->slug; + + $query_args = array( + 'post_type' => $args['post_type'], + 'post_status' => 'publish', + 'posts_per_page' => -1, + + "{$tax_name}" => $term_id, + + 'meta_query' => array( + 'relation' => 'OR', + // include if this key doesn't exists + array( + 'key' => '_yoast_wpseo_meta-robots-noindex', + 'value' => '', // This is ignored, but is necessary... + 'compare' => 'NOT EXISTS' + ), + // OR if key does exists include if it is not 1 + array( + 'key' => '_yoast_wpseo_meta-robots-noindex', + 'value' => '1', + 'compare' => '!=' + ), + // OR this key overrides it + array( + 'key' => '_yoast_wpseo_sitemap-html-include', + 'value' => 'always', + 'compare' => '=' + ) + ) + ); + + $posts = get_posts( $query_args ); + + $output .= "
    "; + foreach ( $posts as $post ) { + $category = get_the_terms( $post->ID, $tax_name ); + + if ( $category ) { + // reset array to get the first element + $category = reset( $category ); + + // Only display a post link once, even if it's in multiple taxonomies + if ( $category->term_id == $object->term_id && !in_array( $post->ID, $this->processed_post_ids ) ) { + $this->processed_post_ids[] = $post->ID; + $output .= '
  • '.get_the_title($post->ID).'
    • '; + } + } + } + $output .= "
"; + parent::end_el($output, $object, $depth, $args); + } + +} \ No newline at end of file diff --git a/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php b/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php index 58bbd6a..e4f7acf 100644 --- a/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php +++ b/wp-content/plugins/wordpress-seo/inc/class-sitemaps.php @@ -8,6 +8,9 @@ if ( !defined( 'WPSEO_VERSION' ) ) { die; } +/** + * Class WPSEO_Sitemaps + */ class WPSEO_Sitemaps { /** * Content of the sitemap to output. @@ -29,6 +32,11 @@ class WPSEO_Sitemaps { */ private $max_entries = 1000; + /** + * Holds the WP SEO + */ + private $options = array(); + function __construct() { if ( !defined( 'ENT_XML1' ) ) define( "ENT_XML1", 16 ); @@ -40,6 +48,8 @@ class WPSEO_Sitemaps { // default stylesheet $this->stylesheet = ''; + + $this->options = get_wpseo_options(); } /** @@ -91,8 +101,7 @@ class WPSEO_Sitemaps { $GLOBALS['wp']->add_query_var( 'sitemap' ); $GLOBALS['wp']->add_query_var( 'sitemap_n' ); - $options = get_wpseo_options(); - $this->max_entries = ( isset( $options['entries-per-page'] ) && $options['entries-per-page'] != '' ) ? intval( $options['entries-per-page'] ) : 1000; + $this->max_entries = ( isset( $this->options['entries-per-page'] ) && $this->options['entries-per-page'] != '' ) ? intval( $this->options['entries-per-page'] ) : 1000; add_rewrite_rule( 'sitemap_index\.xml$', 'index.php?sitemap=1', 'top' ); add_rewrite_rule( '([^/]+?)-sitemap([0-9]+)?\.xml$', 'index.php?sitemap=$matches[1]&sitemap_n=$matches[2]', 'top' ); @@ -113,10 +122,6 @@ class WPSEO_Sitemaps { return; } -// $wphost = parse_url( get_site_url(), PHP_URL_HOST ); -// if ( isset( $_SERVER['SERVER_NAME'] ) && $_SERVER['SERVER_NAME'] != $wphost ) { -// wp_redirect( rtrim( get_site_url(), '/' ) . $_SERVER['REQUEST_URI'], 301 ); -// } $this->output(); die(); } @@ -128,6 +133,9 @@ class WPSEO_Sitemaps { * @param string $type The requested sitemap's identifier. */ function build_sitemap( $type ) { + if ( !is_admin() ) + @ob_clean(); + $type = apply_filters( 'wpseo_build_sitemap_post_type', $type ); if ( $type == 1 ) @@ -136,7 +144,9 @@ class WPSEO_Sitemaps { $this->build_post_type_map( $type ); else if ( $tax = get_taxonomy( $type ) ) $this->build_tax_map( $tax ); - else if ( has_action( 'wpseo_do_sitemap_' . $type ) ) + else if ( $type == 'author' ) { + $this->build_user_map(); + } else if ( has_action( 'wpseo_do_sitemap_' . $type ) ) do_action( 'wpseo_do_sitemap_' . $type ); else $this->bad_sitemap = true; @@ -150,16 +160,19 @@ class WPSEO_Sitemaps { */ function build_root_map() { - global $wpdb; + if ( !is_admin() ) + @ob_clean(); - $options = get_wpseo_options(); + global $wpdb; $this->sitemap = '' . "\n"; $base = $GLOBALS['wp_rewrite']->using_index_permalinks() ? 'index.php/' : ''; // reference post type specific sitemaps foreach ( get_post_types( array( 'public' => true ) ) as $post_type ) { - if ( isset( $options['post_types-' . $post_type . '-not_in_sitemap'] ) && $options['post_types-' . $post_type . '-not_in_sitemap'] ) + if ( isset( $this->options['post_types-' . $post_type . '-not_in_sitemap'] ) && $this->options['post_types-' . $post_type . '-not_in_sitemap'] ) + continue; + else if ( apply_filters( 'wpseo_sitemap_exclude_post_type', false, $post_type ) ) continue; $query = $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_type = '%s' AND post_status IN ('publish','inherit')", $post_type ); @@ -177,9 +190,10 @@ class WPSEO_Sitemaps { $date = $this->get_last_modified( $post_type ); } else { $date = $wpdb->get_var( $wpdb->prepare( "SELECT post_modified_gmt FROM $wpdb->posts WHERE post_status IN ('publish','inherit') AND post_type = %s ORDER BY post_modified_gmt ASC LIMIT 1 OFFSET %d", $post_type, $this->max_entries * ( $i + 1 ) - 1 ) ); - $date = date( 'c', strtotime( $date ) ); } + $date = date( 'c', strtotime( $date ) ); + $this->sitemap .= '' . "\n"; $this->sitemap .= '' . home_url( $base . $post_type . '-sitemap' . $count . '.xml' ) . '' . "\n"; $this->sitemap .= '' . htmlspecialchars( $date ) . '' . "\n"; @@ -191,21 +205,106 @@ class WPSEO_Sitemaps { foreach ( get_taxonomies( array( 'public' => true ) ) as $tax ) { if ( in_array( $tax, array( 'link_category', 'nav_menu', 'post_format' ) ) ) continue; + else if ( apply_filters( 'wpseo_sitemap_exclude_taxonomy', false, $tax ) ) + continue; - if ( isset( $options['taxonomies-' . $tax . '-not_in_sitemap'] ) && $options['taxonomies-' . $tax . '-not_in_sitemap'] ) + if ( isset( $this->options['taxonomies-' . $tax . '-not_in_sitemap'] ) && $this->options['taxonomies-' . $tax . '-not_in_sitemap'] ) continue; // don't include taxonomies with no terms if ( !$wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = %s AND count != 0 LIMIT 1", $tax ) ) ) continue; - // Retrieve the post_types that are registered to this taxonomy and then retrieve last modified date for all of those combined. - $taxobj = get_taxonomy( $tax ); - $date = $this->get_last_modified( $taxobj->object_type ); + $steps = $this->max_entries; + $all_terms = get_terms( $tax, array( 'hide_empty' => true, 'fields' => 'names' ) ); + $count = count( $all_terms ); + $n = ( $count > $this->max_entries ) ? (int) ceil( $count / $this->max_entries ) : 1; - $this->sitemap .= '' . "\n"; - $this->sitemap .= '' . home_url( $base . $tax . '-sitemap.xml' ) . '' . "\n"; - $this->sitemap .= '' . htmlspecialchars( $date ) . '' . "\n"; - $this->sitemap .= '' . "\n"; + for ( $i = 0; $i < $n; $i++ ) { + $count = ( $n > 1 ) ? $i + 1 : ''; + $taxobj = get_taxonomy( $tax ); + + if ( ( empty( $count ) || $count == $n ) && false ) { + $date = $this->get_last_modified( $post_type ); + } else { + $terms = array_splice( $all_terms, 0, $steps ); + if ( !$terms ) + continue; + + $args = array( + 'post_type' => $taxobj->object_type, + 'tax_query' => array( + array( + 'taxonomy' => $tax, + 'field' => 'slug', + 'terms' => $terms + ) + ), + 'orderby' => 'modified', + 'order' => 'DESC', + ); + $query = new WP_Query( $args ); + + $date = ''; + if ( $query->have_posts() ) + $date = $query->posts[0]->post_modified_gmt; + + } + + // Retrieve the post_types that are registered to this taxonomy and then retrieve last modified date for all of those combined. + // $taxobj = get_taxonomy( $tax ); + // $date = $this->get_last_modified( $taxobj->object_type ); + $date = date( 'c', strtotime( $date ) ); + + $this->sitemap .= '' . "\n"; + $this->sitemap .= '' . home_url( $base . $tax . '-sitemap' . $count . '.xml' ) . '' . "\n"; + $this->sitemap .= '' . htmlspecialchars( $date ) . '' . "\n"; + $this->sitemap .= '' . "\n"; + } + } + + if ( !isset( $this->options['disable-author'] ) && !isset( $this->options['disable_author_sitemap'] ) ) { + + // reference user profile specific sitemaps + $users = get_users( array( 'who' => 'authors' ) ); + $count = count( $users ); + $n = ( $count > $this->max_entries ) ? (int) ceil( $count / $this->max_entries ) : 1; + + for ( $i = 0; $i < $n; $i++ ) { + $count = ( $n > 1 ) ? $i + 1 : ''; + + // must use custom raw query because WP User Query does not support ordering by usermeta + // Retrieve the newest updated profile timestamp overall + if ( empty( $count ) || $count == $n ) { + $date = $wpdb->get_var( $wpdb->prepare( " + SELECT mt1.meta_value FROM $wpdb->users + INNER JOIN $wpdb->usermeta ON ($wpdb->users.ID = $wpdb->usermeta.user_id) + INNER JOIN $wpdb->usermeta AS mt1 ON ($wpdb->users.ID = mt1.user_id) WHERE 1=1 + AND ( ($wpdb->usermeta.meta_key = %s AND CAST($wpdb->usermeta.meta_value AS CHAR) != '0') + AND mt1.meta_key = '_yoast_wpseo_profile_updated' ) ORDER BY mt1.meta_value DESC LIMIT 1 + ", + $wpdb->get_blog_prefix() . 'user_level' + ) ); + $date = date( 'c', $date ); + + // Retrieve the newest updated profile timestamp by an offset + } else { + $date = $wpdb->get_var( $wpdb->prepare( " + SELECT mt1.meta_value FROM $wpdb->users + INNER JOIN $wpdb->usermeta ON ($wpdb->users.ID = $wpdb->usermeta.user_id) + INNER JOIN $wpdb->usermeta AS mt1 ON ($wpdb->users.ID = mt1.user_id) WHERE 1=1 + AND ( ($wpdb->usermeta.meta_key = %s AND CAST($wpdb->usermeta.meta_value AS CHAR) != '0') + AND mt1.meta_key = '_yoast_wpseo_profile_updated' ) ORDER BY mt1.meta_value ASC LIMIT 1 OFFSET %d + ", + $wpdb->get_blog_prefix() . 'user_level', + $this->max_entries * ( $i + 1 ) - 1 ) ); + $date = date( 'c', $date ); + } + + $this->sitemap .= '' . "\n"; + $this->sitemap .= '' . home_url( $base . 'author-sitemap' . $count . '.xml' ) . '' . "\n"; + $this->sitemap .= '' . htmlspecialchars( $date ) . '' . "\n"; + $this->sitemap .= '' . "\n"; + } } // allow other plugins to add their sitemaps to the index @@ -221,11 +320,10 @@ class WPSEO_Sitemaps { function build_post_type_map( $post_type ) { global $wpdb; - $options = get_wpseo_options(); - if ( - ( isset( $options['post_types-' . $post_type . '-not_in_sitemap'] ) && $options['post_types-' . $post_type . '-not_in_sitemap'] ) + ( isset( $this->options['post_types-' . $post_type . '-not_in_sitemap'] ) && $this->options['post_types-' . $post_type . '-not_in_sitemap'] ) || in_array( $post_type, array( 'revision', 'nav_menu_item' ) ) + || apply_filters( 'wpseo_sitemap_exclude_post_type', false, $post_type ) ) { $this->bad_sitemap = true; return; @@ -243,7 +341,7 @@ class WPSEO_Sitemaps { $where_filter = ''; $where_filter = apply_filters( 'wpseo_typecount_where', $where_filter, $post_type ); - $query = $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts {$join_filter} WHERE post_status IN ('publish','inherit') AND post_password = '' AND post_type = %s " . $where_filter, $post_type ); + $query = $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts {$join_filter} WHERE post_status IN ('publish','inherit') AND post_password = '' AND post_type = %s " . $where_filter, $post_type ); $typecount = $wpdb->get_var( $query ); if ( $total > $typecount ) @@ -342,7 +440,7 @@ class WPSEO_Sitemaps { continue; } else { - if ( isset( $options['trailingslash'] ) && $options['trailingslash'] && $p->post_type != 'post' ) + if ( isset( $this->options['trailingslash'] ) && $this->options['trailingslash'] && $p->post_type != 'post' ) $url['loc'] = trailingslashit( $url['loc'] ); } @@ -456,19 +554,26 @@ class WPSEO_Sitemaps { * @param string $taxonomy Registered taxonomy's slug */ function build_tax_map( $taxonomy ) { - $options = get_wpseo_options(); if ( - ( isset( $options['taxonomies-' . $taxonomy->name . '-not_in_sitemap'] ) && $options['taxonomies-' . $taxonomy->name . '-not_in_sitemap'] ) + ( isset( $this->options['taxonomies-' . $taxonomy->name . '-not_in_sitemap'] ) && $this->options['taxonomies-' . $taxonomy->name . '-not_in_sitemap'] ) || in_array( $taxonomy, array( 'link_category', 'nav_menu', 'post_format' ) ) + || apply_filters( 'wpseo_sitemap_exclude_taxonomy', false, $taxonomy->name ) ) { $this->bad_sitemap = true; return; } - $terms = get_terms( $taxonomy->name, array( 'hide_empty' => true ) ); - global $wpdb; $output = ''; + + $steps = $this->max_entries; + $n = (int) get_query_var( 'sitemap_n' ); + $offset = ( $n > 1 ) ? ( $n - 1 ) * $this->max_entries : 0; + $total = $offset + $this->max_entries; + + $terms = get_terms( $taxonomy->name, array( 'hide_empty' => true ) ); + $terms = array_splice( $terms, $offset, $steps ); + foreach ( $terms as $c ) { $url = array(); @@ -483,7 +588,7 @@ class WPSEO_Sitemaps { $url['loc'] = wpseo_get_term_meta( $c, $c->taxonomy, 'canonical' ); if ( !$url['loc'] ) { $url['loc'] = get_term_link( $c, $c->taxonomy ); - if ( isset( $options['trailingslash'] ) && $options['trailingslash'] ) + if ( isset( $this->options['trailingslash'] ) && $this->options['trailingslash'] ) $url['loc'] = trailingslashit( $url['loc'] ); } if ( $c->count > 10 ) { @@ -495,7 +600,7 @@ class WPSEO_Sitemaps { } // Grab last modified date - $sql = $wpdb->prepare( "SELECT MAX(p.post_date) AS lastmod + $sql = $wpdb->prepare( "SELECT MAX(p.post_modified_gmt) AS lastmod FROM $wpdb->posts AS p INNER JOIN $wpdb->term_relationships AS term_rel ON term_rel.object_id = p.ID @@ -521,6 +626,84 @@ class WPSEO_Sitemaps { $this->sitemap .= $output . ''; } + + /** + * Build the sub-sitemap for authors + * + * @since 1.4.8 + */ + function build_user_map() { + if ( isset( $this->options['disable-author'] ) || isset( $this->options['disable_author_sitemap'] ) ) { + $this->bad_sitemap = true; + return; + } + + $output = ''; + + $steps = 25; + $n = (int) get_query_var( 'sitemap_n' ); + $offset = ( $n > 1 ) ? ( $n - 1 ) * $this->max_entries : 0; + + // initial query to fill in missing usermeta with the current timestamp + $users = get_users( array( + 'who' => 'authors', + 'meta_query' => array( + array( + 'key' => '_yoast_wpseo_profile_updated', + 'value' => '', // This is ignored, but is necessary... + 'compare' => 'NOT EXISTS' + ) + ) + ) ); + + foreach ( $users as $user ) { + update_user_meta( $user->ID, '_yoast_wpseo_profile_updated', time() ); + } + + // query for users with this meta + $users = get_users( array( + 'who' => 'authors', + 'offset' => $offset, + 'number' => $steps, + 'meta_key' => '_yoast_wpseo_profile_updated', + 'orderby' => 'meta_value_num', + 'order' => 'ASC', + ) ); + + $users = apply_filters( 'wpseo_sitemap_exclude_author', $users ); + + // ascending sort + usort( $users, array( $this, 'user_map_sorter' ) ); + + foreach ( $users as $user ) { + if ( $author_link = get_author_posts_url( $user->ID ) ) { + $output .= $this->sitemap_url( array( + 'loc' => $author_link, + 'pri' => 0.8, + 'chf' => 'weekly', + 'mod' => date( 'c', $user->_yoast_wpseo_profile_updated ) + ) ); + } + } + + if ( empty( $output ) ) { + $this->bad_sitemap = true; + return; + } + + $this->sitemap = 'sitemap .= 'xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" '; + $this->sitemap .= 'xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n"; + $this->sitemap .= $output; + + // Filter to allow adding extra URLs, only do this on the first XML sitemap, not on all. + if ( $n == 0 ) + $this->sitemap .= apply_filters( 'wpseo_sitemap_author_content', '' ); + + $this->sitemap .= ''; + } + + /** * Spit out the generated sitemap and relevant headers and encoding information. */ @@ -550,7 +733,8 @@ class WPSEO_Sitemaps { $date = mysql2date( "Y-m-d\TH:i:s+00:00", $url['mod'] ); else $date = date( 'c' ); - $output = "\t\n"; + $url['loc'] = htmlspecialchars( $url['loc'] ); + $output = "\t\n"; $output .= "\t\t" . $url['loc'] . "\n"; $output .= "\t\t" . $date . "\n"; $output .= "\t\t" . $url['chf'] . "\n"; @@ -623,6 +807,38 @@ class WPSEO_Sitemaps { $result = date( 'c', $result ); return $result; } + + /** + * Parse the requested sitemap's identifier to check for a user sitemap pattern + * + * since 1.6 + * + * @param string $type The requested sitemap's identifier. + * @return string $user a WP_User object or false + */ + private function is_user_sitemap( $type ) { + $pieces = explode( '-', $type, 2 ); + $user = isset( $pieces[1] ) ? $pieces[1] : ''; + return get_user_by( 'slug', $user ); + } + + + /** + * Sorts an array of WP_User by the _yoast_wpseo_profile_updated meta field + * + * since 1.6 + * + * @param Wp_User $a The first WP user + * @param Wp_User $b The second WP user + * @return int 0 if equal, 1 if $a is larger else or -1; + */ + private function user_map_sorter( $a, $b ) { + if ( $a->_yoast_wpseo_profile_updated == $b->_yoast_wpseo_profile_updated ) { + return 0; + } + return ( $a->_yoast_wpseo_profile_updated > $b->_yoast_wpseo_profile_updated ) ? 1 : -1; + } + } global $wpseo_sitemaps; diff --git a/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php b/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php index a14fc8e..09672ea 100644 --- a/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php +++ b/wp-content/plugins/wordpress-seo/inc/wpseo-functions.php @@ -315,6 +315,21 @@ function wpseo_strip_shortcode( $text ) { return preg_replace( '|\[[^\]]+\]|s', '', $text ); } +/** + * Redirect /sitemap.xml to /sitemap_index.xml + */ +function wpseo_xml_redirect_sitemap() { + global $wp_query; + + $current_url =( isset($_SERVER["HTTPS"] ) && $_SERVER["HTTPS"]=='on' ) ? 'https://' : 'http://'; + $current_url .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"]; + + // must be 'sitemap.xml' and must be 404 + if ( home_url( '/sitemap.xml' ) == $current_url && $wp_query->is_404) { + wp_redirect( home_url( '/sitemap_index.xml' ) ); + } +} + /** * Initialize sitemaps. Add sitemap rewrite rules and query var */ @@ -323,12 +338,14 @@ function wpseo_xml_sitemaps_init() { if ( !isset( $options['enablexmlsitemap'] ) || !$options['enablexmlsitemap'] ) return; + // redirects sitemap.xml to sitemap_index.xml + add_action( 'template_redirect', 'wpseo_xml_redirect_sitemap', 0 ); + $GLOBALS['wp']->add_query_var( 'sitemap' ); $GLOBALS['wp']->add_query_var( 'sitemap_n' ); add_rewrite_rule( 'sitemap_index\.xml$', 'index.php?sitemap=1', 'top' ); add_rewrite_rule( '([^/]+?)-sitemap([0-9]+)?\.xml$', 'index.php?sitemap=$matches[1]&sitemap_n=$matches[2]', 'top' ); } - add_action( 'init', 'wpseo_xml_sitemaps_init', 1 ); /** diff --git a/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php b/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php index 893e50e..74fc8a3 100644 --- a/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php +++ b/wp-content/plugins/wordpress-seo/inc/wpseo-non-ajax-functions.php @@ -3,6 +3,8 @@ * @package Internals */ +include 'class-sitemap-walker.php'; + if ( !defined( 'WPSEO_VERSION' ) ) { header( 'HTTP/1.0 403 Forbidden' ); die; @@ -175,31 +177,41 @@ function wpseo_deactivate() { * @param int $val The decimal score to translate. * @return string */ -function wpseo_translate_score( $val ) { +function wpseo_translate_score( $val, $css = true ) { switch ( $val ) { case 0: - $score = 'na'; + $score = __( 'N/A', 'wordpress-seo' ); + $css = 'na'; break; case 4: case 5: - $score = 'poor'; + $score = __( 'Poor', 'wordpress-seo' ); + $css = 'poor'; break; case 6: case 7: - $score = 'ok'; + $score = __( 'OK', 'wordpress-seo' ); + $css = 'ok'; break; case 8: case 9: case 10: - $score = 'good'; + $score = __( 'Good', 'wordpress-seo' ); + $css = 'good'; break; default: - $score = 'bad'; + $score = __( 'Bad', 'wordpress-seo' ); + $css = 'bad'; break; } - return $score; + + if ( $css ) + return $css; + else + return $score; } + /** * Adds an SEO admin bar menu with several options. If the current user is an admin he can also go straight to several settings menu's from here. */ @@ -224,7 +236,9 @@ function wpseo_admin_bar_menu() { $focuskw = wpseo_get_value( 'focuskw', $post->ID ); $perc_score = wpseo_get_value( 'linkdex', $post->ID ); $txtscore = wpseo_translate_score( round( $perc_score / 10 ) ); - $score = '
'; + $title = wpseo_translate_score( round( $perc_score / 10 ), $css = false ); + $score = '
'; + $seo_url = get_edit_post_link( $post->ID ); if ( $txtscore != 'na' ) $seo_url .= '#wpseo_linkdex'; @@ -311,4 +325,217 @@ function allow_custom_field_edits( $allcaps, $cap, $args ) { return $allcaps; } + add_filter( 'user_has_cap', 'allow_custom_field_edits', 0, 3 ); + +/** + * Generate an HTML sitemap + * + * @param array $atts The attributes passed to the shortcode. + * + * @return string + */ +function wpseo_sitemap_handler( $atts ) { + + $atts = shortcode_atts( array( + 'authors' => true, + 'pages' => true, + 'posts' => true, + 'archives' => true + ), $atts ); + + $display_authors = ( $atts['authors'] === 'no' ) ? false : true; + $display_pages = ( $atts['pages'] === 'no' ) ? false : true; + $display_posts = ( $atts['posts'] === 'no' ) ? false : true; + $display_archives = ( $atts['archives'] === 'no' ) ? false : true; + + $options = get_wpseo_options(); + + // Delete the transient if any of these are no + if ( $display_authors === 'no' || $display_pages === 'no' || $display_posts === 'no' ) { + delete_transient( 'html-sitemap' ); + } + + // Get any existing copy of our transient data + if ( false !== ( $output = get_transient( 'html-sitemap' ) ) ) { + // $output .= 'CACHE'; // debug + // return $output; + } + + $output = ''; + + // create author list + if ( $display_authors ) { + $output .= '

' . __( 'Authors', 'wordpress-seo' ) . '

    '; + // use echo => false b/c shortcode format screws up + $author_list = wp_list_authors( + array( + 'exclude_admin' => false, + 'echo' => false, + ) + ); + $output .= $author_list; + $output .= '
'; + } + + // create page list + if ( $display_pages ) { + $output .= '

' . __( 'Pages', 'wordpress-seo' ) . '

    '; + // Add pages you'd like to exclude in the exclude here + // possibly have this controlled by shortcode params + $page_list = wp_list_pages( + array( + 'exclude' => '', + 'title_li' => '', + 'echo' => false, + ) + ); + $output .= $page_list; + $output .= '
'; + } + + // create post list + if ( $display_posts ) { + $output .= '

' . __( 'Posts', 'wordpress-seo' ) . '

    '; + // Add categories you'd like to exclude in the exclude here + // possibly have this controlled by shortcode params + $cats = get_categories( 'exclude=' ); + foreach ( $cats as $cat ) { + $output .= "
  • " . $cat->cat_name; + $output .= "
      "; + + $args = array( + 'post_type' => 'post', + 'post_status' => 'publish', + + 'posts_per_page' => -1, + 'cat' => $cat->cat_ID, + + 'meta_query' => array( + 'relation' => 'OR', + // include if this key doesn't exists + array( + 'key' => '_yoast_wpseo_meta-robots-noindex', + 'value' => '', // This is ignored, but is necessary... + 'compare' => 'NOT EXISTS' + ), + // OR if key does exists include if it is not 1 + array( + 'key' => '_yoast_wpseo_meta-robots-noindex', + 'value' => '1', + 'compare' => '!=' + ), + // OR this key overrides it + array( + 'key' => '_yoast_wpseo_sitemap-html-include', + 'value' => 'always', + 'compare' => '=' + ) + ) + ); + + $posts = get_posts( $args ); + + foreach ( $posts as $post ) { + $category = get_the_category( $post->ID ); + + // Only display a post link once, even if it's in multiple categories + if ( $category[0]->cat_ID == $cat->cat_ID ) { + $output .= '
    • ' . get_the_title( $post->ID ) . '
      • '; + } + } + + $output .= "
    "; + $output .= "
    • "; + } + } + $output .= '
'; + + // get all public non-builtin post types + $args = array( + 'public' => true, + '_builtin' => false + ); + $post_types = get_post_types( $args, 'object' ); + + // create an noindex array of post types and taxonomies + $noindex = array(); + foreach($options as $key => $value) { + if ( strpos( $key, 'noindex-' ) === 0 && $value == 'on' ) + $noindex[] = $key; + } + + // create custom post type list + foreach ( $post_types as $post_type ) { + if ( ! in_array( 'noindex-' . $post_type->name, $noindex ) ) { + $output .= '

' . __( $post_type->label, 'wordpress-seo' ) . '

    '; + $output .= create_type_sitemap_template( $post_type ); + $output .= '
'; + } + } + + // $output = ''; + // create archives list + if ( $display_archives ) { + $output .= '

' . __( 'Archives', 'wordpress-seo' ) . '

    '; + + foreach ( $post_types as $post_type ) { + if ( $post_type->has_archive && ! in_array( 'noindex-ptarchive-' . $post_type->name, $noindex ) ) { + $output .= '' . $post_type->labels->name . ''; + + $output .= create_type_sitemap_template( $post_type ); + } + } + + $output .= '
'; + } + + set_transient( 'html-sitemap', $output, 60 ); + return $output; +} + +add_shortcode( 'wpseo_sitemap', 'wpseo_sitemap_handler' ); + + +function create_type_sitemap_template( $post_type ) { + // $output = '

' . __( $post_type->label, 'wordpress-seo' ) . '

    '; + + $output = ''; + // Get all registered taxonomy of this post type + $taxs = get_object_taxonomies( $post_type->name, 'object' ); + + // Build the taxonomy tree + $walker = new Sitemap_Walker(); + foreach ( $taxs as $key => $tax ) { + $args = array( + 'post_type' => $post_type->name, + 'tax_query' => array( + array( + 'taxonomy' => $key, + 'field' => 'id', + 'terms' => -1, + 'operator' => 'NOT', + ) + ) + ); + $query = new WP_Query( $args ); + + $title_li = $query->have_posts() ? $tax->labels->name : ''; + + $output .= wp_list_categories( + array( + 'title_li' => $title_li, + 'echo' => false, + 'taxonomy' => $key, + 'show_option_none' => '', + // 'hierarchical' => 0, // uncomment this for a flat list + + 'walker' => $walker, + 'post_type' => $post_type->name // arg used by the Walker class + ) + ); + } + + $output .= '
    '; + return $output; +} diff --git a/wp-content/plugins/wordpress-seo/js/wp-seo-admin.js b/wp-content/plugins/wordpress-seo/js/wp-seo-admin.js index 163b186..197a781 100644 --- a/wp-content/plugins/wordpress-seo/js/wp-seo-admin.js +++ b/wp-content/plugins/wordpress-seo/js/wp-seo-admin.js @@ -43,7 +43,7 @@ function wpseo_killBlockingFiles( nonce ) { jQuery(document).ready(function(){ var active_tab = window.location.hash.replace('#top#',''); if ( active_tab == '' ) - active_tab = 'general'; + active_tab = jQuery('.wpseotab').attr('id'); jQuery('#'+active_tab).addClass('active'); jQuery('#'+active_tab+'-tab').addClass('nav-tab-active'); diff --git a/wp-content/plugins/wordpress-seo/js/wp-seo-metabox.js b/wp-content/plugins/wordpress-seo/js/wp-seo-metabox.js index 6b5945a..f67b4b4 100644 --- a/wp-content/plugins/wordpress-seo/js/wp-seo-metabox.js +++ b/wp-content/plugins/wordpress-seo/js/wp-seo-metabox.js @@ -87,14 +87,18 @@ function testFocusKw() { var focuskwNoDiacritics = removeLowerCaseDiacritics( focuskw ); p2 = new RegExp(focuskwNoDiacritics.replace(/\s+/g,"[-_\\\//]"),'gim'); + var metadesc = jQuery('#yoast_wpseo_metadesc').val(); + if ( metadesc == '' ) + metadesc = jQuery('#wpseosnippet .desc').text(); + if (focuskw != '') { - var html = '

    Your focus keyword was found in:
    '; - html += 'Article Heading: ' + ptest( jQuery('#title').val(), p ) + '
    '; - html += 'Page title: ' + ptest( jQuery('#wpseosnippet .title').text(), p ) + '
    '; - html += 'Page URL: ' + ptest( url, p2 ) + '
    '; - html += 'Content: ' + ptest( jQuery('#content').val(), p ) + '
    '; - html += 'Meta description: ' + ptest( jQuery('#yoast_wpseo_metadesc').val(), p ); - html += '

    '; + var html = '

    ' + objectL10n.keyword_header + '
    '; + html += objectL10n.article_header_text + ptest( jQuery('#title').val(), p ) + '
    '; + html += objectL10n.page_title_text + ptest( jQuery('#wpseosnippet .title').text(), p ) + '
    '; + html += objectL10n.page_url_text + ptest( url, p2 ) + '
    '; + html += objectL10n.content_text + ptest( jQuery('#content').val(), p ) + '
    '; + html += objectL10n.meta_description_text + ptest( metadesc, p ); + html += '

    '; jQuery('#focuskwresults').html(html); } else { jQuery('#focuskwresults').html(''); @@ -112,8 +116,8 @@ function updateTitle( force ) { jQuery('#yoast_wpseo_title-length').html( '' ); return; } - - title = jQuery('
    ').html(title).text(); + + title = jQuery('
    ').text(title).html(); if ( force ) jQuery('#yoast_wpseo_title').val( title ); @@ -173,6 +177,9 @@ function updateDesc( desc ) { autogen = true; } } + + desc = jQuery('
    ').text( desc ).html(); + desc = yst_clean( desc ); if ( !autogen ) var len = wpseo_meta_desc_length - desc.length; @@ -247,6 +254,9 @@ jQuery(document).ready(function(){ jQuery('.'+active_tab).addClass('active'); + var desc = jQuery.trim( yst_clean( jQuery("#yoast_wpseo_metadesc").val() ) ); + desc = jQuery('
    ').html( desc ).text(); + jQuery("#yoast_wpseo_metadesc").val( desc ); jQuery('a.wpseo_tablink').click( function($) { jQuery('.wpseo-metabox-tabs li').removeClass('active'); diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ar.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ar.mo index 121f10f..66d8723 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ar.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ar.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo index 5e9636f..776651b 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-da_DK.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo index f88d566..9872d83 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-de_DE.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-el_GR.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-el_GR.mo index acea93d..0aefe94 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-el_GR.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-el_GR.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo index 37ec79e..8837d7d 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-es_ES.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo index 536cc79..bdbbfb9 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fa_IR.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo index e8bc297..8fc17bc 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-fr_FR.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo index 10fa616..e671116 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-he_IL.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-hr.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-hr.mo new file mode 100644 index 0000000..f8d0bc8 Binary files /dev/null and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-hr.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo index f551e8c..03482bf 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-id_ID.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo index fe90c2e..bb3dee6 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-nl_NL.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo index 7c89c27..91fbc95 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-pt_PT.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ro_RO.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ro_RO.mo index e0eb605..09762d3 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ro_RO.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ro_RO.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo index bfb8ad6..a04ce88 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-ru_RU.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sl_SI.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sl_SI.mo new file mode 100644 index 0000000..698642a Binary files /dev/null and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sl_SI.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo index 289ac4d..9fc0eef 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-sv_SE.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TK.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TK.mo new file mode 100644 index 0000000..f1112fb Binary files /dev/null and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-tr_TK.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo index 5b508b7..5416c6a 100644 Binary files a/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo and b/wp-content/plugins/wordpress-seo/languages/wordpress-seo-zh_CN.mo differ diff --git a/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot b/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot index 8bac917..836d196 100644 --- a/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot +++ b/wp-content/plugins/wordpress-seo/languages/wordpress-seo.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/wordpress-seo\n" -"POT-Creation-Date: 2013-02-28 09:17:30+00:00\n" +"POT-Creation-Date: 2013-06-21 06:28:05+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,97 +16,106 @@ msgstr "" msgid "Some files could not be removed. Please remove them via FTP." msgstr "" -#: admin/class-admin.php:135 admin/class-admin.php:161 +#: admin/class-admin.php:142 admin/class-admin.php:168 msgid "WordPress SEO Configuration" msgstr "" -#: admin/class-admin.php:135 admin/class-admin.php:161 -#: admin/class-metabox.php:797 inc/wpseo-non-ajax-functions.php:233 +#: admin/class-admin.php:142 admin/class-admin.php:168 +#: admin/class-metabox.php:821 inc/wpseo-non-ajax-functions.php:247 msgid "SEO" msgstr "" -#: admin/class-admin.php:136 +#: admin/class-admin.php:143 msgid "Titles & Metas" msgstr "" -#: admin/class-admin.php:137 admin/class-opengraph-admin.php:29 +#: admin/class-admin.php:144 admin/class-opengraph-admin.php:29 #: admin/class-opengraph-admin.php:40 admin/pages/social.php:133 -#: inc/wpseo-non-ajax-functions.php:269 +#: inc/wpseo-non-ajax-functions.php:283 msgid "Social" msgstr "" -#: admin/class-admin.php:138 admin/class-pointers.php:118 -#: inc/wpseo-non-ajax-functions.php:270 +#: admin/class-admin.php:145 admin/class-pointers.php:118 +#: admin/pages/xml-sitemaps.php:13 inc/wpseo-non-ajax-functions.php:284 msgid "XML Sitemaps" msgstr "" -#: admin/class-admin.php:139 admin/pages/permalinks.php:13 -#: inc/wpseo-non-ajax-functions.php:271 +#: admin/class-admin.php:146 admin/pages/permalinks.php:13 +#: inc/wpseo-non-ajax-functions.php:285 msgid "Permalinks" msgstr "" -#: admin/class-admin.php:140 admin/pages/internal-links.php:13 -#: inc/wpseo-non-ajax-functions.php:272 +#: admin/class-admin.php:147 admin/pages/internal-links.php:13 +#: inc/wpseo-non-ajax-functions.php:286 msgid "Internal Links" msgstr "" -#: admin/class-admin.php:141 inc/wpseo-non-ajax-functions.php:273 +#: admin/class-admin.php:148 admin/pages/rss.php:14 +#: inc/wpseo-non-ajax-functions.php:287 msgid "RSS" msgstr "" -#: admin/class-admin.php:142 +#: admin/class-admin.php:149 admin/pages/import.php:256 msgid "Import & Export" msgstr "" -#: admin/class-admin.php:147 admin/class-admin.php:149 +#: admin/class-admin.php:154 admin/class-admin.php:156 msgid "Edit files" msgstr "" -#: admin/class-admin.php:154 admin/class-pointers.php:80 +#: admin/class-admin.php:161 admin/class-pointers.php:80 msgid "Dashboard" msgstr "" -#: admin/class-admin.php:254 +#: admin/class-admin.php:261 msgid "Huge SEO Issue: You're blocking access to robots." msgstr "" -#: admin/class-admin.php:254 +#: admin/class-admin.php:261 msgid "" "You must %sgo to your Reading Settings%s and uncheck the box for Search " "Engine Visibility." msgstr "" -#: admin/class-admin.php:254 +#: admin/class-admin.php:261 msgid "I know, don't bug me." msgstr "" -#: admin/class-admin.php:269 +#: admin/class-admin.php:276 msgid "Settings" msgstr "" -#: admin/class-admin.php:308 +#: admin/class-admin.php:313 +msgid "Google+" +msgstr "" + +#: admin/class-admin.php:315 msgid "Twitter username (without @)" msgstr "" -#: admin/class-admin.php:327 +#: admin/class-admin.php:317 +msgid "Facebook profile URL" +msgstr "" + +#: admin/class-admin.php:336 msgid "WordPress SEO settings" msgstr "" -#: admin/class-admin.php:330 +#: admin/class-admin.php:339 msgid "Title to use for Author page" msgstr "" -#: admin/class-admin.php:335 +#: admin/class-admin.php:344 msgid "Meta description to use for Author page" msgstr "" -#: admin/class-admin.php:342 +#: admin/class-admin.php:351 msgid "Meta keywords to use for Author page" msgstr "" #. translators: this should be an array of stopwords for your language, #. separated by comma's. -#: admin/class-admin.php:544 +#: admin/class-admin.php:553 msgid "" "a,about,above,after,again,against,all,am,an,and,any,are,aren't,as,at,be," "because,been,before,being,below,between,both,but,by,can't,cannot,could," @@ -123,576 +132,648 @@ msgid "" "you,you'd,you'll,you're,you've,your,yours,yourself,yourselves" msgstr "" -#: admin/class-config.php:74 -msgid "Improve your Video SEO!" -msgstr "" - -#: admin/class-config.php:78 -msgid "WordPress SEO training videos" -msgstr "" - -#: admin/class-config.php:81 -msgid "Have Team Yoast review your site" -msgstr "" - -#: admin/class-config.php:106 admin/pages/metas.php:20 +#: admin/class-config.php:145 admin/pages/metas.php:20 msgid "Settings updated" msgstr "" -#: admin/class-config.php:118 +#: admin/class-config.php:157 msgid "Yoast WordPress SEO: " msgstr "" -#: admin/class-config.php:140 +#: admin/class-config.php:179 msgid "Save Settings" msgstr "" -#: admin/class-config.php:168 +#: admin/class-config.php:207 msgid "" "This is a settings export file for the WordPress SEO plugin by Yoast.com" msgstr "" -#: admin/class-metabox.php:107 admin/class-metabox.php:810 +#: admin/class-metabox.php:108 admin/class-metabox.php:834 msgid "Post is set to noindex." msgstr "" -#: admin/class-metabox.php:127 +#: admin/class-metabox.php:128 msgid "No focus keyword set." msgstr "" -#: admin/class-metabox.php:149 admin/class-metabox.php:220 +#: admin/class-metabox.php:137 +msgid "SEO: " +msgstr "" + +#: admin/class-metabox.php:137 +msgid "Check" +msgstr "" + +#: admin/class-metabox.php:151 admin/class-metabox.php:222 msgid "WordPress SEO by Yoast" msgstr "" -#: admin/class-metabox.php:176 +#: admin/class-metabox.php:178 msgid " (because of date display)" msgstr "" -#: admin/class-metabox.php:255 +#: admin/class-metabox.php:257 msgid "Snippet Preview" msgstr "" -#: admin/class-metabox.php:261 +#: admin/class-metabox.php:263 msgid "Focus Keyword" msgstr "" -#: admin/class-metabox.php:270 admin/class-metabox.php:797 +#: admin/class-metabox.php:265 +msgid "" +"Pick the main keyword or keyphrase that this post/page is about.

    Read %sthis post%s for more info." +msgstr "" + +#: admin/class-metabox.php:272 admin/class-metabox.php:821 #: admin/class-taxonomy.php:92 msgid "SEO Title" msgstr "" -#: admin/class-metabox.php:271 +#: admin/class-metabox.php:273 msgid "Title display in search engines is limited to 70 chars, %s chars left." msgstr "" -#: admin/class-metabox.php:272 +#: admin/class-metabox.php:274 msgid "" "The SEO Title defaults to what is generated based on this sites title " "template for this posttype." msgstr "" -#: admin/class-metabox.php:279 +#: admin/class-metabox.php:281 msgid "Meta Description" msgstr "" -#: admin/class-metabox.php:282 +#: admin/class-metabox.php:284 msgid "" "The meta description will be limited to %s chars%s, %s chars " "left." msgstr "" -#: admin/class-metabox.php:283 +#: admin/class-metabox.php:285 msgid "" "If the meta description is empty, the snippet preview above shows what is " "generated based on this sites meta description template." msgstr "" -#: admin/class-metabox.php:291 admin/class-taxonomy.php:95 +#: admin/class-metabox.php:293 admin/class-taxonomy.php:95 msgid "Meta Keywords" msgstr "" -#: admin/class-metabox.php:292 +#: admin/class-metabox.php:294 msgid "" "If you type something above it will override your %smeta keywords template%s." msgstr "" -#: admin/class-metabox.php:323 +#: admin/class-metabox.php:325 msgid "Meta Robots Index" msgstr "" -#: admin/class-metabox.php:326 +#: admin/class-metabox.php:328 msgid "Default for post type, currently: %s" msgstr "" -#: admin/class-metabox.php:334 +#: admin/class-metabox.php:329 +msgid "index" +msgstr "" + +#: admin/class-metabox.php:330 +msgid "noindex" +msgstr "" + +#: admin/class-metabox.php:336 msgid "Meta Robots Follow" msgstr "" -#: admin/class-metabox.php:337 +#: admin/class-metabox.php:339 msgid "Follow" msgstr "" -#: admin/class-metabox.php:338 +#: admin/class-metabox.php:340 msgid "Nofollow" msgstr "" -#: admin/class-metabox.php:345 +#: admin/class-metabox.php:347 msgid "Meta Robots Advanced" msgstr "" -#: admin/class-metabox.php:346 +#: admin/class-metabox.php:348 msgid "Advanced meta robots settings for this page." msgstr "" -#: admin/class-metabox.php:348 +#: admin/class-metabox.php:350 msgid "NO ODP" msgstr "" -#: admin/class-metabox.php:349 +#: admin/class-metabox.php:351 msgid "NO YDIR" msgstr "" -#: admin/class-metabox.php:350 +#: admin/class-metabox.php:352 msgid "No Archive" msgstr "" -#: admin/class-metabox.php:351 +#: admin/class-metabox.php:353 msgid "No Snippet" msgstr "" -#: admin/class-metabox.php:359 +#: admin/class-metabox.php:361 msgid "Breadcrumbs title" msgstr "" -#: admin/class-metabox.php:360 +#: admin/class-metabox.php:362 msgid "Title to use for this page in breadcrumb paths" msgstr "" -#: admin/class-metabox.php:368 +#: admin/class-metabox.php:370 msgid "Include in Sitemap" msgstr "" -#: admin/class-metabox.php:369 +#: admin/class-metabox.php:371 msgid "" "Should this page be in the XML Sitemap at all times, regardless of Robots " "Meta settings?" msgstr "" -#: admin/class-metabox.php:371 admin/class-taxonomy.php:109 +#: admin/class-metabox.php:373 admin/class-metabox.php:406 +#: admin/class-taxonomy.php:109 msgid "Auto detect" msgstr "" -#: admin/class-metabox.php:372 admin/class-taxonomy.php:110 +#: admin/class-metabox.php:374 admin/class-metabox.php:407 +#: admin/class-taxonomy.php:110 msgid "Always include" msgstr "" -#: admin/class-metabox.php:373 admin/class-taxonomy.php:111 +#: admin/class-metabox.php:375 admin/class-metabox.php:408 +#: admin/class-taxonomy.php:111 msgid "Never include" msgstr "" -#: admin/class-metabox.php:380 +#: admin/class-metabox.php:382 msgid "Sitemap Priority" msgstr "" -#: admin/class-metabox.php:381 +#: admin/class-metabox.php:383 msgid "The priority given to this page in the XML sitemap." msgstr "" -#: admin/class-metabox.php:383 +#: admin/class-metabox.php:385 msgid "Automatic prioritization" msgstr "" -#: admin/class-metabox.php:384 +#: admin/class-metabox.php:386 msgid "1 - Highest priority" msgstr "" -#: admin/class-metabox.php:386 +#: admin/class-metabox.php:388 msgid "Default for first tier pages" msgstr "" -#: admin/class-metabox.php:388 +#: admin/class-metabox.php:390 msgid "Default for second tier pages and posts" msgstr "" -#: admin/class-metabox.php:389 +#: admin/class-metabox.php:391 msgid "Medium priority" msgstr "" -#: admin/class-metabox.php:393 +#: admin/class-metabox.php:395 msgid "Lowest priority" msgstr "" -#: admin/class-metabox.php:401 +#: admin/class-metabox.php:403 +msgid "Include in HTML Sitemap" +msgstr "" + +#: admin/class-metabox.php:404 +msgid "" +"Should this page be in the HTML Sitemap at all times, regardless of Robots " +"Meta settings?" +msgstr "" + +#: admin/class-metabox.php:415 msgid "Canonical URL" msgstr "" -#: admin/class-metabox.php:402 +#: admin/class-metabox.php:416 msgid "" "The canonical URL that this page should point to, leave empty to default to " "permalink. %sCross domain canonical%s supported too." msgstr "" -#: admin/class-metabox.php:408 +#: admin/class-metabox.php:422 msgid "301 Redirect" msgstr "" -#: admin/class-metabox.php:409 +#: admin/class-metabox.php:423 msgid "The URL that this page should redirect to." msgstr "" -#: admin/class-metabox.php:435 admin/class-metabox.php:448 -#: admin/pages/dashboard.php:114 admin/pages/metas.php:38 +#: admin/class-metabox.php:449 admin/class-metabox.php:462 +#: admin/pages/dashboard.php:124 admin/pages/metas.php:38 msgid "General" msgstr "" -#: admin/class-metabox.php:437 admin/class-metabox.php:450 +#: admin/class-metabox.php:451 admin/class-metabox.php:464 msgid "Page Analysis" msgstr "" -#: admin/class-metabox.php:440 admin/class-metabox.php:457 +#: admin/class-metabox.php:454 admin/class-metabox.php:471 msgid "Advanced" msgstr "" -#: admin/class-metabox.php:775 -msgid "SEO: No Focus Keyword" -msgstr "" - #: admin/class-metabox.php:776 -msgid "SEO: Bad" +msgid "Your focus keyword was found in:" msgstr "" #: admin/class-metabox.php:777 -msgid "SEO: Poor" +msgid "Article Heading: " msgstr "" #: admin/class-metabox.php:778 -msgid "SEO: OK" +msgid "Page title: " msgstr "" #: admin/class-metabox.php:779 -msgid "SEO: Good" +msgid "Page URL: " msgstr "" #: admin/class-metabox.php:780 +msgid "Content: " +msgstr "" + +#: admin/class-metabox.php:781 +msgid "Meta description: " +msgstr "" + +#: admin/class-metabox.php:797 +msgid "All SEO Scores" +msgstr "" + +#: admin/class-metabox.php:799 +msgid "SEO: No Focus Keyword" +msgstr "" + +#: admin/class-metabox.php:800 +msgid "SEO: Bad" +msgstr "" + +#: admin/class-metabox.php:801 +msgid "SEO: Poor" +msgstr "" + +#: admin/class-metabox.php:802 +msgid "SEO: OK" +msgstr "" + +#: admin/class-metabox.php:803 +msgid "SEO: Good" +msgstr "" + +#: admin/class-metabox.php:804 msgid "SEO: Post Noindexed" msgstr "" -#: admin/class-metabox.php:797 +#: admin/class-metabox.php:821 msgid "Meta Desc." msgstr "" -#: admin/class-metabox.php:797 +#: admin/class-metabox.php:821 msgid "Focus KW" msgstr "" -#: admin/class-metabox.php:821 +#: admin/class-metabox.php:845 msgid "Focus keyword not set." msgstr "" -#: admin/class-metabox.php:1021 +#: admin/class-metabox.php:1055 msgid "" "To update this page analysis, save as draft or update and check this tab " "again" msgstr "" -#: admin/class-metabox.php:1038 +#: admin/class-metabox.php:1072 msgid "" "Your hosting environment does not support PHP's %sDocument Object Model%s." msgstr "" -#: admin/class-metabox.php:1038 +#: admin/class-metabox.php:1072 msgid "" "To enjoy all the benefits of the page analysis feature, you'll need to (get " "your host to) install it." msgstr "" -#: admin/class-metabox.php:1043 +#: admin/class-metabox.php:1077 msgid "" "No focus keyword was set for this %s. If you do not set a focus keyword, no " "score can be calculated." msgstr "" -#: admin/class-metabox.php:1209 +#: admin/class-metabox.php:1084 +msgid "Page Analysis has been disabled." +msgstr "" + +#: admin/class-metabox.php:1262 +msgid "You've never used this focus keyword before, very good." +msgstr "" + +#: admin/class-metabox.php:1264 +msgid "" +"You've used this focus keyword %1$sonce before%2$s, be sure to make very " +"clear which URL on your site is the most important for this keyword." +msgstr "" + +#: admin/class-metabox.php:1266 +msgid "" +"You've used this focus keyword %3$s%4$d times before%2$s, it's probably a " +"good idea to read %1$sthis post on cornerstone content%2$s and improve your " +"keyword strategy." +msgstr "" + +#: admin/class-metabox.php:1278 msgid "" "The keyword for this page contains one or more %sstop words%s, consider " "removing them. Found '%s'." msgstr "" -#: admin/class-metabox.php:1225 +#: admin/class-metabox.php:1294 msgid "The keyword / phrase appears in the URL for this page." msgstr "" -#: admin/class-metabox.php:1226 +#: admin/class-metabox.php:1295 msgid "" "The keyword / phrase does not appear in the URL for this page. If you decide " "to rename the URL be sure to check the old URL 301 redirects to the new one!" msgstr "" -#: admin/class-metabox.php:1227 +#: admin/class-metabox.php:1296 msgid "" "The slug for this page contains one or more stop words, consider removing them." msgstr "" -#: admin/class-metabox.php:1228 +#: admin/class-metabox.php:1297 msgid "The slug for this page is a bit long, consider shortening it." msgstr "" -#: admin/class-metabox.php:1260 +#: admin/class-metabox.php:1329 msgid "Please create a page title." msgstr "" -#: admin/class-metabox.php:1261 +#: admin/class-metabox.php:1330 msgid "" "The page title is more than 40 characters and less than the recommended 70 " "character limit." msgstr "" -#: admin/class-metabox.php:1262 +#: admin/class-metabox.php:1331 msgid "" "The page title contains %d characters, which is less than the recommended " "minimum of 40 characters. Use the space to add keyword variations or create " "compelling call-to-action copy." msgstr "" -#: admin/class-metabox.php:1263 +#: admin/class-metabox.php:1332 msgid "" "The page title contains %d characters, which is more than the viewable limit " "of 70 characters; some words will not be visible to users in your listing." msgstr "" -#: admin/class-metabox.php:1264 +#: admin/class-metabox.php:1333 msgid "The keyword / phrase %s does not appear in the page title." msgstr "" -#: admin/class-metabox.php:1265 +#: admin/class-metabox.php:1334 msgid "" "The page title contains keyword / phrase, at the beginning which is " "considered to improve rankings." msgstr "" -#: admin/class-metabox.php:1266 +#: admin/class-metabox.php:1335 msgid "" "The page title contains keyword / phrase, but it does not appear at the " "beginning; try and move it to the beginning." msgstr "" -#: admin/class-metabox.php:1304 +#: admin/class-metabox.php:1373 msgid "" "No outbound links appear in this page, consider adding some as appropriate." msgstr "" -#: admin/class-metabox.php:1305 +#: admin/class-metabox.php:1374 msgid "" "You're linking to another page with the keyword you want this page to rank " "for, consider changing that if you truly want this page to rank." msgstr "" -#: admin/class-metabox.php:1306 +#: admin/class-metabox.php:1375 msgid "This page has %s outbound link(s)." msgstr "" -#: admin/class-metabox.php:1307 +#: admin/class-metabox.php:1376 msgid "This page has %s outbound link(s), all nofollowed." msgstr "" -#: admin/class-metabox.php:1308 +#: admin/class-metabox.php:1377 msgid "This page has %s nofollowed link(s) and %s normal outbound link(s)." msgstr "" -#: admin/class-metabox.php:1403 +#: admin/class-metabox.php:1472 msgid "No images appear in this page, consider adding some as appropriate." msgstr "" -#: admin/class-metabox.php:1404 +#: admin/class-metabox.php:1473 msgid "The images on this page are missing alt tags." msgstr "" -#: admin/class-metabox.php:1405 +#: admin/class-metabox.php:1474 msgid "" "The images on this page contain alt tags with the target keyword / phrase." msgstr "" -#: admin/class-metabox.php:1406 +#: admin/class-metabox.php:1475 msgid "" "The images on this page do not have alt tags containing your keyword / " "phrase." msgstr "" -#: admin/class-metabox.php:1464 +#: admin/class-metabox.php:1533 msgid "No subheading tags (like an H2) appear in the copy." msgstr "" -#: admin/class-metabox.php:1465 +#: admin/class-metabox.php:1534 msgid "" "Keyword / keyphrase appears in %s (out of %s) subheadings in the copy. While " "not a major ranking factor, this is beneficial." msgstr "" -#: admin/class-metabox.php:1466 +#: admin/class-metabox.php:1535 msgid "" "You have not used your keyword / keyphrase in any subheading (such as an H2) " "in your copy." msgstr "" -#: admin/class-metabox.php:1515 +#: admin/class-metabox.php:1584 msgid "" "In the specified meta description, consider: How does it compare to the " "competition? Could it be made more appealing?" msgstr "" -#: admin/class-metabox.php:1516 +#: admin/class-metabox.php:1585 msgid "" "The meta description is under 120 characters, however up to %s characters " "are available. %s" msgstr "" -#: admin/class-metabox.php:1517 +#: admin/class-metabox.php:1586 msgid "" "The specified meta description is over %s characters, reducing it will " "ensure the entire description is visible. %s" msgstr "" -#: admin/class-metabox.php:1518 +#: admin/class-metabox.php:1587 msgid "" "No meta description has been specified, search engines will display copy " "from the page instead." msgstr "" -#: admin/class-metabox.php:1519 +#: admin/class-metabox.php:1588 msgid "The meta description contains the primary keyword / phrase." msgstr "" -#: admin/class-metabox.php:1520 +#: admin/class-metabox.php:1589 msgid "" "A meta description has been specified, but it does not contain the target " "keyword / phrase." msgstr "" -#: admin/class-metabox.php:1524 +#: admin/class-metabox.php:1593 msgid "" "The available space is shorter than the usual 155 characters because Google " "will also include the publication date in the snippet." msgstr "" -#: admin/class-metabox.php:1563 +#: admin/class-metabox.php:1632 msgid "" "There are %d words contained in the body copy, this is greater than the 300 " "word recommended minimum." msgstr "" -#: admin/class-metabox.php:1564 +#: admin/class-metabox.php:1633 msgid "" "There are %d words contained in the body copy, this is below the 300 word " "recommended minimum. Add more useful content on this topic for readers." msgstr "" -#: admin/class-metabox.php:1565 +#: admin/class-metabox.php:1634 msgid "" "There are %d words contained in the body copy, this is slightly below the " "300 word recommended minimum, add a bit more copy." msgstr "" -#: admin/class-metabox.php:1566 +#: admin/class-metabox.php:1635 msgid "" "There are %d words contained in the body copy. This is far too low and " "should be increased." msgstr "" -#: admin/class-metabox.php:1568 +#: admin/class-metabox.php:1637 msgid "" "The keyword density is %s%%, which is a bit low, the keyword was found %s " "times." msgstr "" -#: admin/class-metabox.php:1569 +#: admin/class-metabox.php:1638 msgid "" "The keyword density is %s%%, which is over the advised 4.5%% maximum, the " "keyword was found %s times." msgstr "" -#: admin/class-metabox.php:1570 +#: admin/class-metabox.php:1639 msgid "" "The keyword density is %s%%, which is great, the keyword was found %s times." msgstr "" -#: admin/class-metabox.php:1572 +#: admin/class-metabox.php:1641 msgid "" "The keyword doesn't appear in the first paragraph of the copy, make sure the " "topic is clear immediately." msgstr "" -#: admin/class-metabox.php:1573 +#: admin/class-metabox.php:1642 msgid "The keyword appears in the first paragraph of the copy." msgstr "" -#: admin/class-metabox.php:1575 +#: admin/class-metabox.php:1644 msgid "Flesch Reading Ease" msgstr "" -#: admin/class-metabox.php:1576 +#: admin/class-metabox.php:1645 msgid "The copy scores %s in the %s test, which is considered %s to read. %s" msgstr "" -#: admin/class-metabox.php:1600 +#: admin/class-metabox.php:1669 msgid "" "Your keyphrase is over 10 words, a keyphrase should be shorter and there can " "be only one keyphrase." msgstr "" -#: admin/class-metabox.php:1636 +#: admin/class-metabox.php:1705 msgid "very easy" msgstr "" -#: admin/class-metabox.php:1639 +#: admin/class-metabox.php:1708 msgid "easy" msgstr "" -#: admin/class-metabox.php:1642 +#: admin/class-metabox.php:1711 msgid "fairly easy" msgstr "" -#: admin/class-metabox.php:1645 +#: admin/class-metabox.php:1714 inc/wpseo-non-ajax-functions.php:193 msgid "OK" msgstr "" -#: admin/class-metabox.php:1648 +#: admin/class-metabox.php:1717 msgid "fairly difficult" msgstr "" -#: admin/class-metabox.php:1649 +#: admin/class-metabox.php:1718 msgid "Try to make shorter sentences to improve readability." msgstr "" -#: admin/class-metabox.php:1652 +#: admin/class-metabox.php:1721 msgid "difficult" msgstr "" -#: admin/class-metabox.php:1653 admin/class-metabox.php:1657 +#: admin/class-metabox.php:1722 admin/class-metabox.php:1726 msgid "" "Try to make shorter sentences, using less difficult words to improve " "readability." msgstr "" -#: admin/class-metabox.php:1656 +#: admin/class-metabox.php:1725 msgid "very difficult" msgstr "" -#: admin/class-opengraph-admin.php:55 +#: admin/class-opengraph-admin.php:57 msgid "Facebook Description" msgstr "" -#: admin/class-opengraph-admin.php:56 +#: admin/class-opengraph-admin.php:58 msgid "" "If you don't want to use the meta description for sharing the post on " "Facebook but want another description there, write it here." msgstr "" -#: admin/class-opengraph-admin.php:63 +#: admin/class-opengraph-admin.php:65 msgid "Google+ Description" msgstr "" -#: admin/class-opengraph-admin.php:64 +#: admin/class-opengraph-admin.php:66 msgid "" "If you don't want to use the meta description for sharing the post on Google" "+ but want another description there, write it here." @@ -733,7 +814,7 @@ msgid "" "Read our article %1$sthe definitive guide to WordPress SEO%2$s." msgstr "" -#: admin/class-pointers.php:82 admin/pages/dashboard.php:132 +#: admin/class-pointers.php:82 admin/pages/dashboard.php:142 msgid "Webmaster Tools" msgstr "" @@ -831,18 +912,18 @@ msgid "Social settings" msgstr "" #: admin/class-pointers.php:109 admin/pages/social.php:138 -msgid "Facebook OpenGraph" +msgid "Facebook Open Graph" msgstr "" #: admin/class-pointers.php:110 msgid "" -"On this page you can enable the OpenGraph functionality from this plugin, as " -"well as assign a Facebook user or Application to be the admin of your site, " -"so you can view the Facebook insights." +"On this page you can enable the Open Graph functionality from this plugin, " +"as well as assign a Facebook user or Application to be the admin of your " +"site, so you can view the Facebook insights." msgstr "" #: admin/class-pointers.php:111 -msgid "Read more about %1$sFacebook OpenGraph%2$s." +msgid "Read more about %1$sFacebook Open Graph%2$s." msgstr "" #: admin/class-pointers.php:112 @@ -953,11 +1034,11 @@ msgid "" "quick introduction of this plugins core functionality." msgstr "" -#: admin/class-pointers.php:170 admin/pages/dashboard.php:117 +#: admin/class-pointers.php:170 admin/pages/dashboard.php:127 msgid "Start Tour" msgstr "" -#: admin/class-pointers.php:184 +#: admin/class-pointers.php:185 msgid "Close" msgstr "" @@ -991,7 +1072,7 @@ msgstr "" msgid "The canonical link is shown on the archive page for this term." msgstr "" -#: admin/class-taxonomy.php:97 admin/pages/metas.php:132 +#: admin/class-taxonomy.php:97 admin/pages/metas.php:133 msgid "Breadcrumbs Title" msgstr "" @@ -1029,86 +1110,86 @@ msgstr "" msgid "General Settings" msgstr "" -#: admin/pages/dashboard.php:42 admin/pages/dashboard.php:95 -#: admin/pages/dashboard.php:104 admin/pages/dashboard.php:110 +#: admin/pages/dashboard.php:52 admin/pages/dashboard.php:105 +#: admin/pages/dashboard.php:114 admin/pages/dashboard.php:120 msgid "Fix it." msgstr "" -#: admin/pages/dashboard.php:43 +#: admin/pages/dashboard.php:53 msgid "" "The following file(s) is/are blocking your XML sitemaps from working " "properly:" msgstr "" -#: admin/pages/dashboard.php:47 +#: admin/pages/dashboard.php:57 msgid "" "Either delete them (this can be done with the \"Fix it\" button) or disable " "WP SEO XML sitemaps." msgstr "" -#: admin/pages/dashboard.php:59 +#: admin/pages/dashboard.php:69 msgid "Backed up the original file header.php to header.php.wpseobak, " msgstr "" -#: admin/pages/dashboard.php:68 -msgid "removed hardcoded meta description." +#: admin/pages/dashboard.php:78 +msgid "Removed hardcoded meta description." msgstr "" -#: admin/pages/dashboard.php:96 +#: admin/pages/dashboard.php:106 msgid "" "Your theme contains a meta description, which blocks WordPress SEO from " "working properly, please delete the following line, or press fix it:" msgstr "" -#: admin/pages/dashboard.php:105 admin/pages/dashboard.php:111 +#: admin/pages/dashboard.php:115 admin/pages/dashboard.php:121 msgid "Ignore." msgstr "" -#: admin/pages/dashboard.php:106 +#: admin/pages/dashboard.php:116 msgid "" "You do not have your postname in the URL of your posts and pages, it is " "highly recommended that you do. Consider setting your permalink structure to " "/%postname%/." msgstr "" -#: admin/pages/dashboard.php:112 +#: admin/pages/dashboard.php:122 msgid "" "Paging comments is enabled, this is not needed in 999 out of 1000 cases, so " "the suggestion is to disable it, to do that, simply uncheck the box before " "\"Break comments into pages...\"" msgstr "" -#: admin/pages/dashboard.php:117 +#: admin/pages/dashboard.php:127 msgid "Introduction Tour:" msgstr "" -#: admin/pages/dashboard.php:118 +#: admin/pages/dashboard.php:128 msgid "Take this tour to quickly learn about the use of this plugin." msgstr "" -#: admin/pages/dashboard.php:121 +#: admin/pages/dashboard.php:131 msgid "Default Settings:" msgstr "" -#: admin/pages/dashboard.php:121 +#: admin/pages/dashboard.php:131 msgid "Reset Default Settings" msgstr "" -#: admin/pages/dashboard.php:122 +#: admin/pages/dashboard.php:132 msgid "" "If you want to restore a site to the default WordPress SEO settings, press " "this button." msgstr "" -#: admin/pages/dashboard.php:124 +#: admin/pages/dashboard.php:134 msgid "Tracking" msgstr "" -#: admin/pages/dashboard.php:125 +#: admin/pages/dashboard.php:135 msgid "Allow tracking of this WordPress installs anonymous data." msgstr "" -#: admin/pages/dashboard.php:126 +#: admin/pages/dashboard.php:136 msgid "" "To maintain a plugin as big as WordPress SEO, we need to know what we're " "dealing: what kinds of other plugins our users are using, what themes, etc. " @@ -1116,39 +1197,75 @@ msgid "" "any user details, so your security and privacy are safe with us." msgstr "" -#: admin/pages/dashboard.php:128 +#: admin/pages/dashboard.php:138 msgid "Security" msgstr "" -#: admin/pages/dashboard.php:129 +#: admin/pages/dashboard.php:139 msgid "Disable the Advanced part of the WordPress SEO meta box" msgstr "" -#: admin/pages/dashboard.php:130 +#: admin/pages/dashboard.php:140 msgid "" "Unchecking this box allows authors and editors to redirect posts, noindex " "them and do other things you might not want if you don't trust your authors." msgstr "" -#: admin/pages/dashboard.php:133 +#: admin/pages/dashboard.php:143 msgid "" "You can use the boxes below to verify with the different Webmaster Tools, if " "your site is already verified, you can just forget about these. Enter the " "verify meta values for:" msgstr "" -#: admin/pages/dashboard.php:134 +#: admin/pages/dashboard.php:144 msgid "Google Webmaster Tools" msgstr "" -#: admin/pages/dashboard.php:135 +#: admin/pages/dashboard.php:145 msgid "Bing Webmaster Tools" msgstr "" -#: admin/pages/dashboard.php:136 +#: admin/pages/dashboard.php:146 msgid "Alexa Verification ID" msgstr "" +#: admin/pages/dashboard.php:166 +msgid "Robots-Meta has been deactivated" +msgstr "" + +#: admin/pages/dashboard.php:200 +msgid "" +"Robots-Meta settings has been imported. We recommend %sdisabling the Robots-" +"Meta plugin%s to avoid any conflicts" +msgstr "" + +#: admin/pages/dashboard.php:206 +msgid "" +"The plugin Robots-Meta has been detected. Do you want to %simport its " +"settings%s." +msgstr "" + +#: admin/pages/dashboard.php:226 +msgid "All-In-One-SEO has been deactivated" +msgstr "" + +#: admin/pages/dashboard.php:242 admin/pages/import.php:207 +msgid "All in One SEO (Old version) data successfully imported." +msgstr "" + +#: admin/pages/dashboard.php:247 +msgid "" +"All in One SEO data successfully imported. Would you like to %sdisable the " +"All in One SEO plugin%s." +msgstr "" + +#: admin/pages/dashboard.php:253 +msgid "" +"The plugin All-In-One-SEO has been detected. Do you want to %simport its " +"settings%s." +msgstr "" + #: admin/pages/files.php:14 msgid "You cannot edit the robots.txt file." msgstr "" @@ -1161,6 +1278,10 @@ msgstr "" msgid "You cannot edit the .htaccess file." msgstr "" +#: admin/pages/files.php:46 +msgid "Edit Files" +msgstr "" + #: admin/pages/files.php:61 msgid "If your robots.txt were writable, you could edit it from here." msgstr "" @@ -1216,10 +1337,6 @@ msgstr "" msgid "All in One SEO data successfully imported." msgstr "" -#: admin/pages/import.php:207 -msgid "All in One SEO (Old version) data successfully imported." -msgstr "" - #: admin/pages/import.php:218 msgid "Robots Meta values imported." msgstr "" @@ -1278,71 +1395,71 @@ msgstr "" msgid "Delete the old data after import? (recommended)" msgstr "" -#: admin/pages/import.php:270 admin/pages/import.php:276 -#: admin/pages/import.php:279 admin/pages/import.php:306 +#: admin/pages/import.php:271 admin/pages/import.php:278 +#: admin/pages/import.php:281 admin/pages/import.php:308 msgid "Import" msgstr "" -#: admin/pages/import.php:272 +#: admin/pages/import.php:273 msgid "Import settings from other plugins" msgstr "" -#: admin/pages/import.php:273 +#: admin/pages/import.php:274 msgid "Import from Robots Meta (by Yoast)?" msgstr "" -#: admin/pages/import.php:274 +#: admin/pages/import.php:275 msgid "Import from RSS Footer (by Yoast)?" msgstr "" -#: admin/pages/import.php:275 +#: admin/pages/import.php:276 msgid "Import from Yoast Breadcrumbs?" msgstr "" -#: admin/pages/import.php:283 +#: admin/pages/import.php:285 msgid "Export" msgstr "" -#: admin/pages/import.php:286 +#: admin/pages/import.php:288 msgid "" "Export your WordPress SEO settings here, to import them again later or to " "import them on another site." msgstr "" -#: admin/pages/import.php:288 +#: admin/pages/import.php:290 msgid "Include Taxonomy Metadata" msgstr "" -#: admin/pages/import.php:289 +#: admin/pages/import.php:291 msgid "Export settings" msgstr "" -#: admin/pages/import.php:308 +#: admin/pages/import.php:310 msgid "Import settings by locating settings.zip and clicking" msgstr "" -#: admin/pages/import.php:308 admin/pages/import.php:313 +#: admin/pages/import.php:310 admin/pages/import.php:315 msgid "Import settings" msgstr "" -#: admin/pages/import.php:335 +#: admin/pages/import.php:337 msgid "Settings successfully imported." msgstr "" -#: admin/pages/import.php:337 admin/pages/import.php:341 -#: admin/pages/import.php:343 +#: admin/pages/import.php:339 admin/pages/import.php:343 +#: admin/pages/import.php:345 msgid "Settings could not be imported:" msgstr "" -#: admin/pages/import.php:337 +#: admin/pages/import.php:339 msgid "Unzipping failed." msgstr "" -#: admin/pages/import.php:343 +#: admin/pages/import.php:345 msgid "Upload failed." msgstr "" -#: admin/pages/import.php:346 +#: admin/pages/import.php:348 msgid "Export & Import SEO Settings" msgstr "" @@ -1517,20 +1634,20 @@ msgid "Homepage" msgstr "" #: admin/pages/metas.php:80 admin/pages/metas.php:106 -#: admin/pages/metas.php:144 admin/pages/metas.php:158 -#: admin/pages/metas.php:167 admin/pages/metas.php:177 -#: admin/pages/metas.php:179 +#: admin/pages/metas.php:145 admin/pages/metas.php:159 +#: admin/pages/metas.php:168 admin/pages/metas.php:178 +#: admin/pages/metas.php:180 msgid "Title template" msgstr "" #: admin/pages/metas.php:81 admin/pages/metas.php:107 -#: admin/pages/metas.php:145 admin/pages/metas.php:159 -#: admin/pages/metas.php:168 +#: admin/pages/metas.php:146 admin/pages/metas.php:160 +#: admin/pages/metas.php:169 msgid "Meta description template" msgstr "" #: admin/pages/metas.php:83 admin/pages/metas.php:109 -#: admin/pages/metas.php:147 admin/pages/metas.php:161 +#: admin/pages/metas.php:148 admin/pages/metas.php:162 msgid "Meta keywords template" msgstr "" @@ -1558,6 +1675,10 @@ msgstr "" msgid "Author highlighting" msgstr "" +#: admin/pages/metas.php:93 +msgid "Don't show" +msgstr "" + #: admin/pages/metas.php:94 msgid "" "Choose the user that should be used for the rel=\"author\" on " @@ -1575,55 +1696,63 @@ msgid "" "on your Google+ page's about page." msgstr "" -#: admin/pages/metas.php:110 admin/pages/metas.php:133 -#: admin/pages/metas.php:148 admin/pages/metas.php:162 -#: admin/pages/metas.php:170 +#: admin/pages/metas.php:110 admin/pages/metas.php:134 +#: admin/pages/metas.php:149 admin/pages/metas.php:163 +#: admin/pages/metas.php:171 msgid "Meta Robots" msgstr "" #: admin/pages/metas.php:111 -msgid "Show date in snippet preview?" +msgid "Don't show rel=\"author\"" msgstr "" #: admin/pages/metas.php:111 +msgid "Authorship" +msgstr "" + +#: admin/pages/metas.php:112 +msgid "Show date in snippet preview?" +msgstr "" + +#: admin/pages/metas.php:112 msgid "Date in Snippet Preview" msgstr "" -#: admin/pages/metas.php:112 admin/pages/metas.php:149 +#: admin/pages/metas.php:113 admin/pages/metas.php:150 msgid "Hide" msgstr "" -#: admin/pages/metas.php:112 admin/pages/metas.php:149 +#: admin/pages/metas.php:113 admin/pages/metas.php:150 msgid "WordPress SEO Meta Box" msgstr "" -#: admin/pages/metas.php:119 +#: admin/pages/metas.php:120 msgid "Custom Post Type Archives" msgstr "" -#: admin/pages/metas.php:120 +#: admin/pages/metas.php:121 msgid "" "Note: instead of templates these are the actual titles and meta descriptions " "for these custom post type archive pages." msgstr "" -#: admin/pages/metas.php:129 +#: admin/pages/metas.php:130 msgid "Title" msgstr "" -#: admin/pages/metas.php:130 +#: admin/pages/metas.php:131 msgid "Meta description" msgstr "" -#: admin/pages/metas.php:157 +#: admin/pages/metas.php:158 msgid "Author Archives" msgstr "" -#: admin/pages/metas.php:163 +#: admin/pages/metas.php:164 msgid "Disable the author archives" msgstr "" -#: admin/pages/metas.php:164 +#: admin/pages/metas.php:165 msgid "" "If you're running a one author blog, the author archive will always look " "exactly the same as your homepage. And even though you may not link to it, " @@ -1631,178 +1760,178 @@ msgid "" "those archives will be 301 redirected to the homepage." msgstr "" -#: admin/pages/metas.php:166 +#: admin/pages/metas.php:167 msgid "Date Archives" msgstr "" -#: admin/pages/metas.php:171 +#: admin/pages/metas.php:172 msgid "Disable the date-based archives" msgstr "" -#: admin/pages/metas.php:172 +#: admin/pages/metas.php:173 msgid "" "For the date based archives, the same applies: they probably look a lot like " "your homepage, and could thus be seen as duplicate content." msgstr "" -#: admin/pages/metas.php:174 +#: admin/pages/metas.php:175 msgid "Special Pages" msgstr "" -#: admin/pages/metas.php:175 +#: admin/pages/metas.php:176 msgid "" "These pages will be noindex, followed by default, so they will never show up " "in search results." msgstr "" -#: admin/pages/metas.php:176 +#: admin/pages/metas.php:177 msgid "Search pages" msgstr "" -#: admin/pages/metas.php:178 +#: admin/pages/metas.php:179 msgid "404 pages" msgstr "" -#: admin/pages/metas.php:186 +#: admin/pages/metas.php:187 msgid "" "These tags can be included in templates and will be replaced by WordPress " "SEO by Yoast when a page is displayed." msgstr "" -#: admin/pages/metas.php:190 +#: admin/pages/metas.php:191 msgid "Replaced with the date of the post/page" msgstr "" -#: admin/pages/metas.php:194 +#: admin/pages/metas.php:195 msgid "Replaced with the title of the post/page" msgstr "" -#: admin/pages/metas.php:198 +#: admin/pages/metas.php:199 msgid "The site's name" msgstr "" -#: admin/pages/metas.php:202 +#: admin/pages/metas.php:203 msgid "The site's tagline / description" msgstr "" -#: admin/pages/metas.php:206 +#: admin/pages/metas.php:207 msgid "" "Replaced with the post/page excerpt (or auto-generated if it does not exist)" msgstr "" -#: admin/pages/metas.php:210 +#: admin/pages/metas.php:211 msgid "Replaced with the post/page excerpt (without auto-generation)" msgstr "" -#: admin/pages/metas.php:214 +#: admin/pages/metas.php:215 msgid "Replaced with the current tag/tags" msgstr "" -#: admin/pages/metas.php:218 +#: admin/pages/metas.php:219 msgid "Replaced with the post categories (comma separated)" msgstr "" -#: admin/pages/metas.php:222 +#: admin/pages/metas.php:223 msgid "Replaced with the category description" msgstr "" -#: admin/pages/metas.php:226 +#: admin/pages/metas.php:227 msgid "Replaced with the tag description" msgstr "" -#: admin/pages/metas.php:230 +#: admin/pages/metas.php:231 msgid "Replaced with the term description" msgstr "" -#: admin/pages/metas.php:234 +#: admin/pages/metas.php:235 msgid "Replaced with the term name" msgstr "" -#: admin/pages/metas.php:238 +#: admin/pages/metas.php:239 msgid "Replaced with the post type single label" msgstr "" -#: admin/pages/metas.php:242 +#: admin/pages/metas.php:243 msgid "Replaced with the post type plural label" msgstr "" -#: admin/pages/metas.php:246 +#: admin/pages/metas.php:247 msgid "Replaced with the post/page modified time" msgstr "" -#: admin/pages/metas.php:250 +#: admin/pages/metas.php:251 msgid "Replaced with the post/page ID" msgstr "" -#: admin/pages/metas.php:254 +#: admin/pages/metas.php:255 msgid "Replaced with the post/page author's 'nicename'" msgstr "" -#: admin/pages/metas.php:258 +#: admin/pages/metas.php:259 msgid "Replaced with the post/page author's userid" msgstr "" -#: admin/pages/metas.php:262 +#: admin/pages/metas.php:263 msgid "Replaced with the current search phrase" msgstr "" -#: admin/pages/metas.php:266 +#: admin/pages/metas.php:267 msgid "Replaced with the current time" msgstr "" -#: admin/pages/metas.php:270 +#: admin/pages/metas.php:271 msgid "Replaced with the current date" msgstr "" -#: admin/pages/metas.php:274 +#: admin/pages/metas.php:275 msgid "Replaced with the current day" msgstr "" -#: admin/pages/metas.php:278 +#: admin/pages/metas.php:279 msgid "Replaced with the current month" msgstr "" -#: admin/pages/metas.php:282 +#: admin/pages/metas.php:283 msgid "Replaced with the current year" msgstr "" -#: admin/pages/metas.php:286 +#: admin/pages/metas.php:287 msgid "Replaced with the current page number (i.e. page 2 of 4)" msgstr "" -#: admin/pages/metas.php:290 +#: admin/pages/metas.php:291 msgid "Replaced with the current page total" msgstr "" -#: admin/pages/metas.php:294 +#: admin/pages/metas.php:295 msgid "Replaced with the current page number" msgstr "" -#: admin/pages/metas.php:298 +#: admin/pages/metas.php:299 msgid "Attachment caption" msgstr "" -#: admin/pages/metas.php:302 +#: admin/pages/metas.php:303 msgid "Replaced with the posts focus keyword" msgstr "" -#: admin/pages/metas.php:306 +#: admin/pages/metas.php:307 msgid "Replaced with a posts custom field value" msgstr "" -#: admin/pages/metas.php:310 +#: admin/pages/metas.php:311 msgid "Replaced with a posts custom taxonomies, comma separated." msgstr "" -#: admin/pages/metas.php:314 +#: admin/pages/metas.php:315 msgid "Replaced with a custom taxonomoies description" msgstr "" -#: admin/pages/metas.php:318 +#: admin/pages/metas.php:319 msgid "The separator defined in your theme's wp_title() tag." msgstr "" -#: admin/pages/metas.php:322 +#: admin/pages/metas.php:323 msgid "Variables" msgstr "" @@ -2090,56 +2219,60 @@ msgid "Clear all Facebook Data" msgstr "" #: admin/pages/social.php:139 -msgid "Add OpenGraph meta data" +msgid "Add Open Graph meta data" msgstr "" #: admin/pages/social.php:140 msgid "" -"Add OpenGraph meta data to your site's <head> section. " +"Add Open Graph meta data to your site's <head> section. " "You can specify some of the ID's that are sometimes needed below:" msgstr "" #: admin/pages/social.php:142 +msgid "Facebook Page URL" +msgstr "" + +#: admin/pages/social.php:143 msgid "Frontpage settings" msgstr "" -#: admin/pages/social.php:143 admin/pages/social.php:147 +#: admin/pages/social.php:144 admin/pages/social.php:148 msgid "Image URL" msgstr "" -#: admin/pages/social.php:144 +#: admin/pages/social.php:145 msgid "Description" msgstr "" -#: admin/pages/social.php:145 +#: admin/pages/social.php:146 msgid "" -"These are the image and description used in the OpenGraph meta tags on the " +"These are the image and description used in the Open Graph meta tags on the " "frontpage of your site." msgstr "" -#: admin/pages/social.php:146 +#: admin/pages/social.php:147 msgid "Default settings" msgstr "" -#: admin/pages/social.php:148 +#: admin/pages/social.php:149 msgid "" "This image is used if the post/page being shared does not contain any images." msgstr "" -#: admin/pages/social.php:150 +#: admin/pages/social.php:153 msgid "Twitter" msgstr "" -#: admin/pages/social.php:151 +#: admin/pages/social.php:154 msgid "Add Twitter card meta data" msgstr "" -#: admin/pages/social.php:152 +#: admin/pages/social.php:155 msgid "" "Add Twitter card meta data to your site's <head> section." msgstr "" -#: admin/pages/social.php:153 +#: admin/pages/social.php:156 msgid "Site Twitter Username" msgstr "" @@ -2193,32 +2326,32 @@ msgid "" "NOT want to include in your sitemap:" msgstr "" -#: admin/pages/xml-sitemaps.php:44 +#: admin/pages/xml-sitemaps.php:46 msgid "Exclude taxonomies" msgstr "" -#: admin/pages/xml-sitemaps.php:45 +#: admin/pages/xml-sitemaps.php:47 msgid "" "Please check the appropriate box below if there's a taxonomy that you do " "NOT want to include in your sitemap:" msgstr "" -#: admin/pages/xml-sitemaps.php:52 +#: admin/pages/xml-sitemaps.php:56 msgid "Entries per page" msgstr "" -#: admin/pages/xml-sitemaps.php:53 +#: admin/pages/xml-sitemaps.php:57 msgid "" "Please enter the maximum number of entries per sitemap page (defaults to " "1000, you might want to lower this to prevent memory issues on some " "installs):" msgstr "" -#: admin/pages/xml-sitemaps.php:54 +#: admin/pages/xml-sitemaps.php:58 msgid "Max entries per sitemap page" msgstr "" -#: admin/pages/xml-sitemaps.php:59 +#: admin/pages/xml-sitemaps.php:63 msgid "XML Sitemap" msgstr "" @@ -2234,24 +2367,24 @@ msgstr "" msgid "Error 404: Page not found" msgstr "" -#: frontend/class-frontend.php:317 +#: frontend/class-frontend.php:333 msgid "Search for \"%s\"" msgstr "" -#: frontend/class-frontend.php:355 frontend/class-frontend.php:357 -#: frontend/class-frontend.php:359 inc/wpseo-non-ajax-functions.php:69 +#: frontend/class-frontend.php:371 frontend/class-frontend.php:373 +#: frontend/class-frontend.php:375 inc/wpseo-non-ajax-functions.php:71 msgid "%s Archives" msgstr "" -#: frontend/class-frontend.php:361 +#: frontend/class-frontend.php:377 inc/wpseo-non-ajax-functions.php:480 msgid "Archives" msgstr "" -#: frontend/class-frontend.php:367 +#: frontend/class-frontend.php:383 msgid "Page not found" msgstr "" -#: frontend/class-frontend.php:875 +#: frontend/class-frontend.php:887 msgid "" "Admin only notice: this page doesn't show a meta description because it " "doesn't have one, either write it for this page specifically or go into the " @@ -2262,70 +2395,98 @@ msgstr "" msgid "Page %d of %d" msgstr "" -#: inc/wpseo-non-ajax-functions.php:56 +#: inc/wpseo-non-ajax-functions.php:58 msgid "%s, Author at %s" msgstr "" -#: inc/wpseo-non-ajax-functions.php:58 +#: inc/wpseo-non-ajax-functions.php:60 msgid "You searched for %s" msgstr "" -#: inc/wpseo-non-ajax-functions.php:59 +#: inc/wpseo-non-ajax-functions.php:61 msgid "Page Not Found" msgstr "" -#: inc/wpseo-non-ajax-functions.php:66 +#: inc/wpseo-non-ajax-functions.php:68 msgid "%s Archive" msgstr "" -#: inc/wpseo-non-ajax-functions.php:91 +#: inc/wpseo-non-ajax-functions.php:93 msgid "The post %s appeared first on %s." msgstr "" -#: inc/wpseo-non-ajax-functions.php:234 +#: inc/wpseo-non-ajax-functions.php:183 +msgid "N/A" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:188 +msgid "Poor" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:199 +msgid "Good" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:203 +msgid "Bad" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:248 msgid "Keyword Research" msgstr "" -#: inc/wpseo-non-ajax-functions.php:235 +#: inc/wpseo-non-ajax-functions.php:249 msgid "AdWords External" msgstr "" -#: inc/wpseo-non-ajax-functions.php:236 +#: inc/wpseo-non-ajax-functions.php:250 msgid "Google Insights" msgstr "" -#: inc/wpseo-non-ajax-functions.php:237 +#: inc/wpseo-non-ajax-functions.php:251 msgid "SEO Book" msgstr "" -#: inc/wpseo-non-ajax-functions.php:240 +#: inc/wpseo-non-ajax-functions.php:254 msgid "Analyze this page" msgstr "" -#: inc/wpseo-non-ajax-functions.php:241 +#: inc/wpseo-non-ajax-functions.php:255 msgid "Check Inlinks (OSE)" msgstr "" -#: inc/wpseo-non-ajax-functions.php:242 +#: inc/wpseo-non-ajax-functions.php:256 msgid "Check Keyword Density" msgstr "" -#: inc/wpseo-non-ajax-functions.php:243 +#: inc/wpseo-non-ajax-functions.php:257 msgid "Check Google Cache" msgstr "" -#: inc/wpseo-non-ajax-functions.php:244 +#: inc/wpseo-non-ajax-functions.php:258 msgid "Check Headers" msgstr "" -#: inc/wpseo-non-ajax-functions.php:267 +#: inc/wpseo-non-ajax-functions.php:281 msgid "SEO Settings" msgstr "" -#: inc/wpseo-non-ajax-functions.php:268 +#: inc/wpseo-non-ajax-functions.php:282 msgid "Titles & Metas" msgstr "" +#: inc/wpseo-non-ajax-functions.php:369 +msgid "Authors" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:383 +msgid "Pages" +msgstr "" + +#: inc/wpseo-non-ajax-functions.php:399 +msgid "Posts" +msgstr "" + #: wp-seo.php:51 msgid "" "WordPress SEO requires PHP 5.2 or higher, as does WordPress 3.2 and higher. " diff --git a/wp-content/plugins/wordpress-seo/phpunit.xml b/wp-content/plugins/wordpress-seo/phpunit.xml new file mode 100644 index 0000000..44f0fdb --- /dev/null +++ b/wp-content/plugins/wordpress-seo/phpunit.xml @@ -0,0 +1,14 @@ + + + + ./tests/ + + + diff --git a/wp-content/plugins/wordpress-seo/readme.txt b/wp-content/plugins/wordpress-seo/readme.txt index a3b6963..df553f9 100644 --- a/wp-content/plugins/wordpress-seo/readme.txt +++ b/wp-content/plugins/wordpress-seo/readme.txt @@ -5,8 +5,8 @@ License: GPLv3 License URI: http://www.gnu.org/licenses/gpl.html Tags: seo, SEO, google, meta, meta description, search engine optimization, xml sitemap, xml sitemaps, google sitemap, sitemap, sitemaps, robots meta, rss, rss footer, yahoo, bing, news sitemaps, XML News Sitemaps, WordPress SEO, WordPress SEO by Yoast, yoast, multisite, canonical, nofollow, noindex, keywords, meta keywords, description, webmaster tools, google webmaster tools, seo pack Requires at least: 3.3 -Tested up to: 3.5 -Stable tag: 1.4.7 +Tested up to: 3.6 +Stable tag: 1.4.11 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using the WordPress SEO plugin by Yoast. @@ -89,45 +89,7 @@ For more info, check out the following articles: == Frequently Asked Questions == -= The SEO title output for the plugin doesn't work as expected = - -You've set up a template for your titles, but things get added to it when they're output? You can do two things: either enable "Force rewrite titles" on the SEO -> Titles settings page, or go into your header.php and change the title element to just this: - -`<?php wp_title(''); ?>` - -= I'm not seeing a meta description in my `` section? = - -Check whether your theme's `header.php` file contains a call to [wp_head()](http://codex.wordpress.org/Function_Reference/wp_head). - -= My meta descriptions aren't showing up in the search result pages = - -There are two possible issues with a meta description: - -1. You're putting out more than one of them due to multiple plugins adding a description, for instance the WordBooker plugin adds a description too but has an option to disable it, other SEO plugins running might be another cause. -1. You're not seeing your meta description show up in the search result pages. Google will not alway show your meta description, the likelihood of your meta description appearing in the search results increases incredibly when your meta description contains the sought for keyword though, which is why the focus keyword functionality checks for the appearance of the focus keyword in the description. - -= Page X, Y, Z for plugin X doesn't work with your plugin enabled = - -Disable the clean permalinks feature on the SEO -> Permalinks settings page. - -= Does your plugin allow for Google News Sitemaps too? = - -It does! You'll need an add-on module for that though, which you can download from the [News SEO](http://yoast.com/wordpress/seo/news-seo/) module homepage! - -= Why is WordPress SEO better than All In One SEO Pack? = - -It's not a secret that the author of this plugin, Joost de Valk, aka Yoast, doesn't really like All In One SEO Pack. The main reason is that All in One SEO pack has a default option for auto generating meta descriptions that is actually making it harder for people to rank well in a lot of cases, giving them a false sense of security. - -Once you'll start using this plugin, you won't ask that question anymore, you'll just ask yourself "why does anyone still use All In One SEO"? There's several things this plugin does better: it has a snippet preview in the write post screen that'll help you optimize your titles, meta descriptions and copy instantly while working on your posts and pages. - -Also, other than All In One SEO Pack, this plugin has a completely working canonical implementation for all pages within your site, whereas the one in All In One SEO pack is broken, it was originally written by the author of this plugin, so he knows. It comes with XML Sitemaps, an XML News sitemap module, loads and loads of robots meta options and other options to improve your SEO. - -= I want to use your XML Sitemaps with NGINX, is that possible? = - -Yes, of course! Here are the rewrite rules you'll need: - -`rewrite ^/sitemap_index\.xml$ /index.php?sitemap=1 last; -rewrite ^/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 last;` +You'll find the [FAQ on Yoast.com](http://yoast.com/wordpress/seo/faq/). == Screenshots == @@ -141,6 +103,61 @@ rewrite ^/([^/]+?)-sitemap([0-9]+)?\.xml$ /index.php?sitemap=$1&sitemap_n=$2 las == Changelog == += 1.4.11 = + +* i18n + * Updated de_DE, ru_RU, zh_CN. +* Bugfixes + * Make rel="publisher" markup appear on every page. + * Prevent empty property='article:publisher' markup from being output . + * Fixed twitter:description tag should only appears if OpenGraph is inactive. + * og:description will default to get_the_excerpt when meta description is blank (similar to how twitter:description works). + * Fixes only 25 tags (and other taxonomy) are being indexed in taxonomy sitemaps. + * Fix lastmod dates for taxonomies in XML sitemap index file. +* Enhancements + * Changed Social Admin section to have a tab-layout. + * Moved Google+ section from Homepage tab of Titles & Metas to Social tab. + * Make twitter:domain use WordPress site name instead of domainname. + * Added more output filters in the Twitter class. + += 1.4.10 = + +* Fixes + * Caching was disabled in certain cases, this update fixes that. +* Enhancements + * Added option to disable author sitemap. + * If author pages are disabled, author sitemaps are now automatically disabled. + += 1.4.9 = + +* i18n + * Updated .pot file + * Updated ar, da_DK, de_DE, el_GR, es_ES, fa_IR, fr_FR, he_IL, id_ID, nl_NL, ro_RO, sv_SE & tr_TK + * Added hr & sl_SI + * Many localization fixes +* Bugfixes + * Fixed sitemap "loc" element to have encoded entities. + * Honor the language setting if other plugins set the language. + * sitemap.xml will now redirect to sitemap_index.xml if it doesn't exist statically. + * Added filters 'wpseo_sitemap_exclude_post_type' and 'wpseo_sitemap_exclude_taxonomy' to allow themes/plugins to exclude entries in the XML sitemap. + * Added RTL support, some CSS fixes. + * Focus word gets counted in meta description when defined by a template. + * Fixed some bugs with the focus keyword in the first paragraph test. + * Fixed display bug in SEO Title column when defined by a template ('Page # of #'). + * Fixed a few strict notices that would pop up in WP 3.6. + * Prevent other plugins from overriding the WP SEO menu position. + * Enabled the advanced tab for site-admins on a multi-site install. + * Fixed post save error when page analysis is disabled. + * OpenGraph frontpage og:description and og:image tags now properly added to the frontpage. +* Enhancements + * Added an HTML sitemap shortcode [wpseo_sitemap]. + * Added an XML sitemap listing the author profile URLs. + * Added detection of Yoast's robots meta plugin and All In One SEO plugins, plugin now gives a notice to import settings and disable those plugins. + * Prevent empty image tags in Twitter Cards - props [Mike Bijon](https://github.com/mbijon). + * Add new `twitter:domain` tag - props [Mike Bijon](https://github.com/mbijon). + * Add support for Facebooks new OG tags for media publishers. + * Allow authorship to be removed per post type. + = 1.4.7 = * Properly fix security bug that should've been fixed in 1.4.5. diff --git a/wp-content/plugins/wordpress-seo/tests/bootstrap.php b/wp-content/plugins/wordpress-seo/tests/bootstrap.php new file mode 100644 index 0000000..b077e26 --- /dev/null +++ b/wp-content/plugins/wordpress-seo/tests/bootstrap.php @@ -0,0 +1,22 @@ +assertTrue( true ); // Yay, your unit tests are running! + } +} diff --git a/wp-content/plugins/wordpress-seo/wp-seo.php b/wp-content/plugins/wordpress-seo/wp-seo.php index d3048fb..10cc61c 100644 --- a/wp-content/plugins/wordpress-seo/wp-seo.php +++ b/wp-content/plugins/wordpress-seo/wp-seo.php @@ -1,7 +1,7 @@
    - +
    diff --git a/wp-content/themes/studio13/header.php b/wp-content/themes/studio13/header.php index ac5d3dd..cf66afd 100644 --- a/wp-content/themes/studio13/header.php +++ b/wp-content/themes/studio13/header.php @@ -21,8 +21,8 @@ - - + + diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php index c442050..491d775 100644 --- a/wp-includes/class-feed.php +++ b/wp-includes/class-feed.php @@ -66,7 +66,11 @@ class WP_SimplePie_File extends SimplePie_File { $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE; if ( preg_match('/^http(s)?:\/\//i', $url) ) { - $args = array( 'timeout' => $this->timeout, 'redirection' => $this->redirects); + $args = array( + 'timeout' => $this->timeout, + 'redirection' => $this->redirects, + 'reject_unsafe_urls' => true, + ); if ( !empty($this->headers) ) $args['headers'] = $this->headers; @@ -85,10 +89,8 @@ class WP_SimplePie_File extends SimplePie_File { $this->status_code = wp_remote_retrieve_response_code( $res ); } } else { - if ( ! file_exists($url) || ( ! $this->body = file_get_contents($url) ) ) { - $this->error = 'file_get_contents could not read the file'; - $this->success = false; - } + $this->error = ''; + $this->success = false; } } } diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index 3f396a6..0358932 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -86,7 +86,8 @@ class WP_Http { 'timeout' => apply_filters( 'http_request_timeout', 5), 'redirection' => apply_filters( 'http_request_redirection_count', 5), 'httpversion' => apply_filters( 'http_request_version', '1.0'), - 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ), + 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ), + 'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ), 'blocking' => true, 'headers' => array(), 'cookies' => array(), @@ -108,15 +109,21 @@ class WP_Http { $r = wp_parse_args( $args, $defaults ); $r = apply_filters( 'http_request_args', $r, $url ); - // Certain classes decrement this, store a copy of the original value for loop purposes. - $r['_redirection'] = $r['redirection']; + // The transports decrement this, store a copy of the original value for loop purposes. + if ( ! isset( $r['_redirection'] ) ) + $r['_redirection'] = $r['redirection']; // Allow plugins to short-circuit the request $pre = apply_filters( 'pre_http_request', false, $r, $url ); if ( false !== $pre ) return $pre; - $arrURL = parse_url( $url ); + if ( $r['reject_unsafe_urls'] ) + $url = wp_http_validate_url( $url ); + if ( function_exists( 'wp_kses_bad_protocol' ) ) + $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) ); + + $arrURL = @parse_url( $url ); if ( empty( $url ) || empty( $arrURL['scheme'] ) ) return new WP_Error('http_request_failed', __('A valid URL was not provided.')); @@ -777,7 +784,7 @@ class WP_Http_Fsockopen { // If location is found, then assume redirect and redirect to location. if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) { if ( $r['redirection']-- > 0 ) { - return $this->request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r); + return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r); } else { return new WP_Error('http_request_failed', __('Too many redirects.')); } @@ -887,7 +894,8 @@ class WP_Http_Streams { array( 'method' => strtoupper($r['method']), 'user_agent' => $r['user-agent'], - 'max_redirects' => $r['redirection'] + 1, // See #11557 + 'max_redirects' => 0, // Follow no redirects + 'follow_redirects' => false, 'protocol_version' => (float) $r['httpversion'], 'header' => $strHeaders, 'ignore_errors' => true, // Return non-200 requests. @@ -960,10 +968,13 @@ class WP_Http_Streams { else $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']); - // Streams does not provide an error code which we can use to see why the request stream stopped. - // We can however test to see if a location header is present and return based on that. - if ( isset($processedHeaders['headers']['location']) && 0 !== $args['_redirection'] ) - return new WP_Error('http_request_failed', __('Too many redirects.')); + if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections + if ( $r['redirection']-- > 0 ) { + return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r ); + } else { + return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); + } + } if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) $strResponse = WP_Http::chunkTransferDecode($strResponse); @@ -1088,6 +1099,8 @@ class WP_Http_Curl { // The option doesn't work with safe mode or when open_basedir is set, and there's a // bug #17490 with redirected POST requests, so handle redirections outside Curl. curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false ); + if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4 + curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS ); switch ( $r['method'] ) { case 'HEAD': @@ -1178,7 +1191,7 @@ class WP_Http_Curl { // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually. if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections if ( $r['redirection']-- > 0 ) { - return $this->request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r ); + return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r ); } else { return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); } diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 46d5f62..5ff2a2e 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -108,7 +108,7 @@ class WP_oEmbed { $providers = array(); // Fetch URL content - if ( $html = wp_remote_retrieve_body( wp_remote_get( $url ) ) ) { + if ( $html = wp_remote_retrieve_body( wp_remote_get( $url, array( 'reject_unsafe_urls' => true ) ) ) ) { // types that contain oEmbed provider URLs $linktypes = apply_filters( 'oembed_linktypes', array( @@ -190,7 +190,7 @@ class WP_oEmbed { */ function _fetch_with_format( $provider_url_with_args, $format ) { $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args ); - $response = wp_remote_get( $provider_url_with_args ); + $response = wp_remote_get( $provider_url_with_args, array( 'reject_unsafe_urls' => true ) ); if ( 501 == wp_remote_retrieve_response_code( $response ) ) return new WP_Error( 'not-implemented' ); if ( ! $body = wp_remote_retrieve_body( $response ) ) @@ -219,35 +219,24 @@ class WP_oEmbed { if ( !function_exists('simplexml_load_string') ) { return false; } - - if ( ! class_exists( 'DOMDocument' ) ) + if ( ! function_exists( 'libxml_disable_entity_loader' ) ) return false; + $loader = libxml_disable_entity_loader( true ); + $errors = libxml_use_internal_errors( true ); - $old_value = null; - if ( function_exists( 'libxml_disable_entity_loader' ) ) { - $old_value = libxml_disable_entity_loader( true ); - } - - $dom = new DOMDocument; - $success = $dom->loadXML( $response_body ); - - if ( ! is_null( $old_value ) ) { - libxml_disable_entity_loader( $old_value ); - } + $data = simplexml_load_string( $response_body ); libxml_use_internal_errors( $errors ); - if ( ! $success || isset( $dom->doctype ) ) { - return false; + $return = false; + if ( is_object( $data ) ) { + $return = new stdClass; + foreach ( $data as $key => $value ) { + $return->$key = (string) $value; + } } - $data = simplexml_import_dom( $dom ); - if ( ! is_object( $data ) ) - return false; - - $return = new stdClass; - foreach ( $data as $key => $value ) - $return->$key = (string) $value; + libxml_disable_entity_loader( $loader ); return $return; } diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php index dcdf380..2fed5d7 100644 --- a/wp-includes/class-phpass.php +++ b/wp-includes/class-phpass.php @@ -253,7 +253,7 @@ class PasswordHash { if ($hash[0] == '*') $hash = crypt($password, $stored_hash); - return $hash == $stored_hash; + return $hash === $stored_hash; } } diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index f8ee5e2..1483da2 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -354,7 +354,9 @@ class WP_Admin_Bar { $this->_render_group( $group ); } ?>
    + +
    10, 'redirection' => 0 ) ) ); + $linea = wp_remote_retrieve_body( wp_remote_get( $pagelinkedfrom, array( 'timeout' => 10, 'redirection' => 0, 'reject_unsafe_urls' => true ) ) ); + if ( !$linea ) return $this->pingback_error( 16, __( 'The source URL does not exist.' ) ); diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 0328622..5476b93 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -1661,7 +1661,7 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) { if ( 0 === strpos($url, $uploads_dir['baseurl']) ) return false; - $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) ); + $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; @@ -1674,7 +1674,7 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) { return false; // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file) - $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) ); + $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; @@ -1908,6 +1908,7 @@ function trackback($trackback_url, $title, $excerpt, $ID) { $options = array(); $options['timeout'] = 4; + $options['reject_unsafe_urls'] = true; $options['body'] = array( 'title' => $title, 'url' => get_permalink($ID), @@ -1955,62 +1956,13 @@ function weblog_ping($server = '', $path = '') { * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI * * @since 3.5.1 + * @see wp_http_validate_url() * * @param string $source_uri * @return string */ function pingback_ping_source_uri( $source_uri ) { - $uri = esc_url_raw( $source_uri, array( 'http', 'https' ) ); - if ( ! $uri ) - return ''; - - $parsed_url = @parse_url( $uri ); - if ( ! $parsed_url ) - return ''; - - if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) - return ''; - - if ( false !== strpos( $parsed_url['host'], ':' ) ) - return ''; - - $parsed_home = @parse_url( get_option( 'home' ) ); - - $same_host = strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ); - - if ( ! $same_host ) { - $host = trim( $parsed_url['host'], '.' ); - if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) { - $ip = $host; - } else { - $ip = gethostbyname( $host ); - if ( $ip === $host ) // Error condition for gethostbyname() - $ip = false; - } - if ( $ip ) { - if ( '127.0.0.1' === $ip ) - return ''; - $parts = array_map( 'intval', explode( '.', $ip ) ); - if ( 10 === $parts[0] ) - return ''; - if ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] ) - return ''; - if ( 192 === $parts[0] && 168 === $parts[1] ) - return ''; - } - } - - if ( empty( $parsed_url['port'] ) ) - return $uri; - - $port = $parsed_url['port']; - if ( 80 === $port || 443 === $port || 8080 === $port ) - return $uri; - - if ( $parsed_home && $same_host && $parsed_home['port'] === $port ) - return $uri; - - return ''; + return (string) wp_http_validate_url( $source_uri ); } /** diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index c8fdf4f..655316a 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -3298,7 +3298,7 @@ function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $de */ function wp_get_single_post( $postid = 0, $mode = OBJECT ) { _deprecated_function( __FUNCTION__, '3.5', 'get_post()' ); - return get_post( $postid, $mode, 'edit' ); + return get_post( $postid, $mode ); } /** diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 05d7227..a4e429a 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -2601,10 +2601,11 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) { if ( ! is_array( $protocols ) ) $protocols = wp_allowed_protocols(); - if ( wp_kses_bad_protocol( $url, $protocols ) != $url ) + $good_protocol_url = wp_kses_bad_protocol( $url, $protocols ); + if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) return ''; - return apply_filters('clean_url', $url, $original_url, $_context); + return apply_filters('clean_url', $good_protocol_url, $original_url, $_context); } /** @@ -2869,7 +2870,7 @@ function sanitize_option($option, $value) { case 'illegal_names': if ( ! is_array( $value ) ) - $value = explode( "\n", $value ); + $value = explode( ' ', $value ); $value = array_values( array_filter( array_map( 'trim', $value ) ) ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index f4b4634..e30a014 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -496,6 +496,7 @@ function wp_get_http( $url, $file_path = false, $red = 1 ) { $options = array(); $options['redirection'] = 5; + $options['reject_unsafe_urls'] = true; if ( false == $file_path ) $options['method'] = 'HEAD'; @@ -543,7 +544,7 @@ function wp_get_http_headers( $url, $deprecated = false ) { if ( !empty( $deprecated ) ) _deprecated_argument( __FUNCTION__, '2.7' ); - $response = wp_remote_head( $url ); + $response = wp_remote_head( $url, array( 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; @@ -655,10 +656,10 @@ function add_query_arg() { else $frag = ''; - if ( 0 === stripos( 'http://', $uri ) ) { + if ( 0 === stripos( $uri, 'http://' ) ) { $protocol = 'http://'; $uri = substr( $uri, 7 ); - } elseif ( 0 === stripos( 'https://', $uri ) ) { + } elseif ( 0 === stripos( $uri, 'https://' ) ) { $protocol = 'https://'; $uri = substr( $uri, 8 ); } else { @@ -758,6 +759,7 @@ function wp_remote_fopen( $uri ) { $options = array(); $options['timeout'] = 10; + $options['reject_unsafe_urls'] = true; $response = wp_remote_get( $uri, $options ); @@ -2954,9 +2956,15 @@ function _doing_it_wrong( $function, $message, $version ) { // Allow plugin to filter the output error trigger if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) { - $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version ); - $message .= ' ' . __( 'Please see Debugging in WordPress for more information.' ); - trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ) ); + if ( function_exists( '__' ) ) { + $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version ); + $message .= ' ' . __( 'Please see Debugging in WordPress for more information.' ); + trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ) ); + } else { + $version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version ); + $message .= ' Please see Debugging in WordPress for more information.'; + trigger_error( sprintf( '%1$s was called incorrectly. %2$s %3$s', $function, $message, $version ) ); + } } } diff --git a/wp-includes/http.php b/wp-includes/http.php index 56e4f9f..a196f68 100644 --- a/wp-includes/http.php +++ b/wp-includes/http.php @@ -311,3 +311,64 @@ function send_origin_headers() { return false; } + +/** + * Validate a URL for safe use in the HTTP API. + * + * @since 3.5.2 + * + * @return mixed URL or false on failure. + */ +function wp_http_validate_url( $url ) { + $url = esc_url_raw( $url, array( 'http', 'https' ) ); + if ( ! $url ) + return false; + + $parsed_url = @parse_url( $url ); + if ( ! $parsed_url ) + return false; + + if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) + return false; + + if ( false !== strpos( $parsed_url['host'], ':' ) ) + return false; + + $parsed_home = @parse_url( get_option( 'home' ) ); + + $same_host = strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ); + + if ( ! $same_host ) { + $host = trim( $parsed_url['host'], '.' ); + if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) { + $ip = $host; + } else { + $ip = gethostbyname( $host ); + if ( $ip === $host ) // Error condition for gethostbyname() + $ip = false; + } + if ( $ip ) { + if ( '127.0.0.1' === $ip ) + return false; + $parts = array_map( 'intval', explode( '.', $ip ) ); + if ( 10 === $parts[0] ) + return false; + if ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] ) + return false; + if ( 192 === $parts[0] && 168 === $parts[1] ) + return false; + } + } + + if ( empty( $parsed_url['port'] ) ) + return $url; + + $port = $parsed_url['port']; + if ( 80 === $port || 443 === $port || 8080 === $port ) + return $url; + + if ( $parsed_home && $same_host && $parsed_home['port'] === $port ) + return $url; + + return false; +} diff --git a/wp-includes/js/media-editor.js b/wp-includes/js/media-editor.js index 15eff8d..5a77d50 100644 --- a/wp-includes/js/media-editor.js +++ b/wp-includes/js/media-editor.js @@ -170,6 +170,7 @@ icontag: 'dt', captiontag: 'dd', columns: '3', + link: 'post', size: 'thumbnail', orderby: 'menu_order ID' }, diff --git a/wp-includes/js/media-editor.min.js b/wp-includes/js/media-editor.min.js index 0e280c7..2f2d4f1 100644 --- a/wp-includes/js/media-editor.min.js +++ b/wp-includes/js/media-editor.min.js @@ -1 +1 @@ -(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{e=wp.media.string.link(f);d.post_title=f.title}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!=="undefined"){c=tinymce.get(e);if(tinymce.isIE&&c&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on("click",".insert-media",function(d){var e=b(this),c=e.data("editor");d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery)); \ No newline at end of file +(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{e=wp.media.string.link(f);d.post_title=f.title}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!=="undefined"){c=tinymce.get(e);if(tinymce.isIE&&c&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on("click",".insert-media",function(d){var e=b(this),c=e.data("editor");d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery)); \ No newline at end of file diff --git a/wp-includes/js/plupload/handlers.js b/wp-includes/js/plupload/handlers.js index e903f57..0b9937c 100644 --- a/wp-includes/js/plupload/handlers.js +++ b/wp-includes/js/plupload/handlers.js @@ -16,7 +16,12 @@ function fileQueued(fileObj) { items.removeClass('open').find('.slidetoggle').slideUp(200); } // Create a progress bar containing the filename - jQuery('#media-items').append('
    0%
    ' + fileObj.name + '
    '); + jQuery('
    ') + .attr( 'id', 'media-item-' + fileObj.id ) + .addClass('child-of-' + postid) + .append('
    0%
    ', + jQuery('
    ').text( ' ' + fileObj.name )) + .appendTo( jQuery('#media-items' ) ); // Disable submit jQuery('#insert-gallery').prop('disabled', true); diff --git a/wp-includes/js/plupload/handlers.min.js b/wp-includes/js/plupload/handlers.min.js index d2f99a4..d099ba8 100644 --- a/wp-includes/js/plupload/handlers.min.js +++ b/wp-includes/js/plupload/handlers.min.js @@ -1 +1 @@ -var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(b){jQuery(".media-blank").remove();var a=jQuery("#media-items").children(),c=post_id||0;if(a.length==1){a.removeClass("open").find(".slidetoggle").slideUp(200)}jQuery("#media-items").append('
    0%
    '+b.name+"
    ");jQuery("#insert-gallery").prop("disabled",true)}function uploadStart(){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(a){}return true}function uploadProgress(a,b){var c=jQuery("#media-item-"+b.id);jQuery(".bar",c).width((200*b.loaded)/b.size);jQuery(".percent",c).html(b.percent+"%")}function fileUploading(c,d){var b=100*1024*1024,a=parseInt(c.settings.max_file_size,10);if(a>b&&d.size>b){setTimeout(function(){var e;if(d.status<3&&d.loaded==0){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""));c.stop();c.removeFile(d);c.start()}},10000)}}function updateMediaForm(){var a=jQuery("#media-items").children();if(a.length==1){a.addClass("open").find(".slidetoggle").show();jQuery(".insert-gallery").hide()}else{if(a.length>1){a.removeClass("open");jQuery(".insert-gallery").show()}}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}}function uploadSuccess(c,a){var b=jQuery("#media-item-"+c.id);a=a.replace(/^
    (\d+)<\/pre>$/,"$1");if(a.match(/media-upload-error|error-div/)){b.html(a);return}else{jQuery(".percent",b).html(pluploadL10n.crunching)}prepareMediaItem(c,a);updateMediaForm();if(post_id&&b.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function setResize(a){if(a){if(uploader.features.jpgresize){uploader.settings.resize={width:resize_width,height:resize_height,quality:100}}else{uploader.settings.multipart_params.image_resize=true}}else{delete (uploader.settings.resize);delete (uploader.settings.multipart_params.image_resize)}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);if(d==2&&shortform>2){d=shortform}try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(post_id&&c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery(".menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").addClass("open").find("slidetoggle").fadeIn()}function wpQueueError(a){jQuery("#media-upload-error").show().html('
    '+a+"
    ")}function wpFileError(b,a){itemAjaxError(b.id,a)}function itemAjaxError(e,c){var b=jQuery("#media-item-"+e),a=b.find(".filename").text(),d=b.data("last-err");if(d==e){return}b.html('
    '+pluploadL10n.dismiss+""+pluploadL10n.error_uploading.replace("%s",jQuery.trim(a))+" "+c+"
    ").data("last-err",e)}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(post_id&&a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+pluploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery("#insert-gallery").prop("disabled",false)}function switchUploader(a){if(a){deleteUserSetting("uploader");jQuery(".media-upload-form").removeClass("html-uploader");if(typeof(uploader)=="object"){uploader.refresh()}}else{setUserSetting("uploader","1");jQuery(".media-upload-form").addClass("html-uploader")}}function dndHelper(a){var b=document.getElementById("dnd-helper");if(a){b.style.display="block"}else{b.style.display="none"}}function uploadError(d,f,c,e){var b=100*1024*1024,a;switch(f){case plupload.FAILED:wpFileError(d,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFileError(d,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:uploadSizeError(e,d);break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(d,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(d,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(d,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:a=parseInt(e.settings.max_file_size,10);if(a>b&&d.size>b){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""))}else{wpQueueError(pluploadL10n.io_error)}break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:jQuery(".media-upload-form").addClass("html-uploader");break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(d,pluploadL10n.default_error)}}function uploadSizeError(a,b,d){var c;if(d){c=pluploadL10n.big_upload_queued.replace("%s",b.name)+" "+pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s","")}else{c=pluploadL10n.file_exceeds_size_limit.replace("%s",b.name)}jQuery("#media-items").append('
    '+c+"
    ");a.removeFile(b)}jQuery(document).ready(function(a){a(".media-upload-form").bind("click.uploader",function(f){var d=a(f.target),b,g;if(d.is('input[type="radio"]')){b=d.closest("tr");if(b.hasClass("align")){setUserSetting("align",d.val())}else{if(b.hasClass("image-size")){setUserSetting("imgsize",d.val())}}}else{if(d.is("button.button")){g=f.target.className||"";g=g.match(/url([^ '"]+)/);if(g&&g[1]){setUserSetting("urlbutton",g[1]);d.siblings(".urlfield").val(d.data("link-url"))}}else{if(d.is("a.dismiss")){d.parents(".media-item").fadeOut(200,function(){a(this).remove()})}else{if(d.is(".upload-flash-bypass a")||d.is("a.uploader-html")){a("#media-items, p.submit, span.big-file-warning").css("display","none");switchUploader(0);f.preventDefault()}else{if(d.is(".upload-html-bypass a")){a("#media-items, p.submit, span.big-file-warning").css("display","");switchUploader(1);f.preventDefault()}else{if(d.is("a.describe-toggle-on")){d.parent().addClass("open");d.siblings(".slidetoggle").fadeIn(250,function(){var i=a(window).scrollTop(),e=a(window).height(),k=a(this).offset().top,j=a(this).height(),c,l;if(e&&k&&j){c=k+j;l=i+e;if(c>l){if(c-lc&&f.size>c&&d.runtime!="html5"){uploadSizeError(d,f,true)}else{fileQueued(f)}});d.refresh();d.start()});uploader.bind("BeforeUpload",function(b,c){});uploader.bind("UploadFile",function(b,c){fileUploading(b,c)});uploader.bind("UploadProgress",function(b,c){uploadProgress(b,c)});uploader.bind("Error",function(b,c){uploadError(c.file,c.code,c.message,b);b.refresh()});uploader.bind("FileUploaded",function(b,d,c){uploadSuccess(d,c.response)});uploader.bind("UploadComplete",function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)=="object"){uploader_init()}});
\ No newline at end of file
+var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(b){jQuery(".media-blank").remove();var a=jQuery("#media-items").children(),c=post_id||0;if(a.length==1){a.removeClass("open").find(".slidetoggle").slideUp(200)}jQuery('
    ').attr("id","media-item-"+b.id).addClass("child-of-"+c).append('
    0%
    ',jQuery('
    ').text(" "+b.name)).appendTo(jQuery("#media-items"));jQuery("#insert-gallery").prop("disabled",true)}function uploadStart(){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(a){}return true}function uploadProgress(a,b){var c=jQuery("#media-item-"+b.id);jQuery(".bar",c).width((200*b.loaded)/b.size);jQuery(".percent",c).html(b.percent+"%")}function fileUploading(c,d){var b=100*1024*1024,a=parseInt(c.settings.max_file_size,10);if(a>b&&d.size>b){setTimeout(function(){var e;if(d.status<3&&d.loaded==0){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""));c.stop();c.removeFile(d);c.start()}},10000)}}function updateMediaForm(){var a=jQuery("#media-items").children();if(a.length==1){a.addClass("open").find(".slidetoggle").show();jQuery(".insert-gallery").hide()}else{if(a.length>1){a.removeClass("open");jQuery(".insert-gallery").show()}}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}}function uploadSuccess(c,a){var b=jQuery("#media-item-"+c.id);a=a.replace(/^
    (\d+)<\/pre>$/,"$1");if(a.match(/media-upload-error|error-div/)){b.html(a);return}else{jQuery(".percent",b).html(pluploadL10n.crunching)}prepareMediaItem(c,a);updateMediaForm();if(post_id&&b.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function setResize(a){if(a){if(uploader.features.jpgresize){uploader.settings.resize={width:resize_width,height:resize_height,quality:100}}else{uploader.settings.multipart_params.image_resize=true}}else{delete (uploader.settings.resize);delete (uploader.settings.multipart_params.image_resize)}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);if(d==2&&shortform>2){d=shortform}try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(post_id&&c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery(".menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").addClass("open").find("slidetoggle").fadeIn()}function wpQueueError(a){jQuery("#media-upload-error").show().html('
    '+a+"
    ")}function wpFileError(b,a){itemAjaxError(b.id,a)}function itemAjaxError(e,c){var b=jQuery("#media-item-"+e),a=b.find(".filename").text(),d=b.data("last-err");if(d==e){return}b.html('
    '+pluploadL10n.dismiss+""+pluploadL10n.error_uploading.replace("%s",jQuery.trim(a))+" "+c+"
    ").data("last-err",e)}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(post_id&&a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+pluploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery("#insert-gallery").prop("disabled",false)}function switchUploader(a){if(a){deleteUserSetting("uploader");jQuery(".media-upload-form").removeClass("html-uploader");if(typeof(uploader)=="object"){uploader.refresh()}}else{setUserSetting("uploader","1");jQuery(".media-upload-form").addClass("html-uploader")}}function dndHelper(a){var b=document.getElementById("dnd-helper");if(a){b.style.display="block"}else{b.style.display="none"}}function uploadError(d,f,c,e){var b=100*1024*1024,a;switch(f){case plupload.FAILED:wpFileError(d,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFileError(d,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:uploadSizeError(e,d);break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(d,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(d,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(d,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:a=parseInt(e.settings.max_file_size,10);if(a>b&&d.size>b){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""))}else{wpQueueError(pluploadL10n.io_error)}break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:jQuery(".media-upload-form").addClass("html-uploader");break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(d,pluploadL10n.default_error)}}function uploadSizeError(a,b,d){var c;if(d){c=pluploadL10n.big_upload_queued.replace("%s",b.name)+" "+pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s","")}else{c=pluploadL10n.file_exceeds_size_limit.replace("%s",b.name)}jQuery("#media-items").append('
    '+c+"
    ");a.removeFile(b)}jQuery(document).ready(function(a){a(".media-upload-form").bind("click.uploader",function(f){var d=a(f.target),b,g;if(d.is('input[type="radio"]')){b=d.closest("tr");if(b.hasClass("align")){setUserSetting("align",d.val())}else{if(b.hasClass("image-size")){setUserSetting("imgsize",d.val())}}}else{if(d.is("button.button")){g=f.target.className||"";g=g.match(/url([^ '"]+)/);if(g&&g[1]){setUserSetting("urlbutton",g[1]);d.siblings(".urlfield").val(d.data("link-url"))}}else{if(d.is("a.dismiss")){d.parents(".media-item").fadeOut(200,function(){a(this).remove()})}else{if(d.is(".upload-flash-bypass a")||d.is("a.uploader-html")){a("#media-items, p.submit, span.big-file-warning").css("display","none");switchUploader(0);f.preventDefault()}else{if(d.is(".upload-html-bypass a")){a("#media-items, p.submit, span.big-file-warning").css("display","");switchUploader(1);f.preventDefault()}else{if(d.is("a.describe-toggle-on")){d.parent().addClass("open");d.siblings(".slidetoggle").fadeIn(250,function(){var i=a(window).scrollTop(),e=a(window).height(),k=a(this).offset().top,j=a(this).height(),c,l;if(e&&k&&j){c=k+j;l=i+e;if(c>l){if(c-lc&&f.size>c&&d.runtime!="html5"){uploadSizeError(d,f,true)}else{fileQueued(f)}});d.refresh();d.start()});uploader.bind("BeforeUpload",function(b,c){});uploader.bind("UploadFile",function(b,c){fileUploading(b,c)});uploader.bind("UploadProgress",function(b,c){uploadProgress(b,c)});uploader.bind("Error",function(b,c){uploadError(c.file,c.code,c.message,b);b.refresh()});uploader.bind("FileUploaded",function(b,d,c){uploadSuccess(d,c.response)});uploader.bind("UploadComplete",function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)=="object"){uploader_init()}});
\ No newline at end of file
diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js
index 7296cb6..f38172c 100644
--- a/wp-includes/js/swfupload/handlers.js
+++ b/wp-includes/js/swfupload/handlers.js
@@ -15,7 +15,12 @@ function fileQueued(fileObj) {
 		jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
 	}
 	// Create a progress bar containing the filename
-	jQuery('#media-items').append('
     ' + fileObj.name + '
    ');
+	jQuery('
    ')
+		.attr( 'id', 'media-item-' + fileObj.id )
+		.addClass('child-of-' + post_id)
+		.append('
    ',
+			jQuery('
    ').text( ' ' + fileObj.name ))
+		.appendTo( jQuery('#media-items' ) );
 	// Display the progress div
 	jQuery('.progress', '#media-item-' + fileObj.id).show();
 
diff --git a/wp-includes/js/swfupload/handlers.min.js b/wp-includes/js/swfupload/handlers.min.js
index 43e82f8..5aaa8ee 100644
--- a/wp-includes/js/swfupload/handlers.min.js
+++ b/wp-includes/js/swfupload/handlers.min.js
@@ -1 +1 @@
-var topWin=window.dialogArguments||opener||parent||top;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(a){jQuery(".media-blank").remove();if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".describe-toggle-on").show();jQuery(".describe-toggle-off").hide();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery("#media-items").append('
     '+a.name+"
    ");jQuery(".progress","#media-item-"+a.id).show();jQuery("#insert-gallery").prop("disabled",true);jQuery("#cancel-upload").prop("disabled",false)}function uploadStart(a){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery("#media-items").width()-2,c=jQuery("#media-item-"+e.id);jQuery(".bar",c).width(a*b/d);jQuery(".percent",c).html(Math.ceil(b/d*100)+"%");if(b==d){jQuery(".bar",c).html(''+swfuploadL10n.crunching+"")}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);jQuery(".bar",b).remove();jQuery(".progress",b).hide();try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.toggle",a).click(function(){jQuery(this).siblings(".slidetoggle").slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&&e&&f){c=e+f;if(c>d&&(f+48)d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(".toggle").andSelf().toggle();jQuery(this).siblings("a.toggle").focus();return false});jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery("a.describe-toggle-on, .menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").slideToggle(500).siblings(".toggle").toggle()}function itemAjaxError(d,b){var c=jQuery("#media-item-"+d);var a=jQuery(".filename",c).text();c.html('
    '+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
    "+b+"
    ");c.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+swfuploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function updateMediaForm(){var b=jQuery("form.type-form #media-items").children(),a=jQuery("#media-items").children();if(b.length==1){jQuery(".slidetoggle",b).slideDown(500).siblings().addClass("hidden").filter(".toggle").toggle()}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}if(a.length>1){jQuery(".insert-gallery").show()}else{jQuery(".insert-gallery").hide()}}function uploadSuccess(b,a){if(a.match("media-upload-error")){jQuery("#media-item-"+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery("#media-item-"+b.id).hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function uploadComplete(a){if(swfu.getStats().files_queued==0){jQuery("#cancel-upload").prop("disabled",true);jQuery("#insert-gallery").prop("disabled",false)}}function wpQueueError(a){jQuery("#media-upload-error").show().text(a)}function wpFileError(d,c){var b=jQuery("#media-item-"+d.id);var a=jQuery(".filename",b).text();b.html('
    '+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
    "+c+"
    ");b.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function fileQueueError(c,a,b){if(a==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){wpQueueError(swfuploadL10n.queue_limit_exceeded)}else{if(a==SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT){fileQueued(c);wpFileError(c,swfuploadL10n.file_exceeds_size_limit)}else{if(a==SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE){fileQueued(c);wpFileError(c,swfuploadL10n.zero_byte_file)}else{if(a==SWFUpload.QUEUE_ERROR.INVALID_FILETYPE){fileQueued(c);wpFileError(c,swfuploadL10n.invalid_filetype)}else{wpQueueError(swfuploadL10n.default_error)}}}}}function fileDialogComplete(b){try{if(b>0){this.startUpload()}}catch(a){this.debug(a)}}function switchUploader(b){var c=document.getElementById(swfu.customSettings.swfupload_element_id),a=document.getElementById(swfu.customSettings.degraded_element_id);if(b){c.style.display="block";a.style.display="none"}else{c.style.display="none";a.style.display="block"}}function swfuploadPreLoad(){if(!uploaderMode){switchUploader(1)}else{switchUploader(0)}}function swfuploadLoadFailed(){switchUploader(0);jQuery(".upload-html-bypass").hide()}function uploadError(b,c,a){switch(c){case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:wpFileError(b,swfuploadL10n.missing_upload_url);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:wpFileError(b,swfuploadL10n.upload_limit_exceeded);break;case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:wpQueueError(swfuploadL10n.http_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:wpQueueError(swfuploadL10n.upload_failed);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:wpQueueError(swfuploadL10n.io_error);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:wpQueueError(swfuploadL10n.security_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:jQuery("#media-item-"+b.id).remove();break;default:wpFileError(b,swfuploadL10n.default_error)}}function cancelUpload(){swfu.cancelQueue()}jQuery(document).ready(function(a){a('input[type="radio"]',"#media-items").live("click",function(){var b=a(this).closest("tr");if(a(b).hasClass("align")){setUserSetting("align",a(this).val())}else{if(a(b).hasClass("image-size")){setUserSetting("imgsize",a(this).val())}}});a("button.button","#media-items").live("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/);if(b&&b[1]){setUserSetting("urlbutton",b[1]);a(this).siblings(".urlfield").val(a(this).attr("title"))}})});
\ No newline at end of file
+var topWin=window.dialogArguments||opener||parent||top;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(a){jQuery(".media-blank").remove();if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".describe-toggle-on").show();jQuery(".describe-toggle-off").hide();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery('
    ').attr("id","media-item-"+a.id).addClass("child-of-"+post_id).append('
    ',jQuery('
    ').text(" "+a.name)).appendTo(jQuery("#media-items"));jQuery(".progress","#media-item-"+a.id).show();jQuery("#insert-gallery").prop("disabled",true);jQuery("#cancel-upload").prop("disabled",false)}function uploadStart(a){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery("#media-items").width()-2,c=jQuery("#media-item-"+e.id);jQuery(".bar",c).width(a*b/d);jQuery(".percent",c).html(Math.ceil(b/d*100)+"%");if(b==d){jQuery(".bar",c).html(''+swfuploadL10n.crunching+"")}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);jQuery(".bar",b).remove();jQuery(".progress",b).hide();try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.toggle",a).click(function(){jQuery(this).siblings(".slidetoggle").slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&&e&&f){c=e+f;if(c>d&&(f+48)d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(".toggle").andSelf().toggle();jQuery(this).siblings("a.toggle").focus();return false});jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery("a.describe-toggle-on, .menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").slideToggle(500).siblings(".toggle").toggle()}function itemAjaxError(d,b){var c=jQuery("#media-item-"+d);var a=jQuery(".filename",c).text();c.html('
    '+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
    "+b+"
    ");c.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+swfuploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function updateMediaForm(){var b=jQuery("form.type-form #media-items").children(),a=jQuery("#media-items").children();if(b.length==1){jQuery(".slidetoggle",b).slideDown(500).siblings().addClass("hidden").filter(".toggle").toggle()}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}if(a.length>1){jQuery(".insert-gallery").show()}else{jQuery(".insert-gallery").hide()}}function uploadSuccess(b,a){if(a.match("media-upload-error")){jQuery("#media-item-"+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery("#media-item-"+b.id).hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function uploadComplete(a){if(swfu.getStats().files_queued==0){jQuery("#cancel-upload").prop("disabled",true);jQuery("#insert-gallery").prop("disabled",false)}}function wpQueueError(a){jQuery("#media-upload-error").show().text(a)}function wpFileError(d,c){var b=jQuery("#media-item-"+d.id);var a=jQuery(".filename",b).text();b.html('
    '+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
    "+c+"
    ");b.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function fileQueueError(c,a,b){if(a==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){wpQueueError(swfuploadL10n.queue_limit_exceeded)}else{if(a==SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT){fileQueued(c);wpFileError(c,swfuploadL10n.file_exceeds_size_limit)}else{if(a==SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE){fileQueued(c);wpFileError(c,swfuploadL10n.zero_byte_file)}else{if(a==SWFUpload.QUEUE_ERROR.INVALID_FILETYPE){fileQueued(c);wpFileError(c,swfuploadL10n.invalid_filetype)}else{wpQueueError(swfuploadL10n.default_error)}}}}}function fileDialogComplete(b){try{if(b>0){this.startUpload()}}catch(a){this.debug(a)}}function switchUploader(b){var c=document.getElementById(swfu.customSettings.swfupload_element_id),a=document.getElementById(swfu.customSettings.degraded_element_id);if(b){c.style.display="block";a.style.display="none"}else{c.style.display="none";a.style.display="block"}}function swfuploadPreLoad(){if(!uploaderMode){switchUploader(1)}else{switchUploader(0)}}function swfuploadLoadFailed(){switchUploader(0);jQuery(".upload-html-bypass").hide()}function uploadError(b,c,a){switch(c){case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:wpFileError(b,swfuploadL10n.missing_upload_url);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:wpFileError(b,swfuploadL10n.upload_limit_exceeded);break;case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:wpQueueError(swfuploadL10n.http_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:wpQueueError(swfuploadL10n.upload_failed);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:wpQueueError(swfuploadL10n.io_error);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:wpQueueError(swfuploadL10n.security_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:jQuery("#media-item-"+b.id).remove();break;default:wpFileError(b,swfuploadL10n.default_error)}}function cancelUpload(){swfu.cancelQueue()}jQuery(document).ready(function(a){a('input[type="radio"]',"#media-items").live("click",function(){var b=a(this).closest("tr");if(a(b).hasClass("align")){setUserSetting("align",a(this).val())}else{if(a(b).hasClass("image-size")){setUserSetting("imgsize",a(this).val())}}});a("button.button","#media-items").live("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/);if(b&&b[1]){setUserSetting("urlbutton",b[1]);a(this).siblings(".urlfield").val(a(this).attr("title"))}})});
\ No newline at end of file
diff --git a/wp-includes/js/swfupload/swfupload-all.js b/wp-includes/js/swfupload/swfupload-all.js
deleted file mode 100644
index f18a138..0000000
--- a/wp-includes/js/swfupload/swfupload-all.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// swfupload
-var SWFUpload;if(SWFUpload==undefined){SWFUpload=function(a){this.initSWFUpload(a)}}SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={};this.settings=b;this.eventQueue=[];this.movieName="SWFUpload_"+SWFUpload.movieCount++;this.movieElement=null;SWFUpload.instances[this.movieName]=this;this.initSettings();this.loadFlash()}catch(a){delete SWFUpload.instances[this.movieName];throw a}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(a){if(typeof(a)!=="string"||a.match(/^https?:\/\//i)||a.match(/^\//)){return a}var c,b;c=window.location.protocol+"//"+window.location.hostname+(window.location.port?":"+window.location.port:"");b=window.location.pathname.lastIndexOf("/");if(b<=0){path="/"}else{path=window.location.pathname.substr(0,b)+"/"}return path+a};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,a){this.settings[b]=(this.settings[b]==undefined)?a:this.settings[b]};this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",false);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",false);this.ensureDefault("requeue_on_error",false);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",true);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);this.ensureDefault("button_disabled",false);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",false);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});this.customSettings=this.settings.custom_settings;if(!!this.settings.prevent_swf_caching){this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+new Date().getTime()}if(!this.settings.preserve_relative_urls){this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url);this.settings.button_image_url=SWFUpload.completeURL(this.settings.button_image_url)}delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var a,b;if(document.getElementById(this.movieName)!==null){throw"ID "+this.movieName+" is already in use. The Flash Object could not be added"}a=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(a==undefined){throw"Could not find the placeholder element: "+this.settings.button_placeholder_id}b=document.createElement("div");b.innerHTML=this.getFlashHTML();a.parentNode.replaceChild(b.firstChild,a);if(window[this.movieName]==undefined){window[this.movieName]=this.getMovieElement()}};SWFUpload.prototype.getFlashHTML=function(){return['','','','','','','',""].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString(),a=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&uploadURL=",encodeURIComponent(this.settings.upload_url),"&useQueryString=",encodeURIComponent(this.settings.use_query_string),"&requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&httpSuccess=",encodeURIComponent(a),"&assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&params=",encodeURIComponent(b),"&filePostName=",encodeURIComponent(this.settings.file_post_name),"&fileTypes=",encodeURIComponent(this.settings.file_types),"&fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&fileQueueLimit=",encodeURIComponent(this.settings.file_queue_limit),"&debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&buttonWidth=",encodeURIComponent(this.settings.button_width),"&buttonHeight=",encodeURIComponent(this.settings.button_height),"&buttonText=",encodeURIComponent(this.settings.button_text),"&buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&buttonTextLeftPadding=",encodeURIComponent(this.settings.button_text_left_padding),"&buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&buttonAction=",encodeURIComponent(this.settings.button_action),"&buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==undefined){this.movieElement=document.getElementById(this.movieName)}if(this.movieElement===null){throw"Could not find Flash element"}return this.movieElement};SWFUpload.prototype.buildParamString=function(){var c=this.settings.post_params,b=[],a;if(typeof(c)==="object"){for(a in c){if(c.hasOwnProperty(a)){b.push(encodeURIComponent(a.toString())+"="+encodeURIComponent(c[a].toString()))}}}return b.join("&")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,false);var a=null,c;a=this.getMovieElement();if(a&&typeof(a.CallFunction)==="unknown"){for(c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(e){}}try{a.parentNode.removeChild(a)}catch(b){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieElement=null;this.settings=null;this.customSettings=null;this.eventQueue=null;this.movieName=null;return true}catch(d){return false}};SWFUpload.prototype.addSetting=function(b,c,a){if(c==undefined){return(this.settings[b]=a)}else{return(this.settings[b]=c)}};SWFUpload.prototype.getSetting=function(a){if(this.settings[a]!=undefined){return this.settings[a]}return""};SWFUpload.prototype.callFlash=function(functionName,argumentArray){argumentArray=argumentArray||[];var movieElement=this.getMovieElement(),returnValue,returnString;try{returnString=movieElement.CallFunction(''+__flash__argumentsToXML(argumentArray,0)+"");returnValue=eval(returnString)}catch(ex){throw"Call to "+functionName+" failed"}if(returnValue!=undefined&&typeof returnValue.post==="object"){returnValue=this.unescapeFilePostParams(returnValue)}return returnValue};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(a){this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelUpload=function(a,b){if(b!==false){b=true}this.callFlash("CancelUpload",[a,b])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(a){this.callFlash("SetStats",[a])};SWFUpload.prototype.getFile=function(a){if(typeof(a)==="number"){return this.callFlash("GetFileByIndex",[a])}else{return this.callFlash("GetFile",[a])}};SWFUpload.prototype.addFileParam=function(a,b,c){return this.callFlash("AddFileParam",[a,b,c])};SWFUpload.prototype.removeFileParam=function(a,b){this.callFlash("RemoveFileParam",[a,b])};SWFUpload.prototype.setUploadURL=function(a){this.settings.upload_url=a.toString();this.callFlash("SetUploadURL",[a])};SWFUpload.prototype.setPostParams=function(a){this.settings.post_params=a;this.callFlash("SetPostParams",[a])};SWFUpload.prototype.addPostParam=function(a,b){this.settings.post_params[a]=b;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(a){delete this.settings.post_params[a];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(a,b){this.settings.file_types=a;this.settings.file_types_description=b;this.callFlash("SetFileTypes",[a,b])};SWFUpload.prototype.setFileSizeLimit=function(a){this.settings.file_size_limit=a;this.callFlash("SetFileSizeLimit",[a])};SWFUpload.prototype.setFileUploadLimit=function(a){this.settings.file_upload_limit=a;this.callFlash("SetFileUploadLimit",[a])};SWFUpload.prototype.setFileQueueLimit=function(a){this.settings.file_queue_limit=a;this.callFlash("SetFileQueueLimit",[a])};SWFUpload.prototype.setFilePostName=function(a){this.settings.file_post_name=a;this.callFlash("SetFilePostName",[a])};SWFUpload.prototype.setUseQueryString=function(a){this.settings.use_query_string=a;this.callFlash("SetUseQueryString",[a])};SWFUpload.prototype.setRequeueOnError=function(a){this.settings.requeue_on_error=a;this.callFlash("SetRequeueOnError",[a])};SWFUpload.prototype.setHTTPSuccess=function(a){if(typeof a==="string"){a=a.replace(" ","").split(",")}this.settings.http_success=a;this.callFlash("SetHTTPSuccess",[a])};SWFUpload.prototype.setAssumeSuccessTimeout=function(a){this.settings.assume_success_timeout=a;this.callFlash("SetAssumeSuccessTimeout",[a])};SWFUpload.prototype.setDebugEnabled=function(a){this.settings.debug_enabled=a;this.callFlash("SetDebugEnabled",[a])};SWFUpload.prototype.setButtonImageURL=function(a){if(a==undefined){a=""}this.settings.button_image_url=a;this.callFlash("SetButtonImageURL",[a])};SWFUpload.prototype.setButtonDimensions=function(c,a){this.settings.button_width=c;this.settings.button_height=a;var b=this.getMovieElement();if(b!=undefined){b.style.width=c+"px";b.style.height=a+"px"}this.callFlash("SetButtonDimensions",[c,a])};SWFUpload.prototype.setButtonText=function(a){this.settings.button_text=a;this.callFlash("SetButtonText",[a])};SWFUpload.prototype.setButtonTextPadding=function(b,a){this.settings.button_text_top_padding=a;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,a])};SWFUpload.prototype.setButtonTextStyle=function(a){this.settings.button_text_style=a;this.callFlash("SetButtonTextStyle",[a])};SWFUpload.prototype.setButtonDisabled=function(a){this.settings.button_disabled=a;this.callFlash("SetButtonDisabled",[a])};SWFUpload.prototype.setButtonAction=function(a){this.settings.button_action=a;this.callFlash("SetButtonAction",[a])};SWFUpload.prototype.setButtonCursor=function(a){this.settings.button_cursor=a;this.callFlash("SetButtonCursor",[a])};SWFUpload.prototype.queueEvent=function(b,c){if(c==undefined){c=[]}else{if(!(c instanceof Array)){c=[c]}}var a=this;if(typeof this.settings[b]==="function"){this.eventQueue.push(function(){this.settings[b].apply(this,c)});setTimeout(function(){a.executeNextEvent()},0)}else{if(this.settings[b]!==null){throw"Event handler "+b+" is unknown or is not a function"}}};SWFUpload.prototype.executeNextEvent=function(){var a=this.eventQueue?this.eventQueue.shift():null;if(typeof(a)==="function"){a.apply(this)}};SWFUpload.prototype.unescapeFilePostParams=function(c){var e=/[$]([0-9a-f]{4})/i,f={},d,a,b;if(c!=undefined){for(a in c.post){if(c.post.hasOwnProperty(a)){d=a;while((b=e.exec(d))!==null){d=d.replace(b[0],String.fromCharCode(parseInt("0x"+b[1],16)))}f[d]=c.post[a]}}c.post=f}return c};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(a){return false}};SWFUpload.prototype.flashReady=function(){var a=this.getMovieElement();if(!a){this.debug("Flash called back ready but the flash movie can't be found.");return}this.cleanUp(a);this.queueEvent("swfupload_loaded_handler")};SWFUpload.prototype.cleanUp=function(a){var c;try{if(this.movieElement&&typeof(a.CallFunction)==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(b){}}}}catch(d){}window.__flash__removeCallback=function(e,f){try{if(e){e[f]=null}}catch(g){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("file_queued_handler",a)};SWFUpload.prototype.fileQueueError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("file_queue_error_handler",[a,c,b])};SWFUpload.prototype.fileDialogComplete=function(b,c,a){this.queueEvent("file_dialog_complete_handler",[b,c,a])};SWFUpload.prototype.uploadStart=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("return_upload_start_handler",a)};SWFUpload.prototype.returnUploadStart=function(a){var b;if(typeof this.settings.upload_start_handler==="function"){a=this.unescapeFilePostParams(a);b=this.settings.upload_start_handler.call(this,a)}else{if(this.settings.upload_start_handler!=undefined){throw"upload_start_handler must be a function"}}if(b===undefined){b=true}b=!!b;this.callFlash("ReturnUploadStart",[b])};SWFUpload.prototype.uploadProgress=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_progress_handler",[a,c,b])};SWFUpload.prototype.uploadError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_error_handler",[a,c,b])};SWFUpload.prototype.uploadSuccess=function(b,a,c){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,a,c])};SWFUpload.prototype.uploadComplete=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("upload_complete_handler",a)};SWFUpload.prototype.debug=function(a){this.queueEvent("debug_handler",a)};
-// swfupload.queue
-var SWFUpload;if(typeof(SWFUpload)==="function"){SWFUpload.queue={};SWFUpload.prototype.initSettings=(function(a){return function(){if(typeof(a)==="function"){a.call(this)}this.queueSettings={};this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0;this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler;this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler;this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler;this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler;this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}})(SWFUpload.prototype.initSettings);SWFUpload.prototype.startUpload=function(a){this.queueSettings.queue_cancelled_flag=false;this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=true;this.stopUpload();var a=this.getStats();while(a.files_queued>0){this.cancelUpload();a=this.getStats()}};SWFUpload.queue.uploadStartHandler=function(a){var b;if(typeof(this.queueSettings.user_upload_start_handler)==="function"){b=this.queueSettings.user_upload_start_handler.call(this,a)}b=(b===false)?false:true;this.queueSettings.queue_cancelled_flag=!b;return b};SWFUpload.queue.uploadCompleteHandler=function(b){var c=this.queueSettings.user_upload_complete_handler,d,a;if(b.filestatus===SWFUpload.FILE_STATUS.COMPLETE){this.queueSettings.queue_upload_count++}if(typeof(c)==="function"){d=(c.call(this,b)===false)?false:true}else{if(b.filestatus===SWFUpload.FILE_STATUS.QUEUED){d=false}else{d=true}}if(d){a=this.getStats();if(a.files_queued>0&&this.queueSettings.queue_cancelled_flag===false){this.startUpload()}else{if(this.queueSettings.queue_cancelled_flag===false){this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]);this.queueSettings.queue_upload_count=0}else{this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0}}}}};
-// swfobject
-var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("