diff --git a/Yep/Helpers/YepAlert.swift b/Yep/Helpers/YepAlert.swift
index 00f8ad1b..44829bac 100644
--- a/Yep/Helpers/YepAlert.swift
+++ b/Yep/Helpers/YepAlert.swift
@@ -178,7 +178,7 @@ extension UIViewController {
dispatch_async(dispatch_get_main_queue()) {
- YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("Yep need to read your Contacts to continue this operation.\nIs that OK?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("No now", comment: ""), inViewController: self, withConfirmAction: {
+ YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("Yep need to read your Contacts to continue this operation.\nIs that OK?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Not now", comment: ""), inViewController: self, withConfirmAction: {
propose()
diff --git a/Yep/Info.plist b/Yep/Info.plist
index 757351c2..cd5ee757 100644
--- a/Yep/Info.plist
+++ b/Yep/Info.plist
@@ -19,7 +19,7 @@
CFBundleSignature
????
CFBundleVersion
- 81
+ 83
Fabric
APIKey
diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index b898ab6d..7af950fb 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -855,7 +855,7 @@ class ConversationViewController: BaseViewController {
} else if receivedFriendRequestState == .Blocked {
YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: String(format: NSLocalizedString("You have blocked %@! Do you want to unblock him or her?", comment: ""), "\(userNickname)")
- , confirmTitle: NSLocalizedString("Unblock", comment: ""), cancelTitle: NSLocalizedString("No now", comment: ""), inViewController: self, withConfirmAction: {
+ , confirmTitle: NSLocalizedString("Unblock", comment: ""), cancelTitle: NSLocalizedString("Not now", comment: ""), inViewController: self, withConfirmAction: {
unblockUserWithUserID(userID, failureHandler: nil, completion: { success in
println("unblockUserWithUserID \(success)")
diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift
index 2b932bbf..1408769a 100644
--- a/Yep/ViewControllers/Profile/ProfileViewController.swift
+++ b/Yep/ViewControllers/Profile/ProfileViewController.swift
@@ -444,7 +444,7 @@ class ProfileViewController: UIViewController {
if me.masterSkills.count == 0 && me.learningSkills.count == 0 {
- YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("You don't have any skills!\nWould you like to pick some?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("No now", comment: ""), inViewController: self, withConfirmAction: { [weak self] in
+ YepAlert.confirmOrCancel(title: NSLocalizedString("Notice", comment: ""), message: NSLocalizedString("You don't have any skills!\nWould you like to pick some?", comment: ""), confirmTitle: NSLocalizedString("OK", comment: ""), cancelTitle: NSLocalizedString("Not now", comment: ""), inViewController: self, withConfirmAction: { [weak self] in
self?.pickSkills()
}, cancelAction: {})
}
diff --git a/Yep/en.lproj/Localizable.strings b/Yep/en.lproj/Localizable.strings
index d5eb6d39..a068672f 100644
--- a/Yep/en.lproj/Localizable.strings
+++ b/Yep/en.lproj/Localizable.strings
@@ -276,7 +276,7 @@
"No more new friends." = "No more new friends.";
/* No comment provided by engineer. */
-"No now" = "No now";
+"Not now" = "Not now";
/* No comment provided by engineer. */
"No search results." = "No search results.";
diff --git a/Yep/zh-Hans.lproj/Localizable.strings b/Yep/zh-Hans.lproj/Localizable.strings
index c7ac7d63..c05ae4e3 100644
--- a/Yep/zh-Hans.lproj/Localizable.strings
+++ b/Yep/zh-Hans.lproj/Localizable.strings
@@ -278,7 +278,7 @@
"No more new friends." = "没有新加入的朋友";
/* No comment provided by engineer. */
-"No now" = "暂不";
+"Not now" = "暂不";
/* No comment provided by engineer. */
"No search results." = "搜索无结果";