Merge branch 'dev'

masich · Jun 28, 2021 · ad38e1a · ad38e1a
2 parents fa3c7bb + 7264311
commit ad38e1a
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/SaveMyEyes.xcodeproj/project.pbxproj b/SaveMyEyes.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		B69F2EBE24047AE1003F7BD0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B69F2EC024047AE5003F7BD0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B6BFAD342406EF12008E51E2 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
+		B6FC6A72244B944C004C5B25 /* ru-RU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ru-RU"; path = "ru-RU.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		B6FC9FA62403F088003FFC58 /* SaveMyEyes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SaveMyEyes.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B6FC9FA92403F088003FFC58 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		B6FC9FAB2403F088003FFC58 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
@@ -155,7 +156,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1130;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Max Omelchenko";
 				TargetAttributes = {
 					B6FC9FA52403F088003FFC58 = {
@@ -171,6 +172,7 @@
 				en,
 				Base,
 				uk,
+				"ru-RU",
 			);
 			mainGroup = B6FC9F9D2403F088003FFC58;
 			productRefGroup = B6FC9FA72403F088003FFC58 /* Products */;
@@ -220,6 +222,7 @@
 			children = (
 				B69F2EBE24047AE1003F7BD0 /* en */,
 				B69F2EC024047AE5003F7BD0 /* uk */,
+				B6FC6A72244B944C004C5B25 /* ru-RU */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -262,6 +265,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -323,6 +327,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -344,6 +349,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -358,7 +364,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_ASSET_PATHS = "\"SaveMyEyes/Preview Content\"";
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -369,7 +375,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.4;
+				MARKETING_VERSION = 0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -384,7 +390,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 27;
 				DEVELOPMENT_ASSET_PATHS = "\"SaveMyEyes/Preview Content\"";
 				DEVELOPMENT_TEAM = 5PYHR2J538;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -395,7 +401,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 0.4;
+				MARKETING_VERSION = 0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.masich.SaveMyEyes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/SaveMyEyes/ru-RU.lproj/Localizable.strings b/SaveMyEyes/ru-RU.lproj/Localizable.strings
@@ -0,0 +1,22 @@
+/* 
+ Localizable.strings
+ SaveMyEyes
+
+ Created by Max Omelchenko on 02/24/20.
+ Copyright © 2020 Max Omelchenko. All rights reserved.
+ */
+
+"Time to work" = "Время до работы";
+"Time to break" = "Время до перерыва";
+"Run timer" = "Запустить таймер";
+"min" = "мин";
+"Work interval" = "Интервал работы";
+"Break interval" = "Интервал перерыва";
+"Quit" = "Выход";
+"It's time for break" = "Время для перерыва";
+"It's time to work" = "Время работать";
+"Relax from your computer for %d minutes." = "Отдохни от компьютера %d минут.";
+"Let's continue to do amazing things!" = "Давай продолжим делать крутые вещи!";
+"Pause" = "Пауза";
+"Enable sound" = "Включить звук";
+"Reset" = "Сбросить";
diff --git a/SaveMyEyes/uk.lproj/Localizable.strings b/SaveMyEyes/uk.lproj/Localizable.strings
@@ -15,7 +15,7 @@
 "Quit" = "Вихід";
 "It's time for break" = "Час на перерву";
 "It's time to work" = "Час для роботи";
-"Relax from your computer for %d minutes." = "Відпочинь від компьютера на %d хвилин.";
+"Relax from your computer for %d minutes." = "Відпочинь від компьютера %d хвилин.";
 "Let's continue to do amazing things!" = "Давай продовжимо робити круті речі!";
 "Pause" = "Пауза";
 "Enable sound" = "Увімкнути звук";