diff --git a/languages/switch-to-classicpress-ru_RU.mo b/languages/switch-to-classicpress-ru_RU.mo index 5cdb80b..bba213f 100644 Binary files a/languages/switch-to-classicpress-ru_RU.mo and b/languages/switch-to-classicpress-ru_RU.mo differ diff --git a/languages/switch-to-classicpress-ru_RU.po b/languages/switch-to-classicpress-ru_RU.po index a5ce465..7c5f033 100644 --- a/languages/switch-to-classicpress-ru_RU.po +++ b/languages/switch-to-classicpress-ru_RU.po @@ -3,17 +3,17 @@ msgid "" msgstr "" "Project-Id-Version: Switch to ClassicPress 1.0.1\n" -"Report-Msgid-Bugs-To: https://forums.classicpress.net/c/support/migration-" -"plugin\n" -"POT-Creation-Date: 2019-07-22T20:28:37+03:00\n" -"PO-Revision-Date: 2019-07-22 22:38+03:00\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ClassicPress-" +"Migration-Plugin\n" +"POT-Creation-Date: 2020-01-13T16:22:26+03:00\n" +"PO-Revision-Date: 2020-01-13 16:55+0300\n" "Last-Translator: Ilya Ivanov \n" "Language-Team: \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.3\n" +"X-Generator: Poedit 2.2.4\n" "X-Domain: switch-to-classicpress\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" @@ -22,7 +22,7 @@ msgstr "" #: lib/admin-page.php:154 lib/admin-page.php:155 lib/admin-page.php:170 #: lib/admin-page.php:171 lib/admin-page.php:192 msgid "Switch to ClassicPress" -msgstr "Переход на ClassicPress" +msgstr "Перейти на ClassicPress" #. Plugin URI of the plugin msgid "https://github.com/ClassicPress/ClassicPress-Migration-Plugin" @@ -30,7 +30,7 @@ msgstr "https://github.com/ClassicPress/ClassicPress-Migration-Plugin" #. Description of the plugin msgid "Switch your WordPress installation to ClassicPress." -msgstr "Смените свою инсталляцию WordPress на ClassicPress." +msgstr "Перейдите со своей инсталляции WordPress на ClassicPress." #. Author of the plugin msgid "ClassicPress" @@ -134,11 +134,11 @@ msgstr "" "Продолжайте на свой страх и риск!" #. translators: current WordPress version -#: lib/admin-page.php:430 +#: lib/admin-page.php:431 msgid "You are running WordPress version %s." msgstr "Вы используете WordPress в версии %s." -#: lib/admin-page.php:437 +#: lib/admin-page.php:438 msgid "" "Migration is supported, but content edited in the new WordPress block editor " "may not be fully compatible with ClassicPress." @@ -146,7 +146,7 @@ msgstr "" "Миграция поддерживается, но контент, который редактировался в новом блочном " "редакторе WordPress, может не оказаться полностью совместимым с ClassicPress." -#: lib/admin-page.php:442 +#: lib/admin-page.php:443 msgid "" "After the migration, we recommend reviewing each recently edited post or " "page and restoring to an earlier revision if needed." @@ -155,7 +155,7 @@ msgstr "" "страницы и при необходимости восстановить более ранние ревизии." #. translators: minimum supported PHP version -#: lib/admin-page.php:461 +#: lib/admin-page.php:462 msgid "" "ClassicPress supports PHP versions %1$s and newer." @@ -164,11 +164,11 @@ msgstr "" "strong>." #. translators: current PHP version -#: lib/admin-page.php:467 +#: lib/admin-page.php:468 msgid "You are using PHP version %s." msgstr "Вы используете PHP версии %s." -#: lib/admin-page.php:485 +#: lib/admin-page.php:486 msgid "" "ClassicPress only supports communicating with the ClassicPress.net API over " "SSL." @@ -176,12 +176,12 @@ msgstr "" "ClassicPress поддерживает взаимодействие с ClassicPress.net API только через " "SSL." -#: lib/admin-page.php:491 +#: lib/admin-page.php:492 msgid "This site supports making outgoing connections securely using SSL." msgstr "" "Этот сайт поддерживает безопасные исходящие соединения посредством SSL." -#: lib/admin-page.php:496 +#: lib/admin-page.php:497 msgid "" "This site does not support making " "outgoing connections securely using SSL." @@ -189,31 +189,39 @@ msgstr "" "Этот сайт не поддерживает безопасные " "исходящие соединения посредством SSL." -#: lib/admin-page.php:516 -msgid "No conflicting files were found." -msgstr "Конфликтующие файлы не обнаружены." +#: lib/admin-page.php:511 +msgid "" +"An existing composer.json file was detected on your site. This " +"file will be overwritten during " +"migration." +msgstr "" +"На вашем сайте обнаружен существующий файл composer.json. Он " +"будет перезаписан во время миграции." -#: lib/admin-page.php:521 +#: lib/admin-page.php:516 msgid "" -"Conflicting files detected. These are files that would be unexpectedly overwritten during migration." +"If you have previously installed ClassicPress on this site, then you can " +"ignore this warning." msgstr "" -"Обнаружены конфликтующие файлы. Это файлы, которые будут непредвиденно перезаписаны во время миграции." +"Если ранее вы уже установили ClassicPress на этом сайте, то можете " +"проигнорировать это предупреждение." -#: lib/admin-page.php:526 +#: lib/admin-page.php:521 msgid "" -"If you have JavaScript enabled, you can see a list of conflicting files " -"in your browser console." +"If you are using composer.json to manage dependencies for this " +"site, then you should back up this file before continuing, and restore it after the migration." msgstr "" -"Если у вас включен JavaScript, вы можете увидеть список конфликтующих файлов " -"в консоли вашего браузера." +"Если вы используете composer.json для управления зависимостями " +"этого сайта, то перед тем как продолжить, вам нужно сделать резервную копию этого файла, а затем " +"восстановить его после миграции." -#: lib/admin-page.php:546 +#: lib/admin-page.php:537 msgid "Your WordPress core files will be overwritten." msgstr "Файлы ядра WordPress будут перезаписаны." -#: lib/admin-page.php:552 +#: lib/admin-page.php:543 msgid "" "Unable to determine whether core files were " "modified." @@ -221,7 +229,7 @@ msgstr "" "Невозможно определить, были ли изменены файлы " "ядра.." -#: lib/admin-page.php:557 +#: lib/admin-page.php:548 msgid "" "This is most likely because you are running a development version of " "WordPress." @@ -229,17 +237,17 @@ msgstr "" "Скорее всего, это из-за того, что вы используете девелоперскую версию " "WordPress." -#: lib/admin-page.php:562 +#: lib/admin-page.php:553 msgid "You have not modified any core files." msgstr "Вы не модифицировали никакие файлы ядра." -#: lib/admin-page.php:568 +#: lib/admin-page.php:559 msgid "Modified core files detected. These customisations will be lost." msgstr "" "Обнаружены изменённые файлы ядра. Эти нестандартные модификации будут " "потеряны." -#: lib/admin-page.php:573 +#: lib/admin-page.php:564 msgid "" "If you have JavaScript enabled, you can see a list of modified files " "in your browser console." @@ -247,11 +255,11 @@ msgstr "" "Если у вас включен JavaScript, вы можете увидеть список изменённых файлов " "в консоли вашего браузера." -#: lib/admin-page.php:590 +#: lib/admin-page.php:581 msgid "Multisite installation detected." msgstr "Обнаружена мультисайтовая установка." -#: lib/admin-page.php:595 +#: lib/admin-page.php:586 msgid "" "Migrating to ClassicPress is supported, but it is very important that you perform a backup first." @@ -259,18 +267,18 @@ msgstr "" "Переход на ClassicPress поддерживается, но очень важно, чтобы вы сначала сделали резервную копию." -#: lib/admin-page.php:600 +#: lib/admin-page.php:591 msgid "" "It would also be a good idea to try the migration on a development or " "staging site first." msgstr "" "Хорошей идеей также будет сначала опробовать миграцию на стендовом сайте." -#: lib/admin-page.php:635 +#: lib/admin-page.php:625 msgid "It looks like you're ready to switch to ClassicPress!" msgstr "Похоже, вы готовы к переходу на ClassicPress!" -#: lib/admin-page.php:638 +#: lib/admin-page.php:628 msgid "" "First things first, just in case something does not go as planned, please make a backup of your site files and databaseсделайте резервную копию файлов и базы данных вашего сайта, " "пожалуйста." -#: lib/admin-page.php:641 +#: lib/admin-page.php:631 msgid "After clicking the button below, the migration process will start." msgstr "После нажатия на кнопку ниже начнётся процесс миграции." -#: lib/admin-page.php:668 +#: lib/admin-page.php:644 +msgid "" +"Switch this entire multisite installation to ClassicPress " +"now!" +msgstr "" +"Переключить установку всего этого мультисайта на " +"ClassicPress сейчас!" + +#: lib/admin-page.php:649 +msgid "Switch this site to ClassicPress now!" +msgstr "Переключить этот сайт на ClassicPress сейчас!" + +#: lib/admin-page.php:658 msgid "More Details" msgstr "Больше подробностей" -#: lib/admin-page.php:671 +#: lib/admin-page.php:661 msgid "" "All core WordPress files will be replaced with their ClassicPress versions. " "Depending on the server this website is hosted on, this process can take a " @@ -298,26 +318,26 @@ msgstr "" "процесс может занять некоторое время, в зависимости от сервера, на котором " "размещается этот сайт." -#: lib/admin-page.php:674 +#: lib/admin-page.php:664 msgid "" "We want to emphasise that all your own content (posts, pages, " "themes, plugins, uploads, wp-config.php file, .htaccess file, etc.) is 100% " "safe as the migration process is not touching any of that." msgstr "" "Мы хотим подчеркнуть, что весь ваш контент (записи, страницы, темы, " -"плагины, загрузки, файл wp-config.php, файл .htaccess file и т.п.) на 100% в " -"безопасности, поскольку процесс миграции не затрагивает ничего из " +"плагины, загрузки, файл wp-config.php, файл .htaccess file и т.п.) на 100 % " +"в безопасности, поскольку процесс миграции не затрагивает ничего из " "перечисленного." -#: lib/admin-page.php:677 +#: lib/admin-page.php:667 msgid "" "Once the process has completed, you will see the about page of ClassicPress " "where you can read more information about the project." msgstr "" -"Когда процесс завершится, вы увидите страницу о ClassicPress, из которой вы " +"Когда процесс завершится, вы увидите страницу о ClassicPress, из которой " "сможете почерпнуть больше информации о проекте." -#: lib/admin-page.php:680 +#: lib/admin-page.php:670 msgid "" "We thank you for switching from WordPress to ClassicPress!
The business-" "focused CMS. Powerful. Versatile. Predictable." @@ -325,11 +345,12 @@ msgstr "" "Мы благодарим вас за переход с WordPress на ClassicPress!
Бизнес-" "ориентированную CMS. Мощную. Универсальную. Предсказуемую." -#: lib/admin-page.php:697 +#: lib/admin-page.php:687 msgid "Sorry, we can't switch this site to ClassicPress at this time." -msgstr "Извините, на этот раз мы не можем перевести этот сайт на ClassicPress." +msgstr "" +"Извините, в данный момент мы не можем переключить этот сайт на ClassicPress." -#: lib/admin-page.php:704 +#: lib/admin-page.php:694 msgid "" "If you're not sure how to fix the issues above, contact your hosting " "provider for help." @@ -337,19 +358,19 @@ msgstr "" "Если вы не уверены в том, как исправить вышеуказанные ошибки, обратитесь за " "помощью к своему поставщику хостинга." -#: lib/admin-page.php:729 +#: lib/admin-page.php:719 msgid "Show advanced controls" msgstr "Показать расширенные настройки" -#: lib/admin-page.php:744 +#: lib/admin-page.php:734 msgid "Switch to any version of ClassicPress or WordPress" msgstr "Переход на любую версию ClassicPress или WordPress" -#: lib/admin-page.php:753 +#: lib/admin-page.php:743 msgid "Warning 1:" msgstr "Предупреждение 1:" -#: lib/admin-page.php:760 +#: lib/admin-page.php:750 msgid "" "Use this form to switch to other versions of WordPress, or ClassicPress " "migration builds!" @@ -357,7 +378,7 @@ msgstr "" "Используйте эту форму, чтобы переключиться на другие версии WordPress или " "миграционные сборки ClassicPress!" -#: lib/admin-page.php:766 +#: lib/admin-page.php:756 msgid "" "Official release builds of ClassicPress will " "not work." @@ -366,22 +387,22 @@ msgstr "" "будут работать." #. translators: link to ClassicPress migration builds -#: lib/admin-page.php:773 +#: lib/admin-page.php:763 msgid "" "You can find ClassicPress migration builds on GitHub." msgstr "" "Вы можете найти миграционные сборки ClassicPress на GitHub." -#: lib/admin-page.php:787 +#: lib/admin-page.php:777 msgid "Warning 2:" msgstr "Предупреждение 2:" -#: lib/admin-page.php:789 +#: lib/admin-page.php:779 msgid "Warning:" msgstr "Предупреждение:" -#: lib/admin-page.php:794 +#: lib/admin-page.php:784 msgid "" "As long as the regular requirements for your target version are met, like " "the preflight checks for ClassicPress, then we haven't been able to break " @@ -392,7 +413,7 @@ msgstr "" "этому. Тем не менее, это вовсе не означает, что всё будет работать при любых " "обстоятельствах!" -#: lib/admin-page.php:800 +#: lib/admin-page.php:790 msgid "" "Please, definitely take a backup of your site before using this feature." @@ -400,11 +421,11 @@ msgstr "" "Пожалуйста, обязательно сделайте резервную " "копию своего сайта перед использованием этого инструмента." -#: lib/admin-page.php:810 +#: lib/admin-page.php:800 msgid "Build URL:" msgstr "URL сборки:" -#: lib/admin-page.php:828 +#: lib/admin-page.php:818 msgid "Do the custom migration now!" msgstr "Выполнить произвольную миграцию!" @@ -451,3 +472,13 @@ msgstr "Перейти" #: switch-to-classicpress.php:207 msgid "Could not communicate with the ClassicPress API server" msgstr "Не удалось соединиться с сервером API ClassicPress" + +#~ msgid "No conflicting files were found." +#~ msgstr "Конфликтующие файлы не обнаружены." + +#~ msgid "" +#~ "If you have JavaScript enabled, you can see a list of conflicting files " +#~ "in your browser console." +#~ msgstr "" +#~ "Если у вас включен JavaScript, вы можете увидеть список конфликтующих " +#~ "файлов в консоли вашего браузера." diff --git a/languages/switch-to-classicpress.pot b/languages/switch-to-classicpress.pot index a63c47d..73bcc80 100644 --- a/languages/switch-to-classicpress.pot +++ b/languages/switch-to-classicpress.pot @@ -1,16 +1,16 @@ -# Copyright (C) 2019 ClassicPress +# Copyright (C) 2020 ClassicPress # This file is distributed under the same license as the Switch to ClassicPress plugin. msgid "" msgstr "" -"Project-Id-Version: Switch to ClassicPress 1.0.1\n" -"Report-Msgid-Bugs-To: https://forums.classicpress.net/c/support/migration-plugin\n" +"Project-Id-Version: Switch to ClassicPress 1.1.0\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/ClassicPress-Migration-Plugin\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2019-07-22T20:28:37+03:00\n" -"PO-Revision-Date: 2019-07-22T22:08:37+03:00\n" +"POT-Creation-Date: 2020-01-13T16:22:26+03:00\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.2.0\n" "X-Domain: switch-to-classicpress\n" @@ -100,174 +100,182 @@ msgid "Proceed at your own risk!" msgstr "" #. translators: current WordPress version -#: lib/admin-page.php:430 +#: lib/admin-page.php:431 msgid "You are running WordPress version %s." msgstr "" -#: lib/admin-page.php:437 +#: lib/admin-page.php:438 msgid "Migration is supported, but content edited in the new WordPress block editor may not be fully compatible with ClassicPress." msgstr "" -#: lib/admin-page.php:442 +#: lib/admin-page.php:443 msgid "After the migration, we recommend reviewing each recently edited post or page and restoring to an earlier revision if needed." msgstr "" #. translators: minimum supported PHP version -#: lib/admin-page.php:461 +#: lib/admin-page.php:462 msgid "ClassicPress supports PHP versions %1$s and newer." msgstr "" #. translators: current PHP version -#: lib/admin-page.php:467 +#: lib/admin-page.php:468 msgid "You are using PHP version %s." msgstr "" -#: lib/admin-page.php:485 +#: lib/admin-page.php:486 msgid "ClassicPress only supports communicating with the ClassicPress.net API over SSL." msgstr "" -#: lib/admin-page.php:491 +#: lib/admin-page.php:492 msgid "This site supports making outgoing connections securely using SSL." msgstr "" -#: lib/admin-page.php:496 +#: lib/admin-page.php:497 msgid "This site does not support making outgoing connections securely using SSL." msgstr "" -#: lib/admin-page.php:516 -msgid "No conflicting files were found." +#: lib/admin-page.php:511 +msgid "An existing composer.json file was detected on your site. This file will be overwritten during migration." msgstr "" -#: lib/admin-page.php:521 -msgid "Conflicting files detected. These are files that would be unexpectedly overwritten during migration." +#: lib/admin-page.php:516 +msgid "If you have previously installed ClassicPress on this site, then you can ignore this warning." msgstr "" -#: lib/admin-page.php:526 -msgid "If you have JavaScript enabled, you can see a list of conflicting files in your browser console." +#: lib/admin-page.php:521 +msgid "If you are using composer.json to manage dependencies for this site, then you should back up this file before continuing, and restore it after the migration." msgstr "" -#: lib/admin-page.php:546 +#: lib/admin-page.php:537 msgid "Your WordPress core files will be overwritten." msgstr "" -#: lib/admin-page.php:552 +#: lib/admin-page.php:543 msgid "Unable to determine whether core files were modified." msgstr "" -#: lib/admin-page.php:557 +#: lib/admin-page.php:548 msgid "This is most likely because you are running a development version of WordPress." msgstr "" -#: lib/admin-page.php:562 +#: lib/admin-page.php:553 msgid "You have not modified any core files." msgstr "" -#: lib/admin-page.php:568 +#: lib/admin-page.php:559 msgid "Modified core files detected. These customisations will be lost." msgstr "" -#: lib/admin-page.php:573 +#: lib/admin-page.php:564 msgid "If you have JavaScript enabled, you can see a list of modified files in your browser console." msgstr "" -#: lib/admin-page.php:590 +#: lib/admin-page.php:581 msgid "Multisite installation detected." msgstr "" -#: lib/admin-page.php:595 +#: lib/admin-page.php:586 msgid "Migrating to ClassicPress is supported, but it is very important that you perform a backup first." msgstr "" -#: lib/admin-page.php:600 +#: lib/admin-page.php:591 msgid "It would also be a good idea to try the migration on a development or staging site first." msgstr "" -#: lib/admin-page.php:635 +#: lib/admin-page.php:625 msgid "It looks like you're ready to switch to ClassicPress!" msgstr "" -#: lib/admin-page.php:638 +#: lib/admin-page.php:628 msgid "First things first, just in case something does not go as planned, please make a backup of your site files and database." msgstr "" -#: lib/admin-page.php:641 +#: lib/admin-page.php:631 msgid "After clicking the button below, the migration process will start." msgstr "" -#: lib/admin-page.php:668 +#: lib/admin-page.php:644 +msgid "Switch this entire multisite installation to ClassicPress now!" +msgstr "" + +#: lib/admin-page.php:649 +msgid "Switch this site to ClassicPress now!" +msgstr "" + +#: lib/admin-page.php:658 msgid "More Details" msgstr "" -#: lib/admin-page.php:671 +#: lib/admin-page.php:661 msgid "All core WordPress files will be replaced with their ClassicPress versions. Depending on the server this website is hosted on, this process can take a while." msgstr "" -#: lib/admin-page.php:674 +#: lib/admin-page.php:664 msgid "We want to emphasise that all your own content (posts, pages, themes, plugins, uploads, wp-config.php file, .htaccess file, etc.) is 100% safe as the migration process is not touching any of that." msgstr "" -#: lib/admin-page.php:677 +#: lib/admin-page.php:667 msgid "Once the process has completed, you will see the about page of ClassicPress where you can read more information about the project." msgstr "" -#: lib/admin-page.php:680 +#: lib/admin-page.php:670 msgid "We thank you for switching from WordPress to ClassicPress!
The business-focused CMS. Powerful. Versatile. Predictable." msgstr "" -#: lib/admin-page.php:697 +#: lib/admin-page.php:687 msgid "Sorry, we can't switch this site to ClassicPress at this time." msgstr "" -#: lib/admin-page.php:704 +#: lib/admin-page.php:694 msgid "If you're not sure how to fix the issues above, contact your hosting provider for help." msgstr "" -#: lib/admin-page.php:729 +#: lib/admin-page.php:719 msgid "Show advanced controls" msgstr "" -#: lib/admin-page.php:744 +#: lib/admin-page.php:734 msgid "Switch to any version of ClassicPress or WordPress" msgstr "" -#: lib/admin-page.php:753 +#: lib/admin-page.php:743 msgid "Warning 1:" msgstr "" -#: lib/admin-page.php:760 +#: lib/admin-page.php:750 msgid "Use this form to switch to other versions of WordPress, or ClassicPress migration builds!" msgstr "" -#: lib/admin-page.php:766 +#: lib/admin-page.php:756 msgid "Official release builds of ClassicPress will not work." msgstr "" #. translators: link to ClassicPress migration builds -#: lib/admin-page.php:773 +#: lib/admin-page.php:763 msgid "You can find ClassicPress migration builds on GitHub." msgstr "" -#: lib/admin-page.php:787 +#: lib/admin-page.php:777 msgid "Warning 2:" msgstr "" -#: lib/admin-page.php:789 +#: lib/admin-page.php:779 msgid "Warning:" msgstr "" -#: lib/admin-page.php:794 +#: lib/admin-page.php:784 msgid "As long as the regular requirements for your target version are met, like the preflight checks for ClassicPress, then we haven't been able to break this yet. However, that doesn't mean it works under all circumstances!" msgstr "" -#: lib/admin-page.php:800 +#: lib/admin-page.php:790 msgid "Please, definitely take a backup of your site before using this feature." msgstr "" -#: lib/admin-page.php:810 +#: lib/admin-page.php:800 msgid "Build URL:" msgstr "" -#: lib/admin-page.php:828 +#: lib/admin-page.php:818 msgid "Do the custom migration now!" msgstr "" diff --git a/lib/admin-page.php b/lib/admin-page.php index dd40c84..8680089 100644 --- a/lib/admin-page.php +++ b/lib/admin-page.php @@ -643,12 +643,12 @@ function classicpress_show_migration_controls() { if ( is_multisite() ) { _e( 'Switch this entire multisite installation to ClassicPress now!', - 'migrate-to-classicpress' + 'switch-to-classicpress' ); } else { _e( 'Switch this site to ClassicPress now!', - 'migrate-to-classicpress' + 'switch-to-classicpress' ); } ?>