From 914dd91653ccc92ff86b588954cbc18e2066e6e3 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 15 Dec 2014 10:37:23 +0100
Subject: [PATCH 1/7] Fix NPE

---
 OsmAnd/src/net/osmand/plus/render/RenderingIcons.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
index 45583ecf48..2d2ca9a494 100644
--- a/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
+++ b/OsmAnd/src/net/osmand/plus/render/RenderingIcons.java
@@ -82,6 +82,9 @@ public class RenderingIcons {
 	}
 	
 	public static Bitmap getIcon(Context ctx, String s) {
+		if(s == null) {
+			return null;
+		}
 		if (!iconsBmp.containsKey(s)) {
 			Integer resId = icons.get(s);
 			if (resId != null) {

From fafe89040c18016a98ed6ff922fe1c6d8fc4c96a Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 15 Dec 2014 17:01:04 +0200
Subject: [PATCH 2/7] Added audio-video notes card for dashboard

---
 OsmAnd/res/drawable-hdpi/ic_play_dark.png     | Bin 0 -> 1298 bytes
 OsmAnd/res/drawable-hdpi/ic_play_light.png    | Bin 0 -> 1324 bytes
 OsmAnd/res/drawable-hdpi/ic_type_audio.png    | Bin 0 -> 1224 bytes
 OsmAnd/res/drawable-hdpi/ic_type_img.png      | Bin 0 -> 1308 bytes
 OsmAnd/res/drawable-hdpi/ic_type_video.png    | Bin 0 -> 1093 bytes
 OsmAnd/res/drawable-mdpi/ic_play_dark.png     | Bin 0 -> 1155 bytes
 OsmAnd/res/drawable-mdpi/ic_play_light.png    | Bin 0 -> 1200 bytes
 OsmAnd/res/drawable-mdpi/ic_type_audio.png    | Bin 0 -> 1149 bytes
 OsmAnd/res/drawable-mdpi/ic_type_img.png      | Bin 0 -> 1208 bytes
 OsmAnd/res/drawable-mdpi/ic_type_video.png    | Bin 0 -> 1071 bytes
 OsmAnd/res/drawable-xhdpi/ic_play_dark.png    | Bin 0 -> 1397 bytes
 OsmAnd/res/drawable-xhdpi/ic_play_light.png   | Bin 0 -> 1423 bytes
 OsmAnd/res/drawable-xhdpi/ic_type_audio.png   | Bin 0 -> 1295 bytes
 OsmAnd/res/drawable-xhdpi/ic_type_img.png     | Bin 0 -> 1397 bytes
 OsmAnd/res/drawable-xhdpi/ic_type_video.png   | Bin 0 -> 1113 bytes
 OsmAnd/res/drawable-xxhdpi/ic_play_dark.png   | Bin 0 -> 1616 bytes
 OsmAnd/res/drawable-xxhdpi/ic_play_light.png  | Bin 0 -> 1685 bytes
 OsmAnd/res/drawable-xxhdpi/ic_type_audio.png  | Bin 0 -> 1475 bytes
 OsmAnd/res/drawable-xxhdpi/ic_type_img.png    | Bin 0 -> 1632 bytes
 OsmAnd/res/drawable-xxhdpi/ic_type_video.png  | Bin 0 -> 1166 bytes
 OsmAnd/res/layout-large-land/dashboard.xml    |   6 +
 .../layout/dash_audio_video_notes_plugin.xml  |  24 ++++
 OsmAnd/res/layout/dash_note_item.xml          |  52 +++++++++
 OsmAnd/res/layout/dashboard.xml               |   6 +
 .../plus/activities/MainMenuActivity.java     |  11 +-
 .../DashAudioVideoNotesFragment.java          | 109 ++++++++++++++++++
 .../plus/dashboard/DashFavoritesFragment.java |   2 -
 27 files changed, 201 insertions(+), 9 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_play_dark.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_play_light.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_type_audio.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_type_img.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_type_video.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_play_dark.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_play_light.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_type_audio.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_type_img.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_type_video.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_play_dark.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_play_light.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_type_audio.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_type_img.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_type_video.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_play_dark.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_play_light.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_type_audio.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_type_img.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_type_video.png
 create mode 100644 OsmAnd/res/layout/dash_audio_video_notes_plugin.xml
 create mode 100644 OsmAnd/res/layout/dash_note_item.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java

diff --git a/OsmAnd/res/drawable-hdpi/ic_play_dark.png b/OsmAnd/res/drawable-hdpi/ic_play_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c25b806686e0a810054e4bb2245f395cce0ca2df
GIT binary patch
literal 1298
zcmbVMTWs4@7<SUjvXQc=j7#=_JP!pX)$t{EE~Z(RI?Wnbx{_sD#8Z4ZZcJ-C*lv^d
zVYEaVsl-JCHg$-Htq%pHF>O2yBtWQQ63{-hLNIZYfFSXJRIx~af&?okX;OHo_JAdy
zbN=K1`!C=B|DGQmIoh*l{~iQEdXmHOG~6F*ysmDz{)j9rz|Ct9W$hD&ViyGyATikx
z0h-i=F^~p=JpJ@%pdUdxrqoQ<&ZdrWlA-y9hK|3a6(AZx`Ugq{K^g}(DuOXpk7B>R
z{}G0&auhqorpQ!*2YGdP#snv3Ml#aOxD=7Gfx~EjiGv0-U<+tTo6s$;6vdi$Ie2bd
z6Byc5vB#s>R#4g0D9RfqKv{nfmq?01LlHm421AihA4)@+Aj1Sr;$(zl0~|@Ctp|hN
zOj+U5@kGlPl%iPPwhJ6V6pKZFG2l1MF@lOjA_PejG>t<I+?v*Hp@i$!!M24suq0D0
z*s7tU4U2+kOxjTlM!J=PR!F6`4eM5mC`cJm5()(6Ckah!<ki%+>@@f{j2*SD%ya<|
zX<!+XrUdJu9BhLjcXxKwP=wKN$4wO$MVN>i(xe7-I~k8+@QYtoWiCiF0VO1eIHN$?
z1et-00s=ToDgqM;l0jMwwC(JKr^p0L$LL^~VHt`VVg?fdKFkbJ;m{z((sZzmP3o2{
z=n`oAR-x|}mc1jE<4qvghM6&piFOx^<_+7h@<svW`DWG8M^34_Y!t0SjWTUz9S5d5
z1>}TjXlRpXPTe5}R*o=YSW$3MmIPd8830L;0ywF#A&RDe#Ih9D!pr}cKLQ3tG@9i<
z&C|Yu9oaZ;j{+37hY9F#f=oCnoujYrMGyy_jK?yiZ^XYgHwQk>Igh!^?&rCDmdoGc
zS>5Z~^{2CT67_e9_dWS&<!oi*rOQ9`dd8f!Ys)X6`E9mNde%C{*lX{(_6>HD{#(5j
zX@329ua8~1I``p`*Sl`K+x__U;+dtlyV0L778iY;I?s=<<qkb?a;_Be5Zz*JIg|bb
zsr8^E4}W?0Q%AkQg0m8stygnzt@h2<-JW6xwU%=okZ-vv)}`Nny7=aXclXyxV%Oh}
z>S6Szv)WVN_s;q<RrWpc%<Ogd<@rfB&gZ?J`#WlPrP=hivGUR{_1!mKSpVbm2Oo1U
zCR`ikrE?DB^asvr7@fLwUiws{Zg*8L9O)b0xQV%5*$>J~XE*Pytj>M4aQ?*u!Ihxn
rT0g${+;@rF`R`AE5#v{4h@%_vUODGmdE;uX@s~;tjl{1E=AQir3^cNm

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_play_light.png b/OsmAnd/res/drawable-hdpi/ic_play_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..39c080a9f49ac2961bbe2ea8b9d1b2bfe487e8b4
GIT binary patch
literal 1324
zcmbVMT}&KR6rKgT7_uOZv9z_3n`t$+GCMyzv%528%g-*9jVvtNH4tL7^K+LSVP=+@
zp}P=M7qE6))KuF9URrqq3~BX6Q-g^iu4&a6rD`7<Lo9C^YeTF}o2d0Ju;>HngOkj?
z_uM((`T5Q{b1K?#xUyn*1%_dj;kHl=?fVMvBTls5#HOauw##nmv5y!DJ1v?JYf=me
zg0Lp`!59>k;lVFpJ%*JYQ{z2$Po!Ot4b3eUble#&h0qvQ-;ha(azC_z1p8DyfZtyD
z6bGsjz`MB!6-fnQQf(VC;gOM!xIEG?^9tT@2-If;WI%(q2r}A$ZV8zHzGhcI=fX9K
zgEbYqKY*_X)f0(=pkYG5xxIu;(Jb)sZkqG@cwZf0kW5m3lA#ES7dVeVF<|4tkvCIG
z2(eJ>hA$)q@T6_01d>dr)9$p#ZJ2!|&GS4-F(ktfNQ1D3bz963y0y1xAp|YiR8zKU
z=%8Rxl#C%efTKv)Q_xb8$fjZ4+8_#1MrOnmNxLah(+YX5X<K#-{u{=Y+E#ox1<4q+
zj3HA-^+@b3f)RHQcT`YB(FmQUii#o*gbaB|gSs6K1#tAmt*DCNWmr$bCrSjHK(vVp
zi<SiR5FC{dS>8)|8Oc+$vlX7Enm8XvwfI?%rRf&7xz!W&vn{mW*GzK^<1J#tx@C*H
z42!;1<a+}fdMH*1nozV2Gj13I#V&{@4coAiMhXOjYgGr&bgQ~zq^<phGOcGFf~I;5
zDy^oWfi<25b&D7{g=ZyyB0)%sED{RGLPUb>A*clBqZt~?97p3Dc;)}{N1~v}LbLp*
zd5Tx4BMZmPQ9#1xFhLznkcmd+<gc@PFwD^&4mHIyH>5uwJZSjrXi2+k-1UZ#yvpZJ
zoEckLS&1|rsL9pFzPh%&{Nm~6t2MdzO9uDTPfmBA8!R2HseX5xG{1Q6^*h;nRP{Gy
z(&FMfb4?@HviF?TSE^=Sc-ont$Yvg`p0Au4xb4bMW-mK(yz@CeUzPtOdh%n}%vjgs
zxpe8O1a{Q6KQ-iHmuAntTu#haIlu)+{_tqetJDv0N8>Bb+`{No-v{wa(+6hDdbi!L
zoVjt~?K9`^nBUfd-%2F{EH`%jK3?%tS#=+_`uS+b_qAF7W4Vi`hFnB2xob`<&y#b@
z(!T9KI#=qFCk{?Of29-XuYELmH`;qBT5-4OyDu+}>c>ARS@9=t9iQkO?09SZZ^vpK
zxSqZKOZ?Wv+1+q*ddV7?e&YU1qnG#O-c*0yDFu_B4-cNsJiD-TbE>Pn(pT;%+ljsR
WHUC#zXTG`c{|dKsgf2B79s39B(8FE;

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_type_audio.png b/OsmAnd/res/drawable-hdpi/ic_type_audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..e53e8f8b9eec2c9eb0dd3a4976d598bf84416f27
GIT binary patch
literal 1224
zcmbVMU2NM_6!zAxK$V0D#OSIbdG0_=!oRVT*wnO%-LODYvMgxPK&bw?ZmiZn*lv?{
zNYltB6#*SjsN35XP1@6>A%qx1+A2CR{)7q>NW5)`u_uZ^LOdYCb($0&sy$%I_ug}T
zzVq{)bNohe^4VzrU_XK&(fk3q1owU6dw(BXZy_ryaN84%SAs*15!4h9AQ|0J0h+gz
zX;1=+zVPa2U<5&W=FM^?s1zmy&9Mk2)FJAY3(*KNGFo>PZ3YCW3Z_k4#5S&6#ZXfh
zvBO+}D!3A;ng<p=aA<L|tS!!HypD}NgO1b%Xutx2g4V5B+ZXC0*0w9ab9hZ+Xj>(i
z5wXpnDup5{IUYbcB8h7h&7vuupt)p<Pd$Y)P$sD~$xt}O3tU2=7_{?X(3__lLP^eb
zd_hUXszKliBw4G~h+2YhylIl=d7h*gl3{SDf%^+~pww~OAMRR^fv<U{8<>ubh87jo
znF~Y=M!K1T<rWHChHbw?6r_x-D=tYB6lqyuUTtkZD1m>&*jC#wFSvj#0pFSPG*}N~
zxC@5d-P=*92%`~R@Jv_~Wma~yISbf9UKTO<h0sl1NHT1~NGU4L8jv<cXW?Ri1kO>0
z!tzNf$*760o$c^6mE)KU!=zb`rRi}tn@dP(cAQS9vNXpq$u2f;`+;I>pzGU&zB^d@
zo>)QhfD$-f*>PsOT~Mq#f#X*l7nP)T)zK#po3`%M{QY5>HnWz2XU+pX=Q$SI=2<Ye
ziGkC3R!tiQuIieC>l_Op30eZD3@$}8G|)JX#yWWY|MEw|pvbUU{?k0&E7+0YacdNy
zur*A;h7;t$Q7QeQlW@%L=H*Pe{)75gt2O$`)Xs@WBl4E86rWm+pT2gZZ{L;U>At0t
zRej?q`buQ&d}LSa*sWT;M|w2=^LiTXJv;x}eYg9w2X{aJ>A-W3KM{RkeLa(HUY;E=
zj{de|c=x4NbFch%aZll9Gd38BeH2|=9sBaZ>#IGdzp!^++7&-G_RveIclMS~-dWjk
z>OE1~fAIIniN?#n-nbk+(KvFvg1q@5QeOTg_6>6T;jy9KwU3KKy^nl5aN+Y8A6xo<
z`Q4k1>zR$a)z;JM(EBUPu`|-dIim5wDebH{ab*7d3_W<K`J>c~or@#A1ISn34S)Uj
SpShpHe@lLRQofj-di@{JT$0uR

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_type_img.png b/OsmAnd/res/drawable-hdpi/ic_type_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..86276bf41b853131ecd89c8441203ede2418d755
GIT binary patch
literal 1308
zcmbVMZ%i9y7(XZ$MhezQ=ERYmH#C~;dVhM?KNl+f3lu5Ct`oAv$@T6nJ!$XSyMq>7
zTmh%d7-Ql;oQZK`E|};tlW8(Bfht5LSt4$qrpW>yHvQt<H$KeN_ezU?Ap77Y_rCA*
z-t&9@{GR8z(*yn8O^vOM2!b?)dxBB8w;OMR8Lk`1+#K8<)k8!25hbDLcoiT%QHcXI
zoaRSB6!79i_9xJRAf|CCHlz<l`Zz&J+jv9AmQQCO8bLZb^BG<k1v(lBBa-aF?kp~0
zs3dx@K{i50G69g3dL~tHWU@adOpXd}5$k*g?Z|V`KpN;gnop->jmvwmvRw|IjcWo!
z%PRV)2ip#6C^CQs6cwPX&4CLf#h^~Njba^6xAPE6Lzy651Wn?kn`7-9Nu!kqgWgmz
z!9{~z6<<*DU`buia0HRd<!m{-O;JY(%I$U&Bu&sX4mEIXLe}{_E^7y?7J@(%R4JoN
zii{c-`M5HsdoUR3b_(fCB(h^z)+$6n%7{FlAt)P3q|-)TWo=E5f`7x<Ra=WqWB?Hb
znlh#eupWtnRWRi4{*DYq7!7w=m0(f$R8SGd(m>Y3K@SGM*hER>95iE3IQclvBp_|P
z$iO85>^Ms%c*gA@9dz7YwX++ZB7LlrC4DZ2Whg4d_`B=@7ZajfPCv!cw4;g*%bL#1
z0;u|ypzjLSeP1jWPyw$iYD`g5)h-xFD!QU2l?)mPl&g+DH7LoVlGC0x%Cwzz5UA2P
z5W7?*jh1=lq+McQMK=?7B@%dC6nI=@830KT>^PZVofJ(0fn_PIf*1cUe*_GQFq-8*
z%~QRC9cdhQMga;t!vthFK`I=TOJ5r^ThkE^`eOMT@q49G=l8?4eU=%^o7}8*xM=-w
z`A2j6;*`rgdnzg3c^N%!S^3oRK<VU0&T0xgV!gfYLhH_spQzt#^gp-v*&p`xKJjGJ
zp7nK~fBs79x^KR@b?oPbnXb0Fnh&O2A8}V7Tq|~?&F0Nty(#m`-OJ5qbKZ^vukT-&
z`WP9rG>A2K*<;-A2QF`zUvi|r!*1?bdF<`2n*~=(@3j@*RqwZLv!&YXe&&ni<>TnZ
z;<?+c%=v{sKWX#+_Uil3-z#jf*3O#Eo`t}dQ>O;{z6$=0v>q*8nyvS*zW6X{YU#b;
z{XF#9%qvK?!Me2i_{n#B4i|s9CZV^^wXdm#twZm<Q8)d^={f5e)9U=udbQY1{Potp
zdi=ut%q{CXudNm49=gG|oX-w^v-gGRtbQVS-PclEKupM)n0N8mQu7t#e-#e(2QT`E
Gr~d)66}KV)

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_type_video.png b/OsmAnd/res/drawable-hdpi/ic_type_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..767c0de2ccf2bbb541746a07df1dc554880c1b4b
GIT binary patch
literal 1093
zcmbVLJ#5oJ6gHGUMN}*d6eKvgNCi~KKe3b8B$PBiG(bv}L}~^GF7~-Gt$oJ6HfhCx
z7!Vy;s|X1RkXRVXfCK{rMNE*T8!8e5LTrc*fK+uroYSN*R2{JFyL;#Ny`S&Bw@@6v
z&>uP)Vi=}BKb9%c{bcYR*hkmTOshq=0g|nfGB!yAdWcCGxQ0O9hLfm-pfPvj9ZE1v
z->g-sl4{|yreiw{1D$Zwb}5=+5+h9)>Qjh-8k)46B)j(NH47{w$xbK*q2Q)b-5Q(s
zP<ej5qR&t1s=<z&1Bs?a4cLf4(6px=Uu!1Wj$MtOgKM4z9ThT_WH*DV7K$K^Jp`0+
zl+y)K1~D}(D$$r48wL`Uc_GeA0w<`N643++bRU*_^9)lfWpZ6#R7$dSLR^jK8;wS|
z5eZ{&k{4A~<pqhCB#vru{+vT#lXLvRo`nqZb<c8%g&h!Bgf%=vk}QpMGX>i%6t)aI
zewQdp8Q+91FNOu)wu8Jn+CC|vzhP{v?N{bp#FvndXFQ$O!yN2^DR(<N3KVHH+7-{D
zMS;^9tk2lUA^A*_rGLVPWoS`Jj+il6<7AW41`U}mCW>&1U_x1q3Q?&R>Dk#1FA6zD
zN=d1>tjMC6l}B@tbX?Ag@z|)SNK&+i%{xAUj*fc1E$X|ARd>W{X%9hyy$Z(Dy)G!$
zF~NQvyC9wJR2`g}up9$7{L?|1HnYwk&zeO>&cin7@T^(e#Gn|eT#K6~S2J|T8H$W3
z33`MROeH2tBGMH_WV?9dfBEBSP<+rV|1?kUigsjh+!_TcYz-4~=mdFmRPOzB+H}k)
zd#OtE<F{5Sv<wdJdH&?k_wvS<Ur$$#Up!oHCHH2kM~3#JvuD2Etvy;<3q5!?^m60F
zlJooen;)OryH~Foy3~GOebKjivwi*!0&k^Z`t}Vh!huC@Vg1D8qExuGi%Gmac4_(H
R`u$+A^V#vt(&)9@e*lxfU&;Ug

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_play_dark.png b/OsmAnd/res/drawable-mdpi/ic_play_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7f4bcd42dc5a287811964d3b29355ccd474c74e
GIT binary patch
literal 1155
zcmbVMO>EOh6n1Hg*zSUmDymZLO0(_-B>ZnDvA3b5Nhpy>>862J98kyhxUpJ$j6Ef3
zB~W({sDL<t0QHIxaDr2zpgm9|koY^m1tCs**b^Km7X%VocAO?%4iyJ1d1l`DeedUc
z@A=g5(BS5do(_g#HW&8gN_6jz-%T6o`gb+`k#5^bevFJ@hg4yRn2e201PUIUKqUn2
znWK+UAH%dBbIW67thnE>u*bt#hp%}7MKerae=UI4BqG2>6Rw|T-~Dxu1+JZDN426@
z46>-=?wbwK$m~$rnw_+Co9*8X`f3I>;2{D*&71Ngqn2jtb`5%tuLTy=RmfzTT@7li
zI1I8lL_p&coFz&sNb0<#C6an_7m%qeh$%r9IZ-z>#SmrCcv$K!v>l_A+uQI(r8HY1
zBrpV_TCMU`g~#E9AnCd;h_WEd9M#~W8K1x!=SRIw3po^7p&Jkv`yjRmO*~D~ERA$E
z1urNT*9`kngD6UwP=kRW@uJ{)ab9)ph?LO(VXUhim1hDZlu(4HLyOkK>1~23ci(mt
zE7E9;1EEWc0;h7=n)Z-S3b`~(zwowe8wpueoFp_k)uFUOTcwMG6iyQzsOkwZA)89m
z&U$z$qbsS5qNh|%m886?=aX_arO2u-W)yi~pouN`5rMvin!a7?yMax86KiBc1PKny
z7*933V7P(_jw(0+*=)V)V8^KI+qfF-jLWo|bq<B@F=X!zu?Olr8}2$WXtu7JDaYYV
z+k%{}sfdzbDV*qNNlBKFrD+n|z}w%;pFo2W;%51(d74+WBje-RC{ST-n2=8=D5Rru
z<M+a0I%Zc2xlFnC+Wh?GOMffZ(%E|U{>ts~&aF>JrdoHLKRUkk<Aw)l&$H8mzZ}{B
zXhZj%pB^L@7n!zyTi*W+x-MUA7gu`bJO5ZXcc^Q5`B(7r+SPWj^5gt(a|>tUo8#ca
zLubn^xu^H;r@002rp@#Zx4nSi<>iBN@mgMPM~gFyPb#BxuP$}vAC3b4`a!t#!~C{K
kTKCEAgKz(7Sz^F4b3!gYzteGHQ~X;f<cD%M2gd*W4=aguYybcN

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_play_light.png b/OsmAnd/res/drawable-mdpi/ic_play_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..448a2905913cc29ddaaf192f0c4e62864f8f8bcc
GIT binary patch
literal 1200
zcmbVMPiP!f7@uTGTT)`S6lsmtyiQB0#rZ$8yEA5!COeyU!A;|KYeP@YpEubtnR&A_
zFWpHHSp}gH%%QRLQq+d_P>>cOn1Y~)_0Wq1EFScrR20EO2|d_@(!Sa3Mh~F}2j;!^
zz4?CMpWpX=vp6|%qOW(Lm!hb?(n-BS_WjAbYX@0>Y2+V~?KxbW!l#jg8%7AJQ5%^M
zlssb^R-j?e*YCn1ib|b#t5bNY{HkUlk2Mk<HueI7rl_HjI54akh=B>GT|ZAh_~I)X
zxOSdCtCab2P=Gb}<U$BfFHBUeg&9k=>5*YD6l=tQ2eAQSZ`O~rI8V3iYUG?;b2MnF
z;F&zV8PrsH5)@Dffx>1Oix*^&RarsFWYz4;KqNB9=QxpPcvVv*jTb@tp^3N9cC?B<
z-u6YLJYB;$&^WHqXs`{5Md36jsH)2GA}5Lr(O{x^9~&{_M~6BVbQoEo8(<gtAhBqe
zXb$IT66t0NUQjM?8TO+#QG_xsHUdsydCv2ayjt23uE2l8*j78L&IgdIzzEHS7O97G
zr~@Y4J>5~FNTShBg)S+IF{>kM&VxQK>3N!bVQtseGNLRwS;J&xhtOu&GFcobF$(V(
zvYO#DqA7LkY=;*{MP1KHQchN6K`6><F)J2wk|?YEs3eY!b+9Er!iI0bj&GOvZezu#
zVzojD4UEDnLbIJNn5-d;q8bW7q0p*2IC|FgZPbWfO3JjEwGKn~JhaC{<bf8?n!8O5
ziml3K&T$yiwhYErWJpM`B!+jCtRM=|QWSx1<L&>;A4h`Xl4ki&^K`CAM<&OuQ6R$B
zFhQS8P)J5)^{>}f$(XH|^wDbkqxtva$0I4GYj5g<uh-X_J(u-*ed7qYwEIr~qVnn5
z+U3K8kGeO`05)a5ey(RvHr?pnP{HR{;R}CI8wbHhsXO%Q`}R1P*m3{Q<5zb5_Wj{!
z-+7DgztG?PS%z7@!K6RldH)&k`^uSN>iW&F_U6OuaNN3fssHU%eV@!`mOorxq)s$*
zdoSFYeC6WLRJ}L-(;o3kb+CDCsb_uV*S>GxJ1}s&w{Pj2d+f0<yXrmZ=Pz2hgM-aV
p@x}DWCrAHT`r&TM?>gS>q7KAIZVi7oU?%^NQgK4RIrhf8PXMIOfg}I`

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_type_audio.png b/OsmAnd/res/drawable-mdpi/ic_type_audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af1472389b047bb4e4e8fc9b05b085c3fec76ae
GIT binary patch
literal 1149
zcmbVM-D}%c6j$Q4boqeNGHAPpX-Xejn5=Kx5^)m8b{a#SxQ<yp3dL8_RV)(eD$-4?
zBzxG$O9IPaA$`lnVDBT01x80d0(t2}|A2NatV<tT+R_$E8B4DmJL^N}Lj}6`o~!da
zAHQ>smP=#jdb>__Q54l%7|oT*ej<909471Ejr1$Boy7Sno<J6E03T8r6X}pHIA9W%
zAu#7>Zoz(vip|-TDy|mKYX)-SAkvA4jz`cG)jt?|z?g!V*5Rb>rkN*y-e73kOfwgi
zB46~fux^ho_;6xjtYR!o8LG()4$%FfMhrL*13Gl3-9QV|Ow+DL&e1i;&`lLQm1g#W
zsuoLh7Wt4?;tAH^1({B&aY0EW)#PWiNMw#raU#$1s-{R9FVd}tA>Mq`(#pA!mM<cu
znL5Uv#&L~CBi@kW$e-i{RaH4&<V2Ar8f-A{Vi2-!(ATz*gMs1O9=4H7M;3vOW^tM!
zk?y77c*WwrVK-<IMJVG!;Bi8n=Nu=>tEnB}GW<V`1GR(7ya%~54A87^ka}2sZ7|{P
z-Hswf5{)+Q+oUL9I){u|2fDbBOEct4+_X(CA<B}K1Uf5Qgf?KxWU-*cD!c_`HNhuD
zU25Ao2rpz*DV33wl&r{tkeAhbQp~0#QC9hkBn}U^u?084z%^jow@rMvu<|>xTGodE
zBfo;sbh`^mb%aq+M;@KcHmgpbxoEp4Y6NGaGVNuZgT6fn%@H3tbdzVzJ|G6gRAoJ7
zS*&gvfHf5v5)urF<t-&ChypYeMPOQZ^L_c_NKjnVEN?YW`-*gAble{WBJ2+nbjbwy
zWK=%C`h`Zu?8ibbQwi_t|L*P%#@LSIv6YV7Y%TMkSbOooYVdV+_5AanVl!fPYxnUV
zUk)ul=qX(bo*nw(^hd*apW68<b#rO^zwz$wB{6*U@Y@X7>Z9jk`sFjlmzA}i?ZuxT
z-T(dR)`#-I$D8cN(9Wd`e|47b{L{I8ue8vyxij?r`o<?4=Iiw?>-x>fOxM-UV_OsT
k-$vHH`{l~Or_|9J)i-u(W>jBUjD84({8;YS;o3KE0C<FU%m4rY

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_type_img.png b/OsmAnd/res/drawable-mdpi/ic_type_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..30fb103d6471956ef1c942ab0011c12f38b8d3e1
GIT binary patch
literal 1208
zcmbVMPi)&%829FGgVKshD-s|CmWKq0+0S<DB)00dNt|wx=C-5}%g`j^*w3xi+Rw4w
z#VJFyVG`Q`1QnO<z)nC<g98U71l6QmrfCQvB+xF<-3MbJR3t=sPLsl++5t;`?|skT
z@B8!nzR#Ctr%wzIJ~>Db#Bk}PR>u3|$@|b@y#CZwxAFEwRIEmG$c~yu0EwK1>X0hA
z#yl)T!)i5dz%ha#&pDN9RMk%@CURLL(P3lP$7q5Wn}~hGT!ax-hx3l7(!YGMNmGuc
z(x)Yz)BOTma89lSaBgL~Vy-NjvPDmfQ)97$4Y)8esMuZdLM2w|u3ZJ6lWRazU6p82
zrFVm>>a$b<1(1^1G-GnSNM&S}m(m$IbDR>e47e;1IEIrIDWz}%)q7~{EwF5*tWEWN
zVM(PIqR3YOXf~T{GsU7{9`Ld(15N;fz+ep~Y<ZCpGhTSCZ$X2h8909AAdgBc8g;ZB
zsWgssHwD+%^*zI0*dq#424cepJj(&sP4en$hfx{+8^*rcVWs6mP=+B|4oqAR`&b{0
zxqGmqL=i`$%mfZDim{|2bJ>MnRMJ!$e_<`hQqqE$vNJ}V5p7JHVTpLLVTzGB+Yse6
zmlo=&zMcK>d`{4`tT2@oC6VWgqFl@fg=|U?WiFQz^7%ft<b{#pnXvEM!M=Og;sdct
zA%I4Nf(k-Q{VteYKoJTTkWUo~-Kta1pLRS8HNzK@GVNxq!N55Ot*HRHRF`MP*(V0c
zlEr$~wwbzR8jK~05R+i07|xb5yud?Kl6bm@xBf4G00#w<X8BL^^sjJ7Cda)|z{1`z
zK@U$*fJdbzeE0_*vmZ)Yt`gs_|FyF-K{5x9l5Zcl#nf_JdhPdt^>D4ae(JXm$c9k3
zzH|5U^OKjhhGxGEe?9cxvybJAL0r7Qaj5WpduH;f!Oo8x#&ucz`wicNwJO<Zz5mLm
z!x#0nm|3qr^POM)`qljTGZzMbCL2Q|JLH`#_42?SFnRW!k67}ezFK{A^pUT~1~;<#
z*8QAu_tDPg+BUdy`;%|Bvk!O9b`HOk9=Uqr=xYZ%ps}&pesSFYv-b4poO*fu<Mw56
t@65aHYpdG5(JL3WRvVvv``iF=aEL%hj^BJ;p1GR*OG?FQ?OMLp{s%aGj)DLH

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_type_video.png b/OsmAnd/res/drawable-mdpi/ic_type_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..f01af0b201f5dedb3bb0e7800258d02b0852af1b
GIT binary patch
literal 1071
zcmbVL&1=*^6i=y0saAv{R1qA~O9k_t>~3OX*=~02g4@>ZLif0nWU?E!$;4#ZO?yz#
zlLx`8e}E@J=-Gn`UOWh1deD>5yLv2AsFUrc^-y{+kePWi@Ap1_@4e@%%lD@yZ%i@_
zGgV)*nslGZ{)vlp{V^~P=ysh{+hh%UWB_BtlwE8iP!C`iH4${TAALsi3^Tsvx7wuL
zcwjg<;9;i2r$I!~3^TuwM$qXa0&LXvLzDgW?mY{9*JRhVhS-QIsOK;3#At12x#jHi
z9o=OY?t%H#paud&AV`CaFfme-9ojYMIlC5EFjOIZlRXZq-B<+`93!Cd1<nyA6%=(|
z(h5brcn8Q-7Q~Vui=3z%nqr7D7=0}D7Q3F&v}z+?R5IBfA(0^ngTa6wC_Ik4f~4!Z
zAj*O)b5w&%wnG9_E=*=~3l>V8*pG;hLy%d7Hr^yAOCvo_A&44{6T@LLB8pNbq%aaB
zUKD~L%WJ5ekS00}<4o<OwH+a$i4wdSJG36&Y!0T}o$n}9q|q2Fu}_NvH!SRI1}G$T
z%Vg;b@A|G$kX6MiLYq@PN*i=lx_C(8G|_{qUJwhit>kvj!b@dcDU}tgq-v@pRaL!O
zlq)4gR&}wg$cu|PwjL$~h7QVo`_%UcTR9hNRAK}Pj$0US<Xy1Z!vrTi9Dzz@SamSB
z?uRZOB)79N9cOK!*xy2KEye*D@@)8L#GtvlYL`5Zvt0*ruBIYNf}?PvrxhhxLXM_M
z><I7vFMk3JO30e!pXSN0Xh&wplTo0;$uOaiPEbro<?*xMdvwfJ>Q=dxezy;gjuytb
zvFY&_V_&$=$E&YCOk7fGbB(#n5BIJec5ilW0cLmi=*icbJli~wU%m;|E4BU3aIrp(
f?e|`<OfVN_nEub{yW$`ATQ<V=>az8AvGepVw+c^%

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xhdpi/ic_play_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..518dac837d144318b7070f95c4c9144ab41a22d2
GIT binary patch
literal 1397
zcmbVMYfKzf6dt;5c@$c-O2Jk;48~Apc4l^GUjqw)-K8vbc`RGmAJ#BCb7vV~ccwD~
zyU>_|rq)tXVyx9BBsADkrKKR)(qN$xe$*JWi9t)Fw)(@E)VAOw*0*<oMSqa~aFV(A
zo;&9|kMEo_hpH-erlmZTf*?qmyUgi@I~jYE*2A@S&94XHmZiD;T8$)V5mo_6F)sxG
z>JG6%-~}w-y7xm+fFQaS(dXCvo+lYj3hCLHjy@WaAsRsnilQ>hH3AI{fS?$*V|T_U
zF;wL3SgpxJdSnNv7t7idP}5f7<JuZI8;=zgq6JX~8VCW6MWdmnu*yX3*rHtqo@3Vp
zhAygTjdpA)D8Hu)bw~<8O?orVkra(uY<kLMw%9Crr~%3ZX(bFKPTClgks%G}@`FKd
z3NJ8TXX&ypDA}=kO_Lddh(sd#h*2*oL4vZ`Yy@c_3<ex(;A(4FW21Oj&52uZ0+mxl
zSrer&8neg-q-M>I!AO@<2+1DLis7)jOcbPyh_W(4=}96KisiMat!iHIZy2j;tG-ql
z5MH24%?bzWA>_otkh^<3iYdZqm`X*2MPZwq64x98Va@HdWAKZf7kS2PppAls4dAo@
zX=8aBE&?#(CQ@K&o0&8l0>-$V)$pX*NEyrq(n_0XigMA##!_doi?&(JE{DZcVu@qj
zVO3+p9EkfCq3<OuReDb><4^#rNs3RBn&MqhRWE6hS})0{!?9R(G`Cg^^HN0J5i8SD
z)=r>^Er2goq!7BuGb64NgNe7%0jnV30iI)V-b4dP0%ycY!DOKf6yQuI3R}kW|Cc`k
z21Uf0<v-06zk(eZJFbiZ6jp`_gy94!a8w*A6dcopBW`E0FM93!H!qg!s?!gQWOwyE
z)%l)37ke>q>yyp?s{^MF6dmcTL~|$FQUBr0XAw_eM|sk4`b)#9E!XCfZf?o^IwRxI
z+|2EceK&5tOHN%F3EqAzX^QMS-BkMYM8frUskgbuF{$Vd&!_H6f9pg?Z`U??e{@6R
z{7FWq&achyuF)>d=A15Z{fyJen`Fe^xpAy*cy6p_ri0D>Ao-`qnH%pUY?aR(n|@wi
zca-dXzdX;63{KzIzW0&ilfKdH{k!*kEA*!9t6o=k{$Y9dIV5jj@YBumrky=&>t5YB
z*6{H(^MH?_9kQ<fO8<B51Cgtve{^5;3bQX?IXe|3*K9dc_}VV_Lh}aeh3vmx;4*)&
zTyW=C4gXoDzdTX5{Un1ICMTA+eAd|T(HH%<>?73~*YU(3hJa=C@`FKL+7kt5TTY~g
z`m?&m?^?H=n(KbudtMz)FFQznHS<lM(%aPW=r7`MR@pe&<6G#lRt=3jb98RpvwbM_
zM=^I|PvWus-_CvchPUt1-!*r(&Zpg7fB)<&hz_auHN1Vi<MZO!kI?O^a1NH#J@*fn
Cf9f*;

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_play_light.png b/OsmAnd/res/drawable-xhdpi/ic_play_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b22269e4170c9a7923bac7f63a3496a86a7b1c2
GIT binary patch
literal 1423
zcmbVMYfKzf6dqpN3Y1_CC50BJ1I5zq?#%3yU0BFIVL|A2yOuRZ!|cqRGKHC0W(HUw
zB+vvaNt+teq=hDJW9%QI_yA2!CGKjBQHeGz;RjNsBpQtrG$@utTkisk{viF~By;aQ
zcg}Yn-#KT7e2q1GG7B;h1li-Qb@|~=B;MUBxHhG(pM%?e#T`^mimcK_NdU1kVhEsK
zo;nTufMUAazW|j8lGe!uf=aOASt~8_S}LKVjqqWJMv%(tNSLBqfr5s>X-=?VE4M$!
zP>!)-O~wYIA?yS#Ty2j8PWChg=$=;E!eG@^Xl29-4e&sr&<Niq$kvDr+puee=fpLR
zp&Kens}0)>D%jvdouUL#qt>LM3DSU?En3oOGF!~YP#u(Uq8!%|8p2{V>aBzh-Fh(S
zO=4K9-{slz1tlBSq9|c2j(2r+X}k1VQ96y27K;TZbhu8Zff^dQTTrNoMv#k>7F<B4
zB`&ORqJSnWQX#QJv0*UM%@p`>L&LUVLEa(?QieyUFivU-oaYmHZD`AiAN(7}j@ojd
zI}C6?ki`y(hV@{JlVHf*;~gawVKmm`5(kSywYfyPg9n1*b=ffZMayuE)uc1%Su+*V
z7+6Rf#Teki0=>pau#~}KB22oFK51tsJYn>hNsr4>ZZH~1(rvKoJubW3U@@EAPP5x#
zPGY@+tWW|ClD;|UdkbrSEY|9j0HughKor}OUEpgG6;W;x!>H4_QFZi46DKfYmt2-8
z(`ME#AaR|5@kk<%Zt!g7c8I~qSPY?Zmeqt9n$j>v1ArvZdJVxE&7_V5w9!anTX^RG
z@`uBq@I<rxr+JcBup<-4?NNZj_AmhfPLKpgC3c_*N05}ay)JtoGPg85S(kPqcW^xB
zQOAdFzA}i_`Hp>deOGQqZ{Gch=kxkfV%Pf+`@}x7s(<8-r=E29W<uV=iRrIB!Ed4y
zj>YA>w|A`!UgRBDD0bO0{)_v>CAw<;z<T==x6&W>rXGCj;hjJKmMcxs-hzP)`>T<R
zeKB<~wWu{KFIsj>)i<Rl(ym3>3jWIbhn7>%E##cneea+bQkDi9XIlevE%`IClJT7E
z{>*aK-8UVjO-lt4l{{59pEVXe{1f%T-qoZ1>e6&VgO{v^Qw4kV`0&-#i_H~fDHHcR
zZuMHsc0~8>&##xZ=hh(nO4_vNg}GDlsjLgxYZr2Q20DsYe;@5j$y!o_Yh+6Ir=2QQ
z%)MCg?!CD0QGhL66vOE+Kid1z{mhw;mew}MT1ICyGQYqFZj4SAy*K>f@pneg6qc@k
z&IN9y&)Vac^2v^og2)hm^ZZOadpPGiSBB%@^qC(kYqHLk)PGq!5_{&kfsstVEk3rA
zZ+{IipPc%&{itvDCGpM!!S;0X{wem*gHAPC^kNk`3AokY<}deL?yrv?ZvNx1-2?)D
Ws23+ou6~vHMS9(ht}#dR*?$0cRr8bp

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_audio.png b/OsmAnd/res/drawable-xhdpi/ic_type_audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0bf0add76227fa2b1e37020693f5f8142d3ddba
GIT binary patch
literal 1295
zcmbVMU2NM_6n3+2&_-nsbQ@b$$#^YFMf@8(sja4KnxrJ#(uOpm724K1_H|=5{;BOQ
zX+ex3ZNLL)Xq&VO1ZC`nzo|@Us4%Gy2(8mtTR}AeuRKgb9Yts_Wn<+!O$ray9<b#5
z=ktB%-0z&@H`Be(HPr8`M-ZeTnTTcJOu6slJK#9rS$iE$d!6{8({CtFQM3ROk&PTc
zlbSdJGC-6k#%_QP1le|6%?>()sl$R~XoTq65GBooXawmvP%=en6gX%OjHr4TTm5DZ
zLsdD94R9$cWkx|>O-x##f3i0#O^!;uj2-AiJ4ym1(10VNC9R;_LMe=uc?Gz3k4X$I
zn>eFkY$K?_R2q#M7C<>7h)WdBq9LB3xnPJ7`B4V$NvfS>D4gO2E+9}0T6r+&&5{)%
z6YHt?g1a!5cN|k7$zric6a$1|jgU0Y^CZQP41+@p+@8=Kv4rdP{whNZ*pj81j%w(r
z%P8iIaVLzyNH?yanW@w!v2Is{f|8LX(IjbtA~nsuSJ~QjGT`4ZwzRgh6DA-tz&6G$
z3FbrDUj;+$9_`3AgwY6nmI{+17Gj1pt^wUi#=;o<LddEt1Q|A<gv1=qDo{32X5pZK
z0M1d0$nrrd$m9Z5o~`gyFhDawI@->1EKSGRNT4SciL-nt7>|bH-JvQrsoRdIOQ7mo
zg}y7;?nh#Us0BpFu(F0xs8&HbZ#agXH%v4dEoU9|4XC<o6zw)QO&hn40ZTm&<Q~h=
z(6Y{gx<w3}%(J<6MZt5jB;qp10w{tMz$t|b(F_eFj-#;(UjD!OkuWIIEtdZjPxS~^
zq`TZ~1-RL4CZNL(vS6$1nrez7NDY~cMY5$|R;F&%*F68!>BaelKD}Fi^-Al{Uzn{c
zjfdpcfr}45yHvoBAhUJiiEC$#r|GHW0)K5N{3Cm3`Q^p;=J@8m(a(>(eZlJRb)7u1
z=Z!i4-j^P7-qX{bABGn0*1j;^@Wdw{N9%p(w>6!i?~VPv^ELv~wfAR^=7*`Z`|}Cn
z!|Pq&UA%nkE$qzI1bRa~=NTG$tn<lZT~ms8#(T<pYxgv=9a4X=`@+rN+gi^ZeR2Nl
z>GeMfcMp2~@3*XG_w1YP+;P=dPR@3E)pxi5X)L$><X`$L-7I;yr8?hgqWRP7T{{m)
z>RM{oUwH=fuFU`DSwH1N$FBGm4>g`VANSn!c^=*?eu=J0OKfw?O#fGB->GYFN<8qd
o5(kOCZ+}gOq5qnX#&!)Oi_Ei^8t>fx-u*=-<Gr!V-NUc_11p%bOaK4?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_img.png b/OsmAnd/res/drawable-xhdpi/ic_type_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..10a42960795f0164401af72f1f68576b42878943
GIT binary patch
literal 1397
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%w?G&5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYFXrf?lsb^?v
zW^QS&qhJK&>l;|;8yV;tSX!AHTNxNBK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1pzzJZaxk&!M?g>G?WUP)qwZeFo6%mkOz;^d;tf|AVqJOz-6iAnjT
zCALaHmqNUdTj1*pH#n~t8c@I>)2~P@&^OdG(9g{U`3tPNxFjeQ;S8**i$f|4QuTvU
zi}Op1l7aD&rVP^z3_JW5ffNE=W946z35=A)9GCp$(%jU%5>FRfC7_I6N@j|cnURTc
znt5W9u1Oj&*b-ArfJ9oVv975>TB3=inSq&6k}=F2Z2ApM-OLT$T+A&@Oic_8T}>Q~
z-CP`9O)SmLT%FBboy=i+J@bl767!N%VRmN%?S|?#!>iZIxhOTUB)=#mKR*YS3Ia0n
zOY(~|@(UE4ox!oLpb?&#my%yztO<%Hh_78zi!#enQ{0O3a}~hhY?X<{4W=oUCP@})
zX}U=%$%(otrY5PtKu9*$HApixH#9O#O*S<(RD$YHAvgT=fsWD#B^IQ_0}}$KNDvdA
z6@VOgW=hQi=Aa^AR$&rvdd$GUIMvg|F{I+wo0*Q@OpYSQ(-$x9h<9o_#}>yexU21M
z)4QY#hA+Yt<aU>KF0gaBu5zS!x|Q3+fcOOly<Cpl|6dUPwqf1xWo7Bp?lsTner>St
z{<-SKudDXGU#)Yz=~P8W1IM58#-lUe%T)f_$`Q4I>67MjGX~iW>~dGvofiqn;*4o-
zTH3u@{{~wGbLxi!x(k;bebOAbAm)Z`K;eojtJRn)+gXY>^>#II08N6T1M`n)TKNB)
zW;AmLEAN8$;ob?B-r66yvK|Q6H27LYiC<7Hv`Ih1lGC{Sz)tIc?YaiKow65tCCWMU
zoX^b{3}b0hHC$FNP^I|z)&qs4c~)!PRxu^2eq_7$(xNwA%Di*N>+rt`S_Z3Cs<sGK
zx$etojY~R{eurP}_KQ7}UIh8~9N<lkyUV>g!P>LYLUm!%8?V5>8xH-fdoV>{xr$Ho
zU4EHHw#`7sRsK0bR*FxqXGAeEw|}ZJ7kpu%Qjn^&f&Uku%KharH<-S^dVcZ*t3;GX
tjmP}hWid{NC#!!|QeaX_Fx|&0!SL2JR4e*c;89RP=;`X`vd$@?2>^`n>D~YU

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_type_video.png b/OsmAnd/res/drawable-xhdpi/ic_type_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..b400e347288f5797fd2d3929ca8d68cf9d2c8e16
GIT binary patch
literal 1113
zcmbVLPiWIn7=Lx5Qk)9@0VhbzE)&fEq+LS0t!r9Wuyu6B^)fI`Ube6%FD7rc-9gJh
z)WeQ?@iGryWgwmeJ&2;9phvwZdeNZ_5d_hLFI_u5j2#T*{r!Hw?|Z-R`>s!xPWQ(L
z;sAjD!h~KXGavnXc9C&<$Iq)|I*M~uJcVrBFaiiN7OFw2;2N{A3=OMw;W<nJ(09?P
zRB^R<Ml+Gi8j%g#bbW#bAT`?b4Rao1ss?8rFHNsMctlf<m8PeaB46~gaL$=n4B*sa
zsbVh9o2o^Rj!>zlMhIMp4XWwZy-;hW=?<?(*3mIXQymjLpQbm0sum}yED9i{unETG
z1(`~!te_;4YVs5%l0C-{b0W|1s-{R9FH+r)Cf)+e*2;Rm>x=Bt^c=>%#&L~CgKbDG
z3T8P$RaK4`IZ<SY1rxSBY&01!9PBaZFf;?l#}4wSh|#E_1)Qcyq#I9g{bF&G*bBQt
z5y`lw;d27ZbFLe`t79GFGW;9HmeygV<wLFvL$nZ>Bp>!*4@|V%-ce*oqS4L<4oQkp
z*O9s4LJt@8G)-<;%dxbCC`)$Is4=olWHT(83^tS)g|`h^P4Ee^CiQr>!t)795DCe!
ztjL0plQU9Y&*Wq^naE|6x$$HVTkt|`cqZ)mc8KpTR@xS;Wdmqn6jTtZ_o`rW4q+6|
zA)m@-J6WfOrX9~hjqqfYrj1wYFmNtHD<2@2>gcRFTg0GPs$3hkZKh_K24g8QBqEp+
z!`n(y5Cv!|ia>Yq*8l3qk)XJ!SpF%V-Vv$DXt~)6WV6{!&?6lbkXD)6UEN38tX0r6
zmFC+oZ!+;VzgK^qPpzK*_Vn|^CHB<K_qS$l9~${>9a(-+zj5#WhZuOj4t{-HmYyny
zAOHM1@Zj?Lvy}twJCgtM%UUTO8%p%O`vI<iPqBFHRo|f<E4znwj_se^(>}g(0HnuG
jfbRz{t;GOXm1o*9unQeCUtK%*Bx?3TuB6``Kfm+`KU!hl

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_play_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaaad5723097d0a8ded65b8b6766bde1e7e6de65
GIT binary patch
literal 1616
zcmbVMc~BE)6i>v77LB!|4stlG>$E~K*<8C}R{|#40O<e?5GxgH-Ry2cgzT=HRRTJQ
z;(>N5PA5{UQR$)W2(@0dhgT_%(iWYmQaQ9paOyFm7OPXSqtkvtV*7{VAKjV#uKoSq
zd*AQ9w;LP<Im+0CSeZ<wwC9pVV9t%aV-;YWd;3rhnBpZ{iB!zHrAkU<WoCwVv5?(I
zdDtSBVyc$>z-Gu~G0VKp5~(CVkDz&<nu=i50iOWaGFe7eK%nSyR)Sot$IF@E-;bVz
zAunTs=b`zUe8I|=d2_2pwz#^$NmrNCI0I*8LKy)981S(Y1qFN+oSz7o;9<K2SVxW#
z7#fC1<tF$^P$l^e$jXZ>gsL$Wt<f4FBd*q>m=QP5f^=YyXwng#My0_CR8MGh(8vP=
zZzAI+ipcB{Utni~%Opu45TvrQQeCN6^P&gQ;y8|Ibcjx;0tl7Aij$~-iu2EiS|C|J
zEqVpX%X3h~BIV+jN+uXY`s4~eAwU1AVa`7y6p#!FPy(V=YY?9=a<5^uUn*k%4da<;
zzq3kUks{X5FBNH!5BH2H8EE%>M-d>1hIn1{f}~ItBu_8(v7BTlO)&VPX1ol6=?r?e
zk#eaFZXg@Q7{K6W^(s{3rVKcy!E`Qt)XuZ`*;W$Q;kNX21FF|*Z3eT&V$3#LP%~-O
zYOFRa%C&QTiQ;HB>e~x^k8q98<q}qrr6gW-@_a?K3LIs;#QV#50kT?$vks-q^KuMd
z=}(QM>B+50R`f1onQW2wLBl!|-e<&sGPuE&?sltO3{9yR)W8A}XuV3~MvYpXmZect
z3y<)b|EnJYf<hw2@}J^~9)XICET6Ul*gS0}mIECmf>y~XJsTsFjS}pn*%|1)6`Gx!
zWKKGLom?|Hwc<TX-j-MHj;(*UsTFQ0DlLvb_0{UNuMuAcgD<37zs+dLD`*a3nG?y$
zhMj8{ei+yOW=cuQ#=yhI4_wE$_Y816?|E1=m^OE4Xc>1cYx!yMn-JvQJ5?Uznlrv$
zu7wn*YNt91J6Z_^vnS?GYwKr6v~LU)wmoi3+aGu5khyw(7z?dID;!ka<y(8P&%w!n
zFr}vUK@Y@l>Yun^QQiHF)%OO|R(x06acos;_iu*x8@3uxhGlsGxv+Iwx}q5%F{+{0
zdcd5ptzQvZ^`IN#CoIZZ-~!Zj_M!NT2hDwt>OK}4<yH5_O=ugRtTo*pY#{bI519K}
z_NJOQD$ielNA1LWE<(n0bk~@!Zpfq*;%g?eA-v}@WIVI@rCpx7`<-p0A1RV`kbZ|{
zq4oHb%(J17{;0oM;(RBtO?m#FrTx;DC57L2r2eQBuO`(j?{2cF!?UNKIch7M78V*i
z6Qp+ZhT5|~@x&}Nl!Dz@zghoD%iAY4ugclZ0-|-t{kORA%%Q_c;qE@jbLR3-7gkK~
z5)!b+*-43shxg1s6xW%2c(?hwFgo)^T~cX6(6P&L?3eZ#&8OpTZ;74RBFD${BZC`y
zhvo+Nn_S1X8-<uFZ5}Fi<}78eGx^t2YQfmFo~Ci>^6hO21urKCo#o0ag&kL&?TPEV
zur-sUx)bB@X8gd-ib>?06&Lzy_03D}oV|KvUGX`^-AkE@ef`1BU;H^gdD9i;fN_E{
z)NK1&wKzQVbJH%%iB*5iBZE`_Ub%VNr&W<;PmF;<;vb${DObp@P1>Ea_3^>w;1@5m
M+X~2imPM=o0ky7HRsaA1

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_play_light.png b/OsmAnd/res/drawable-xxhdpi/ic_play_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ed91cf3ad2bfa25721369a3e8fd96cfd14b9e4a
GIT binary patch
literal 1685
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy
z7U!21B?IFlO&O*c7<TwA0x1N##>&4a6BsFpIWGChrManjC7v#}N<bOCl*|+>Gb0n@
zH1otHU6V9muqCFL0Ex6zV_j2&v_un2GXpcDBx9I4*z~(OI~to98@X7Rm>L@zx|%pT
zIhnheJDEDVI2#%`yPCoDdgc|EB<3Zj!tBlj+6~p~j90Ifb5UwyNq$jCetr%t6$E7D
zm*f{`<QFJ7JA-3gK_fgfFD1XcSQ8XY5MR5b7G;*DrnnX5=PH21*(wu@8%$FyO_D6q
z(sYwjk`r}POifaOfskyhYmjDYZfInfnrv!ns07uYLT>o!10AIgN-Ri;2POneksu~K
zD*!q0%#@l3%t1xKtg>p2?j{BXrmdbXjv*Dd-psN02o01uUazm>>2YGA)D}l66V<M1
zFZi35dM8F-3E}vwFB5k$Y^Uo_vBepkbGB@Ia#O(bg1w+qw^8njwhaf_nA;b1#N9t^
zdAhk=?EcR0^NN4fJ#3zQ{kz?tdwZYPysv%cwRDofw>1lxxE3iu(J%kt;IsPAKmTO^
zQOH*F^>42jSF4ZO3x*l2%ai81iRZ79yTjz~$jy3lGxr|G=?A>HR?UgJz`yK38P}%e
zvU^yX6HHle_Sf>AX{Z%RInQRm)^;$8YtwUs8O-hueN9@+8F?Dr7tCyW^OEWPm83nl
zuGXBX-e_gOpmtD<Yg4*(1?#$|P?41TCh;u!j_N==1bdpT6L?ue`=Xe>%$oK<0VpJQ
zhkfyai9iz=-yeLb6PK@{I{nq0yr%R8Q=8u0)YL5ZQ@pmstLN36We53yPU5v;H&;1$
zPV>v6*uDQYKU3K^zv)dTldA#KwZI9s?Pr)iudsMECuz_0rB=&#KiFvTVouV&uY24}
z<m=*A0onV_*T0(l`hgj1=sEw3rl(Fmm0O^eWa)pP@I&YG1)plfW2e7a8|K#|yyVqH
zyA2OsHEiUVB_7)@vU8H&`S^>bCzh!^X|Z$6I$FcyQ(zuH@BRa>8?&~|5m3)K<a0J>
zR;eRLq)=@38^2&b4dD=z@D)FG{_Qv~yd~jP_q;VverT;odDRuR`NL_GeYHpInuOEj
zpSsq}Twwn|>c*SNGVy8|r($-+|E^FvQ`A(~z`bbx@^3+Y(}Yd(&Y8}yjZa=;>)5^M
zy+uj8g8Ey|UFy45{}j7)PmR|x{*2d;#Ez+sljIGrUS09~+1rJuJd2vr&Md7CV(Nd*
z`HNMryKaklh2=W+7p*gA@e2jU_*|G|$yt6x?f6lamFfY_KdyZ)n*8`bKUcE3zoUqY
jqsWl}0anZN_Ka){rH=~Qy_Kg;1XUECu6{1-oD!M<Q~G_~

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_audio.png b/OsmAnd/res/drawable-xxhdpi/ic_type_audio.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9bb8a95ab08fdad9d448fec1e595d8f0d0a298f
GIT binary patch
literal 1475
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n9DLlB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU&_u!9QqR!T
z%-qskN5Kfl*Eg`xH!{#Qu(UEYwlXkMfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDm<cYa#mPmP1tppJc?uvC6O-~w
zOKg>ZE`@j@x4_pIZg5^PG@yV%reBd*pl_&Wpr4xy@)uZjaY;}r!Wmdq7l%|9r0NHy
z7U!21B?IFlO&O*c7<TwA0x1N##>&4a6BsFpIWGChrManjC7v#}N<bOCl*|+>Gb0n@
zH1otHU6V9muqCFL0Ex6zV_j2&v_un2GXpcDBx9I4*z~(OyI2}ox|&#+m>L@zx|%pT
zIhnheJDEDVI2#%`yPCoDdgc|EB<3Zj!tBlj+6~ofj90Ifb5UwyNq$jCetr%t6$E7D
zm*f{`<QFJ7JA-3gK_fgfFD1XcSQ8XY5MR5b7G;*DrnnX5=PH21*(wu@8%$FyO_D6q
z(sYwjk`r}POifaOfskyhYmjDYZfInfnrv!ns07uYLT>o!10AIgN-Ri;2POneksu~K
zD*!q0%#@l3%t1xKtRnN`unGeM<6}=3$B>F!Z|2zgA99d67M=9!(Xz}%eQVTK2*mGe
z%3sXY+1zdQDNv@=EUNsgwuOXA){MI`7X;ZP*POpuFV58QHRsmu=bm+(y5*kluiyK+
zZpn^B39B;?L{>C3X>>r5&e<CtOZ)Ern9SbiAbO^;bIz8{yt5P-)EE5TyIn3zNF-G(
zrunB#9LFn{bsWDFnD@MTlN8tY^o!fphipBsMM^R{=2)l}EC>!bd*I{tWx*E~H8zQr
z^gAwdeJydMQ_0y;#Km!DZ1+;}@8YS>agJ}2M2;A~m@oW^D@lB@0@osiHiSd|&GA?N
zRa?XT!|%(V<I~?B_;&Oa_YJo1w!iNmn3}LwK{Z`;%Z;PI%2&^|IpyhnK{cabg4`VA
zdq>-rJ31czJa5Ci^zH>KTfVC03Wj(_tWW7)uy@Mqr+ydmnpUq+`npCSWWvq~_DPlT
zr^IsvmjtnFU+~9y=cXyzw|2}5@7>2No*;bY#M+vuZRel<K6Ape+Ejl2gjEMR7jZ5G
zI&y&z$1ABD-?sTV^0RSey%G_T(9pP``9j1-QssH%ttGw}*dy5c*-iwiSNYyr@>Ory
zy^k?$rRr5Zw@yx+(kHXo>YHl%k?*0QG5>7&o`b>zijI6aJ)MD>Vdhom%1Q2-eV}61
M)78&qol`;+0LOqEEC2ui

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_img.png b/OsmAnd/res/drawable-xxhdpi/ic_type_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..86755a97559106b93badeddc8a93b60c4988a351
GIT binary patch
literal 1632
zcmbVMc~BE)6ki}7fKaV=Du=^P90ZSKH#gZPCLtRjY7jykBCV~P>@LYbvT?JJfQT8X
z*0$PIkZHkVusBumXgz5yHeNF=T6BhK&8Y2QYISVKV=Pjcik*Hzg8jqskM4Z?9dCc{
z_<rxbeZQo*FeNEH34)*$V-ao!Yf<!_JQ2*x?j0=zOB!dea%Bw7`3RPRbR=V=V55tu
zq|6jS)~)KLR1lO<>$F%ot7!>lXIw%eiV^x<9-s|DDvjSm*sCZGwo#Q%x0?Upn-Cv%
zl4^dr%!HaeddlG}s%NRP`eKW{zRIp7`I?2W%8vm9E{Y>yzpL8q#r$gis9g-~qhf>)
zk3zUAHUC*qR#OSAXIKiB3FQJiDw4tqrBEc3E0l@_uo#>XG!GG@0#u2~Bp51&#~wcL
z#*#E<#tX)Lfs>l=;5ZM4AU>Z@=#vN;wh|F3l}ZE^BVw@tAOzkzH%IsdZtv`v1)TEQ
zS*M3{GHy6(k+3l}oSF|JeRc(x$7C8e?Dmck1t>%Oga;7`QN-nn-fI-?<;>LcFkXoE
zTIxI$Vy3)I4QmJapl8RF0e3HV6a|84u%)aMB!#HP8GDV3a&typ%?DqEq?5$tVyT2y
z5H^972DA~R6ihTF5y()QkSgV<Tx^rX?7T?7K(CWXC1PcsR3;IL3{qWwzM?>pFVo?A
z5vn)HW4cDSmm}PED(2e>e2?koy;K*|vlPKGtc78!V^vV%U^vF>U_7v1Kbmzox7_I_
z8J~A<G)>QLjZ>_%mLdyS#s!b^j5%KrgN#&4ZFw{;u#t8`K+2>PAi*vXptMXO5{oFi
zOeW%w>68DLKLiAYM2qD=#S;^Oii~c@TLB!#n~8FR4q`#8)HQBZLr{Fci0dr=Yj?Ms
z7H5>sT)%l^-0z4dyhhRc*>Kh(#Zc$Ull#^S@iVQ<%hv{k$E~}P_nqLD?Yi2XT)Jt6
zg9{7uxy}qth31amy(U4t!#Jnq@rK?$r3YSeoBng**WUZvg2oGjJ;Hf!{eo+?JbY}-
z>e^Yfx^GWccYP%6Np0k594*-88!P-18k667dL6qpH|}JaW@N&p6A>ImehUm|kIXpa
z*lBb6Pnjaat*sUP?SUVht*de?#O9Xtj?zhkKFjoyD>`kONqZ_a-rNVvKbR3WZR+?i
zJa^5*fxPBbcyQ?9)CQgQOnQ^%+)du2(Cr&b*(awy4d4Tj9%fscA^Q{P-uX-)FL*lq
z?Y%kgZFqA_;X%j}$U2vmk?EW5N!8y+j`M@n34c!reQfJ{z@A8-`9{jx{YQgCsw0Va
zf(tHw_qh1ON{{lab^7;%(}H$cusXgy(7opRl<jA*tE-^Uy3V(88<56TY#3PobN5{J
z=GXhDv@fr{cH`lJTU%1JhBo!_V-qjGD{Xor3RYzYkHzgMx<B&Kmk%-qF4Tt7Hq9SW
z{ZZO*Aaum`bkkR%ocY)FiH~~DdiUPmvRv?_S>8lPz7Qpe+Xht~0Q-}wKi)FAcWdsv
zuw&xQMS`FdYNOGdJ=W&k&4qpOUGk=!#D<pr{aLc)+`VZ_n%ggR(&dM<4<G%tvY+>3
zy0$#^N@G{z-aBxI+N90O<Q?lubWHmvGBva8;<`B<i-(QnBd-j!?4GsnmU;DSlCZzM
zYGF<!Ww>W^$M%cfom<oAl}`G6_;KFdrpX%vv60k&5K4er&o`V7`~G60|9qpN7(bN1
Ga^1fuu2c;G

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_type_video.png b/OsmAnd/res/drawable-xxhdpi/ic_type_video.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aa8abcebba3f8f84d7100af28007a9e52366d6b
GIT binary patch
literal 1166
zcmbVMOK8+U7*2K3wpgq$ih3DR55BT_Y_i+LuI+BJwF}+4Y*$(Z#cVR^hBld)Ox?$+
z=%LhuR6XfI6tB`tFG4{<5K+{F2;u_-1;IC-y*SzKRu9F4fz13f^L_vS&;OYD{OFOc
z&Rv}pMRjF|wE~%k!@qq48IOHiIzpzMI5UCAkcBI{52=)iN)TineG(R+Zr08`g8dY=
z{;XY`z!SL<#XwF}4>8fI;}JGR^$%1%-I#(Hl;EW8Cg~r`_h?|7NqSt$aXC+gWqY{p
z!?F5k(Wp-uvPlmd2K`lqC~zRwLDiXd1Erdz8+sKYhubU-8W22{q*t7p$mM~Gd<djy
zoH00F1PM9HOYwx9I0yu?X1P9A;22I;q?p19p!w0nnr~W4K^tn?BC8}_#@JI>wo<7?
zE3qi@Cs|&WWtJ0IL0|}i32H9ZtBf1;wlrukFnrs?HgZ9zQ7@qxoTQ1TD_3y5Ty9md
z8#Dt&LdI5gkL9Br>p0=P8t4EQ;2$^EL<hy12iXD)(2Q@8d|16LGKt;44TV7BjdIkt
zNmBG_4H+{Iba7To(&Qv++NKg0#F&-PON?ldu<52q1`Ea*iL-Q3j&pIL6l>{Oi$A1l
zvLI*FK2eJCd`3*A(}|%(T1sgu&#9Ssi<@-=th)wm*|v%8CO7?0uA=%-$H*@tG~KF#
zd>LUBl#vHiwUKqOcieVOR0;NlX<E6p27UW1G>3fTfJU4Zdkr5XQx;2omc^7zLuX7$
zgd_+?jNvRP!3#VzB#Eb+eDi<f#}cR5uvq>op4Jwr$WUBu1+rLeCg_q5@=2>?_q_i_
z+H5harHa+pU*D!WXSq$0!QR7nj{bc3Y2%ZdbNes9x&`hp<X@h@ban29yoFj9Y3~Mu
zv)4YJxclMa=cmGjFU#+=m)8#oBMUp$N80mm#%@0wf0uh6InEExQu2dS-?f3-Vn>5^
za-?UeG#lv#D+1NF_2iRC8#!7S8|m3b;BC(zVE({{_64dbbl<Q#?mgsF<fx&c_IUeg
XYIAz`mHOPg9KI0Q%&4}QK7H;t(hG3o

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/layout-large-land/dashboard.xml b/OsmAnd/res/layout-large-land/dashboard.xml
index da8dd7965d..569f52b4c6 100644
--- a/OsmAnd/res/layout-large-land/dashboard.xml
+++ b/OsmAnd/res/layout-large-land/dashboard.xml
@@ -63,6 +63,12 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"/>
 
+				<fragment
+						xmlns:android="http://schemas.android.com/apk/res/android"
+						android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"/>
+
 				<fragment
 						xmlns:android="http://schemas.android.com/apk/res/android"
 						android:name="net.osmand.plus.dashboard.DashPluginsFragment"
diff --git a/OsmAnd/res/layout/dash_audio_video_notes_plugin.xml b/OsmAnd/res/layout/dash_audio_video_notes_plugin.xml
new file mode 100644
index 0000000000..dd9f77aa07
--- /dev/null
+++ b/OsmAnd/res/layout/dash_audio_video_notes_plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/main_notes"
+			  android:background="@drawable/bg_cardui"
+			  android:layout_marginBottom="4dp"
+			  android:layout_width="fill_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical">
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="fill_parent"
+				  android:layout_height="40dp">
+		<TextView android:id="@+id/notes_text"
+				  android:text="@string/map_widget_av_notes"
+				  style="@style/DashboardSubHeader"/>
+		<Button android:id="@+id/show_all"
+				android:text="@string/show_all"
+				style="@style/DashboardGeneralButton"/>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/notes"
+				  android:orientation="vertical"
+				  android:layout_width="fill_parent"
+				  android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dash_note_item.xml b/OsmAnd/res/layout/dash_note_item.xml
new file mode 100644
index 0000000000..c64070d8a5
--- /dev/null
+++ b/OsmAnd/res/layout/dash_note_item.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:orientation="vertical"
+			  android:layout_width="match_parent"
+			  android:background="@drawable/dashboard_button"
+			  android:layout_height="50dp">
+	<View android:layout_width="match_parent"
+		  android:background="@color/dashboard_divider"
+		  android:layout_height="1dp"/>
+	<LinearLayout android:orientation="horizontal"
+				  android:layout_width="match_parent"
+				  android:layout_height="match_parent">
+		<ImageView android:id="@+id/icon"
+				   android:layout_gravity="center_vertical"
+				   android:layout_marginLeft="12dp"
+				   android:layout_marginRight="12dp"
+				   android:layout_width="28dp"
+				   android:layout_height="28dp"/>
+
+		<LinearLayout android:orientation="vertical"
+					  android:layout_weight="1"
+					  android:layout_gravity="center_vertical"
+					  android:layout_width="0dp"
+					  android:layout_height="wrap_content">
+			<TextView android:id="@+id/name"
+					  android:textSize="16sp"
+					  android:lines="1"
+					  android:ellipsize="end"
+					  android:textColor="@color/dashboard_black"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+
+			<TextView android:id="@+id/descr"
+					  android:textSize="12sp"
+					  android:lines="1"
+					  android:ellipsize="end"
+					  android:layout_width="wrap_content"
+					  android:layout_height="wrap_content"/>
+
+		</LinearLayout>
+
+		<ImageButton android:id="@+id/play"
+					 android:src="@drawable/ic_play_light"
+					 android:background="@drawable/dashboard_button"
+					 android:layout_marginLeft="12dp"
+					 android:layout_width="50dp"
+					 android:layout_height="50dp"/>
+	</LinearLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/dashboard.xml b/OsmAnd/res/layout/dashboard.xml
index 658fd6887b..f4509efc7c 100644
--- a/OsmAnd/res/layout/dashboard.xml
+++ b/OsmAnd/res/layout/dashboard.xml
@@ -37,6 +37,12 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"/>
 
+			<fragment
+					xmlns:android="http://schemas.android.com/apk/res/android"
+					android:name="net.osmand.plus.dashboard.DashAudioVideoNotesFragment"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"/>
+
 			<fragment
 					xmlns:android="http://schemas.android.com/apk/res/android"
 					android:name="net.osmand.plus.dashboard.DashUpdatesFragment"
diff --git a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
index 87e2557f27..d5068d47f9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MainMenuActivity.java
@@ -16,13 +16,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.base.BasicProgressAsyncTask;
-import net.osmand.plus.dashboard.DashDownloadMapsFragment;
-import net.osmand.plus.dashboard.DashErrorFragment;
-import net.osmand.plus.dashboard.DashFavoritesFragment;
-import net.osmand.plus.dashboard.DashMapFragment;
-import net.osmand.plus.dashboard.DashPluginsFragment;
-import net.osmand.plus.dashboard.DashSearchFragment;
-import net.osmand.plus.dashboard.DashUpdatesFragment;
+import net.osmand.plus.dashboard.*;
 import net.osmand.plus.download.BaseDownloadActivity;
 import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.IndexItem;
@@ -447,6 +441,9 @@ public class MainMenuActivity extends BaseDownloadActivity {
 					((DashDownloadMapsFragment) f).refreshData();
 				}
 			}
+			if(f instanceof DashAudioVideoNotesFragment && !f.isDetached()){
+				((DashAudioVideoNotesFragment) f).setupNotes();
+			}
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
new file mode 100644
index 0000000000..13ff06e434
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
@@ -0,0 +1,109 @@
+package net.osmand.plus.dashboard;
+
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.R;
+import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
+import net.osmand.plus.helpers.FontCache;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Denis on 15.12.2014.
+ */
+public class DashAudioVideoNotesFragment extends DashBaseFragment {
+	AudioVideoNotesPlugin plugin;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+		plugin = OsmandPlugin.getEnabledPlugin(AudioVideoNotesPlugin.class);
+		if (plugin == null) {
+			return super.onCreateView(inflater, container, savedInstanceState);
+		}
+
+		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_audio_video_notes_plugin, container, false);
+		Typeface typeface = FontCache.getRobotoMedium(getActivity());
+		((TextView) view.findViewById(R.id.notes_text)).setTypeface(typeface);
+		((Button) view.findViewById(R.id.show_all)).setTypeface(typeface);
+
+		(view.findViewById(R.id.show_all)).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+
+			}
+		});
+
+		return view;
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		setupNotes();
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+	}
+
+	public void setupNotes() {
+		View mainView = getView();
+
+		List<AudioVideoNotesPlugin.Recording> notes = new ArrayList<AudioVideoNotesPlugin.Recording>(plugin.getAllRecordings());
+		if (notes.size() == 0){
+			(mainView.findViewById(R.id.main_notes)).setVisibility(View.GONE);
+			return;
+		} else {
+			(mainView.findViewById(R.id.main_notes)).setVisibility(View.VISIBLE);
+		}
+
+		LinearLayout notesLayout = (LinearLayout) mainView.findViewById(R.id.notes);
+		notesLayout.removeAllViews();
+		if (notes.size() > 3){
+			while (notes.size() != 3){
+				notes.remove(3);
+			}
+		}
+
+		for (final AudioVideoNotesPlugin.Recording recording : notes){
+			LayoutInflater inflater = getActivity().getLayoutInflater();
+			View view = inflater.inflate(R.layout.dash_note_item, null, false);
+			((TextView) view.findViewById(R.id.name)).setText(recording.name);
+			((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
+			ImageView icon = (ImageView) view.findViewById(R.id.icon);
+			if (recording.isAudio()){
+				icon.setImageResource(R.drawable.ic_type_audio);
+			} else if (recording.isVideo()){
+				icon.setImageResource(R.drawable.ic_type_video);
+			} else {
+				icon.setImageResource(R.drawable.ic_type_img);
+			}
+			view.findViewById(R.id.play).setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					plugin.playRecording(getActivity(), recording);
+				}
+			});
+			int height = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50, getResources().getDisplayMetrics());
+
+			LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height);
+			view.setLayoutParams(lp);
+			notesLayout.addView(view);
+
+		}
+	}
+
+}
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
index 2c1c730b24..ae9069151a 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashFavoritesFragment.java
@@ -59,8 +59,6 @@ public class DashFavoritesFragment extends DashBaseFragment implements OsmAndLoc
 			}
 		});
 
-
-
 		return view;
 	}
 

From 15824993f56e59b9e0e0e27b878cdbb83498691e Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Mon, 15 Dec 2014 17:18:44 +0200
Subject: [PATCH 3/7] If record doesnt have name - description will be put
 instead

---
 .../plus/dashboard/DashAudioVideoNotesFragment.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
index 13ff06e434..fdcb936d27 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashAudioVideoNotesFragment.java
@@ -81,8 +81,14 @@ public class DashAudioVideoNotesFragment extends DashBaseFragment {
 		for (final AudioVideoNotesPlugin.Recording recording : notes){
 			LayoutInflater inflater = getActivity().getLayoutInflater();
 			View view = inflater.inflate(R.layout.dash_note_item, null, false);
-			((TextView) view.findViewById(R.id.name)).setText(recording.name);
-			((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
+
+			if (recording.name != null){
+				((TextView) view.findViewById(R.id.name)).setText(recording.name);
+				((TextView) view.findViewById(R.id.descr)).setText(recording.getDescription(getActivity()));
+			} else {
+				((TextView) view.findViewById(R.id.name)).setText(recording.getDescription(getActivity()));
+			}
+
 			ImageView icon = (ImageView) view.findViewById(R.id.icon);
 			if (recording.isAudio()){
 				icon.setImageResource(R.drawable.ic_type_audio);

From 8de3d98e50a01f30d551e191c0c2cf5e69ab86b5 Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Mon, 15 Dec 2014 16:48:56 +0100
Subject: [PATCH 4/7] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1594 of 1594 strings)
---
 OsmAnd/res/values-be/strings.xml | 64 ++++++++++++++++----------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 57667fac45..42e3436e24 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1229,7 +1229,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="update_poi_error_loading">Памылка пры загрузцы дадзеных з сервера</string>
 	<string name="update_poi_no_offline_poi_index">Для гэтай мясцовасці адсутнічаюць лакальныя дадзеныя аб POI</string>
 	<string name="update_poi_is_not_available_for_zoom">Абнаўленьне POI не даступна для малых узроўняў маштабаваньня</string>
-	<string name="context_menu_item_update_poi">Абнаўленне POI</string>
+	<string name="context_menu_item_update_poi">Абнаўленьне POI</string>
 	<string name="context_menu_item_update_map_confirm">Абнавіць лакальныя дадзеныя праз Інтэрнэт?</string>
 	<string name="search_history_city">Горад: {0}</string>
 	<string name="search_history_street">Вуліца: {0}, {1}</string>
@@ -1248,15 +1248,15 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_offline_address">Пазасеціўны пошук</string>
 	<string name="search_online_address">Сеціўны пошук</string>
 	<string name="max_level_download_tile">Максімальнае павелічэньне онлайн мапаў</string>
-	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэння для загрузкі онлайн растравых мапаў</string>
-	<string name="route_general_information">Агульная адлегласць %1$s, час у дарозе %2$d г. %3$d хв.</string>
+	<string name="max_level_download_tile_descr">Выберыце максімальны ўзровень павелічэньня для загрузкі онлайн растравых мапаў</string>
+	<string name="route_general_information">Агульная адлегласьць %1$s, час у дарозе %2$d г. %3$d хв.</string>
 	<string name="router_service_descr">Абраць сеціўны ці пазасеціўны сэрвіс навігацыі</string>
 	<string name="router_service">Сэрвіс навігацыі</string>
 	<string name="sd_dir_not_accessible">Каталёг на SD-карце недаступны для захоўваньня!</string>
 	<string name="download_question">Download {0} - {1} ?</string>
-	<string name="download_question_exist">Лакальная карта для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})?</string>
+	<string name="download_question_exist">Лакальная мапа для {0} ужо існуе ({1}). Хочаце яе абнавіць ({2})?</string>
 	<string name="address">Адрас</string>
-	<string name="download_index_success">Загрузка паспяховая</string>
+	<string name="download_index_success">Загрузка пасьпяховая</string>
 	<string name="error_io_error">Адбылася памылка ўводу/вываду</string>
 	<string name="downloading_file_new">Ладаваньне…</string>
 	<string name="downloading">Ладаваньне…</string>
@@ -1285,9 +1285,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="loading_cities">Загружаюцца гарады…</string>
 	
 	<string name="poi">POI</string>
-	<string name="error_occurred_saving_gpx">Памылка пры захаванні GPX</string>
+	<string name="error_occurred_saving_gpx">Памылка пры захаваньні GPX</string>
 	<string name="error_calculating_route">Памылка разьліку маршруту</string>
-	<string name="error_calculating_route_occured">Памылка пры разбліку маршруту</string>
+	<string name="error_calculating_route_occured">Памылка падчас разьліку маршруту</string>
 	<string name="empty_route_calculated">Памылка: Разлічаны маршрут пусты</string>					
 	<string name="new_route_calculated_dist">Новы шлях разьлічаны, адлегласьць</string>
 	<string name="arrived_at_destination">Вы прыбылі ў пункт прызначэньня</string>
@@ -1299,16 +1299,16 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="previous_run_crashed">Папярэдні старт OsmAnd скончыўся аварыйна. Хроніка запісаная ў файл {0}. Калі ласка, паведаміце пра праблему й прычапіце файл хронікі.</string>
 	<string name="saving_gpx_tracks">Захаваньне GPX-сьлядоў на SD…</string>
 	<string name="finished_task">Скончана</string>
-	<string name="reload_indexes_descr">Перачытаць лакальныя вектарныя карты з SD</string>
+	<string name="reload_indexes_descr">Перачытаць лакальныя вектарныя мапы з SD</string>
 	<string name="reload_indexes">Перачытаць лакальныя дадзеныя</string>
-	<string name="download_indexes_descr">Загрузіць або абнавіць карты для лакальнага выкарыстання з Інтэрнэту</string>
+	<string name="download_indexes_descr">Загрузіць або абнавіць мапы для лакальнага выкарыстаньня з Інтэрнэту</string>
 	<string name="download_indexes">Зладаваць пазасеткавыя зьвесткі</string>
-	<string name="use_online_routing_descr">Выкарыстоўваць Інтэрнэт для разліку маршруту</string>
+	<string name="use_online_routing_descr">Выкарыстоўваць Інтэрнэт для разьліку маршруту</string>
 	<string name="use_online_routing">Выкарыстоўваць онлайн навігацыю</string>
 	<string name="osm_settings_descr">Лагін і пароль для Openstreetmap.org (OSM)</string>
 	<string name="data_settings_descr">Выбар мовы, абнаўленьне дадзеных</string>
-	<string name="data_settings">Data</string>
-	<string name="map_preferences_descr">Настройка крыніцы і параметраў карты, каардынат маркера, арыентацыі экрана</string>
+	<string name="data_settings">Зьвесткі</string>
+	<string name="map_preferences_descr">Настройка крыніцы і параметраў мапы, каардынат маркера, арыентацыі экрана</string>
 	<string name="osm_settings">Рэдагаваньне OSM</string>
 	<string name="additional_settings">Дадатковыя налады</string>
 	<string name="settings">Налады</string>
@@ -1320,7 +1320,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="save_track_to_gpx">Запісваць сьлед у GPX файл</string>
 	<string name="update_tile">Абнавіць мапу</string>
 	<string name="reload_tile">Абнавіць частку мапы</string>
-	<string name="mark_point">Мэта</string>
+	<string name="mark_point">Цэль</string>
 	<string name="show_osm_bugs_descr">Адлюстроўваць OpenStreetBugs на мапе</string>
 	<string name="show_osm_bugs">Паказаць OpenStreetBugs</string>
 	<string name="favourites_activity">Упадабаныя</string>
@@ -1355,7 +1355,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_button">Пошук</string>
 	<string name="search_activity">Пошук</string>
 	<string name="searchpoi_activity">Абраць цікавостку</string>
-	<string name="search_POI_level_btn">Знайсьці больш</string>
+	<string name="search_POI_level_btn">Знайсьці яшчэ</string>
 	<string name="incremental_search_street">Шукаць вуліцу</string>
 	<string name="incremental_search_building">Шукаць дом</string>
 	<string name="choose_available_region">Выбраць рэгіён са сьпісу</string>
@@ -1379,11 +1379,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="search_address_city">Горад</string>
 	<string name="search_address_street">Вуліца</string>
 	<string name="search_address_building">Будынак</string>
-	<string name="search_address_building_option">Будынак</string>
-	<string name="search_address_street_option">Скрыжаваньне вуліц</string>
+	<string name="search_address_building_option">Дом</string>
+	<string name="search_address_street_option">Перакрыжаваньне</string>
 	<string name="search_tabs_location">Месца</string>
 	<string name="context_menu_item_add_favorite">Дадаць да ўпадабаных</string>
-	<string name="context_menu_item_update_map">Абнавіць карту</string>
+	<string name="context_menu_item_update_map">Абнавіць мапу</string>
 	<string name="context_menu_item_open_bug">Паведаміць пра памылку на мапе</string>
 	<string name="context_menu_item_create_poi">Стварыць цікавостку</string>
 	<string name="default_buttons_yes">Так</string>
@@ -1398,21 +1398,21 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="favourites_context_menu_delete">Выдаліць упадабанае</string>
 	<string name="favourites_remove_dialog_msg">Вы сапраўды хочаце выдаліць кропку \'%s\' з закладак?</string>
 	<string name="favourites_remove_dialog_success">Кропка {0} была паспяхова выдаленая з закладак.</string>
-	<string name="osb_add_dialog_title">Калі ласка, увядзіце тэкст памылкі</string>
-	<string name="osb_add_dialog_success">Памылка паспяхова створана</string>
+	<string name="osb_add_dialog_title">Увядзіце тэкст памылкі</string>
+	<string name="osb_add_dialog_success">Памылка пасьпяхова створана</string>
 	<string name="osb_add_dialog_error">Выключная сітуацыя: заўвага не была створана</string>
 	<string name="osb_author_dialog_password">OSM пароль (неабавязковы)</string>
 	<string name="osb_comment_menu_item">Дадаць камэнтар</string>
 	<string name="osb_comment_dialog_message">Паведамленьне</string>
 	<string name="osb_comment_dialog_author">Імя аўтара</string>
-	<string name="osb_comment_dialog_title">Даданне каментара да памылкі</string>
+	<string name="osb_comment_dialog_title">Даданьне каментара да памылкі</string>
 	<string name="osb_comment_dialog_add_button">Дадаць камэнтар</string>
-	<string name="osb_comment_dialog_success">Гэты каментар быў паспяхова дададзены</string>
+	<string name="osb_comment_dialog_success">Гэты каментар быў пасьпяхова дададзены</string>
 	<string name="osb_comment_dialog_error">Выключная сітуацыя: каментар не быў дададзены</string>
 	<string name="osb_close_menu_item">Зачыніць памылку</string>
-	<string name="osb_close_dialog_title">Закрыццё памылкі</string>
+	<string name="osb_close_dialog_title">Закрыцьцё памылкі</string>
 	<string name="osb_close_dialog_close_button">Зачыніць памылку</string>
-	<string name="osb_close_dialog_success">Памылка была паспяхова зачынена</string>
+	<string name="osb_close_dialog_success">Памылка была пасьпяхова зачынена</string>
 	<string name="osb_close_dialog_error">Выключная сітуацыя: памылка не была зачынена</string>
 	<string name="poi_edit_title">Рэдагаваць цікавостку</string>
 	<string name="poi_create_title">Стварыць цікавостку</string>
@@ -1423,17 +1423,17 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="poi_remove_success">Цікавостка выдаленая</string>
 	<string name="poi_action_add">дадаць</string>
 	<string name="poi_action_change">зьмяніць</string>
-	<string name="poi_action_succeded_template">Дзеянне {0} паспяхова завершана.</string>
+	<string name="poi_action_succeded_template">Дзеянне {0} пасьпяхова завершана.</string>
 	<string name="poi_error_unexpected_template">Нечаканая памылка пры выкананьні дзеяньня {0}.</string>
 	<string name="poi_error_io_error_template">Адбылася памылка ўводу/вываду пры выкананьні дзеяньня {0}.</string>
 	<string name="poi_error_info_not_loaded">Адбылася памылка пры загрузцы інфармацыі аб POI</string>
 	<string name="poi_dialog_name">Назва</string>
-	<string name="poi_dialog_opening_hours">Open</string>
+	<string name="poi_dialog_opening_hours">Гадзіны працы</string>
 	<string name="poi_dialog_comment">Каментар</string>
 	<string name="poi_dialog_comment_default">Зьмена POI</string>
 	<string name="poi_dialog_other_tags_message">Усе астатнія тэгі захоўваюцца</string>
-	<string name="default_buttons_commit">Commit</string>
-	<string name="default_buttons_reset">Reset</string>
+	<string name="default_buttons_commit">Зьберагчы</string>
+	<string name="default_buttons_reset">Скінуць</string>
 	<string name="filter_current_poiButton">Фільтраваць</string>
 	<string name="edit_filter_delete_menu_item">Выдаліць</string>
 	<string name="edit_filter_save_as_menu_item">Захаваць як</string>
@@ -1441,14 +1441,14 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="edit_filter_delete_message">Фільтр {0} быў выдалены</string>
 	<string name="edit_filter_create_message">Фільтр {0} быў створаны</string>
 	<string name="default_buttons_selectall">Вылучыць усе</string>
-	<string name="email">email</string>
+	<string name="email">E-mail</string>
 	<string name="av_camera_focus">Тып факусоўкі камеры</string>
-	<string name="av_camera_focus_descr">Выберыце тып фокусу убудаванай праграмы для фатаграфавання</string>
+	<string name="av_camera_focus_descr">Выберыце тып фокусу ўбудаванай праграмы для фатаграфаваньня</string>
 	<string name="av_camera_focus_auto">Аўтафокус</string>
 	<string name="av_camera_focus_hiperfocal">Гіперфакальны фокус</string>
-	<string name="av_camera_focus_edof">Павялічаная глыбіня рэзкасці (EDOF)</string>
-	<string name="av_camera_focus_infinity">Фокус усталяваны на бясконцасці</string>
-	<string name="av_camera_focus_macro">Макра (буйны план) рэжым факусоўкі</string>
+	<string name="av_camera_focus_edof">Павялічаная глыбіня рэзкасьці (EDOF)</string>
+	<string name="av_camera_focus_infinity">Фокус усталяваны на бясконцасьці</string>
+	<string name="av_camera_focus_macro">Макра-рэжым факусоўкі (буйны план)</string>
 	<string name="av_camera_focus_continuous">Камера пастаянна спрабуе сфакусавацца</string>
 	<string name="av_photo_play_sound">Прайграваць гук пры фатаграфаваньні</string>
 	<string name="av_photo_play_sound_descr">Выберыце, ці трэба прайграваць гук пры здымцы фатаграфій</string>

From b531769931396ceec90b2b609a9a69e6990f503e Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Tue, 16 Dec 2014 09:50:06 +0100
Subject: [PATCH 5/7] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1594 of 1594 strings)
---
 OsmAnd/res/values-be/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 42e3436e24..32ade7bfe5 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -1423,7 +1423,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="poi_remove_success">Цікавостка выдаленая</string>
 	<string name="poi_action_add">дадаць</string>
 	<string name="poi_action_change">зьмяніць</string>
-	<string name="poi_action_succeded_template">Дзеянне {0} пасьпяхова завершана.</string>
+	<string name="poi_action_succeded_template">Дзеяньне {0} пасьпяхова завершана.</string>
 	<string name="poi_error_unexpected_template">Нечаканая памылка пры выкананьні дзеяньня {0}.</string>
 	<string name="poi_error_io_error_template">Адбылася памылка ўводу/вываду пры выкананьні дзеяньня {0}.</string>
 	<string name="poi_error_info_not_loaded">Адбылася памылка пры загрузцы інфармацыі аб POI</string>

From 43e060de766cdcf66155258646d487d2af16a7bb Mon Sep 17 00:00:00 2001
From: stephan 75 <stephan.r@web.de>
Date: Mon, 15 Dec 2014 19:37:07 +0100
Subject: [PATCH 6/7] Translated using Weblate (German)

Currently translated at 100.0% (1594 of 1594 strings)

string was shortened for better display on phone screens, was almost truncated before.
---
 OsmAnd/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index a50a9f07c5..24cb2fd78a 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2014,7 +2014,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="home_button">Startbildschirm</string>
     <string name="osmo_use_https_descr">Sichere Server-Verbindung verwenden</string>
     <string name="osmo_use_https">HTTPS nutzen</string>
-    <string name="map_update">Aktualisierungen für %1$s Karten sind verfügbar</string>
+    <string name="map_update">Aktualisierungen für %1$s Karten verfügbar</string>
     <string name="search_for">Suchen nach</string>
     <string name="show_map">KARTE ZEIGEN</string>
     <string name="show_all">ALLES ZEIGEN</string>

From d9e766d511b097687639fbda3f007943d59b70a5 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Mon, 15 Dec 2014 20:04:52 +0100
Subject: [PATCH 7/7] Translated using Weblate (Swedish)

Currently translated at 99.4% (1586 of 1594 strings)
---
 OsmAnd/res/values-sv/strings.xml | 41 +++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 08673b89f4..b3e6d81018 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -347,8 +347,8 @@
 <string name="index_name_oceania">Oceanien</string>
 <string name="index_name_other">Hela världen och ämneskartor</string>
 <string name="index_name_wiki">Wikipedia</string>
-<string name="index_name_voice">Röstpaket (inspelat, begränsad funktion)</string>
-<string name="index_name_tts_voice">Röstpaket (TTS, rekommenderas)</string>
+<string name="index_name_voice">Röstprompter (inspelade med begränsad funktion)</string>
+<string name="index_name_tts_voice">Röstprompter (TTS - text-till-tal, rekommenderas)</string>
 <string name="amenity_type_osmwiki">Wikipedia (offline)</string>
 <string name="amenity_type_user_defined">Användardefinierat</string>
 <string name="fav_export_confirmation">En fil med tidigare exporterade favoriter finns redan. Vill du ersätta den?</string>
@@ -647,7 +647,7 @@
 	<string name="select_build_to_install">Välj en OsmAnd-kompilering att installera</string>
 	<string name="contribution_activity">Särskild aktivitet för bidragsversionen</string>
 	<string name="gps_status_app_not_found">Appen GPS-status är inte installerad. Vill du söka på Play Butik?</string>
-	<string name="voice_is_not_available_msg">Röstvägledning är inte tillgänglig. Gå till inställningar, välj önskat röstdatapaket och hämta det.</string>
+	<string name="voice_is_not_available_msg">Röstvägledning är inte tillgänglig. Gå till \'Inställningar\' \t\'Allmänt\' \t\'Röstvägleding\' och välj eller hämta ett paket med röstprompter.</string>
 	<string name="voice_is_not_available_title">Ingen röstvägledning vald</string>
 	<string name="daynight_mode_day">Dag</string>
 	<string name="daynight_mode_night">Natt</string>
@@ -696,7 +696,7 @@
 	<string name="transport_search_none">ingen</string>
 	<string name="transport_search_again">Återställ transportsökning</string>
 	<string name="map_index">Karta</string>
-	<string name="voice">Röst</string>
+	<string name="voice">Inspelad röst</string>
 	<string name="no_vector_map_loaded">Vektorkartorna laddades inte</string>
 	<string name="map_route_by_gpx">Navigera med GPX</string>
 	<string name="gpx_files_not_found">Hittar inga GPX-filer i spårmappen</string>
@@ -834,7 +834,7 @@
 	<string name="route_general_information">Total sträcka %1$s, restid %2$d h %3$d m.</string>
 	<string name="router_service_descr">Välj en online- eller offline-navigeringstjänst</string>
 	<string name="router_service">Navigeringstjänst</string>
-	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet är inte tillgänglig</string>
+	<string name="sd_dir_not_accessible">Datalagringsmappen på SD-kortet är inte tillgänglig!</string>
 	<string name="download_question">Ladda ner {0} - {1}?</string>
 	<string name="download_question_exist">Offline-data för {0} finns redan ({1}). Vill du uppdatera den ({2})?</string>
 	<string name="address">Adress</string>
@@ -1339,7 +1339,7 @@
     <string name="android_19_location_disabled">Efter Androidversion 4.4 (KitKat) går det inte att hämta och uppdatera kartor på den tidigare lagringsmappen (%s). Vill du byta till en tillåten plats och kopiera alla OsmAnd-filerna dit?
 \n OBS: Gamla filer berörs inte (men kan tas bort manuellt).
 \n OBS: På den nya lagringsplatsen kommer det inte att vara möjligt att dela filer mellan OsmAnd och OsmAnd+.</string>
-    <string name="application_dir_change_warning2">Vill du att OsmAnd också ska kopiera datafilerna till den nya platsen?</string>
+    <string name="application_dir_change_warning2">Vill du att OsmAnd också ska kopiera datafilerna till den nya platsen? Välj \'Nej\' om du vill att OsmAnd ska skapa och använda den nya mappen.</string>
     <string name="copying_osmand_one_file_descr">Kopierar filen (%s) till den nya platsen …</string>
     <string name="copying_osmand_files_descr">Kopierar OsmAnd-datafiler till den nya platsen (%s)</string>
     <string name="copying_osmand_files">Kopierar OsmAnd-datafiler</string>
@@ -1736,11 +1736,36 @@
 	<string name="show_map">VISA KARTAN</string>
 	<string name="show_all">VISA ALLA</string>
 	<string name="coordinates">Koordinater</string>
-	<string name="map_update">Kartor</string>
+	<string name="map_update">Du har %1$s kartor att uppdatera</string>
 	<string name="error_avoid_specific_road">Hittar inte närmaste väg</string>
     <string name="dismiss">Avfärda</string>
     <string name="everything_up_to_date">Allt är uppdaterat</string>
     <string name="use_opengl_render">Använd OpenGL-rendering</string>
     <string name="use_opengl_render_descr">Använd hårdvaruaccelererad OpenGL-rendering (fungerar kanske inte på vissa enheter)</string>
     <string name="no_internet_connection">Kan inte ladda ner. Anslut till Wi-Fi för att fortsätta.</string>
-    </resources>
+    <string name="rendering_attr_roadStyle_name">Vägstil</string>
+    <string name="rendering_value_default_name">Standard</string>
+    <string name="rendering_value_orange_name">Brandgul</string>
+    <string name="rendering_value_germanRoadAtlas_name">Tysk vägkarta</string>
+	<string name="traffic_warning_railways">Järnvägar</string>
+	<string name="traffic_waring_pedestrian">Fotgängare</string>
+	<string name="show_railway_warnings">Visa järnvägsvarningar</string>
+	<string name="show_pedestrian_warnings">Visa fotgängarvarningar</string>
+    <string name="rendering_value_americanRoadAtlas_name">Amerikansk vägkarta</string>
+    <string name="routing_attr_no_new_routing_name">Använd inte ruttning från v 1.9</string>
+    <string name="routing_attr_no_new_routing_description">Använd inte ruttning från v 1.9</string>
+    <string name="dash_download_msg_none">Vill du hämta några offline-kartor?</string>
+    <string name="dash_download_msg">Du har hämtat %1$s kartor</string>
+    <string name="dash_download_new_one">Hämta ny karta</string>
+    <string name="dash_download_manage">Hantera</string>
+    <string name="map_locale">Kartspråk</string>
+    <string name="rendering_attr_transportStops_name">Hållplatser</string>
+    <string name="navigate_point_zone">Zon</string>
+    <string name="navigate_point_northing">Nordlig</string>
+    <string name="navigate_point_easting">Östlig</string>
+    <string name="download_tab_downloads">Alla hämtningar</string>
+    <string name="download_tab_updates">Uppdateringar</string>
+    <string name="download_tab_local">Hämtat</string>
+	<string name="route_descr_destination">Destination</string>
+    <string name="voices">Röstprompter</string>
+	</resources>