From 0dfd24fc926254a3c171d210a96eed7265cf27a4 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 21 May 2015 12:01:37 +0200
Subject: [PATCH 01/14] i10n: update translations

---
 .../FirstLoginViewController.strings          | Bin 0 -> 1282 bytes
 Classes/zh_TW.lproj/WizardViews.strings       | Bin 0 -> 18742 bytes
 .../ar.lproj/Audio.strings                    | Bin 1568 -> 1568 bytes
 .../de.lproj/Audio.strings                    | Bin 0 -> 1698 bytes
 .../de.lproj/Call.strings                     | Bin 0 -> 618 bytes
 .../de.lproj/Root.strings                     | Bin 1392 -> 1404 bytes
 .../de.lproj/Video.strings                    | Bin 0 -> 608 bytes
 .../en.lproj/Audio.strings                    |   8 ++++----
 .../fr.lproj/Audio.strings                    | Bin 1614 -> 1614 bytes
 .../ja.lproj/Audio.strings                    | Bin 0 -> 1618 bytes
 .../nl.lproj/Audio.strings                    | Bin 0 -> 1618 bytes
 .../ru.lproj/Audio.strings                    | Bin 1658 -> 1658 bytes
 .../zh_TW.lproj/Advanced.strings              | Bin 0 -> 1014 bytes
 .../zh_TW.lproj/Audio.strings                 | Bin 0 -> 1618 bytes
 14 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 Classes/zh_TW.lproj/FirstLoginViewController.strings
 create mode 100644 Classes/zh_TW.lproj/WizardViews.strings
 create mode 100644 Settings/InAppSettings.bundle/de.lproj/Audio.strings
 create mode 100644 Settings/InAppSettings.bundle/de.lproj/Call.strings
 create mode 100644 Settings/InAppSettings.bundle/de.lproj/Video.strings
 create mode 100644 Settings/InAppSettings.bundle/ja.lproj/Audio.strings
 create mode 100644 Settings/InAppSettings.bundle/nl.lproj/Audio.strings
 create mode 100644 Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings
 create mode 100644 Settings/InAppSettings.bundle/zh_TW.lproj/Audio.strings

diff --git a/Classes/zh_TW.lproj/FirstLoginViewController.strings b/Classes/zh_TW.lproj/FirstLoginViewController.strings
new file mode 100644
index 0000000000000000000000000000000000000000..389b7f246bb34acdde28388c90ac64872c100ae0
GIT binary patch
literal 1282
zcmcIkOA5j;6r6QWQM&9xH&P1XMnw<=UFZR<7C*!)ZAHDjI*GQWC8b7`5J>WpnarEK
zJnk0SaA9Krfh7_)8$EUh3yd*Gh$~Wzu;WNz&Gjy$ORU&JwSR|zQNf<#h6!VV+FRfx
zoX3b5IdJqsm~z*ivlUN`G0a)LciiQ@ERH?2K4NongavO^<+F(Ojn0$Gid4GAQR$b+
zzf-2i|Bn_E&t}ZId<z$<j&s-RJo77_`Np2<`2ORWj>(3JvL?@T3{6`4II|8?W;=T4
z(!{L^&uv(L+1WZZ9y%4L<cev1mD$XdMe0o*_`(GL7x`-l)>l?jW%PPy>a^(5i;61a
GTX+J7n8bJh

literal 0
HcmV?d00001

diff --git a/Classes/zh_TW.lproj/WizardViews.strings b/Classes/zh_TW.lproj/WizardViews.strings
new file mode 100644
index 0000000000000000000000000000000000000000..302614eda41a29a1a8526e97dab2105c18488632
GIT binary patch
literal 18742
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
BYiR%g

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/ar.lproj/Audio.strings b/Settings/InAppSettings.bundle/ar.lproj/Audio.strings
index 981d99f7cd1ba1f4b0ee37e76037bfef959891df..92060bc6f4e2ab00e0960f557a80779d24f31af4 100644
GIT binary patch
delta 122
zcmZ3$vw&xU6LU6$$HYcSSwjXh1|XB6ib09Nnt=;Q1~U{eqyk|DgTmxSCgF*Fd|<Wn
vgF)0}eMWI*BL));J(&zSKrsadsChtj(vy>z<R<qp@=V^vD6zSRaS96nByJh=

delta 128
zcmZ3$vw&xU6SFr%#>7TRWkUut1|XB6ib09Nnt=;Q1~U{eqyk|Dg93vENN!@IG+6cg
wU=TG~pHW=dh`|IyS0+OaLpD$k)I^{<u(rwaOwyBk7<ne|VwBk2!#ITn0DPkwD*ylh

diff --git a/Settings/InAppSettings.bundle/de.lproj/Audio.strings b/Settings/InAppSettings.bundle/de.lproj/Audio.strings
new file mode 100644
index 0000000000000000000000000000000000000000..78a04abff6ecf22b4c97ac48daeb8b671b10fd60
GIT binary patch
literal 1698
zcma)6(N4lZ5S(Yf;=;QoB2kR-p(sJ4L?Th2ORYd!3V}-0@AW&>*(=v8y-G>b=5BXp
zc5nB#zdsFJVUAaX2(Ur}3YUD#)(afaHpGIs5FbPw;}j8Y@KxZH{VGSe{C4g$5sU0L
zBN+9J`@q=m%ut~Pm%HsPbBCBBrk+BRY@=)A-r^p28}I+z>JuBTc*|T59;<tZF7>bJ
ztx~AM)af*Nj`AtWI)bUwIoU%;Fm*buimI0L5lp>~+gVq~y&E3-cr4sQv(Ii$4`)0>
zv*7RHD7O_c=M@;S8O)Gz?1c0<53<j^at}J}w)IbQONJQG+s9J@VJ$_3=ODzAAv{j%
z8a@(EYsj^Y=6Z}~O#CNC{04dk##~LQV7V{ci&}^!#5>|@t#>P=_@*`D>?QP>Jo;n=
zw9h$}6Mhq-mF8|M3og>QH;vk@DrfMin35$(MW)Z4tOCtXwN_ln-Q_%PI0>;Ka|${8
z+u6Gu8^<Sl%vek2kn(J^9kG_o%SLmV^1m__vwvB|`ii!V8FN3=HrtbZ@mZI<?11zw
z*0p+O{?Z?*+dx-L)+;{J9qFR|_bqfD0Z*Fs#^+x8FBxW4Q&f()lb*;uk*dn=sfyeo
YR^lkm!kmxX9~;eh<^E2nGTI};AO3Fi)&Kwi

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/de.lproj/Call.strings b/Settings/InAppSettings.bundle/de.lproj/Call.strings
new file mode 100644
index 0000000000000000000000000000000000000000..d8a4378cc3d9cfe3232bbe49661d0c638c9f1274
GIT binary patch
literal 618
zcma)(&1%9x6ot>)rx>yoq5I-Okb(=VXzjwC(NO~?mL!GteSHk6elw#@5dRov?&Rj&
zbI(0<_=_}DE~}*y{V0-An;o*d|Lm(8<i`3|tU@K&lDh@jWXJmDd|_4f&tT82R+$zs
zB*a*=(^pp?>g$bub=Jq&OV+V^%xE~@VH<F}&U_nX&=C5%Gg9c#<386`sn@-NcaHWA
z%Xo)UYPPsk*7Q%wIq&w&Y4N?FX6^kCj%IQ^3;q>EhjkeXrs{9hA)CXz^xjlzo>Aab
q-@^sAPn0KUb1$4SRpO_bXoQRP*Z4xm%+HXWV(#nK%-GTy?>LW;d1EdB

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/de.lproj/Root.strings b/Settings/InAppSettings.bundle/de.lproj/Root.strings
index d18e076dced5cb59cc89dd073db2b387ed7007ca..5524616ef5f543f0efc73386cd320f3d1e350e80 100644
GIT binary patch
delta 48
wcmeys^@nRhnyMp1F%V_~aS1~zLmrS+U`S*r1@hAv{xD=P6oEuH)_-IH07<Y7cK`qY

delta 17
Zcmeyv^?_?b+C(Rr$zNE6HZHis0su$?2ebeH

diff --git a/Settings/InAppSettings.bundle/de.lproj/Video.strings b/Settings/InAppSettings.bundle/de.lproj/Video.strings
new file mode 100644
index 0000000000000000000000000000000000000000..5f44284084d41b9810c0a002a58b57bf6701e5de
GIT binary patch
literal 608
zcma)&&1%9x6ot>aPa*Exg@_c2iz=cUK@hT^#xW5zk@$zcY~RAA?Kd-O5~@%n&dj~%
ze)rt_b7|^RJ8hL~CBwN;%(>)uR6`pgMg{*(UR}Pw`VAFnO>32*`_Rh+b(L<YjAga{
z7vDh5P^UPpc9;^$b?^=>zUSQb%wdU@uBW`0`npb(ak@!UIyaaw(~0~-$rJLL9oPrd
zh|UEpM>6d3Icwqxb0~$s&8{wIL~`!VkMmGE?)i?6e}bIg)S`>fg_?xSS>L`U?79!h
v<zi?hrydQ;6+5>u+ZEkd6Ad)ftB(d<s+Kx6)ktsmSkOe&y;nH5x6A$lTa05T

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
index 675c25120..c19078b2a 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
@@ -1,9 +1,9 @@
 "Codecs" = "Codecs";
-"Speex 16Khz" = "Speex 16Khz";
-"Speex 8Khz" = "Speex 8Khz";
+"Speex 16kHz" = "Speex 16kHz";
+"Speex 8kHz" = "Speex 8kHz";
 "Opus 48kHz" = "Opus 48kHz";
-"Silk 24Khz" = "Silk 24Khz";
-"Silk 16Khz" = "Silk 16Khz";
+"Silk 24kHz" = "Silk 24kHz";
+"Silk 16kHz" = "Silk 16kHz";
 "AAC-ELD 16kHz" = "AAC-ELD 16kHz";
 "AAC-ELD 22kHz" = "AAC-ELD 22kHz";
 "AAC-ELD 32kHz" = "AAC-ELD 32kHz";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings
index 9b6dadd5e6876a0f0d8a6820d827c758c6167733..3d9d34047a27168274806e310ee54fc090fb3981 100644
GIT binary patch
delta 69
zcmX@dbB<?%-Q)~Lfr)+s%-IYc6B8vTZUJ(5SS=Vp+}Xik(T~y-FG);JVHBD8kBixm
U!EEwHM)}Ddj69nQ81JzF01!16eE<Le

delta 79
zcmX@dbB<?%9kVw>#zaS1FqJ3?;YqSuFo1+-2ZQ+^r9sqWenyD&M{#yT1~ZU?$%#zT
OlRFrBHWx77V*vnO^c8IY

diff --git a/Settings/InAppSettings.bundle/ja.lproj/Audio.strings b/Settings/InAppSettings.bundle/ja.lproj/Audio.strings
new file mode 100644
index 0000000000000000000000000000000000000000..6a00768fbbe3197b7d31d7ff1f889ccc72d3286b
GIT binary patch
literal 1618
zcmb7E+fIW(5IxU+1?jsFV&f&o2dYgqkw|Rx9g$!oy#%mPKVCh%8!{`qv>4K6nK_r4
z*<F6VN4UZoFUXOh#s~o}`Rhh6aKP9c8{%?&5OIVPyx|647N;-ovd?yMC2N@X^nGV_
z0mhJATd6<WdM;4XD?muDTdyzMW%@g9nReDNBSf6(A*Q&)b<d=BVf-o~JLuNmRk1OC
zmE!>_HpZ_q_RO+di;d}1are?y5lpKR<H0&}5zM>E&Tz^OLn|*48*%O+RHQ}BsVO&M
z#&fUUP4<?%I^q6GULppOFdO61LP*3$L=Hkl3?kx<+#<z_w=(Bi+}up7SrY$=XZ~mU
z#1~vGs36>gccBksRAMqRRQw`r@XG%c-2=Ev`*6}lN~MOXTdh>lztO8qt2f%Kv}#oS
z4dv{2N!f8hr-~Ic>}WaA$;UHp^0f>&Yo#hZm3&|7n9O`A-l$JG@szryp3xI4SNoy%
mAkmXj>za?+*TU-MzdWDYgw9Gk;Q3zjso9(K@z=qRRjR*$yX2q%

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/nl.lproj/Audio.strings b/Settings/InAppSettings.bundle/nl.lproj/Audio.strings
new file mode 100644
index 0000000000000000000000000000000000000000..6a00768fbbe3197b7d31d7ff1f889ccc72d3286b
GIT binary patch
literal 1618
zcmb7E+fIW(5IxU+1?jsFV&f&o2dYgqkw|Rx9g$!oy#%mPKVCh%8!{`qv>4K6nK_r4
z*<F6VN4UZoFUXOh#s~o}`Rhh6aKP9c8{%?&5OIVPyx|647N;-ovd?yMC2N@X^nGV_
z0mhJATd6<WdM;4XD?muDTdyzMW%@g9nReDNBSf6(A*Q&)b<d=BVf-o~JLuNmRk1OC
zmE!>_HpZ_q_RO+di;d}1are?y5lpKR<H0&}5zM>E&Tz^OLn|*48*%O+RHQ}BsVO&M
z#&fUUP4<?%I^q6GULppOFdO61LP*3$L=Hkl3?kx<+#<z_w=(Bi+}up7SrY$=XZ~mU
z#1~vGs36>gccBksRAMqRRQw`r@XG%c-2=Ev`*6}lN~MOXTdh>lztO8qt2f%Kv}#oS
z4dv{2N!f8hr-~Ic>}WaA$;UHp^0f>&Yo#hZm3&|7n9O`A-l$JG@szryp3xI4SNoy%
mAkmXj>za?+*TU-MzdWDYgw9Gk;Q3zjso9(K@z=qRRjR*$yX2q%

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings
index a73f1679d8ec383421c9ed1d7ff4b74567951876..750528f5322a497ba47fb48e8c78c7130faefa93 100644
GIT binary patch
delta 69
zcmeyx^NVMK-Q)~Lfr)+s%-IYc6B8vTZUJ(5SS=Vp+}Xik(T~y-FG);JVHBD8kBixm
T!EEwHM)}Ddj69nQ7`a#hCGHji

delta 79
zcmeyx^NVMK9kVw>#zaS1FqJ3?;YqSuFo1+-2ZQ+^r9sqWenyD&M{#yT1~ZU?$%#zT
OlRFrBHWx5*u>t^i9Tf5a

diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Advanced.strings
new file mode 100644
index 0000000000000000000000000000000000000000..ce4023744a51b1acfd330d29a0a66682eea3c224
GIT binary patch
literal 1014
zcmbW0%}&EW420**Q$)S<1c*bSa6+P@>H|Pq+KBw1ZNksX1D|V9HgrQIR8^bUo*9pw
z{rs3{ri~udYO9Gdo%8R<&UErCGF-KQtI`^d8`UuGBhFOLxi3|KyH`l!(pg8|s?iQ?
zh;-tZS54_DSBXNyS@Rb6mCicy0?bNJI0@j|Z*L{fYgD^=jnz5Z0)2DY;M01^n0w8y
ziJ1PX`Ek>NsC5d5Ie9(!H^xWeHj9k7vF1c_`tN*q9Zzxde-`iL8uma3=A=Mz%X`K1
z3+INuI<@giXS~vzo)4_?bo)`SoTKbJ4SGk@_Ozl0+fh8vu{vj)!L>)ZfXCP>&a$`R
x;R<J1g16ZpBabtVu$kC*pMl(=XMU>QEgY_J2D?##Y5UHXy5rV$Gf!s?`32g^p?&}W

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Audio.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Audio.strings
new file mode 100644
index 0000000000000000000000000000000000000000..6a00768fbbe3197b7d31d7ff1f889ccc72d3286b
GIT binary patch
literal 1618
zcmb7E+fIW(5IxU+1?jsFV&f&o2dYgqkw|Rx9g$!oy#%mPKVCh%8!{`qv>4K6nK_r4
z*<F6VN4UZoFUXOh#s~o}`Rhh6aKP9c8{%?&5OIVPyx|647N;-ovd?yMC2N@X^nGV_
z0mhJATd6<WdM;4XD?muDTdyzMW%@g9nReDNBSf6(A*Q&)b<d=BVf-o~JLuNmRk1OC
zmE!>_HpZ_q_RO+di;d}1are?y5lpKR<H0&}5zM>E&Tz^OLn|*48*%O+RHQ}BsVO&M
z#&fUUP4<?%I^q6GULppOFdO61LP*3$L=Hkl3?kx<+#<z_w=(Bi+}up7SrY$=XZ~mU
z#1~vGs36>gccBksRAMqRRQw`r@XG%c-2=Ev`*6}lN~MOXTdh>lztO8qt2f%Kv}#oS
z4dv{2N!f8hr-~Ic>}WaA$;UHp^0f>&Yo#hZm3&|7n9O`A-l$JG@szryp3xI4SNoy%
mAkmXj>za?+*TU-MzdWDYgw9Gk;Q3zjso9(K@z=qRRjR*$yX2q%

literal 0
HcmV?d00001


From 878071d18be5ce546464992c100d2d71ebd10a16 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 21 May 2015 12:23:13 +0200
Subject: [PATCH 02/14] i10n: fix some case typo in audio/video codecs thanks
 to Atalanttore

---
 Settings/InAppSettings.bundle/Audio.plist     |  14 +++++++-------
 Settings/InAppSettings.bundle/Video.plist     |   4 ++--
 .../ar.lproj/Audio.strings                    | Bin 1568 -> 1576 bytes
 .../ar.lproj/Root.strings                     | Bin 1428 -> 1502 bytes
 .../ar.lproj/Video.strings                    | Bin 542 -> 550 bytes
 .../de.lproj/Audio.strings                    | Bin 1698 -> 1702 bytes
 .../de.lproj/Root.strings                     | Bin 1404 -> 1478 bytes
 .../de.lproj/Video.strings                    | Bin 608 -> 612 bytes
 .../en.lproj/Audio.strings                    |   6 +++---
 .../en.lproj/Root.strings                     |   1 +
 .../en.lproj/Video.strings                    |   4 ++--
 .../fr.lproj/Audio.strings                    | Bin 1614 -> 1622 bytes
 .../fr.lproj/Root.strings                     | Bin 1490 -> 1580 bytes
 .../fr.lproj/Video.strings                    | Bin 610 -> 618 bytes
 .../ja.lproj/Audio.strings                    | Bin 1618 -> 1626 bytes
 .../ja.lproj/Root.strings                     | Bin 1350 -> 1424 bytes
 .../nl.lproj/Audio.strings                    | Bin 1618 -> 1626 bytes
 .../nl.lproj/Root.strings                     | Bin 1398 -> 1472 bytes
 .../ru.lproj/Audio.strings                    | Bin 1658 -> 1666 bytes
 .../ru.lproj/Root.strings                     | Bin 1474 -> 1548 bytes
 .../ru.lproj/Video.strings                    | Bin 620 -> 628 bytes
 .../zh_TW.lproj/Audio.strings                 | Bin 1618 -> 1626 bytes
 .../zh_TW.lproj/Root.strings                  | Bin 1382 -> 1456 bytes
 23 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist
index 58f5cf6d0..b9b3278f4 100644
--- a/Settings/InAppSettings.bundle/Audio.plist
+++ b/Settings/InAppSettings.bundle/Audio.plist
@@ -16,7 +16,7 @@
 			<key>Key</key>
 			<string>speex_16k_preference</string>
 			<key>Title</key>
-			<string>Speex 16Khz</string>
+			<string>Speex 16kHz</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -26,7 +26,7 @@
 			<key>Key</key>
 			<string>speex_8k_preference</string>
 			<key>Title</key>
-			<string>Speex 8Khz</string>
+			<string>Speex 8kHz</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -46,7 +46,7 @@
 			<key>Key</key>
 			<string>silk_24k_preference</string>
 			<key>Title</key>
-			<string>Silk 24Khz</string>
+			<string>Silk 24kHz</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -56,7 +56,7 @@
 			<key>Key</key>
 			<string>silk_16k_preference</string>
 			<key>Title</key>
-			<string>Silk 16Khz</string>
+			<string>Silk 16kHz</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -128,7 +128,7 @@
 			<key>Key</key>
 			<string>g722_preference</string>
 			<key>Title</key>
-			<string>G722</string>
+			<string>G.722</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -138,7 +138,7 @@
 			<key>Key</key>
 			<string>g729_preference</string>
 			<key>Title</key>
-			<string>G729</string>
+			<string>G.729</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -158,7 +158,7 @@
 			<key>Key</key>
 			<string>ilbc_preference</string>
 			<key>Title</key>
-			<string>ILBC</string>
+			<string>iLBC</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
diff --git a/Settings/InAppSettings.bundle/Video.plist b/Settings/InAppSettings.bundle/Video.plist
index dfcd404b4..71e8964ff 100644
--- a/Settings/InAppSettings.bundle/Video.plist
+++ b/Settings/InAppSettings.bundle/Video.plist
@@ -74,7 +74,7 @@
 			<key>Key</key>
 			<string>mp4v-es_preference</string>
 			<key>Title</key>
-			<string>mpeg4</string>
+			<string>MPEG-4</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
@@ -84,7 +84,7 @@
 			<key>Key</key>
 			<string>h264_preference</string>
 			<key>Title</key>
-			<string>h264</string>
+			<string>H.264</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Audio.strings b/Settings/InAppSettings.bundle/ar.lproj/Audio.strings
index 92060bc6f4e2ab00e0960f557a80779d24f31af4..5cb4f358decd998c10a6c8ebdde5006eb7ddcf57 100644
GIT binary patch
delta 96
zcmZ3$vw~;CH709426F}@AXH*dV6X*ZB?fl}gqSr07m|o2s;bGH%(}vv3_c7_49-Y0
LnVUVCuQLGvsE!S<

delta 88
zcmZ3%vw&yAH6~+o1|uL;Vo+eP1!5%zcLtb<H3Ju%Z;7m8vLLgruqT5LgA;=@lDOyQ
IK<4XA08IQ0zW@LL

diff --git a/Settings/InAppSettings.bundle/ar.lproj/Root.strings b/Settings/InAppSettings.bundle/ar.lproj/Root.strings
index 4ccc20f65b1c1275101b33dcfaf26e464d0603bf..e8f29b4054d82438285620035e3eb81a9a2a286b 100644
GIT binary patch
delta 79
zcmbQjeUE#C0*jL?Lj^+#LlHwFg91YuLn@FiVJHRiQyGdGlz?KkK&-@oPt|4#mKsI?
DlH?Dv

delta 12
Tcmcb|J%xLN0?XzsmJ&t)9jpWM

diff --git a/Settings/InAppSettings.bundle/ar.lproj/Video.strings b/Settings/InAppSettings.bundle/ar.lproj/Video.strings
index 26e7a1a975e3764402c9d046451986a0548786f1..19bfcdd3994ca9c2e01ecf63f6bdd1e144b7d0fc 100644
GIT binary patch
delta 77
zcmbQovW#WJE=EURh5!av26qNs1``G)1_cINAXZ{P6}4vI0*ZMs=rI^En4zcxicS8^
Gs0{$*b_-Gf

delta 69
zcmZ3+GLL1$E=J2-h609EhI9rK1|<ds23sIjVn7zNX5a#fWH1;pn4zf2nEabj8vx1_
B3)}zz

diff --git a/Settings/InAppSettings.bundle/de.lproj/Audio.strings b/Settings/InAppSettings.bundle/de.lproj/Audio.strings
index 78a04abff6ecf22b4c97ac48daeb8b671b10fd60..7d420ae4fef72e0937978d47c58b4f8a9c43908a 100644
GIT binary patch
delta 26
gcmZ3)yNq|kGbTp8$xoS7fg~rhBV*=fZ{~1j0CgV+od5s;

delta 22
ecmZ3+yNGwgGp5Nem{cb7F*`7NZuVymX9fUZ5eF#%

diff --git a/Settings/InAppSettings.bundle/de.lproj/Root.strings b/Settings/InAppSettings.bundle/de.lproj/Root.strings
index 5524616ef5f543f0efc73386cd320f3d1e350e80..77dc6e9e8cfab50a1624ed4ee1866d471572af25 100644
GIT binary patch
delta 78
zcmeyvb&Pw142z>HLj^+#LlHwFg91YuLn@FiVJHRiQyGdGlz?KkK&-@oN7ZIwmP|$f
Dn;Z}1

delta 12
TcmX@c{fBFV49n&;mIOusAU^~q

diff --git a/Settings/InAppSettings.bundle/de.lproj/Video.strings b/Settings/InAppSettings.bundle/de.lproj/Video.strings
index 5f44284084d41b9810c0a002a58b57bf6701e5de..3ff7eacd386a2c76bd36c454c8124471890efc9d 100644
GIT binary patch
delta 29
lcmaFB@`Po>4@OR3h5!av26qPC$^RJ@nLQZvCMz=80|1Na2loH~

delta 25
gcmaFD@_=Q-4@UM}h609EhV;pdOp1&dlU14Q0dTtqKL7v#

diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
index c19078b2a..3bf01c791 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
@@ -10,10 +10,10 @@
 "AAC-ELD 44kHz" = "AAC-ELD 44kHz";
 "AAC-ELD 48kHz" = "AAC-ELD 48kHz";
 "AMR" = "AMR";
-"G722" = "G722";
-"G729" = "G729";
+"G.722" = "G.722";
+"G.729" = "G.729";
 "GSM" = "GSM";
-"ILBC" = "ILBC";
+"iLBC" = "iLBC";
 "PCMU" = "PCMU";
 "PCMA" = "PCMA";
 "Advanced" = "Advanced";
diff --git a/Settings/InAppSettings.bundle/en.lproj/Root.strings b/Settings/InAppSettings.bundle/en.lproj/Root.strings
index 317149125..a4f199b92 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Root.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Root.strings
@@ -18,6 +18,7 @@
 "Network" = "Network";
 "Tunnel" = "Tunnel";
 "Advanced" = "Advanced";
+"Extra features" = "Extra features";
 "Development debug actions" = "Development debug actions";
 "About" = "About";
 "Quit" = "Quit";
diff --git a/Settings/InAppSettings.bundle/en.lproj/Video.strings b/Settings/InAppSettings.bundle/en.lproj/Video.strings
index 675d4dc4f..598678c4c 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Video.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Video.strings
@@ -4,6 +4,6 @@
 "Show preview" = "Show preview";
 "Preferred video size" = "Preferred video size";
 "Codecs" = "Codecs";
-"mpeg4" = "mpeg4";
-"h264" = "h264";
+"MPEG-4" = "MPEG-4";
+"H.264" = "H.264";
 "VP8" = "VP8";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings
index 3d9d34047a27168274806e310ee54fc090fb3981..9bb1b7819ee97b4f2e07be8d6a1d33bdbd10a028 100644
GIT binary patch
delta 82
zcmX@dbB$-iB_>9_$rqV~)%6(68H|8XiNTtI3rM;%KtwEoYy}2eAO?#~W@XkD&Sdam
QaAI&qlF8ic%FM|O0C+nL^#A|>

delta 88
zcmcb{bB<@jB_?BY1|uL;Vo+eP1!5%zcLtb<H3Ju%Z;7m8GB2~PuqT5LgA;=@lDOw)
IUuI5b0BG3^LI3~&

diff --git a/Settings/InAppSettings.bundle/fr.lproj/Root.strings b/Settings/InAppSettings.bundle/fr.lproj/Root.strings
index 54f984e9f76c8af4f8d68c7050880fb064f8e0a2..8ca7357254a217020ff9142aa469c3da4f46793c 100644
GIT binary patch
delta 92
zcmcb_y@qFl7mL3uLj^+#LlHwFg91YuLn@FiVJHRiQyGdGlz?KkK&-^z2owXU0*Qju
c<ul|lBm+e<!K^%>t{fn{gyH38dzQ(J0FCt%rT_o{

delta 12
TcmZ3(bBTL{7t7`)EFFvhAOQq;

diff --git a/Settings/InAppSettings.bundle/fr.lproj/Video.strings b/Settings/InAppSettings.bundle/fr.lproj/Video.strings
index c6fabea203bf7436e9db8bb6cfc0a2e361a7e93a..d7b6da9ab1612ac9bd59d1366969a599193fd4fd 100644
GIT binary patch
delta 77
zcmaFF@``1{KSoDih5!av26qNs1``G)1_cINAXZ{P6}4vI0*ZMs=rI^En4zcxicL0W
G(gpw>(+gt&

delta 69
zcmaFG@`z=_KSs-3h609EhI9rK1|<ds23sIjVn7zNX5a#fWH1;pn4zf2m~79a4FLTD
B3+(^^

diff --git a/Settings/InAppSettings.bundle/ja.lproj/Audio.strings b/Settings/InAppSettings.bundle/ja.lproj/Audio.strings
index 6a00768fbbe3197b7d31d7ff1f889ccc72d3286b..8dc312533cfd6dac25283761a07d7709aab2e955 100644
GIT binary patch
delta 82
zcmcb_bBkxgB_>9_$rqV~)%6(68H|8XiNTtI3rM;%KtwEoYy}2eAO?#~W@XkD&Sdam
QaAI&qlF8ic%FN3Q0D8*}0RR91

delta 88
zcmcb`bBSleB_?BY1|uL;Vo+eP1!5%zcLtb<H3Ju%Z;7m8GB2~PuqT5LgA;=@lDOw)
IUuIrr0Be~HP5=M^

diff --git a/Settings/InAppSettings.bundle/ja.lproj/Root.strings b/Settings/InAppSettings.bundle/ja.lproj/Root.strings
index 98079add0c8396def9338b7d1d6c6871c119b00e..08ed64e6572744b0652803ec3ed6cca0a2467b7d 100644
GIT binary patch
delta 78
zcmX@cHGzA>D`rPmh6;ufh9ZVU1_g#RhEyP3!cYq2r!o{XC;`Q6fmn$FkE+cNnNt}7
DxI+;R

delta 12
TcmbQheT-|vE9T86EHR7#AZG+o

diff --git a/Settings/InAppSettings.bundle/nl.lproj/Audio.strings b/Settings/InAppSettings.bundle/nl.lproj/Audio.strings
index 6a00768fbbe3197b7d31d7ff1f889ccc72d3286b..8dc312533cfd6dac25283761a07d7709aab2e955 100644
GIT binary patch
delta 82
zcmcb_bBkxgB_>9_$rqV~)%6(68H|8XiNTtI3rM;%KtwEoYy}2eAO?#~W@XkD&Sdam
QaAI&qlF8ic%FN3Q0D8*}0RR91

delta 88
zcmcb`bBSleB_?BY1|uL;Vo+eP1!5%zcLtb<H3Ju%Z;7m8GB2~PuqT5LgA;=@lDOw)
IUuIrr0Be~HP5=M^

diff --git a/Settings/InAppSettings.bundle/nl.lproj/Root.strings b/Settings/InAppSettings.bundle/nl.lproj/Root.strings
index ed3cb391143dfed330d6f5c070d35b284073dcb5..a2f24cb67b1cfbca2c7278601a475c10ed8c0780 100644
GIT binary patch
delta 78
zcmeyyb%1+=7>lDTLj^+#LlHwFg91YuLn@FiVJHRiQyGdGlz?KkK&-@oN7ZItmP|$f
Dm9h`a

delta 12
TcmX@W{f%pb7|Z4amIOusA9(~0

diff --git a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings
index 750528f5322a497ba47fb48e8c78c7130faefa93..cbe619ed6fac65a7c917dfc9cb725c9ecba4844b 100644
GIT binary patch
delta 82
zcmeyx)5N>s5)-4|<cmzg>Us?33`Rhx#9+<91ti@WAR?APwgQ7K5QD`gvoh-nXEOLO
QI59XQ$z*PJWj1970BpJp`Tzg`

delta 88
zcmZqT{l&B45|gnxgAouaF(@$D0<jW<I|EF_nt=<>w?tMknU`5t*ptDB!HK~cN!)X@
IFS98#09$YjM*si-

diff --git a/Settings/InAppSettings.bundle/ru.lproj/Root.strings b/Settings/InAppSettings.bundle/ru.lproj/Root.strings
index 5fa091180b874a0b585323693f7cf6652903c4e4..81e404f9c0e3c85c024fe755bca970081433dde8 100644
GIT binary patch
delta 79
zcmX@a-NUmXh{eg3p@N}=p@<=oL4hHSAr(lMFq8uMsSL#oN<cANAXZ|)r)skoO9dkU
Dm+TMk

delta 12
TcmeC-ImEpoh-LE}mI6iq9mxbR

diff --git a/Settings/InAppSettings.bundle/ru.lproj/Video.strings b/Settings/InAppSettings.bundle/ru.lproj/Video.strings
index efffa34fb0ee33e5632261ee9be93b0caedf43d2..645f88014711aacc3f005b3528a6a031993d9e95 100644
GIT binary patch
delta 77
zcmaFE@`Yss2a}^OLjZ#-gFAyRg9(EYg93vs5GygDidr*p0mVER^caj7%uv(;#U?v4
GX#)V>=?aVh

delta 69
zcmeyu@`hyt2a{zkLjgl7Lpp;AgA#)RgDns%F(8XsGjIV#G8l{)%uv*1O!j2b1^~q`
B3l;zX

diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Audio.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Audio.strings
index 6a00768fbbe3197b7d31d7ff1f889ccc72d3286b..8dc312533cfd6dac25283761a07d7709aab2e955 100644
GIT binary patch
delta 82
zcmcb_bBkxgB_>9_$rqV~)%6(68H|8XiNTtI3rM;%KtwEoYy}2eAO?#~W@XkD&Sdam
QaAI&qlF8ic%FN3Q0D8*}0RR91

delta 88
zcmcb`bBSleB_?BY1|uL;Vo+eP1!5%zcLtb<H3Ju%Z;7m8GB2~PuqT5LgA;=@lDOw)
IUuIrr0Be~HP5=M^

diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Root.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Root.strings
index d23b62fb85fcef2e4575ce92724025f47e59e82d..602fdf1a34c4b551509fd3fa54a8d68ae7c64f13 100644
GIT binary patch
delta 78
zcmaFHwSjvB3yY&GLj^+#LlHwFg91YuLn@FiVJHRiQyGdGlz?KkK&-@oN7d%v%-M_p
Dim4EZ

delta 12
TcmdnM{fuh^3(ICdmLx_19ajU)


From d0803d6d304b4a8f77a91dd3fa3361fca66044e9 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 22 May 2015 15:04:27 +0200
Subject: [PATCH 03/14] i10n: update translations

---
 .../de.lproj/UICallBar~ipad.strings           | Bin 7648 -> 7650 bytes
 .../LinphoneUI/de.lproj/UICallCell.strings    | Bin 9608 -> 9588 bytes
 .../LinphoneUI/de.lproj/UIChatCell.strings    | Bin 1512 -> 1514 bytes
 .../de.lproj/UIChatRoomCell.strings           | Bin 1812 -> 1826 bytes
 .../de.lproj/UIContactDetailsFooter.strings   | Bin 452 -> 454 bytes
 .../de.lproj/UIContactDetailsHeader.strings   | Bin 680 -> 660 bytes
 Classes/LinphoneUI/de.lproj/UIMainBar.strings | Bin 2764 -> 2746 bytes
 .../de.lproj/UIMainBar~ipad.strings           | Bin 3882 -> 3850 bytes
 .../LinphoneUI/de.lproj/UIStateBar.strings    | Bin 1866 -> 1866 bytes
 Classes/de.lproj/AboutViewController.strings  | Bin 1382 -> 1382 bytes
 .../de.lproj/ChatRoomViewController.strings   | Bin 3400 -> 3404 bytes
 Classes/de.lproj/ChatViewController.strings   | Bin 1548 -> 1558 bytes
 .../ContactDetailsViewController.strings      | Bin 1412 -> 1420 bytes
 .../de.lproj/ContactsViewController.strings   | Bin 1798 -> 1808 bytes
 Classes/de.lproj/DialerViewController.strings | Bin 4502 -> 4504 bytes
 .../DialerViewController~ipad.strings         | Bin 4724 -> 4734 bytes
 .../HistoryDetailsViewController.strings      | Bin 4842 -> 4822 bytes
 .../de.lproj/HistoryViewController.strings    | Bin 1946 -> 1986 bytes
 .../IncomingCallViewController.strings        | Bin 1596 -> 1576 bytes
 .../IncomingCallViewController~ipad.strings   | Bin 3206 -> 3186 bytes
 Classes/de.lproj/WizardViews.strings          | Bin 18946 -> 18996 bytes
 Settings/InAppSettings.bundle/Call.plist      |   2 +-
 .../ar.lproj/Call.strings                     | Bin 578 -> 580 bytes
 .../de.lproj/Advanced.strings                 | Bin 1022 -> 1122 bytes
 .../de.lproj/Call.strings                     | Bin 618 -> 630 bytes
 .../de.lproj/Network.strings                  | Bin 902 -> 904 bytes
 .../de.lproj/Root.strings                     | Bin 1478 -> 1574 bytes
 .../de.lproj/Tunnel.strings                   | Bin 116 -> 118 bytes
 .../en.lproj/Call.strings                     |   2 +-
 .../fr.lproj/Call.strings                     | Bin 638 -> 640 bytes
 .../ja.lproj/Video.strings                    | Bin 0 -> 584 bytes
 .../nl.lproj/Video.strings                    | Bin 0 -> 584 bytes
 .../ru.lproj/Call.strings                     | Bin 602 -> 604 bytes
 .../zh_TW.lproj/Video.strings                 | Bin 0 -> 584 bytes
 34 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 Settings/InAppSettings.bundle/ja.lproj/Video.strings
 create mode 100644 Settings/InAppSettings.bundle/nl.lproj/Video.strings
 create mode 100644 Settings/InAppSettings.bundle/zh_TW.lproj/Video.strings

diff --git a/Classes/LinphoneUI/de.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/de.lproj/UICallBar~ipad.strings
index 0e34b67fef3716b0645a59baefb2dd816f0d51de..19663dab03f9d0e8271e341fa545ee1878dbc7c6 100644
GIT binary patch
delta 50
zcmaE0{m6R5JSJIhhJ1!RhBSs$h9V%&W2j<KU?^rNVMqk>OC~c)T2H<pptD(l`G6Dv
DaX}5;

delta 48
zcmaE4{lI#|JSO>Kh7yKEh9V%D%AmmD&5+NK$B+hO7Xfh|L)GMq{K=b@m=8z+09h;z
Al>h($

diff --git a/Classes/LinphoneUI/de.lproj/UICallCell.strings b/Classes/LinphoneUI/de.lproj/UICallCell.strings
index d88ef71c5a7351a2f8145f9736ebe6245ad3685e..d719ddb6d1f21536083a341ef2907e03d113b62b 100644
GIT binary patch
delta 68
zcmeD1{^B*^hOjq7K0_Wu2}2@7HjvB%(z%lhCEYjMF`i)-N0m%uC<96Zl}@f_R^J@J
HYM}rCtw0iH

delta 96
zcmez3)!{wihN2%sB10}iDuV(;3Xm)Y(%uaD40#MCK=EuKSv=WL+I6!L;~8c}Cx%Rh
W9H27XN*6M!PF7&E+g!!^OCA7+Y!|}-

diff --git a/Classes/LinphoneUI/de.lproj/UIChatCell.strings b/Classes/LinphoneUI/de.lproj/UIChatCell.strings
index f377a8290329c83e98ad8f2d5cd0237d72ac60bb..ec85a65fab04b1c80794f5a56b57412fa989af7e 100644
GIT binary patch
delta 16
XcmaFC{fc{o95Zt!L+WOE=95eSF_8r;

delta 14
VcmaFG{epXg95Z9$W<}<cOaLgg1ik<O

diff --git a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings
index 4091aa28ab1526d73a3b0bf72465d5e22d827fd5..3efe98727a0e73ca6808ba1b75ed070760e401e2 100644
GIT binary patch
delta 103
zcmbQjw}@}TJw-o;M22LB42B|xOfX%-pumvB@QtAu%u8j+n|zT`b+a7f97a)0r9kP;
TCz&2H3g)4k0@ihp#f%96YIPd=

delta 48
zcmZ3)H-&G)y@_!Olb<muY*t~M!#LRi$auzdfpM}GiwH<`@&{(I$tH{fn}t{fm;kv;
B5D@?X

diff --git a/Classes/LinphoneUI/de.lproj/UIContactDetailsFooter.strings b/Classes/LinphoneUI/de.lproj/UIContactDetailsFooter.strings
index 44dceef6dfa0f57c0e6c199318ea119ee214ebac..9dc62be3dda778a6d8821edfe20a3e00149b48ed 100644
GIT binary patch
delta 48
ucmX@Ye2jU+JVp&~hJ1!Rh7yKEhHN0Iz>o^&r2*+8APdA(Vz6f5VgLXtxe71<

delta 33
ncmX@ce1v(!JjRKq1jG~=yczNt@)$}O5*f0Aq!NQQ0~Z4TsU`=+

diff --git a/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings b/Classes/LinphoneUI/de.lproj/UIContactDetailsHeader.strings
index fd30c299aacc53efa618cc79bf70b03299ac8930..8ec7e8bdb46df88c50f182ca9fd7b815dd2bb323 100644
GIT binary patch
delta 73
zcmZ3%I)!z@6;W@7e1<%R5{5*EY#^Bjq;nZkC(mV6ov0wNS&K1@Q2|v&B10Ka4M=?v
LgA#)^0~Z4Tv5OFE

delta 93
zcmbQjx`K7W6-7UWM21|3R0aix6d+j)q`evP8S)rPfa2LevUu`DM%9T50-NO+!x%N3
U7%~}hfGTmSW>8|VX5eA~0ONiWApigX

diff --git a/Classes/LinphoneUI/de.lproj/UIMainBar.strings b/Classes/LinphoneUI/de.lproj/UIMainBar.strings
index 5edd38a0ef3d16f47a5a706bcab889754cb4141e..ca048a81fe1b0ae9b6db2fed64c7b4a4c6586248 100644
GIT binary patch
delta 76
zcmX>jx=VCJ7bB}PLk2_QWJQ+L$yb;hCO=`;;|*g-Whi3EVMt^sWk{QB$fY`o(Euo!
PfGIIi!EW<1W;J#ISQZr-

delta 67
zcmdlbdPa0Z7vscZK9fJN>P-H^n8)kEkjYTYP{NSUP{fcq`6EmC<ReT87^0RS^_!<K
HtFZ$BGou!p

diff --git a/Classes/LinphoneUI/de.lproj/UIMainBar~ipad.strings b/Classes/LinphoneUI/de.lproj/UIMainBar~ipad.strings
index 2cb9e3a89c1c699b00ecb41b0d86881b95030a6f..354ff4935845583b30e9d8e3b7d6abebe7ab64f1 100644
GIT binary patch
delta 92
zcmZ1_*Cn@M8RO&*UY^OzxPvBl@v2NVV={sAjV4F2=uF<i>@c~6O^-K>A(f$sA%`K6
dp_CzQ@<Q&=$p?6JCO=>{!H_ZE9K~{h3jkU+99aMW

delta 55
zcmeB@TP3$)8RO(*yjGJBuo+Cw;8mNf!DIsBPgJm*e2gh?G7E3Y<OMuBlMgYQ0NHMv
JtynH_0RS;06C3~l

diff --git a/Classes/LinphoneUI/de.lproj/UIStateBar.strings b/Classes/LinphoneUI/de.lproj/UIStateBar.strings
index 9582df007d6957a589a6eb7ef839e019d7813768..8be33cdc4bd33ea7334b3a4729303abe1a6dc399 100644
GIT binary patch
delta 86
zcmX@bcZzR=6`OnjLlA=_gENB%gCCR*V(<j>Ll|5c{3hqK)=$2{=A%YH9fJ~sH3Js|
E00r9*x&QzG

delta 86
zcmX@bcZzR=6`OnkLlHwFLo!1KLmreaV#oyZOBhla@+RlA)=$2{=A%YH9fJ~sH3Js|
E0I}N>x&QzG

diff --git a/Classes/de.lproj/AboutViewController.strings b/Classes/de.lproj/AboutViewController.strings
index ba945f814f57f621cb711e1f3bbf2ef0fa99dcc3..fe932b98a69f44e6ac576f74424a40d69b766cc1 100644
GIT binary patch
delta 32
ncmaFH^^9wSAFG5egEvDeLlHwBg93vggC2tcgA#)^0~Z4TgBAtP

delta 14
VcmaFH^^9wSAM4~NEMiPt3;-+x1c3km

diff --git a/Classes/de.lproj/ChatRoomViewController.strings b/Classes/de.lproj/ChatRoomViewController.strings
index baa97fae2c258d2f8b10889bab431e8a728f4ed9..54e6308a4802315ec97f72a33da0814d811c139c 100644
GIT binary patch
delta 100
zcmX>hbw+AK6cfJ_Ln=ceLlHv~kj`W%nOw-KIZ;7q@;er}$-9{1a7b^CV*bG->dlbP
fkjGF0)Se9_^MG_NL+Zqfs*|gD6gKZ*o4^JDYY7|7

delta 65
zcmX>jbwX-G6cgtWhCGH8hE#^4$%f39lmD^EO+LgFhY;Ot$ZW{W?#GbGkjs!dS(w9q
NavhJt<~?i^*Z`3i69E7K

diff --git a/Classes/de.lproj/ChatViewController.strings b/Classes/de.lproj/ChatViewController.strings
index 947386cb97966009d0bab5dc08d19c9587478b44..f40dfd2aeb151b0308fd807cb73156139c0b74a8 100644
GIT binary patch
delta 44
xcmeC-nZ~oBfl<(jA(bJKp@<;~NM|yXFr-dAZ@KvpV+%7gkU#Of`s6&;c>os)4Uzx=

delta 21
dcmbQn)5Ei&fpOw7r_HArTbLOWCkL_~1pr$v2pRwY

diff --git a/Classes/de.lproj/ContactDetailsViewController.strings b/Classes/de.lproj/ContactDetailsViewController.strings
index d189b62349e4944dd3d04d5e00c7e2116455dd07..4a8fe640eacd473068c7e90746987471f03daf44 100644
GIT binary patch
delta 32
mcmZqS?&03hz{u~!kjjwAP{fb~q%#>xCU0c1-h7Dh5HkRczX?MC

delta 15
WcmeC-ZsFe0z&P=k)8<o*hnN8{T?RA&

diff --git a/Classes/de.lproj/ContactsViewController.strings b/Classes/de.lproj/ContactsViewController.strings
index 9c47c94ff4903bfee8bbf2bba5d2054a53c1c0f1..fdd063fb947f5ec52e8093c8f0bc5dd3c72c3270 100644
GIT binary patch
delta 44
xcmZqUo4~hW3zM`igEvDyLmop3Ln1>qkW6F9WXJ*1sSHJv9oa%ROEJG;1_1c$3o!ry

delta 19
bcmbQh*T%PD3)93mX_MQSMK)V7-(Us+PPPYi

diff --git a/Classes/de.lproj/DialerViewController.strings b/Classes/de.lproj/DialerViewController.strings
index d747752ea8dfb1cb0ed5604161ede2850cae74ee..8b7da1f541ba2b8476f500ee8743549ad0e5aa1e 100644
GIT binary patch
delta 16
XcmbQHJVSYd03&lML*`~d##R9UDJKMB

delta 23
fcmbQCJWY9n03&lEL*C?%%&HR=BsK>zx(NUPSBVDM

diff --git a/Classes/de.lproj/DialerViewController~ipad.strings b/Classes/de.lproj/DialerViewController~ipad.strings
index ffeea8e15d871164eb5c7759d4287c5ea74d18c7..3ee713d0e9b02b3ac6678182dd5e60e0d12c782b 100644
GIT binary patch
delta 37
tcmeyO@=s-h03&lML*`~dMo}jAV1^QgREDC-f{f~u8<^}icQL=>0|3o@3Z(!5

delta 28
kcmeyT@<nBX03&1KWPN7!i3$>%gBY(dGHPu$WcK9;0E>1AUH||9

diff --git a/Classes/de.lproj/HistoryDetailsViewController.strings b/Classes/de.lproj/HistoryDetailsViewController.strings
index 97b098e9570aab7e635c3a4e4db5f90f33f6f3cc..689025f1908ca545c5ade00a15a73e0bf82ecb73 100644
GIT binary patch
delta 56
zcmaE*dQEjh3De{?ynNh=3}p<73?)EZH2EP*^5k30Jd;_N^FVU!c|g%zhSbT99Il&h
IFbnYm01n*|MgRZ+

delta 96
zcmcbn`bu>}36r7|LncEGLkfce5T`N}18HxDe1<%R5{5*EY#>=Yc_W|c<O%#blixAb
UDEa|KbAjscsdn9bgjt9m0G*T=8vp<R

diff --git a/Classes/de.lproj/HistoryViewController.strings b/Classes/de.lproj/HistoryViewController.strings
index 0f6ab0c52691b617d9e4a89836a394ed9fa73141..32bd19cfb16fb152e40b8f0ea1e30582da6b58ca 100644
GIT binary patch
delta 140
zcmbQme~5p>0w!@chD?SWh7yKUh9U+9hBSshV7hGbLZ+*XVUx?5ZwfmB<r0CSNkBRi
ztTJ!%Mn?0=znJ7EZ(xbSCBNB+HHuNv5omZ0P-8LB@EnG3KsuQr1IR}hA;jJR0CDUk
A!vFvP

delta 78
zcmX@aKZ}3E0;b75%mR~-F&$$po7~HMllurm9zzO4Dnk)N-sFvp=94$DRG^D(E@F*h
VoV<ixZt@OBgUJHSa+9stI{+@Q8Iu42

diff --git a/Classes/de.lproj/IncomingCallViewController.strings b/Classes/de.lproj/IncomingCallViewController.strings
index 87b8afab20f42025dd9e72cb7ddfc2ccff716045..53c9c18ae4627213d38bf1e7aaa4e2674aa47b9b 100644
GIT binary patch
delta 80
zcmdnPvw~;CBqmXBhJ1!Rh7yKEhHN022c&ZuQYYuKx^Di#6v8NpDxJts22=o2Tr@eC
P<vye9WM9_fU{W0bT+<ag

delta 110
zcmZ3%vxjHHBql{ahD3&3hExUxh7=%K45Ymo@)`0NN`T_oK(ct^ZPm$jtO}doFoiHG
cIx%E2<N#ITSIx4EF?BK{oBHGg)&&q20O27Um;e9(

diff --git a/Classes/de.lproj/IncomingCallViewController~ipad.strings b/Classes/de.lproj/IncomingCallViewController~ipad.strings
index f33ecb5c540368262a593852d04ea05cbec7e6aa..9937db406f2891268f8c94bf5e71fe5c1eac8614 100644
GIT binary patch
delta 104
zcmZpZ{3Nkq5|gMmLq0<uLkUA7LpG4i1Jbz+sgn<Kl}`>}64`9W%*QB+sw9!245$dC
np$MqVbg}_Q%H&t95|iav^%z|z`?4Mfldh8(Gd3S$JHiS8sHhyK

delta 52
zcmV-40L%aK7={_Jk^+;A3Ye2n0u-|{0}cU`N(?BIC<Y#regwLc#t5F1)&(k)jtNGR
K0cf+X2E+yCP7;s+

diff --git a/Classes/de.lproj/WizardViews.strings b/Classes/de.lproj/WizardViews.strings
index 1903a77340ef423dcf54429026cf394520aecba0..a518bc573dc0ceced04ad2cd231351955914cbe2 100644
GIT binary patch
delta 236
zcmZpg!nkD$;|3<ii75h%x|3xYwYiHKDj9Mak{I$CawdPY_gp-Ikuf!iA(bJML4hF!
zNEZR=Ffd&XB=dk`r9d(rC<;=O2PBJu>|h2@h5!a#25+D_c?=~$5+s_&@CU5llOY30
zrvgPBfwDzF6Vez`CvQ|&pFDw0XmTE_&SW*_S(DA!B&3l|0NGFkG^Yee=Kx*zUnml&
rj&E`T%Phvc%|BT}87D8`m@?Uf*<-R6d&T4noCZ+iY&I)!JaPm8kq$cT

delta 105
zcmdlog|TT0;|3<i$suN0lMCDxHuo{IFi!r$DJ81FkjjwBkjGHPP|8pQWF<3XFqBL-
z6t<phz<g}76sy2w8`hM`2L$CNH?gePtiu|@$f&Tnku8{!TY<rwAs?u-gdu-&pitrF
I0FEb)09HmG00000

diff --git a/Settings/InAppSettings.bundle/Call.plist b/Settings/InAppSettings.bundle/Call.plist
index 3b2503bfd..ae0855c79 100644
--- a/Settings/InAppSettings.bundle/Call.plist
+++ b/Settings/InAppSettings.bundle/Call.plist
@@ -28,7 +28,7 @@
 			<key>Key</key>
 			<string>substitute_+_by_00_preference</string>
 			<key>Title</key>
-			<string>Substitue + by 00</string>
+			<string>Substitute + by 00</string>
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
diff --git a/Settings/InAppSettings.bundle/ar.lproj/Call.strings b/Settings/InAppSettings.bundle/ar.lproj/Call.strings
index 84718d8aa93c933d05bbe8458e4511afb9e1f540..38e1bd90d0785f8994b7d237dac622443bc7b521 100644
GIT binary patch
delta 12
TcmX@aa)f1q17pcXduAp89WMjP

delta 10
RcmX@Ya)@Pu!$v12CIA*P16BY4

diff --git a/Settings/InAppSettings.bundle/de.lproj/Advanced.strings b/Settings/InAppSettings.bundle/de.lproj/Advanced.strings
index ca5cd2cfb71e616f14bc26279ff90159a9d4f2c1..c5d517fa1687095701939619c23fc26babb68fb7 100644
GIT binary patch
delta 330
zcmZ`zy$-=p7(Hbm5~Hv*E+Qs_!60H_Kw`0VZnP=UlF-KF8EE<#MuTVY5Ec(%6z99x
z7``v}-0%E7GxzMVR2ag=96t93TSS-<xpBq(a~RbtQ!>{GIZKYOwTfC7D>$;_eWUi9
z<l{l2jv(z~<}LCU^pbQpzID=+Cq<)GAM<<lIe0uq+B{&O!}k_dbdgIAM!BibgCZVi
ztAOtTSyE66NwE+%9W+i(hBXO@L;8Q4DD-vKjw<0PB3ri<FL8OJ4K>nTw4QF{o!hCa
F@dC$~N4o$3

delta 104
zcmaFF@sE9i1g8r_Dnk-ODMR{1U0EbfysBU@P$rKdg+YPAhasOKouPQ*QuT@J#3p`{
y;`C=IVaNbV7fqIAv}7!v9Li`oIgU|b@(M<+$?F(pCjVj#nasgtws{WIF-8EXH61Ac

diff --git a/Settings/InAppSettings.bundle/de.lproj/Call.strings b/Settings/InAppSettings.bundle/de.lproj/Call.strings
index d8a4378cc3d9cfe3232bbe49661d0c638c9f1274..afc1592018ae4344a0cab4dc9ba353f04196dde4 100644
GIT binary patch
delta 62
zcmaFG@{MJJ9b?HvTUl*KhEj%Nh7yKEFrCbh!H~+3$DqKV4a6xxu_6YLm;!?VgTcg$
K!W;YUFaiMXKo3{|

delta 32
mcmeyy@``1G-9!f&{$Peuh9rh!h7yKMATFI~FS@bo4I==kTnZxq

diff --git a/Settings/InAppSettings.bundle/de.lproj/Network.strings b/Settings/InAppSettings.bundle/de.lproj/Network.strings
index cb18d99693baaf54e486de859ec9fb3246436881..0f2844d653495ff79ce56d9cd166956d34a27179 100644
GIT binary patch
delta 104
zcmZo;?_i%`py<tz$dJcS!jK9i^BD?&tW1VnAWmf{VkiZQrB4i0<<A2$ix?Cb!hsTL
w44D(#4H<PO?hF==0*a?GJYmQI!c2yAkfzDvjLD1zlWQ5B84ETaW<1OY02fgjY5)KL

delta 80
zcmeBRZ)2ZeFp))N@;WBAiBU3w;S8A!X+W&Nkk63Eki$?pvDI+mG=Yi7T)2Z65`jV~
hK#APRvW&@-V;F@dPhd1*R$vI2+{h@p`4;0kMgVrV7Bv6>

diff --git a/Settings/InAppSettings.bundle/de.lproj/Root.strings b/Settings/InAppSettings.bundle/de.lproj/Root.strings
index 77dc6e9e8cfab50a1624ed4ee1866d471572af25..ac5384a19c719f78dec7166e536b12421baba6dc 100644
GIT binary patch
delta 474
zcmZ8eJxjw-6g~aO(kdcYN)Ry?98^jNaVVt}g}6AVg9@TU)DS~sDotxKi+{oJ1_yWj
z0saSfadmWcb=C83+JN$w`*H5M=iK*Neww;pE!VMw9zqPzOPY6PmcT-QZ$vo9C0vBb
z+w#no4lpD(X4Fr9Ru=x1&=rUVh49oy?z!@TGY#fY9}c{6=PTDRHyKB)xakI52+qQu
zYUB?VkC^$K(z7nr?Bbf4FJdV}J?1@iQYcj{vUa6&!)}TWm05T&VvOLbm%@J4CI{n;
zZ-5$FD5*|yY28Ab>@^&VnolytbncIRTi6!G=>~l$z5BFiw{1DvNRVAlh-3Pxb3!``
zL`%fFzTiaTgyFr|nLQLlz+S|sc}-(}T3?j0Tq9I1W3B3BTK@cqx;2_}+Ofl34jo>l
GuJ8-hp=p!=

delta 180
zcmZ3+bBud}7QX^RB119|<};Ks<S~>?G_9XFL1y9wCC*TWVun<PA_j%YjEtJRa2|sv
zgUe)h#^sYQF^WuPW73(-!z4F3jLB<q9h21LLrf`?S(v3JdoWL7E@#M}{E#`2-;p7O
zp$uqA9?+6hhLp+9Ec%muSmY)zU~!tfjKyTK5~~e+AkgwmhLXwotkUeR3>9GZbXM)j
Vi&(`b-(fYI{Ek(C#hQVO0RXp+FJk}z

diff --git a/Settings/InAppSettings.bundle/de.lproj/Tunnel.strings b/Settings/InAppSettings.bundle/de.lproj/Tunnel.strings
index 91c6ad49d5fd34f61568fc492f8e577b9e660fae..4ff7fc16b66c42f0ae668aefc0b171f81408f9a4 100644
GIT binary patch
delta 11
ScmXRZn;^qn%1}H}HXHyJb_0h1

delta 9
QcmXRbnIOZMI#E6x01!w61ONa4

diff --git a/Settings/InAppSettings.bundle/en.lproj/Call.strings b/Settings/InAppSettings.bundle/en.lproj/Call.strings
index a56e6ea0c..20d54ef56 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Call.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Call.strings
@@ -1,5 +1,5 @@
 "Prefix" = "Prefix";
-"Substitue + by 00" = "Substitue + by 00";
+"Substitute + by 00" = "Substitute + by 00";
 "Send inband DTMFs" = "Send inband DTMFs";
 "Send SIP INFO DTMFs" = "Send SIP INFO DTMFs";
 "Incoming call timeout" = "Incoming call timeout";
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Call.strings b/Settings/InAppSettings.bundle/fr.lproj/Call.strings
index 1468d271590f4fbe770f66544d9e65c145148294..2ca653c3cc2b79a3e50a3ad995d52670898509ea 100644
GIT binary patch
delta 12
Tcmeyz(!e^wfw5$xy*(2E9oPf@

delta 10
RcmZo*{l_xFVWX2B695(K1B(Cv

diff --git a/Settings/InAppSettings.bundle/ja.lproj/Video.strings b/Settings/InAppSettings.bundle/ja.lproj/Video.strings
new file mode 100644
index 0000000000000000000000000000000000000000..bb336f09cb832df167104f18ef39fadc55a7adf7
GIT binary patch
literal 584
zcma)(%?iRW5QOLKQ%LW65D`H<h=^W<g5W)*DHfEL`iDNeI?XCcdZ?ka*-U1?ozV9y
z!2(xYP~rr|wSeY&<nuruXDSLczX^A9zVZGUdVk!Cvos8<Xnxos6LvT-{oSTD%$>8k
z@g9bnOWo~ilPccXbW++5A*8l1XK!t*?3*Q{Qrd(Co~&K2_zsz{B&VTi{u@ULRdH^S
fVudvZ7<<l873T&+j4%m&z9z0cc~g({+c&2l4s2V(

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/nl.lproj/Video.strings b/Settings/InAppSettings.bundle/nl.lproj/Video.strings
new file mode 100644
index 0000000000000000000000000000000000000000..bb336f09cb832df167104f18ef39fadc55a7adf7
GIT binary patch
literal 584
zcma)(%?iRW5QOLKQ%LW65D`H<h=^W<g5W)*DHfEL`iDNeI?XCcdZ?ka*-U1?ozV9y
z!2(xYP~rr|wSeY&<nuruXDSLczX^A9zVZGUdVk!Cvos8<Xnxos6LvT-{oSTD%$>8k
z@g9bnOWo~ilPccXbW++5A*8l1XK!t*?3*Q{Qrd(Co~&K2_zsz{B&VTi{u@ULRdH^S
fVudvZ7<<l873T&+j4%m&z9z0cc~g({+c&2l4s2V(

literal 0
HcmV?d00001

diff --git a/Settings/InAppSettings.bundle/ru.lproj/Call.strings b/Settings/InAppSettings.bundle/ru.lproj/Call.strings
index ea8681e464944368b5074ce2b2020c86dc86b2c3..48bffaded429d29c820dd792177a519d53a0bb77 100644
GIT binary patch
delta 12
Tcmcb`a))Jt17pcXdub*BA8!N^

delta 10
Rcmcb^a*Jhx!$v15CIA=`1D*f?

diff --git a/Settings/InAppSettings.bundle/zh_TW.lproj/Video.strings b/Settings/InAppSettings.bundle/zh_TW.lproj/Video.strings
new file mode 100644
index 0000000000000000000000000000000000000000..bb336f09cb832df167104f18ef39fadc55a7adf7
GIT binary patch
literal 584
zcma)(%?iRW5QOLKQ%LW65D`H<h=^W<g5W)*DHfEL`iDNeI?XCcdZ?ka*-U1?ozV9y
z!2(xYP~rr|wSeY&<nuruXDSLczX^A9zVZGUdVk!Cvos8<Xnxos6LvT-{oSTD%$>8k
z@g9bnOWo~ilPccXbW++5A*8l1XK!t*?3*Q{Qrd(Co~&K2_zsz{B&VTi{u@ULRdH^S
fVudvZ7<<l873T&+j4%m&z9z0cc~g({+c&2l4s2V(

literal 0
HcmV?d00001


From 817389b9b46400574dbb7d89b09482d86d93bdfb Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 25 May 2015 16:41:59 +0200
Subject: [PATCH 04/14] UICallBar: fix typo in speaker icon name

---
 Classes/LinphoneUI/UICallBar.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m
index 8847b39cf..92d86dedb 100644
--- a/Classes/LinphoneUI/UICallBar.m
+++ b/Classes/LinphoneUI/UICallBar.m
@@ -172,7 +172,7 @@
         // Set selected+over background: IB lack !
         [speakerButton setBackgroundImage:[UIImage imageNamed:@"speaker_on_over.png"]
                                  forState:(UIControlStateHighlighted | UIControlStateSelected)];
-        [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"sspeaker_on_over_landscape.png"]
+        [speakerButtonLandscape setBackgroundImage:[UIImage imageNamed:@"speaker_on_over_landscape.png"]
                                           forState:(UIControlStateHighlighted | UIControlStateSelected)];
         
         [LinphoneUtils buttonFixStates:speakerButton];

From 72175dcb42d84b8b10f56c6fedb4108f63264b71 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 25 May 2015 16:58:44 +0200
Subject: [PATCH 05/14] LinphoneManager: change runningOnIpad to use
 UIuserInterfaceIdiomPad instead of #ifdef UI_USER_INTERFACE_IDIOM because
 somehow it is not fully working on iOS 8.2

---
 Classes/LinphoneManager.m | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 0ca716147..3e031049a 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -194,11 +194,7 @@ struct codec_name_pref_table codec_pref_table[]={
 }
 
 + (BOOL)runningOnIpad {
-#ifdef UI_USER_INTERFACE_IDIOM
-	return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad);
-#else
-	return NO;
-#endif
+	return ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad);
 }
 
 + (BOOL)isRunningTests {

From e3ea73d871ba5672febafa2c78e0fa0755b5e447 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 26 May 2015 11:51:16 +0200
Subject: [PATCH 06/14] =?UTF-8?q?AboutViewController:=20remove=20ending=20?=
 =?UTF-8?q?part=20of=20copyright=20since=20it=20still=20applies=20(=C2=A9?=
 =?UTF-8?q?=202010=20-=20Belledonne=20Communications)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes/AboutViewController.m              | 2 +-
 Classes/Base.lproj/AboutViewController.xib | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m
index c0f3ef92b..d969ae16f 100644
--- a/Classes/AboutViewController.m
+++ b/Classes/AboutViewController.m
@@ -64,7 +64,7 @@
     
 	[linkLabel setText:NSLocalizedString(@"http://www.linphone.org", nil)];
 	[licenseLabel setText:NSLocalizedString(@"GNU General Public License V2 ", nil)];
-	[copyrightLabel setText:NSLocalizedString(@"© 2010-2012 Belledonne Communications ", nil)];
+	[copyrightLabel setText:NSLocalizedString(@"© 2010 Belledonne Communications ", nil)];
 	
     [linkLabel addGestureRecognizer:linkTapGestureRecognizer];
     
diff --git a/Classes/Base.lproj/AboutViewController.xib b/Classes/Base.lproj/AboutViewController.xib
index 052697f51..8248666f4 100644
--- a/Classes/Base.lproj/AboutViewController.xib
+++ b/Classes/Base.lproj/AboutViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutViewController">
@@ -62,7 +62,7 @@
                     <color key="textColor" red="0.35686275360000003" green="0.3960784376" blue="0.43529412150000002" alpha="1" colorSpace="deviceRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="© 2010-2012 Belledonne Communications " textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="58" userLabel="copyrightLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="© 2010 Belledonne Communications " textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="58" userLabel="copyrightLabel">
                     <rect key="frame" x="10" y="300" width="300" height="21"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>

From 37b98bb1f0f50d059370bd15353909a27c025c8f Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 27 May 2015 15:10:59 +0200
Subject: [PATCH 07/14] tag_missing_resources.sh: handle images not in
 Resources/ directory but possibly in subdirectories (launchscreen)

---
 Tools/tag_missing_resources.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Tools/tag_missing_resources.sh b/Tools/tag_missing_resources.sh
index a568297f8..3bcd30880 100755
--- a/Tools/tag_missing_resources.sh
+++ b/Tools/tag_missing_resources.sh
@@ -50,12 +50,16 @@ grep -oE '([^ /"])*.png' ../linphone.xcodeproj/project.pbxproj | sort -u > $alre
 find ../Resources/  -name *.png -exec basename {} \; | sort -u > $to_sync
 
 # clean red tags
-cd ../Resources && tag -r red $(cat $to_sync $already_sync) && cd - 1>/dev/null
+for file in $to_sync $already_sync; do 
+	find ../Resources -name $file -exec tag -a red {} \;
+done
 
 # 'comm' command output files contained in second file but not in first nor in common
 non_synced_files=$(comm -13 $already_sync $to_sync)
 
-cd ../Resources/ && tag -a red $non_synced_files && cd - 1>/dev/null
+for file in $non_synced_files; do 
+	find ../Resources -name $file -exec tag -a red {} \;
+done
 
 rm $already_sync $to_sync
 

From 6b3edbb625f99eb8b2530b6a121ea199e3432ec0 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 28 May 2015 13:44:44 +0200
Subject: [PATCH 08/14] i10n: remove quote around username when displaying
 popup error "XXX is not registered" and update translations

---
 Classes/LinphoneUI/de.lproj/UICallBar.strings | Bin 9854 -> 9864 bytes
 .../de.lproj/UICallBar~ipad.strings           | Bin 7650 -> 7658 bytes
 .../LinphoneUI/de.lproj/UICallCell.strings    | Bin 9588 -> 9614 bytes
 .../de.lproj/UIChatRoomCell.strings           | Bin 1826 -> 1824 bytes
 .../LinphoneUI/de.lproj/UIContactCell.strings | Bin 758 -> 772 bytes
 Classes/LinphoneUI/de.lproj/UIMainBar.strings | Bin 2746 -> 2756 bytes
 .../de.lproj/UIMainBar~ipad.strings           | Bin 3850 -> 3844 bytes
 Classes/PhoneMainView.m                       |   2 +-
 .../de.lproj/ChatRoomViewController.strings   | Bin 3404 -> 3410 bytes
 Classes/de.lproj/DialerViewController.strings | Bin 4504 -> 4534 bytes
 .../DialerViewController~ipad.strings         | Bin 4734 -> 4756 bytes
 .../HistoryDetailsViewController.strings      | Bin 4822 -> 4830 bytes
 .../de.lproj/HistoryViewController.strings    | Bin 1986 -> 1988 bytes
 .../IncomingCallViewController~ipad.strings   | Bin 3186 -> 3166 bytes
 Classes/de.lproj/WizardViews.strings          | Bin 18996 -> 19136 bytes
 Resources/ar.lproj/Localizable.strings        | Bin 28774 -> 28766 bytes
 Resources/de.lproj/Localizable.strings        | Bin 29758 -> 31062 bytes
 Resources/en.lproj/Localizable.strings        | Bin 29474 -> 29466 bytes
 Resources/fr.lproj/Localizable.strings        | Bin 30706 -> 30698 bytes
 Resources/ja.lproj/Localizable.strings        | Bin 26036 -> 26028 bytes
 Resources/nl.lproj/Localizable.strings        | Bin 30980 -> 30972 bytes
 Resources/ru.lproj/Localizable.strings        | Bin 29970 -> 29962 bytes
 Resources/zh_TW.lproj/Localizable.strings     | Bin 29378 -> 29370 bytes
 .../de.lproj/Advanced.strings                 | Bin 1122 -> 1146 bytes
 .../de.lproj/Audio.strings                    | Bin 1702 -> 1714 bytes
 .../de.lproj/Call.strings                     | Bin 630 -> 686 bytes
 .../de.lproj/Network.strings                  | Bin 904 -> 962 bytes
 .../de.lproj/Root.strings                     | Bin 1574 -> 1566 bytes
 .../nl.lproj/Call.strings                     | Bin 0 -> 624 bytes
 submodules/cmake-builder                      |   2 +-
 30 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 Settings/InAppSettings.bundle/nl.lproj/Call.strings

diff --git a/Classes/LinphoneUI/de.lproj/UICallBar.strings b/Classes/LinphoneUI/de.lproj/UICallBar.strings
index c8663943d7b084b168742dc51861da2add135b4e..2f3fddeb7463f2c5bba24c0913a20daccf3c93fc 100644
GIT binary patch
delta 66
zcmez8)8V^;gG<(%A)g_SA&nuGp$Lfc7^)Z)7>XH67!rZ}lF1KQ(<gUv<*)|>MSv<M
RFBGwyT)?8UIf`3F8US4L5+VQq

delta 54
zcmeD1{pYiRgG;`cp@bokp$JH(GAJ;3GvqVmF{A<6ML?X#P&HYRGkfwBt`tVC&5Ydb
F(g2054X*$I

diff --git a/Classes/LinphoneUI/de.lproj/UICallBar~ipad.strings b/Classes/LinphoneUI/de.lproj/UICallBar~ipad.strings
index 19663dab03f9d0e8271e341fa545ee1878dbc7c6..b403e5d70246ec2a7b8934ff31d67dee0340275f 100644
GIT binary patch
delta 26
icmaE4{mOd7KOxRwh7yKUh9ZW%$rt&PHzx@<Z~*|14+)?E

delta 18
acmaE5{m6R5KOsh~$rt&PH)jbqZ~*{Q>j%C7

diff --git a/Classes/LinphoneUI/de.lproj/UICallCell.strings b/Classes/LinphoneUI/de.lproj/UICallCell.strings
index d719ddb6d1f21536083a341ef2907e03d113b62b..0c4232ce20669ca1b648fbf6592d69d403902f85 100644
GIT binary patch
delta 438
zcmez3)#tro9>?Yd94<`4x(pr+`3%Vn84NiLi3}+WsSHVz<)y<n`*8Cy3SvsFmx-LL
zCF3%gjaN(31E{!&p_Czyp#;oA7_eT(bMgj-vdORbBqmGoS>Ujwee)|m6-LIS&4L0e
z87E0|aq2R7GB`81GU!gu7nWu$p4`pkIQap$z-B8U6UNCkvR#vZ2sbb$O%@ag+<Zpl
z1LNcc93_)8#AGJ>iJ!shREQ(aNy<!a5yRz(@X0>hTAR;F+AvCkf&zz+Hp@%bGUE2|
m=JhhK87EIr#_a_u`5N3|{YP;gBaSc%pZrHrXS1G)8zTU46ms1F

delta 387
zcmeD4{^GS^9>-)A4uQ!R#L_1FaY$^|;@rU~sK5})P{5GGkk63FkiwwA;50dxFMP8P
zHy<NEx`e)j=i~?60+TIdTqbkyY5{2>MyJX868k4}@daQSv^ke=H6ybw(8NZOz|C0#
z5sZ?-3?)EoN*GERih))+0_hZnOrX^Ylk<g@Cm#}WnXD&oF}X%iV)7)RCyWY{C(3qC
z5@`ULvAI#ikqPAb%@@S{Fr2noUqTp{SJp_TF^VcMxB#swXUIeL>1JK&T1L1pz<%2-
zBRdJ*nPEUDrZA);J9D$1d<_#bFz6<4lu(|0OvqufjEc@?2c;rxj@YZ%yxBv=jS&F9
CXJ9V?

diff --git a/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings b/Classes/LinphoneUI/de.lproj/UIChatRoomCell.strings
index 3efe98727a0e73ca6808ba1b75ed070760e401e2..bb0ec0b8fc7f871f7a32456b12f9f0cc3908a3d5 100644
GIT binary patch
delta 11
ScmZ3)w}5ZM1GdSJ*c<>I2?VeJ

delta 13
UcmZ3$w}@}U12)E@$@keD0VO8|ApigX

diff --git a/Classes/LinphoneUI/de.lproj/UIContactCell.strings b/Classes/LinphoneUI/de.lproj/UIContactCell.strings
index 1e83d31ff53818f94c1fe2bd9512a64a7cccd774..311f23136d37515fac13895f9c6af9bb38b4134c 100644
GIT binary patch
delta 34
ocmeyy+QPQs6_b=NLn%WsLkUAFLlHwRLn1>S5GpZPGjK5g0IbCa%>V!Z

delta 20
bcmZo+`^LKA6%&sOLq0<)gA#)^0~Z4TLSF=}

diff --git a/Classes/LinphoneUI/de.lproj/UIMainBar.strings b/Classes/LinphoneUI/de.lproj/UIMainBar.strings
index ca048a81fe1b0ae9b6db2fed64c7b4a4c6586248..1396b82fdfb9e65fcaba72130828b4993571615b 100644
GIT binary patch
delta 68
zcmdlbdPH<X7>8yULn=cNLjgk~LopDR0C^ffz9xeLgCj#8kX6c%1{6tU(40JxQFXE&
Sr@-b_9Bzz^p_4yyo&*3VS`e-P

delta 56
zcmX>ix=VCJ7>8^bLn=cNLjgk~LopDR0C@@wjtqG~u~LS#$sbwNC;M@^Y<|HZ#K>4W
I`8VfD0IkswHvj+t

diff --git a/Classes/LinphoneUI/de.lproj/UIMainBar~ipad.strings b/Classes/LinphoneUI/de.lproj/UIMainBar~ipad.strings
index 354ff4935845583b30e9d8e3b7d6abebe7ab64f1..f5c0b2c6133e3aaaee49bb5d0fd29ba96e29ca55 100644
GIT binary patch
delta 91
zcmeB@YmwU!z@Zt&kjhZRP{5GLPz;16K%NGWugRdm;K+~%WR)_c0Yy?7G$%VUt4`u`
pn#{!^G5H<GAI8wluQ?@|Cx2shnJmMqFgc4iW^xRZ&L%!CMgZKQ7Wn`G

delta 105
zcmZpX>yq0Lz#(78kjhZRP{5GLPz;16K%N4FBSRigtdt>*A$77Nv+Cw~9AS)%rJKKU
tN-|Gg#lyp#2^J5XT)-PA>Ic-B%#Z<8p9!WxCgg#1P444!nQX^*3;=T}8xH^g

diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 2abf1c10f..47143ea8d 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -626,7 +626,7 @@ static RootViewManager* rootViewManagerInstance = nil;
     }
 
     if (linphone_call_get_reason(call) == LinphoneReasonNotFound) {
-        lMessage = [NSString stringWithFormat : NSLocalizedString(@"'%@' not registered", nil), lUserName];
+        lMessage = [NSString stringWithFormat : NSLocalizedString(@"%@ not registered", nil), lUserName];
     } else {
         if (message != nil) {
             lMessage = [NSString stringWithFormat : NSLocalizedString(@"%@\nReason was: %@", nil), lMessage, message];
diff --git a/Classes/de.lproj/ChatRoomViewController.strings b/Classes/de.lproj/ChatRoomViewController.strings
index 54e6308a4802315ec97f72a33da0814d811c139c..3afa89d9352b02aa91e6c107310f8288d6f43f98 100644
GIT binary patch
delta 63
zcmX>jbxCRi7pJ5jLn1>mLk2?;LnfFmVMt}jV@P92oh-<uIZ?rGasUg*<UY=l$vhlf
QjK!1pvgmKN;u2y800PDj=l}o!

delta 37
tcmca4bw+9f7w6<24!OxXoVO<LVd3IbU~po{WXNGinRrokvjdk9GXUsl3l{(Y

diff --git a/Classes/de.lproj/DialerViewController.strings b/Classes/de.lproj/DialerViewController.strings
index 8b7da1f541ba2b8476f500ee8743549ad0e5aa1e..bbc5e3bbd5c0165455786a1224244ebf0f46374c 100644
GIT binary patch
delta 61
zcmbQCyiIw78y9CVLkUAFLlHyX<d4kBn^$rDV&*SqNM^`jNMy(XOXW>I$df&pkH3aB
OilLN2VRI)xKNA2%vJs#F

delta 31
ncmdm{JVSYd8yBP2<d4kBn>TU&VxD}8Cu_1Af6e9<{CrFR!&D2W

diff --git a/Classes/de.lproj/DialerViewController~ipad.strings b/Classes/de.lproj/DialerViewController~ipad.strings
index 3ee713d0e9b02b3ac6678182dd5e60e0d12c782b..2802cfdb5f9d03db6ee279c15b04d17626927ee6 100644
GIT binary patch
delta 36
scmeyTGDUSmkpOEHLn(v8=0X8ZM$Te}WQGieM24Kn4|y^t-w|8{0LmE)UjP6A

delta 20
ccmbQD`cGv;k-+8(0S?B=v-pxGe-c~-09E4%CjbBd

diff --git a/Classes/de.lproj/HistoryDetailsViewController.strings b/Classes/de.lproj/HistoryDetailsViewController.strings
index 689025f1908ca545c5ade00a15a73e0bf82ecb73..1ab7796f51417305aa022f8b6d3caad393edf715 100644
GIT binary patch
delta 36
scmcbndQWx33|`hKhEfKF$<uk?PHtdincTs5h0$vAMn2Qc6ZqYj0s4~+-T(jq

delta 34
qcmcbodQEl14Bp8yEPRvK@ZMvrn%vEIeX@&y$>cnCoy|x1rI-QnDGaXw

diff --git a/Classes/de.lproj/HistoryViewController.strings b/Classes/de.lproj/HistoryViewController.strings
index 32bd19cfb16fb152e40b8f0ea1e30582da6b58ca..b1ce4a4ea72e53b50385b3c052078db66a8286d5 100644
GIT binary patch
delta 11
ScmX@ae}sR-686bw*c1RA`UHgl

delta 38
rcmX@Ye~5p>5_UNshHnhT49N@`45<tX42cXmK$r>?QDU%W;9>v()BFgV

diff --git a/Classes/de.lproj/IncomingCallViewController~ipad.strings b/Classes/de.lproj/IncomingCallViewController~ipad.strings
index 9937db406f2891268f8c94bf5e71fe5c1eac8614..b50cb2ccec507bcbcf7760fe8d3c1bd0d9254295 100644
GIT binary patch
delta 51
zcmew)aZh5yF^<U=tn(%}a7aw9;S`$0<~I2rW6@+cF1N`JEPRs}Fx3Is5}R$f`51u$
F3IOk65Xb-k

delta 123
zcmca7@kwICF%HJm$&75Slj~R`CO2?MOs?S+f{NT@ESfCAEipNcOHa{{A(0`MA(cUa
tAq7Yl18HxDe1<%R5}<fCkSyN3kZUfZh7&_3Lk>_0PGt;A4Au->3;+}t9PI!A

diff --git a/Classes/de.lproj/WizardViews.strings b/Classes/de.lproj/WizardViews.strings
index a518bc573dc0ceced04ad2cd231351955914cbe2..208d593a1d662a45681ea3999346a14c3e78bddc 100644
GIT binary patch
delta 623
zcmah{O-n*i5S?fFL5g2d$t&Y!mZ2Czk(Ce`nn^B{phdPRdYWV!J}U^K+O-HGrdmk^
z{Q>E=XcaB`0sVs7v~JPbMRRWj1yPI3+&eSp%$b>cb1L1RN%aXc4kWsR>rj9yXs`t9
zWEDulDpWwFqre=!(h!6glqvcGB`nKV_-b)6#d6!ECkLo_;K|};(vL?r7w*{mKfM{}
z30j=(Eaf=YqdhT#DcK}x=rDHTzQKxB`GP%m%;-=yd$|nrHyN0a-AzG=GF4tP;KSGg
z-YF&w^=#m9Yd>DfF=q1kb!`b~K#?RDAP;LKShRuez9F29hp^_|`8|WV`@%YXf%;p)
ztgqMDfMwn-?)v6z{H77*%Lgrc_H9~ER_y4M7I|H)cMY;oxT14Uivg8BpkK8Kq>`c{
zM!i{-$7}y)1+F9WhP@am=VetIc$(Hw5vx!I8(+dUY;v&_FVSm@R>3Xrm!?l^QQ%KC
zgf7v9G}s`PGUNzXB+L?N&lA4VObI!B_64q|-lV`3cM0;U2=i%(ri9f9I4cBHp^O>l
ZG1lUv>?yX~{NpbiTEx!)4@95^-T_8npcw!F

delta 346
zcmX>wm2t}y#tnAdnmP;$3;_&@48=fL&XCVg#E=3MDP_n5(=I@fT%c?wL*C@GQVTch
z@LXV?+{4c`nN46Hm`>wW*!)gFf^D)0yVT?&9*N0z+;WpINX^^KBjLdW7ElmZnY>O)
zfH86NL8)xE$xCEZCg)k1On#%tF}Y8%0LahSoS~$}#D0e%i6NDtX!1-|<H>cx29vo|
zt6*ZAXR4Yrv6q6~mOA;Wy7DBAApS&#Y=#n`!^(gdsBd$kMk$}PCqpvO#d$y<_<-EZ
zP{5D@=BF|!Onz>rJ-J3lW%37UiOCOSqBd_aFJhW}hNEKgJgYfCtTlO;iUL$pXR?E|
z-sE347Mpc!*04@~<<PY`%}I!9@+)Vp$*Y_dCchKNnylewu{p~%i3J=C*F5imXeKTO
E0A}B9r2qf`

diff --git a/Resources/ar.lproj/Localizable.strings b/Resources/ar.lproj/Localizable.strings
index d880db10b5df77aefc1694b68f85285d49adf1ad..ad98c915ca4032ba3303b5c76100dd69475c3b31 100644
GIT binary patch
delta 30
lcmaF%fbre~#tn0r*;N@F7!(-tCi6R~G6UJ0FEdZh0RX8k3CREe

delta 34
kcmccjfbrP_#tn0r+0_|T85|hYC(mcrgt0fDW}ch_0LcjoC;$Ke

diff --git a/Resources/de.lproj/Localizable.strings b/Resources/de.lproj/Localizable.strings
index 4b23632309eacf9304b9c5bdeebad695ec9439e9..cbef1d4c0c1642b14a84f6c57699e182cf6e9c5a 100644
GIT binary patch
delta 3673
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
a&^6S@n7J<`a4HA!ydZ4Je0F5HLi-QcIev5i

delta 1939
zcmbVNYiv_x82-L?bhqx(mG07Y&^BAw)iK7H8_oeM49&)XvO(!Ocj;)^%G$23H^d1<
zkYCCr4;o{PX#8UcAq$5n0W%hZX#7Ef8YF}aMu;&+<|Kw6lVrZ%>72vx%OB^Q_q)8e
z=Y8Jy+<e5xf8k@}O6*O^z*VIswVai)CRQ#zRBlw_v8o0)4NmD|>RFD4bR(J-PTWr)
zq^D1oOEYJS-7Llin1_Yv9bsOQqRdCDN@j#zZ9=tK50}=3Np*Yu2KiK+k1#*IjcgC?
zL`cKP0<;$Uq{p0e>ZR2%$@InD6dhj=dqJ0UE9*^;{+x!A5FPGjgDgk}0(31dD@Q08
z+QqhTFJ`h;k}dZ!N5G=aF_IS%m9QG3$PQ`_V_a*%_j&D^J~9%PBMD)<_9q;&tB~jN
zVoaNjiKYEH5jyozM8X|Kh(B_>aY<L2>7ZzzkRIiMgDZS+<QwTJ6p+z31s@e;;8DH-
z5Ax0Ua>qY=4Y*%mz>fwOa*Hh3tICkS$#nzCHE@<W>8rw>qF>?FyQS*lV?4c?-1G~m
zvE9%uRhPs$jx5t-2id7w9>)n^zNVj`h|x95k97!q@x^iz_9$Iaqwx&Kbg8N+dDOxj
zbVY<e%=WR@#C04mwP*Ir$}uX(ew-{Xl19xB{)ZYy%@=X5tcrUuRqw;uGCg`M`uWv8
zixKxMg{Um=!|hZx_aS0UpwwzZp|uLl6#@Kd)#JP;4{_@Oj8*7SGo&YZFD7ki2-z;-
zj;$GnTC?>2b2gqCq%@;4;R4dvm8*H?rl)Gzi=L{%|I}CPH6XgOHfvGc*?@Fq<+}>Z
z)aug(DFre?46pWJvZj^CP_g=QMGFDDTkMlhL3SfaKB85GU>_i9v7Qdr+TXZO(mfyK
z+=#pN3Cz}gr;M=>UN@Ixy8b;Llipf0r%>)<!<gEl)h5X52pb|UCy7SZ;P(e{tuYUE
zjb<`3XVD>dtsCDq)-0?>`GEA!+Etv;y|V683e=O<h4J-f@)X48jt<l{eTeLEKC*YX
zq$Ych0`ZMToU*&Hta(}|NG&o+wxggowWeg+^oD|aq|+}SR^WQ84XW0q7;W?7PHP>l
z8<X_jmQCwQq_pMIUIW6d0o-ewNu6&AOeKmm0<UDNhsZ;e#i0r7mJkHYi{o2$2&jp^
zVYlSimce0mRO6`4DgEr2Oj-F<VMtf7R@S5MGh&v0-&xFY-B~MUlJwaw1uY6Pv_`gp
z@(WPQzbdyyfCX^F(1nT46jXH<YC2@gUa}dWs?zYn4Ocg=c7BlRmc0zfx39Us!l|y@
z^w4}=qWGk%CCf;?DB_ZPMf$7j2afaIOJ!(Y>ai(l8e*>3hnqdO(cbIC=OHJ&eQU%d
z%JNV^Bcv>d<CDJWE8u(!hCMpWdM>=+kjG(!CD>!SltfRAt|)mA%6t=8EW|?c6FHI*
z1lxRQ-+gYuRum_^XG%89nF#!i>{<2D;%%Q9AD5?LZ0#DX+jCnE@u^`+qp~EciuBtT
z5SU7o@gbOY7Gq*-CHG@{xEn_X4=FbhhRgjgY6PPKlu2^fk}ggcivhmMO9R{=<t87E
z9shh<f_!5B3qS=fqM;+OD>|j?L)CnV@Vph8pmvF@08>zh_I+;YSWvBidiW@;@mHh^
z;c1@JMyeqi)q_+`${3eNT2hm|iGmNB&=;wd$L_gs8fGICxD_>+M7J%{nGa*Wt|B0m
z#UAFwDHn0mOAqZyruYhu0||?1aUq^TObX)UKs{y>`RU@XMm<ST%vlPw`$_)ymnDeg
Lm48`h_nrA0DEva$

diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 355e529dad754f953da42a5932ff9b13112883f6..0b8e79cf6cc3409f7aa976d1cb8aca29868bb199 100644
GIT binary patch
delta 26
icmZ4VjB(a8#tpleCx2jMn|y>>jaik!Ve?03!+Zdm*$OcL

delta 34
qcmbRBjB(L3#tpleCnvCQO+LV^#;(qw%HY7DK6x**;$|)ufqVeiVG3ga

diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 1a64d133b4fdf6be72753e133850f514fa7eff2f..e896d2d0bb8edc0ceb926cd3204f135c4087dfec 100644
GIT binary patch
delta 26
gcmezLp7GUt#tkQ!nN=AaCZA{41ks!SGk-1y0Gt^Lu>b%7

delta 30
mcmaF$p7GOr#tkQ!Cs(m>O+Lr0#;(qw%HY7DzWF=z=VAcM8w;uc

diff --git a/Resources/ja.lproj/Localizable.strings b/Resources/ja.lproj/Localizable.strings
index 64a65e4584b97ca60b66ba63a8c92bf6a34d6753..8f2e68d29c13478acf21fc18db4f6c8e23ff31cd 100644
GIT binary patch
delta 26
fcmdmTnsLo(#tj+F%&H6ylk=H1LG<SN%%VvEda?)J

delta 34
qcmZ2;nsLi%#tj+F-0BRf3=RzH3<?Z+lM8KBC;PDQY@Wj`kOTm<TM2jo

diff --git a/Resources/nl.lproj/Localizable.strings b/Resources/nl.lproj/Localizable.strings
index acc87f0dbd15e2cc69109f0d57db89b67989762c..880bf8b5328fa68c3489f83cd413282a4b13f6ba 100644
GIT binary patch
delta 30
jcmZqq#Q5hU<Axi|%&H6ylkYQYg6WBl!kd*?9+dz9y2uL#

delta 30
mcmezKk+J0y<Axi|lY3aWCf{RLV^?QTWpH3n-^|YPwFCgdMGBb!

diff --git a/Resources/ru.lproj/Localizable.strings b/Resources/ru.lproj/Localizable.strings
index 2539ab1e833e79c456416b2496cd398bde4e39c4..23de0527f436c7a11991798ba77f71065c79b798 100644
GIT binary patch
delta 26
icmbRAim~ez<AxK=lm9WYO}@me#;nTVu=zi;a3KJj6$&)~

delta 34
kcmeBr#W?8|<AxK=?CK1v3=RzHlTR~i!q}U?GYc020KG&Bod5s;

diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
index d71ff4f906e132425fee20f5e88c9a63494065df..9b46bcd9e6669b3f312b5a2a2adb945d5c12c3d0 100644
GIT binary patch
delta 26
icmX@~lyTQn#tn;@Cx2jMo4kfujaik!Ve?Jqmw5o5@e1Am

delta 38
ocmdn>l=0A0#tn;@+0_|T85|hYCtqY%oV><|1IFKck@;mF0Qw&c3jhEB

diff --git a/Settings/InAppSettings.bundle/de.lproj/Advanced.strings b/Settings/InAppSettings.bundle/de.lproj/Advanced.strings
index c5d517fa1687095701939619c23fc26babb68fb7..aa724cfdde14cbbb8f0c44e8aad033331dfcdfd2 100644
GIT binary patch
delta 194
zcmaFF@rz@_876Z_hCGI1hD?TJh75)h1_g!`hE#?kAPpjmfg-6uc?AZLs$3vD2Pj_(
zWT#Jl%_J}E&hQ5)QUcVS4pfr_q>CquG8;;IFeCz16#!+j8S;UuOMs*jgEa%!<ZfnJ
zQ3VEDplT(snN>hDLAp~X&t=Y)b^+>x*a*@OvK>ML-8NZ~#h6c*A(SDA!3Sa%0|0|J
BC~N=#

delta 88
zcmeyx@rYx?8K%jLn3UA58Mqjf7+e`D7z!9N8HyNEfjk8UTOdXeoovc%IN6R_VR8+#
c#^feusmXholP3QG(l#sxll@q@SU~0g0K6d-<NyEw

diff --git a/Settings/InAppSettings.bundle/de.lproj/Audio.strings b/Settings/InAppSettings.bundle/de.lproj/Audio.strings
index 7d420ae4fef72e0937978d47c58b4f8a9c43908a..e9c2a551242286183bfaaeace6ab2566948d22cd 100644
GIT binary patch
delta 76
zcmZ3+yNP$hIc7muh9ZV?hE#@3h7urI#89&NF7s(dRb2)ruuu_0B3L4iAqgm*4pflJ
VkjGHPPzof|C)=`#Prk)^1^@~M6bt|W

delta 24
gcmdnQyNq|kIp)b*n1wb!Vm`q*xr$Y8@+H;>0Dh|qD*ylh

diff --git a/Settings/InAppSettings.bundle/de.lproj/Call.strings b/Settings/InAppSettings.bundle/de.lproj/Call.strings
index afc1592018ae4344a0cab4dc9ba353f04196dde4..8597ac972c997f6a32040c4a39ea876634a5d9c8 100644
GIT binary patch
delta 36
qcmeyyvW|7a9$rs|JccBOL?D^MpgUQeQE}rl3C77aj8T(Sn1TSz7Ycy@

delta 21
dcmZ3-`i*76o{1AwHa?MKoP3K>VR9H#1ORIH2*dyY

diff --git a/Settings/InAppSettings.bundle/de.lproj/Network.strings b/Settings/InAppSettings.bundle/de.lproj/Network.strings
index 0f2844d653495ff79ce56d9cd166956d34a27179..987d15c85652548d80a666ebb99a6bf3c1ff564e 100644
GIT binary patch
delta 238
zcmeBRKg7P_3!}6rLjXe=gBgPYkW6JLVkifac?>BaaxycMwIYZIktt?KX2@X3Vfe#P
z41}pbRw+;}eR3$1t)ec26Ifp&SWOW_CYUY((&<oDtC{4bL24kT6fryj>dl78f$h4=
zWUTDLkPo#Z5$u8_hD5Mil7Q|?1)5dDkUCkN+1$tj$SVTt1&RP!IY4zF7h_S+pu}L!
Hz{LOnQ5rM^

delta 76
zcmX@a-od`%3nPChLoq`tg93vmLjXe=gV|($ChN%xOj48cn5-t(Fv(0l!z9D)!;s04
f3&bT1#gmztjVJRkD@~4JHkq8ntj1!^z{LOn<Zltq

diff --git a/Settings/InAppSettings.bundle/de.lproj/Root.strings b/Settings/InAppSettings.bundle/de.lproj/Root.strings
index ac5384a19c719f78dec7166e536b12421baba6dc..41d2a5e00fa735d18af19edcc63e48a117e5bff1 100644
GIT binary patch
delta 43
wcmZ3+GmmG(JVw?h40#Nxn-?=Cvq(5HWCLL-Ln1>C5En7zGAJ=vGjK5g02ICoJ^%m!

delta 51
zcmbQovy5lMJVw?;hD?UM&5Ie6SrnWY5*bQ>FqNSQD3}W5<p6OJLoS07gEa#e0{~$E
B3u^!X

diff --git a/Settings/InAppSettings.bundle/nl.lproj/Call.strings b/Settings/InAppSettings.bundle/nl.lproj/Call.strings
new file mode 100644
index 0000000000000000000000000000000000000000..77920985830c34203df7b791b4474c7ac8f5234f
GIT binary patch
literal 624
zcmbu6%}&EW420**Q&_noB<`p;gj9(?wWW93h7y%DQ4=cQ;epRCo4r6U$g;DWot^P`
zzdj4yYo}6As`REprV&}_T94XlMZT&gN>GI^bV8l-Z=p^-cY4-6r>0YKp?B&zk(uUk
zcOQJ~AKXd}u^X_7w+u~#cMI2{1Jk8uy3rMinRWaJ!n6;)532X?HTRwPryAqisJHOm
zvHDHp80wgg_qN1e9X{Oi5-%@=#msz~P0TI(nX&H(@37_6SBE)lf+@K%b}f@@IBy4M
tuJ}I{(=&`cENi}9Xq4Iv3Ud@Ie0WziZmMwepb0a~E;1@%&Xh3z#@|KuWA6X}

literal 0
HcmV?d00001

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 0e703903c..3465dedd6 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 0e703903c89ab1e3ef06d2697b4d844afc5a0851
+Subproject commit 3465dedd6607d580572e397216bc73b6921a9cb2

From 5ca07e1a35292387578cd074fa6c06f916b9b045 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 28 May 2015 15:16:40 +0200
Subject: [PATCH 09/14] project.pbxproj: add some missing resources

---
 Tools/tag_missing_resources.sh     | 8 ++++----
 linphone.xcodeproj/project.pbxproj | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Tools/tag_missing_resources.sh b/Tools/tag_missing_resources.sh
index 3bcd30880..93a2df735 100755
--- a/Tools/tag_missing_resources.sh
+++ b/Tools/tag_missing_resources.sh
@@ -47,17 +47,17 @@ already_sync=$(mktemp -t tag_missing_resources)
 to_sync=$(mktemp -t tag_missing_resources)
 
 grep -oE '([^ /"])*.png' ../linphone.xcodeproj/project.pbxproj | sort -u > $already_sync
-find ../Resources/  -name *.png -exec basename {} \; | sort -u > $to_sync
+find ../Resources/ -not -path '*/Images.xcassets/*' -name '*.png' -exec basename {} \; | sort -u > $to_sync
 
 # clean red tags
-for file in $to_sync $already_sync; do 
-	find ../Resources -name $file -exec tag -a red {} \;
+for file in $to_sync $already_sync; do
+	find ../Resources -name $file -exec tag -r red {} \;
 done
 
 # 'comm' command output files contained in second file but not in first nor in common
 non_synced_files=$(comm -13 $already_sync $to_sync)
 
-for file in $non_synced_files; do 
+for file in $non_synced_files; do
 	find ../Resources -name $file -exec tag -a red {} \;
 done
 
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 7eb29c0da..ce6c4f90c 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -128,6 +128,8 @@
 		639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB081A1DF4F1004DE38F /* UIChatRoomCell.xib */; };
 		639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 639CEB0B1A1DF4FA004DE38F /* UIChatCell.xib */; };
 		63CD4B4F1A5AAC8C00B84282 /* DTAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */; };
+		63D2680F1B174A5E00A2CC11 /* numpad_one_voicemail_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */; };
+		63D268101B174A5E00A2CC11 /* numpad_one_voicemail_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */; };
 		63E59A3F1ADE70D900646FB3 /* InAppProductsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */; };
 		63FB30351A680E73008CA393 /* UIRoundedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 63FB30341A680E73008CA393 /* UIRoundedImageView.m */; };
 		70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */ = {isa = PBXBuildFile; fileRef = 70571E1913FABCB000CDD3C2 /* rootca.pem */; };
@@ -1051,6 +1053,8 @@
 		639CEB0D1A1DF52C004DE38F /* ru */ = {isa = PBXFileReference; fileEncoding = 2483028224; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UICallCell.strings; sourceTree = "<group>"; };
 		63CD4B4D1A5AAC8C00B84282 /* DTAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTAlertView.h; sourceTree = "<group>"; };
 		63CD4B4E1A5AAC8C00B84282 /* DTAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTAlertView.m; sourceTree = "<group>"; };
+		63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = numpad_one_voicemail_default.png; path = Resources/numpad_one_voicemail_default.png; sourceTree = "<group>"; };
+		63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = numpad_one_voicemail_over.png; path = Resources/numpad_one_voicemail_over.png; sourceTree = "<group>"; };
 		63E59A3D1ADE6ECB00646FB3 /* InAppProductsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InAppProductsManager.h; sourceTree = "<group>"; };
 		63E59A3E1ADE70D900646FB3 /* InAppProductsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InAppProductsManager.m; sourceTree = "<group>"; };
 		63EF7FDC1A24B5810017A416 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AboutViewController.strings; sourceTree = "<group>"; };
@@ -2817,6 +2821,8 @@
 				D3F83F3F1582223B00336684 /* numpad_nine_over.png */,
 				D3F83F2E1582223B00336684 /* numpad_one_default.png */,
 				D3F83F2F1582223B00336684 /* numpad_one_over.png */,
+				63D2680D1B174A5E00A2CC11 /* numpad_one_voicemail_default.png */,
+				63D2680E1B174A5E00A2CC11 /* numpad_one_voicemail_over.png */,
 				D3F83F3A1582223B00336684 /* numpad_seven_default.png */,
 				D3F83F3B1582223B00336684 /* numpad_seven_over.png */,
 				D3F83F401582223B00336684 /* numpad_sharp_default.png */,
@@ -3340,6 +3346,7 @@
 				70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */,
 				D347347E1580E5F8003C7B8C /* history_default.png in Resources */,
 				D347347F1580E5F8003C7B8C /* history_selected.png in Resources */,
+				63D268101B174A5E00A2CC11 /* numpad_one_voicemail_over.png in Resources */,
 				D38327F31580FE3A00FA0D23 /* contacts_default.png in Resources */,
 				D38327F41580FE3A00FA0D23 /* contacts_selected.png in Resources */,
 				D38327F51580FE3A00FA0D23 /* dialer_default.png in Resources */,
@@ -3540,6 +3547,7 @@
 				639CEB061A1DF4F1004DE38F /* UIChatRoomCell.xib in Resources */,
 				D3A8BB7B15A6CC3200F96BE5 /* chat_bubble_outgoing.png in Resources */,
 				D3A8BB7D15A6CC3200F96BE5 /* chat_bubble_incoming.png in Resources */,
+				63D2680F1B174A5E00A2CC11 /* numpad_one_voicemail_default.png in Resources */,
 				F0C1F9101A28781F009402C9 /* corner-left-bottom.png in Resources */,
 				D3A8BB7F15A6CC3200F96BE5 /* setup_back_disabled.png in Resources */,
 				D3A8BB8115A6CC3200F96BE5 /* setup_cancel_disabled.png in Resources */,

From 2c89cb8173c6009fdceef34dfde0eba131dc3632 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 28 May 2015 15:51:43 +0200
Subject: [PATCH 10/14] SettingsViewController: hide media encryption
 preference when SSL not available

---
 Classes/SettingsViewController.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index 4f56f8a72..42c28edd4 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -595,6 +595,10 @@ static UICompositeViewDescription *compositeDescription = nil;
     LinphoneManager* lm = [LinphoneManager instance];
     NSMutableSet *hiddenKeys = [NSMutableSet set];
 
+#ifndef HAVE_SSL
+	[hiddenKeys addObject:@"media_encryption_preference"];
+#endif
+
 #ifndef DEBUG
     [hiddenKeys addObject:@"release_button"];
     [hiddenKeys addObject:@"clear_cache_button"];

From 728b84f7ee16c7a13c3ececaad4f3ba8283b9aff Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 28 May 2015 17:53:14 +0200
Subject: [PATCH 11/14] submodules: update linphone and belle-sip

---
 submodules/belle-sip | 2 +-
 submodules/linphone  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/belle-sip b/submodules/belle-sip
index aa049d272..1ffd89057 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit aa049d2723f7dd9441cb5de1138f5aa6f417d8cc
+Subproject commit 1ffd890571879bba9a58251dfe7dd5249c011517
diff --git a/submodules/linphone b/submodules/linphone
index 5d5808b70..819e0f07d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5d5808b705214fb1db2ae8241d5476606e09eb97
+Subproject commit 819e0f07dc08e9cc241dabbdc9d2714c1ee80e6f

From 79a297d1a9d2c0c4f2354c1fae97c6849b609e67 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 29 May 2015 10:33:12 +0200
Subject: [PATCH 12/14] InAppProductsManager: add some comments and add account
 activation feature

---
 Classes/InAppProductsManager.h |  16 +++-
 Classes/InAppProductsManager.m | 148 +++++++++++++++++++++------------
 Classes/WizardViewController.m |   2 +-
 3 files changed, 109 insertions(+), 57 deletions(-)

diff --git a/Classes/InAppProductsManager.h b/Classes/InAppProductsManager.h
index b973336cd..f23a9cdeb 100644
--- a/Classes/InAppProductsManager.h
+++ b/Classes/InAppProductsManager.h
@@ -46,7 +46,14 @@ typedef NSString*               IAPPurchaseNotificationStatus;
 //paid_account_id=test.autorenew_7days
 //receipt_validation_url=https://www.linphone.org/inapp.php
 //products_list=test.autorenew_7days
-// Note: in Sandbox mode (test), autorenewal expire time is speed up (see http://stackoverflow.com/questions/8815271/what-expiry-date-should-i-see-for-in-app-purchase-in-the-application-sandbox) so that 7 days renewal is only 3 minutes!
+// Note: in Sandbox mode (test), autorenewal expire time is speed up (see http://stackoverflow.com/questions/8815271/what-expiry-date-should-i-see-for-in-app-purchase-in-the-application-sandbox) so that 7 days renewal is only 3 minutes and:
+//1 week = 3 minutes
+//1 month = 5 minutes
+//2 months = 10 minutes
+//3 months = 15 minutes
+//6 months = 30 minutes
+//1 year = 1 hour
+
 
 @interface InAppProductsManager : NSObject <SKProductsRequestDelegate, SKPaymentTransactionObserver> {
 	NSString *latestReceiptMD5;
@@ -64,11 +71,16 @@ typedef NSString*               IAPPurchaseNotificationStatus;
 // TRUE if manager is available for usage - will be FALSE if an operation is already in progress or if not initialized or not enabled
 @property (readonly) BOOL available;
 
+// TRUE if accountActivate was started but we did not receive response from server yet
+@property (readonly) BOOL accountActivationInProgress;
+
 - (BOOL)isPurchasedWithID:(NSString*)productId;
 // Purchase an account. You should not use this if manager is not available yet.
-- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString*)email;
+- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString*)email monthly:(BOOL)monthly;
 // Purchase a product. You should not use this if manager is not available yet.
 - (BOOL)purchaseWitID:(NSString *)productID;
+// Activate purchased account.
+- (BOOL)activateAccount:(NSString *)phoneNumber;
 
 // restore user purchases. You should not use this if manager is not available yet. Must be at a user action ONLY.
 - (BOOL)restore;
diff --git a/Classes/InAppProductsManager.m b/Classes/InAppProductsManager.m
index 316e78d7a..a9c35d7ac 100644
--- a/Classes/InAppProductsManager.m
+++ b/Classes/InAppProductsManager.m
@@ -32,9 +32,10 @@
 #import "InAppProductsViewController.h"
 
 @interface InAppProductsManager()
-	@property (retain, nonatomic) NSDictionary *accountCreationData;
-	// needed because request:didFailWithError method is already used by SKProductsRequestDelegate...
-	@property (nonatomic, retain) InAppProductsXMLRPCDelegate *xmlrpc;
+@property (retain, nonatomic) NSDate *expirationDate;
+@property (retain, nonatomic) NSDictionary *accountCreationData;
+// needed because request:didFailWithError method is already used by SKProductsRequestDelegate...
+@property (nonatomic, retain) InAppProductsXMLRPCDelegate *xmlrpc;
 @end
 
 @implementation InAppProductsManager
@@ -47,7 +48,7 @@
 		_enabled = (([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) && ([SKPaymentQueue canMakePayments]) && ([[LinphoneManager instance] lpConfigBoolForKey:@"enabled" forSection:@"in_app_purchase"]));
 		_initialized = false;
 		_available = false;
-
+		_accountActivationInProgress = false;
 		if (_enabled) {
 			self.xmlrpc = [[InAppProductsXMLRPCDelegate alloc] init];
 			_status = kIAPNotReady;
@@ -64,7 +65,9 @@
 	if (!_enabled) return FALSE;
 
 	for (NSString *prod in _productsIDPurchased) {
-		if ([prod isEqual: productID]) {
+		NSDate *now = [[[NSDate alloc] init] autorelease];
+		// since multiple ID represent the same product, we must not check it
+		if (/*[prod isEqual: productID] &&*/[self.expirationDate earlierDate:now] == now) {
 			bool isBought = true;
 			LOGE(@"%@ is %s bought.", prod, isBought?"":"NOT");
 			return isBought;
@@ -75,7 +78,7 @@
 
 - (BOOL)purchaseWitID:(NSString *)productID {
 	if (!_enabled||!_initialized||!_available) {
-		NSDictionary* dict = @{@"product_id":productID, @"error_msg": NSLocalizedString(@"In apps not ready yet", nil)};
+		NSDictionary* dict = @{@"product_id":productID, @"error_msg": NSLocalizedString(@"Cannot purchase anything yet, please try again later.", nil)};
 		[self postNotificationforStatus:kIAPPurchaseFailed withDict:dict];
 		return FALSE;
 	}
@@ -95,9 +98,9 @@
 	}
 }
 
-- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString*)email {
+- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString*)email monthly:(BOOL)monthly {
 	if (phoneNumber) {
-		NSString* productID = [[LinphoneManager instance] lpConfigStringForKey:@"paid_account_id" forSection:@"in_app_purchase"];
+		NSString* productID = [[LinphoneManager instance] lpConfigStringForKey:(monthly?@"paid_account_id_monthly":@"paid_account_id") forSection:@"in_app_purchase"];
 		self.accountCreationData = @{ @"phoneNumber":[phoneNumber retain], @"password":[password retain], @"email":[email retain] };
 
 		if (![self purchaseWitID:productID]) {
@@ -108,6 +111,34 @@
 	return false;
 }
 
+- (BOOL)activateAccount:(NSString *)phoneNumber {
+	if (phoneNumber) {
+		NSString *receiptBase64 = [self getReceipt];
+		if (receiptBase64) {
+			NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"receipt_validation_url" forSection:@"in_app_purchase"]];
+			XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
+			//buying for the first time: need to create the account
+			//if ([transaction.transactionIdentifier isEqualToString:transaction.originalTransaction.transactionIdentifier]) {
+			[request setMethod: @"activate_account" withParameters:[NSArray arrayWithObjects:
+																	@"",
+																	phoneNumber,
+																	receiptBase64,
+																	@"",
+																	@"apple",
+																	nil]];
+			_accountActivationInProgress = YES;
+			XMLRPCConnectionManager *manager = [XMLRPCConnectionManager sharedManager];
+			[manager spawnConnectionWithXMLRPCRequest: request delegate: self.xmlrpc];
+			LOGI(@"XMLRPC query %@", [request method]);
+			[request release];
+			return true;
+		} else {
+			LOGE(@"Trying to activate account but no receipt available yet (probably doing it too soon)");
+		}
+	}
+	return false;
+}
+
 -(BOOL)restore {
 	if (!_enabled||!_initialized||!_available) {
 		NSDictionary* dict = @{@"error_msg": NSLocalizedString(@"In apps not ready yet", nil)};
@@ -197,70 +228,66 @@
 	}
 }
 
-- (void)validateReceipt: (SKPaymentTransaction*)transaction {
-	NSString *receiptBase64 = nil;
+- (NSString*) getReceipt {
 	NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
-
 	// Test whether the receipt is present at the above URL
 	if(![[NSFileManager defaultManager] fileExistsAtPath:[receiptURL path]]) {
 		// We are probably in sandbox environment, trying to retrieve it...
+		return nil;
+	}
+
+	NSString *receiptBase64 = [[NSData dataWithContentsOfURL:receiptURL] base64EncodedStringWithOptions:0];
+	LOGI(@"Found appstore receipt %@", [receiptBase64 md5]);
+	return receiptBase64;
+}
+
+- (void)validateReceipt: (SKPaymentTransaction*)transaction {
+	NSString *receiptBase64 = [self getReceipt];
+	if (receiptBase64 == nil) {
 		SKRequest* req = [[SKReceiptRefreshRequest alloc] init];
 		LOGI(@"Receipt not found yet, trying to retrieve it...");
 		req.delegate = self;
 		[req start];
 		return;
 	}
-
-	receiptBase64 = [[NSData dataWithContentsOfURL:receiptURL] base64EncodedStringWithOptions:0];
-	LOGI(@"Found appstore receipt %@", [receiptBase64 md5]);
-
 	//only check the receipt if it has changed
 	if (latestReceiptMD5 == nil || ![latestReceiptMD5 isEqualToString:[receiptBase64 md5]]) {
+		// transaction is null when restoring user purchases at application start or if user clicks the "restore" button
 		// We must validate the receipt on our server
 		NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"receipt_validation_url" forSection:@"in_app_purchase"]];
-
 		XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
-
-		// transaction is null when restoring user purchases at application start or if user clicks the "restore" button
-		if (!transaction || [transaction.payment.productIdentifier isEqualToString:[[LinphoneManager instance] lpConfigStringForKey:@"paid_account_id" forSection:@"in_app_purchase"]]) {
-			//buying for the first time: need to create the account
-			//if ([transaction.transactionIdentifier isEqualToString:transaction.originalTransaction.transactionIdentifier]) {
-			if (self.accountCreationData.count == 3) {
-				[request setMethod: @"create_account_from_in_app_purchase" withParameters:[NSArray arrayWithObjects:
-																						   @"",
-																						   [_accountCreationData objectForKey:@"phoneNumber"],
-																						   receiptBase64,
-																						   @"",
-																						   @"apple",
-																						   [_accountCreationData objectForKey:@"email"],
-																						   nil]];
-				self.accountCreationData = nil;
-				// otherwise simply renewing
-			} else {
-				if ([[self getPhoneNumber] length] > 0) {
+		//buying for the first time: need to create the account
+		//if ([transaction.transactionIdentifier isEqualToString:transaction.originalTransaction.transactionIdentifier]) {
+		if (self.accountCreationData.count == 3) {
+			[request setMethod: @"create_account_from_in_app_purchase" withParameters:[NSArray arrayWithObjects:
+																					   @"",
+																					   [_accountCreationData objectForKey:@"phoneNumber"],
+																					   receiptBase64,
+																					   @"",
+																					   @"apple",
+																					   [_accountCreationData objectForKey:@"email"],
+																					   nil]];
+			self.accountCreationData = nil;
+			// otherwise simply renewing
+		} else {
+			if ([[self getPhoneNumber] length] > 0) {
 				[request setMethod: @"get_expiration_date" withParameters:[NSArray arrayWithObjects:
 																		   [self getPhoneNumber],
 																		   receiptBase64,
 																		   @"",
 																		   @"apple",
 																		   nil]];
-				} else {
-					LOGW(@"No SIP URI configured, doing nothing");
-					_available = true;
-					return;
-				}
+			} else {
+				LOGW(@"No SIP URI configured, doing nothing");
+				_available = true;
+				return;
 			}
-		} else {
-			LOGE(@"Hum, not handling product with ID %@", transaction.payment.productIdentifier);
-			_available = true;
-			return;
 		}
-
 		latestReceiptMD5 = [[receiptBase64 md5] retain];
 
 		XMLRPCConnectionManager *manager = [XMLRPCConnectionManager sharedManager];
 		[manager spawnConnectionWithXMLRPCRequest: request delegate: self.xmlrpc];
-		LOGI(@"XMLRPC query %@: %@", [request method], [request body]);
+		LOGI(@"XMLRPC query %@", [request method]);
 		[request release];
 	} else {
 		LOGW(@"Not checking receipt since it has already been done!");
@@ -311,7 +338,7 @@
 					NSDictionary* dict = @{@"product_id": transaction.payment.productIdentifier};
 					[self postNotificationforStatus:kIAPPurchaseCancelled withDict:dict];
 				} else {
-					NSString* errlast = [NSString stringWithFormat:@"Purchase of %@ failed: %@.",transaction.payment.productIdentifier,transaction.error.localizedDescription];
+					NSString* errlast = [NSString stringWithFormat:@"Purchase failed: %@.",transaction.error.localizedDescription];
 					LOGE(@"SKPaymentTransactionStateFailed: %@", errlast);
 					NSDictionary* dict = @{@"product_id": transaction.payment.productIdentifier, @"error_msg": errlast};
 					[self postNotificationforStatus:kIAPPurchaseFailed withDict:dict];
@@ -324,7 +351,7 @@
 
 - (void)paymentQueue:(SKPaymentQueue *)queue removedTransactions:(NSArray *)transactions {
 	for(SKPaymentTransaction * transaction in transactions) {
-		LOGI(@"%@ was removed from the payment queue.", transaction.payment.productIdentifier);
+		LOGD(@"%@ was removed from the payment queue.", transaction.payment.productIdentifier);
 	}
 }
 
@@ -350,6 +377,10 @@
 
 	_available = true;
 
+	if ([[request method] isEqualToString:@"activate_account"]) {
+		_accountActivationInProgress = NO;
+	}
+
 	LOGI(@"XMLRPC response %@: %@", [request method], [response body]);
 	NSString* productID = [[LinphoneManager instance] lpConfigStringForKey:@"paid_account_id" forSection:@"in_app_purchase"];
 
@@ -361,22 +392,26 @@
 			// response object can either be expiration date (long long number or an error string)
 			double timeinterval = [[response object] doubleValue];
 			if (timeinterval != 0.0f) {
-				NSDate *expirationDate = [NSDate dateWithTimeIntervalSince1970:timeinterval/1000];
-				NSDate *now = [[NSDate alloc] init];
-				NSDictionary* dict = @{@"product_id": productID, @"expires_date": expirationDate};
-				if ([expirationDate earlierDate:now] == expirationDate) {
+				self.expirationDate = [NSDate dateWithTimeIntervalSince1970:timeinterval/1000];
+				NSDate *now = [[[NSDate alloc] init] autorelease];
+				NSDictionary* dict = @{@"product_id": productID, @"expires_date": self.expirationDate};
+				if ([self.expirationDate earlierDate:now] == self.expirationDate) {
 					LOGW(@"Account has expired");
 					[self postNotificationforStatus:kIAPPurchaseExpired withDict:dict];
 				} else {
+					LOGI(@"Account valid until %@", self.expirationDate);
 					[_productsIDPurchased addObject:productID];
 					[self postNotificationforStatus:kIAPPurchaseSucceeded withDict:dict];
 				}
 			} else {
+				self.expirationDate = nil;
 				NSString *error = [response object];
 				LOGE(@"Failed with error %@", error);
 				NSString *errorMsg;
 				if ([error isEqualToString:@"ERROR_ACCOUNT_ALREADY_EXISTS"]) {
-					errorMsg=NSLocalizedString(@"You have already registered an account.", nil);
+					errorMsg=NSLocalizedString(@"This account is already registered.", nil);
+				} else if ([error isEqualToString:@"ERROR_UID_ALREADY_IN_USE"]) {
+					errorMsg=NSLocalizedString(@"You already own an account.", nil);
 				} else if ([error isEqualToString:@"ERROR_ACCOUNT_DOESNT_EXIST"]) {
 					errorMsg=NSLocalizedString(@"You have already purchased an account but it does not exist anymore.", nil);
 				} else if ([error isEqualToString:@"ERROR_PURCHASE_CANCELLED"]) {
@@ -415,6 +450,10 @@
 
 	_available = true;
 
+	if ([[request method] isEqualToString:@"activate_account"]) {
+		_accountActivationInProgress = NO;
+	}
+
 	LOGE(@"Communication issue (%@)", [error localizedDescription]);
 	NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Communication issue (%@)", nil), [error localizedDescription]];
 	UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Communication issue", nil)
@@ -434,7 +473,7 @@
 	[[NSNotificationCenter defaultCenter] postNotificationName:status object:self userInfo:nil];
 	LOGE(@"Not supported, triggering %@", status);
 }
-- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString*)email { [self postNotificationforStatus:kIAPPurchaseFailed]; return false; }
+- (BOOL)purchaseAccount:(NSString *)phoneNumber withPassword:(NSString *)password andEmail:(NSString *)email monthly:(BOOL)monthly { [self postNotificationforStatus:kIAPPurchaseFailed]; return false; }
 - (BOOL)restore { [self postNotificationforStatus:kIAPRestoreFailed]; return false; }
 - (BOOL)retrievePurchases { [self postNotificationforStatus:kIAPRestoreFailed]; return false; }
 - (BOOL)purchaseWitID:(NSString *)productID { [self postNotificationforStatus:kIAPPurchaseFailed]; return FALSE; }
@@ -444,6 +483,7 @@
 - (void)XMLRPCRequest:(XMLRPCRequest *)request didReceiveResponse:(XMLRPCResponse *)response { }
 - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions { }
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response { }
+- (BOOL)activateAccount:(NSString *)phoneNumber { return FALSE; }
 #endif
 @end
 
@@ -470,6 +510,6 @@
 }
 
 - (void)request:(XMLRPCRequest *)request didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge {
-
+	
 }
 @end
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 1d27f276b..874aa2094 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -933,7 +933,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 			NSString *identity = [self identityFromUsername:username];
 			[self checkUserExist:identity];
 		} else {
-			[iapm purchaseAccount:username withPassword:password andEmail:email];
+			[iapm purchaseAccount:username withPassword:password andEmail:email monthly:FALSE];
 			// inAppPurchaseNotification will take care of bringing us to the next view now
 		}
 	}

From c6960034f3961ea3c7ec703043121daeb82a86ab Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 29 May 2015 16:20:25 +0200
Subject: [PATCH 13/14] imgur_upload.sh: customize output when no images of
 failed tests are available

---
 Tools/imgur_upload.sh | 62 +++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/Tools/imgur_upload.sh b/Tools/imgur_upload.sh
index 1df935021..541d22b62 100755
--- a/Tools/imgur_upload.sh
+++ b/Tools/imgur_upload.sh
@@ -1,39 +1,39 @@
-#!/usr/bin/env bash
+#!/bin/bash -x
 
 # Install underscore-cli for hacking
 if ! which underscore &> /dev/null; then
-  npm install -g underscore-cli
+	npm install -g underscore-cli
 fi
 
 cd Screens
 
-# Prepare location to collect delete commands
-if test "$TRAVIS_BUILD_NUMBER" = ""; then
-  TRAVIS_BUILD_NUMBER="dev"
-fi
-output_dir="Screens"
-download_cmds=""
+if "*.png" 2>/dev/null; then
+	# Prepare location to collect delete commands
+	if test "$TRAVIS_BUILD_NUMBER" = ""; then
+		TRAVIS_BUILD_NUMBER="dev"
+	fi
+	output_dir="Screens"
+	download_cmds=""
 
-# curl from http://imgur.com/tools/imgurbash.sh via http://imgur.com/tools
-# Documentation: http://code.google.com/p/imgur-api/source/browse/wiki/ImageUploading.wiki?r=82
-api_key=$IMGUR_KEY
-oIFS=$IFS
-IFS=$'\n'
-for filepath in $(find . -name '*.png'); do
-#	echo "File $filepath"
-#	echo "Command: curl https://api.imgur.com/3/upload.json -H \"Authorization: Client-ID $api_key\" -F "image=@\"$filepath\"""
-  result="$(curl https://api.imgur.com/3/upload.json -H "Authorization: Client-ID $api_key" -F "image=@\"$filepath\"" )"
-  # result='{"rsp":{"stat":"ok","image":{"image_hash":"dKZ0YK9","delete_hash":"r0MsZp11K9vawLf","original_image":"http:\/\/i.imgur.com\/dKZ0YK9.png","large_thumbnail":"http:\/\/i.imgur.com\/dKZ0YK9l.jpg","small_thumbnail":"http:\/\/i.imgur.com\/dKZ0YK9s.jpg","imgur_page":"http:\/\/imgur.com\/dKZ0YK9","delete_page":"http:\/\/imgur.com\/delete\/r0MsZp11K9vawLf"}}}'
-  lol="$(echo $result | underscore extract success)"
-  if test $lol != "true"; then
-    echo "There was a problem uploading \"$filepath\"" 1>&2
-    echo "$result" 1>&2
-  else
-    download_cmds="${download_cmds}wget $(echo "$result" | underscore extract 'data.link')\n"
-  fi
-done
-IFS=$oIFS
-echo "All uploads complete!"
-echo ""
-echo "Download via:"
-echo -e "    $download_cmds"
+	# curl from http://imgur.com/tools/imgurbash.sh via http://imgur.com/tools
+	# Documentation: http://code.google.com/p/imgur-api/source/browse/wiki/ImageUploading.wiki?r=82
+	api_key=$IMGUR_KEY
+	for filepath in *.png; do
+		# echo "File $filepath"
+		# echo "Command: curl https://api.imgur.com/3/upload.json -H \"Authorization: Client-ID $api_key\" -F "image=@\"$filepath\"""
+		result="$(curl https://api.imgur.com/3/upload.json -H "Authorization: Client-ID $api_key" -F "image=@\"$filepath\"" )"
+
+		# result='{"rsp":{"stat":"ok","image":{"image_hash":"dKZ0YK9","delete_hash":"r0MsZp11K9vawLf","original_image":"http:\/\/i.imgur.com\/dKZ0YK9.png","large_thumbnail":"http:\/\/i.imgur.com\/dKZ0YK9l.jpg","small_thumbnail":"http:\/\/i.imgur.com\/dKZ0YK9s.jpg","imgur_page":"http:\/\/imgur.com\/dKZ0YK9","delete_page":"http:\/\/imgur.com\/delete\/r0MsZp11K9vawLf"}}}'
+		succeeded="$(echo $result | underscore extract success)"
+		if [ "$succeeded" != "true" ]; then
+			echo "There was a problem uploading \"$filepath\": $result"
+		else
+			download_cmds="${download_cmds}wget $(echo "$result" | underscore extract 'data.link')\n"
+		fi
+	done
+	echo "All uploads complete!"
+	echo ""
+	echo "Download via: $download_cmds"
+else
+	echo "Could not find any PNG in $PWD, something must be broken!"
+fi

From 54afa31e4df95d98240f7d4888dc4a8cb23024ef Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 1 Jun 2015 12:23:33 +0200
Subject: [PATCH 14/14] LinphoneManager.m: instanciate in app manager only
 after linphone core initialization

---
 Classes/LinphoneManager.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 3e031049a..eaadf8ea1 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -295,8 +295,6 @@ struct codec_name_pref_table codec_pref_table[]={
 #endif
 		}
 
-		_iapManager = [[InAppProductsManager alloc] init];
-
 		[self migrateFromUserPrefs];
 	}
 	return self;
@@ -1399,6 +1397,8 @@ static BOOL libStarted = FALSE;
 	// create linphone core
 	[self createLinphoneCore];
 
+	_iapManager = [[InAppProductsManager alloc] init];
+
 	linphone_core_migrate_to_multi_transport(theLinphoneCore);
 
 	// init audio session (just getting the instance will init)