Version %1$s addressed some security issues and fixed %2$s bug.',
+ 'Version %1$s addressed some security issues and fixed %2$s bugs.', 13 ), '4.2.2', number_format_i18n( 13 ) ); ?>
+ the release notes.' ), 'http://codex.wordpress.org/Version_4.2.2' ); ?>
+
Version %1$s addressed a security issue.',
'Version %1$s addressed some security issues.', 1 ), '4.2.1' ); ?>
the release notes.' ), 'http://codex.wordpress.org/Version_4.2.1' ); ?>
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 55125f6..6c12b3f 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -146,7 +146,7 @@ function wp_tempnam( $filename = '', $dir = '' ) {
$dir = get_temp_dir();
}
- if ( empty( $filename ) || '.' == $filename ) {
+ if ( empty( $filename ) || '.' == $filename || '/' == $filename ) {
$filename = time();
}
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 5a97b18..a15cc88 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -1050,6 +1050,9 @@ function update_core($from, $to) {
$wp_filesystem->delete($old_file, true);
}
+ // Remove any Genericons example.html's from the filesystem
+ _upgrade_422_remove_genericons();
+
// Upgrade DB with separate request
/** This filter is documented in wp-admin/includes/update-core.php */
apply_filters( 'update_feedback', __( 'Upgrading database…' ) );
@@ -1188,3 +1191,67 @@ window.location = 'about.php?updated';
exit();
}
add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+
+/**
+ * Cleans up Genericons example files.
+ *
+ * @since 4.2.2
+ */
+function _upgrade_422_remove_genericons() {
+ global $wp_theme_directories, $wp_filesystem;
+
+ // A list of the affected files using the filesystem absolute paths.
+ $affected_files = array();
+
+ // Themes
+ foreach ( $wp_theme_directories as $directory ) {
+ $affected_theme_files = _upgrade_422_find_genericons_files_in_folder( $directory );
+ $affected_files = array_merge( $affected_files, $affected_theme_files );
+ }
+
+ // Plugins
+ $affected_plugin_files = _upgrade_422_find_genericons_files_in_folder( WP_PLUGIN_DIR );
+ $affected_files = array_merge( $affected_files, $affected_plugin_files );
+
+ foreach ( $affected_files as $file ) {
+ $gen_dir = $wp_filesystem->find_folder( trailingslashit( dirname( $file ) ) );
+ if ( empty( $gen_dir ) ) {
+ continue;
+ }
+
+ // The path when the file is accessed via WP_Filesystem may differ in the case of FTP
+ $remote_file = $gen_dir . basename( $file );
+
+ if ( ! $wp_filesystem->exists( $remote_file ) ) {
+ continue;
+ }
+
+ if ( ! $wp_filesystem->delete( $remote_file, false, 'f' ) ) {
+ $wp_filesystem->put_contents( $remote_file, '' );
+ }
+ }
+}
+
+/**
+ * Recursively find Genericons example files in a given folder.
+ *
+ * @ignore
+ * @since 4.2.2
+ *
+ * @param string $directory Directory path. Expects trailingslashed.
+ * @return array
+ */
+function _upgrade_422_find_genericons_files_in_folder( $directory ) {
+ $directory = trailingslashit( $directory );
+ $files = array();
+
+ if ( file_exists( "{$directory}example.html" ) && false !== strpos( file_get_contents( "{$directory}example.html" ), '
Genericons' ) ) {
+ $files[] = "{$directory}example.html";
+ }
+
+ foreach ( glob( $directory . '*', GLOB_ONLYDIR ) as $dir ) {
+ $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+ }
+
+ return $files;
+}
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 9803f88..495d5b4 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -524,12 +524,15 @@ function upgrade_all() {
if ( $wp_current_db_version < 29630 )
upgrade_400();
+ // Don't harsh my mellow. upgrade_422() must be called before
+ // upgrade_420() to catch bad comments prior to any auto-expansion of
+ // MySQL column widths.
+ if ( $wp_current_db_version < 31534 )
+ upgrade_422();
+
if ( $wp_current_db_version < 31351 )
upgrade_420();
- if ( $wp_current_db_version < 31533 )
- upgrade_421();
-
maybe_disable_link_manager();
maybe_disable_automattic_widgets();
@@ -1444,19 +1447,48 @@ function upgrade_420() {
* @since 4.2.1
*/
function upgrade_421() {
+}
+
+/**
+ * Execute changes made in WordPress 4.2.2.
+ *
+ * @since 4.2.2
+ */
+function upgrade_422() {
global $wp_current_db_version, $wpdb;
- if ( $wp_current_db_version < 31533 ) {
+ if ( $wp_current_db_version < 31534 ) {
$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
- if ( ! $content_length ) {
- $content_length = 65535;
+
+ if ( is_wp_error( $content_length ) ) {
+ return;
}
+ if ( false === $content_length ) {
+ $content_length = array(
+ 'type' => 'byte',
+ 'length' => 65535,
+ );
+ } elseif ( ! is_array( $content_length ) ) {
+ $length = (int) $content_length > 0 ? (int) $content_length : 65535;
+ $content_length = array(
+ 'type' => 'byte',
+ 'length' => $length
+ );
+ }
+
+ if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
+ // Sites with malformed DB schemas are on their own.
+ return;
+ }
+
+ $allowed_length = intval( $content_length['length'] ) - 10;
+
$comments = $wpdb->get_results(
- "SELECT comment_ID FROM $wpdb->comments
- WHERE comment_date_gmt > '2015-04-26'
- AND CHAR_LENGTH( comment_content ) >= $content_length
- AND ( comment_content LIKE '%<%' OR comment_content LIKE '%>%' )"
+ "SELECT `comment_ID` FROM `{$wpdb->comments}`
+ WHERE `comment_date_gmt` > '2015-04-26'
+ AND LENGTH( `comment_content` ) >= {$allowed_length}
+ AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
);
foreach ( $comments as $comment ) {
@@ -1568,7 +1600,7 @@ function upgrade_network() {
$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
- $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
+ $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
$tables = $wpdb->tables( 'global' );
@@ -1577,6 +1609,24 @@ function upgrade_network() {
}
}
}
+
+ // 4.2.2
+ if ( $wp_current_db_version < 31535 && 'utf8mb4' === $wpdb->charset ) {
+ if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
+ $upgrade = false;
+ $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
+ foreach( $indexes as $index ) {
+ if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+ $upgrade = true;
+ break;
+ }
+ }
+
+ if ( $upgrade ) {
+ $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+ }
+ }
+ }
}
//
diff --git a/wp-admin/js/editor-expand.js b/wp-admin/js/editor-expand.js
index db7561e..4d76717 100644
--- a/wp-admin/js/editor-expand.js
+++ b/wp-admin/js/editor-expand.js
@@ -15,7 +15,7 @@
$visualEditor = $(),
$textTop = $( '#ed_toolbar' ),
$textEditor = $( '#content' ),
- $textEditorClone = $( '' ),
+ $textEditorClone = $( '' ),
$bottom = $( '#post-status-info' ),
$menuBar = $(),
$statusBar = $(),
diff --git a/wp-admin/js/editor-expand.min.js b/wp-admin/js/editor-expand.min.js
index b7d23d6..5d1d632 100644
--- a/wp-admin/js/editor-expand.min.js
+++ b/wp-admin/js/editor-expand.min.js
@@ -1 +1 @@
-!function(a,b){"use strict";var c=b(a),d=b(document),e=b("#wpadminbar"),f=b("#wpfooter");b(function(){function g(){var a=c.width();T={windowHeight:c.height(),windowWidth:a,adminBarHeight:a>600?e.outerHeight():0,toolsHeight:t.outerHeight()||0,menuBarHeight:A.outerHeight()||0,visualTopHeight:u.outerHeight()||0,textTopHeight:w.outerHeight()||0,bottomHeight:z.outerHeight()||0,statusBarHeight:B.outerHeight()||0,sideSortablesHeight:C.height()||0},T.menuBarHeight<3&&(T.menuBarHeight=0)}function h(b){var c,d,e,f,g,h=jQuery.ui.keyCode,i=b.keyCode,j=document.createRange(),k=x[0].selectionStart,l=x[0].selectionEnd,m=y[0].firstChild,n=10;if(!k||!l||k===l){try{j.setStart(m,k),j.setEnd(m,l+1)}catch(o){}c=j.getBoundingClientRect(),c.height&&(d=c.top-n,e=d+c.height+n,f=T.adminBarHeight+T.toolsHeight+T.textTopHeight,g=T.windowHeight-T.bottomHeight,f>d&&(i===h.UP||i===h.LEFT||i===h.BACKSPACE)?a.scrollTo(a.pageXOffset,d+a.pageYOffset-f):e>g&&a.scrollTo(a.pageXOffset,e+a.pageYOffset-g))}}function i(){if(!(p&&!p.isHidden()||!p&&"tinymce"===R)){var a,b=x.height();y.width(x.width()-22),y.text(x.val()+" "),a=y.height(),Q>a&&(a=Q),a!==b&&(x.height(a),j())}}function j(b){if(!F||!F.settings.visible){var e,h,j,k,l,m,n,o,q,r=c.scrollTop(),G=b&&b.type,H="scroll"!==G,N=p&&!p.isHidden(),R=Q,U=E.offset().top,V=1,W=s.width();(H||!T.windowHeight)&&g(),N||"resize"!==G||i(),N?(e=u,h=v,n=T.visualTopHeight):(e=w,h=x,n=T.textTopHeight),(N||e.length)&&(m=e.parent().offset().top,o=h.offset().top,q=h.outerHeight(),l=N?Q+n:Q+20,l=q>l+5,l?((!I||H)&&r>=m-T.toolsHeight-T.adminBarHeight&&r<=m-T.toolsHeight-T.adminBarHeight+q-R?(I=!0,t.css({position:"fixed",top:T.adminBarHeight,width:W}),N&&A.length&&A.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),e.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):(I||H)&&(r<=m-T.toolsHeight-T.adminBarHeight?(I=!1,t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):r>=m-T.toolsHeight-T.adminBarHeight+q-R&&(I=!1,t.css({position:"absolute",top:q-R,width:W}),N&&A.length&&A.css({position:"absolute",top:q-R,width:W-2*V}),e.css({position:"absolute",top:q-R+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}))),(!J||H&&S)&&r+T.windowHeight<=o+q+T.bottomHeight+T.statusBarHeight+V?b&&b.deltaHeight>0&&b.deltaHeight<100?a.scrollBy(0,b.deltaHeight):S&&(J=!0,B.css({position:"fixed",bottom:T.bottomHeight,visibility:"",width:W-2*V}),z.css({position:"fixed",bottom:0,width:W})):(!S&&J||(J||H)&&r+T.windowHeight>o+q+T.bottomHeight+T.statusBarHeight-V)&&(J=!1,B.attr("style",S?"":"visibility: hidden;"),z.attr("style",""))):H&&(t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),B.attr("style",S?"":"visibility: hidden;"),z.attr("style","")),D.width()<300&&T.windowWidth>600&&d.height()>C.height()+U+120&&T.windowHeightT.windowHeight||K||L?U>=r+O?(C.attr("style",""),K=L=!1):r>M?K?(K=!1,j=C.offset().top-T.adminBarHeight,k=f.offset().top,kr&&(L?(L=!1,j=C.offset().top-P,k=f.offset().top,k=r+O&&(K=!0,C.css({position:"fixed",top:O,bottom:""}))):(r>=U-O?C.css({position:"fixed",top:O}):C.attr("style",""),K=L=!1),M=r):(C.attr("style",""),K=L=!1),H&&(s.css({paddingTop:T.toolsHeight}),N?v.css({paddingTop:T.visualTopHeight+T.menuBarHeight}):(x.css({marginTop:T.textTopHeight}),y.width(W-20-2*V))))}}function k(){i(),j()}function l(a){for(var b=1;6>b;b++)setTimeout(a,500*b)}function m(){clearTimeout(q),q=setTimeout(j,100)}function n(){a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.addClass("wp-editor-expand"),c.on("scroll.editor-expand resize.editor-expand",function(a){j(a.type),m()}),d.on("wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand",j).on("postbox-toggled.editor-expand",function(){!K&&!L&&a.pageYOffset>O&&(L=!0,a.scrollBy(0,-1),j(),a.scrollBy(0,1)),j()}).on("wp-window-resized.editor-expand",function(){p&&!p.isHidden()?p.execCommand("wpAutoResize"):i()}),x.on("focus.editor-expand input.editor-expand propertychange.editor-expand",i),x.on("keyup.editor-expand",h),G(),F&&F.pubsub.subscribe("hidden",k),p&&(p.settings.wp_autoresize_on=!0,p.execCommand("wpAutoResizeOn"),p.isHidden()||p.execCommand("wpAutoResize")),(!p||p.isHidden())&&i(),j(),d.trigger("editor-expand-on")}function o(){var e=parseInt(a.getUserSetting("ed_size",300),10);50>e?e=50:e>5e3&&(e=5e3),a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.removeClass("wp-editor-expand"),c.off(".editor-expand"),d.off(".editor-expand"),x.off(".editor-expand"),H(),F&&F.pubsub.unsubscribe("hidden",k),b.each([u,w,t,A,z,B,s,v,x,C],function(a,b){b&&b.attr("style","")}),I=J=K=L=!1,p&&(p.settings.wp_autoresize_on=!1,p.execCommand("wpAutoResizeOff"),p.isHidden()||(x.hide(),e&&p.theme.resizeTo(null,e))),e&&x.height(e),d.trigger("editor-expand-off")}var p,q,r=b("#postdivrich"),s=b("#wp-content-wrap"),t=b("#wp-content-editor-tools"),u=b(),v=b(),w=b("#ed_toolbar"),x=b("#content"),y=b(''),z=b("#post-status-info"),A=b(),B=b(),C=b("#side-sortables"),D=b("#postbox-container-1"),E=b("#post-body"),F=a.wp.editor&&a.wp.editor.fullscreen,G=function(){},H=function(){},I=!1,J=!1,K=!1,L=!1,M=0,N=130,O=56,P=20,Q=300,R=s.hasClass("tmce-active")?"tinymce":"html",S=!!parseInt(a.getUserSetting("hidetb"),10),T={windowHeight:0,windowWidth:0,adminBarHeight:0,toolsHeight:0,menuBarHeight:0,visualTopHeight:0,textTopHeight:0,bottomHeight:0,statusBarHeight:0,sideSortablesHeight:0};y.insertAfter(x),y.css({"font-family":x.css("font-family"),"font-size":x.css("font-size"),"line-height":x.css("line-height"),"white-space":"pre-wrap","word-wrap":"break-word"}),d.on("tinymce-editor-init.editor-expand",function(d,e){function f(){var a,b,c,d=e.selection.getNode();if(e.wp&&e.wp.getView&&(b=e.wp.getView(d)))c=b.getBoundingClientRect();else{a=e.selection.getRng();try{c=a.getClientRects()[0]}catch(f){}c||(c=d.getBoundingClientRect())}return c.height?c:!1}function g(a){var b=a.keyCode;47>=b&&b!==q.SPACEBAR&&b!==q.ENTER&&b!==q.DELETE&&b!==q.BACKSPACE&&b!==q.UP&&b!==q.LEFT&&b!==q.DOWN&&b!==q.UP||b>=91&&93>=b||b>=112&&123>=b||144===b||145===b||h(b)}function h(b){var c,d,g,h,i=f(),j=50;i&&(c=i.top+e.iframeElement.getBoundingClientRect().top,d=c+i.height,c-=j,d+=j,g=T.adminBarHeight+T.toolsHeight+T.menuBarHeight+T.visualTopHeight,h=T.windowHeight-(S?T.bottomHeight+T.statusBarHeight:0),h-gc&&(b===q.UP||b===q.LEFT||b===q.BACKSPACE)?a.scrollTo(a.pageXOffset,c+a.pageYOffset-g):d>h&&a.scrollTo(a.pageXOffset,d+a.pageYOffset-h)))}function k(a){a.state||j()}function m(){c.on("scroll.mce-float-panels",t),setTimeout(function(){e.execCommand("wpAutoResize"),j()},300)}function n(){c.off("scroll.mce-float-panels"),setTimeout(function(){var b=s.offset().top;a.pageYOffset>b&&a.scrollTo(a.pageXOffset,b-T.adminBarHeight),i(),j()},100),j()}function o(){S=!S}var q=a.tinymce.util.VK,t=_.debounce(function(){!b(".mce-floatpanel:hover").length&&a.tinymce.ui.FloatPanel.hideAll(),b(".mce-tooltip").hide()},1e3,!0);"content"===e.id&&(p=e,e.settings.autoresize_min_height=Q,u=s.find(".mce-toolbar-grp"),v=s.find(".mce-edit-area"),B=s.find(".mce-statusbar"),A=s.find(".mce-menubar"),G=function(){e.on("keyup",g),e.on("show",m),e.on("hide",n),e.on("wp-toolbar-toggle",o),e.on("setcontent wp-autoresize wp-toolbar-toggle",j),e.on("undo redo",h),e.on("FullscreenStateChanged",k),c.off("scroll.mce-float-panels").on("scroll.mce-float-panels",t)},H=function(){e.off("keyup",g),e.off("show",m),e.off("hide",n),e.off("wp-toolbar-toggle",o),e.off("setcontent wp-autoresize wp-toolbar-toggle",j),e.off("undo redo",h),e.off("FullscreenStateChanged",k),c.off("scroll.mce-float-panels")},r.hasClass("wp-editor-expand")&&(G(),l(j)))}),r.hasClass("wp-editor-expand")&&(n(),s.hasClass("html-active")&&l(function(){j(),i()})),b("#adv-settings .editor-expand").show(),b("#editor-expand-toggle").on("change.editor-expand",function(){b(this).prop("checked")?(n(),a.setUserSetting("editor_expand","on")):(o(),a.setUserSetting("editor_expand","off"))}),a.editorExpand={on:n,off:o}}),b(function(){function g(){z=J.offset(),z.right=z.left+J.outerWidth(),z.bottom=z.top+J.outerHeight()}function h(){S||(S=!0,d.trigger("dfw-activate"),L.on("keydown.focus-shortcut",v))}function i(){S&&(l(),S=!1,d.trigger("dfw-deactivate"),L.off("keydown.focus-shortcut"))}function j(){return S}function k(){!T&&S&&(T=!0,L.on("keydown.focus",o),K.add(L).on("blur.focus",q),o(),a.setUserSetting("post_dfw","on"),d.trigger("dfw-on"))}function l(){T&&(T=!1,K.add(L).off(".focus"),p(),J.off(".focus"),a.setUserSetting("post_dfw","off"),d.trigger("dfw-off"))}function m(){T?l():k()}function n(){return T}function o(b){var d=b&&b.keyCode;return 27===d||87===d&&b.altKey&&b.shiftKey?void p(b):void(b&&(b.metaKey||b.ctrlKey&&!b.altKey||b.altKey&&b.shiftKey||d&&(47>=d&&8!==d&&13!==d&&32!==d&&46!==d||d>=91&&93>=d||d>=112&&135>=d||d>=144&&150>=d||d>=224))||(w||(w=!0,clearTimeout(F),F=setTimeout(function(){M.show()},600),J.css("z-index",9998),M.on("mouseenter.focus",function(){g(),c.on("scroll.focus",function(){var b=a.pageYOffset;D&&C&&D!==b&&(Cz.bottom+W)&&p(),D=b})}).on("mouseleave.focus",function(){A=B=null,U=V=0,c.off("scroll.focus")}).on("mousemove.focus",function(b){var c=b.clientX,d=b.clientY,e=a.pageYOffset,f=a.pageXOffset;if(A&&B&&(c!==A||d!==B))if(B>=d&&d=B&&d>z.bottom-e||A>=c&&c=A&&c>z.right-f){if(U+=Math.abs(A-c),V+=Math.abs(B-d),(d<=z.top-W-e||d>=z.bottom+W-e||c<=z.left-W-f||c>=z.right+W-f)&&(U>10||V>10))return p(),A=B=null,void(U=V=0)}else U=V=0;A=c,B=d}).on("touchstart.focus",function(a){a.preventDefault(),p()}),J.off("mouseenter.focus"),E&&(clearTimeout(E),E=null),H.addClass("focus-on").removeClass("focus-off")),r(),t()))}function p(a){w&&(w=!1,clearTimeout(F),F=setTimeout(function(){M.hide()},200),J.css("z-index",""),M.off("mouseenter.focus mouseleave.focus mousemove.focus touchstart.focus"),"undefined"==typeof a&&J.on("mouseenter.focus",function(){(b.contains(J.get(0),document.activeElement)||G)&&o()}),E=setTimeout(function(){E=null,J.off("mouseenter.focus")},1e3),H.addClass("focus-off").removeClass("focus-on")),s(),u()}function q(){setTimeout(function(){function a(a){return b.contains(a.get(0),document.activeElement)}var c=document.activeElement.compareDocumentPosition(J.get(0));2!==c&&4!==c||!(a(P)||a(I)||a(f))||p()},0)}function r(){!x&&w&&(x=!0,e.on("mouseenter.focus",function(){e.addClass("focus-off")}).on("mouseleave.focus",function(){e.removeClass("focus-off")}))}function s(){x&&(x=!1,e.off(".focus"))}function t(){y||!w||N.find(":focus").length||(y=!0,N.stop().fadeTo("fast",.3).on("mouseenter.focus",u).off("mouseleave.focus"),O.on("focus.focus",u).off("blur.focus"))}function u(){y&&(y=!1,N.stop().fadeTo("fast",1).on("mouseleave.focus",t).off("mouseenter.focus"),O.on("blur.focus",t).off("focus.focus"))}function v(a){a.altKey&&a.shiftKey&&87===a.keyCode&&m()}var w,x,y,z,A,B,C,D,E,F,G,H=b(document.body),I=b("#wpcontent"),J=b("#post-body-content"),K=b("#title"),L=b("#content"),M=b(document.createElement("DIV")),N=b("#edit-slug-box"),O=N.find("a").add(N.find("button")).add(N.find("input")),P=b("#adminmenuwrap"),Q=b(),R=b(),S="on"===a.getUserSetting("editor_expand","on"),T=S?"on"===a.getUserSetting("post_dfw"):!1,U=0,V=0,W=20;H.append(M),M.css({display:"none",position:"fixed",top:e.height(),right:0,bottom:0,left:0,"z-index":9997}),J.css({position:"relative"}),c.on("mousemove.focus",function(a){C=a.pageY}),b("#postdivrich").hasClass("wp-editor-expand")&&L.on("keydown.focus-shortcut",v),d.on("tinymce-editor-setup.focus",function(a,b){b.addButton("dfw",{active:T,classes:"wp-dfw btn widget",disabled:!S,onclick:m,onPostRender:function(){var a=this;d.on("dfw-activate.focus",function(){a.disabled(!1)}).on("dfw-deactivate.focus",function(){a.disabled(!0)}).on("dfw-on.focus",function(){a.active(!0)}).on("dfw-off.focus",function(){a.active(!1)})},tooltip:"Distraction-free writing mode",shortcut:"Alt+Shift+W"}),b.addCommand("wpToggleDFW",m),b.addShortcut("alt+shift+w","","wpToggleDFW")}),d.on("tinymce-editor-init.focus",function(a,c){function e(){G=!0}function f(){G=!1}var h,i;"content"===c.id&&(Q=b(c.getWin()),R=b(c.getContentAreaContainer()).find("iframe"),h=function(){c.on("keydown",o),c.on("blur",q),c.on("focus",e),c.on("blur",f),c.on("wp-autoresize",g)},i=function(){c.off("keydown",o),c.off("blur",q),c.off("focus",e),c.off("blur",f),c.off("wp-autoresize",g)},T&&h(),d.on("dfw-on.focus",h).on("dfw-off.focus",i),c.on("click",function(a){a.target===c.getDoc().documentElement&&c.focus()}))}),d.on("quicktags-init",function(a,c){var d;c.settings.buttons&&-1!==(","+c.settings.buttons+",").indexOf(",dfw,")&&(d=b("#"+c.name+"_dfw"),b(document).on("dfw-activate",function(){d.prop("disabled",!1)}).on("dfw-deactivate",function(){d.prop("disabled",!0)}).on("dfw-on",function(){d.addClass("active")}).on("dfw-off",function(){d.removeClass("active")}))}),d.on("editor-expand-on.focus",h).on("editor-expand-off.focus",i),T&&(L.on("keydown.focus",o),K.add(L).on("blur.focus",q)),a.wp=a.wp||{},a.wp.editor=a.wp.editor||{},a.wp.editor.dfw={activate:h,deactivate:i,isActive:j,on:k,off:l,toggle:m,isOn:n}})}(window,window.jQuery);
\ No newline at end of file
+!function(a,b){"use strict";var c=b(a),d=b(document),e=b("#wpadminbar"),f=b("#wpfooter");b(function(){function g(){var a=c.width();T={windowHeight:c.height(),windowWidth:a,adminBarHeight:a>600?e.outerHeight():0,toolsHeight:t.outerHeight()||0,menuBarHeight:A.outerHeight()||0,visualTopHeight:u.outerHeight()||0,textTopHeight:w.outerHeight()||0,bottomHeight:z.outerHeight()||0,statusBarHeight:B.outerHeight()||0,sideSortablesHeight:C.height()||0},T.menuBarHeight<3&&(T.menuBarHeight=0)}function h(b){var c,d,e,f,g,h=jQuery.ui.keyCode,i=b.keyCode,j=document.createRange(),k=x[0].selectionStart,l=x[0].selectionEnd,m=y[0].firstChild,n=10;if(!k||!l||k===l){try{j.setStart(m,k),j.setEnd(m,l+1)}catch(o){}c=j.getBoundingClientRect(),c.height&&(d=c.top-n,e=d+c.height+n,f=T.adminBarHeight+T.toolsHeight+T.textTopHeight,g=T.windowHeight-T.bottomHeight,f>d&&(i===h.UP||i===h.LEFT||i===h.BACKSPACE)?a.scrollTo(a.pageXOffset,d+a.pageYOffset-f):e>g&&a.scrollTo(a.pageXOffset,e+a.pageYOffset-g))}}function i(){if(!(p&&!p.isHidden()||!p&&"tinymce"===R)){var a,b=x.height();y.width(x.width()-22),y.text(x.val()+" "),a=y.height(),Q>a&&(a=Q),a!==b&&(x.height(a),j())}}function j(b){if(!F||!F.settings.visible){var e,h,j,k,l,m,n,o,q,r=c.scrollTop(),G=b&&b.type,H="scroll"!==G,N=p&&!p.isHidden(),R=Q,U=E.offset().top,V=1,W=s.width();(H||!T.windowHeight)&&g(),N||"resize"!==G||i(),N?(e=u,h=v,n=T.visualTopHeight):(e=w,h=x,n=T.textTopHeight),(N||e.length)&&(m=e.parent().offset().top,o=h.offset().top,q=h.outerHeight(),l=N?Q+n:Q+20,l=q>l+5,l?((!I||H)&&r>=m-T.toolsHeight-T.adminBarHeight&&r<=m-T.toolsHeight-T.adminBarHeight+q-R?(I=!0,t.css({position:"fixed",top:T.adminBarHeight,width:W}),N&&A.length&&A.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),e.css({position:"fixed",top:T.adminBarHeight+T.toolsHeight+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):(I||H)&&(r<=m-T.toolsHeight-T.adminBarHeight?(I=!1,t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())})):r>=m-T.toolsHeight-T.adminBarHeight+q-R&&(I=!1,t.css({position:"absolute",top:q-R,width:W}),N&&A.length&&A.css({position:"absolute",top:q-R,width:W-2*V}),e.css({position:"absolute",top:q-R+T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}))),(!J||H&&S)&&r+T.windowHeight<=o+q+T.bottomHeight+T.statusBarHeight+V?b&&b.deltaHeight>0&&b.deltaHeight<100?a.scrollBy(0,b.deltaHeight):S&&(J=!0,B.css({position:"fixed",bottom:T.bottomHeight,visibility:"",width:W-2*V}),z.css({position:"fixed",bottom:0,width:W})):(!S&&J||(J||H)&&r+T.windowHeight>o+q+T.bottomHeight+T.statusBarHeight-V)&&(J=!1,B.attr("style",S?"":"visibility: hidden;"),z.attr("style",""))):H&&(t.css({position:"absolute",top:0,width:W}),N&&A.length&&A.css({position:"absolute",top:0,width:W-2*V}),e.css({position:"absolute",top:T.menuBarHeight,width:W-2*V-(N?0:e.outerWidth()-e.width())}),B.attr("style",S?"":"visibility: hidden;"),z.attr("style","")),D.width()<300&&T.windowWidth>600&&d.height()>C.height()+U+120&&T.windowHeightT.windowHeight||K||L?U>=r+O?(C.attr("style",""),K=L=!1):r>M?K?(K=!1,j=C.offset().top-T.adminBarHeight,k=f.offset().top,kr&&(L?(L=!1,j=C.offset().top-P,k=f.offset().top,k=r+O&&(K=!0,C.css({position:"fixed",top:O,bottom:""}))):(r>=U-O?C.css({position:"fixed",top:O}):C.attr("style",""),K=L=!1),M=r):(C.attr("style",""),K=L=!1),H&&(s.css({paddingTop:T.toolsHeight}),N?v.css({paddingTop:T.visualTopHeight+T.menuBarHeight}):(x.css({marginTop:T.textTopHeight}),y.width(W-20-2*V))))}}function k(){i(),j()}function l(a){for(var b=1;6>b;b++)setTimeout(a,500*b)}function m(){clearTimeout(q),q=setTimeout(j,100)}function n(){a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.addClass("wp-editor-expand"),c.on("scroll.editor-expand resize.editor-expand",function(a){j(a.type),m()}),d.on("wp-collapse-menu.editor-expand postboxes-columnchange.editor-expand editor-classchange.editor-expand",j).on("postbox-toggled.editor-expand",function(){!K&&!L&&a.pageYOffset>O&&(L=!0,a.scrollBy(0,-1),j(),a.scrollBy(0,1)),j()}).on("wp-window-resized.editor-expand",function(){p&&!p.isHidden()?p.execCommand("wpAutoResize"):i()}),x.on("focus.editor-expand input.editor-expand propertychange.editor-expand",i),x.on("keyup.editor-expand",h),G(),F&&F.pubsub.subscribe("hidden",k),p&&(p.settings.wp_autoresize_on=!0,p.execCommand("wpAutoResizeOn"),p.isHidden()||p.execCommand("wpAutoResize")),(!p||p.isHidden())&&i(),j(),d.trigger("editor-expand-on")}function o(){var e=parseInt(a.getUserSetting("ed_size",300),10);50>e?e=50:e>5e3&&(e=5e3),a.pageYOffset&&a.pageYOffset>N&&a.scrollTo(a.pageXOffset,0),r.removeClass("wp-editor-expand"),c.off(".editor-expand"),d.off(".editor-expand"),x.off(".editor-expand"),H(),F&&F.pubsub.unsubscribe("hidden",k),b.each([u,w,t,A,z,B,s,v,x,C],function(a,b){b&&b.attr("style","")}),I=J=K=L=!1,p&&(p.settings.wp_autoresize_on=!1,p.execCommand("wpAutoResizeOff"),p.isHidden()||(x.hide(),e&&p.theme.resizeTo(null,e))),e&&x.height(e),d.trigger("editor-expand-off")}var p,q,r=b("#postdivrich"),s=b("#wp-content-wrap"),t=b("#wp-content-editor-tools"),u=b(),v=b(),w=b("#ed_toolbar"),x=b("#content"),y=b(''),z=b("#post-status-info"),A=b(),B=b(),C=b("#side-sortables"),D=b("#postbox-container-1"),E=b("#post-body"),F=a.wp.editor&&a.wp.editor.fullscreen,G=function(){},H=function(){},I=!1,J=!1,K=!1,L=!1,M=0,N=130,O=56,P=20,Q=300,R=s.hasClass("tmce-active")?"tinymce":"html",S=!!parseInt(a.getUserSetting("hidetb"),10),T={windowHeight:0,windowWidth:0,adminBarHeight:0,toolsHeight:0,menuBarHeight:0,visualTopHeight:0,textTopHeight:0,bottomHeight:0,statusBarHeight:0,sideSortablesHeight:0};y.insertAfter(x),y.css({"font-family":x.css("font-family"),"font-size":x.css("font-size"),"line-height":x.css("line-height"),"white-space":"pre-wrap","word-wrap":"break-word"}),d.on("tinymce-editor-init.editor-expand",function(d,e){function f(){var a,b,c,d=e.selection.getNode();if(e.wp&&e.wp.getView&&(b=e.wp.getView(d)))c=b.getBoundingClientRect();else{a=e.selection.getRng();try{c=a.getClientRects()[0]}catch(f){}c||(c=d.getBoundingClientRect())}return c.height?c:!1}function g(a){var b=a.keyCode;47>=b&&b!==q.SPACEBAR&&b!==q.ENTER&&b!==q.DELETE&&b!==q.BACKSPACE&&b!==q.UP&&b!==q.LEFT&&b!==q.DOWN&&b!==q.UP||b>=91&&93>=b||b>=112&&123>=b||144===b||145===b||h(b)}function h(b){var c,d,g,h,i=f(),j=50;i&&(c=i.top+e.iframeElement.getBoundingClientRect().top,d=c+i.height,c-=j,d+=j,g=T.adminBarHeight+T.toolsHeight+T.menuBarHeight+T.visualTopHeight,h=T.windowHeight-(S?T.bottomHeight+T.statusBarHeight:0),h-gc&&(b===q.UP||b===q.LEFT||b===q.BACKSPACE)?a.scrollTo(a.pageXOffset,c+a.pageYOffset-g):d>h&&a.scrollTo(a.pageXOffset,d+a.pageYOffset-h)))}function k(a){a.state||j()}function m(){c.on("scroll.mce-float-panels",t),setTimeout(function(){e.execCommand("wpAutoResize"),j()},300)}function n(){c.off("scroll.mce-float-panels"),setTimeout(function(){var b=s.offset().top;a.pageYOffset>b&&a.scrollTo(a.pageXOffset,b-T.adminBarHeight),i(),j()},100),j()}function o(){S=!S}var q=a.tinymce.util.VK,t=_.debounce(function(){!b(".mce-floatpanel:hover").length&&a.tinymce.ui.FloatPanel.hideAll(),b(".mce-tooltip").hide()},1e3,!0);"content"===e.id&&(p=e,e.settings.autoresize_min_height=Q,u=s.find(".mce-toolbar-grp"),v=s.find(".mce-edit-area"),B=s.find(".mce-statusbar"),A=s.find(".mce-menubar"),G=function(){e.on("keyup",g),e.on("show",m),e.on("hide",n),e.on("wp-toolbar-toggle",o),e.on("setcontent wp-autoresize wp-toolbar-toggle",j),e.on("undo redo",h),e.on("FullscreenStateChanged",k),c.off("scroll.mce-float-panels").on("scroll.mce-float-panels",t)},H=function(){e.off("keyup",g),e.off("show",m),e.off("hide",n),e.off("wp-toolbar-toggle",o),e.off("setcontent wp-autoresize wp-toolbar-toggle",j),e.off("undo redo",h),e.off("FullscreenStateChanged",k),c.off("scroll.mce-float-panels")},r.hasClass("wp-editor-expand")&&(G(),l(j)))}),r.hasClass("wp-editor-expand")&&(n(),s.hasClass("html-active")&&l(function(){j(),i()})),b("#adv-settings .editor-expand").show(),b("#editor-expand-toggle").on("change.editor-expand",function(){b(this).prop("checked")?(n(),a.setUserSetting("editor_expand","on")):(o(),a.setUserSetting("editor_expand","off"))}),a.editorExpand={on:n,off:o}}),b(function(){function g(){z=J.offset(),z.right=z.left+J.outerWidth(),z.bottom=z.top+J.outerHeight()}function h(){S||(S=!0,d.trigger("dfw-activate"),L.on("keydown.focus-shortcut",v))}function i(){S&&(l(),S=!1,d.trigger("dfw-deactivate"),L.off("keydown.focus-shortcut"))}function j(){return S}function k(){!T&&S&&(T=!0,L.on("keydown.focus",o),K.add(L).on("blur.focus",q),o(),a.setUserSetting("post_dfw","on"),d.trigger("dfw-on"))}function l(){T&&(T=!1,K.add(L).off(".focus"),p(),J.off(".focus"),a.setUserSetting("post_dfw","off"),d.trigger("dfw-off"))}function m(){T?l():k()}function n(){return T}function o(b){var d=b&&b.keyCode;return 27===d||87===d&&b.altKey&&b.shiftKey?void p(b):void(b&&(b.metaKey||b.ctrlKey&&!b.altKey||b.altKey&&b.shiftKey||d&&(47>=d&&8!==d&&13!==d&&32!==d&&46!==d||d>=91&&93>=d||d>=112&&135>=d||d>=144&&150>=d||d>=224))||(w||(w=!0,clearTimeout(F),F=setTimeout(function(){M.show()},600),J.css("z-index",9998),M.on("mouseenter.focus",function(){g(),c.on("scroll.focus",function(){var b=a.pageYOffset;D&&C&&D!==b&&(Cz.bottom+W)&&p(),D=b})}).on("mouseleave.focus",function(){A=B=null,U=V=0,c.off("scroll.focus")}).on("mousemove.focus",function(b){var c=b.clientX,d=b.clientY,e=a.pageYOffset,f=a.pageXOffset;if(A&&B&&(c!==A||d!==B))if(B>=d&&d=B&&d>z.bottom-e||A>=c&&c=A&&c>z.right-f){if(U+=Math.abs(A-c),V+=Math.abs(B-d),(d<=z.top-W-e||d>=z.bottom+W-e||c<=z.left-W-f||c>=z.right+W-f)&&(U>10||V>10))return p(),A=B=null,void(U=V=0)}else U=V=0;A=c,B=d}).on("touchstart.focus",function(a){a.preventDefault(),p()}),J.off("mouseenter.focus"),E&&(clearTimeout(E),E=null),H.addClass("focus-on").removeClass("focus-off")),r(),t()))}function p(a){w&&(w=!1,clearTimeout(F),F=setTimeout(function(){M.hide()},200),J.css("z-index",""),M.off("mouseenter.focus mouseleave.focus mousemove.focus touchstart.focus"),"undefined"==typeof a&&J.on("mouseenter.focus",function(){(b.contains(J.get(0),document.activeElement)||G)&&o()}),E=setTimeout(function(){E=null,J.off("mouseenter.focus")},1e3),H.addClass("focus-off").removeClass("focus-on")),s(),u()}function q(){setTimeout(function(){function a(a){return b.contains(a.get(0),document.activeElement)}var c=document.activeElement.compareDocumentPosition(J.get(0));2!==c&&4!==c||!(a(P)||a(I)||a(f))||p()},0)}function r(){!x&&w&&(x=!0,e.on("mouseenter.focus",function(){e.addClass("focus-off")}).on("mouseleave.focus",function(){e.removeClass("focus-off")}))}function s(){x&&(x=!1,e.off(".focus"))}function t(){y||!w||N.find(":focus").length||(y=!0,N.stop().fadeTo("fast",.3).on("mouseenter.focus",u).off("mouseleave.focus"),O.on("focus.focus",u).off("blur.focus"))}function u(){y&&(y=!1,N.stop().fadeTo("fast",1).on("mouseleave.focus",t).off("mouseenter.focus"),O.on("blur.focus",t).off("focus.focus"))}function v(a){a.altKey&&a.shiftKey&&87===a.keyCode&&m()}var w,x,y,z,A,B,C,D,E,F,G,H=b(document.body),I=b("#wpcontent"),J=b("#post-body-content"),K=b("#title"),L=b("#content"),M=b(document.createElement("DIV")),N=b("#edit-slug-box"),O=N.find("a").add(N.find("button")).add(N.find("input")),P=b("#adminmenuwrap"),Q=b(),R=b(),S="on"===a.getUserSetting("editor_expand","on"),T=S?"on"===a.getUserSetting("post_dfw"):!1,U=0,V=0,W=20;H.append(M),M.css({display:"none",position:"fixed",top:e.height(),right:0,bottom:0,left:0,"z-index":9997}),J.css({position:"relative"}),c.on("mousemove.focus",function(a){C=a.pageY}),b("#postdivrich").hasClass("wp-editor-expand")&&L.on("keydown.focus-shortcut",v),d.on("tinymce-editor-setup.focus",function(a,b){b.addButton("dfw",{active:T,classes:"wp-dfw btn widget",disabled:!S,onclick:m,onPostRender:function(){var a=this;d.on("dfw-activate.focus",function(){a.disabled(!1)}).on("dfw-deactivate.focus",function(){a.disabled(!0)}).on("dfw-on.focus",function(){a.active(!0)}).on("dfw-off.focus",function(){a.active(!1)})},tooltip:"Distraction-free writing mode",shortcut:"Alt+Shift+W"}),b.addCommand("wpToggleDFW",m),b.addShortcut("alt+shift+w","","wpToggleDFW")}),d.on("tinymce-editor-init.focus",function(a,c){function e(){G=!0}function f(){G=!1}var h,i;"content"===c.id&&(Q=b(c.getWin()),R=b(c.getContentAreaContainer()).find("iframe"),h=function(){c.on("keydown",o),c.on("blur",q),c.on("focus",e),c.on("blur",f),c.on("wp-autoresize",g)},i=function(){c.off("keydown",o),c.off("blur",q),c.off("focus",e),c.off("blur",f),c.off("wp-autoresize",g)},T&&h(),d.on("dfw-on.focus",h).on("dfw-off.focus",i),c.on("click",function(a){a.target===c.getDoc().documentElement&&c.focus()}))}),d.on("quicktags-init",function(a,c){var d;c.settings.buttons&&-1!==(","+c.settings.buttons+",").indexOf(",dfw,")&&(d=b("#"+c.name+"_dfw"),b(document).on("dfw-activate",function(){d.prop("disabled",!1)}).on("dfw-deactivate",function(){d.prop("disabled",!0)}).on("dfw-on",function(){d.addClass("active")}).on("dfw-off",function(){d.removeClass("active")}))}),d.on("editor-expand-on.focus",h).on("editor-expand-off.focus",i),T&&(L.on("keydown.focus",o),K.add(L).on("blur.focus",q)),a.wp=a.wp||{},a.wp.editor=a.wp.editor||{},a.wp.editor.dfw={activate:h,deactivate:i,isActive:j,on:k,off:l,toggle:m,isOn:n}})}(window,window.jQuery);
\ No newline at end of file
diff --git a/wp-content/languages/admin-nb_NO.mo b/wp-content/languages/admin-nb_NO.mo
index 5c7d894..977027b 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 a798417..e8af487 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: 2015-04-27 20:16:30+0000\n"
+"PO-Revision-Date: 2015-05-04 08:01:04+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -11,83 +11,83 @@ msgstr ""
"Project-Id-Version: Administration\n"
#. translators: 1: Term splitting guide link
-#: wp-admin/about.php:123
+#: wp-admin/about.php:127
msgid "Terms shared across multiple taxonomies will be split when one of them is updated. Find out more in the Plugin Developer Handbook."
msgstr "Termer delt over flere taksonomier vil bli delt opp når én av dem oppdateres. Finn ut mer i Utviklerhåndboken for utvidelser."
-#: wp-admin/about.php:60
+#. translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza
+#. emoji, 5: Emoji Codex link
+#: wp-admin/about.php:86
+msgid "Don’t use any of those characters? You can still have fun — emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other emoji."
+msgstr "Bruker du ikke noen av de tegnene? Du kan fortsatt ha det gøy: emoji er nå tilgjengelig i WordPress! Så slå deg løs og dekorér innholdet ditt med %1$s, %2$s, %3$s, %4$s, og alle de andre emojiene. "
+
+#: wp-admin/about.php:64
msgid "Clip it, edit it, publish it. Get familiar with the new and improved Press This. From the Tools menu, add Press This to your browser bookmark bar or your mobile device home screen. Once installed you can share your content with lightning speed. Sharing your favorite videos, images, and content has never been this fast or this easy."
msgstr "Klipp det, rediger det, publiser det. Bli kjent med den nye og forbedrede «Skriv om dette». I Verktøy-menyen finner du «Skriv om dette»-appen, som du kan dra til din nettlesers bokmerkerad eller din mobile enhets hjem-skjerm. Etter at den er installert kan du dele ditt innhold lynraskt. Å dele dine favorittfilmer, -bilder og annet innhold har aldri være så raskt og enkelt."
-#: wp-admin/about.php:90
+#: wp-admin/about.php:94
msgid "Switch themes in the Customizer"
msgstr "Bytt temaer i tematilpasseren"
#. translators: 1: WP_Query, 2: WP_Comment_Query, 3: WP_User_Query
-#: wp-admin/about.php:129
+#: wp-admin/about.php:133
msgid "%1$s, %2$s, and %3$s now support complex ordering with named meta query clauses."
msgstr "%1$s, %2$s og %3$s støtter nå kompleks rekkefølge med navngitte metaspørringsklausuler."
#. translators: %s wp.a11y.speak()
-#: wp-admin/about.php:116
+#: wp-admin/about.php:120
msgid "You can now send audible notifications to screen readers in JavaScript with %s. Pass it a string, and an update will be sent to a dedicated ARIA live notifications area."
msgstr "Du kan nå sende hørbare varsler til skjermlesere i JavaScript med %s. Send det en tekststreng, og en oppdatering vil bli sendt til et dedikert ARIA live varslingsområde."
-#: wp-admin/about.php:100
+#: wp-admin/about.php:104
msgid "Streamlined plugin updates"
msgstr "Strømlinjeformede oppdateringer av utvidelser"
-#: wp-admin/about.php:110
+#: wp-admin/about.php:114
msgid "utf8mb4 support"
msgstr "Støtte for utf8mb4"
-#: wp-admin/about.php:111
+#: wp-admin/about.php:115
msgid "Database character encoding has changed from utf8 to utf8mb4, which adds support for a whole range of new 4-byte characters."
msgstr "Tegnkodingen i databasen er endret fra utf8 til utf8mb4, som betyr støtte for en hel serie av nye 4-byte tegn."
-#. translators: 1: heart emoji, 2: frog face emoji, 3, monkey emoji, 4: pizza
-#. emoji, 5: Emoji Codex link
-#: wp-admin/about.php:82
-msgid "Don’t use any of those characters? You can still have fun — emoji are now available in WordPress! Get creative and decorate your content with %1$s, %2$s, %3$s, %4$s, and all the many other emoji."
-msgstr "Bruker du ikke noen av de tegnene? Du kan fortsatt ha det gøy: emoji er nå tilgjengelig i WordPress! Så slå deg løs og dekorér innholdet ditt med %1$s, %2$s, %3$s, %4$s, og alle de mange andre emoijene. "
-
-#: wp-admin/about.php:91
+#: wp-admin/about.php:95
msgid "Browse and preview your installed themes from the Customizer. Make sure the theme looks great with your content, before it debuts on your site. "
msgstr "Bla i og forhåndsvis dine installerte temaer fra tematilpasseren. Forsikre deg om at temaet ser bra ut med ditt innhold, før det får sin debut på ditt nettsted."
-#: wp-admin/about.php:79
+#: wp-admin/about.php:83
msgid "Writing in WordPress, whatever your language, just got better. WordPress 4.2 supports a host of new characters out-of-the-box, including native Chinese, Japanese, and Korean characters, musical and mathematical symbols, and hieroglyphs."
msgstr "Å skrive i WordPress, uansett språk, har akkurat blitt bedre. WordPress støtter stadig flere språk. Nytt i 4.2 er kinesiske, japanske og koreanske tegn, i tillegg til musikalske og matematiske symboler, samt hieroglyfer. "
-#: wp-admin/about.php:78
+#: wp-admin/about.php:82
msgid "Extended character support"
msgstr "Støtte for flere tegn og bokstaver"
-#: wp-admin/about.php:59
+#: wp-admin/about.php:63
msgid "An easier way to share content"
msgstr "En enklere måte å dele innhold"
-#: wp-admin/about.php:96
+#: wp-admin/about.php:100
msgid "Paste links from Tumblr.com and Kickstarter and watch them magically appear right in the editor. With every release, your publishing and editing experience get closer together."
msgstr "Lim inn lenker fra Tumblr.com og Kickstarter og se dem bygges inn automatisk rett i tekstbehandleren. Hver nye utgave av WordPress gjør publiserings- og redigeringsopplevelsen mer sømløs."
-#: wp-admin/about.php:126
+#: wp-admin/about.php:130
msgid "Complex query ordering"
msgstr "Kompleks rekkefølge på spørringer"
-#: wp-admin/about.php:101
+#: wp-admin/about.php:105
msgid "Goodbye boring loading screen, hello smooth and simple plugin updates. Click Update Now and watch the magic happen."
msgstr "Farvel til kjedelige innlastingsskjermer, hallo til strømlinjeformede og enkle utvidelsesoppdateringer. Klikk Oppdater nå og opplev magien."
-#: wp-admin/about.php:95
+#: wp-admin/about.php:99
msgid "Even more embeds"
msgstr "Enda flere innbygginger"
-#: wp-admin/about.php:120
+#: wp-admin/about.php:124
msgid "Shared term splitting"
msgstr "Deling av delte termer"
-#: wp-admin/about.php:113
+#: wp-admin/about.php:117
msgid "JavaScript accessibility"
msgstr "JavaScript-tilgjengelighet"
@@ -95,7 +95,7 @@ msgstr "JavaScript-tilgjengelighet"
msgid "Thank you for updating! WordPress %s helps you communicate and share, globally."
msgstr "Takk for at du oppdaterer! WordPress %s hjelper deg å kommunisere og dele innhold med hele verden."
-#: wp-admin/about.php:82
+#: wp-admin/about.php:86
msgid "https://codex.wordpress.org/Emoji"
msgstr "https://codex.wordpress.org/Emoji"
@@ -682,7 +682,7 @@ msgstr "Følg lenken for å åpne Skriv om dette. Så kan du legge den til dine
msgid "Open Press This"
msgstr "Åpne Skriv om dette"
-#: wp-admin/about.php:61 wp-admin/tools.php:48
+#: wp-admin/about.php:65 wp-admin/tools.php:48
msgid "Drag the bookmarklet below to your bookmarks bar. Then, when you’re on a page you want to share, simply “press” it."
msgstr "Dra bokmerkeskriptet nedenfor til dine bokmerker. Da kan du enkelt skrive om en nettside som du har lyst å dele."
@@ -3088,7 +3088,7 @@ msgstr "Hent favoritter"
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/update-core.php:1177 wp-admin/update-core.php:433
+#: wp-admin/includes/update-core.php:1180 wp-admin/update-core.php:433
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."
@@ -4140,12 +4140,12 @@ msgstr "Vis verktøylinjen når du ser på nettstedet"
msgid "Contributing Developers"
msgstr "Medvirkende utviklere"
-#: wp-admin/about.php:47 wp-admin/about.php:174
+#: wp-admin/about.php:47 wp-admin/about.php:51 wp-admin/about.php:178
msgid "For more information, see the release notes."
msgstr "For mer informasjon, se versjonsmerknadene."
#. translators: 1: WordPress version number, 2: plural number of bugs.
-#: wp-admin/about.php:163
+#: wp-admin/about.php:167
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."
@@ -4153,7 +4153,7 @@ msgstr[1] "Versjon %1$s rettet %2$s programfeil."
#. translators: 1: WordPress version number, 2: plural number of bugs. Singular
#. security issue.
-#: wp-admin/about.php:167
+#: wp-admin/about.php:171
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."
@@ -4161,7 +4161,7 @@ msgstr[1] "Versjon %1$s tettet et sikkerhetshull og rettet %2$s
#. translators: 1: WordPress version number, 2: plural number of bugs. More
#. than one security issue.
-#: wp-admin/about.php:171
+#: wp-admin/about.php:45 wp-admin/about.php:175
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."
@@ -4171,7 +4171,7 @@ msgstr[1] "Versjon %1$s tettet noen sikkerhetshull og rettet %2
msgid "Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab in the upper corner."
msgstr "Velkommen til kontrollpanelet i WordPress. Dette er det skjermbildet vil du se hver gang du logger inn på nettstedet, og gir deg tilgang alle administrative funksjoner i WordPress. Du kan få mer informasjon om hvert enkelt skjermbilde om du klikker Hjelp-fanen i øvre høyre hjørne."
-#: wp-admin/about.php:44 wp-admin/about.php:155
+#: wp-admin/about.php:159
msgid "Security Release"
msgid_plural "Security Releases"
msgstr[0] "Sikkerhetsoppdatering"
@@ -4181,20 +4181,20 @@ msgstr[1] "Sikkerhetsoppdateringer"
msgid "What’s New"
msgstr "Hva er nytt"
-#: wp-admin/about.php:156
+#: wp-admin/about.php:44 wp-admin/about.php:160
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:154
+#: wp-admin/about.php:158
msgid "Maintenance Release"
msgid_plural "Maintenance Releases"
msgstr[0] "Vedlikeholdsoppdatering"
msgstr[1] "Vedlikeholdsoppdateringer"
#. translators: 1: WordPress version number.
-#: wp-admin/about.php:45 wp-admin/about.php:159
+#: wp-admin/about.php:49 wp-admin/about.php:163
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."
@@ -4204,11 +4204,11 @@ msgstr[1] "Versjon %1$s tettet noen sikkerhetshull."
msgid "This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures."
msgstr "Dette skjermbildet lar deg velge strukturen på permalenkene dine. Du kan velge blant de vanligste eller opprette din egen URL-struktur."
-#: wp-admin/about.php:138
+#: wp-admin/about.php:142
msgid "Return to Updates"
msgstr "Tilbake til oppdateringer"
-#: wp-admin/includes/update-core.php:1178 wp-admin/update-core.php:434
+#: wp-admin/includes/update-core.php:1181 wp-admin/update-core.php:434
msgid "Welcome to WordPress %1$s. Learn more."
msgstr "Velkommen til WordPress %1$s. Lær mer."
@@ -4504,11 +4504,11 @@ msgstr "Sannsynligvis direkte inkludering av wp-admin/includes/template.php for
msgid "Welcome to WordPress %s"
msgstr "Velkommen til WordPress %s"
-#: wp-admin/about.php:138
+#: wp-admin/about.php:142
msgid "Return to Dashboard → Updates"
msgstr "Tilbake til Kontrollpanel → Oppdateringer"
-#: wp-admin/about.php:142
+#: wp-admin/about.php:146
msgid "Go to Dashboard → Home"
msgstr "Gå til Kontrollpanel → Hjem"
@@ -4520,7 +4520,7 @@ msgstr "WordPress er blitt til av et nettverk med ihuga entusiaster i hele verde
msgid "Core Developers"
msgstr "Kjerneutviklere"
-#: wp-admin/about.php:106
+#: wp-admin/about.php:110
msgid "Under the Hood"
msgstr "Under panseret"
@@ -6783,7 +6783,7 @@ msgid "Update WordPress"
msgstr "Oppdater WordPress"
#: wp-admin/includes/class-wp-upgrader.php:2672
-#: wp-admin/includes/update-core.php:1174 wp-admin/update-core.php:432
+#: wp-admin/includes/update-core.php:1177 wp-admin/update-core.php:432
msgid "WordPress updated successfully"
msgstr "Oppdateringen av WordPress var vellykket"
@@ -6857,7 +6857,7 @@ msgid_plural "Drop-ins (%s)"
msgstr[0] "Innslipp (%s)"
msgstr[1] "Innslipp (%s)"
-#: wp-admin/about.php:142
+#: wp-admin/about.php:146
msgid "Go to Dashboard"
msgstr "Gå til kontrollpanel"
@@ -8223,7 +8223,7 @@ msgstr "Ingen brukere funnet."
msgid "Screen Options"
msgstr "Skjerminnstillinger"
-#: wp-admin/includes/update-core.php:1055
+#: wp-admin/includes/update-core.php:1058
msgid "Upgrading database…"
msgstr "Oppgraderer database…"
@@ -8998,7 +8998,7 @@ msgstr "Målmappen finnes allerede."
#: wp-admin/includes/class-wp-upgrader.php:133 wp-admin/includes/file.php:644
#: wp-admin/includes/file.php:748 wp-admin/includes/file.php:799
-#: wp-admin/includes/update-core.php:1128
+#: wp-admin/includes/update-core.php:1131
msgid "Could not create directory."
msgstr "Kunne ikke lage mappe."
@@ -9112,7 +9112,7 @@ msgstr "Andre WordPress-nyheter"
msgid "View all"
msgstr "Vis alle"
-#: wp-admin/about.php:64 wp-admin/tools.php:16 wp-admin/tools.php:40
+#: wp-admin/about.php:68 wp-admin/tools.php:16 wp-admin/tools.php:40
#: wp-admin/tools.php:51
msgid "Press This"
msgstr "Skriv om dette"
@@ -9311,7 +9311,7 @@ msgstr "Kunne ikke pakke ut fil fra arkivet."
#: wp-admin/includes/file.php:664 wp-admin/includes/file.php:761
#: wp-admin/includes/file.php:794 wp-admin/includes/update-core.php:1020
-#: wp-admin/includes/update-core.php:1123
+#: wp-admin/includes/update-core.php:1126
msgid "Could not copy file."
msgstr "Kunne ikke kopiere fil."
diff --git a/wp-content/languages/nb_NO.po b/wp-content/languages/nb_NO.po
index 7999b88..43df3bc 100644
--- a/wp-content/languages/nb_NO.po
+++ b/wp-content/languages/nb_NO.po
@@ -172,7 +172,7 @@ msgstr "Oppdaterer…"
msgid "Updated!"
msgstr "Oppdatert!"
-#: wp-includes/taxonomy.php:4173
+#: wp-includes/taxonomy.php:4169
msgid "Could not split shared term."
msgstr "Kunne ikke splitte delt term."
@@ -736,7 +736,7 @@ msgstr "(ikke noe navigasjonsmerke)"
#. translators: %s: taxonomy label, %l: list of terms formatted as per
#. $term_template
-#: wp-includes/taxonomy.php:4483
+#: wp-includes/taxonomy.php:4479
msgid "%s: %l."
msgstr "%s: %l."
@@ -4686,7 +4686,7 @@ msgstr "Ikke godkjent"
msgid "Duplicate comment detected; it looks as though you’ve already said that!"
msgstr "To like kommentarer. Det ser ut som om du allerede har sagt dette!"
-#: wp-includes/comment.php:2368
+#: wp-includes/comment.php:2375
msgid "Could not update comment status"
msgstr "Kunne ikke oppdatere kommentarstatus"
@@ -5915,7 +5915,7 @@ msgstr "Kunne ikke sette det som miniatyrbilde. Prøv et annet vedlegg."
msgid "Saving Draft…"
msgstr "Lagrer kladd…"
-#: wp-includes/taxonomy.php:4554
+#: wp-includes/taxonomy.php:4550
msgid "Invalid object ID"
msgstr "Ugyldig objekt-ID"
@@ -5947,7 +5947,7 @@ msgstr "Vennligst logg inn igjen."
msgid "Sidebar %d"
msgstr "Sidekolonne %d"
-#: wp-includes/wp-db.php:2949
+#: wp-includes/wp-db.php:2991
msgid "ERROR: WordPress %1$s requires MySQL %2$s or higher"
msgstr "FEIL: WordPress %1$s krever MySQL %2$s eller høyere"
@@ -6331,7 +6331,7 @@ msgid "Invalid Taxonomy"
msgstr "Ugyldig taksonomi"
#: wp-includes/taxonomy.php:1318 wp-includes/taxonomy.php:3382
-#: wp-includes/taxonomy.php:4351
+#: wp-includes/taxonomy.php:4347
msgid "Empty Term"
msgstr "Tom term"
diff --git a/wp-content/languages/plugins/akismet-nb_NO.mo b/wp-content/languages/plugins/akismet-nb_NO.mo
index de725e9..69bc20f 100644
Binary files a/wp-content/languages/plugins/akismet-nb_NO.mo and b/wp-content/languages/plugins/akismet-nb_NO.mo differ
diff --git a/wp-content/languages/plugins/akismet-nb_NO.po b/wp-content/languages/plugins/akismet-nb_NO.po
index 7eb870c..6103e55 100644
--- a/wp-content/languages/plugins/akismet-nb_NO.po
+++ b/wp-content/languages/plugins/akismet-nb_NO.po
@@ -2,7 +2,7 @@
# This file is distributed under the same license as the Development package.
msgid ""
msgstr ""
-"PO-Revision-Date: 2015-04-12 19:11:03+0000\n"
+"PO-Revision-Date: 2015-05-10 18:23:31+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -10,11 +10,75 @@ msgstr ""
"X-Generator: GlotPress/1.0-alpha-1000\n"
"Project-Id-Version: Development\n"
-#: views/notice.php:90
+#: views/notice.php:81 views/notice.php:104 views/notice.php:111
+msgid "Please contact our support team with any questions."
+msgstr "Vennligst kontakt vårt support-team hvis du har noen spørsmål."
+
+#: views/notice.php:102
+msgid "Your Pro subscription allows the use of Akismet on only one site. Please purchase additional Pro subscriptions or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites."
+msgstr "Ditt Pro-abonnement lar deg kun bruke Akismet på ett nettsted. Vennligst kjøp flere Pro-abonnementer eller oppgrader til et Enterprise-abonnement som lar deg bruke Akismet på et ubegrenset antall nettsteder."
+
+#: views/notice.php:109
+msgid "To continue your service, upgrade to an Enterprise subscription, which covers an unlimited number of sites."
+msgstr "For å fortsette med tjenesten, oppgrader til et enterprise-abonnement, som er gyldig for et ubegrenset antall nettsteder."
+
+#: views/notice.php:79
+msgid "Since 2012, Akismet began using subscriptions for all accounts (even free ones). It looks like a subscription has not been assigned to your account, and we’d appreciate it if you’d sign into your account and choose one."
+msgstr "Siden 2012, har Akismet brukt abonnementer for alle kontoer (også gratis-kontoer). Det ser ut til at et abonnement ikke har blitt tildelt din konto, og vi setter pris på om du vil logge inn i din konto og velge et."
+
+#: class.akismet-admin.php:515
+msgid "Akismet caught this comment as spam."
+msgstr "Akismet tror at denne kommentaren er useriøs."
+
+#: class.akismet-admin.php:512
+msgid "Akismet re-checked and caught this comment as spam."
+msgstr "Akismet testet denne kommentaren på nytt og mener at den er useriøs."
+
+#: class.akismet-admin.php:521
+msgid "Akismet cleared this comment."
+msgstr "Akismet godkjente denne kommentaren."
+
+#: class.akismet-admin.php:536
+msgid "%s reported this comment as not spam."
+msgstr "%s rapporterte at denne kommentaren er seriøs."
+
+#: class.akismet-admin.php:550
+msgid "Akismet was unable to check this comment (response: %s) but will automatically retry later."
+msgstr "Akismet kunne ikke sjekke denne kommentaren (respons: %s), men vil prøve igjen senere."
+
+#: class.akismet-admin.php:518
+msgid "Akismet re-checked and cleared this comment."
+msgstr "Akismet sjekket denne kommentaren på nytt og godkjente den."
+
+#: class.akismet-admin.php:528
+msgid "%s reported this comment as spam."
+msgstr "%s rapporterte denne kommentaren som useriøs."
+
+#: class.akismet-admin.php:531
+msgid "This comment was reported as spam."
+msgstr "Denne kommentaren ble rappportert som useriøs"
+
+#: class.akismet-admin.php:539
+msgid "This comment was reported as not spam."
+msgstr "Denne kommentaren ble rapportert som seriøs."
+
+#: class.akismet-admin.php:524
+msgid "Comment was caught by wp_blacklist_check."
+msgstr "Kommentaren ble stoppet av wp_blacklist_check."
+
+#: class.akismet-admin.php:569
+msgid "%1$s changed the comment status to %2$s."
+msgstr "%1$s endret status på kommentaren til %2$s."
+
+#: class.akismet-admin.php:555
+msgid "Akismet was unable to recheck this comment (response: %s)."
+msgstr "Akismet kunne ikke sjekke denne kommentaren på nytt (respons: %s)."
+
+#: views/notice.php:94
msgid "The key you entered could not be verified."
msgstr "Nøkkelen du skrev inn kunne ikke verifiseres."
-#: views/notice.php:91
+#: views/notice.php:95
msgid "The connection to akismet.com cannot be established. Please refer to our guide about firewalls and check your server configuration."
msgstr "Koblingen til akismet.com kunne ikke etableres. Vennligst se vår guide til brannmurer og sjekk din serverkonfigurasjon."
@@ -46,10 +110,6 @@ msgstr "Deaktivert."
msgid "SSL Status"
msgstr "SSL-status"
-#: views/notice.php:97
-msgid "Your Pro subscription allows the use of Akismet on only one site. Please purchase additional Pro subscriptions or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.
If you have any questions, please get in touch with our support team."
-msgstr "Ditt «Pro»-abonnement lar deg kun bruke Akismet på ett nettsted. Vennligst kjøp flere Pro-abonnementer eller oppgrader til en Enterprise-konto som lar deg bruke Akismet på et ubegrenset antall nettsteder.
Hvis du har noen spørsmål, vennligst ta kontakt med vårt support-team."
-
#: views/config.php:127
msgid "Spam in the spam folder older than 1 day is deleted automatically."
msgid_plural "Spam in the spam folder older than %2$d days is deleted automatically."
@@ -64,7 +124,7 @@ msgstr "Benyttet av millioner, er Akismet muligens den beste måten i verden å
msgid "http://akismet.com/"
msgstr "http://akismet.com/"
-#: class.akismet-admin.php:692
+#: class.akismet-admin.php:781
msgid "Please check your Akismet configuration and contact your web host if problems persist."
msgstr "Vennligst sjekk din Akismet-konfigurasjon og kontakt din web-admin hvis problemet vedvarer."
@@ -124,10 +184,6 @@ msgstr "Aktiv"
msgid "There is a problem with your key."
msgstr "Det er et problem med din nøkkel."
-#: views/notice.php:78
-msgid "Since 2012, Akismet began using subscriptions for all accounts (even free ones). It looks like a subscription has not been assigned to your account, and we’d appreciate it if you’d sign into your account and choose one. Please contact our support team with any questions."
-msgstr "Siden 2012 har Akismet begynt å bruke abonnementer for alle kontoer (også gratiskontoer). Det ser ikke ut til at et abonnement har blitt knyttet til din konto, og vi setter pris på om du logger inn i din konto og velger en. Vennligst kontakt vårt support-team hvis du har noen spørsmål."
-
#: class.akismet-admin.php:196 views/config.php:114
msgid "Strictness"
msgstr "Strenghet"
@@ -152,19 +208,15 @@ msgstr "Kommentarer"
msgid "Your subscription is missing."
msgstr "Ditt abonnement mangler."
-#: views/notice.php:99
-msgid "You're using Akismet on far too many sites for your Pro subscription."
+#: views/notice.php:107
+msgid "You’re using Akismet on far too many sites for your Pro subscription."
msgstr "Du bruker Akismet på altfor mange nettsteder for ditt Pro-abonnement."
-#: views/notice.php:96
-msgid "You're using your Akismet key on more sites than your Pro subscription allows."
+#: views/notice.php:100
+msgid "You’re using your Akismet key on more sites than your Pro subscription allows."
msgstr "Du bruker din Akismet-nøkkel på flere nettsteder enn ditt Pro-abonnement tillater."
-#: views/notice.php:100
-msgid "To continue your service, upgrade to an Enterprise subscription, which covers an unlimited number of sites. Please contact our support team with any questions."
-msgstr "For å fortsette din tjeneste, oppgrader til et Enterprise-abonnement som dekker ubegrenset antall nettsteder. Vennligst kontakt vårt brukerstøtte-team med ethvert spørsmål."
-
-#: views/notice.php:82
+#: views/notice.php:86
msgid "Your Akismet account has been successfully set up and activated. Happy blogging!"
msgstr "Din Akismet-konto har blitt opprettet og aktivert. God blogging!"
@@ -172,7 +224,7 @@ msgstr "Din Akismet-konto har blitt opprettet og aktivert. God blogging!"
msgid "Akismet %s requires WordPress 3.0 or higher."
msgstr "Akismet %s krever WordPress 3.0 eller nyere."
-#: views/notice.php:86
+#: views/notice.php:90
msgid "The key you entered is invalid. Please double-check it."
msgstr "Nøkkelen du skrev inn er ikke gyldig. Vennligst kontroller den."
@@ -310,10 +362,6 @@ msgstr "Ditt abonnement på %s er suspendert"
msgid "Activate your Akismet account"
msgstr "Aktiver din Akismet-konto"
-#: views/notice.php:14
-msgid "Almost done - activate your account and say goodbye to comment spam"
-msgstr "Nesten ferdig - Akriver din konto og si farvel til useriøse kommentarer"
-
#: views/config.php:109
msgid "Show approved comments"
msgstr "Vis godkjente kommentarer"
@@ -322,7 +370,7 @@ msgstr "Vis godkjente kommentarer"
msgid "Save Changes"
msgstr "Lagre endringer"
-#: class.akismet-admin.php:438
+#: class.akismet-admin.php:443
msgid "Awaiting spam check"
msgstr "Avventer spam-sjekk"
@@ -341,7 +389,7 @@ msgstr[0] "%1$s useriøs kommentar stoppet av <
msgstr[1] "%1$s useriøse kommentarer stoppet av Akismet"
#: class.akismet-admin.php:69 class.akismet-admin.php:191
-#: class.akismet-admin.php:500 views/config.php:60 views/stats.php:2
+#: class.akismet-admin.php:589 views/config.php:60 views/stats.php:2
msgid "Settings"
msgstr "Innstillinger"
@@ -355,11 +403,11 @@ msgid_plural "Akismet has protected your site from %2$s spa
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."
-#: class.akismet-admin.php:442
+#: class.akismet-admin.php:447
msgid "Flagged as spam by Akismet"
msgstr "Merket som useriøst av Akismet"
-#: class.akismet-admin.php:462
+#: class.akismet-admin.php:467
msgid "History"
msgstr "Historikk"
@@ -368,7 +416,7 @@ msgctxt "comments"
msgid "Spam"
msgstr "Useriøse"
-#: class.akismet-admin.php:444
+#: class.akismet-admin.php:449
msgid "Cleared by Akismet"
msgstr "Godkjent av Akismet"
@@ -376,79 +424,43 @@ msgstr "Godkjent av Akismet"
msgid "Comment History"
msgstr "Kommentarhistorikk"
-#: class.akismet-admin.php:478
+#: class.akismet-admin.php:483
msgid "%s approved"
msgid_plural "%s approved"
msgstr[0] "%s godkjent"
msgstr[1] "%s godkjente"
-#: class.akismet.php:537
-msgid "%s reported this comment as not spam"
-msgstr "%s rapporterte denne kommentaren som ikke useriøs"
-
-#: class.akismet.php:231
-msgid "Akismet caught this comment as spam"
-msgstr "Akismet fanget denne kommentaren som useriøs"
-
-#: class.akismet.php:491
-msgid "%s reported this comment as spam"
-msgstr "%s rapporterte denne kommentaren som useriøs"
-
-#: class.akismet.php:578
+#: class.akismet-admin.php:543
msgid "Akismet caught this comment as spam during an automatic retry."
msgstr "Akismet fanget denne kommentaren som useriøs i løpet av en automatisk re-sjekk."
-#: class.akismet.php:233 class.akismet.php:242
+#: class.akismet-admin.php:563
msgid "Comment status was changed to %s"
msgstr "Status for kommentaren ble endret til %s"
-#: class.akismet.php:580
+#: class.akismet-admin.php:546
msgid "Akismet cleared this comment during an automatic retry."
msgstr "Akismet godkjente denne kommentaren ved en ny automatisk kontroll."
-#: class.akismet.php:237
-msgid "Akismet cleared this comment"
-msgstr "Akismet godkjente denne kommentaren"
-
-#: class.akismet.php:240
-msgid "Comment was caught by wp_blacklist_check"
-msgstr "Kommentaren ble fanget opp av wp_blacklist_check"
-
-#: class.akismet.php:247
-msgid "Akismet was unable to check this comment (response: %s), will automatically retry again later."
-msgstr "Akismet var ikke i stand til å sjekke denne kommentaren (respons: %s), men vil automatisk prøve på nytt igjen senere."
-
-#: class.akismet-admin.php:462 class.akismet-admin.php:470
+#: class.akismet-admin.php:467 class.akismet-admin.php:475
msgid "View comment history"
msgstr "Se kommentarhistorikk"
#. #-#-#-#-# akismet.pot (Akismet 3.1.2a1) #-#-#-#-#
#. Plugin Name of the plugin/theme
#: class.akismet-admin.php:76 class.akismet-admin.php:78
-#: class.akismet-admin.php:749 views/config.php:3
+#: class.akismet-admin.php:838 views/config.php:3
msgid "Akismet"
msgstr "Akismet"
-#: class.akismet-admin.php:384
-msgid "Akismet was unable to re-check this comment (response: %s)"
-msgstr "Akismet klarte ikke å re-sjekke denne kommentaren (respons:%s)"
-
-#: class.akismet-admin.php:448
+#: class.akismet-admin.php:453
msgid "Flagged as spam by %s"
msgstr "Merket som useriøs av %s"
-#: class.akismet-admin.php:374
-msgid "Akismet re-checked and caught this comment as spam"
-msgstr "Akismet re-sjekket og fanget denne kommentaren som useriøs"
-
-#: class.akismet-admin.php:450
+#: class.akismet-admin.php:455
msgid "Un-spammed by %s"
msgstr "Merket som ikke useriøs av %s"
-#: class.akismet-admin.php:380
-msgid "Akismet re-checked and cleared this comment"
-msgstr "Akismet re-sjekket og klarerte denne kommentaren"
-
#: class.akismet-widget.php:69
msgid "Spam Blocked"
msgstr "Useriøse kommentarer blokkert"
@@ -474,7 +486,7 @@ msgstr "Akismet statistikk"
msgid "Check for Spam"
msgstr "Se etter useriøse"
-#: class.akismet-admin.php:491
+#: class.akismet-admin.php:577
msgid "%s ago"
msgstr "%s siden"
@@ -506,6 +518,10 @@ msgstr "Merk:"
msgid "Accuracy"
msgstr "Treffsikkerhet"
+#: views/notice.php:14
+msgid "Almost done - activate your account and say goodbye to comment spam"
+msgstr "Nesten ferdig – aktiver din konto og si farvel til useriøse kommentarer"
+
#: class.akismet-admin.php:206 views/config.php:170
msgid "Subscription Type"
msgstr "Type abonnement"
@@ -533,11 +549,11 @@ msgstr "Oversikt"
msgid "All time"
msgstr "Til alle tider"
-#: class.akismet.php:991
+#: class.akismet.php:1011
msgid "Akismet %s requires WordPress %s or higher."
msgstr "Akismet %s krever WordPress %s eller nyere."
-#: class.akismet-admin.php:786
+#: class.akismet-admin.php:875
msgid "Since you joined us, Akismet has saved you %d minutes!"
msgstr "Siden du ble med har Aksimet spart deg for %d minutter!"
@@ -561,7 +577,7 @@ msgstr "Akismet brukerstøtte"
msgid "On this page, you are able to enter/remove an API key, view account information and view spam stats."
msgstr "På denne siden kan du legge inn eller fjerne en API-nøkkel, vise kontoinformasjon og vise statistikk over useriøst innhold."
-#: class.akismet-admin.php:782
+#: class.akismet-admin.php:871
msgid "Since you joined us, Akismet has saved you %s days!"
msgstr "Siden du ble med har Akismet spart deg for %s dager!"
@@ -606,7 +622,7 @@ msgstr "På denne siden kan du se statistikk for useriøst innhold filtrert på
msgid "Akismet Setup"
msgstr "Konfigurering av Akismet"
-#: class.akismet-admin.php:784
+#: class.akismet-admin.php:873
msgid "Since you joined us, Akismet has saved you %d hours!"
msgstr "Siden du ble med har Akismet spart deg for %d timer!"
@@ -622,10 +638,6 @@ msgstr "Endre"
msgid "The subscription status - active, cancelled or suspended"
msgstr "Abonnementets status - aktivt, avbrutt eller avsluttet."
-#: class.akismet.php:446
-msgid "%1$s changed the comment status to %2$s"
-msgstr "%1$s endret kommentarens status til %2$s"
-
#: class.akismet-admin.php:284
msgid "Akismet has protected your site from %3$s spam comment."
msgid_plural "Akismet has protected your site from %3$s spam comments."
@@ -654,7 +666,7 @@ msgstr[1] "%s udetekterte useriøse, %s falske positive"
msgid "Akismet FAQ"
msgstr "Akismet FAQ"
-#: class.akismet-admin.php:779
+#: class.akismet-admin.php:868
msgid "Cleaning up spam takes time."
msgstr "Opprenskning av useriøst innhold tar tid."
@@ -683,7 +695,7 @@ msgstr "API-nøkkel"
msgid "The Akismet subscription plan"
msgstr "Akismet abonnementer"
-#: class.akismet.php:991 views/notice.php:27
+#: class.akismet.php:1011 views/notice.php:27
msgid "Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin."
msgstr "Vennligst oppgrader WordPress til en nyere versjon eller nedgrader til versjon 2.4 av utvidelsen Akismet.."
diff --git a/wp-content/languages/themes/twentyfifteen-nb_NO.po b/wp-content/languages/themes/twentyfifteen-nb_NO.po
index c882fb2..8506e71 100644
--- a/wp-content/languages/themes/twentyfifteen-nb_NO.po
+++ b/wp-content/languages/themes/twentyfifteen-nb_NO.po
@@ -215,7 +215,7 @@ msgstr "Vi klarer ikke å finne det du leter etter. Prøv å søke."
msgid "Widget Area"
msgstr "Widgetområde"
-#. #-#-#-#-# twentyfifteen.pot (Twenty Fifteen 1.1) #-#-#-#-#
+#. #-#-#-#-# twentyfifteen.pot (Twenty Fifteen 1.2) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:25
msgid "https://wordpress.org/"
diff --git a/wp-content/plugins/user-role-editor/includes/class-garvs-wp-lib.php b/wp-content/plugins/user-role-editor/includes/class-garvs-wp-lib.php
index 130cc1c..dbb03f8 100644
--- a/wp-content/plugins/user-role-editor/includes/class-garvs-wp-lib.php
+++ b/wp-content/plugins/user-role-editor/includes/class-garvs-wp-lib.php
@@ -230,7 +230,7 @@ class Garvs_WP_Lib {
public function get_current_url() {
global $wp;
- $current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
+ $current_url = esc_url_raw(add_query_arg($wp->query_string, '', home_url($wp->request )));
return $current_url;
}
diff --git a/wp-content/plugins/user-role-editor/includes/class-ure-lib.php b/wp-content/plugins/user-role-editor/includes/class-ure-lib.php
index 018671a..ed645b1 100644
--- a/wp-content/plugins/user-role-editor/includes/class-ure-lib.php
+++ b/wp-content/plugins/user-role-editor/includes/class-ure-lib.php
@@ -787,7 +787,7 @@ class Ure_Lib extends Garvs_WP_Lib {
$wp_roles = new WP_Roles();
$reload_link = wp_get_referer();
$reload_link = remove_query_arg('action', $reload_link);
- $reload_link = add_query_arg('action', 'roles_restore_note', $reload_link);
+ $reload_link = esc_url_raw(add_query_arg('action', 'roles_restore_note', $reload_link));
?>
-
-
-
-
-
-
-
-
-
-
-
-
Genericons — A free, GPL, flexible icon font for blogs!
-
-
-
-
-
-
-
-
Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic. Use for instant HiDPI or to easily change colors on the fly.
-