From 535ace6a1df55e49c29e67b4840ac45d5dfe0a42 Mon Sep 17 00:00:00 2001
From: sasbot <>
Date: Sat, 6 Jun 2020 12:00:00 +0000
Subject: [PATCH] update zmp

---
 Google/Ghyb.zmp/params.txt                    |  10 ++++++----
 .../GoogleEarth.Earth.Terrain.zmp/params.txt  |   4 +++-
 .../GoogleEarth.Mars.Terrain.zmp/params.txt   |   4 +++-
 .../GoogleEarth.Moon.Terrain.zmp/params.txt   |   4 +++-
 Google/GoogleTraf.zmp/params.txt              |  10 ++++++----
 Google/Panoramio_KML.zmp/params.txt           |   3 ++-
 Osm/osm_layer_transport.zmp/params.txt        |   3 ++-
 Osm/osm_mapsurfer_hillshade.zmp/params.txt    |   6 +++---
 Other/Water.zmp/params.txt                    |   3 ++-
 Yandex/YaHyb.zmp/params.txt                   |  12 ++++++------
 Yandex/YaTraf.zmp/18.bmp                      | Bin 1062 -> 0 bytes
 Yandex/YaTraf.zmp/24.bmp                      | Bin 1782 -> 1784 bytes
 Yandex/YaTraf.zmp/params.txt                  |  13 ++++++-------
 13 files changed, 42 insertions(+), 30 deletions(-)
 delete mode 100644 Yandex/YaTraf.zmp/18.bmp

diff --git a/Google/Ghyb.zmp/params.txt b/Google/Ghyb.zmp/params.txt
index 3b5aa7ce6..0d94d7415 100644
--- a/Google/Ghyb.zmp/params.txt
+++ b/Google/Ghyb.zmp/params.txt
@@ -3,10 +3,12 @@
 pnum=1
 GUID={F25E37ED-923B-41E7-8BA6-CC0CC3213B93}
 asLayer=1
-name_ru=Гибрид (Google)
-name=Hybrid (Google)
-name_uk=Гібрид (Google)
-ParentSubMenu=Google
+ParentSubMenu_ru=Подписи и границы
+ParentSubMenu=Labels and borders
+ParentSubMenu_uk=Підписи та межі
+name_ru=Google - Гибрид
+name=Google - Hybrid 
+name_uk=Google - Гібрид
 NameInCache=Both
 DefURLBase=http://mt.google.com/vt/lyrs=h@169000000&hl=ru
 ContentType=image/png
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
index 7b88f7e50..9fb48a010 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Earth.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={E45E5615-C318-4961-9247-E3139BAC1D80}
 name_ru=Земля - Рельеф (GoogleEarth)
 name=Earth - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
index 98f83b02b..94b31faf7 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Mars.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={309B0BF2-AC93-4A97-8DA3-E13FE6B8E95F}
 name_ru=Марс - Рельеф (GoogleEarth)
 name=Mars - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
index e147b6193..d20ad12f2 100644
--- a/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
+++ b/Google/GoogleEarth/GoogleEarth.Direct/Terrain/GoogleEarth.Moon.Terrain.zmp/params.txt
@@ -3,7 +3,9 @@
 GUID={17903835-5F6A-45F4-8D34-AB1FAC648319}
 name_ru=Луна - Рельеф (GoogleEarth)
 name=Moon - Terrain (GoogleEarth)
-ParentSubMenu=GoogleEarth
+ParentSubMenu_ru=Сломанные карты\GoogleEarth
+ParentSubMenu=Not working\GoogleEarth
+ParentSubMenu_uk=Сломанные карты\GoogleEarth
 asLayer=1
 EPSG=4326
 CacheType=51
diff --git a/Google/GoogleTraf.zmp/params.txt b/Google/GoogleTraf.zmp/params.txt
index 321f0308f..1160d6899 100644
--- a/Google/GoogleTraf.zmp/params.txt
+++ b/Google/GoogleTraf.zmp/params.txt
@@ -3,10 +3,12 @@
 pnum=48
 GUID={D61F9933-CE83-46CE-96AD-AEC88E0E7E05}
 asLayer=1
-name_ru=Пробки (Google Maps)
-name=Traffic (Google Maps)
-name_uk=Пробки (Google Maps)
-ParentSubMenu=Google
+ParentSubMenu_ru=Пробки
+ParentSubMenu_uk=Пробки
+ParentSubMenu=Traffic
+name_ru=Google Maps - Пробки
+name=Google Maps - Traffic
+name_uk=Google Maps - Пробки
 NameInCache=googletraf
 DefURLBase=http://mt1.google.com/vt?hl=ru&lyrs=h@159000000,traffic|seconds_into_week:-1&style=15&
 ContentType=image/png
diff --git a/Google/Panoramio_KML.zmp/params.txt b/Google/Panoramio_KML.zmp/params.txt
index c2358b418..2c42e83ea 100644
--- a/Google/Panoramio_KML.zmp/params.txt
+++ b/Google/Panoramio_KML.zmp/params.txt
@@ -3,13 +3,14 @@
 pnum=44
 GUID={3C6C8E9B-D455-425F-9652-11F8CB3D3613}
 asLayer=1
+ParentSubMenu_ru=Сломанные карты\Google
+ParentSubMenu=Not working\Google
 name=Panoramio KML
 NameInCache=Pano_KML
 DefURLBase=http://www.panoramio.com/panoramio.kml?all&LANG=ru_RU.utf8&BBOX=
 ContentType=application/vnd.google-earth.kml+xml; charset=utf-8
 MimeTypeSubst="""application/vnd.google-earth.kml+xml; charset=utf-8""=application/vnd.google-earth.kml+xml"
 MainStorageContentType=application/vnd.sas.wikimapia.kml+xml
-ParentSubMenu=Google
 Ext=.kml
 projection=1
 sradiusa=6378137
diff --git a/Osm/osm_layer_transport.zmp/params.txt b/Osm/osm_layer_transport.zmp/params.txt
index 3cd6eba82..92da87f42 100644
--- a/Osm/osm_layer_transport.zmp/params.txt
+++ b/Osm/osm_layer_transport.zmp/params.txt
@@ -3,6 +3,8 @@
 pnum=115
 GUID={36e3746e-20f7-4861-82f9-911195f9de9b}
 asLayer=1
+ParentSubMenu_ru=Сломанные карты\OSM
+ParentSubMenu=Not working\OSM
 name_ru=Транспорт OSM (osmosnimki.ru)
 name=Transport OSM (osmosnimki.ru)
 name_uk=Транспорт OSM (osmosnimki.ru)
@@ -14,7 +16,6 @@ projection=1
 sradiusa=6378137
 sradiusb=6378137
 separator=1
-PARENTSUBMENU=OSM
 RequestHead=User-Agent: SAS.Planet
 IteratorSubRectSize=8,8
 License=© OpenStreetMap contributors, CC-BY-SA; rendering by kosmosnimki.ru
diff --git a/Osm/osm_mapsurfer_hillshade.zmp/params.txt b/Osm/osm_mapsurfer_hillshade.zmp/params.txt
index 08f44997e..2a8c91bab 100644
--- a/Osm/osm_mapsurfer_hillshade.zmp/params.txt
+++ b/Osm/osm_mapsurfer_hillshade.zmp/params.txt
@@ -3,9 +3,9 @@
 pnum=118
 GUID={AB8A8685-AEC6-4E16-80DA-DA4AC37E4777}
 asLayer=1
-name_ru=OpenMapSurfer (рельеф)
-name=OpenMapSurfer (hillshade)
-name_uk=OpenMapSurfer (рельєф)
+name_ru=OpenMapSurfer
+name=OpenMapSurfer
+name_uk=OpenMapSurfer
 ParentSubMenu_ru=Рельеф и тополинии
 ParentSubMenu=Hillshade
 ParentSubMenu_uk=Рельєф і тополинии
diff --git a/Other/Water.zmp/params.txt b/Other/Water.zmp/params.txt
index c15bef738..4938ed694 100644
--- a/Other/Water.zmp/params.txt
+++ b/Other/Water.zmp/params.txt
@@ -3,13 +3,14 @@
 pnum=43
 GUID={BF0F5E1C-4E9B-43DE-990F-2F26618A6274}
 asLayer=1
+ParentSubMenu_ru=Водные карты
+ParentSubMenu=Water maps
 name_ru=Водные ресурсы (maps-for-free)
 name=Water resource (maps-for-free)
 name_uk=Водні ресурси (maps-for-free)
 NameInCache=water
 DefURLBase=http://www.maps-for-free.com/layer/water/
 ContentType=image/gif
-ParentSubMenu_ru=
 Ext=.gif
 projection=1
 sradiusa=6378137
diff --git a/Yandex/YaHyb.zmp/params.txt b/Yandex/YaHyb.zmp/params.txt
index cc46c821f..6364e1586 100644
--- a/Yandex/YaHyb.zmp/params.txt
+++ b/Yandex/YaHyb.zmp/params.txt
@@ -3,12 +3,12 @@
 pnum=5
 GUID={02D3A3D6-870D-4549-933C-172CB11EA71B}
 asLayer=1
-name_ru=Гибрид (Яндекс.Карты)
-name=Hybrid (Yandex.Maps)
-name_uk=Гібрид (Яндекс.Карты)
-ParentSubMenu_ru=Яндекс
-ParentSubMenu=Yandex
-ParentSubMenu_uk=Яндекс
+ParentSubMenu_ru=Подписи и границы
+ParentSubMenu_uk=Підписи та межі
+ParentSubMenu=Labels and borders
+name_ru=Яндекс.Карты - Гибрид
+name=Yandex.Maps - Hybrid
+name_uk=Яндекс.Карты - Гібрид
 NameInCache=yahyb
 DefURLBase=https://vec01.maps.yandex.net/tiles?l=skl&scale=1&lang=ru_RU&x=
 ContentType=image/png
diff --git a/Yandex/YaTraf.zmp/18.bmp b/Yandex/YaTraf.zmp/18.bmp
deleted file mode 100644
index 2713756969f83c00dfaeba02a50b3ffcaba24783..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1062
zcmZ?rRbycQ12Z700mMR3%*Y@C76%bW_#hZ2@Sov7IS8RCvNzJD%>@&Ab$VeM46{tG
zO`4^h0T;6DGe^@}1GSH%hXEhzW<=As9jcFa5(9puGD!+qt2tDk&~yeMa#~|jbF}F2
z)BUZdYTVXYc&xXYacLrutGifEa5_WMf+&Pms6MfI3_#R<u73N&jnhugGIBbrulV0c
z|E*zB_1-7j?bqu9WhG~`!1clWC$*RXh<YzJEWS0vDsn4O69gG*eGXm`<GfiHC@Z~~
z!DAsTfS~rtuV4V8{>$|}muk}5c9>Z_gKIUdEGs*iqPmJ5s6b&E6U0hJs6OSj3_vvT
zTK(cXQ~v+|Uoq(jTwh50^rv4R8f_8;Do|Ssb1GDy`bGvIntY>S;obfh-ydIn@X}NR
z<WwW07fa4;T6lMY#zsbsjSSg`gCO?7;$3GO0}xHSUBB<eh70eHefag}^u_nh>z6kj
zY~S>Bk=H>LpsdL@E_k?PLhUo$!vI8eR}<#lZ|}WT)OJ0y<3>*Bjog;&=^@8;jQ21b
z?na4vn0;mk8Sta9W7=@bKn$pTwkH_yAiLwxU_@wz>Px#~=yIL`fzH9$U`E~b5QGk}
T6JhQ|6DG`s+DBL+nhpN}D})j?

diff --git a/Yandex/YaTraf.zmp/24.bmp b/Yandex/YaTraf.zmp/24.bmp
index 057d4a869f56783d53d791b6f54466265e3d7ac8..108dd576a43e7200e42144b70694c0ac5db575d4 100644
GIT binary patch
literal 1784
zcmZ?r{lUfn24+A~1BfM{m=VlkU^oPn7vhFsutFg5pW#0qv~TxYJhH?~bvE9kicvea
zz0r|7^6<fT;;qK2^1;1t3PJ~b9M58vB}q_I=CGXLfwqQwB<aFb92Ia;N%Wu$-+`lt
z-($)WFVffk0BDY)$U%LjqaQx}CSD_^N}xGFBr9+rGw~XxEb$`BV*6CY_bH3*2L{xx
z?Qe+J2vNCt<Im34?-eB<ML2JXab1(*JFg&o$UybT!-vEsgQbgp7;3$j5PZwa@`jb+
z9Vf$EPKGz!jIVf@pNeyxO^dxkjFTo$`X<EnmW|;J2N(fO0He1Y3_$dbi}95x=jAJx
zKI1oP&FY^(Hvmn5XlG`4%>YI$FcF|>oD8p{g777$*RTGH@Bl4^8Ui!{$kkAKr>5{u
zfa5JA!)ut^fPQ?5$30!`-{6J-87gw`RxJPd{{6pKul~)N@f{dkaC3l+w&vHkjIuWU
z2v^C?^ya{UU;mN7!udbowg8p6*yBt9G7<<IMfu($nE_({`}-dl_;8EV72e@;kGc{t
zilHij0rLF^ib?nG{y}z+jrj*$=EO#PhMU9A@Fpq#^Y1_ZAZ7tW$;%btYoLL3)n9R$
zbNJvdc>Dql1jd)U)5ogvuVuww>?}S2xo}%p8Q$E#_Xn3bK=B~oPe7MI)B{6<f#DT6
z{Q${Va8CinOAEi?F$5xIZu9|e6wpARE@Uo{?d$o8pdmm7&z}8FN%+jgh=>}vcYukZ
xtcb8n;I@4E^6%)O-$i*}ER8-$i@cQ+duMO{p|<kt`E$R&fBy$phRk4K004U@`fLCI

literal 1782
zcmZ?r{l>-s24+A~1BfM{m=VkZOEDbbV*q0akAdMo!~emFVmo35YWSI281NvLCg$|X
z>G<8x+Ri`>;%Z^XV~%vEC`UH~k;t~&5|>fj6BxNCFc6FS8F87zKZSuLq}nHi)hMAE
z3~)5}%GBAHC;$Kd|H<b^<wtTuw|WF`b?Z6X{QdVgprFe-Q;5pcnemuLiOpqzBcS5>
z*QcL*b<(CgNni0l1ev5w_S|go<=1E5EjAF9(lf9Gxa2|xI0Blp@aA-nNqKNXAPkGl
zX^m%!{kPk|ReH>{LUWSLQU*8znv;0I&)V}6nmItO-6pkwUDj}wGE2|{Tww(R90ASA
zJ{mUhN|OzSQRaPNQ?IqzZ&86Oc3WnM>?Gwi3~&TAr|)VlkUa2wJDQV1XP5o^|2O-1
z2wZW*c1L7$)Ydb=5zvH;<9<LA2%;)cjGA(z@!OxTMw|H{iq+RKAsYf@Yi?$MBcS%V
zcf0pI-vDHsJ^_s{pu<Av6@UKyvFln1TxH48STu8Vw==*IQ2UC9Q}2AfdiLERAp6Dl
z$4eeeXup=X;C|1N2NMGhYeQ68?GQvW1jsem%>YM0y=$M$Uj2B+vPYBV-|t-da3YYg
z;6eAo2R$B#Wli_8K~!QI0u(XX$3PN_IAnm;9E-z@mPZ(fMTgOY7j9<oaRs}R3`C;(
pi_vh6m<;E048$P6GgyKb&9sawhF%xh+%GcVLcSNd(6kI%E&!~XXYl|4

diff --git a/Yandex/YaTraf.zmp/params.txt b/Yandex/YaTraf.zmp/params.txt
index b5af2fd14..a2a4e503e 100644
--- a/Yandex/YaTraf.zmp/params.txt
+++ b/Yandex/YaTraf.zmp/params.txt
@@ -1,14 +1,13 @@
 
 [PARAMS]
-pnum=47
 GUID={C32B96AD-3AC5-4170-ADD7-47B2222AFC99}
 asLayer=1
-name_ru=Пробки (Яндекс.Карты)
-name=Traffic (Yandex.Maps)
-name_uk=Пробки (Яндекс.Карты)
-ParentSubMenu_ru=Яндекс
-ParentSubMenu=Yandex
-ParentSubMenu_uk=Яндекс
+ParentSubMenu_ru=Пробки
+ParentSubMenu_uk=Пробки
+ParentSubMenu=Traffic
+name_ru=Яндекс - Пробки
+name=Yandex - Traffic
+name_uk=Яндекс - Пробки
 NameInCache=yatraf
 DefURLBase=https://core-jams-rdr.maps.yandex.net/1.1/tiles?trf&l=trf&scale=1&lang=ru&x=
 ContentType=image/png