From a94b4961d979a2a3e99a4a972d7dc5f6b3204a5a Mon Sep 17 00:00:00 2001
From: "WebMan Design, Oliver Juhas" <webmandesigneu@gmail.com>
Date: Sun, 27 Jan 2019 15:02:22 +0100
Subject: [PATCH] 2.3.1

---
 changelog.md                                  | 15 ++++
 languages/modern.pot                          | 85 ++----------------
 readme.txt                                    |  6 +-
 style.css                                     |  2 +-
 template-parts/admin/notice-upgrade-2.0.0.php | 69 ---------------
 .../admin/notice-upgrade-child-theme.php      | 87 -------------------
 6 files changed, 26 insertions(+), 238 deletions(-)
 delete mode 100644 template-parts/admin/notice-upgrade-2.0.0.php
 delete mode 100644 template-parts/admin/notice-upgrade-child-theme.php

diff --git a/changelog.md b/changelog.md
index d2b5603..8f56664 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,20 @@
 # Modern Changelog
 
+## 2.3.1
+
+* **Update**: Removing obsolete files (related to v2.0.0 upgrade notices)
+* **Update**: Localization
+
+### Files changed:
+
+	changelog.md
+	readme.txt
+	style.css
+	languages/*.*
+	template-parts/admin/notice-upgrade-2.0.0.php
+	template-parts/admin/notice-upgrade-child-theme-2.0.0.php
+
+
 ## 2.3.0
 
 * **Update**: Support URL
diff --git a/languages/modern.pot b/languages/modern.pot
index 6240cde..c7c2228 100644
--- a/languages/modern.pot
+++ b/languages/modern.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Modern\n"
 "Report-Msgid-Bugs-To: https://support.webmandesign.eu\n"
-"POT-Creation-Date: 2019-01-25 13:24+0100\n"
+"POT-Creation-Date: 2019-01-27 14:06+0100\n"
 "PO-Revision-Date: 2015-04-15 10:00+0100\n"
 "Last-Translator: WebMan - Oliver Juhas <webmandesigneu@gmail.com>\n"
 "Language-Team: \n"
@@ -1599,83 +1599,6 @@ msgctxt "1: image width, 2: image height, 3: cropped or scaled?"
 msgid "%1$d &times; %2$d, %3$s"
 msgstr ""
 
-#: template-parts/admin/notice-upgrade-2.0.0.php:20
-msgid "IMPORTANT: Typography options change"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-2.0.0.php:23
-msgid ""
-"Please note that custom typography options have been changed in this theme "
-"update to provide more flexible typography setup."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-2.0.0.php:24
-msgid ""
-"You will most likely need to load your custom fonts using additional plugin."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-2.0.0.php:25
-msgid ""
-"Please read the information in Appearance &rarr; Customize &rarr; Theme "
-"Options &rarr; Typography for more details on custom typography setup."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-2.0.0.php:29
-msgid "Set customize typography now &raquo;"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-2.0.0.php:40
-#: template-parts/admin/notice-upgrade-child-theme.php:53
-#: template-parts/admin/notice-welcome.php:41
-#, php-format
-msgctxt "%s: Theme name."
-msgid "Get started with %s"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:20
-msgid "IMPORTANT: This is a major theme upgrade"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:23
-msgid "Thank you for upgrading your theme!"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:24
-msgid "We have noticed you are using a child theme."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:25
-msgid ""
-"Please note that there are a lot of changes in this theme update and you "
-"should check the code of your child theme modifications for compatibility."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:28
-msgid "We are sorry for any inconvenience caused."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:29
-msgid ""
-"Please understand we strive to provide most relevant and up to date "
-"WordPress code in our products."
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:30
-msgid "Thank you for understanding!"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:34
-msgid "Check documentation about child themes &raquo;"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:38
-msgid "Contact support for help &raquo;"
-msgstr ""
-
-#: template-parts/admin/notice-upgrade-child-theme.php:42
-msgid "Download a previous theme version &raquo;"
-msgstr ""
-
 #: template-parts/admin/notice-welcome.php:27
 #, php-format
 msgctxt "%s: Theme name."
@@ -1686,6 +1609,12 @@ msgstr ""
 msgid "Please read \"Welcome\" page for information about the theme setup."
 msgstr ""
 
+#: template-parts/admin/notice-welcome.php:41
+#, php-format
+msgctxt "%s: Theme name."
+msgid "Get started with %s"
+msgstr ""
+
 #: template-parts/admin/welcome-demo.php:22
 msgid "Installing the theme demo content"
 msgstr ""
diff --git a/readme.txt b/readme.txt
index 4c00b23..e04b786 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: webmandesign
 Tags: one-column, two-columns, right-sidebar, grid-layout, flexible-header, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-image-header, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, portfolio
 Requires at least: 4.7.0
 Tested up to: 5.0.3
-Stable tag: 2.3.0
+Stable tag: 2.3.1
 License: GNU General Public License v3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -37,8 +37,8 @@ Please see `changelog.md` file.
 
 == Upgrade Notice ==
 
-= 2.3.0 =
-* Using CSS variables instead of generating a customized stylesheet, improving security, improving code.
+= 2.3.1 =
+Removing obsolete files, updating localization.
 
 
 == Resources ==
diff --git a/style.css b/style.css
index 5772ab9..322cc88 100644
--- a/style.css
+++ b/style.css
@@ -3,7 +3,7 @@ Theme Name:   Modern
 Theme URI:    https://www.webmandesign.eu/portfolio/modern-wordpress-theme/
 Author:       WebMan Design
 Author URI:   https://www.webmandesign.eu/
-Version:      2.3.0
+Version:      2.3.1
 Text Domain:  modern
 Domain Path:  /languages
 License:      GNU General Public License v3
diff --git a/template-parts/admin/notice-upgrade-2.0.0.php b/template-parts/admin/notice-upgrade-2.0.0.php
deleted file mode 100644
index 6e8ac70..0000000
--- a/template-parts/admin/notice-upgrade-2.0.0.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Admin notice: Upgrade: 2.0.0
- *
- * @package    Modern
- * @copyright  WebMan Design, Oliver Juhas
- *
- * @since    2.0.0
- * @version  2.0.0
- */
-
-
-
-
-
-?>
-
-<div class="updated notice is-dismissible theme-upgrade-notice theme-upgrade-notice-info">
-	<h2>
-		<?php esc_html_e( 'IMPORTANT: Typography options change', 'modern' ); ?>
-	</h2>
-	<p>
-		<?php esc_html_e( 'Please note that custom typography options have been changed in this theme update to provide more flexible typography setup.', 'modern' ); ?>
-		<?php esc_html_e( 'You will most likely need to load your custom fonts using additional plugin.', 'modern' ); ?>
-		<?php esc_html_e( 'Please read the information in Appearance &rarr; Customize &rarr; Theme Options &rarr; Typography for more details on custom typography setup.', 'modern' ); ?>
-	</p>
-	<p>
-		<a href="<?php echo esc_url( admin_url( 'customize.php' ) ); ?>" class="button">
-			<?php esc_html_e( 'Set customize typography now &raquo;', 'modern' ); ?>
-		</a>
-	</p>
-
-	<p>
-		<a href="<?php echo esc_url( admin_url( 'themes.php?page=modern-welcome' ) ); ?>" class="button button-primary">
-			<?php
-
-			$theme_name = wp_get_theme( 'modern' )->get( 'Name' );
-
-			printf(
-				esc_html_x( 'Get started with %s', '%s: Theme name.', 'modern' ),
-				$theme_name
-			);
-
-			?>
-		</a>
-	</p>
-</div>
-
-<style type="text/css" media="screen">
-
-	.notice.theme-upgrade-notice-info {
-		padding: 1.62em;
-		background: #ffeeba;
-		color: #856404;
-		border: .5em solid rgba(0,0,0,.1);
-	}
-
-	.notice.theme-upgrade-notice-info h2 {
-		margin-top: 0;
-		font-weight: 800;
-		color: inherit;
-	}
-
-	.notice.theme-upgrade-notice-info p {
-		max-width: 40em;
-		margin-bottom: 0;
-	}
-
-</style>
diff --git a/template-parts/admin/notice-upgrade-child-theme.php b/template-parts/admin/notice-upgrade-child-theme.php
deleted file mode 100644
index fd20e6c..0000000
--- a/template-parts/admin/notice-upgrade-child-theme.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Admin notice: Upgrade: Incompatible child theme
- *
- * @package    Modern
- * @copyright  WebMan Design, Oliver Juhas
- *
- * @since    2.0.0
- * @version  2.0.0
- */
-
-
-
-
-
-?>
-
-<div class="updated notice is-dismissible theme-upgrade-notice theme-upgrade-notice-alert">
-	<h2>
-		<?php esc_html_e( 'IMPORTANT: This is a major theme upgrade', 'modern' ); ?>
-	</h2>
-	<p>
-		<?php esc_html_e( 'Thank you for upgrading your theme!', 'modern' ); ?>
-		<?php esc_html_e( 'We have noticed you are using a child theme.', 'modern' ); ?>
-		<?php esc_html_e( 'Please note that there are a lot of changes in this theme update and you should check the code of your child theme modifications for compatibility.', 'modern' ); ?>
-	</p>
-	<p>
-		<?php esc_html_e( 'We are sorry for any inconvenience caused.', 'modern' ); ?>
-		<?php esc_html_e( 'Please understand we strive to provide most relevant and up to date WordPress code in our products.', 'modern' ); ?>
-		<?php esc_html_e( 'Thank you for understanding!', 'modern' ); ?>
-	</p>
-	<p>
-		<a href="https://webmandesign.github.io/docs/modern/#child-theme">
-			<?php esc_html_e( 'Check documentation about child themes &raquo;', 'modern' ); ?>
-		</a>
-		<br>
-		<a href="https://support.webmandesign.eu/new-ticket/">
-			<?php esc_html_e( 'Contact support for help &raquo;', 'modern' ); ?>
-		</a>
-		<br>
-		<a href="https://github.com/webmandesign/modern/releases">
-			<?php esc_html_e( 'Download a previous theme version &raquo;', 'modern' ); ?>
-		</a>
-	</p>
-
-	<p>
-		<a href="<?php echo esc_url( admin_url( 'themes.php?page=modern-welcome' ) ); ?>" class="button button-primary">
-			<?php
-
-			$theme_name = wp_get_theme( 'modern' )->get( 'Name' );
-
-			printf(
-				esc_html_x( 'Get started with %s', '%s: Theme name.', 'modern' ),
-				$theme_name
-			);
-
-			?>
-		</a>
-	</p>
-</div>
-
-<style type="text/css" media="screen">
-
-	.notice.theme-upgrade-notice-alert {
-		padding: 1.62em;
-		font-weight: bolder;
-		background: #f5c6cb;
-		color: #721c24;
-		border: .5em solid rgba(0,0,0,.1);
-	}
-
-	.notice.theme-upgrade-notice-alert h2 {
-		margin-top: 0;
-		font-weight: 800;
-		color: inherit;
-	}
-
-	.notice.theme-upgrade-notice-alert p {
-		max-width: 40em;
-		margin-bottom: 0;
-	}
-
-	.notice.theme-upgrade-notice-alert .button {
-		font-weight: 400;
-	}
-
-</style>