oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag '2.14.1.2' 

// FREEBIE
This commit is contained in:
Matthew Chen 2017-07-27 15:09:51 -04:00
parent bca736a2b7 18ff072763
commit 75fb55e018
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Carthage

@ -1 +1 @@
Subproject commit c9f5152a2ed8516c3f23364105135c048f901553
Subproject commit fc8eebb92367031f60ea337c897551cc54baa4b2

8
Signal.xcodeproj/project.pbxproj
View File

@ -136,6 +136,8 @@
4542F0971EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4542F0951EBB9E9A00C7EE92 /* Promise+retainUntilComplete.swift */; };
45464DBC1DFA041F001D3FD6 /* DataChannelMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */; };
4563ADF11F22BD7100DEB8C7 /* OWS106EnsureProfileComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4563ADF01F22BD7100DEB8C7 /* OWS106EnsureProfileComplete.swift */; };
455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 455A16DB1F1FEA0000F86704 /* Metal.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 455A16DC1F1FEA0000F86704 /* MetalKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
45666EC61D99483D008FE134 /* OWSAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */; };
45666EC91D994C0D008FE134 /* OWSGroupAvatarBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666EC81D994C0D008FE134 /* OWSGroupAvatarBuilder.m */; };
45666F561D9B2827008FE134 /* OWSScrubbingLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 45666F551D9B2827008FE134 /* OWSScrubbingLogFormatter.m */; };
@ -572,6 +574,8 @@
45464DBB1DFA041F001D3FD6 /* DataChannelMessage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataChannelMessage.swift; sourceTree = "<group>"; };
454B35071D08EED80026D658 /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = translations/mk.lproj/Localizable.strings; sourceTree = "<group>"; };
4563ADF01F22BD7100DEB8C7 /* OWS106EnsureProfileComplete.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OWS106EnsureProfileComplete.swift; sourceTree = "<group>"; };
455A16DB1F1FEA0000F86704 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
455A16DC1F1FEA0000F86704 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
45666EC41D99483D008FE134 /* OWSAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSAvatarBuilder.h; sourceTree = "<group>"; };
45666EC51D99483D008FE134 /* OWSAvatarBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSAvatarBuilder.m; sourceTree = "<group>"; };
45666EC71D994C0D008FE134 /* OWSGroupAvatarBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSGroupAvatarBuilder.h; sourceTree = "<group>"; };
@ -848,6 +852,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
455A16DD1F1FEA0000F86704 /* Metal.framework in Frameworks */,
455A16DE1F1FEA0000F86704 /* MetalKit.framework in Frameworks */,
45847E871E4283C30080EAB3 /* Intents.framework in Frameworks */,
4509E79A1DD653700025A59F /* WebRTC.framework in Frameworks */,
456C38961DC7B882007536A7 /* PromiseKit.framework in Frameworks */,
@ -1636,6 +1642,8 @@
D221A08C169C9E5E00537ABF /* Frameworks */ = {
isa = PBXGroup;
children = (
455A16DB1F1FEA0000F86704 /* Metal.framework */,
455A16DC1F1FEA0000F86704 /* MetalKit.framework */,
45847E861E4283C30080EAB3 /* Intents.framework */,
45BD60811DE9547E00A8F436 /* Contacts.framework */,
4509E7991DD653700025A59F /* WebRTC.framework */,

18
Signal/translations/ja_JP.lproj/Localizable.strings
View File

@ -56,13 +56,13 @@
"APN_MESSAGE_IN_GROUP_DETAILED" = "%@の%@：%@";
/* Message format for the 'new app version available' alert. Embeds: {{The latest app version number.}}. */
"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "Version %@ is now available in the App Store.";
"APP_UPDATE_NAG_ALERT_MESSAGE_FORMAT" = "バージョン%@がApp Storeに出ています";
/* Title for the 'new app version available' alert. */
"APP_UPDATE_NAG_ALERT_TITLE" = "A New Version of Signal is Available";
"APP_UPDATE_NAG_ALERT_TITLE" = "Signalの最新版が出ています";
/* Label for the 'update' button in the 'new app version available' alert. */
"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "Update";
"APP_UPDATE_NAG_ALERT_UPDATE_BUTTON" = "更新する";
/* Name of application */
"APPLICATION_NAME" = "Signal";
@ -140,7 +140,7 @@
"ATTACHMENT_TYPE_VOICE_MESSAGE" = "音声メッセージ";
/* action sheet button title to enable built in speaker during a call */
"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "Speaker";
"AUDIO_ROUTE_BUILT_IN_SPEAKER" = "スピーカー";
/* An explanation of the consequences of blocking another user. */
"BLOCK_BEHAVIOR_EXPLANATION" = "拒否すると通話もメッセージも受け付けません";
@ -296,7 +296,7 @@
"CONVERSATION_SETTINGS" = "会話設定";
/* Label for 'new contact' button in conversation settings view. */
"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "Add to Existing Contact";
"CONVERSATION_SETTINGS_ADD_TO_EXISTING_CONTACT" = "既存の連絡先に加える";
/* table cell label in conversation settings */
"CONVERSATION_SETTINGS_BLOCK_THIS_USER" = "この人を拒否する";
@ -335,7 +335,7 @@
"CONVERSATION_SETTINGS_MUTED_UNTIL_FORMAT" = "%@まで";
/* Label for 'new contact' button in conversation settings view. */
"CONVERSATION_SETTINGS_NEW_CONTACT" = "Create New Contact";
"CONVERSATION_SETTINGS_NEW_CONTACT" = "新規の連絡先を作る";
/* Label for button to unmute a thread. */
"CONVERSATION_SETTINGS_UNMUTE_ACTION" = "消音をやめる";
@ -653,7 +653,7 @@
"IN_CALL_TERMINATED" = "通話が終了";
/* Label reminding the user that they are in archive mode. */
"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "You are viewing your archived messages. Tap to return to your Inbox.";
"INBOX_VIEW_ARCHIVE_MODE_REMINDER" = "保管庫のメッセージを見ています。受信箱に戻るにはタップしてください。";
/* Multiline label explaining how to show names instead of phone numbers in your inbox */
"INBOX_VIEW_MISSING_CONTACTS_PERMISSION" = "連絡先の名前を見るには，連絡先へのアクセスが必要です。";
@ -665,7 +665,7 @@
"INCOMING_CALL_FROM" = "%@ から着信";
/* info message recorded in conversation history when local user declined a call */
"INCOMING_DECLINED_CALL" = "You declined a call";
"INCOMING_DECLINED_CALL" = "着信を拒否しました";
/* No comment provided by engineer. */
"INCOMING_INCOMPLETE_CALL" = "不完全着信";
@ -950,7 +950,7 @@
"OUTGOING_CALL" = "発信";
/* No comment provided by engineer. */
"OUTGOING_INCOMPLETE_CALL" = "Unanswered outgoing call";
"OUTGOING_INCOMPLETE_CALL" = "返答が無かった発信";
/* A display format for oversize text messages. */
"OVERSIZE_TEXT_DISPLAY_FORMAT" = "%@... [詳細はタップで]";