Merge branch 'release/v0.19.5'

gee1k · Jul 23, 2020 · e30acf3 · e30acf3
2 parents 7d49463 + f66f197
commit e30acf3
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 99 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -22,6 +22,8 @@
 
 **☕️赞助： _[Paypal](https://paypal.me/geeee1k), [支付宝](https://raw.githubusercontent.com/gee1k/oss/master/qrcode/alipay.JPG), [微信支付](https://raw.githubusercontent.com/gee1k/oss/master/qrcode/wechat_pay.JPG)_**
 
+**📱uPic for iOS: [![uPic for iOS](https://cdn.jsdelivr.net/gh/gee1k/oss@master/uPic/app-store-black.svg)](https://apps.apple.com/us/app/id1510718678)**
+
 ## 📑 简介
 
 > **uPic(upload Picture) 是一款 Mac 端的图床(文件)上传客户端**

diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
@@ -1260,7 +1260,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200708;
+				CURRENT_PROJECT_VERSION = 20200723;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1269,7 +1269,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.19.4;
+				MARKETING_VERSION = 0.19.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1290,7 +1290,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200708;
+				CURRENT_PROJECT_VERSION = 20200723;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1299,7 +1299,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.19.4;
+				MARKETING_VERSION = 0.19.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1316,7 +1316,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200708;
+				CURRENT_PROJECT_VERSION = 20200723;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1326,7 +1326,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.19.4;
+				MARKETING_VERSION = 0.19.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1343,7 +1343,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20200708;
+				CURRENT_PROJECT_VERSION = 20200723;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = uPicFinderExtension/Info.plist;
@@ -1353,7 +1353,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.19.4;
+				MARKETING_VERSION = 0.19.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic.uPicFinderExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/uPic/PreferencesWindow/AboutPreferencesViewController.swift b/uPic/PreferencesWindow/AboutPreferencesViewController.swift
@@ -27,7 +27,7 @@ class AboutPreferencesViewController: PreferencesViewController {
     }
 
     @IBAction func twitterButtonClicked(_ sender: NSButton) {
-        guard let url = URL(string: "https://twitter.com/geee1k") else {
+        guard let url = URL(string: "https://twitter.com/realSvend") else {
             return
         }
         NSWorkspace.shared.open(url)

diff --git a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
diff --git a/uPic/PreferencesWindow/en.lproj/Preferences.strings b/uPic/PreferencesWindow/en.lproj/Preferences.strings
@@ -131,8 +131,8 @@
 /* Class = "NSButtonCell"; title = "WeChat"; ObjectID = "fJL-Ts-QPI"; */
 "fJL-Ts-QPI.title" = "WeChat";
 
-/* Class = "NSButtonCell"; title = "@geee1k"; ObjectID = "i90-se-6z8"; */
-"i90-se-6z8.title" = "@geee1k";
+/* Class = "NSButtonCell"; title = "@realSvend"; ObjectID = "i90-se-6z8"; */
+"i90-se-6z8.title" = "@realSvend";
 
 /* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "iRI-j6-BHQ"; */
 "iRI-j6-BHQ.title" = "Width:";

diff --git a/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings b/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
@@ -131,8 +131,8 @@
 /* Class = "NSButtonCell"; title = "WeChat"; ObjectID = "fJL-Ts-QPI"; */
 "fJL-Ts-QPI.title" = "微信";
 
-/* Class = "NSButtonCell"; title = "@geee1k"; ObjectID = "i90-se-6z8"; */
-"i90-se-6z8.title" = "@geee1k";
+/* Class = "NSButtonCell"; title = "@realSvend"; ObjectID = "i90-se-6z8"; */
+"i90-se-6z8.title" = "@realSvend";
 
 /* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "iRI-j6-BHQ"; */
 "iRI-j6-BHQ.title" = "宽度:";

diff --git a/uPic/PreferencesWindow/zh-Hant.lproj/Preferences.strings b/uPic/PreferencesWindow/zh-Hant.lproj/Preferences.strings
@@ -132,8 +132,8 @@
 /* Class = "NSButtonCell"; title = "WeChat"; ObjectID = "fJL-Ts-QPI"; */
 "fJL-Ts-QPI.title" = "WeChat";
 
-/* Class = "NSButtonCell"; title = "@geee1k"; ObjectID = "i90-se-6z8"; */
-"i90-se-6z8.title" = "@geee1k";
+/* Class = "NSButtonCell"; title = "@realSvend"; ObjectID = "i90-se-6z8"; */
+"i90-se-6z8.title" = "@realSvend";
 
 /* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "iRI-j6-BHQ"; */
 "iRI-j6-BHQ.title" = "寬度:";

diff --git a/uPic/zh-Hant.lproj/Localizable.strings b/uPic/zh-Hant.lproj/Localizable.strings
@@ -68,8 +68,8 @@
 /* 狀態欄菜單上傳前壓縮圖片 */
 "Compress images before uploading" = "上傳前壓縮圖片";
 
-"Reset User Preferences?" = "重置用戶偏好設置?";
-"⚠️ Note that this will reset all user preferences" = "⚠️ 注意 這將會重置所有用戶偏好設置";
+"Reset User Preferences?" = "重置用戶偏好設定?";
+"⚠️ Note that this will reset all user preferences" = "⚠️ 注意 這將會重置所有用戶偏好設定";
 "Continuing will lose unsaved data. Do you want to continue?" = "繼續將會丟失未存檔的數據, 是否繼續?";
 "Import host configuration" = "導入圖床配置";
 "⚠️ Please choose import method, merge or overwrite?" = "⚠️ 請選擇導入方式, 合併還是覆蓋?";

diff --git a/uPic/zh-Hant.lproj/Main.strings b/uPic/zh-Hant.lproj/Main.strings
@@ -68,7 +68,7 @@
 "U1c-9i-q5b.title" = "URL";
 
 /* Class = "NSMenuItem"; title = "Preferences"; ObjectID = "VW7-Z2-hXR"; */
-"VW7-Z2-hXR.title" = "偏好設置";
+"VW7-Z2-hXR.title" = "偏好設定";
 
 /* Class = "NSMenu"; title = "Edit"; ObjectID = "W48-6f-4Dl"; */
 "W48-6f-4Dl.title" = "編輯";