diff --git a/Classes/Base.lproj/AboutView.strings b/Classes/Base.lproj/AboutView.strings index 5cce46d13..d4a070336 100644 Binary files a/Classes/Base.lproj/AboutView.strings and b/Classes/Base.lproj/AboutView.strings differ diff --git a/Classes/Base.lproj/AboutView.xib b/Classes/Base.lproj/AboutView.xib index e3588ad2b..5dc9bf2d2 100644 --- a/Classes/Base.lproj/AboutView.xib +++ b/Classes/Base.lproj/AboutView.xib @@ -131,7 +131,7 @@ GNU General Public License V2 -© 2010-2016 Belledonne-Communications +© 2010-2016 Belledonne Communications @@ -257,7 +257,7 @@ GNU General Public License V2 -© 2010-2016 Belledonne-Communications +© 2010-2016 Belledonne Communications diff --git a/Classes/Base.lproj/FirstLoginView.strings b/Classes/Base.lproj/FirstLoginView.strings index 5663041fe..ded50f888 100644 Binary files a/Classes/Base.lproj/FirstLoginView.strings and b/Classes/Base.lproj/FirstLoginView.strings differ diff --git a/Classes/Base.lproj/FirstLoginView.xib b/Classes/Base.lproj/FirstLoginView.xib index 9b0a15009..d5a605452 100644 --- a/Classes/Base.lproj/FirstLoginView.xib +++ b/Classes/Base.lproj/FirstLoginView.xib @@ -81,7 +81,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/Classes/FirstLoginView.m b/Classes/FirstLoginView.m index 8c34852d2..0752161f3 100644 --- a/Classes/FirstLoginView.m +++ b/Classes/FirstLoginView.m @@ -178,7 +178,7 @@ static UICompositeViewDescription *compositeDescription = nil; initWithTitle:NSLocalizedString(@"Configuration failed", nil) message: NSLocalizedString( - @"Cannot retrieve your configuration. Please check credentialls or try again later", + @"Cannot retrieve your configuration. Please check credentials or try again later", nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"OK", nil) diff --git a/Classes/ar.lproj/AboutView.strings b/Classes/ar.lproj/AboutView.strings index e3dd9e8fc..419309543 100644 Binary files a/Classes/ar.lproj/AboutView.strings and b/Classes/ar.lproj/AboutView.strings differ diff --git a/Classes/ar.lproj/FirstLoginView.strings b/Classes/ar.lproj/FirstLoginView.strings index 210df7ef4..58a7f1df7 100644 Binary files a/Classes/ar.lproj/FirstLoginView.strings and b/Classes/ar.lproj/FirstLoginView.strings differ diff --git a/Classes/de.lproj/AboutView.strings b/Classes/de.lproj/AboutView.strings index 2876bf526..893cc0d5d 100644 Binary files a/Classes/de.lproj/AboutView.strings and b/Classes/de.lproj/AboutView.strings differ diff --git a/Classes/de.lproj/FirstLoginView.strings b/Classes/de.lproj/FirstLoginView.strings index 486d00d21..505a13513 100644 Binary files a/Classes/de.lproj/FirstLoginView.strings and b/Classes/de.lproj/FirstLoginView.strings differ diff --git a/Classes/fr.lproj/AboutView.strings b/Classes/fr.lproj/AboutView.strings index e86f56f6f..452305ae4 100644 Binary files a/Classes/fr.lproj/AboutView.strings and b/Classes/fr.lproj/AboutView.strings differ diff --git a/Classes/fr.lproj/FirstLoginView.strings b/Classes/fr.lproj/FirstLoginView.strings index db6e7e185..f29da653b 100644 Binary files a/Classes/fr.lproj/FirstLoginView.strings and b/Classes/fr.lproj/FirstLoginView.strings differ diff --git a/Classes/ja.lproj/AboutView.strings b/Classes/ja.lproj/AboutView.strings index 8749d7ac7..b8accea17 100644 Binary files a/Classes/ja.lproj/AboutView.strings and b/Classes/ja.lproj/AboutView.strings differ diff --git a/Classes/ja.lproj/FirstLoginView.strings b/Classes/ja.lproj/FirstLoginView.strings index 3c7434854..ef2bee5ab 100644 Binary files a/Classes/ja.lproj/FirstLoginView.strings and b/Classes/ja.lproj/FirstLoginView.strings differ diff --git a/Classes/nl.lproj/AboutView.strings b/Classes/nl.lproj/AboutView.strings index ac06a575c..534c30b2c 100644 Binary files a/Classes/nl.lproj/AboutView.strings and b/Classes/nl.lproj/AboutView.strings differ diff --git a/Classes/nl.lproj/FirstLoginView.strings b/Classes/nl.lproj/FirstLoginView.strings index 8fd48bfc7..918214345 100644 Binary files a/Classes/nl.lproj/FirstLoginView.strings and b/Classes/nl.lproj/FirstLoginView.strings differ diff --git a/Classes/ru.lproj/AboutView.strings b/Classes/ru.lproj/AboutView.strings index 4a82b772c..e61414303 100644 Binary files a/Classes/ru.lproj/AboutView.strings and b/Classes/ru.lproj/AboutView.strings differ diff --git a/Classes/ru.lproj/FirstLoginView.strings b/Classes/ru.lproj/FirstLoginView.strings index 19ce609e0..da43f8d5f 100644 Binary files a/Classes/ru.lproj/FirstLoginView.strings and b/Classes/ru.lproj/FirstLoginView.strings differ diff --git a/Classes/sv.lproj/AboutView.strings b/Classes/sv.lproj/AboutView.strings index 4319c3447..39c9ef131 100644 Binary files a/Classes/sv.lproj/AboutView.strings and b/Classes/sv.lproj/AboutView.strings differ diff --git a/Classes/sv.lproj/FirstLoginView.strings b/Classes/sv.lproj/FirstLoginView.strings index f0ab8281c..c90701b1f 100644 Binary files a/Classes/sv.lproj/FirstLoginView.strings and b/Classes/sv.lproj/FirstLoginView.strings differ diff --git a/Classes/zh_CN.lproj/AboutView.strings b/Classes/zh_CN.lproj/AboutView.strings index 2f2b6d967..a1b7408b9 100644 Binary files a/Classes/zh_CN.lproj/AboutView.strings and b/Classes/zh_CN.lproj/AboutView.strings differ diff --git a/Classes/zh_CN.lproj/FirstLoginView.strings b/Classes/zh_CN.lproj/FirstLoginView.strings index 2dc0e549d..511bfb646 100644 Binary files a/Classes/zh_CN.lproj/FirstLoginView.strings and b/Classes/zh_CN.lproj/FirstLoginView.strings differ diff --git a/Classes/zh_TW.lproj/AboutView.strings b/Classes/zh_TW.lproj/AboutView.strings index b3e841a49..5e0bc125f 100644 Binary files a/Classes/zh_TW.lproj/AboutView.strings and b/Classes/zh_TW.lproj/AboutView.strings differ diff --git a/Classes/zh_TW.lproj/FirstLoginView.strings b/Classes/zh_TW.lproj/FirstLoginView.strings index 79d9cfea7..ded50f888 100644 Binary files a/Classes/zh_TW.lproj/FirstLoginView.strings and b/Classes/zh_TW.lproj/FirstLoginView.strings differ diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings index 5d9c6834b..8687bbaaa 100644 Binary files a/Resources/ar.lproj/Localizable.strings and b/Resources/ar.lproj/Localizable.strings differ diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings index 74d6dcd3d..84390cf80 100644 Binary files a/Resources/de.lproj/Localizable.strings and b/Resources/de.lproj/Localizable.strings differ diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index f3ee7ba04..45d7b1bf6 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 4b706262a..0d97ca1ea 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings index 975e04fa0..a44ab8272 100644 Binary files a/Resources/ja.lproj/Localizable.strings and b/Resources/ja.lproj/Localizable.strings differ diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings index 08a828b2d..cc782b656 100644 Binary files a/Resources/nl.lproj/Localizable.strings and b/Resources/nl.lproj/Localizable.strings differ diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings index bb72bf4a6..0091aa902 100644 Binary files a/Resources/ru.lproj/Localizable.strings and b/Resources/ru.lproj/Localizable.strings differ diff --git a/Resources/sv.lproj/Localizable.strings b/Resources/sv.lproj/Localizable.strings index 5d343096a..fd1bcefd4 100644 Binary files a/Resources/sv.lproj/Localizable.strings and b/Resources/sv.lproj/Localizable.strings differ diff --git a/Resources/zh_CN.lproj/Localizable.strings b/Resources/zh_CN.lproj/Localizable.strings index b0bb13370..0bc041b3b 100644 Binary files a/Resources/zh_CN.lproj/Localizable.strings and b/Resources/zh_CN.lproj/Localizable.strings differ diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings index fd27211c6..d7f9d1288 100644 Binary files a/Resources/zh_TW.lproj/Localizable.strings and b/Resources/zh_TW.lproj/Localizable.strings differ diff --git a/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings b/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings index 14ef3fe7c..1161878e2 100644 Binary files a/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/ar.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/de.lproj/Advanced.strings b/Settings/InAppSettings.bundle/de.lproj/Advanced.strings index 87aaab5bd..d6c30a7d4 100644 Binary files a/Settings/InAppSettings.bundle/de.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/de.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/en.lproj/Advanced.strings b/Settings/InAppSettings.bundle/en.lproj/Advanced.strings index 6e8c6d2e2..102d3964b 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Advanced.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Advanced.strings @@ -8,10 +8,10 @@ "Other" = "Other"; "Animations" = "Animations"; "Start at boot" = "Start at boot"; +"Show message in notification" = "Show message in notification"; "First login view" = "First login view"; "Primary account" = "Primary account"; "Display name" = "Display name"; "Username" = "Username"; "File sharing" = "File sharing"; "Server URL" = "Server URL"; -"Show message in notification" = "Show message in notification"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings index 5a7097876..0b97f8d80 100644 Binary files a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/ja.lproj/Advanced.strings b/Settings/InAppSettings.bundle/ja.lproj/Advanced.strings index abf34c09e..afbb57143 100644 Binary files a/Settings/InAppSettings.bundle/ja.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/ja.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/nl.lproj/Advanced.strings b/Settings/InAppSettings.bundle/nl.lproj/Advanced.strings index cdee922f2..b9eeaa71b 100644 Binary files a/Settings/InAppSettings.bundle/nl.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/nl.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings b/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings index 1aa1dcab2..baba6350d 100644 Binary files a/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/ru.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/sv.lproj/Advanced.strings b/Settings/InAppSettings.bundle/sv.lproj/Advanced.strings index bb75ba20e..1a0f9586b 100644 Binary files a/Settings/InAppSettings.bundle/sv.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/sv.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/zh_CN.lproj/Advanced.strings b/Settings/InAppSettings.bundle/zh_CN.lproj/Advanced.strings index 41de2dd84..0ccc81b4e 100644 Binary files a/Settings/InAppSettings.bundle/zh_CN.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/zh_CN.lproj/Advanced.strings differ diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings index d54652a1a..eba23865c 100644 Binary files a/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 376305371..ce17d9cb9 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -53,7 +53,7 @@ CFBundleVersion - 1 + 2 LSRequiresIPhoneOS UIApplicationExitsOnSuspend diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7dba40df3..3223dc7ac 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -628,7 +628,7 @@ 63E27A5A1C51392A00D332AE /* libebml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A4D1C50EAC300D332AE /* libebml2.a */; }; 63E27A5B1C51392A00D332AE /* libmatroska2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 63E27A471C50EA7A00D332AE /* libmatroska2.a */; }; 63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; }; - 63E802DB1C625AEF000D5509 /* nowebcamCIF.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 63E802DA1C625AEF000D5509 /* nowebcamCIF.jpg */; }; + 63E802DB1C625AEF000D5509 /* (null) in Resources */ = {isa = PBXBuildFile; }; 63EEE3FF1BBA9AC00087D3AF /* libcunit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F03A9B7E18C0D9C900C4D7FE /* libcunit.a */; }; 63EEE4001BBA9AC00087D3AF /* liblinphonetester.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C0F193623F200974404 /* liblinphonetester.a */; }; 63EEE4041BBA9B010087D3AF /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; }; @@ -2279,7 +2279,6 @@ 6316A07D1C5F64330073BFA4 /* add_field_over.png */, 6316A07E1C5F64330073BFA4 /* add_field_over@2x.png */, 6316A07F1C5F64330073BFA4 /* avatar.png */, - 63E802DA1C625AEF000D5509 /* nowebcamCIF.jpg */, 6316A0801C5F64330073BFA4 /* avatar@2x.png */, 6316A0811C5F64330073BFA4 /* avatar~ipad.png */, 6316A0821C5F64330073BFA4 /* avatar~ipad@2x.png */, @@ -3167,7 +3166,7 @@ 6316A2971C5F64350073BFA4 /* chat_add_default@2x.png in Resources */, 6316A2E41C5F64350073BFA4 /* dialer_back_default.png in Resources */, 6316A3871C5F64350073BFA4 /* numpad_star_over~ipad.png in Resources */, - 63E802DB1C625AEF000D5509 /* nowebcamCIF.jpg in Resources */, + 63E802DB1C625AEF000D5509 /* (null) in Resources */, 6316A2781C5F64350073BFA4 /* call_status_missed~ipad.png in Resources */, 6316A32E1C5F64350073BFA4 /* numpad_0_over~ipad.png in Resources */, 63AADBFF1B6A0FF200AA16FD /* assistant_external_sip.rc in Resources */,