diff --git a/Classes/fr.lproj/ChatRoomViewController.xib b/Classes/fr.lproj/ChatRoomViewController.xib index d529292f6..925eb238d 100644 --- a/Classes/fr.lproj/ChatRoomViewController.xib +++ b/Classes/fr.lproj/ChatRoomViewController.xib @@ -15,6 +15,7 @@ IBUIImageView IBUILabel IBProxyObject + IBUIProgressView IBUITapGestureRecognizer IBUITableViewController IBUITableView @@ -134,7 +135,7 @@ _NS:9 - + 3 MQA @@ -248,6 +249,77 @@ IBCocoaTouchFramework + + + 292 + + + + 292 + {{238, 11}, {62, 37}} + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 1 + cancel + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + 292 + {{7, 25}, {213, 9}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0.5 + + + {320, 59} + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 292 + {{6, 11}, {50, 37}} + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 1 + Pict + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + {{0, 357}, {320, 59}} @@ -482,6 +554,38 @@ 71 + + + transfertView + + + + 76 + + + + cancelTransfertButton + + + + 77 + + + + imageTransferProgressBar + + + + 79 + + + + pictButton + + + + 80 + dataSource @@ -551,6 +655,24 @@ 62 + + + onPictClick: + + + 7 + + 81 + + + + onTransferCancelClick: + + + 7 + + 78 + @@ -669,6 +791,8 @@ + + footerView @@ -713,6 +837,34 @@ messageField + + 72 + + + + + + + transferView + + + 75 + + + cancel + + + 74 + + + progressBar + + + 73 + + + pictureButton + @@ -742,6 +894,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -751,7 +907,7 @@ - 71 + 81 @@ -771,7 +927,9 @@ id id id + id id + id @@ -790,25 +948,37 @@ onMessageChange: id + + onPictClick: + id + onSendClick: id + + onTransferCancelClick: + id + UILabel UIImageView + UIButton UIView UIToggleButton UIImageView UIView UIView + UIProgressView UITapGestureRecognizer UIImageView HPGrowingTextView UIView + UIButton UIButton ChatRoomTableViewController + UIView @@ -819,6 +989,10 @@ avatarImage UIImageView + + cancelTransfertButton + UIButton + chatView UIView @@ -839,6 +1013,10 @@ headerView UIView + + imageTransferProgressBar + UIProgressView + listTapGestureRecognizer UITapGestureRecognizer @@ -855,6 +1033,10 @@ messageView UIView + + pictButton + UIButton + sendButton UIButton @@ -863,6 +1045,10 @@ tableController ChatRoomTableViewController + + transfertView + UIView + IBProjectSource diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index 7bb5ecb9f..d2123bd9c 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index c364fc42d..bddbaa5c2 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 70072ae50..7cb75514b 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -12,7 +12,9 @@ change date 2001-01-01T00:00:00Z changed values - + + fr + class BLBundleObject errors @@ -212,19 +214,21 @@ backup - 11 + 12 class BLWrapperHandle name - Classes/ChatRoomViewController/11/ChatRoomViewController.xib + Classes/ChatRoomViewController/12/ChatRoomViewController.xib change date - 2012-09-13T16:01:39Z + 2012-09-14T08:42:01Z changed values - + + fr + class BLNibFileObject errors @@ -232,7 +236,7 @@ flags 0 hash - 1017e47ad2fcb46b91d384f53e88bb41 + fe17a7cc443845e0f73af8ee35e892e5 name ChatRoomViewController.xib @@ -386,6 +390,60 @@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + fr + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "Pict"; ObjectID = "73"; + errors + + flags + 0 + key + 73.normalTitle + localizations + + en + Pict + fr + Img + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + fr + + class + BLStringKeyObject + comment + Class = "IBUIButton"; normalTitle = "cancel"; ObjectID = "75"; + errors + + flags + 0 + key + 75.normalTitle + localizations + + en + cancel + fr + Annuler + + snapshots + + old objects @@ -443,9 +501,9 @@ versions en - 11 + 12 fr - 11 + 12 @@ -7135,7 +7193,7 @@ change date - 2012-09-11T10:28:55Z + 2012-09-14T09:51:58Z changed values class @@ -7145,7 +7203,7 @@ flags 0 hash - e6f2d74fc56bbbdbcee0adb3a997cc4c + 7fcce4bdc516e1d8f77ce093860a38dd name Localizable.strings @@ -7254,6 +7312,34 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + %@ +Reason was: %s + localizations + + en + %1$@ +Reason was: %2$s + fr + %1$@ +Raison: %2$s + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7279,6 +7365,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + '%@' not registered to Service + localizations + + en + '%@' not registered to Service + fr + '%@' n'est pas enregistré + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7504,6 +7615,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Camera + localizations + + en + Camera + fr + Appareil photo + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7529,6 +7665,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cancel + localizations + + en + Cancel + fr + Annuler + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7579,6 +7740,81 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot transfert file from remote pary + localizations + + en + Cannot transfert file from remote pary + fr + Impossible de transferer depuis destinataire + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot transfert file from remote pary + localizations + + en + Cannot transfert file from remote pary + fr + Impossible de transferer depuis destinataire + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Cannot transfert file to remote pary + localizations + + en + Cannot transfert file to remote pary + fr + Impossible de transferer au destinataire + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7904,6 +8140,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Ignore + localizations + + en + Ignore + fr + Ignoner + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7954,6 +8215,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Image sent + localizations + + en + Image sent + fr + Image envoyé + + snapshots + + change date 2001-01-01T00:00:00Z @@ -7979,6 +8265,56 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Incoming file + localizations + + en + Incoming file + fr + Fichier entrant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Incoming file stored to your photo library + localizations + + en + Incoming file stored to your photo library + fr + Fichier entrant stocké + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8004,6 +8340,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + It seems you have not configured any proxy server from settings + localizations + + en + It seems you have not configured any proxy server from settings + fr + Il semble qu'il n'y est pas de serveur SIP configuré + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8102,6 +8463,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Never remind + localizations + + en + Never remind + fr + Ne pas me rappeler + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8152,31 +8538,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - No comment provided by engineer. - errors - - flags - 0 - key - No SIP account defined - localizations - - en - No SIP account defined - fr - Aucun compte SIP défini - - snapshots - - change date 2001-01-01T00:00:00Z @@ -8202,31 +8563,6 @@ La cause était: %2$@ snapshots - - change date - 2001-01-01T00:00:00Z - changed values - - class - BLStringKeyObject - comment - InAppSettingsKit - errors - - flags - 0 - key - OK - localizations - - en - OK - fr - OK - - snapshots - - change date 2001-01-01T00:00:00Z @@ -8252,6 +8588,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + InAppSettingsKit + errors + + flags + 0 + key + OK + localizations + + en + OK + fr + OK + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8327,6 +8688,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Photo library + localizations + + en + Photo library + fr + Photos + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8477,6 +8863,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Select picture source + localizations + + en + Select picture source + fr + Selectionner une source d'image + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8783,6 +9194,56 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Tranfer error + localizations + + en + Tranfer error + fr + Erreur de transfert + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Transfer error + localizations + + en + Transfer error + fr + Erreur de transfert + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8833,6 +9294,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + Warning + localizations + + en + Warning + fr + Attention + + snapshots + + change date 2001-01-01T00:00:00Z @@ -8939,6 +9425,31 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 0 + key + No SIP account defined + localizations + + en + No SIP account defined + fr + Aucun compte SIP défini + + snapshots + + plist file diff --git a/linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib b/linphone.ldb/Resources/Classes/ChatRoomViewController/12/ChatRoomViewController.xib similarity index 82% rename from linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib rename to linphone.ldb/Resources/Classes/ChatRoomViewController/12/ChatRoomViewController.xib index 76a72edf1..dd7c2c6ba 100644 --- a/linphone.ldb/Resources/Classes/ChatRoomViewController/11/ChatRoomViewController.xib +++ b/linphone.ldb/Resources/Classes/ChatRoomViewController/12/ChatRoomViewController.xib @@ -15,6 +15,7 @@ IBUIButton IBUIImageView IBUILabel + IBUIProgressView IBUITableView IBUITableViewController IBUITapGestureRecognizer @@ -139,7 +140,7 @@ _NS:9 - + 3 MQA @@ -258,6 +259,81 @@ IBCocoaTouchFramework + + + 292 + + + + 292 + {{238, 11}, {62, 37}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 1 + cancel + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + + + + 292 + {{7, 25}, {213, 9}} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0.5 + + + {320, 59} + + + + _NS:9 + + 3 + MQA + + 2 + + + IBCocoaTouchFramework + + + + 292 + {{6, 11}, {50, 37}} + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + 1 + Pict + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + + + {{0, 357}, {320, 59}} @@ -500,6 +576,38 @@ 71 + + + transfertView + + + + 76 + + + + cancelTransfertButton + + + + 77 + + + + imageTransferProgressBar + + + + 79 + + + + pictButton + + + + 80 + dataSource @@ -569,6 +677,24 @@ 62 + + + onPictClick: + + + 7 + + 81 + + + + onTransferCancelClick: + + + 7 + + 78 + @@ -687,6 +813,8 @@ + + footerView @@ -731,6 +859,34 @@ messageField + + 72 + + + + + + + transferView + + + 75 + + + cancel + + + 74 + + + progressBar + + + 73 + + + pictureButton + @@ -760,6 +916,10 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -769,7 +929,7 @@ - 71 + 81 @@ -789,7 +949,9 @@ id id id + id id + id @@ -808,25 +970,37 @@ onMessageChange: id + + onPictClick: + id + onSendClick: id + + onTransferCancelClick: + id + UILabel UIImageView + UIButton UIView UIToggleButton UIImageView UIView UIView + UIProgressView UITapGestureRecognizer UIImageView HPGrowingTextView UIView + UIButton UIButton ChatRoomTableViewController + UIView @@ -837,6 +1011,10 @@ avatarImage UIImageView + + cancelTransfertButton + UIButton + chatView UIView @@ -857,6 +1035,10 @@ headerView UIView + + imageTransferProgressBar + UIProgressView + listTapGestureRecognizer UITapGestureRecognizer @@ -873,6 +1055,10 @@ messageView UIView + + pictButton + UIButton + sendButton UIButton @@ -881,6 +1067,10 @@ tableController ChatRoomTableViewController + + transfertView + UIView + IBProjectSource diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index 7bb5ecb9f..d2123bd9c 100644 Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ