Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into release/1.219.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ivan-magda committed Oct 30, 2023
2 parents 4ec6f71 + 90c4717 commit 1653b62
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Stepic/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ CourseInfoPurchaseModalWishlistButtonInWishlistTitle = "Added to Wishlist";
CourseInfoPurchaseModalBuyButtonPurchaseInProgressTitle = "Processing the Payment";

CourseInfoPurchaseModalPurchaseErrorStatusTitle = "The payment was successful, but the purchase is not completed";
CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "An error occurred while processing the payment, try to restore the purchase and <a href=\"https://support.stepik.org/hc/en-us\">contact support</a>, if the error persists. The funds will not be debited again.";
CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "An error occurred while processing the payment, try to restore the purchase and <a href=\"https://help.stepik.org/\">contact support</a>, if the error persists. The funds will not be debited again.";
CourseInfoPurchaseModalPurchaseErrorRestoreTitle = "Restore Purchase";
CourseInfoPurchaseModalPurchaseErrorContactSupportSubject = "Error when purchasing course";
CourseInfoPurchaseModalPurchaseSuccessStatusTitle = "The payment was successful";
Expand Down Expand Up @@ -826,7 +826,7 @@ PrivacyPolicyTitle = "Privacy Policy";
TermsOfServiceLink = "https://welcome.stepik.org/en/terms";
PrivacyPolicyLink = "https://welcome.stepik.org/en/privacy";
HelpCenterTitle = "Help Center";
HelpCenterLink = "https://support.stepik.org/hc/en-us";
HelpCenterLink = "https://help.stepik.org/";
ContactSupportTitle = "Contact Support";
ContactSupportSubject = "Stepik iOS feedback";
ContactSupportMessageBody = "I do the following:\n\n1.\n2.\n3.\n\nWhat happens:\n\nI expect:\n\n=======\nPlease do not delete this information\n=======\nApp Version: %@\nStepik ID: %@";
Expand Down Expand Up @@ -1036,10 +1036,10 @@ StepARQuickLookUnsupportedAlertMessage = "Your device is not supported by viewin
StepDisabledStudentTitle = "You can't view the assignment yet";
StepDisabledStudentMessage = "Write to the course authors so that they pay attention to the settings %@.<br><br>Access may be restored after some time.";
StepDisabledTeacherTitle = "Learners can't view the assignment yet";
StepDisabledTeacherInCourseMessage = "For enable learners to view the assignment, change the course type to %@.<br><br>This step has paid features. <a href=\"https://support.stepik.org/hc/en-us/articles/360012252539\">Learn about plans</a>.";
StepDisabledTeacherInCourseMessage = "For enable learners to view the assignment, change the course type to %@.<br><br>This step has paid features. <a href=\"https://help.stepik.org/article/54722\">Learn about plans</a>.";
StepDisabledTeacherInCoursePlanProTitle = "<b>PRO</b> or paid";
StepDisabledTeacherInCoursePlanEnterpriseTitle = "<b>Enterprise</b>";
StepDisabledTeacherNoCourseMessage = "For enable learners to view the assignment, add the lesson to %@.<br><br>This step has paid features. <a href=\"https://support.stepik.org/hc/en-us/articles/360012252539\">Learn about plans</a>.";
StepDisabledTeacherNoCourseMessage = "For enable learners to view the assignment, add the lesson to %@.<br><br>This step has paid features. <a href=\"https://help.stepik.org/article/54722\">Learn about plans</a>.";
StepDisabledTeacherNoCoursePlanProTitle = "a <b>PRO</b> or <b>paid</b> course";
StepDisabledTeacherNoCoursePlanEnterpriseTitle = "an <b>Enterprise</b> course";
StepPosition = "Step %@";
Expand Down
8 changes: 4 additions & 4 deletions Stepic/ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ CourseInfoPurchaseModalWishlistButtonInWishlistTitle = "Добавлен в Сп
CourseInfoPurchaseModalBuyButtonPurchaseInProgressTitle = "Обработка платежа";

CourseInfoPurchaseModalPurchaseErrorStatusTitle = "Оплата прошла, покупка не завершена";
CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "При обработке платежа произошла ошибка, попробуйте восстановить покупку и <a href=\"https://support.stepik.org/hc/ru\">свяжитесь с поддержкой</a>, если ошибка не будет устранена. Повторного списания средств не произойдет.";
CourseInfoPurchaseModalPurchaseErrorFeedbackMessage = "При обработке платежа произошла ошибка, попробуйте восстановить покупку и <a href=\"https://help.stepik.org/\">свяжитесь с поддержкой</a>, если ошибка не будет устранена. Повторного списания средств не произойдет.";
CourseInfoPurchaseModalPurchaseErrorRestoreTitle = "Восстановить покупку";
CourseInfoPurchaseModalPurchaseErrorContactSupportSubject = "Ошибка при покупке курса";
CourseInfoPurchaseModalPurchaseSuccessStatusTitle = "Оплата прошла успешно";
Expand Down Expand Up @@ -827,7 +827,7 @@ PrivacyPolicyTitle = "Условия конфиденциальности";
TermsOfServiceLink = "https://welcome.stepik.org/ru/terms";
PrivacyPolicyLink = "https://welcome.stepik.org/ru/privacy";
HelpCenterTitle = "Справочный центр";
HelpCenterLink = "https://support.stepik.org/hc/ru";
HelpCenterLink = "https://help.stepik.org/";
ContactSupportTitle = "Написать в поддержку";
ContactSupportSubject = "Обратная связь о приложении Stepik iOS";
ContactSupportMessageBody = "Я делаю следующее:\n\n1.\n2.\n3.\n\nПроисходит вот что:\n\nЯ ожидаю:\n\n=======\nПожалуйста, не удаляйте эту информацию\n=======\nВерсия приложения: %@\nStepik ID: %@";
Expand Down Expand Up @@ -1037,10 +1037,10 @@ StepARQuickLookUnsupportedAlertMessage = "Ваше устройство не п
StepDisabledStudentTitle = "Увидеть задачу пока нельзя";
StepDisabledStudentMessage = "Напишите авторам курса, чтобы они обратили внимание на настройки %@.<br><br>Возможно, через какое-то время доступ восстановится.";
StepDisabledTeacherTitle = "Сейчас учащиеся не могут просмотреть эту задачу";
StepDisabledTeacherInCourseMessage = "Чтобы учащиеся увидели эту задачу, измените тип курса на %@.<br><br>В шаге использована платная функциональность. <a href=\"https://support.stepik.org/hc/ru/articles/360012252539\">О тарифных планах</a>.";
StepDisabledTeacherInCourseMessage = "Чтобы учащиеся увидели эту задачу, измените тип курса на %@.<br><br>В шаге использована платная функциональность. <a href=\"https://help.stepik.org/article/54722\">О тарифных планах</a>.";
StepDisabledTeacherInCoursePlanProTitle = "<b>PRO</b> или сделайте его платным";
StepDisabledTeacherInCoursePlanEnterpriseTitle = "<b>Enterprise</b>";
StepDisabledTeacherNoCourseMessage = "Чтобы учащиеся увидели эту задачу, добавьте урок в %@.<br><br>В шаге использована платная функциональность. <a href=\"https://support.stepik.org/hc/ru/articles/360012252539\">О тарифных планах</a>.";
StepDisabledTeacherNoCourseMessage = "Чтобы учащиеся увидели эту задачу, добавьте урок в %@.<br><br>В шаге использована платная функциональность. <a href=\"https://help.stepik.org/article/54722\">О тарифных планах</a>.";
StepDisabledTeacherNoCoursePlanProTitle = "<b>платный</b> или <b>PRO-курс</b>";
StepDisabledTeacherNoCoursePlanEnterpriseTitle = "<b>Enterprise-курс</b>";
StepPosition = "Шаг %@";
Expand Down
2 changes: 1 addition & 1 deletion fastlane/metadata/Stepic/en-GB/support_url.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://support.stepik.org/hc/en-us
https://help.stepik.org/
2 changes: 1 addition & 1 deletion fastlane/metadata/Stepic/en-US/support_url.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://support.stepik.org/hc/en-us
https://help.stepik.org/
2 changes: 1 addition & 1 deletion fastlane/metadata/Stepic/ru/support_url.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://support.stepik.org/hc/ru
https://help.stepik.org/

0 comments on commit 1653b62

Please sign in to comment.