diff --git a/.gitignore b/.gitignore index dd07bff2c..9c6145750 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build-* +*.locuser diff --git a/Classes/HistoryDetailsViewController.m b/Classes/HistoryDetailsViewController.m index 8b5f2a169..eefed13c2 100644 --- a/Classes/HistoryDetailsViewController.m +++ b/Classes/HistoryDetailsViewController.m @@ -268,6 +268,7 @@ static UICompositeViewDescription *compositeDescription = nil; if(contact) { ContactDetailsViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactDetailsViewController compositeViewDescription] push:TRUE], ContactDetailsViewController); if(controller != nil) { + [ContactSelection setSelectionMode:ContactSelectionModeNone]; [controller setContact:contact]; } } diff --git a/Classes/en.lproj/HistoryDetailsViewController.xib b/Classes/en.lproj/HistoryDetailsViewController.xib index 75f2fc588..afce0f1a5 100644 --- a/Classes/en.lproj/HistoryDetailsViewController.xib +++ b/Classes/en.lproj/HistoryDetailsViewController.xib @@ -123,7 +123,7 @@ - {320, 58} + {320, 44} diff --git a/Classes/fr.lproj/HistoryDetailsViewController.xib b/Classes/fr.lproj/HistoryDetailsViewController.xib index 90142d952..a34626363 100644 --- a/Classes/fr.lproj/HistoryDetailsViewController.xib +++ b/Classes/fr.lproj/HistoryDetailsViewController.xib @@ -120,7 +120,7 @@ - {320, 58} + {320, 44} _NS:9 diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 5a905d517..c364fc42d 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index f587e1cf2..d4220eca9 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -2022,17 +2022,17 @@ backup - 1 + 2 class BLWrapperHandle name - Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib + Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib change date - 2012-09-10T15:21:27Z + 2012-09-11T12:08:15Z changed values class @@ -2042,7 +2042,7 @@ flags 0 hash - 8e3f7756f219a2bd1a73da657abf7f25 + 5772e41dc8ea1406d99370f79cb51bce name HistoryDetailsViewController.xib @@ -2446,9 +2446,9 @@ versions en - 1 + 2 fr - 1 + 2 @@ -7273,7 +7273,7 @@ La cause était: %2$@ en '%@' not registered fr - '%' n'est pas enregistré + '%@' n'est pas enregistré snapshots diff --git a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib similarity index 99% rename from linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib rename to linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib index 75f2fc588..afce0f1a5 100644 --- a/linphone.ldb/Resources/Classes/HistoryDetailsViewController/1/HistoryDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/HistoryDetailsViewController/2/HistoryDetailsViewController.xib @@ -123,7 +123,7 @@ - {320, 58} + {320, 44}