diff --git a/Classes/ChatConversationInfoView.xib b/Classes/ChatConversationInfoView.xib
index 15ec50f80..2fe63ef70 100644
--- a/Classes/ChatConversationInfoView.xib
+++ b/Classes/ChatConversationInfoView.xib
@@ -129,7 +129,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index a0b2f463b..3ebf23743 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -333,7 +333,7 @@ static UICompositeViewDescription *compositeDescription = nil;
NSString *composingAddresses = @"";
if (bctbx_list_size(addresses) == 1) {
composingAddresses = [FastAddressBook displayNameForAddress:(LinphoneAddress *)addresses->data];
- _composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ is composing...", nil), composingAddresses];
+ _composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ is writing...", nil), composingAddresses];
} else {
while (addresses) {
if (![composingAddresses isEqualToString:@""])
@@ -341,7 +341,7 @@ static UICompositeViewDescription *compositeDescription = nil;
composingAddresses = [composingAddresses stringByAppendingString:[FastAddressBook displayNameForAddress:(LinphoneAddress *)addresses->data]];
addresses = addresses->next;
}
- _composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ are composing...", nil), composingAddresses];
+ _composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ are writing...", nil), composingAddresses];
}
} else {
// pull down the composing frame and widen the tableview
diff --git a/Classes/ChatsListTableView.m b/Classes/ChatsListTableView.m
index 5b76ae1ee..89cfefe65 100644
--- a/Classes/ChatsListTableView.m
+++ b/Classes/ChatsListTableView.m
@@ -224,8 +224,8 @@ void deletion_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomStat
if (editingStyle == UITableViewCellEditingStyleDelete) {
LinphoneChatRoom *chatRoom = (LinphoneChatRoom *)bctbx_list_nth_data(_data, (int)[indexPath row]);
NSString *msg = (LinphoneChatRoomCapabilitiesOneToOne & linphone_chat_room_get_capabilities(chatRoom))
- ? [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete this conversation?", nil)]
- : [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete and leave this conversation?", nil)];
+ ? [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete this conversation?", nil)]
+ : [NSString stringWithFormat:NSLocalizedString(@"Do you want to leave and delete this conversation?", nil)];
[UIConfirmationDialog ShowWithMessage:msg
cancelMessage:nil
confirmMessage:nil
diff --git a/Classes/ChatsListView.m b/Classes/ChatsListView.m
index 155ff1f8e..e7c556ec8 100644
--- a/Classes/ChatsListView.m
+++ b/Classes/ChatsListView.m
@@ -104,8 +104,8 @@ static UICompositeViewDescription *compositeDescription = nil;
}
}
NSString *msg = group
- ? [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete and leave the selected conversations?", nil)]
- : [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete the selected conversations?", nil)];
+ ? [NSString stringWithFormat:NSLocalizedString(@"Do you want to leave and delete the selected conversations?", nil)]
+ : [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete the selected conversations?", nil)];
[UIConfirmationDialog ShowWithMessage:msg
cancelMessage:nil
confirmMessage:nil
diff --git a/Classes/ImagePickerView.m b/Classes/ImagePickerView.m
index 584f4088a..c5ee92daf 100644
--- a/Classes/ImagePickerView.m
+++ b/Classes/ImagePickerView.m
@@ -224,7 +224,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
};
- DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source", nil)];
+ DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select the source", nil)];
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
[sheet addButtonWithTitle:NSLocalizedString(@"Camera", nil)
block:^() {
diff --git a/Classes/LinphoneUI/UIChatNotifiedEventCell.m b/Classes/LinphoneUI/UIChatNotifiedEventCell.m
index 2d519167d..e198cab93 100644
--- a/Classes/LinphoneUI/UIChatNotifiedEventCell.m
+++ b/Classes/LinphoneUI/UIChatNotifiedEventCell.m
@@ -62,41 +62,41 @@ static const CGFloat NOTIFIED_CELL_HEIGHT = 44;
switch (linphone_event_log_get_type(event)) {
case LinphoneEventLogTypeConferenceSubjectChanged: {
NSString *subject = [NSString stringWithUTF8String:linphone_event_log_get_subject(event) ?: LINPHONE_DUMMY_SUBJECT];
- NSString *formatedString = [NSString stringWithFormat:@"Chat room subject has changed to : %@", subject];
+ NSString *formatedString = [NSString stringWithFormat:@"New subject : %@", subject];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantAdded: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
- NSString *formatedString = [NSString stringWithFormat:@"%@ has been added to the chat room", participant];
+ NSString *formatedString = [NSString stringWithFormat:@"%@ has joined", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantRemoved: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
- NSString *formatedString = [NSString stringWithFormat:@"%@ has been removed of the chat room", participant];
+ NSString *formatedString = [NSString stringWithFormat:@"%@ has left", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantSetAdmin: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
- NSString *formatedString = [NSString stringWithFormat:@"%@ is now an admin of the chat room", participant];
+ NSString *formatedString = [NSString stringWithFormat:@"%@ is now an admin", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantUnsetAdmin: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
- NSString *formatedString = [NSString stringWithFormat:@"%@ is no longer an admin of the chat room", participant];
+ NSString *formatedString = [NSString stringWithFormat:@"%@ is no longer an admin", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceTerminated: {
- NSString *formatedString = [NSString stringWithFormat:@"Chat room has been left"];
+ NSString *formatedString = [NSString stringWithFormat:@"You have left the group"];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceCreated: {
- NSString *formatedString = [NSString stringWithFormat:@"Chat room has been entered"];
+ NSString *formatedString = [NSString stringWithFormat:@"You have joined the group"];
eventString = NSLocalizedString(formatedString, nil);
break;
}