Skip to content

Commit 876b360

Browse files
michaelkirkmichaelkirk
authored
Merge pull request signalapp#1411 from WhisperSystems/update-translations
Update translations, use new auto genstrings tool to keep translations and comments up to date.
2 parents 89ee74f + 15dcbbb commit 876b360

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+78
-134
lines changed

‎Signal/src/audio/AppAudioManager.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ - (BOOL)releaseRecordingPrivilege {
154154
- (void)requestRequiredPermissionsIfNeededWithCompletion:(PermissionBlock)permissionBlock incoming:(BOOL)isIncoming {
155155
[AVAudioSession.sharedInstance requestRecordPermission:^(BOOL granted) {
156156
if (!granted) {
157-
UIAlertView *alertView =
158-
[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"ACTION_REQUIRED_TITLE", @"")
159-
message:NSLocalizedString(@"AUDIO_PERMISSION_MESSAGE", @"")
160-
delegate:nil
161-
cancelButtonTitle:NSLocalizedString(@"TXT_CANCEL_TITLE", @"")
162-
otherButtonTitles:NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", nil), nil];
157+
UIAlertView *alertView = [[UIAlertView alloc]
158+
initWithTitle:NSLocalizedString(@"ACTION_REQUIRED_TITLE", @"")
159+
message:NSLocalizedString(@"AUDIO_PERMISSION_MESSAGE", @"")
160+
delegate:nil
161+
cancelButtonTitle:NSLocalizedString(@"TXT_CANCEL_TITLE", @"")
162+
otherButtonTitles:NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", @"Title for settings activity"), nil];
163163

164164
[alertView setDelegate:self];
165165

‎Signal/src/environment/LocalizableText.h‎

Lines changed: 0 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -2,98 +2,5 @@
22
#import "CallProgress.h"
33
#import "CallTermination.h"
44

5-
#define TXT_IN_CALL_CONNECTING NSLocalizedString(@"IN_CALL_CONNECTING", @"")
6-
#define TXT_IN_CALL_RINGING NSLocalizedString(@"IN_CALL_RINGING", @"")
7-
#define TXT_IN_CALL_SECURING NSLocalizedString(@"IN_CALL_SECURING", @"")
8-
#define TXT_IN_CALL_TALKING NSLocalizedString(@"IN_CALL_TALKING", @"")
9-
#define TXT_IN_CALL_TERMINATED NSLocalizedString(@"IN_CALL_TERMINATED", @"")
10-
11-
#define TXT_END_CALL_LOGIN_FAILED NSLocalizedString(@"END_CALL_LOGIN_FAILED", @"")
12-
#define TXT_END_CALL_STALE_SESSION NSLocalizedString(@"END_CALL_STALE_SESSION", @"")
13-
#define TXT_END_CALL_NO_SUCH_USER NSLocalizedString(@"END_CALL_NO_SUCH_USER", @"")
14-
#define TXT_END_CALL_RESPONDER_IS_BUSY NSLocalizedString(@"END_CALL_RESPONDER_IS_BUSY", @"")
15-
#define TXT_END_CALL_REJECTED_LOCAL NSLocalizedString(@"END_CALL_REJECTED_LOCAL", @"")
16-
#define TXT_END_CALL_REJECTED_REMOTE NSLocalizedString(@"END_CALL_REJECTED_REMOTE", @"")
17-
#define TXT_END_CALL_RECIPIENT_UNAVAILABLE NSLocalizedString(@"END_CALL_RECIPIENT_UNAVAILABLE", @"")
18-
#define TXT_END_CALL_UNCATEGORIZED_FAILURE NSLocalizedString(@"END_CALL_UNCATEGORIZED_FAILURE", @"")
19-
#define TXT_END_CALL_BAD_INTERACTION_WITH_SERVER NSLocalizedString(@"END_CALL_BAD_INTERACTION_WITH_SERVER", @"")
20-
#define TXT_END_CALL_HANDSHAKE_FAILED NSLocalizedString(@"END_CALL_HANDSHAKE_FAILED", @"")
21-
#define TXT_END_CALL_HANGUP_REMOTE NSLocalizedString(@"END_CALL_HANGUP_REMOTE", @"")
22-
#define TXT_END_CALL_HANGUP_LOCAL NSLocalizedString(@"END_CALL_HANGUP_LOCAL", @"")
23-
#define TXT_END_CALL_REPLACED_BY_NEXT NSLocalizedString(@"END_CALL_REPLACED_BY_NEXT", @"")
24-
#define TXT_END_CALL_MESSAGE_FROM_SERVER_PREFIX NSLocalizedString(@"END_CALL_MESSAGE_FROM_SERVER_PREFIX", @"")
25-
26-
#pragma mark - View Controller Titles
27-
#define SETTINGS_NAV_BAR_TITLE NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", @"Title for recent calls view controller")
28-
29-
#define DIALER_CALL_BUTTON_TITLE NSLocalizedString(@"DIALER_CALL_BUTTON_TITLE", @"")
30-
31-
#pragma mark - General Purpose
32-
33-
#define TXT_CANCEL_TITLE NSLocalizedString(@"TXT_CANCEL_TITLE", @"")
34-
#define TXT_SEARCH_PLACEHOLDER_TEXT NSLocalizedString(@"TXT_SEARCH_PLACEHOLDER_TEXT", @"")
35-
36-
#pragma mark - Inbox View
37-
38-
#define INBOX_VIEW_TUTORIAL_LABEL_TOP NSLocalizedString(@"INBOX_VIEW_TUTORIAL_LABEL_TOP", @"")
39-
#define INBOX_VIEW_TUTORIAL_LABEL_MIDDLE NSLocalizedString(@"INBOX_VIEW_TUTORIAL_LABEL_MIDDLE", @"")
40-
41-
#define TABLE_SECTION_TITLE_REGISTERED NSLocalizedString(@"TABLE_SECTION_TITLE_REGISTERED", @"")
42-
#define TABLE_SECTION_TITLE_UNREGISTERED NSLocalizedString(@"TABLE_SECTION_TITLE_UNREGISTERED", @"")
43-
44-
#pragma mark - Home View footer cell
45-
46-
#define HOME_FOOTER_FIRST_MESSAGE_CALLS_UNSORTED NSLocalizedString(@"HOME_FOOTER_FIRST_MESSAGE_CALLS_UNSORTED", @"")
47-
#define HOME_FOOTER_SECOND_MESSAGE_CALLS_UNSORTED NSLocalizedString(@"HOME_FOOTER_SECOND_MESSAGE_CALLS_UNSORTED", @"")
48-
#define HOME_FOOTER_SECOND_MESSAGE_CALL_UNSORTED NSLocalizedString(@"HOME_FOOTER_SECOND_MESSAGE_CALL_UNSORTED", @"")
49-
#define HOME_FOOTER_FIRST_MESSAGE_CALLS_NIL NSLocalizedString(@"HOME_FOOTER_FIRST_MESSAGE_CALLS_NIL", @"")
50-
#define HOME_FOOTER_SECOND_MESSAGE_CALLS_NIL NSLocalizedString(@"HOME_FOOTER_SECOND_MESSAGE_CALLS_NIL", @"")
51-
52-
#pragma mark - Settings View
53-
54-
#define SETTINGS_NUMBER_PREFIX NSLocalizedString(@"SETTINGS_NUMBER_PREFIX", @"")
55-
#define SETTINGS_LOG_CLEAR_TITLE NSLocalizedString(@"SETTINGS_LOG_CLEAR_TITLE", @"")
56-
#define SETTINGS_LOG_CLEAR_MESSAGE NSLocalizedString(@"SETTINGS_LOG_CLEAR_MESSAGE", @"")
57-
#define SETTINGS_LOG_CLEAR_CONFIRM NSLocalizedString(@"OK", @"")
58-
59-
#define SETTINGS_SENDLOG NSLocalizedString(@"SETTINGS_SENDLOG", @"")
60-
61-
#define SETTINGS_SENDLOG_WAITING NSLocalizedString(@"SETTINGS_SENDLOGS_WAITING", @"")
62-
#define SETTINGS_SENDLOG_ALERT_TITLE NSLocalizedString(@"SETTINGS_SENDLOG", @"")
63-
64-
#pragma mark - Registration
65-
66-
#define REGISTER_CC_ERR_ALERT_VIEW_TITLE NSLocalizedString(@"REGISTER_CC_ERR_ALERT_VIEW_TITLE", @"")
67-
#define REGISTER_CC_ERR_ALERT_VIEW_MESSAGE NSLocalizedString(@"REGISTER_CC_ERR_ALERT_VIEW_MESSAGE", @"")
68-
#define REGISTER_CC_ERR_ALERT_VIEW_DISMISS NSLocalizedString(@"OK", @"")
69-
70-
#define END_CALL_BUTTON_TITLE NSLocalizedString(@"END_CALL_BUTTON_TITLE", @"")
71-
#define ANSWER_CALL_BUTTON_TITLE NSLocalizedString(@"ANSWER_CALL_BUTTON_TITLE", @"")
72-
#define REJECT_CALL_BUTTON_TITLE NSLocalizedString(@"REJECT_CALL_BUTTON_TITLE", @"")
73-
74-
#define REGISTER_ERROR_ALERT_VIEW_TITLE NSLocalizedString(@"REGISTRATION_ERROR", @"")
75-
#define REGISTER_ERROR_ALERT_VIEW_BODY NSLocalizedString(@"REGISTRATION_BODY", @"")
76-
#define REGISTER_ERROR_ALERT_VIEW_DISMISS NSLocalizedString(@"OK", @"")
77-
78-
#define REGISTER_CHALLENGE_ALERT_VIEW_TITLE NSLocalizedString(@"REGISTER_CHALLENGE_ALERT_VIEW_TITLE", @"")
79-
#define REGISTER_CHALLENGE_ALERT_VIEW_BODY NSLocalizedString(@"REGISTER_CHALLENGE_ALERT_VIEW_BODY", @"")
80-
81-
#pragma mark - Invite Users
82-
83-
#define INVITE_USERS_ACTION_SHEET_TITLE NSLocalizedString(@"INVITE_USERS_ACTION_SHEET_TITLE", @"");
84-
#define INVITE_USERS_MESSAGE NSLocalizedString(@"INVITE_USERS_MESSAGE", @"");
85-
86-
#pragma mark - Invite User Modal
87-
88-
#define INVITE_USER_MODAL_TITLE NSLocalizedString(@"INVITE_USER_MODAL_TITLE", @"")
89-
#define INVITE_USER_MODAL_BUTTON_CANCEL NSLocalizedString(@"INVITE_USER_MODAL_BUTTON_CANCEL", @"")
90-
#define INVITE_USER_MODAL_BUTTON_INVITE NSLocalizedString(@"INVITE_USER_MODAL_BUTTON_INVITE", @"")
91-
#define INVITE_USER_MODAL_TEXT NSLocalizedString(@"INVITE_USER_MODAL_TEXT", @"")
92-
93-
#pragma mark - Contact Intersection
94-
95-
#define TIMEOUT NSLocalizedString(@"ERROR_WAS_DETECTED_TITLE", @"")
96-
#define TIMEOUT_CONTACTS_DETAIL NSLocalizedString(@"TIMEOUT_CONTACTS_DETAIL", @"")
97-
985
NSDictionary *makeCallProgressLocalizedTextDictionary(void);
996
NSDictionary *makeCallTerminationLocalizedTextDictionary(void);

‎Signal/src/environment/LocalizableText.m‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,29 @@
1111

1212
NSDictionary *makeCallProgressLocalizedTextDictionary(void) {
1313
return @{
14-
cp(CallProgressType_Connecting) : TXT_IN_CALL_CONNECTING,
15-
cp(CallProgressType_Ringing) : TXT_IN_CALL_RINGING,
16-
cp(CallProgressType_Securing) : TXT_IN_CALL_SECURING,
17-
cp(CallProgressType_Talking) : TXT_IN_CALL_TALKING,
18-
cp(CallProgressType_Terminated) : TXT_IN_CALL_TERMINATED
14+
cp(CallProgressType_Connecting) : NSLocalizedString(@"IN_CALL_CONNECTING", @"Call setup status label"),
15+
cp(CallProgressType_Ringing) : NSLocalizedString(@"IN_CALL_RINGING", @"Call setup status label"),
16+
cp(CallProgressType_Securing) : NSLocalizedString(@"IN_CALL_SECURING", @"Call setup status label"),
17+
cp(CallProgressType_Talking) : NSLocalizedString(@"IN_CALL_TALKING", @"Call setup status label"),
18+
cp(CallProgressType_Terminated) : NSLocalizedString(@"IN_CALL_TERMINATED", @"Call setup status label")
1919
};
2020
}
2121
NSDictionary *makeCallTerminationLocalizedTextDictionary(void) {
2222
return @{
23-
ct(CallTerminationType_NoSuchUser) : TXT_END_CALL_NO_SUCH_USER,
24-
ct(CallTerminationType_LoginFailed) : TXT_END_CALL_LOGIN_FAILED,
25-
ct(CallTerminationType_ResponderIsBusy) : TXT_END_CALL_RESPONDER_IS_BUSY,
26-
ct(CallTerminationType_StaleSession) : TXT_END_CALL_STALE_SESSION,
27-
ct(CallTerminationType_UncategorizedFailure) : TXT_END_CALL_UNCATEGORIZED_FAILURE,
28-
ct(CallTerminationType_ReplacedByNext) : TXT_END_CALL_REPLACED_BY_NEXT,
29-
ct(CallTerminationType_RecipientUnavailable) : TXT_END_CALL_RECIPIENT_UNAVAILABLE,
30-
ct(CallTerminationType_BadInteractionWithServer) : TXT_END_CALL_BAD_INTERACTION_WITH_SERVER,
31-
ct(CallTerminationType_HandshakeFailed) : TXT_END_CALL_HANDSHAKE_FAILED,
32-
ct(CallTerminationType_HangupRemote) : TXT_END_CALL_HANGUP_REMOTE,
33-
ct(CallTerminationType_HangupLocal) : TXT_END_CALL_HANGUP_LOCAL,
34-
ct(CallTerminationType_ServerMessage) : TXT_END_CALL_MESSAGE_FROM_SERVER_PREFIX,
35-
ct(CallTerminationType_RejectedLocal) : TXT_END_CALL_REJECTED_LOCAL,
36-
ct(CallTerminationType_RejectedRemote) : TXT_END_CALL_REJECTED_REMOTE
23+
ct(CallTerminationType_NoSuchUser) : NSLocalizedString(@"END_CALL_NO_SUCH_USER", @""),
24+
ct(CallTerminationType_LoginFailed) : NSLocalizedString(@"END_CALL_LOGIN_FAILED", @""),
25+
ct(CallTerminationType_ResponderIsBusy) : NSLocalizedString(@"END_CALL_RESPONDER_IS_BUSY", @""),
26+
ct(CallTerminationType_StaleSession) : NSLocalizedString(@"END_CALL_STALE_SESSION", @""),
27+
ct(CallTerminationType_UncategorizedFailure) : NSLocalizedString(@"END_CALL_UNCATEGORIZED_FAILURE", @""),
28+
ct(CallTerminationType_ReplacedByNext) : NSLocalizedString(@"END_CALL_REPLACED_BY_NEXT", @""),
29+
ct(CallTerminationType_RecipientUnavailable) : NSLocalizedString(@"END_CALL_RECIPIENT_UNAVAILABLE", @""),
30+
ct(CallTerminationType_BadInteractionWithServer) :
31+
NSLocalizedString(@"END_CALL_BAD_INTERACTION_WITH_SERVER", @""),
32+
ct(CallTerminationType_HandshakeFailed) : NSLocalizedString(@"END_CALL_HANDSHAKE_FAILED", @""),
33+
ct(CallTerminationType_HangupRemote) : NSLocalizedString(@"END_CALL_HANGUP_REMOTE", @""),
34+
ct(CallTerminationType_HangupLocal) : NSLocalizedString(@"END_CALL_HANGUP_LOCAL", @""),
35+
ct(CallTerminationType_ServerMessage) : NSLocalizedString(@"END_CALL_MESSAGE_FROM_SERVER_PREFIX", @""),
36+
ct(CallTerminationType_RejectedLocal) : NSLocalizedString(@"END_CALL_REJECTED_LOCAL", @""),
37+
ct(CallTerminationType_RejectedRemote) : NSLocalizedString(@"END_CALL_REJECTED_REMOTE", @"")
3738
};
3839
}

‎Signal/src/view controllers/CodeVerificationViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ - (void)showRegistrationErrorMessage:(NSError *)registrationError {
238238
UIAlertView *registrationErrorAV = [[UIAlertView alloc] initWithTitle:registrationError.localizedDescription
239239
message:registrationError.localizedRecoverySuggestion
240240
delegate:nil
241-
cancelButtonTitle:REGISTER_ERROR_ALERT_VIEW_DISMISS
241+
cancelButtonTitle:NSLocalizedString(@"OK", @"")
242242
otherButtonTitles:nil, nil];
243243

244244
[registrationErrorAV show];

‎Signal/src/view controllers/InCallViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ - (void)showConnectingError {
110110
}
111111

112112
- (void)localizeButtons {
113-
[_endButton setTitle:END_CALL_BUTTON_TITLE forState:UIControlStateNormal];
114-
[_answerButton setTitle:ANSWER_CALL_BUTTON_TITLE forState:UIControlStateNormal];
115-
[_rejectButton setTitle:REJECT_CALL_BUTTON_TITLE forState:UIControlStateNormal];
113+
[_endButton setTitle:NSLocalizedString(@"END_CALL_BUTTON_TITLE", @"") forState:UIControlStateNormal];
114+
[_answerButton setTitle:NSLocalizedString(@"ANSWER_CALL_BUTTON_TITLE", @"") forState:UIControlStateNormal];
115+
[_rejectButton setTitle:NSLocalizedString(@"REJECT_CALL_BUTTON_TITLE", @"") forState:UIControlStateNormal];
116116
}
117117

118118
- (void)setPotentiallyKnownContact:(Contact *)potentiallyKnownContact {

‎Signal/src/view controllers/MessageComposeTableViewController.m‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,15 @@ - (void)refreshContacts {
474474
}
475475
failure:^(NSError *error) {
476476
dispatch_async(dispatch_get_main_queue(), ^{
477-
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:TIMEOUT
478-
message:TIMEOUT_CONTACTS_DETAIL
479-
delegate:nil
480-
cancelButtonTitle:NSLocalizedString(@"OK", @"")
481-
otherButtonTitles:nil];
477+
UIAlertView *alert =
478+
[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"ERROR_WAS_DETECTED_TITLE", @"")
479+
message:NSLocalizedString(@"TIMEOUT_CONTACTS_DETAIL", @"")
480+
delegate:nil
481+
cancelButtonTitle:NSLocalizedString(@"OK", @"")
482+
otherButtonTitles:nil];
482483
[alert show];
483484
[self updateAfterRefreshTry];
484-
});
485+
});
485486
}];
486487

487488
if ([self.contacts count] == 0) {

‎Signal/src/view controllers/RegistrationViewController.m‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,13 @@ - (IBAction)changeCountryCodeTapped {
108108
}
109109

110110
- (void)presentInvalidCountryCodeError {
111-
UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:REGISTER_CC_ERR_ALERT_VIEW_TITLE
112-
message:REGISTER_CC_ERR_ALERT_VIEW_MESSAGE
113-
delegate:nil
114-
cancelButtonTitle:REGISTER_CC_ERR_ALERT_VIEW_DISMISS
115-
otherButtonTitles:nil];
111+
UIAlertView *alertView =
112+
[[UIAlertView alloc] initWithTitle:NSLocalizedString(@"REGISTER_CC_ERR_ALERT_VIEW_TITLE", @"")
113+
message:NSLocalizedString(@"REGISTER_CC_ERR_ALERT_VIEW_MESSAGE", @"")
114+
delegate:nil
115+
cancelButtonTitle:NSLocalizedString(@"DISMISS_BUTTON_TEXT",
116+
@"Generic short text for button to dismiss a dialog")
117+
otherButtonTitles:nil];
116118
[alertView show];
117119
}
118120

‎Signal/src/view controllers/SettingsTableViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ - (void)viewDidLoad
7373
[self initializeObserver];
7474
[TSSocketManager sendNotification];
7575

76-
self.title = NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", @"");
76+
self.title = NSLocalizedString(@"SETTINGS_NAV_BAR_TITLE", @"Title for settings activity");
7777
self.networkStatusHeader.text = NSLocalizedString(@"NETWORK_STATUS_HEADER", @"");
7878
self.privacyLabel.text = NSLocalizedString(@"SETTINGS_PRIVACY_TITLE", @"");
7979
self.advancedLabel.text = NSLocalizedString(@"SETTINGS_ADVANCED_TITLE", @"");

‎Signal/translations/ar.lproj/Localizable.strings‎

10.7 KB
Binary file not shown.

‎Signal/translations/az_AZ.lproj/Localizable.strings‎

10.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)