Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into fix_plan_route_save_as_new_track

Browse source
This commit is contained in:
Dima-1 2020-09-09 10:16:24 +03:00
commit ba2ccf1dc2
46 changed files with 642 additions and 383 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-telegram/res/values-eu/strings.xml
View file

@ -210,7 +210,7 @@
<string name="osmand_service_descr">OsmAnd aztarnaria atzeko planoan exekutatzen da pantaila itzalita dagoenean.</string>
<string name="location_service_no_gps_available">Hautatu kokapen-hornitzaileetako bat zure kokapena partekatzeko.</string>
<string name="no_location_permission">Aplikazioak ez du kokapena atzitzeko baimenik.</string>
<string name="authentication_code_descr">"Telegramek kode bat bidali dizu OsmAnd-ek zure kontuan saioa hasteko."</string>
<string name="authentication_code_descr">Telegramek kode bat bidali dizu OsmAnd-ek zure kontuan saioa hasteko.</string>
<string name="my_location_search_hint">Bilaketa: Taldea edo kontaktua</string>
<string name="location_sharing_description">Hautatu kokapena partekatzeko kontaktuak eta taldeak.</string>
<string name="set_time">Ezarri denbora</string>
@ -232,14 +232,14 @@
<string name="send_my_location_desc">Ezarri kokapena partekatzeko gutxieneko tartea.</string>
<string name="stale_location">Ez da mugitzen</string>
<string name="stale_location_desc">Kontaktu bat mugitu zen azken aldia.</string>
<string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak</string>
<string name="location_history_desc">Ezkutatu denbora jakin batean mugitu ez diren kontaktuak.</string>
<string name="osmand_connect">OsmAnd konexioa</string>
<string name="osmand_connect_desc">Aukeratu OsmAnd aztarnariak posizioak bistaratzeko erabiliko duen OsmAnd bertsioa.</string>
<string name="in_time">%1$s-n</string>
<string name="logout_help_desc">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
<string name="disconnect_from_telegram">Nola itzali OsmAnd aztarnaria Telegram-etik</string>
<string name="disconnect_from_telegram_desc">Kokapena partekatzeko sarbidea baliogabetzeko. Ireki Telegram, joan Ezarpenak → Pribatutasuna eta segurtasuna → Saioak eta amaitu OsmAnd aztarnariaren saioa atalera.</string>
<string name="logout_no_internet_msg">"Konektatu Internetera Telegram saioa behar bezala amaiatzeko."</string>
<string name="logout_no_internet_msg">Konektatu Internetera Telegram saioa behar bezala amaiatzeko.</string>
<string name="last_response">Azken erantzuna</string>
<string name="disable_all_sharing_desc">Kokapena partekatzea itzaltzen du hautatutako txat guztietan (%1$d).</string>
<string name="choose_osmand_desc">Hautatu kontaktuak mapan bistaratzeko OsmAnd bertsioa.</string>

BIN
OsmAnd/res/drawable-hdpi/image_text_openstreetmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.3 KiB

BIN
OsmAnd/res/drawable-mdpi/image_text_openstreetmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
OsmAnd/res/drawable-xhdpi/image_text_openstreetmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.9 KiB

BIN
OsmAnd/res/drawable-xxhdpi/image_text_openstreetmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.1 KiB

BIN
OsmAnd/res/drawable-xxxhdpi/image_text_openstreetmap.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

84
OsmAnd/res/drawable/image_text_openstreetmap.xml Normal file
View file

@ -0,0 +1,84 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="232dp"
android:height="24dp"
android:viewportWidth="232"
android:viewportHeight="24">
<path
android:pathData="M9.234,16.14C8.646,16.14 8.128,16 7.68,15.72C7.232,15.44 6.878,15.076 6.616,14.628V18.982H5.076V8.678H6.434V9.994C6.714,9.555 7.074,9.205 7.512,8.944C7.96,8.683 8.464,8.552 9.024,8.552C9.528,8.552 9.99,8.655 10.41,8.86C10.83,9.065 11.194,9.341 11.502,9.686C11.81,10.031 12.048,10.433 12.216,10.89C12.394,11.347 12.482,11.828 12.482,12.332C12.482,12.864 12.403,13.363 12.244,13.83C12.086,14.287 11.862,14.689 11.572,15.034C11.283,15.37 10.938,15.641 10.536,15.846C10.144,16.042 9.71,16.14 9.234,16.14ZM8.73,14.824C9.057,14.824 9.351,14.754 9.612,14.614C9.883,14.474 10.112,14.287 10.298,14.054C10.494,13.821 10.644,13.555 10.746,13.256C10.849,12.957 10.9,12.649 10.9,12.332C10.9,11.996 10.84,11.679 10.718,11.38C10.606,11.081 10.448,10.82 10.242,10.596C10.046,10.372 9.808,10.195 9.528,10.064C9.248,9.933 8.945,9.868 8.618,9.868C8.422,9.868 8.217,9.905 8.002,9.98C7.788,10.055 7.587,10.157 7.4,10.288C7.214,10.419 7.05,10.573 6.91,10.75C6.77,10.918 6.672,11.105 6.616,11.31V13.228C6.71,13.452 6.831,13.662 6.98,13.858C7.13,14.054 7.293,14.222 7.47,14.362C7.657,14.502 7.858,14.614 8.072,14.698C8.287,14.782 8.506,14.824 8.73,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M17.297,16.14C16.719,16.14 16.196,16.037 15.729,15.832C15.272,15.627 14.88,15.351 14.553,15.006C14.227,14.661 13.975,14.259 13.797,13.802C13.62,13.335 13.531,12.85 13.531,12.346C13.531,11.842 13.62,11.361 13.797,10.904C13.975,10.437 14.227,10.031 14.553,9.686C14.889,9.341 15.286,9.065 15.743,8.86C16.21,8.655 16.728,8.552 17.297,8.552C17.867,8.552 18.38,8.655 18.837,8.86C19.304,9.065 19.701,9.341 20.027,9.686C20.363,10.031 20.62,10.437 20.797,10.904C20.975,11.361 21.063,11.842 21.063,12.346C21.063,12.85 20.975,13.335 20.797,13.802C20.62,14.259 20.363,14.661 20.027,15.006C19.701,15.351 19.304,15.627 18.837,15.832C18.38,16.037 17.867,16.14 17.297,16.14ZM15.113,12.36C15.113,12.715 15.169,13.041 15.281,13.34C15.393,13.639 15.547,13.9 15.743,14.124C15.939,14.339 16.168,14.511 16.429,14.642C16.7,14.763 16.989,14.824 17.297,14.824C17.605,14.824 17.89,14.763 18.151,14.642C18.422,14.511 18.655,14.334 18.851,14.11C19.047,13.886 19.201,13.625 19.313,13.326C19.425,13.027 19.481,12.701 19.481,12.346C19.481,12.001 19.425,11.679 19.313,11.38C19.201,11.072 19.047,10.806 18.851,10.582C18.655,10.358 18.422,10.185 18.151,10.064C17.89,9.933 17.605,9.868 17.297,9.868C16.999,9.868 16.714,9.933 16.443,10.064C16.182,10.195 15.953,10.372 15.757,10.596C15.561,10.82 15.403,11.086 15.281,11.394C15.169,11.693 15.113,12.015 15.113,12.36Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M31.437,8.678H32.907L29.827,16H28.553L27.195,12.598L25.837,16H24.563L21.469,8.678H22.939L25.305,14.516L26.369,11.8L25.095,8.692H26.355L27.195,10.988L28.021,8.692H29.281L28.021,11.8L29.085,14.516L31.437,8.678Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M37.129,16.14C36.559,16.14 36.041,16.042 35.575,15.846C35.108,15.641 34.707,15.365 34.371,15.02C34.044,14.675 33.787,14.273 33.601,13.816C33.423,13.359 33.335,12.873 33.335,12.36C33.335,11.847 33.423,11.361 33.601,10.904C33.787,10.437 34.044,10.031 34.371,9.686C34.707,9.331 35.108,9.056 35.575,8.86C36.041,8.655 36.564,8.552 37.143,8.552C37.712,8.552 38.225,8.655 38.683,8.86C39.149,9.065 39.546,9.341 39.873,9.686C40.199,10.022 40.447,10.419 40.615,10.876C40.792,11.324 40.881,11.795 40.881,12.29C40.881,12.402 40.876,12.509 40.867,12.612C40.857,12.705 40.848,12.785 40.839,12.85H34.973C35.001,13.177 35.075,13.471 35.197,13.732C35.327,13.993 35.491,14.222 35.687,14.418C35.892,14.605 36.121,14.749 36.373,14.852C36.634,14.955 36.905,15.006 37.185,15.006C37.39,15.006 37.591,14.983 37.787,14.936C37.992,14.88 38.179,14.805 38.347,14.712C38.515,14.609 38.664,14.488 38.795,14.348C38.925,14.208 39.028,14.054 39.103,13.886L40.419,14.264C40.167,14.815 39.747,15.267 39.159,15.622C38.58,15.967 37.903,16.14 37.129,16.14ZM39.355,11.786C39.327,11.478 39.247,11.193 39.117,10.932C38.995,10.671 38.837,10.451 38.641,10.274C38.445,10.087 38.216,9.943 37.955,9.84C37.693,9.737 37.418,9.686 37.129,9.686C36.839,9.686 36.564,9.737 36.303,9.84C36.051,9.943 35.827,10.087 35.631,10.274C35.435,10.451 35.276,10.671 35.155,10.932C35.033,11.193 34.959,11.478 34.931,11.786H39.355Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M46.393,10.008C45.796,10.027 45.264,10.167 44.797,10.428C44.34,10.68 44.013,11.044 43.817,11.52V16H42.277V8.678H43.705V10.316C43.957,9.812 44.284,9.411 44.685,9.112C45.096,8.804 45.534,8.636 46.001,8.608C46.094,8.608 46.169,8.608 46.225,8.608C46.29,8.608 46.346,8.613 46.393,8.622V10.008Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M50.602,16.14C50.033,16.14 49.515,16.042 49.048,15.846C48.581,15.641 48.18,15.365 47.844,15.02C47.517,14.675 47.261,14.273 47.074,13.816C46.897,13.359 46.808,12.873 46.808,12.36C46.808,11.847 46.897,11.361 47.074,10.904C47.261,10.437 47.517,10.031 47.844,9.686C48.18,9.331 48.581,9.056 49.048,8.86C49.515,8.655 50.037,8.552 50.616,8.552C51.185,8.552 51.699,8.655 52.156,8.86C52.623,9.065 53.019,9.341 53.346,9.686C53.673,10.022 53.92,10.419 54.088,10.876C54.265,11.324 54.354,11.795 54.354,12.29C54.354,12.402 54.349,12.509 54.34,12.612C54.331,12.705 54.321,12.785 54.312,12.85H48.446C48.474,13.177 48.549,13.471 48.67,13.732C48.801,13.993 48.964,14.222 49.16,14.418C49.365,14.605 49.594,14.749 49.846,14.852C50.107,14.955 50.378,15.006 50.658,15.006C50.863,15.006 51.064,14.983 51.26,14.936C51.465,14.88 51.652,14.805 51.82,14.712C51.988,14.609 52.137,14.488 52.268,14.348C52.399,14.208 52.501,14.054 52.576,13.886L53.892,14.264C53.64,14.815 53.22,15.267 52.632,15.622C52.053,15.967 51.377,16.14 50.602,16.14ZM52.828,11.786C52.8,11.478 52.721,11.193 52.59,10.932C52.469,10.671 52.31,10.451 52.114,10.274C51.918,10.087 51.689,9.943 51.428,9.84C51.167,9.737 50.891,9.686 50.602,9.686C50.313,9.686 50.037,9.737 49.776,9.84C49.524,9.943 49.3,10.087 49.104,10.274C48.908,10.451 48.749,10.671 48.628,10.932C48.507,11.193 48.432,11.478 48.404,11.786H52.828Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M58.732,16.14C58.238,16.14 57.78,16.042 57.36,15.846C56.94,15.641 56.576,15.365 56.268,15.02C55.96,14.675 55.718,14.273 55.54,13.816C55.372,13.349 55.288,12.85 55.288,12.318C55.288,11.805 55.368,11.324 55.526,10.876C55.694,10.419 55.923,10.017 56.212,9.672C56.511,9.327 56.856,9.056 57.248,8.86C57.65,8.655 58.088,8.552 58.564,8.552C59.152,8.552 59.67,8.697 60.118,8.986C60.566,9.266 60.916,9.625 61.168,10.064V5.78H62.708V14.18C62.708,14.357 62.736,14.483 62.792,14.558C62.858,14.633 62.97,14.675 63.128,14.684V16C62.97,16.028 62.839,16.047 62.736,16.056C62.643,16.065 62.564,16.07 62.498,16.07C62.19,16.07 61.938,15.991 61.742,15.832C61.546,15.673 61.439,15.468 61.42,15.216L61.392,14.67C61.122,15.127 60.753,15.487 60.286,15.748C59.82,16.009 59.302,16.14 58.732,16.14ZM59.11,14.824C59.334,14.824 59.558,14.787 59.782,14.712C60.006,14.637 60.212,14.535 60.398,14.404C60.585,14.273 60.744,14.119 60.874,13.942C61.014,13.765 61.112,13.573 61.168,13.368V11.45C61.084,11.217 60.963,11.002 60.804,10.806C60.655,10.61 60.482,10.442 60.286,10.302C60.09,10.162 59.88,10.055 59.656,9.98C59.442,9.905 59.222,9.868 58.998,9.868C58.69,9.868 58.406,9.938 58.144,10.078C57.892,10.218 57.673,10.405 57.486,10.638C57.3,10.871 57.15,11.137 57.038,11.436C56.936,11.735 56.884,12.043 56.884,12.36C56.884,12.696 56.94,13.013 57.052,13.312C57.174,13.611 57.337,13.872 57.542,14.096C57.748,14.32 57.981,14.497 58.242,14.628C58.513,14.759 58.802,14.824 59.11,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M72.351,16.14C71.791,16.14 71.283,16.009 70.825,15.748C70.377,15.477 70.023,15.118 69.761,14.67V16H68.403V5.78H69.943V10.064C70.233,9.597 70.592,9.229 71.021,8.958C71.46,8.687 71.973,8.552 72.561,8.552C73.047,8.552 73.49,8.659 73.891,8.874C74.293,9.079 74.633,9.359 74.913,9.714C75.203,10.059 75.422,10.465 75.571,10.932C75.73,11.389 75.809,11.87 75.809,12.374C75.809,12.897 75.721,13.387 75.543,13.844C75.366,14.301 75.123,14.703 74.815,15.048C74.507,15.384 74.139,15.65 73.709,15.846C73.289,16.042 72.837,16.14 72.351,16.14ZM71.945,14.824C72.281,14.824 72.589,14.759 72.869,14.628C73.149,14.488 73.387,14.306 73.583,14.082C73.789,13.858 73.947,13.601 74.059,13.312C74.171,13.013 74.227,12.701 74.227,12.374C74.227,12.047 74.171,11.735 74.059,11.436C73.957,11.128 73.807,10.862 73.611,10.638C73.425,10.405 73.196,10.218 72.925,10.078C72.664,9.938 72.375,9.868 72.057,9.868C71.581,9.868 71.157,10.022 70.783,10.33C70.419,10.638 70.139,11.011 69.943,11.45V13.382C69.999,13.597 70.097,13.793 70.237,13.97C70.377,14.138 70.541,14.287 70.727,14.418C70.914,14.549 71.115,14.651 71.329,14.726C71.544,14.791 71.749,14.824 71.945,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M77.34,17.722C77.48,17.75 77.616,17.773 77.746,17.792C77.886,17.811 77.998,17.82 78.082,17.82C78.204,17.82 78.306,17.792 78.39,17.736C78.484,17.689 78.577,17.601 78.67,17.47C78.764,17.339 78.857,17.153 78.95,16.91C79.053,16.677 79.17,16.373 79.3,16L76.29,8.678H77.872L80.14,14.642L82.156,8.678H83.612L80.294,17.694C80.145,18.114 79.884,18.464 79.51,18.744C79.146,19.033 78.675,19.178 78.096,19.178C77.984,19.178 77.868,19.169 77.746,19.15C77.625,19.141 77.49,19.113 77.34,19.066V17.722Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M92.427,16.07C91.717,16.07 91.069,15.93 90.481,15.65C89.902,15.361 89.403,14.983 88.983,14.516C88.563,14.04 88.236,13.499 88.003,12.892C87.779,12.285 87.667,11.665 87.667,11.03C87.667,10.367 87.788,9.733 88.031,9.126C88.273,8.519 88.605,7.983 89.025,7.516C89.454,7.049 89.958,6.681 90.537,6.41C91.125,6.13 91.764,5.99 92.455,5.99C93.164,5.99 93.808,6.139 94.387,6.438C94.975,6.727 95.474,7.11 95.885,7.586C96.305,8.062 96.627,8.603 96.851,9.21C97.084,9.807 97.201,10.419 97.201,11.044C97.201,11.707 97.079,12.341 96.837,12.948C96.603,13.555 96.272,14.091 95.843,14.558C95.413,15.015 94.905,15.384 94.317,15.664C93.738,15.935 93.108,16.07 92.427,16.07ZM89.263,11.03C89.263,11.497 89.337,11.949 89.487,12.388C89.636,12.827 89.846,13.214 90.117,13.55C90.397,13.886 90.733,14.157 91.125,14.362C91.517,14.558 91.955,14.656 92.441,14.656C92.945,14.656 93.388,14.553 93.771,14.348C94.163,14.133 94.494,13.853 94.765,13.508C95.035,13.163 95.241,12.775 95.381,12.346C95.521,11.917 95.591,11.478 95.591,11.03C95.591,10.554 95.516,10.101 95.367,9.672C95.217,9.233 95.003,8.851 94.723,8.524C94.452,8.188 94.121,7.922 93.729,7.726C93.346,7.521 92.917,7.418 92.441,7.418C91.937,7.418 91.489,7.525 91.097,7.74C90.705,7.945 90.373,8.216 90.103,8.552C89.832,8.888 89.622,9.275 89.473,9.714C89.333,10.143 89.263,10.582 89.263,11.03Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M102.926,16.14C102.338,16.14 101.82,16 101.372,15.72C100.924,15.44 100.569,15.076 100.308,14.628V18.982H98.768V8.678H100.126V9.994C100.406,9.555 100.765,9.205 101.204,8.944C101.652,8.683 102.156,8.552 102.716,8.552C103.22,8.552 103.682,8.655 104.102,8.86C104.522,9.065 104.886,9.341 105.194,9.686C105.502,10.031 105.74,10.433 105.908,10.89C106.085,11.347 106.174,11.828 106.174,12.332C106.174,12.864 106.095,13.363 105.936,13.83C105.777,14.287 105.553,14.689 105.264,15.034C104.975,15.37 104.629,15.641 104.228,15.846C103.836,16.042 103.402,16.14 102.926,16.14ZM102.422,14.824C102.749,14.824 103.043,14.754 103.304,14.614C103.575,14.474 103.803,14.287 103.99,14.054C104.186,13.821 104.335,13.555 104.438,13.256C104.541,12.957 104.592,12.649 104.592,12.332C104.592,11.996 104.531,11.679 104.41,11.38C104.298,11.081 104.139,10.82 103.934,10.596C103.738,10.372 103.5,10.195 103.22,10.064C102.94,9.933 102.637,9.868 102.31,9.868C102.114,9.868 101.909,9.905 101.694,9.98C101.479,10.055 101.279,10.157 101.092,10.288C100.905,10.419 100.742,10.573 100.602,10.75C100.462,10.918 100.364,11.105 100.308,11.31V13.228C100.401,13.452 100.523,13.662 100.672,13.858C100.821,14.054 100.985,14.222 101.162,14.362C101.349,14.502 101.549,14.614 101.764,14.698C101.979,14.782 102.198,14.824 102.422,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M111.017,16.14C110.448,16.14 109.93,16.042 109.463,15.846C108.996,15.641 108.595,15.365 108.259,15.02C107.932,14.675 107.676,14.273 107.489,13.816C107.312,13.359 107.223,12.873 107.223,12.36C107.223,11.847 107.312,11.361 107.489,10.904C107.676,10.437 107.932,10.031 108.259,9.686C108.595,9.331 108.996,9.056 109.463,8.86C109.93,8.655 110.452,8.552 111.031,8.552C111.6,8.552 112.114,8.655 112.571,8.86C113.038,9.065 113.434,9.341 113.761,9.686C114.088,10.022 114.335,10.419 114.503,10.876C114.68,11.324 114.769,11.795 114.769,12.29C114.769,12.402 114.764,12.509 114.755,12.612C114.746,12.705 114.736,12.785 114.727,12.85H108.861C108.889,13.177 108.964,13.471 109.085,13.732C109.216,13.993 109.379,14.222 109.575,14.418C109.78,14.605 110.009,14.749 110.261,14.852C110.522,14.955 110.793,15.006 111.073,15.006C111.278,15.006 111.479,14.983 111.675,14.936C111.88,14.88 112.067,14.805 112.235,14.712C112.403,14.609 112.552,14.488 112.683,14.348C112.814,14.208 112.916,14.054 112.991,13.886L114.307,14.264C114.055,14.815 113.635,15.267 113.047,15.622C112.468,15.967 111.792,16.14 111.017,16.14ZM113.243,11.786C113.215,11.478 113.136,11.193 113.005,10.932C112.884,10.671 112.725,10.451 112.529,10.274C112.333,10.087 112.104,9.943 111.843,9.84C111.582,9.737 111.306,9.686 111.017,9.686C110.728,9.686 110.452,9.737 110.191,9.84C109.939,9.943 109.715,10.087 109.519,10.274C109.323,10.451 109.164,10.671 109.043,10.932C108.922,11.193 108.847,11.478 108.819,11.786H113.243Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M122.731,16H121.191V11.898C121.191,11.207 121.079,10.708 120.855,10.4C120.641,10.083 120.319,9.924 119.889,9.924C119.665,9.924 119.441,9.966 119.217,10.05C118.993,10.134 118.783,10.255 118.587,10.414C118.391,10.563 118.214,10.745 118.055,10.96C117.906,11.165 117.789,11.394 117.705,11.646V16H116.165V8.678H117.565V10.148C117.845,9.653 118.251,9.266 118.783,8.986C119.315,8.697 119.903,8.552 120.547,8.552C120.986,8.552 121.345,8.631 121.625,8.79C121.905,8.949 122.125,9.168 122.283,9.448C122.451,9.719 122.568,10.036 122.633,10.4C122.699,10.755 122.731,11.133 122.731,11.534V16Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M130.735,8.398C130.641,8.295 130.506,8.188 130.329,8.076C130.151,7.955 129.941,7.843 129.699,7.74C129.465,7.637 129.204,7.553 128.915,7.488C128.635,7.423 128.345,7.39 128.047,7.39C127.384,7.39 126.894,7.511 126.577,7.754C126.269,7.997 126.115,8.333 126.115,8.762C126.115,9.005 126.161,9.205 126.255,9.364C126.357,9.513 126.511,9.649 126.717,9.77C126.922,9.882 127.179,9.985 127.487,10.078C127.795,10.162 128.154,10.255 128.565,10.358C129.069,10.479 129.521,10.615 129.923,10.764C130.333,10.913 130.679,11.095 130.959,11.31C131.239,11.525 131.453,11.791 131.603,12.108C131.761,12.416 131.841,12.794 131.841,13.242C131.841,13.746 131.743,14.18 131.547,14.544C131.36,14.908 131.099,15.207 130.763,15.44C130.436,15.664 130.053,15.832 129.615,15.944C129.176,16.047 128.705,16.098 128.201,16.098C127.445,16.098 126.712,15.986 126.003,15.762C125.303,15.529 124.668,15.193 124.099,14.754L124.813,13.41C124.934,13.531 125.107,13.667 125.331,13.816C125.564,13.965 125.83,14.105 126.129,14.236C126.437,14.357 126.768,14.465 127.123,14.558C127.477,14.642 127.846,14.684 128.229,14.684C128.845,14.684 129.321,14.577 129.657,14.362C129.993,14.147 130.161,13.83 130.161,13.41C130.161,13.158 130.095,12.948 129.965,12.78C129.843,12.612 129.666,12.467 129.433,12.346C129.199,12.215 128.915,12.099 128.579,11.996C128.243,11.893 127.86,11.786 127.431,11.674C126.936,11.543 126.502,11.408 126.129,11.268C125.765,11.119 125.461,10.941 125.219,10.736C124.976,10.531 124.789,10.293 124.659,10.022C124.537,9.742 124.477,9.406 124.477,9.014C124.477,8.529 124.57,8.099 124.757,7.726C124.943,7.343 125.195,7.026 125.513,6.774C125.839,6.513 126.222,6.317 126.661,6.186C127.099,6.055 127.575,5.99 128.089,5.99C128.761,5.99 129.381,6.097 129.951,6.312C130.52,6.527 131.019,6.793 131.449,7.11L130.735,8.398Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M137.349,15.622C137.153,15.715 136.883,15.823 136.537,15.944C136.192,16.056 135.823,16.112 135.431,16.112C135.189,16.112 134.96,16.079 134.745,16.014C134.531,15.949 134.339,15.851 134.171,15.72C134.013,15.589 133.887,15.421 133.793,15.216C133.7,15.001 133.653,14.745 133.653,14.446V9.868H132.687V8.678H133.653V6.27H135.193V8.678H136.789V9.868H135.193V13.956C135.212,14.217 135.291,14.409 135.431,14.53C135.581,14.642 135.763,14.698 135.977,14.698C136.192,14.698 136.397,14.661 136.593,14.586C136.789,14.511 136.934,14.451 137.027,14.404L137.349,15.622Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M142.672,10.008C142.075,10.027 141.543,10.167 141.076,10.428C140.619,10.68 140.292,11.044 140.096,11.52V16H138.556V8.678H139.984V10.316C140.236,9.812 140.563,9.411 140.964,9.112C141.375,8.804 141.813,8.636 142.28,8.608C142.373,8.608 142.448,8.608 142.504,8.608C142.569,8.608 142.625,8.613 142.672,8.622V10.008Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M146.881,16.14C146.312,16.14 145.794,16.042 145.327,15.846C144.86,15.641 144.459,15.365 144.123,15.02C143.796,14.675 143.54,14.273 143.353,13.816C143.176,13.359 143.087,12.873 143.087,12.36C143.087,11.847 143.176,11.361 143.353,10.904C143.54,10.437 143.796,10.031 144.123,9.686C144.459,9.331 144.86,9.056 145.327,8.86C145.794,8.655 146.316,8.552 146.895,8.552C147.464,8.552 147.978,8.655 148.435,8.86C148.902,9.065 149.298,9.341 149.625,9.686C149.952,10.022 150.199,10.419 150.367,10.876C150.544,11.324 150.633,11.795 150.633,12.29C150.633,12.402 150.628,12.509 150.619,12.612C150.61,12.705 150.6,12.785 150.591,12.85H144.725C144.753,13.177 144.828,13.471 144.949,13.732C145.08,13.993 145.243,14.222 145.439,14.418C145.644,14.605 145.873,14.749 146.125,14.852C146.386,14.955 146.657,15.006 146.937,15.006C147.142,15.006 147.343,14.983 147.539,14.936C147.744,14.88 147.931,14.805 148.099,14.712C148.267,14.609 148.416,14.488 148.547,14.348C148.678,14.208 148.78,14.054 148.855,13.886L150.171,14.264C149.919,14.815 149.499,15.267 148.911,15.622C148.332,15.967 147.656,16.14 146.881,16.14ZM149.107,11.786C149.079,11.478 149,11.193 148.869,10.932C148.748,10.671 148.589,10.451 148.393,10.274C148.197,10.087 147.968,9.943 147.707,9.84C147.446,9.737 147.17,9.686 146.881,9.686C146.592,9.686 146.316,9.737 146.055,9.84C145.803,9.943 145.579,10.087 145.383,10.274C145.187,10.451 145.028,10.671 144.907,10.932C144.786,11.193 144.711,11.478 144.683,11.786H149.107Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M155.347,16.14C154.778,16.14 154.26,16.042 153.793,15.846C153.327,15.641 152.925,15.365 152.589,15.02C152.263,14.675 152.006,14.273 151.819,13.816C151.642,13.359 151.553,12.873 151.553,12.36C151.553,11.847 151.642,11.361 151.819,10.904C152.006,10.437 152.263,10.031 152.589,9.686C152.925,9.331 153.327,9.056 153.793,8.86C154.26,8.655 154.783,8.552 155.361,8.552C155.931,8.552 156.444,8.655 156.901,8.86C157.368,9.065 157.765,9.341 158.091,9.686C158.418,10.022 158.665,10.419 158.833,10.876C159.011,11.324 159.099,11.795 159.099,12.29C159.099,12.402 159.095,12.509 159.085,12.612C159.076,12.705 159.067,12.785 159.057,12.85H153.191C153.219,13.177 153.294,13.471 153.415,13.732C153.546,13.993 153.709,14.222 153.905,14.418C154.111,14.605 154.339,14.749 154.591,14.852C154.853,14.955 155.123,15.006 155.403,15.006C155.609,15.006 155.809,14.983 156.005,14.936C156.211,14.88 156.397,14.805 156.565,14.712C156.733,14.609 156.883,14.488 157.013,14.348C157.144,14.208 157.247,14.054 157.321,13.886L158.637,14.264C158.385,14.815 157.965,15.267 157.377,15.622C156.799,15.967 156.122,16.14 155.347,16.14ZM157.573,11.786C157.545,11.478 157.466,11.193 157.335,10.932C157.214,10.671 157.055,10.451 156.859,10.274C156.663,10.087 156.435,9.943 156.173,9.84C155.912,9.737 155.637,9.686 155.347,9.686C155.058,9.686 154.783,9.737 154.521,9.84C154.269,9.943 154.045,10.087 153.849,10.274C153.653,10.451 153.495,10.671 153.373,10.932C153.252,11.193 153.177,11.478 153.149,11.786H157.573Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M164.515,15.622C164.319,15.715 164.048,15.823 163.703,15.944C163.357,16.056 162.989,16.112 162.597,16.112C162.354,16.112 162.125,16.079 161.911,16.014C161.696,15.949 161.505,15.851 161.337,15.72C161.178,15.589 161.052,15.421 160.959,15.216C160.865,15.001 160.819,14.745 160.819,14.446V9.868H159.853V8.678H160.819V6.27H162.359V8.678H163.955V9.868H162.359V13.956C162.377,14.217 162.457,14.409 162.597,14.53C162.746,14.642 162.928,14.698 163.143,14.698C163.357,14.698 163.563,14.661 163.759,14.586C163.955,14.511 164.099,14.451 164.193,14.404L164.515,15.622Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M174.275,16V8.846L171.321,14.264H170.453L167.485,8.846V16H165.917V6.06H167.597L170.887,12.136L174.177,6.06H175.857V16H174.275Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M179.921,16.14C179.566,16.14 179.235,16.084 178.927,15.972C178.628,15.851 178.367,15.687 178.143,15.482C177.928,15.277 177.755,15.034 177.625,14.754C177.503,14.474 177.443,14.171 177.443,13.844C177.443,13.499 177.517,13.186 177.667,12.906C177.816,12.626 178.026,12.383 178.297,12.178C178.577,11.973 178.903,11.814 179.277,11.702C179.659,11.59 180.079,11.534 180.537,11.534C180.882,11.534 181.223,11.567 181.559,11.632C181.895,11.688 182.198,11.767 182.469,11.87V11.366C182.469,10.825 182.315,10.405 182.007,10.106C181.699,9.798 181.255,9.644 180.677,9.644C180.285,9.644 179.897,9.719 179.515,9.868C179.141,10.008 178.754,10.213 178.353,10.484L177.877,9.504C178.819,8.869 179.799,8.552 180.817,8.552C181.825,8.552 182.609,8.809 183.169,9.322C183.729,9.835 184.009,10.573 184.009,11.534V14.18C184.009,14.507 184.144,14.675 184.415,14.684V16C184.265,16.028 184.135,16.047 184.023,16.056C183.92,16.065 183.817,16.07 183.715,16.07C183.416,16.07 183.183,15.995 183.015,15.846C182.856,15.697 182.758,15.505 182.721,15.272L182.679,14.81C182.352,15.239 181.946,15.571 181.461,15.804C180.985,16.028 180.471,16.14 179.921,16.14ZM180.341,15.006C180.714,15.006 181.064,14.941 181.391,14.81C181.727,14.67 181.988,14.479 182.175,14.236C182.371,14.068 182.469,13.891 182.469,13.704V12.738C182.207,12.635 181.927,12.556 181.629,12.5C181.339,12.444 181.055,12.416 180.775,12.416C180.224,12.416 179.771,12.537 179.417,12.78C179.071,13.013 178.899,13.326 178.899,13.718C178.899,14.082 179.034,14.39 179.305,14.642C179.575,14.885 179.921,15.006 180.341,15.006Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M190.175,16.14C189.587,16.14 189.069,16 188.621,15.72C188.173,15.44 187.818,15.076 187.557,14.628V18.982H186.017V8.678H187.375V9.994C187.655,9.555 188.014,9.205 188.453,8.944C188.901,8.683 189.405,8.552 189.965,8.552C190.469,8.552 190.931,8.655 191.351,8.86C191.771,9.065 192.135,9.341 192.443,9.686C192.751,10.031 192.989,10.433 193.157,10.89C193.334,11.347 193.423,11.828 193.423,12.332C193.423,12.864 193.344,13.363 193.185,13.83C193.026,14.287 192.802,14.689 192.513,15.034C192.224,15.37 191.878,15.641 191.477,15.846C191.085,16.042 190.651,16.14 190.175,16.14ZM189.671,14.824C189.998,14.824 190.292,14.754 190.553,14.614C190.824,14.474 191.052,14.287 191.239,14.054C191.435,13.821 191.584,13.555 191.687,13.256C191.79,12.957 191.841,12.649 191.841,12.332C191.841,11.996 191.78,11.679 191.659,11.38C191.547,11.081 191.388,10.82 191.183,10.596C190.987,10.372 190.749,10.195 190.469,10.064C190.189,9.933 189.886,9.868 189.559,9.868C189.363,9.868 189.158,9.905 188.943,9.98C188.728,10.055 188.528,10.157 188.341,10.288C188.154,10.419 187.991,10.573 187.851,10.75C187.711,10.918 187.613,11.105 187.557,11.31V13.228C187.65,13.452 187.772,13.662 187.921,13.858C188.07,14.054 188.234,14.222 188.411,14.362C188.598,14.502 188.798,14.614 189.013,14.698C189.228,14.782 189.447,14.824 189.671,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M201.529,16.14C201.034,16.14 200.577,16.042 200.157,15.846C199.737,15.641 199.373,15.365 199.065,15.02C198.757,14.675 198.514,14.273 198.337,13.816C198.169,13.349 198.085,12.85 198.085,12.318C198.085,11.805 198.164,11.324 198.323,10.876C198.491,10.419 198.72,10.017 199.009,9.672C199.308,9.327 199.653,9.056 200.045,8.86C200.446,8.655 200.885,8.552 201.361,8.552C201.949,8.552 202.467,8.697 202.915,8.986C203.363,9.266 203.713,9.625 203.965,10.064V5.78H205.505V14.18C205.505,14.357 205.533,14.483 205.589,14.558C205.654,14.633 205.766,14.675 205.925,14.684V16C205.766,16.028 205.636,16.047 205.533,16.056C205.44,16.065 205.36,16.07 205.295,16.07C204.987,16.07 204.735,15.991 204.539,15.832C204.343,15.673 204.236,15.468 204.217,15.216L204.189,14.67C203.918,15.127 203.55,15.487 203.083,15.748C202.616,16.009 202.098,16.14 201.529,16.14ZM201.907,14.824C202.131,14.824 202.355,14.787 202.579,14.712C202.803,14.637 203.008,14.535 203.195,14.404C203.382,14.273 203.54,14.119 203.671,13.942C203.811,13.765 203.909,13.573 203.965,13.368V11.45C203.881,11.217 203.76,11.002 203.601,10.806C203.452,10.61 203.279,10.442 203.083,10.302C202.887,10.162 202.677,10.055 202.453,9.98C202.238,9.905 202.019,9.868 201.795,9.868C201.487,9.868 201.202,9.938 200.941,10.078C200.689,10.218 200.47,10.405 200.283,10.638C200.096,10.871 199.947,11.137 199.835,11.436C199.732,11.735 199.681,12.043 199.681,12.36C199.681,12.696 199.737,13.013 199.849,13.312C199.97,13.611 200.134,13.872 200.339,14.096C200.544,14.32 200.778,14.497 201.039,14.628C201.31,14.759 201.599,14.824 201.907,14.824Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M209.547,16.14C209.192,16.14 208.861,16.084 208.553,15.972C208.254,15.851 207.993,15.687 207.769,15.482C207.554,15.277 207.382,15.034 207.251,14.754C207.13,14.474 207.069,14.171 207.069,13.844C207.069,13.499 207.144,13.186 207.293,12.906C207.442,12.626 207.652,12.383 207.923,12.178C208.203,11.973 208.53,11.814 208.903,11.702C209.286,11.59 209.706,11.534 210.163,11.534C210.508,11.534 210.849,11.567 211.185,11.632C211.521,11.688 211.824,11.767 212.095,11.87V11.366C212.095,10.825 211.941,10.405 211.633,10.106C211.325,9.798 210.882,9.644 210.303,9.644C209.911,9.644 209.524,9.719 209.141,9.868C208.768,10.008 208.38,10.213 207.979,10.484L207.503,9.504C208.446,8.869 209.426,8.552 210.443,8.552C211.451,8.552 212.235,8.809 212.795,9.322C213.355,9.835 213.635,10.573 213.635,11.534V14.18C213.635,14.507 213.77,14.675 214.041,14.684V16C213.892,16.028 213.761,16.047 213.649,16.056C213.546,16.065 213.444,16.07 213.341,16.07C213.042,16.07 212.809,15.995 212.641,15.846C212.482,15.697 212.384,15.505 212.347,15.272L212.305,14.81C211.978,15.239 211.572,15.571 211.087,15.804C210.611,16.028 210.098,16.14 209.547,16.14ZM209.967,15.006C210.34,15.006 210.69,14.941 211.017,14.81C211.353,14.67 211.614,14.479 211.801,14.236C211.997,14.068 212.095,13.891 212.095,13.704V12.738C211.834,12.635 211.554,12.556 211.255,12.5C210.966,12.444 210.681,12.416 210.401,12.416C209.85,12.416 209.398,12.537 209.043,12.78C208.698,13.013 208.525,13.326 208.525,13.718C208.525,14.082 208.66,14.39 208.931,14.642C209.202,14.885 209.547,15.006 209.967,15.006Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M219.663,15.622C219.467,15.715 219.196,15.823 218.851,15.944C218.505,16.056 218.137,16.112 217.745,16.112C217.502,16.112 217.273,16.079 217.059,16.014C216.844,15.949 216.653,15.851 216.485,15.72C216.326,15.589 216.2,15.421 216.107,15.216C216.013,15.001 215.967,14.745 215.967,14.446V9.868H215.001V8.678H215.967V6.27H217.507V8.678H219.103V9.868H217.507V13.956C217.525,14.217 217.605,14.409 217.745,14.53C217.894,14.642 218.076,14.698 218.291,14.698C218.505,14.698 218.711,14.661 218.907,14.586C219.103,14.511 219.247,14.451 219.341,14.404L219.663,15.622Z"
android:fillColor="#BFBFBF"/>
<path
android:pathData="M222.815,16.14C222.461,16.14 222.129,16.084 221.821,15.972C221.523,15.851 221.261,15.687 221.037,15.482C220.823,15.277 220.65,15.034 220.519,14.754C220.398,14.474 220.337,14.171 220.337,13.844C220.337,13.499 220.412,13.186 220.561,12.906C220.711,12.626 220.921,12.383 221.191,12.178C221.471,11.973 221.798,11.814 222.171,11.702C222.554,11.59 222.974,11.534 223.431,11.534C223.777,11.534 224.117,11.567 224.453,11.632C224.789,11.688 225.093,11.767 225.363,11.87V11.366C225.363,10.825 225.209,10.405 224.901,10.106C224.593,9.798 224.15,9.644 223.571,9.644C223.179,9.644 222.792,9.719 222.409,9.868C222.036,10.008 221.649,10.213 221.247,10.484L220.771,9.504C221.714,8.869 222.694,8.552 223.711,8.552C224.719,8.552 225.503,8.809 226.063,9.322C226.623,9.835 226.903,10.573 226.903,11.534V14.18C226.903,14.507 227.039,14.675 227.309,14.684V16C227.16,16.028 227.029,16.047 226.917,16.056C226.815,16.065 226.712,16.07 226.609,16.07C226.311,16.07 226.077,15.995 225.909,15.846C225.751,15.697 225.653,15.505 225.615,15.272L225.573,14.81C225.247,15.239 224.841,15.571 224.355,15.804C223.879,16.028 223.366,16.14 222.815,16.14ZM223.235,15.006C223.609,15.006 223.959,14.941 224.285,14.81C224.621,14.67 224.883,14.479 225.069,14.236C225.265,14.068 225.363,13.891 225.363,13.704V12.738C225.102,12.635 224.822,12.556 224.523,12.5C224.234,12.444 223.949,12.416 223.669,12.416C223.119,12.416 222.666,12.537 222.311,12.78C221.966,13.013 221.793,13.326 221.793,13.718C221.793,14.082 221.929,14.39 222.199,14.642C222.47,14.885 222.815,15.006 223.235,15.006Z"
android:fillColor="#BFBFBF"/>
</vector>

18
OsmAnd/res/drawable/image_text_osmand.xml
View file

@ -7,27 +7,21 @@
<clip-path android:pathData="M0,0h172v36h-172z M 0,0"/>
<path
android:pathData="M15.4629 34.252C13.2509 34.252 11.2349 33.818 9.41489 32.95C7.59489 32.082 6.0409 30.948 4.7529 29.548C3.4649 28.12 2.4569 26.496 1.7289 24.676C1.0289 22.856 0.678894 20.98 0.678894 19.048C0.678894 17.088 1.0429 15.198 1.7709 13.378C2.5269 11.558 3.56289 9.96203 4.87889 8.59003C6.2229 7.19003 7.8049 6.08403 9.6249 5.27203C11.4449 4.43203 13.4329 4.01203 15.5889 4.01203C17.8009 4.01203 19.8169 4.44603 21.6369 5.31403C23.4569 6.18203 25.0109 7.33003 26.2989 8.75803C27.5869 10.186 28.5809 11.81 29.2809 13.63C29.9809 15.45 30.3309 17.298 30.3309 19.174C30.3309 21.134 29.9529 23.024 29.1969 24.844C28.4689 26.664 27.4469 28.274 26.1309 29.674C24.8149 31.046 23.2469 32.152 21.4269 32.992C19.6069 33.832 17.6189 34.252 15.4629 34.252ZM7.69289 19.132C7.69289 20.28 7.8609 21.4 8.1969 22.492C8.5329 23.556 9.0229 24.508 9.6669 25.348C10.3389 26.188 11.1649 26.86 12.1449 27.364C13.1249 27.868 14.2449 28.12 15.5049 28.12C16.8209 28.12 17.9689 27.854 18.9489 27.322C19.9289 26.79 20.7409 26.104 21.3849 25.264C22.0289 24.396 22.5049 23.43 22.8129 22.366C23.1489 21.274 23.3169 20.168 23.3169 19.048C23.3169 17.9 23.1489 16.794 22.8129 15.73C22.4769 14.638 21.9729 13.686 21.3009 12.874C20.6289 12.034 19.8029 11.376 18.8229 10.9C17.8709 10.396 16.7649 10.144 15.5049 10.144C14.1889 10.144 13.0409 10.41 12.0609 10.942C11.1089 11.446 10.2969 12.118 9.6249 12.958C8.9809 13.798 8.4909 14.764 8.1549 15.856C7.8469 16.92 7.69289 18.012 7.69289 19.132Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M42.459 34.42C40.583 34.42 38.7351 34.126 36.9151 33.538C35.0951 32.922 33.555 32.04 32.295 30.892L34.6891 26.776C36.0331 27.7 37.3351 28.414 38.5951 28.918C39.8831 29.422 41.115 29.674 42.291 29.674C43.159 29.674 43.831 29.52 44.307 29.212C44.783 28.904 45.0211 28.456 45.0211 27.868C45.0211 27.28 44.713 26.818 44.097 26.482C43.509 26.118 42.459 25.74 40.947 25.348C39.463 24.928 38.203 24.522 37.167 24.13C36.159 23.738 35.3331 23.304 34.6891 22.828C34.0451 22.352 33.5831 21.806 33.3031 21.19C33.0231 20.574 32.8831 19.846 32.8831 19.006C32.8831 17.886 33.107 16.864 33.555 15.94C34.003 15.016 34.619 14.232 35.403 13.588C36.187 12.944 37.1111 12.44 38.1751 12.076C39.2671 11.712 40.4431 11.53 41.7031 11.53C43.3551 11.53 44.8951 11.754 46.3231 12.202C47.7791 12.65 49.1791 13.462 50.5231 14.638L47.9191 18.67C46.6591 17.802 45.5391 17.172 44.5591 16.78C43.5791 16.388 42.6271 16.192 41.7031 16.192C40.9751 16.192 40.3591 16.346 39.8551 16.654C39.3511 16.934 39.099 17.396 39.099 18.04C39.099 18.656 39.3651 19.118 39.8971 19.426C40.4571 19.734 41.4791 20.07 42.9631 20.434C44.5311 20.854 45.8471 21.274 46.9111 21.694C48.0031 22.114 48.885 22.59 49.557 23.122C50.229 23.626 50.719 24.214 51.0271 24.886C51.3351 25.558 51.4891 26.356 51.4891 27.28C51.4891 29.464 50.6771 31.2 49.0531 32.488C47.4291 33.776 45.231 34.42 42.459 34.42Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M102.628 4.18003H108.844L119.722 34H112.666L110.356 27.322H101.074L98.806 34H91.75L102.628 4.18003ZM109.222 22.576L105.736 12.034L102.166 22.576H109.222Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M156.986 34.42C155.474 34.42 154.074 34.14 152.786 33.58C151.526 32.992 150.434 32.18 149.51 31.144C148.586 30.108 147.858 28.904 147.326 27.532C146.822 26.132 146.57 24.606 146.57 22.954C146.57 21.358 146.808 19.86 147.284 18.46C147.76 17.06 148.431 15.856 149.299 14.848C150.167 13.812 151.189 13 152.365 12.412C153.569 11.824 154.886 11.53 156.314 11.53C157.854 11.53 159.239 11.894 160.471 12.622C161.731 13.35 162.698 14.33 163.37 15.562V3.34003H170.09V26.44C170.09 27.112 170.188 27.588 170.383 27.868C170.607 28.12 170.986 28.274 171.518 28.33V34C170.902 34.14 170.37 34.224 169.922 34.252C169.474 34.308 169.053 34.336 168.661 34.336C167.485 34.336 166.533 34.098 165.805 33.622C165.077 33.118 164.658 32.404 164.546 31.48L164.419 30.346C163.635 31.718 162.572 32.74 161.228 33.412C159.912 34.084 158.498 34.42 156.986 34.42ZM158.792 28.75C159.716 28.75 160.597 28.484 161.438 27.952C162.306 27.392 162.963 26.636 163.411 25.684V21.064C162.991 19.944 162.306 19.034 161.354 18.334C160.43 17.606 159.464 17.242 158.456 17.242C157.728 17.242 157.055 17.41 156.439 17.746C155.851 18.054 155.333 18.474 154.885 19.006C154.437 19.538 154.087 20.154 153.835 20.854C153.611 21.554 153.499 22.296 153.499 23.08C153.499 23.892 153.626 24.648 153.878 25.348C154.158 26.048 154.521 26.65 154.969 27.154C155.445 27.658 156.006 28.05 156.65 28.33C157.322 28.61 158.036 28.75 158.792 28.75Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
</group>
</vector>

24
OsmAnd/res/drawable/image_text_osmand_inapp.xml
View file

@ -7,39 +7,31 @@
<clip-path android:pathData="M0,0h172v72h-172z M 0,0"/>
<path
android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M159.895 59.016C159.895 58.6333 159.843 58.2833 159.741 57.966C159.638 57.6487 159.489 57.378 159.293 57.154C159.106 56.93 158.873 56.7573 158.593 56.636C158.313 56.5053 158 56.44 157.655 56.44H156.563V61.62H157.655C158.009 61.62 158.327 61.5547 158.607 61.424C158.887 61.2933 159.12 61.1113 159.307 60.878C159.503 60.6447 159.647 60.3693 159.741 60.052C159.843 59.7347 159.895 59.3893 159.895 59.016Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M68 49C68 47.8954 68.8954 47 70 47H169C170.105 47 171 47.8954 171 49V69C171 70.1046 170.105 71 169 71H70C68.8954 71 68 70.1046 68 69V49ZM82.9503 61.452C82.7263 61.592 82.4557 61.662 82.1383 61.662C81.821 61.662 81.5503 61.5967 81.3263 61.466C81.1117 61.326 80.9343 61.144 80.7943 60.92C80.6543 60.6867 80.5517 60.4207 80.4863 60.122C80.421 59.814 80.3883 59.4967 80.3883 59.17V54.06H77.6583V59.17C77.6583 59.8327 77.7423 60.4627 77.9103 61.06C78.0783 61.648 78.3443 62.166 78.7083 62.614C79.0723 63.062 79.5343 63.4213 80.0943 63.692C80.6637 63.9533 81.345 64.084 82.1383 64.084C82.9037 64.084 83.5663 63.958 84.1263 63.706C84.6957 63.454 85.167 63.1087 85.5403 62.67C85.9137 62.2313 86.189 61.7133 86.3663 61.116C86.5437 60.5093 86.6323 59.8607 86.6323 59.17V54.06H83.9023V59.17C83.9023 59.4967 83.8697 59.8093 83.8043 60.108C83.739 60.4067 83.6363 60.6727 83.4963 60.906C83.3563 61.13 83.1743 61.312 82.9503 61.452ZM92.0526 64V59.114L96.0006 64H98.1706V54.06H95.4406V59.114L91.4506 54.06H89.3226V64H92.0526ZM100.997 64V54.06H103.727V61.62H108.235V64H100.997ZM110.307 54.06V64H113.037V54.06H110.307ZM123.388 64V58.764L121.722 62.446H120.266L118.6 58.764V64H115.87V54.06H118.852L120.994 58.736L123.15 54.06H126.118V64H123.388ZM128.939 54.06V64H131.669V54.06H128.939ZM142.245 56.44H139.389V64H136.659V56.44H133.789V54.06H142.245V56.44ZM151.443 64V61.62H147.089V60.052H150.701V57.84H147.089V56.44H151.317V54.06H144.359V64H151.443ZM153.833 64V54.06H157.655C158.476 54.06 159.199 54.1907 159.825 54.452C160.45 54.7133 160.973 55.068 161.393 55.516C161.813 55.964 162.13 56.4913 162.345 57.098C162.559 57.6953 162.667 58.3347 162.667 59.016C162.667 59.772 162.545 60.458 162.303 61.074C162.069 61.6807 161.733 62.2033 161.295 62.642C160.856 63.0713 160.329 63.4073 159.713 63.65C159.097 63.8833 158.411 64 157.655 64H153.833Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
</group>
</vector>

30
OsmAnd/res/drawable/image_text_osmand_osmlive.xml
View file

@ -7,47 +7,37 @@
<clip-path android:pathData="M0,0h172v72h-172z M 0,0"/>
<path
android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M60.08 59.044C60.08 59.38 60.1266 59.7067 60.22 60.024C60.3133 60.332 60.4533 60.6073 60.64 60.85C60.8267 61.0927 61.06 61.2887 61.34 61.438C61.6293 61.5873 61.97 61.662 62.362 61.662C62.754 61.662 63.0947 61.5873 63.384 61.438C63.6733 61.2793 63.9067 61.0787 64.084 60.836C64.2707 60.584 64.406 60.2993 64.49 59.982C64.5833 59.6647 64.63 59.3427 64.63 59.016C64.63 58.68 64.5833 58.358 64.49 58.05C64.3967 57.7327 64.252 57.4573 64.056 57.224C63.8693 56.9813 63.6313 56.79 63.342 56.65C63.062 56.5007 62.7307 56.426 62.348 56.426C61.956 56.426 61.6153 56.5007 61.326 56.65C61.046 56.7993 60.8126 57 60.626 57.252C60.4393 57.4947 60.2993 57.7747 60.206 58.092C60.122 58.4 60.08 58.7173 60.08 59.044Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M97.1309 60.234L96.2489 57.154L95.3249 60.234H97.1309Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M120.467 57.966C120.57 58.2833 120.621 58.6333 120.621 59.016C120.621 59.3893 120.57 59.7347 120.467 60.052C120.374 60.3693 120.229 60.6447 120.033 60.878C119.847 61.1113 119.613 61.2933 119.333 61.424C119.053 61.5547 118.736 61.62 118.381 61.62H117.289V56.44H118.381C118.727 56.44 119.039 56.5053 119.319 56.636C119.599 56.7573 119.833 56.93 120.019 57.154C120.215 57.378 120.365 57.6487 120.467 57.966Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M49 49C49 47.8954 49.8954 47 51 47H169C170.105 47 171 47.8954 171 49V69C171 70.1046 170.105 71 169 71H51C49.8954 71 49 70.1046 49 69V49ZM75.617 57.308C75.337 57.14 75.0477 56.9907 74.749 56.86C74.497 56.748 74.2124 56.6453 73.895 56.552C73.587 56.4493 73.2837 56.398 72.985 56.398C72.7424 56.398 72.5464 56.4353 72.397 56.51C72.257 56.5847 72.187 56.7107 72.187 56.888C72.187 57.0187 72.229 57.126 72.313 57.21C72.397 57.294 72.5184 57.3733 72.677 57.448C72.8357 57.5133 73.027 57.5787 73.251 57.644C73.4844 57.7093 73.7457 57.7887 74.035 57.882C74.4924 58.022 74.903 58.176 75.267 58.344C75.6404 58.512 75.9577 58.7127 76.219 58.946C76.4804 59.17 76.681 59.4453 76.821 59.772C76.961 60.0987 77.031 60.4953 77.031 60.962C77.031 61.5593 76.919 62.0633 76.695 62.474C76.4804 62.8753 76.191 63.1973 75.827 63.44C75.4724 63.6827 75.0664 63.86 74.609 63.972C74.161 64.0747 73.7084 64.126 73.251 64.126C72.887 64.126 72.5137 64.098 72.131 64.042C71.7484 63.986 71.3657 63.9067 70.983 63.804C70.6097 63.7013 70.2457 63.58 69.891 63.44C69.5457 63.3 69.2237 63.1413 68.925 62.964L70.101 60.57C70.4277 60.7753 70.7684 60.9573 71.123 61.116C71.4217 61.256 71.7577 61.382 72.131 61.494C72.5137 61.606 72.901 61.662 73.293 61.662C73.5917 61.662 73.797 61.6247 73.909 61.55C74.0304 61.466 74.091 61.3587 74.091 61.228C74.091 61.088 74.0304 60.9713 73.909 60.878C73.797 60.7753 73.6384 60.6867 73.433 60.612C73.2277 60.5373 72.9897 60.4627 72.719 60.388C72.4577 60.3133 72.1777 60.2247 71.879 60.122C71.4404 59.9727 71.0624 59.814 70.745 59.646C70.4277 59.4687 70.1664 59.2727 69.961 59.058C69.7557 58.834 69.6017 58.582 69.499 58.302C69.4057 58.022 69.359 57.7 69.359 57.336C69.359 56.7853 69.457 56.3 69.653 55.88C69.8584 55.46 70.1337 55.11 70.479 54.83C70.8244 54.55 71.2164 54.34 71.655 54.2C72.103 54.0507 72.5744 53.976 73.069 53.976C73.433 53.976 73.7877 54.0133 74.133 54.088C74.4784 54.1533 74.8097 54.242 75.127 54.354C75.4537 54.4567 75.757 54.5733 76.037 54.704C76.317 54.8253 76.569 54.942 76.793 55.054L75.617 57.308ZM62.334 64.084C61.578 64.084 60.892 63.9393 60.276 63.65C59.66 63.3607 59.1327 62.9827 58.694 62.516C58.2553 62.04 57.9146 61.4987 57.672 60.892C57.4293 60.2853 57.308 59.66 57.308 59.016C57.308 58.3627 57.434 57.7327 57.686 57.126C57.938 56.5193 58.288 55.9873 58.736 55.53C59.1933 55.0633 59.73 54.6947 60.346 54.424C60.9713 54.144 61.6526 54.004 62.39 54.004C63.146 54.004 63.832 54.1487 64.448 54.438C65.064 54.7273 65.5913 55.11 66.03 55.586C66.4687 56.062 66.8046 56.6033 67.038 57.21C67.2807 57.8167 67.402 58.4373 67.402 59.072C67.402 59.7253 67.276 60.3553 67.024 60.962C66.772 61.5593 66.422 62.0913 65.974 62.558C65.526 63.0153 64.9893 63.384 64.364 63.664C63.748 63.944 63.0713 64.084 62.334 64.084ZM86.8757 58.764V64H89.6057V54.06H86.6377L84.4817 58.736L82.3397 54.06H79.3577V64H82.0877V58.764L83.7537 62.446H85.2097L86.8757 58.764ZM95.0029 54.06H97.4949L100.939 64H98.1669L97.5649 62.054H94.9189L94.3309 64H91.5449L95.0029 54.06ZM105.615 64V59.114L109.563 64H111.733V54.06H109.003V59.114L105.013 54.06H102.885V64H105.615ZM114.559 64V54.06H118.381C119.203 54.06 119.926 54.1907 120.551 54.452C121.177 54.7133 121.699 55.068 122.119 55.516C122.539 55.964 122.857 56.4913 123.071 57.098C123.286 57.6953 123.393 58.3347 123.393 59.016C123.393 59.772 123.272 60.458 123.029 61.074C122.796 61.6807 122.46 62.2033 122.021 62.642C121.583 63.0713 121.055 63.4073 120.439 63.65C119.823 63.8833 119.137 64 118.381 64H114.559ZM129.965 54.06V64H137.203V61.62H132.695V54.06H129.965ZM139.275 64V54.06H142.005V64H139.275ZM148.702 60.57L146.756 54.06H143.872L147.568 64H149.836L153.49 54.06H150.62L148.702 60.57ZM162.449 61.62V64H155.365V54.06H162.323V56.44H158.095V57.84H161.707V60.052H158.095V61.62H162.449Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
</group>
</vector>

21
OsmAnd/res/drawable/image_text_osmand_plus.xml
View file

@ -7,34 +7,27 @@
<clip-path android:pathData="M0,0h212v36h-212z M 0,0"/>
<path
android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M191 4H198V15H209V22H198V33H191V22H180V15H191V4Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
</group>
</vector>

33
OsmAnd/res/drawable/image_text_osmand_plus_osmlive.xml
View file

@ -5,50 +5,39 @@
android:viewportHeight="72">
<path
android:pathData="M152.786,33.58C154.074,34.14 155.474,34.42 156.986,34.42C158.497,34.42 159.912,34.084 161.228,33.412C162.572,32.74 163.635,31.718 164.419,30.346L164.546,31.48C164.658,32.404 165.077,33.118 165.805,33.622C166.533,34.098 167.486,34.336 168.661,34.336C169.053,34.336 169.474,34.308 169.922,34.252C170.37,34.224 170.902,34.14 171.518,34V28.33C170.986,28.274 170.607,28.12 170.383,27.868C170.188,27.588 170.09,27.112 170.09,26.44V3.34H163.37V15.562C162.698,14.33 161.731,13.35 160.471,12.622C159.24,11.894 157.854,11.53 156.314,11.53C154.886,11.53 153.569,11.824 152.365,12.412C151.189,13 150.167,13.812 149.299,14.848C148.432,15.856 147.76,17.06 147.284,18.46C146.808,19.86 146.57,21.358 146.57,22.954C146.57,24.606 146.822,26.132 147.326,27.532C147.857,28.904 148.586,30.108 149.51,31.144C150.434,32.18 151.526,32.992 152.786,33.58ZM161.438,27.952C160.598,28.484 159.715,28.75 158.792,28.75C158.036,28.75 157.322,28.61 156.65,28.33C156.006,28.05 155.445,27.658 154.969,27.154C154.521,26.65 154.158,26.048 153.878,25.348C153.626,24.648 153.499,23.892 153.499,23.08C153.499,22.296 153.611,21.554 153.835,20.854C154.087,20.154 154.438,19.538 154.885,19.006C155.333,18.474 155.852,18.054 156.439,17.746C157.055,17.41 157.728,17.242 158.456,17.242C159.464,17.242 160.43,17.606 161.354,18.334C162.305,19.034 162.992,19.944 163.411,21.064V25.684C162.964,26.636 162.305,27.392 161.438,27.952Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M9.415,32.95C11.235,33.818 13.251,34.252 15.463,34.252C17.619,34.252 19.607,33.832 21.427,32.992C23.247,32.152 24.815,31.046 26.131,29.674C27.447,28.274 28.469,26.664 29.197,24.844C29.953,23.024 30.331,21.134 30.331,19.174C30.331,17.298 29.981,15.45 29.281,13.63C28.581,11.81 27.587,10.186 26.299,8.758C25.011,7.33 23.457,6.182 21.637,5.314C19.817,4.446 17.801,4.012 15.589,4.012C13.433,4.012 11.445,4.432 9.625,5.272C7.805,6.084 6.223,7.19 4.879,8.59C3.563,9.962 2.527,11.558 1.771,13.378C1.043,15.198 0.679,17.088 0.679,19.048C0.679,20.98 1.029,22.856 1.729,24.676C2.457,26.496 3.465,28.12 4.753,29.548C6.041,30.948 7.595,32.082 9.415,32.95ZM8.197,22.492C7.861,21.4 7.693,20.28 7.693,19.132C7.693,18.012 7.847,16.92 8.155,15.856C8.491,14.764 8.981,13.798 9.625,12.958C10.297,12.118 11.109,11.446 12.061,10.942C13.041,10.41 14.189,10.144 15.505,10.144C16.765,10.144 17.871,10.396 18.823,10.9C19.803,11.376 20.629,12.034 21.301,12.874C21.973,13.686 22.477,14.638 22.813,15.73C23.149,16.794 23.317,17.9 23.317,19.048C23.317,20.168 23.149,21.274 22.813,22.366C22.505,23.43 22.029,24.396 21.385,25.264C20.741,26.104 19.929,26.79 18.949,27.322C17.969,27.854 16.821,28.12 15.505,28.12C14.245,28.12 13.125,27.868 12.145,27.364C11.165,26.86 10.339,26.188 9.667,25.348C9.023,24.508 8.533,23.556 8.197,22.492Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M36.915,33.538C38.735,34.126 40.583,34.42 42.459,34.42C45.231,34.42 47.429,33.776 49.053,32.488C50.677,31.2 51.489,29.464 51.489,27.28C51.489,26.356 51.335,25.558 51.027,24.886C50.719,24.214 50.229,23.626 49.557,23.122C48.885,22.59 48.003,22.114 46.911,21.694C45.847,21.274 44.531,20.854 42.963,20.434C41.479,20.07 40.457,19.734 39.897,19.426C39.365,19.118 39.099,18.656 39.099,18.04C39.099,17.396 39.351,16.934 39.855,16.654C40.359,16.346 40.975,16.192 41.703,16.192C42.627,16.192 43.579,16.388 44.559,16.78C45.539,17.172 46.659,17.802 47.919,18.67L50.523,14.638C49.179,13.462 47.779,12.65 46.323,12.202C44.895,11.754 43.355,11.53 41.703,11.53C40.443,11.53 39.267,11.712 38.175,12.076C37.111,12.44 36.187,12.944 35.403,13.588C34.619,14.232 34.003,15.016 33.555,15.94C33.107,16.864 32.883,17.886 32.883,19.006C32.883,19.846 33.023,20.574 33.303,21.19C33.583,21.806 34.045,22.352 34.689,22.828C35.333,23.304 36.159,23.738 37.167,24.13C38.203,24.522 39.463,24.928 40.947,25.348C42.459,25.74 43.509,26.118 44.097,26.482C44.713,26.818 45.021,27.28 45.021,27.868C45.021,28.456 44.783,28.904 44.307,29.212C43.831,29.52 43.159,29.674 42.291,29.674C41.115,29.674 39.883,29.422 38.595,28.918C37.335,28.414 36.033,27.7 34.689,26.776L32.295,30.892C33.555,32.04 35.095,32.922 36.915,33.538Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M89.584,34H82.864V21.61C82.864,20.154 82.598,19.104 82.066,18.46C81.534,17.788 80.848,17.452 80.008,17.452C79.56,17.452 79.098,17.55 78.622,17.746C78.174,17.942 77.754,18.222 77.362,18.586C76.97,18.922 76.606,19.328 76.27,19.804C75.962,20.28 75.71,20.798 75.514,21.358V34H68.794V21.61C68.794,20.154 68.528,19.104 67.996,18.46C67.464,17.788 66.778,17.452 65.938,17.452C65.042,17.452 64.16,17.816 63.292,18.544C62.452,19.244 61.836,20.182 61.444,21.358V34H54.724V11.95H60.772V15.646C61.584,14.302 62.676,13.28 64.048,12.58C65.448,11.88 67.072,11.53 68.92,11.53C69.844,11.53 70.642,11.642 71.314,11.866C72.014,12.09 72.616,12.398 73.12,12.79C73.624,13.182 74.03,13.644 74.338,14.176C74.646,14.68 74.87,15.226 75.01,15.814C75.85,14.442 76.956,13.392 78.328,12.664C79.7,11.908 81.268,11.53 83.032,11.53C84.432,11.53 85.552,11.796 86.392,12.328C87.26,12.832 87.932,13.504 88.408,14.344C88.884,15.156 89.192,16.052 89.332,17.032C89.5,18.012 89.584,18.964 89.584,19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M108.844,4.18H102.628L91.75,34H98.806L101.074,27.322H110.356L112.666,34H119.722L108.844,4.18ZM105.736,12.034L109.222,22.576H102.166L105.736,12.034Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
<path
android:pathData="M143.365,34H136.645V21.61C136.645,20.154 136.365,19.104 135.805,18.46C135.273,17.788 134.559,17.452 133.663,17.452C133.187,17.452 132.711,17.55 132.235,17.746C131.759,17.942 131.297,18.222 130.849,18.586C130.401,18.922 129.995,19.328 129.631,19.804C129.295,20.28 129.029,20.798 128.833,21.358V34H122.113V11.95H128.161V15.646C128.973,14.33 130.121,13.322 131.605,12.622C133.089,11.894 134.797,11.53 136.729,11.53C138.157,11.53 139.305,11.796 140.173,12.328C141.041,12.832 141.713,13.504 142.189,14.344C142.665,15.156 142.973,16.052 143.113,17.032C143.281,18.012 143.365,18.964 143.365,19.888V34Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M198,4H191V15H180V22H191V33H198V22H209V15H198V4Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M60.22,60.024C60.127,59.707 60.08,59.38 60.08,59.044C60.08,58.717 60.122,58.4 60.206,58.092C60.299,57.775 60.439,57.495 60.626,57.252C60.813,57 61.046,56.799 61.326,56.65C61.615,56.501 61.956,56.426 62.348,56.426C62.731,56.426 63.062,56.501 63.342,56.65C63.631,56.79 63.869,56.981 64.056,57.224C64.252,57.457 64.397,57.733 64.49,58.05C64.583,58.358 64.63,58.68 64.63,59.016C64.63,59.343 64.583,59.665 64.49,59.982C64.406,60.299 64.271,60.584 64.084,60.836C63.907,61.079 63.673,61.279 63.384,61.438C63.095,61.587 62.754,61.662 62.362,61.662C61.97,61.662 61.629,61.587 61.34,61.438C61.06,61.289 60.827,61.093 60.64,60.85C60.453,60.607 60.313,60.332 60.22,60.024Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M96.249,57.154L97.131,60.234H95.325L96.249,57.154Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M120.621,59.016C120.621,58.633 120.57,58.283 120.467,57.966C120.365,57.649 120.215,57.378 120.019,57.154C119.833,56.93 119.599,56.757 119.319,56.636C119.039,56.505 118.727,56.44 118.381,56.44H117.289V61.62H118.381C118.736,61.62 119.053,61.555 119.333,61.424C119.613,61.293 119.847,61.111 120.033,60.878C120.229,60.645 120.374,60.369 120.467,60.052C120.57,59.735 120.621,59.389 120.621,59.016Z"
android:fillColor="#000000"
android:fillAlpha="0.15"/>
android:fillColor="#BFBFBF"/>
<path
android:pathData="M51,47C49.895,47 49,47.895 49,49V69C49,70.105 49.895,71 51,71H169C170.105,71 171,70.105 171,69V49C171,47.895 170.105,47 169,47H51ZM74.749,56.86C75.048,56.991 75.337,57.14 75.617,57.308L76.793,55.054C76.569,54.942 76.317,54.825 76.037,54.704C75.757,54.573 75.454,54.457 75.127,54.354C74.81,54.242 74.478,54.153 74.133,54.088C73.788,54.013 73.433,53.976 73.069,53.976C72.574,53.976 72.103,54.051 71.655,54.2C71.216,54.34 70.824,54.55 70.479,54.83C70.134,55.11 69.858,55.46 69.653,55.88C69.457,56.3 69.359,56.785 69.359,57.336C69.359,57.7 69.406,58.022 69.499,58.302C69.602,58.582 69.756,58.834 69.961,59.058C70.166,59.273 70.428,59.469 70.745,59.646C71.062,59.814 71.44,59.973 71.879,60.122C72.178,60.225 72.458,60.313 72.719,60.388C72.99,60.463 73.228,60.537 73.433,60.612C73.638,60.687 73.797,60.775 73.909,60.878C74.03,60.971 74.091,61.088 74.091,61.228C74.091,61.359 74.03,61.466 73.909,61.55C73.797,61.625 73.592,61.662 73.293,61.662C72.901,61.662 72.514,61.606 72.131,61.494C71.758,61.382 71.422,61.256 71.123,61.116C70.768,60.957 70.428,60.775 70.101,60.57L68.925,62.964C69.224,63.141 69.546,63.3 69.891,63.44C70.246,63.58 70.61,63.701 70.983,63.804C71.366,63.907 71.748,63.986 72.131,64.042C72.514,64.098 72.887,64.126 73.251,64.126C73.708,64.126 74.161,64.075 74.609,63.972C75.066,63.86 75.472,63.683 75.827,63.44C76.191,63.197 76.48,62.875 76.695,62.474C76.919,62.063 77.031,61.559 77.031,60.962C77.031,60.495 76.961,60.099 76.821,59.772C76.681,59.445 76.48,59.17 76.219,58.946C75.958,58.713 75.64,58.512 75.267,58.344C74.903,58.176 74.492,58.022 74.035,57.882C73.746,57.789 73.484,57.709 73.251,57.644C73.027,57.579 72.836,57.513 72.677,57.448C72.518,57.373 72.397,57.294 72.313,57.21C72.229,57.126 72.187,57.019 72.187,56.888C72.187,56.711 72.257,56.585 72.397,56.51C72.546,56.435 72.742,56.398 72.985,56.398C73.284,56.398 73.587,56.449 73.895,56.552C74.212,56.645 74.497,56.748 74.749,56.86ZM60.276,63.65C60.892,63.939 61.578,64.084 62.334,64.084C63.071,64.084 63.748,63.944 64.364,63.664C64.989,63.384 65.526,63.015 65.974,62.558C66.422,62.091 66.772,61.559 67.024,60.962C67.276,60.355 67.402,59.725 67.402,59.072C67.402,58.437 67.281,57.817 67.038,57.21C66.805,56.603 66.469,56.062 66.03,55.586C65.591,55.11 65.064,54.727 64.448,54.438C63.832,54.149 63.146,54.004 62.39,54.004C61.653,54.004 60.971,54.144 60.346,54.424C59.73,54.695 59.193,55.063 58.736,55.53C58.288,55.987 57.938,56.519 57.686,57.126C57.434,57.733 57.308,58.363 57.308,59.016C57.308,59.66 57.429,60.285 57.672,60.892C57.915,61.499 58.255,62.04 58.694,62.516C59.133,62.983 59.66,63.361 60.276,63.65ZM86.876,64V58.764L85.21,62.446H83.754L82.088,58.764V64H79.358V54.06H82.34L84.482,58.736L86.638,54.06H89.606V64H86.876ZM97.495,54.06H95.003L91.545,64H94.331L94.919,62.054H97.565L98.167,64H100.939L97.495,54.06ZM105.615,59.114V64H102.885V54.06H105.013L109.003,59.114V54.06H111.733V64H109.563L105.615,59.114ZM114.559,54.06V64H118.381C119.137,64 119.823,63.883 120.439,63.65C121.055,63.407 121.583,63.071 122.021,62.642C122.46,62.203 122.796,61.681 123.029,61.074C123.272,60.458 123.393,59.772 123.393,59.016C123.393,58.335 123.286,57.695 123.071,57.098C122.857,56.491 122.539,55.964 122.119,55.516C121.699,55.068 121.177,54.713 120.551,54.452C119.926,54.191 119.203,54.06 118.381,54.06H114.559ZM129.965,64V54.06H132.695V61.62H137.203V64H129.965ZM139.275,54.06V64H142.005V54.06H139.275ZM146.756,54.06L148.702,60.57L150.62,54.06H153.49L149.836,64H147.568L143.872,54.06H146.756ZM162.449,64V61.62H158.095V60.052H161.707V57.84H158.095V56.44H162.323V54.06H155.365V64H162.449Z"
android:fillColor="#000000"
android:fillAlpha="0.15"
android:fillColor="#BFBFBF"
android:fillType="evenOdd"/>
</vector>

8
OsmAnd/res/layout/route_option_btn.xml
View file

@ -38,10 +38,10 @@
android:letterSpacing="@dimen/text_button_letter_spacing"
android:maxLines="1"
android:paddingBottom="3dp"
android:paddingEnd="16dp"
android:paddingLeft="3dp"
android:paddingRight="16dp"
android:paddingStart="3dp"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="3dp"
android:text="@string/routing_attr_avoid_motorway_name"
android:textSize="@dimen/default_sub_text_size"

6
OsmAnd/res/layout/route_options_container.xml
View file

@ -56,15 +56,15 @@
android:layout_gravity="end|center_vertical"
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:paddingLeft="@dimen/route_info_icon_vertical_padding"
android:paddingTop="3dp"
android:paddingLeft="@dimen/route_info_icon_vertical_padding"
android:paddingRight="@dimen/route_info_icon_vertical_padding"
android:paddingStart="@dimen/route_info_icon_vertical_padding"
android:paddingEnd="@dimen/route_info_icon_vertical_padding"
android:paddingBottom="3dp"
android:contentDescription="@string/shared_string_remove"
tools:src="@drawable/ic_action_remove_dark"
android:layout_marginEnd="1dp"
android:paddingStart="@dimen/route_info_icon_vertical_padding"
android:paddingEnd="@dimen/route_info_icon_vertical_padding"
android:layout_marginStart="1dp" />
<View

21
OsmAnd/res/values-ar/strings.xml
View file

@ -596,7 +596,7 @@
\n عبارة عن تطبيق ملاحة مفتوح المصدر مع إمكانية الوصول إلى العديد من بيانات عالمية للموقع. كل بيانات الخرائط (خرائط التوجيه أو الخرائط الجزئية) يمكن تخزينها في ذاكرة الجهاز للإستخدام دون إنترنت. يوفر التطبيق كذلك وظائف توجيه بما في ذلك التوجيه الصوتي.
\n
\nبعض الميزات الأساسية:
\n - تشغيل كامل دون إنترنت( خزن الخرائط التوجيه أو الخرائط الجزئية المنزلة في ذاكرة الجهاز)
\n - تشغيل كامل دون إنترنت( خزن خرائط التوجيه أو الخرائط الجزئية المنزلة في ذاكرة الجهاز)
\n - خرائط التوجيه المدمجة للعالم ككل متاحة لتعمل دون إنترنت
\n - تحميل غير محدود لخرائط البلدان أو المناطق مباشرة من التطبيق
\n - ميزة ويكيبيديا المحلية ( قم بتحميل POI لويكيبيديا)، الأمثل لمشاهدة المعالم الأثرية
@ -2064,12 +2064,12 @@
<string name="trip_rec_notification_settings">تشغيل التسجيل السريع</string>
<string name="trip_rec_notification_settings_desc">عرض نظام الإشعار للسماح بتسجيل الرحلة.</string>
<string name="shared_string_notifications">الإشعارات</string>
<string name="gpx_no_tracks_title_folder">يمكنك أيضا إضافة مسارات إلى المجلد</string>
<string name="gpx_no_tracks_title_folder">يمكنك إضافة مسارات إلى المجلد</string>
<string name="gpx_add_track">أضف المزيد…</string>
<string name="shared_string_appearance">المظهر</string>
<string name="upload_poi">رفع POI</string>
<string name="route_calculation">حساب المسار</string>
<string name="gpx_no_tracks_title">ليس لديك مسارات بعد</string>
<string name="gpx_no_tracks_title">لايوجد مسارات</string>
<string name="rendering_value_fine_name">اللون والسمك</string>
<string name="route_roundabout_short">خذ المخرج %1$d ثم واصل</string>
<string name="search_map_hint">المدينة أو المنطقة</string>
@ -2878,7 +2878,7 @@
<string name="show_more">اعرض المزيد</string>
<string name="tracks_on_map">المسارات على الخريطة</string>
<string name="quick_action_show_hide_gpx_tracks">إظهار/إخفاء مسارات GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">زر لإظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
<string name="quick_action_show_hide_gpx_tracks_descr">إظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
<string name="quick_action_gpx_tracks_hide">إخفاء المسارات</string>
<string name="quick_action_gpx_tracks_show">عرض المسارات</string>
<string name="add_destination_query">الرجاء إضافة الوجهة أولاً</string>
@ -3016,15 +3016,15 @@
<string name="enter_path_to_folder">إدخال مسار المجلد</string>
<string name="shared_string_select_folder">المجلد…</string>
<string name="paste_Osmand_data_folder_path">لصق مسار مجلد بيانات أوسماند</string>
<string name="change_osmand_data_folder_question">تغيير مجلد البيانات ؟</string>
<string name="change_osmand_data_folder_question">تغيير مجلد التخزين ؟</string>
<string name="move_maps_to_new_destination">نقل للموقع الجديد</string>
<string name="avoid_in_routing_descr_">تجنب بعض الطرق، أو بعض أنواع الطرق</string>
<string name="app_mode_utv">جنبًا إلى جنب</string>
<string name="rendering_attr_piste_difficulty_aerialway_name">طريق تلفريك</string>
<string name="rendering_attr_piste_difficulty_connection_name">اتصال</string>
<string name="shared_string_calculate">حساب</string>
<string name="shared_string_osmand_usage">استخدام أوسماند</string>
<string name="shared_sting_tiles">طبقات</string>
<string name="shared_string_osmand_usage">المستخدم</string>
<string name="shared_sting_tiles">الطبقات</string>
<string name="shared_string_maps">الخرائط</string>
<string name="shared_string_memory_tb_desc">تيرا بايت %1$s TB</string>
<string name="shared_string_memory_gb_desc">%1$s GB</string>
@ -3143,7 +3143,7 @@
<string name="manage_profiles">إدارة أوضاع التطبيق …</string>
<string name="osmand_settings_descr">لكامل التطبيق</string>
<string name="osmand_settings">الإعدادات</string>
<string name="copy_from_other_profile">نسخ من وضع آخر</string>
<string name="copy_from_other_profile">نسخة من ملف تعريف آخر</string>
<string name="turn_screen_on">قم بتشغيل الشاشة</string>
<string name="map_during_navigation_info">خريطة أثناء التنقل</string>
<string name="map_during_navigation">خريطة أثناء التنقل</string>
@ -3162,7 +3162,7 @@
<string name="shared_string_by_default">بشكل افتراضي</string>
<string name="download_detailed_map">قم بتنزيل خريطة مفصلة%s لعرض هذه المنطقة.</string>
<string name="internal_app_storage_description">تخزين داخلي ، مخفي عن المستخدم والتطبيقات الأخرى ، يمكن الوصول إليه حصريا من أوسماند.</string>
<string name="change_data_storage_folder">تغيير مجلد التخزين</string>
<string name="change_data_storage_folder">مجلد التخزين</string>
<string name="rendering_attr_piste_type_snow_park_name">حديقة التضاريس</string>
<string name="rendering_attr_piste_type_sleigh_name">زلاجة</string>
<string name="rendering_attr_piste_type_sled_name">تزلج</string>
@ -3301,7 +3301,7 @@
<string name="profile_alert_cant_delete_base">لايمكن حذف الأوضاع الأساسية</string>
<string name="profile_alert_need_save_title">حفظ التغييرات</string>
<string name="profile_alert_need_save_msg">احفظ تغييرات الوضع أولاً</string>
<string name="profile_alert_delete_title">حذف الوضع</string>
<string name="profile_alert_delete_title">حذف الملف الشخصي</string>
<string name="profile_alert_delete_msg">هل تريد حذف الوضع \"%s\"</string>
<string name="select_base_profile_dialog_title">حدد وضع أساسي</string>
<string name="select_base_profile_dialog_message">إسناد الوضع المخصص الخاص بك إلى أحد أوضاع التطبيق الافتراضية ، يحدد الإعداد الأساسي مثل الرؤية الافتراضية لعناصر واجهة المستخدم ووحدات السرعة والمسافة. وهذه هي أوضاع التطبيق الافتراضية ، إلى جانب أمثلة لأوضاع مخصصة يمكن تمديدها إلى:</string>
@ -3874,4 +3874,5 @@
<string name="simplified_track_description">سيتم حفظ خط التوجيه فقط، وسيتم حذف نقاط الطريق.</string>
<string name="shared_string_file_name">اسم الملف</string>
<string name="one_point_error">الرجاء إضافة نقطتين على الأقل.</string>
<string name="shared_string_redo">إعادة</string>
</resources>

2
OsmAnd/res/values-be/phrases.xml
View file

@ -894,7 +894,7 @@
<string name="poi_monitoring_station">Станцыя назірання</string>
<string name="poi_email">Эл. пошта</string>
<string name="poi_fax">Факс</string>
<string name="facebook">Фэйсбук</string>
<string name="facebook">Facebook</string>
<string name="poi_mobile">Мабільны тэлефон</string>
<string name="poi_animal_shelter_dog">Сабакі</string>
<string name="poi_animal_shelter_cat">Каты</string>

16
OsmAnd/res/values-be/strings.xml
View file

@ -657,7 +657,7 @@
<string name="tts_language_not_supported">Абраная мова не падтрымліваецца Android TTS (пераўтварэнне тэксту ў гук), таму будзе выкарыстоўвацца прадвызначаная мова TTS. Пашукаць іншы TTS у краме\?</string>
<string name="tts_missing_language_data_title">Даныя адсутнічаюць</string>
<string name="tts_missing_language_data">Перайсці ў краму, каб спампаваць абраную мову\?</string>
<string name="gpx_option_reverse_route">Развярнуць накірунак GPX</string>
<string name="gpx_option_reverse_route">Развярнуць кірунак GPX</string>
<string name="gpx_option_destination_point">Выкарыстоўваць дзейны пункт прызначэння</string>
<string name="gpx_option_from_start_point">Прайсці ўвесь шлях</string>
<string name="switch_to_vector_map_to_see">Для гэтага рэгіёну даступныя лакальныя вектарныя мапы.
@ -1307,10 +1307,10 @@
<string name="traffic_warning_speed_limit">Абмежаванне хуткасці</string>
<string name="traffic_warning_border_control">Памежны кантроль</string>
<string name="traffic_warning_payment">Платны праезд</string>
<string name="traffic_warning_stop">Знак СТОП</string>
<string name="traffic_warning_stop">Знак \"СТОП\"</string>
<string name="traffic_warning_calming">Паменшыце хуткасць</string>
<string name="traffic_warning_speed_camera">Камера хуткасці</string>
<string name="traffic_warning">Абмежаванне руху</string>
<string name="traffic_warning_speed_camera">Камера кантролю хуткасці</string>
<string name="traffic_warning">Абмежаванні руху</string>
<string name="text_size_descr">Змяніць памер тэксту на мапе.</string>
<string name="text_size">Памер тэксту</string>
<string name="speed_limit_exceed">Дапушчальнае значэнне перавышэння хуткасці</string>
@ -1431,7 +1431,7 @@
<string name="shared_string_dismiss">Адхіліць</string>
<string name="shared_string_yes">Так</string>
<string name="shared_string_no">Не</string>
<string name="shared_string_on">Уключыць</string>
<string name="shared_string_on">Укл</string>
<string name="shared_string_off">Выкл</string>
<string name="shared_string_previous">Папярэдні</string>
<string name="shared_string_next">Далей</string>
@ -1507,7 +1507,7 @@
<string name="tips_and_tricks_descr">Пытанні і адказы, апошнія змены і іншае.</string>
<string name="routing_settings_2">Налады навігацыі</string>
<string name="general_settings_2">Агульныя налады</string>
<string name="shared_string_clear_all">Ачысціць ўсё</string>
<string name="shared_string_clear_all">Ачысціць усё</string>
<string name="shared_string_collapse">Згарнуць</string>
<string name="shared_string_my_location">Маё месцазнаходжанне</string>
<string name="shared_string_tracks">Сляды</string>
@ -2014,7 +2014,7 @@
<string name="shared_string_is_open_24_7">Адчынена 24/7</string>
<string name="map_widget_search">Шукаць</string>
<string name="shared_string_from">ад</string>
<string name="city_type_neighbourhood">Суседства</string>
<string name="city_type_neighbourhood">Ваколіцы</string>
<string name="city_type_district">Раён</string>
<string name="lang_hsb">Верхнялужыцкая</string>
<string name="search_categories">Катэгорыі</string>
@ -2041,7 +2041,7 @@
<string name="skip_map_downloading_desc">У вас адсутнічаюць мапы. Вы можаце абраць мапу са спіса альбо спампаваць яе пазней праз \"Меню - %1$s\".</string>
<string name="search_another_country">Абраць іншы рэгіён</string>
<string name="search_map">Пошук мапаў…</string>
<string name="first_usage_wizard_desc">OsmAnd вызначыць вашае месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёна.</string>
<string name="first_usage_wizard_desc">OsmAnd вызначыць ваша месцазнаходжанне і прапануе спампаваць мапы для гэтага рэгіёна.</string>
<string name="location_not_found">Не атрымалася вызначыць месцазнаходжанне</string>
<string name="no_inet_connection">Злучэнне з Інтэрнэтам адсутнічае</string>
<string name="no_inet_connection_desc_map">Патрабуецца для спампоўвання мапаў.</string>

12
OsmAnd/res/values-ca/strings.xml
View file

@ -3800,4 +3800,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="shared_string_is_saved">s\'ha desat</string>
<string name="one_point_error">Afegiu almenys dos punts.</string>
<string name="shared_string_redo">Torna a fer</string>
<string name="keep_screen_off">Manté la pantalla desactivada</string>
<string name="app_mode_enduro_motorcycle">Moto enduro</string>
<string name="plan_route_exit_dialog_descr">Esteu segur que voleu tancar la ruta planificada sense desar-la\? Perdreu tots els canvis.</string>
<string name="add_segment_to_the_track">Afegeix a un fitxer de traces</string>
<string name="layer_gpx_layer">Traces</string>
<string name="save_track_to_gpx_globally">Enregistra el trajecte a un fitxer GPX</string>
<string name="navigate_to_track_descr">Navegua des de la meva ubicació fins a la traça</string>
<string name="add_address">Afegeix una adreça</string>
<string name="shared_string_file_name">Nom del fitxer</string>
<string name="monitoring_control_start">REC</string>
<string name="disable_recording_once_app_killed_descrp">Aturarà l\'enregistrament de traces quan es mati l\'aplicació (mitjançant aplicacions recents). (La indicació de fons OsmAnd desapareix de la barra de notificacions d\'Android.)</string>
<string name="save_global_track_interval_descr">Trieu l\'interval d\'enregistrament general dels desplaçaments (s\'activa mitjançant el giny de gravació del mapa).</string>
</resources>

5
OsmAnd/res/values-da/phrases.xml
View file

@ -3731,7 +3731,7 @@
<string name="poi_craft_distillery">Destilleri</string>
<string name="poi_craft_joiner">Snedker</string>
<string name="poi_craft_floorer">Gulvlægger</string>
<string name="poi_craft_bakery">Bakehouse</string>
<string name="poi_craft_bakery">Bageri</string>
<string name="poi_craft_cabinet_maker">Møbelsnedker</string>
<string name="poi_charge">Gebyr</string>
<string name="poi_pet_grooming">Kæledyrspleje</string>
@ -3831,7 +3831,7 @@
<string name="poi_fire_hydrant_style_water_source_groundwater">Grundvand</string>
<string name="poi_fire_hydrant_type_pipe">Rør</string>
<string name="poi_fire_hydrant_pressure_filter">Tryk</string>
<string name="poi_pump_status_missing_beam">Pumpens tilstand: ingen håndtag</string>
<string name="poi_pump_status_missing_beam">Pumpe tilstand: ingen stråle</string>
<string name="poi_traffic_signals_arrow_yes">Ja</string>
<string name="poi_traffic_signals_vibration_yes">Ja</string>
<string name="poi_traffic_signals_vibration_no">Vibration: nej</string>
@ -3841,4 +3841,5 @@
<string name="poi_borough">Bydistrikt</string>
<string name="poi_give_box">Donationsboks</string>
<string name="poi_traffic_signals_arrow_no">Pil: nej</string>
<string name="poi_elevator">Elevator</string>
</resources>

142
OsmAnd/res/values-da/strings.xml
View file

@ -31,7 +31,6 @@
<string name="osmand_srtm_short_description_80_chars">Udvidelse for offline højdekurver</string>
<string name="osmand_srtm_long_description_1000_chars">Udvidelsen giver både en højdekurver overlejring og reliefskygger, der vises ovenpå OsmAnds standard kort. Funktionaliteten er meget værdsat af sportsfolk, vandrere, og enhver interesseret i en relief struktur af landskabet.
\n
\n
\nDe globale data (mellem 70° nord og 70° syd) er baseret på målinger af SRTM (Shuttle Radar Topografi Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et billeddannende instrument ombord på Terra satellitten, flagskibet i NASAs Earth Observering system. ASTER er et samarbejde mellem NASA, Japans Ministry of Economy, Trade and Industry (METI), og Japan Space Systems (J-spacesystems).</string>
<string name="map_widget_distancemeasurement">Afstandsmåling</string>
<string name="audionotes_location_not_defined">Tryk på \'Brug placering...\' for at tilføje en note til placeringen.</string>
@ -42,7 +41,6 @@
<string name="index_srtm_ele">Højdekurver</string>
<string name="srtm_plugin_description">Udvidelsen giver både en højdekurver overlejring og et reliefskygger, der vises ovenpå OsmAnds standard kort. Funktionaliteten er meget værdsat af sportsfolk, vandrere, og enhver interesseret i en relief struktur af landskabet.(Bemærk, at højdekurver og/eller relieflag er separate, yderligere data er tilgængelige efter aktivering af udvidelse.)
\n
\n
\nDe globale data (mellem 70° nord og 70° syd) er baseret på målinger af SRTM (Shuttle Radar Topografi Mission) og ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), et billeddannende instrument ombord på Terra satellitten, flagskibet i NASAs Earth Observering system. ASTER er et samarbejde mellem NASA, Japans Ministry of Economy, Trade and Industry (METI), og Japan Space Systems (J-spacesystems).</string>
<string name="srtm_plugin_name">Højdekurver</string>
<string name="download_select_map_types">Andre kort</string>
@ -239,7 +237,7 @@
<string name="address_search_desc">Adressesøgning</string>
<string name="navpoint_search_desc">Koordinater</string>
<string name="transport_search_desc">Søg efter offentlig transport</string>
<string name="favourites_search_desc">En måde at søge efter Favoritter</string>
<string name="favourites_search_desc">En måde at søge efter favoritter</string>
<string name="offline_navigation_not_available">Offline navigation er midlertidig utilgængelig.</string>
<string name="left_side_navigation">Venstrekørsel</string>
<string name="left_side_navigation_descr">For lande, hvor man kører i venstre side af vejen.</string>
@ -265,8 +263,7 @@
\nAlle disse kort kan enten bruges som det vigtigste (primær) kort, der skal vises på skærmen, eller som en over- eller underlejring til et andet basiskort (såsom OsmAnd standard offline kort). For at gøre underlejringskortet mere synlig, kan visse elementer af OsmAnd vektorkort nemt skjules via \'Konfigurer kort\' menuen som ønsket.
\n
\nKortbrikker kan hentes direkte via online-kilder, eller kan fremstilles til offline brug (og manuelt kopieres til OsmAnd datamappen) som en SQLite database. Kort kan fremstilles ved hjælp af en række 3. parts kortværktøjer.</string>
<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller renderingsydeevne indikation, eller talevejledning.
\nIndstillinger er beregnet til udviklere og er ikke nødvendig for den almindelige bruger.</string>
<string name="osmand_development_plugin_description">Viser indstillinger for udviklings- og fejlretningsfunktioner som rutesimulering eller renderingsydeevne indikation, eller talevejledning. Indstillinger er beregnet til udviklere og er ikke nødvendig for den almindelige bruger.</string>
<string name="plugins_screen">Udvidelser</string>
<string name="prefs_plugins_descr">Udvidelser aktiverer avancerede indstillinger og ekstra funktionalitet,.</string>
<string name="prefs_plugins">Udvidelser</string>
@ -447,37 +444,37 @@
<string name="local_index_gpx_info_show">"
\n
\nTryk og hold for valgmuligheder"</string>
<string name="osmand_long_description_1000_chars">"OsmAnd (OSM Automated Navigation Directions)
<string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
\n
\nOsmAnd er et open source-navigationsprogram med adgang til en lang række af globale OpenStreetMap (OSM)-data. Alle kortdata (vektorkort eller kortbrikker) kan gemmes på enhedens hukommelseskort til offline-brug. OsmAnd tilbyder også offline- og online-rutefunktionalitet inklusive sving-for-sving-talevejledning.
\nOsmAnd er et open source-navigationsprogram med adgang til en lang række af globale OpenStreetMap (OSM)-data. Alle kortdata (vektorkort eller kortbrikker) kan gemmes på enhedens hukommelseskort til offline-brug. OsmAnd tilbyder også offline- og online-rutefunktionalitet inklusive sving-for-sving tale vejledning.
\n
\nNogle af hovedfunktionerne:
\n - Komplet offlinefunktionalitet (gemme hentede vektorkort eller kortbrikker i enhedens lager)
\n - Kompakte offlinevektorkort for hele verden er tilgængelige
\n - Kort for enkelte lande eller områder kan hentes direkte fra OsmAnd
\n - Overlejring af flere kortlag er muligt, som fx GPX- eller navigationsspor, interessepunkter (IP), Favoritter, konturlinjer, stoppesteder for kollektiv trafik og flere kort med modificerebar gennemsigtighed
\n - Overlejring af flere kortlag er muligt, som fx GPX- eller navigationspor, interessepunkter (IP), favoritter, konturlinjer, stoppesteder for kollektiv trafik og flere kort med modificerebar gennemsigtighed
\n - Offlinesøgning efter adresser og steder (interessepunkter, IP)
\n - Offlineruteplanlægning for mellemlange afstande
\n - Bil-, cykel- og fodgængertilstand med:
\n - valgfri automatisk dag/nat-tilstandsskift
\n - valgfri automatisk zoom efter hastighed
\n - valgfri automatisk kortrotation efter kompas eller bevægelsesretning
\n - valgfri vognbaneassistent
\n - visning af hastighedsgrænser
\n - optagede stemmer og talesyntesestemmer (tekst-til-tale)
\n - valgfri automatisk dag/nat-tilstandsskift
\n - valgfri automatisk zoom efter hastighed
\n - valgfri automatisk kortrotation efter kompas eller bevægelsesretning
\n - valgfri vognbaneassistent
\n - visning af hastighedsgrænse
\n - optagede stemmer og tale syntese stemmer (tekst-til-tale)
\n
\n Begrænsninger i den gratis version af OsmAnd:
\n - Antallet af kort der kan hentes er begrænset
\n - Ingen adgang til Wikipedia-interessepunkter offline
\n
\nOsmAnd bliver aktivt udviklet. Projektet og den videre udvikling afhænger af økonomiske bidrag til at drive udviklingen og test af nye funktioner. Overvej at købe OsmAnd+, betale for en specifik ny funktion eller lave en generel donation på https://osmand.net."</string>
<string name="osmand_plus_long_description_1000_chars">"OsmAnd+ (OSM Automated Navigation Directions)
\n OsmAnd bliver aktivt udviklet. Projektet og den videre udvikling afhænger af økonomiske bidrag til at drive udviklingen og test af nye funktioner. Overvej at købe OsmAnd+, betale for en specifik ny funktion eller lave en generel donation på https://osmand.net.</string>
<string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions)
\n
\n OsmAnd+ er et open source-navigationsprogram med adgang til en bred vifte af globale OpenStreetMap (OSM)-data. Alle kortdata (vektor eller kortbrikker) kan gemmes på enhedens hukommelseskort til offline-brug. OsmAnd tilbyder også offline og online ruteplanlægningsfunktionalitet, herunder sving-for-sving-talevejledning.
\nOsmAnd+ er et open source-navigationsprogram med adgang til en bred vifte af globale OpenStreetMap (OSM)-data. Alle kortdata (vektor eller kortbrikker) kan gemmes på enhedens hukommelseskort til offline-brug. OsmAnd tilbyder også offline og online ruteplanlægningsfunktionalitet, herunder sving-for-sving-talevejledning.
\n
\n OsmAnd+ er den betalte programversion; ved at købe den støtter man projektet, finansierer udviklingen af nye funktioner, og modtager de seneste opdateringer.
\nOsmAnd+ er den betalte programversion; ved at købe den støtter man projektet, finansierer udviklingen af nye funktioner, og modtager de seneste opdateringer.
\n
\n Nogle af hovedfunktionerne:
\nNogle af hovedfunktionerne:
\n - Komplet offline-funktionalitet (gem hentede vektor- eller brikkort på enhedens hukommelsseskort)
\n - Kompakte offline vektorkort for hele verden
\n - Ubegrænset hentning af lande- eller områdekort direkte fra OsmAnd
@ -490,14 +487,14 @@
\n - valgfri automatisk dag/nat-visning
\n - valgfri hastighedsafhængig kortzoom
\n - valgfri korttilpasning i henhold til kompas- eller bevægelsesretning
\n - valgfri vognbanevejledning, visning af hastighedsgrænser, optagede stemmer eller TTS-stemmer
\n"</string>
\n - valgfri vognbanevejledning, visning af hastighedsgrænser, optagede stemmer eller TTS-stemmer
\n</string>
<string name="city_type_hamlet">lille landsby</string>
<string name="city_type_town">By</string>
<string name="city_type_city">Stor by</string>
<string name="map_version_changed_info">Hent den nye version for at være i stand til at bruge de nye kortfiler.</string>
<string name="show_more_map_detail_descr">Vis nogle vektor-kortdetaljer (f.eks. veje) allerede ved lavere zoomniveauer .</string>
<string name="favourites_delete_multiple_succesful">Favoritpunkter slettet.</string>
<string name="favourites_delete_multiple_succesful">Favorit punkter slettet.</string>
<string name="favorite_delete_multiple">%1$d Favoritter og %2$d Favoritgrupper slettes. Forsæt?</string>
<string name="basemap_missing">Hent verdensgrundkort for at få et overblik, der dækker hele verden ved lave zoom-niveauer.</string>
<string name="vector_data_missing">Hent (\'offline\') data for at kunne bruge kort offline.</string>
@ -729,10 +726,10 @@
<string name="poi_edit_title">Rediger interessepunkt</string>
<string name="osb_comment_dialog_success">Kommentar tilføjet</string>
<string name="osb_comment_dialog_message">Meddelelse</string>
<string name="favourites_remove_dialog_success">Favoritpunkt {0} slettet.</string>
<string name="favourites_remove_dialog_msg">Slet Favoritpunkt \'%s\'?</string>
<string name="favourites_context_menu_delete">Slet Favorit</string>
<string name="favourites_context_menu_edit">Rediger Favorit</string>
<string name="favourites_remove_dialog_success">Favorit punkt {0} slettet.</string>
<string name="favourites_remove_dialog_msg">Slet favorit punkt \'%s\'\?</string>
<string name="favourites_context_menu_delete">Slet favorit</string>
<string name="favourites_context_menu_edit">Redigere favorit</string>
<string name="amenity_type_emergency">Nødsituation</string>
<string name="layer_poi">IP overlejring…</string>
<string name="process_navigation_service">OsmAnd-navigationstjeneste</string>
@ -918,7 +915,7 @@
<string name="navigate_point_format_D">DDD.DDDDD</string>
<string name="navigate_point_format_DM">DDD MM.MMM</string>
<string name="search_address_region">Område</string>
<string name="add_favorite_dialog_favourite_added_template">Favoritpunkt \'{0}\' tilføjet.</string>
<string name="add_favorite_dialog_favourite_added_template">Favorit punkt \'{0}\' tilføjet.</string>
<string name="poi_dialog_comment_default">Interessepunkt ændres</string>
<string name="app_mode_default">Gennemse kort</string>
<string name="poi_error_info_not_loaded">Information om knudepunkt blev ikke indlæst</string>
@ -933,7 +930,7 @@
<string name="navigate_point_format_DMS">DDD MM SS.S</string>
<string name="street_name">Gadenavn</string>
<string name="select_address_activity">Angiv adresse</string>
<string name="favourites_list_activity">Vælg Favorit</string>
<string name="favourites_list_activity">Vælg favorit</string>
<string name="hno">Husnummer</string>
<string name="choose_osmand_theme_descr">Tilpas udseende på programmet.</string>
<string name="choose_osmand_theme">Tema</string>
@ -1192,8 +1189,7 @@
<string name="save_as_favorites_points">Gem som en gruppe af Favoritter</string>
<string name="select_destination_and_intermediate_points">Angiv destinationer</string>
<string name="layer_amenity_label">Overlejring af IP-etiketter</string>
<string name="create_poi_link_to_osm_doc">
<u>Online OSM</u> kort klassificering med billeder.</string>
<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> kort klassificering med billeder.</string>
<string name="show_zoom_buttons_navigation_descr">Vis zoom-knapperne under navigation.</string>
<string name="show_zoom_buttons_navigation">Vis zoom-knapperne</string>
<string name="sort_by_distance">Sorter efter afstand</string>
@ -1394,8 +1390,7 @@
\nHvis du vil vende tilbage til et af OsmAnds almindelige kortstil, skal du enten deaktivere denne udvidelse igen eller ændre kortformat under \'Konfigurer kort\'.</string>
<string name="plugin_ski_descr">Udvidelsen viser detaljerne for globale skiløjper, langrendsruter, alpine skiruter, svævebaner og skilifte. Ruter og pister vises farvekodede efter sværhedsgrad, og vises i et særligt \'Vinter\'-kortstil som et snefarvet vinterlandskab.
\n
\nAktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold.
\nVisningen kan altid nulstilles ved enten at deaktivere denne udvidelse igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket.</string>
\nAktivering ændrer kortformat til \'Vinter og ski\', som viser alle landskabstræk under vinterlige forhold. Visningen kan altid nulstilles ved enten at deaktivere denne udvidelse igen her, eller ved at ændre \'Kortformat\' under \'Konfigurer kort\' som ønsket.</string>
<string name="plugin_touringview_descr">Aktivering ændrer kortstil til \'Touring\', det er en særlig højdetaljevisning for rejsende og erhvervschauffører.
\n
\nVisning giver, på et givet kortzoom, den maksimale mængde rejseoplysninger til rådighed i kortdata (især veje, spor, stier, og orienteringsmærker).
@ -1482,8 +1477,8 @@
<string name="shared_string_photo">Foto</string>
<string name="simulate_your_location">Simuler position</string>
<string name="drawer">Enkel liste</string>
<string name="short_location_on_map">Lat %1$s
\nLon %2$s</string>
<string name="short_location_on_map">Breddegrad %1$s
\nLængdegrad %2$s</string>
<string name="tips_and_tricks_descr">Ofte stillede spørgsmål, de seneste ændringer og andre oplysninger.</string>
<string name="routing_settings_2">Navigationsindstillinger</string>
<string name="general_settings_2">Generelle indstillinger</string>
@ -1670,8 +1665,8 @@
<string name="simulate_your_location_descr">Simuler position ved brug af beregnet rute eller optaget GPX-spor.</string>
<string name="downloads_left_template">%1$s filhentninger tilbage</string>
<string name="roads">Veje</string>
<string name="favourites_edit_dialog_title">Favoritinfo</string>
<string name="favourites_context_menu_add">Tilføj Favorit</string>
<string name="favourites_edit_dialog_title">Favorit information</string>
<string name="favourites_context_menu_add">Tilføj favorit</string>
<string name="shared_string_trip_recording">Optag ture</string>
<string name="shared_string_navigation">Navigation</string>
<string name="osmand_running_in_background">Kør i baggrunden</string>
@ -1899,7 +1894,7 @@
<string name="osm_editors_ranking">Rangering af OSM-bidragsydere</string>
<string name="osm_live_subscription">OsmAnd Live-abonnement</string>
<string name="osm_live_subscribe_btn">Tilmeld</string>
<string name="osm_live_email_desc">Nødvendig for at at give oplysninger om bidrag.</string>
<string name="osm_live_email_desc">Nødvendig for at opdatere dig om dine bidrag.</string>
<string name="osm_live_user_public_name">Offentligt navn</string>
<string name="osm_live_hide_user_name">Vis ikke navn i rapporter</string>
<string name="osm_live_support_region">Understøttet område</string>
@ -2174,11 +2169,11 @@
<string name="shared_string_action_name">Genvejsnavn</string>
<string name="navigate_point_olc">Open Location Code (OLC)</string>
<string name="navigate_point_olc_info_invalid">Ugyldig OLC
</string>
\n</string>
<string name="navigate_point_olc_info_short">Kort OLC
\nIndtast en fuldstændige kode</string>
<string name="navigate_point_olc_info_area">Gyldig fuldstændig OLC
Repræsenterer område: %1$s x %2$s</string>
<string name="navigate_point_olc_info_area">Gyldig fuld OLC
\nRepræsenterer område: %1$s x %2$s</string>
<string name="quick_action_map_overlay_switch">Kortoverlejring er ændret til \"%s\".</string>
<string name="quick_action_map_underlay_switch">Kortunderlejring er ændret til \"%s\".</string>
<string name="quick_action_page_list_descr">En knap til at gennemløber nedenstående liste.</string>
@ -2238,9 +2233,10 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="osmand_extended_description_part7">Bidrag til OSM
\n • Rapporter fejl i data
\n • Overfør GPX-spor til OSM direkte
\n • Tilføj IP\'er og overfør dem direkte til OSM (eller senere, hvis offline)</string>
\n • Tilføj IP\'er og overfør dem direkte til OSM (eller senere, hvis offline)
\n</string>
<string name="osmand_extended_description_part8">OsmAnd er aktivt udviklet open source software. Alle kan bidrage ved at rapportere programfejl, forbedre oversættelser eller kodning af nye funktioner. Derudover projektet er afhængig af økonomiske bidrag til kodning og test af nye funktionaliteter.
\n  Anslået kortdækning og kvalitet:
\n Anslået kortdækning og kvalitet:
\n • Vesteuropa: ****  
\n • Østeuropa: ***  
\n • Rusland: ***  
@ -2248,7 +2244,8 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Sydamerika: **  
\n • Asien: **  
\n • Japan og Korea: ***  
\n • Mellemøsten: **   • Afrika: **  
\n • Mellemøsten: **
\n • Afrika: **  
\n • Antarktis: *  
\n De fleste lande i verden kan hentes!  
\n Få pålidelig navigation - det være sig Frankrig, Tyskland, Mexico, Storbritannien, Spanien, Holland, USA, Rusland, Brasilien eller andre.</string>
@ -2257,7 +2254,8 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Overfør GPX-spor direkte til OSM  
\n • Tilføj IP\'er og overfør dem direkte til OSM (eller senere, hvis offline)  
\n • Valgfri turoptagelse også i baggrundstilstand (mens enheden er i dvaletilstand)
\n  OsmAnd er aktivt udviklet Open source-software. Alle kan bidrage ved rapporterer programfejl, forbedre oversættelser eller kodning nye funktioner. Derudover er projektet afhængig af økonomiske bidrag til finansiering af kodning og afprøvning af nye funktionaliteter</string>
\n  OsmAnd er aktivt udviklet Open source-software. Alle kan bidrage ved rapporterer programfejl, forbedre oversættelser eller kodning nye funktioner. Derudover er projektet afhængig af økonomiske bidrag til finansiering af kodning og afprøvning af nye funktionaliteter
\n</string>
<string name="osmand_extended_description_part2">GPS-navigation
\n • Vælg mellem offline (ingen roamingtakster i udlandet) eller online (hurtigere) tilstand
\n • Sving-for-sving stemmevejledning (indspillet og syntetiseret stemmer)
@ -2268,7 +2266,8 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Kortzoom tilpasser sig hastigheden
\n • Søg destination efter adresse, efter type (fx: parkering, restaurant, hotel, tankstation, museum), eller ved geografiskekoordinater
\n • Understøtter mellemliggende punkter på ruten
\n • Optag eller overfør et GPX-spor og følg det</string>
\n • Optag eller overfør et GPX-spor og følg det
\n</string>
<string name="osmand_extended_description_part3">Kort
\n • Viser IP\'er (interessepunkter) i nærheden
\n • Justerer kortet til bevægelsesretning (eller kompas)
@ -2276,7 +2275,8 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Del placering, så andre kan finde dig
\n • Gem vigtige steder i \'Favoritter\'
\n • Giver mulighed for at vælge, hvordan navne vises på kortet: på engelsk, lokal eller fonetisk stavemåde .
\n• Viser specialiserede online kortbrikkerr, satellitvisning (fra Bing), forskellige overlejringer som touring/navigation GPX-spor og yderligere lag med tilpasselig gennemsigtighed</string>
\n• Viser specialiserede online kortbrikkerr, satellitvisning (fra Bing), forskellige overlejringer som touring/navigation GPX-spor og yderligere lag med tilpasselig gennemsigtighed
\n</string>
<string name="osmand_extended_description_part4">Skikort
\nUdvidelsen viser skiløjper med angivelse af sværhedsgrad og yderligere oplysninger, såsom placering af lifte og andre faciliteter.</string>
<string name="osmand_extended_description_part5">Cykling
@ -2290,20 +2290,22 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Wikipedia på det foretrukne sprog kan fortælle en masse i løbet af en byrundtur
\n • Offentlig transport (busser, sporvogne, tog), herunder linjenavne, hjælper til at navigere i en ny by
\n • GPS-navigation i fodgængertilstand laver ruten ved hjælp af gangstier
\n • Overfør og følg en GPX-rute eller optag og del egne ruter</string>
\n • Overfør og følg en GPX-rute eller optag og del egne ruter
\n</string>
<string name="osmand_plus_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) er et kort- og navigationsprogram med adgang til gratis, verdensomspændende, og højkvalitet data fra OpenStreetMap (OSM).
\n Nyd stemme og optisk navigation, visning af IP\'er (interessepunkter), opret og administrere GPX-spor, ved hjælp af højdekurvevisualisering og højdeinfo, vælg mellem bilkørsel, cykling, fodgænger tilstand, OSM redigering og meget mere.
\n
\n OsmAnd+ er den betalte programversion. Ved køb støttes projektet og udvikling af nye funktioner, og modtager de seneste opdateringer.
\n
\n Nogle af de vigtigste funktioner:</string>
<string name="osmand_plus_extended_description_part2">"Navigation
<string name="osmand_plus_extended_description_part2">Navigation
\n  • Arbejder online (hurtig) eller offline (ingen roamingtakster, i udlandet)
\n  • Sving-for-sving stemmevejledning (indspillede og syntetiseret stemmer)
\n  • Valgfri vognbaneskift, gadenavn visning, og forventet ankomsttidspunkt
\n  • Understøtter mellemliggende punkter på ruten
\n  • Automatisk genberegning, ved afvigelse fra ruten
\n  • Søg efter steder efter adresse, efter type (fx: restaurant, hotel, tankstation, museum), eller ved geografiske koordinater "</string>
\n  • Søg efter steder efter adresse, efter type (fx: restaurant, hotel, tankstation, museum), eller ved geografiske koordinater
\n</string>
<string name="osmand_plus_extended_description_part3">Kortvisning  
\n • Vis position og orientering  
\n • Juster eventuelt kortet efter kompas eller bevægelsesretning  
@ -2324,7 +2326,8 @@ Repræsenterer område: %1$s x %2$s</string>
\n • Valgfri automatisk skift til dag-/natvisning  
\n • Valgfri visning af hastighedsgrænse med påmindelse ved overskridelse
\n • Valgfri hastighedsafhængig zoom  
\n • Del placering, så dine venner kan finde dig</string>
\n • Del placering, så dine venner kan finde dig
\n</string>
<string name="osmand_plus_extended_description_part6">Cykel og fodgænger-funktioner
\n • Visning af gang-, vandre- og cykelstier, fantastisk til udendørsaktiviteter
\n • Særlige navigations- og visningstilstande for cyklister og fodgængere
@ -2483,7 +2486,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="add_route_points">Tilføj rutepunkter</string>
<string name="add_line">Tilføj linje</string>
<string name="empty_state_favourites">Tilføj favoritter</string>
<string name="empty_state_favourites_desc">Importer Favoritter, eller tilføj ved at markere punkter på kortet.</string>
<string name="empty_state_favourites_desc">Importer favoritter, eller tilføj dem ved at markere punkter på kortet.</string>
<string name="import_track">Importer GPX-fil</string>
<string name="import_track_desc">Filen %1$s indeholder ingen rutepunkter, importer den som et spor?</string>
<string name="move_point">Flyt punkt</string>
@ -2572,9 +2575,9 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="distance_indication_descr">Vælg hvordan afstanden til de aktive markører skal vises.</string>
<string name="active_markers_descr">Angiv antal retningsindikatorer.</string>
<string name="add_track_to_markers_descr">Vælg et spor for at tilføje dens rutepunkter til markører.</string>
<string name="add_favourites_group_to_markers_descr">Vælg en katagori af Favoriter, der skal tilføjes markørerne.</string>
<string name="add_favourites_group_to_markers_descr">Vælg en kategori af favoritter, der skal føjes til markørerne.</string>
<string name="shared_string_gpx_waypoints">Sporrutepunkter</string>
<string name="favourites_group">Favoritkategori</string>
<string name="favourites_group">Favorit kategori</string>
<string name="add_group">Tilføj en gruppe</string>
<string name="add_group_descr">Importer grupper fra Favoritter eller et GPX-rutepunkter.</string>
<string name="empty_state_markers_active">Opret kortmarkører!</string>
@ -2727,7 +2730,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="paid_plugin">Betalt udvidelse</string>
<string name="popular_destinations">Populære destinationer</string>
<string name="travel_card_update_descr">Nye Wikivoyage data er tilgængelige, opdater for at bruge dem.</string>
<string name="travel_card_download_descr">"Hent Wikivoyage rejseguider for at se artikler om steder rundt om i verden uden forbindelse til internettet."</string>
<string name="travel_card_download_descr">Hent Wikivoyage rejseguider for at se artikler om steder rundt om i verden uden forbindelse til internettet.</string>
<string name="update_is_available">Opdatering er tilgængelig</string>
<string name="download_file">Hent fil</string>
<string name="start_editing_card_image_text">Den gratis verdensomspændende rejseguide, som alle kan redigere.</string>
@ -3236,7 +3239,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="list_of_installed_plugins">Installerede udvidelser</string>
<string name="configure_navigation">Konfigurer navigation</string>
<string name="general_settings_profile_descr">Tema, enheder, region</string>
<string name="configure_profile">Konfigurer profil</string>
<string name="configure_profile">Konfigurere profil</string>
<string name="screen_alerts_descr">Advarsler vises nederst til venstre under navigationen.</string>
<string name="switch_profile">Skift profil</string>
<string name="language_and_output">Sprog og output</string>
@ -3280,7 +3283,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="rendering_attr_piste_type_sled_name">Kælk</string>
<string name="rendering_attr_piste_type_hike_name">Vandretur</string>
<string name="rendering_attr_piste_type_connection_name">Forbindelse</string>
<string name="rendering_attr_piste_type_skitour_name">Skitour</string>
<string name="rendering_attr_piste_type_skitour_name">Skitur</string>
<string name="rendering_attr_piste_type_downhill_name">Styrtløb</string>
<string name="rendering_attr_piste_type_nordic_name">Nordisk</string>
<string name="routeInfo_piste_type_name">Pistetype</string>
@ -3289,7 +3292,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="rendering_attr_piste_difficulty_intermediate_name">Mellem</string>
<string name="rendering_attr_piste_difficulty_advanced_name">Avanceret</string>
<string name="rendering_attr_piste_difficulty_expert_name">Ekspert</string>
<string name="rendering_attr_piste_difficulty_freeride_name">Freeride</string>
<string name="rendering_attr_piste_difficulty_freeride_name">Gratis tur</string>
<string name="rendering_attr_piste_difficulty_extreme_name">Ekstreme</string>
<string name="rendering_attr_piste_difficulty_undefined_name">Ikke defineret</string>
<string name="routeInfo_piste_difficulty_name">Pistesværhedsgrad</string>
@ -3323,9 +3326,9 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="routing_attr_prefer_unpaved_description">Foretræk ikke-asfalterede veje.</string>
<string name="update_all_maps">Opdater alle kort</string>
<string name="update_all_maps_q">Bekræft opdatering alle (%1$d) kort\?</string>
<string name="release_3_5">"• Opdaterede program-og profilindstillinger: indstillinger er nu arrangement efter type. Hver profil kan tilpasses separat.
<string name="release_3_5">• Opdaterede program-og profilindstillinger: indstillinger er nu arrangement efter type. Hver profil kan tilpasses separat.
\n
\n• Ny dialog til hentning af kort, foreslår et kort ved visning
\n• Ny dialog til hentning af kort, foreslår et kort ved visning
\n
\n• Nattema rettelser
\n
@ -3339,7 +3342,7 @@ Repræsenterer område: %1$s x %2$s</string>
\n
\n• Andre fejlrettelser
\n
\n"</string>
\n</string>
<string name="apply_preference_to_all_profiles">Anvend ændring på alle eller kun på den valgte profil.</string>
<string name="shared_preference">Delt</string>
<string name="routing_attr_driving_style_prefer_unpaved_name">Foretræk ikke-asfalterede veje</string>
@ -3356,7 +3359,7 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="rendering_value_white_name">Hvid</string>
<string name="tts_initialization_error">Tekst-til-tale-programmet kan ikke startes.</string>
<string name="simulate_your_location_gpx_descr">Simuler positionen ved hjælp af et optaget GPX-spor.</string>
<string name="export_profile">Eksportér profil</string>
<string name="export_profile">Eksportere profil</string>
<string name="exported_osmand_profile">OsmAnd profil: %1$s</string>
<string name="overwrite_profile_q">\'%1$s\' findes allerede. Overskriv\?</string>
<string name="export_profile_failed">Profilen kunne ikke eksporteres.</string>
@ -3400,11 +3403,11 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="edit_profiles_descr">Standard-profiler kan ikke slettes, men de kan deaktiveres (på forrige skærmbillede) eller flyttes til bunden.</string>
<string name="edit_profiles">Rediger profiler</string>
<string name="select_nav_profile_dialog_message">Navigationstype\' bestemmer hvordan ruter beregnes.</string>
<string name="profile_appearance">Profilens udseende</string>
<string name="profile_appearance">Profil udseende</string>
<string name="choose_icon_color_name">Ikon, farve og navn</string>
<string name="reorder_profiles">Rediger profilliste</string>
<string name="selected_profile">Valgte profil</string>
<string name="default_speed_dialog_msg">Estimerer ankomsttidspunkt for ukendte vejtyper og begrænser hastigheden for alle veje (kan påvirke ruten)</string>
<string name="selected_profile">Valgt profil</string>
<string name="default_speed_dialog_msg">Anslår ankomsttid for ukendte vejtyper og begrænser hastigheden for alle veje (kan påvirke ruten)</string>
<string name="reset_confirmation_descr">Ved at klikke på %1$s, slettes alle ændringer.</string>
<string name="reset_all_profile_settings_descr">Alle profilindstillinger nulstilles til standardværdier.</string>
<string name="reset_all_profile_settings">Nulstil alle profilindstillinger\?</string>
@ -3757,4 +3760,15 @@ Repræsenterer område: %1$s x %2$s</string>
<string name="plan_route_trim_after">Trim efter</string>
<string name="plan_route_change_route_type_before">Skift rutetype før</string>
<string name="plan_route_change_route_type_after">Skift rutetype efter</string>
<string name="simplified_track">Forenklet spor</string>
<string name="shared_string_file_name">Fil navn</string>
<string name="gpx_monitoring_stop">Pause tur optagelse</string>
<string name="gpx_monitoring_start">Genoptage tur optagelse</string>
<string name="previous_segment">Foregående segmenter</string>
<string name="system_default_theme">System standard</string>
<string name="all_previous_segments">Alle tidligere segmenter</string>
<string name="open_saved_track">Åben gemt spor</string>
<string name="shared_string_is_saved">er gemt</string>
<string name="one_point_error">Tilføj mindst to punkter.</string>
<string name="shared_string_redo">Omgøre</string>
</resources>

1
OsmAnd/res/values-de/phrases.xml
View file

@ -3835,4 +3835,5 @@
<string name="poi_give_box">Give box</string>
<string name="poi_city_block">Stadtteil</string>
<string name="poi_borough">Bezirk</string>
<string name="poi_elevator">Aufzug</string>
</resources>

4
OsmAnd/res/values-es-rAR/phrases.xml
View file

@ -333,7 +333,7 @@
<string name="poi_doctors">Doctor</string>
<string name="poi_clinic">Clínica</string>
<string name="poi_first_aid">Primeros auxilios</string>
<string name="poi_dentist">Dentista;Odontólogo</string>
<string name="poi_dentist">Dentista;Odontología</string>
<string name="poi_nursing_home">Asilo de ancianos;Geriátrico</string>
<string name="poi_baby_hatch">Escotilla de bebé</string>
<string name="poi_veterinary">Veterinaria</string>
@ -2309,7 +2309,7 @@
<string name="poi_health_specialty_maxillofacial_surgery_yes">Cirugía maxilofacial</string>
<string name="poi_health_specialty_diagnostic_radiology_yes">Radiología diagnóstica</string>
<string name="poi_health_specialty_gastroenterology_yes">Gastroenterología</string>
<string name="poi_health_specialty_dentistry_yes">Odontología</string>
<string name="poi_health_specialty_dentistry_yes">Dentista;Odontología</string>
<string name="poi_health_specialty_nephrology_yes">Nefrología (enfermedades renales)</string>
<string name="poi_health_specialty_neurosurgery_yes">Neurocirugía</string>
<string name="poi_health_specialty_neuropsychiatry_yes">Neuropsiquiatría</string>

15
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -2014,7 +2014,7 @@
<string name="no_inet_connection_desc_map">Necesario para descargar mapas.</string>
<string name="search_location">Buscando la ubicación…</string>
<string name="storage_free_space">Espacio libre</string>
<string name="storage_place_description">Almacenamiento de datos de OsmAnd (para mapas, archivos GPX, etc.): %1$s.</string>
<string name="storage_place_description">Almacenamiento de datos de OsmAnd (para mapas, archivos de trazas, etc.): %1$s.</string>
<string name="give_permission">Conceder permiso</string>
<string name="allow_access_location">Permitir el acceso a la ubicación</string>
<string name="first_usage_greeting">Obtén direcciones y descubre sitios nuevos sin una conexión a Internet</string>
@ -2066,8 +2066,8 @@
<string name="trip_rec_notification_settings">Activar la grabación rápida</string>
<string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación del viaje.</string>
<string name="shared_string_notifications">Notificaciones</string>
<string name="gpx_no_tracks_title">Sin archivos GPX aún</string>
<string name="gpx_no_tracks_title_folder">También puedes añadir archivos GPX a la carpeta</string>
<string name="gpx_no_tracks_title">Sin archivos de trazas aún</string>
<string name="gpx_no_tracks_title_folder">También puedes añadir archivos de trazas a la carpeta</string>
<string name="gpx_add_track">Añadir GPX</string>
<string name="shared_string_appearance">Aspecto</string>
<string name="rendering_value_fine_name">Muy fino</string>
@ -2897,10 +2897,10 @@
<string name="routeInfo_road_types_name">Tipos de caminos</string>
<string name="exit_at">Bajar en</string>
<string name="sit_on_the_stop">Esperar en la parada</string>
<string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas GPX elegidas en el mapa.</string>
<string name="quick_action_gpx_tracks_hide">Ocultar trazas GPX</string>
<string name="quick_action_gpx_tracks_show">Mostrar trazas GPX</string>
<string name="quick_action_show_hide_gpx_tracks">Mostrar u ocultar trazas</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Un botón que muestra u oculta las trazas elegidas en el mapa.</string>
<string name="quick_action_gpx_tracks_hide">Ocultar trazas</string>
<string name="quick_action_gpx_tracks_show">Mostrar trazas</string>
<string name="release_3_3">• Nueva pantalla «Direcciones»: Muestra los botones de destino «Casa» y «Trabajo», el atajo de la «ruta anterior», la lista de trazas, marcadores GPX activos y el historial de búsqueda.
\n
\n • Información adicional en «Detalles de la ruta»: Tipos de caminos, superficie, pendiente y suavidad
@ -3889,4 +3889,5 @@
<string name="simplified_track_description">Sólo se guardará la línea de la ruta, los puntos de referencia serán borrados.</string>
<string name="number_of_gpx_files_selected_pattern">%s archivo(s) de trazas marcado(s)</string>
<string name="one_point_error">Añade al menos dos puntos.</string>
<string name="shared_string_redo">Rehacer</string>
</resources>

13
OsmAnd/res/values-et/strings.xml
View file

@ -601,10 +601,10 @@
<string name="step_by_step">Pöörangupõhine</string>
<string name="exit_at">Välju</string>
<string name="sit_on_the_stop">Sisene peatuses</string>
<string name="quick_action_show_hide_gpx_tracks">Kuva/peida GPX rajad</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud GPX radade kaardil kuvamiseks või peitmiseks.</string>
<string name="quick_action_gpx_tracks_hide">Peida GPX rajad</string>
<string name="quick_action_gpx_tracks_show">Kuva GPX rajad</string>
<string name="quick_action_show_hide_gpx_tracks">Kuva/peida rajad</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud radade kaardil kuvamiseks või peitmiseks.</string>
<string name="quick_action_gpx_tracks_hide">Peida rajad</string>
<string name="quick_action_gpx_tracks_show">Kuva rajad</string>
<string name="add_destination_query">Palun määra esmalt sihtkoht</string>
<string name="use_osm_live_public_transport_description">Luba ühistransport OsmAnd Live muudatustele.</string>
<string name="use_osm_live_public_transport">OsmAnd Live ühistransport</string>
@ -891,7 +891,7 @@
<string name="screen_alerts_descr">Hoiatused kuvatakse navigeerimise ajal all vasakul.</string>
<string name="switch_profile">Vaheta profiili</string>
<string name="language_and_output">Keel ja väljund</string>
<string name="reset_to_default">Taasta vaikeseaded</string>
<string name="reset_to_default">Taasta algväärtused</string>
<string name="manage_profiles_descr">Loo, impordi, muuda profiile</string>
<string name="manage_profiles">Halda rakenduse profiile…</string>
<string name="osmand_settings_descr">Jõus kogu rakenduses</string>
@ -3711,4 +3711,7 @@
<string name="screen_control">Ekraani juhtimine</string>
<string name="threshold_distance">Läve kaugus</string>
<string name="one_point_error">Palun lisa vähemalt kaks punkti.</string>
<string name="shared_string_redo">Korda tegevust</string>
<string name="rearrange_categories">Järjesta kategooriad ümber</string>
<string name="shared_string_rendering_style">Visualiseerimise stiil</string>
</resources>

18
OsmAnd/res/values-fi/strings.xml
View file

@ -2543,5 +2543,21 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
<string name="mapillary_item">OsmAnd + mapillary</string>
<string name="quick_action_item">Pikatoiminto</string>
<string name="radius_ruler_item">Sädeviivain</string>
<string name="download_unsupported_action">Toimintoa ei tuettu %1$s</string>
<string name="download_unsupported_action">Ei tuettu toiminto %1$s</string>
<string name="travel_item">Matkailu (Wikivoyage ja Wikipedia)</string>
<string name="select_track_file">"Valitse reitti tiedosto "</string>
<string name="wiki_menu_download_descr">Lisäkarttoja tarvitaan Wikipedian erikoiskohteiden tarkastelemiseen kartalla.</string>
<string name="select_wikipedia_article_langs">Valitse kielet, joilla Wikipedia-artikkelit näkyvät kartalla. Voit vaihtaa kaikkien käytettävissä olevien kielten välillä lukiessasi artikkelia.</string>
<string name="some_articles_may_not_available_in_lang">Jotkut Wikipedia-artikkelit eivät välttämättä ole saatavilla omalla kielelläsi.</string>
<string name="lang_zhyue">Kantoninkiina</string>
<string name="lang_uz">uzbekki</string>
<string name="lang_tt">tataari</string>
<string name="lang_sco">skotti</string>
<string name="lang_ne">nepali</string>
<string name="search_poi_types">Etsi POI-tyyppejä</string>
<string name="custom_osmand_plugin">Muokattu OsmAnd-laajennus</string>
<string name="changes_applied_to_profile">Muutokset lisätty \'%1$s\' profiiliin.</string>
<string name="settings_item_read_error">Ei voitu lukea \'%1$s\'.</string>
<string name="settings_item_write_error">Ei voitu kirjoittaa \'%1$s\'.</string>
<string name="settings_item_import_error">Ei voitu tuoda kohteesta \'%1$s\'.</string>
</resources>

8
OsmAnd/res/values-fr/strings.xml
View file

@ -3853,4 +3853,12 @@
<string name="import_track_descr">Sélectionnez le fichier de trace à suivre ou importez-en un.</string>
<string name="gpx_monitoring_start">Reprendre l\'enregistrement du trajet</string>
<string name="gpx_monitoring_stop">Suspendre l\'enregistrement du trajet</string>
<string name="save_global_track_interval_descr">Définit la fréquence d’enregistrement du parcours (enregistrement activé depuis le gadget sur la carte).</string>
<string name="disable_recording_once_app_killed_descrp">Suspend l\'enregistrement du parcours lorsque l\'application est arrêtée via Applications récentes ; les indications OsmAnd ne seront plus affichées dans la barre de notifications.</string>
<string name="all_next_segments_will_be_recalc">Tous les segments suivants seront recalculés avec le profil sélectionné.</string>
<string name="all_previous_segments_will_be_recalc">Tous les segments précédents seront recalculés avec le profil sélectionné.</string>
<string name="all_next_segments">Tous les segments suivants</string>
<string name="previous_segment">Segment précédent</string>
<string name="all_previous_segments">Tous les segments précédents</string>
<string name="only_selected_segment_recalc">Seul le segment sélectionné sera recalculé avec le profil sélectionné.</string>
</resources>

2
OsmAnd/res/values-hu/phrases.xml
View file

@ -3797,7 +3797,7 @@
<string name="poi_bowling_alley">Bowling</string>
<string name="poi_shop_security">Biztonságtechnikai szaküzlet</string>
<string name="poi_mountain_rescue">Hegyimentő</string>
<string name="poi_traffic_signals_arrow_yes">Nincs</string>
<string name="poi_traffic_signals_arrow_yes">Van</string>
<string name="poi_traffic_signals_vibration_yes">Van</string>
<string name="poi_traffic_signals_vibration_no">Rezgés nincs</string>
<string name="poi_give_box">Adománygyűjtő doboz</string>

17
OsmAnd/res/values-hu/strings.xml
View file

@ -2006,7 +2006,7 @@
<string name="no_inet_connection_desc_map">A térképek letöltéséhez szükséges.</string>
<string name="search_location">Hely keresése…</string>
<string name="storage_free_space">Szabad hely</string>
<string name="storage_place_description">Az OsmAnd tárolt adatai (térképek, GPX fájlok, stb.): %1$s.</string>
<string name="storage_place_description">Az OsmAnd tárolt adatai (térképek, nyomvonalfájlok, stb.): %1$s.</string>
<string name="give_permission">Engedélyezés</string>
<string name="allow_access_location">Hozzáférés a pozíciódhoz engedélyezése</string>
<string name="search_my_location">Pozícióm meghatározása</string>
@ -2037,8 +2037,8 @@
<string name="route_roundabout_short">Hajts ki a(z) %1$d kijáraton és menj</string>
<string name="upload_poi">POI feltöltése</string>
<string name="route_calculation">Útvonalszámítás</string>
<string name="gpx_no_tracks_title">Még nincsenek GPX fájljaid</string>
<string name="gpx_no_tracks_title_folder">A mappához GPX-fájlokat is hozzáadhat</string>
<string name="gpx_no_tracks_title">Még nincsenek nyomvonalfájljai</string>
<string name="gpx_no_tracks_title_folder">A mappához ön is adhat nyomvonalfájlokat</string>
<string name="gpx_add_track">Továbbiak hozzáadása…</string>
<string name="shared_string_appearance">Megjelenés</string>
<string name="trip_rec_notification_settings">Gyors rögzítés bekapcsolása</string>
@ -2849,10 +2849,10 @@
<string name="step_by_step">Részletes navigáció</string>
<string name="routeInfo_road_types_name">Úttípusok</string>
<string name="exit_at">Szálljon le itt:</string>
<string name="quick_action_show_hide_gpx_tracks">GPX-nyomvonalak megjelenítése/elrejtése</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a GPX-nyomvonalakat.</string>
<string name="quick_action_gpx_tracks_hide">GPX nyomvonalak elrejtése</string>
<string name="quick_action_gpx_tracks_show">GPX nyomvonalak megjelenítése</string>
<string name="quick_action_show_hide_gpx_tracks">Nyomvonalak megjelenítése/elrejtése</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Gomb, amely a térképen megjeleníti vagy elrejti a nyomvonalakat.</string>
<string name="quick_action_gpx_tracks_hide">Nyomvonalak elrejtése</string>
<string name="quick_action_gpx_tracks_show">Nyomvonalak megjelenítése</string>
<string name="add_destination_query">Először adjon meg egy célpontot</string>
<string name="release_3_3">"• Új \'Navigáció\' képernyő: Új gomb az Otthon és Munkahely célpontokhoz, \'előző útvonal\' gyors gomb, az aktív GPX útvonalak és jelölők listája, keresési előzmények
\n
@ -3785,7 +3785,7 @@
<string name="gpx_split_interval_descr">Válassza ki, hogy a nyomvonalon milyen távolság- vagy időintervallumok jelzései jelenjenek meg.</string>
<string name="monitoring_min_distance_descr">Ez a szűrő kiküszöböli az ismétlődő pontok rögzítését ott, ahol túl kevés tényleges mozgás történhetett, így szebb lesz a később utólag fel nem dolgozott nyomvonalak térbeli megjelenése.</string>
<string name="multimedia_rec_split_title">Felvétel vágása</string>
<string name="disable_recording_once_app_killed_descrp">Szünetelteti a nyomvonal naplózását, amikor az alkalmazást (később megnyitott alkalmazások) bezárják. (Az OsmAnd háttérjelzése eltűnik az Android értesítési sávjáról.)</string>
<string name="disable_recording_once_app_killed_descrp">Szünetelteti a nyomvonal naplózását, amikor az alkalmazást bezárják (a \'mostanában használt alkalmazások\' felületen). (Az OsmAnd háttérjelzése eltűnik az Android értesítési sávjáról.)</string>
<string name="monitoring_min_speed_descr_recommendation">Javaslat: Először próbálja meg a mozgásérzékelést használni a legkisebb elmozdulást naplózó szűrővel (B). Ez jobb eredményeket hozhat, és kevesebb adatot veszít. Ha a nyomvonalak alacsony sebességnél továbbra is zajosak, próbálkozzon itt nullától eltérő értékekkel. Felhívjuk figyelmét, hogy egyes (hálózatalapú módszereket használó) mérőeszközök egyáltalán nem adnak sebességértéket, így ebben az esetben semmi sem fog rögzülni.</string>
<string name="street_level_imagery">Utcaszintű képek</string>
<string name="simplified_track_description">Csak az út vonala lesz elmentve, az útpontok törlődnek.</string>
@ -3879,4 +3879,5 @@
<string name="number_of_gpx_files_selected_pattern">%s nyomvonalfájl kijelölve</string>
<string name="rourte_between_points_add_track_desc">Jelölje ki azt a nyomvonalfájlt, amelyhez az új szakasz hozzáadódjék.</string>
<string name="show_gpx">Nyomvonalak</string>
<string name="shared_string_redo">Mégis</string>
</resources>

15
OsmAnd/res/values-iw/strings.xml
View file

@ -1062,7 +1062,7 @@
<string name="shared_string_pause">הפסקה</string>
<string name="map_markers_other">סמנים אחרים</string>
<string name="gpx_add_track">הוספת עוד…</string>
<string name="gpx_no_tracks_title">עדיין אין לך קובצי GPX</string>
<string name="gpx_no_tracks_title">עדיין אין לך קובצי מסלול</string>
<string name="rendering_value_dark_brown_name">חום כהה</string>
<string name="rendering_value_light_brown_name">חום בהיר</string>
<string name="morning">בוקר</string>
@ -2229,7 +2229,7 @@
<string name="route_roundabout_short">יש לצאת ביציאה מס׳ %1$d ולהמשיך</string>
<string name="upload_poi">העלאת נקודות עניין</string>
<string name="route_calculation">חישוב נתיב</string>
<string name="gpx_no_tracks_title_folder">ניתן גם להוסיף קובצי GPX לתיקייה</string>
<string name="gpx_no_tracks_title_folder">ניתן גם להוסיף קובצי מסלול לתיקייה</string>
<string name="trip_rec_notification_settings">הפעלת הקלטה מהירה</string>
<string name="saved_at_time">נשמר כעת תחת: %1$s</string>
<string name="poi_deleted_localy">נקודת העניין תימחק לאחר העלאת השינויים שלך</string>
@ -2337,7 +2337,7 @@
<string name="no_inet_connection_desc_map">נדרש לטובת הורדת מפות.</string>
<string name="search_location">מתבצע חיפוש אחר המיקום…</string>
<string name="storage_free_space">מקום פנוי</string>
<string name="storage_place_description">אחסון נתונים של OsmAnd (למפות, קובצי GPX וכו׳): %1$s.</string>
<string name="storage_place_description">אחסון נתונים של OsmAnd (למפות, קובצי מסלולים וכו׳): %1$s.</string>
<string name="move_marker_bottom_sheet_title">יש להזיז את המפה כדי לשנות את מיקום הסמן</string>
<string name="follow_us">לעקוב אחרינו</string>
<string name="access_direction_audio_feedback">חיווי כיוון קולי</string>
@ -2893,10 +2893,10 @@
<string name="step_by_step">פנייה אחר פנייה</string>
<string name="routeInfo_road_types_name">סוגי כבישים</string>
<string name="exit_at">לצאת ב־</string>
<string name="quick_action_show_hide_gpx_tracks">הצגה/הסתרה של מסלולי GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">כפתור להצגה או הסתרה של מסלולי ה־GPX הנבחרים במפה.</string>
<string name="quick_action_gpx_tracks_hide">הסתרת מסלולי GPX</string>
<string name="quick_action_gpx_tracks_show">הצגת מסלולי GPX</string>
<string name="quick_action_show_hide_gpx_tracks">הצגה/הסתרה של מסלולים</string>
<string name="quick_action_show_hide_gpx_tracks_descr">כפתור להצגה או הסתרה של המסלולים הנבחרים במפה.</string>
<string name="quick_action_gpx_tracks_hide">הסתרת מסלולים</string>
<string name="quick_action_gpx_tracks_show">הצגת מסלולים</string>
<string name="use_osm_live_public_transport_description">הפעלת תחבורה ציבורית לשינויים ב־OsmAnd החי.</string>
<string name="use_osm_live_public_transport">OsmAnd חי תחבורה ציבורית</string>
<string name="transfers_size">%1$d העברות</string>
@ -3892,4 +3892,5 @@
<string name="open_saved_track">פתיחת מסלולים שמורים</string>
<string name="shared_string_is_saved">נשמר</string>
<string name="one_point_error">נא להוסיף שתי נקודות לפחות.</string>
<string name="shared_string_redo">ביצוע מחדש</string>
</resources>

2
OsmAnd/res/values-night/colors.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splash_screen_background_color">@color/map_background_color_dark</color>
<color name="splash_screen_background_color">@color/list_background_color_dark</color>
</resources>

15
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -2236,8 +2236,8 @@
<string name="route_roundabout_short">Tome %1$d sair e ir</string>
<string name="upload_poi">Subir POI</string>
<string name="route_calculation">Cálculo da rota</string>
<string name="gpx_no_tracks_title">Você não tem arquivos GPX ainda</string>
<string name="gpx_no_tracks_title_folder">Você pode também adicionar arquivos GPX na pasta</string>
<string name="gpx_no_tracks_title">Você não tem arquivos de trilha ainda</string>
<string name="gpx_no_tracks_title_folder">Você pode também adicionar arquivos de trilha na pasta</string>
<string name="gpx_add_track">Adicionar…</string>
<string name="shared_string_appearance">Aparência</string>
<string name="trip_rec_notification_settings">Ativar gravação rápida</string>
@ -2282,7 +2282,7 @@
<string name="osm_live_banner_desc">Obtenha downloads ilimitados de mapas, adicionando atualizações semanais, diárias e a cada hora.</string>
<string name="quick_action_add_gpx_descr">Um botão para adicionar um waypoint GPX no meio da tela.</string>
<string name="av_locations_all_desc">Arquivo GPX com coordenadas e dados de todas as notas.</string>
<string name="storage_place_description">Armazenamento de dados do OsmAnd (para mapas, arquivos GPX, etc.): %1$s.</string>
<string name="storage_place_description">Armazenamento de dados do OsmAnd (para mapas, arquivos de trilha, etc.): %1$s.</string>
<string name="first_usage_greeting">Obtenha direções e descobra novos lugares sem precisar de conexão com a Internet</string>
<string name="rendering_attr_hideOverground_name">Objetos superficiais</string>
<string name="get_started">Vamos começar</string>
@ -2891,10 +2891,10 @@
<string name="routeInfo_road_types_name">Tipos de estrada</string>
<string name="exit_at">Desembarque em</string>
<string name="sit_on_the_stop">Embarque na parada</string>
<string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar faixas GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar as trilhas GPX selecionadas no mapa.</string>
<string name="quick_action_gpx_tracks_hide">Ocultar faixas de GPX</string>
<string name="quick_action_gpx_tracks_show">Mostrar faixas GPX</string>
<string name="quick_action_show_hide_gpx_tracks">Mostrar/ocultar trilhas</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Um botão para mostrar ou ocultar as trilhas selecionadas no mapa.</string>
<string name="quick_action_gpx_tracks_hide">Ocultar trilhas</string>
<string name="quick_action_gpx_tracks_show">Mostrar trilhas</string>
<string name="release_3_3">- Nova tela \'Direções\': Apresenta os botões de destino Casa e Trabalho, atalho \"percurso anterior\", lista de faixas e marcadores GPX activos, histórico de pesquisa
\n
\n - Informação adicional em \"Detalhes da rota\": tipos de estrada, superfície, declive, suavidade
@ -3880,4 +3880,5 @@
<string name="open_saved_track">Abrir trilha salva</string>
<string name="shared_string_is_saved">está salvo</string>
<string name="one_point_error">Adicione pelo menos dois pontos.</string>
<string name="shared_string_redo">Refazer</string>
</resources>

1
OsmAnd/res/values-pt/phrases.xml
View file

@ -3818,4 +3818,5 @@
<string name="poi_borough">Bairro</string>
<string name="poi_give_box">Give-box</string>
<string name="poi_traffic_signals_arrow_no">Seta: não</string>
<string name="poi_elevator">Elevador</string>
</resources>

14
OsmAnd/res/values-pt/strings.xml
View file

@ -3871,4 +3871,18 @@
<string name="context_menu_item_add_waypoint">Adicionar ponto de passagem de trilha</string>
<string name="map_widget_monitoring">Gravação de viagem</string>
<string name="monitoring_control_start">GPX</string>
<string name="save_global_track_interval_descr">Especifique o intervalo de registo para a gravação geral da faixa (ativado através do widget de gravação Trip no mapa).</string>
<string name="gpx_monitoring_stop">Pausar a gravação da viagem</string>
<string name="gpx_monitoring_start">Retomar a gravação da viagem</string>
<string name="system_default_theme">Predefinição do sistema</string>
<string name="all_next_segments">Todos os segmentos subsequentes</string>
<string name="previous_segment">Segmento anterior</string>
<string name="all_previous_segments">Todos os segmentos anteriores</string>
<string name="only_selected_segment_recalc">Apenas o segmento selecionado será recalculado a usar o perfil selecionado.</string>
<string name="all_next_segments_will_be_recalc">Todos os segmentos subsequentes serão recalculados a utilizar o perfil selecionado.</string>
<string name="all_previous_segments_will_be_recalc">Todos os segmentos anteriores serão recalculados a usar o perfil selecionado.</string>
<string name="open_saved_track">Abrir trilho gravado</string>
<string name="shared_string_is_saved">está gravado</string>
<string name="one_point_error">Adicione pelo menos dois pontos.</string>
<string name="shared_string_redo">Refazer</string>
</resources>

52
OsmAnd/res/values-ru/strings.xml
View file

@ -59,7 +59,7 @@
<string name="favorite_group_name">Имя группы</string>
<string name="change_color">Изменить цвет</string>
<string name="edit_name">Изменить имя</string>
<string name="route_is_too_long_v2">Для больших расстояний: пожалуйста, добавьте промежуточные пункты назначения, если маршрут не найден в течение 10 минут.</string>
<string name="route_is_too_long_v2">Для больших расстояний: добавьте промежуточные пункты, если маршрут не построен в течение 10 минут.</string>
<string name="routing_attr_allow_private_name">Разрешить частный доступ</string>
<string name="routing_attr_allow_private_description">Разрешить доступ на частную территорию.</string>
<string name="shared_string_overview">Обзор</string>
@ -96,7 +96,7 @@
<string name="subscribe_email_desc">Подпишитесь на нашу рассылку о скидках на приложение и получите 3 дополнительные загрузки карт!</string>
<string name="subscribe_email_error">Ошибка</string>
<string name="quick_action_auto_zoom">Переключатель автомасштаба карты</string>
<string name="quick_action_auto_zoom_desc">Переключатель, чтобы включить или выключить автоматическое масштабирование карты.</string>
<string name="quick_action_auto_zoom_desc">Кнопка переключения автомасштабирования на основе скорости.</string>
<string name="quick_action_auto_zoom_on">Включение автомасштаба</string>
<string name="quick_action_auto_zoom_off">Выключение автомасштаба</string>
<string name="quick_action_add_destination">Установить пункт назначения</string>
@ -170,7 +170,7 @@
<string name="quick_action_map_source_title">Источники карты</string>
<string name="quick_action_map_source_action">Добавить источник карты</string>
<string name="quick_action_map_source_switch">Источник карты изменён на «%s».</string>
<string name="quick_action_btn_tutorial_descr">Долгое нажатие и перетаскивание позволит переместить кнопку.</string>
<string name="quick_action_btn_tutorial_descr">Удерживайте кнопку для перемещения её по экрану.</string>
<string name="rendering_attr_depthContours_description">Показывать контуры и точки глубины.</string>
<string name="rendering_attr_depthContours_name">Контуры морских глубин</string>
<string name="rendering_attr_contourDensity_description">Частота горизонталей</string>
@ -450,7 +450,7 @@
<string name="choose_auto_follow_route_descr">Выберите время, через которое карта вернётся к текущей позиции.</string>
<string name="auto_follow_route_navigation">Автовозврат карты только при следовании по маршруту</string>
<string name="auto_follow_route_navigation_descr">Возвращать карту в текущее положение только при следовании по маршруту.</string>
<string name="auto_follow_location_enabled">Центрировать карту при использовании.</string>
<string name="auto_follow_location_enabled">Возврат к позиции на карте...</string>
<string name="poi_query_by_name_matches_categories">Найдено несколько связанных категорий POI.</string>
<string name="data_to_search_poi_not_available">Загрузите данные для локального поиска POI.</string>
<string name="poi_filter_by_name">Поиск по имени</string>
@ -726,13 +726,13 @@
<string name="sd_mounted_ro">Карта памяти доступна только для чтения.
\nТеперь можно только просматривать предварительно загруженную карту, а не загружать новые области.</string>
<string name="unzipping_file">Файл распаковывается…</string>
<string name="route_tr">Поверните направо и двигайтесь</string>
<string name="route_tshr">Поверните резко направо и двигайтесь</string>
<string name="route_tslr">Поверните плавно направо и двигайтесь</string>
<string name="route_tl">Поверните налево и двигайтесь</string>
<string name="route_tshl">Поверните резко налево и двигайтесь</string>
<string name="route_tsll">Поверните плавно налево и двигайтесь</string>
<string name="route_tu">Выполните разворот и двигайтесь</string>
<string name="route_tr">Направо и прямо</string>
<string name="route_tshr">Резко направо и прямо</string>
<string name="route_tslr">Плавно направо и прямо</string>
<string name="route_tl">Налево и прямо</string>
<string name="route_tshl">Резко налево и прямо</string>
<string name="route_tsll">Плавно налево и прямо</string>
<string name="route_tu">Выполните разворот, затем прямо</string>
<string name="route_head">Двигайтесь прямо</string>
<string name="first_time_continue">Продолжить</string>
<string name="first_time_download">Загрузить детальные карты регионов</string>
@ -837,7 +837,7 @@
<string name="data_settings_descr">Настройка данных: язык, обновление данных.</string>
<string name="data_settings">Данные</string>
<string name="osm_settings">Редактирование OSM</string>
<string name="auto_zoom_map_descr">Автоматически изменять масштаб карты при изменении скорости (пока карта синхронизирована с текущим положением).</string>
<string name="auto_zoom_map_descr">Масштабирование по скорости (при отображении позиции на карте).</string>
<string name="auto_zoom_map">Автомасштаб</string>
<string name="additional_settings">Дополнительные настройки</string>
<string name="save_current_track_descr">Сохранить текущий трек как файл GPX.</string>
@ -1048,8 +1048,8 @@
<string name="osmand_parking_pm">PM</string>
<string name="osmand_parking_am">AM</string>
<string name="osmand_parking_position_name">Точка парковки</string>
<string name="osmand_parking_plugin_description">Позволяет записывать, где припаркован ваш автомобиль, а также сколько времени он на парковке.
\nМесто и время парковки доступны на панели управления, а также в виде виджета на карте. Для напоминания в календарь Android может быть добавлено уведомление.</string>
<string name="osmand_parking_plugin_description">Запись места и времени парковки вашего авто.
\nИ место, и время отображаются на панели управления или как виджет на карте. Можно добавить напоминание в календаре Android.</string>
<string name="osmand_parking_plugin_name">Место парковки</string>
<string name="context_menu_item_add_parking_point">Пометить место парковки</string>
<string name="context_menu_item_delete_parking_point">Удалить метку места парковки</string>
@ -1345,9 +1345,9 @@
<string name="animate_routing_route">Симуляция использования рассчитанного маршрута </string>
<string name="animate_routing_gpx">Симуляция использования трека GPX</string>
<string name="auto_zoom_none">Без автомасштаба</string>
<string name="auto_zoom_close">К крупному плану</string>
<string name="auto_zoom_far">К среднему плану</string>
<string name="auto_zoom_farthest">К дальнему плану</string>
<string name="auto_zoom_close">Ближний план</string>
<string name="auto_zoom_far">Средний план</string>
<string name="auto_zoom_farthest">Дальний план</string>
<string name="routing_attr_avoid_motorway_description">Избегать автомагистрали</string>
<string name="routing_attr_avoid_motorway_name">Без автомагистралей</string>
<string name="routing_attr_prefer_motorway_name">Предпочитать автомагистрали</string>
@ -1627,7 +1627,7 @@
<string name="download_tab_local">Локальные</string>
<string name="navigate_point_zone">Зона</string>
<string name="rendering_attr_transportStops_name">Остановки транспорта</string>
<string name="shared_string_dismiss">Отклонить</string>
<string name="shared_string_dismiss">Отменить</string>
<string name="dash_download_msg_none">Загрузить локальные карты\?</string>
<string name="dash_download_msg">Загружено карт: %1$s</string>
<string name="dash_download_new_one">Загрузить новую карту</string>
@ -1650,7 +1650,7 @@
<string name="traffic_warning_pedestrian">Пешеходный переход</string>
<string name="speak_pedestrian">Пешеходные переходы</string>
<string name="navigation_over_track">Начать навигацию по треку?</string>
<string name="avoid_roads_msg">Запуск альтернативного маршрута путём выбора дорог, которых стоит избегать</string>
<string name="avoid_roads_msg">Запуск альтернативного маршрута путём исключения указанных дорог</string>
<string name="save_track_to_gpx_globally_headline">Запись трека по требованию</string>
<string name="proxy_pref_title">Прокси-сервер</string>
<string name="proxy_pref_descr">Укажите прокси-сервер.</string>
@ -1758,7 +1758,7 @@
<string name="action_create">Создать действие</string>
<string name="osm_edits">Правки OSM</string>
<string name="osmand_parking_hour">ч.</string>
<string name="osmand_parking_minute">м.</string>
<string name="osmand_parking_minute">мин.</string>
<string name="osmand_parking_time_left">осталось</string>
<string name="parking_place_limited">Парковка ограничена временем</string>
<string name="your_edits">Ваши правки</string>
@ -2891,7 +2891,7 @@
<string name="points_of_interests">Точки интереса (POI)</string>
<string name="waiting_for_route_calculation">Расчёт маршрута…</string>
<string name="app_mode_public_transport">Общественный транспорт</string>
<string name="avoid_roads_descr">Выберите дорогу на карте или из списка ниже, которую вы хотите избежать во время навигации:</string>
<string name="avoid_roads_descr">Укажите на карте или в списке ниже, каких дорог следует избегать при навигации:</string>
<string name="simulate_navigation">Моделировать навигацию</string>
<string name="choose_track_file_to_follow">Выберите файл трека для следования</string>
<string name="voice_announcements">Голосовые подсказки</string>
@ -3220,7 +3220,7 @@
<string name="navigate_point_format_olc">Открытый код местоположения (OLC)</string>
<string name="coordinates_format_info">Выбранный формат будет применён во всём приложении.</string>
<string name="pref_selected_by_default_for_profiles">Параметр выбран по умолчанию для профилей: %s</string>
<string name="route_parameters_info">Настройки для маршрутизации в выбранном профиле «%1$s».</string>
<string name="route_parameters_info">Настройки маршрутизации в профиле «%1$s».</string>
<string name="wake_time">Время работы после пробуждения</string>
<string name="appearance">Внешний вид</string>
<string name="configure_navigation">Настроить навигацию</string>
@ -3375,7 +3375,7 @@
<string name="rendering_attr_highway_class_track_grade5_name">Класс 5</string>
<string name="app_mode_wagon">Фургон</string>
<string name="map_look">Вид карты</string>
<string name="reset_to_default">Сбросить на значения по умолчанию</string>
<string name="reset_to_default">Сброс к настройкам по умолчанию</string>
<string name="rendering_attr_piste_type_sled_name">Только самоходные сани</string>
<string name="rendering_attr_piste_type_hike_name">Хайк</string>
<string name="rendering_attr_piste_type_connection_name">Соединение</string>
@ -3802,7 +3802,7 @@
<string name="app_mode_wheelchair_forward">Инвалидное кресло впереди</string>
<string name="add_to_a_track">Добавить к треку</string>
<string name="set_working_days_to_continue">Необходимо указать рабочие дни для продолжения</string>
<string name="route_between_points">Маршрут между пунктами</string>
<string name="route_between_points">Маршрут между точками</string>
<string name="plan_a_route">План маршрута</string>
<string name="gpx_split_interval_none_descr">Выберите нужный вариант разбиения: по времени или по расстоянию.</string>
<string name="gpx_split_interval_descr">Выберите интервал с которым будут отображаться метки с расстоянием или временем на треке.</string>
@ -3831,7 +3831,7 @@
<string name="rourte_between_points_warning_desc">Для использования данной возможности OsmAnd проложит ваш трек по дорогам.
\n
\nДалее вам следует выбрать профиль для построения маршрута с учётом ограничений этого профиля.</string>
<string name="rourte_between_points_desc">Выберите как соединять точки: по прямой линии или построением маршрута.</string>
<string name="rourte_between_points_desc">Выберите способ соединения точек: прямой линией или прокладкой маршрута с выбранным профилем.</string>
<string name="in_case_of_reverse_direction">В случае обратного направления</string>
<string name="plan_route_exit_dialog_descr">Закрыть план маршрута без сохранения\? Все изменения будут потеряны.</string>
<string name="street_level_imagery">Изображения на уровне улиц</string>
@ -3850,7 +3850,7 @@
<string name="map_widget_monitoring">Запись поездки</string>
<string name="marker_save_as_track">Сохранить как файл трека</string>
<string name="follow_track">Следовать по маршруту</string>
<string name="follow_track_descr">Выберите файл маршрута для ведения</string>
<string name="follow_track_descr">Выберите файл маршрута для следования</string>
<string name="import_track_descr">Выберите или импортируйте файл маршрута.</string>
<string name="select_another_track">Выбрать другой трек</string>
<string name="navigate_to_track_descr">Перейдите от моего местоположения к треку</string>

2
OsmAnd/res/values-sc/phrases.xml
View file

@ -3828,4 +3828,6 @@
<string name="poi_give_box">Iscàtula pro donos (give box)</string>
<string name="poi_city_block">Isuladu</string>
<string name="poi_borough">Unidade amministrativa (Borough)</string>
<string name="poi_elevator">Ascensore</string>
<string name="poi_traffic_signals_arrow_no">Fritza: nono</string>
</resources>

65
OsmAnd/res/values-sc/strings.xml
View file

@ -2009,7 +2009,7 @@
<string name="no_inet_connection_desc_map">Nde b\'est bisòngiu pro iscarrigare mapas.</string>
<string name="search_location">Chirchende sa positzione…</string>
<string name="storage_free_space">Ispàtziu lìberu</string>
<string name="storage_place_description">Ispàtziu impreadu pro sos datos de OsmAnd (mapas, documentos GPX etc.): %1$s.</string>
<string name="storage_place_description">Ispàtziu impreadu pro sos datos de OsmAnd (mapas, documentos de rasta etc.): %1$s.</string>
<string name="give_permission">Dae su permissu</string>
<string name="allow_access_location">Dae su permissu pro s\'atzessu a sa positzione</string>
<string name="search_my_location">Agata sa positzione mea</string>
@ -2064,8 +2064,8 @@
<string name="trip_rec_notification_settings">Allughe sa registratzione de biàgios lestra</string>
<string name="trip_rec_notification_settings_desc">Ammustra una notìfica chi permitit de incumentzare a registrare su biàgiu.</string>
<string name="shared_string_notifications">Notìficas</string>
<string name="gpx_no_tracks_title">Non tenes galu documentos GPX</string>
<string name="gpx_no_tracks_title_folder">Podes fintzas annànghere documentos GPX a sa cartella</string>
<string name="gpx_no_tracks_title">Non tenes galu documentos de rasta</string>
<string name="gpx_no_tracks_title_folder">Podes fintzas annànghere documentos de rasta a sa cartella</string>
<string name="gpx_add_track">Annanghe àteru…</string>
<string name="shared_string_appearance">Aparèntzia</string>
<string name="rendering_value_fine_name">Bonu</string>
@ -2408,7 +2408,7 @@
<string name="nothing_found">Nudda de agatadu</string>
<string name="nothing_found_descr">Muda sa chirca o ismànnia su raju suo.</string>
<string name="private_access_routing_req">Sa destinatzione tua est positzionada in un\'àrea cun atzessu privadu. Cheres abilitare s\'impreu de sos caminos privados pro custu biàgiu\?</string>
<string name="mapillary">Fotografias a livellu de sas carreras</string>
<string name="mapillary">Mapillary</string>
<string name="mapillary_widget">Widget pro Mapillary</string>
<string name="mapillary_widget_descr">Permitit de contribuire in manera lestra e fàtzile a Mapillary.</string>
<string name="mapillary_descr">Fotografias a livellu de sos caminos in lìnia pro totus. Iscoberi logos, agiuda, catura su mundu.</string>
@ -2898,10 +2898,10 @@
<string name="routeInfo_road_types_name">Castas de àndalas</string>
<string name="exit_at">Essi in</string>
<string name="sit_on_the_stop">Àrtzia in sa firmada</string>
<string name="quick_action_show_hide_gpx_tracks">Ammustra/cua sas rastas GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Unu butone pro ammustrare o cuare sas rastas GPX ischertadas in sa mapa.</string>
<string name="quick_action_gpx_tracks_hide">Istichi sas rastas GPX</string>
<string name="quick_action_gpx_tracks_show">Ammustra sas rastas GPX</string>
<string name="quick_action_show_hide_gpx_tracks">Ammustra/cua sas rastas</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Unu butone pro ammustrare o cuare sas rastas ischertadas in sa mapa.</string>
<string name="quick_action_gpx_tracks_hide">Istichi sas rastas</string>
<string name="quick_action_gpx_tracks_show">Ammustra sas rastas</string>
<string name="release_3_3">• Ischermada \'Diretziones\' noa: Ammustrat sos butones de destinatzione pro sa domo e su logu de traballu, s\'incurtzada \'àndala imbeniente\', sa lista de rastas GPX e de marcadores ativos e sa cronologia de sas chircas
\n
\n • Informatziones agiuntivas in suta de \'Minujas de s\'àndala\': casta de carreras, superfìtzies, ratesa, uniformidade
@ -3838,4 +3838,53 @@
<string name="street_level_imagery">Fotografias a livellu de sas carreras</string>
<string name="plan_route_exit_dialog_descr">Ses seguru de chèrrere serrare sa pianificatzione de s\'àndala chene sarvare\? As a pèrdere totu sas modìficas.</string>
<string name="in_case_of_reverse_direction">In casu de diretzione furriada</string>
<string name="layer_gpx_layer">Rastas</string>
<string name="save_track_to_gpx_globally">Càrriga sa rasta in unu documentu GPX</string>
<string name="empty_state_my_tracks_desc">Importa o registra documentos de rasta</string>
<string name="shared_string_save_as_gpx">Sarva s’àndala comente unu documentu de rasta nou</string>
<string name="add_segment_to_the_track">Annanghe a unu documentu de rasta</string>
<string name="shared_string_gpx_files">Rastas</string>
<string name="show_gpx">Rastas</string>
<string name="empty_state_my_tracks">Annanghe documentos de rasta</string>
<string name="context_menu_item_add_waypoint">Annanghe unu puntu de coladòrgiu a sa rasta</string>
<string name="quick_action_add_gpx">Annanghe unu puntu de coladòrgiu a sa rasta</string>
<string name="map_widget_monitoring">Registratzione de su biàgiu</string>
<string name="disable_recording_once_app_killed_descrp">At a pònnere in pàusa sa registratzione de sa rasta cando OsmAnd at a èssere istudadu (pro mèdiu de sas aplicatziones reghentes). (S\'indicatore de sa modalidade OsmAnd de isfundu at a iscumpàrrere dae sa barra de notìfica de Android.)</string>
<string name="gpx_monitoring_stop">Pone in pàusa sa registratzione de su biàgiu</string>
<string name="gpx_monitoring_start">Sighi cun sa registratzione de su biàgiu</string>
<string name="marker_save_as_track">Sarva comente documentu de rasta</string>
<string name="number_of_gpx_files_selected_pattern">%s documentos de rasta ischertados</string>
<string name="save_global_track_interval_descr">Dislinda s’intervallu pro sa registratzione generale de sas rastas (abilitadu pro mèdiu de su widget registratzione GPX in sa mapa).</string>
<string name="monitoring_control_start">Registra</string>
<string name="shared_string_gpx_route">Àndala de una rasta</string>
<string name="follow_track">Sighi sa rasta</string>
<string name="follow_track_descr">Issèbera su documentu de sa rasta de sighire</string>
<string name="import_track_descr">Issèbera su documentu de sa rasta de sighire, o importa·nde unu.</string>
<string name="select_another_track">Ischerta un\'àtera rasta</string>
<string name="navigate_to_track_descr">Nàviga dae sa positzione mea a sa rasta</string>
<string name="pass_whole_track_descr">Puntu de sa rasta de navigare</string>
<string name="start_of_the_track">Incumintzu de sa rasta</string>
<string name="nearest_point">Puntu prus a curtzu</string>
<string name="attach_to_the_roads">Bloca in sos caminos</string>
<string name="delete_address">Iscantzella s\'indiritzu</string>
<string name="add_address">Annanghe un\'indiritzu</string>
<string name="access_hint_enter_address">Inserta s\'indiritzu</string>
<string name="plan_route_trim_before">Trunca in antis de</string>
<string name="plan_route_trim_after">Trunca a pustis de</string>
<string name="plan_route_change_route_type_before">Càmbia sa casta de àndala in antis de</string>
<string name="plan_route_change_route_type_after">Càmbia sa casta de àndala a pustis de</string>
<string name="simplified_track">Rasta semplificada</string>
<string name="simplified_track_description">S\'at a sarvare petzi sa lìnia de s\'àndala, sos puntos de coladòrgiu s\'ant a iscantzellare.</string>
<string name="shared_string_file_name">Nùmene de su documentu</string>
<string name="system_default_theme">Predefinidu de su sistema</string>
<string name="all_next_segments">Totu sos segmentos imbenientes</string>
<string name="previous_segment">Segmentu antepostu</string>
<string name="all_previous_segments">Totu sos segmentos antepostos</string>
<string name="only_selected_segment_recalc">Petzi su segmentu ischertadu s\'at a torrare a carculare impreende su profilu ischertadu.</string>
<string name="all_next_segments_will_be_recalc">Totu sos segmentos imbenientes s\'ant a torrare a carculare impreende su segmentu ischertadu.</string>
<string name="all_previous_segments_will_be_recalc">Totu sos segmentos s\'ant a torrare a carculare impreende su profilu ischertadu.</string>
<string name="open_saved_track">Aberi una rasta sarvada</string>
<string name="shared_string_is_saved">est sarvadu</string>
<string name="one_point_error">Pro praghere annanghe a su mancu duos puntos.</string>
<string name="shared_string_redo">Torra a fàghere</string>
</resources>

15
OsmAnd/res/values-sk/strings.xml
View file

@ -2002,7 +2002,7 @@
<string name="no_inet_connection_desc_map">Potrebné na stiahnutie máp.</string>
<string name="search_location">Hľadá sa poloha…</string>
<string name="storage_free_space">Voľné miesto</string>
<string name="storage_place_description">Úložisko údajov pre OsmAnd (mapy, súbory GPX, atď.): %1$s.</string>
<string name="storage_place_description">Úložisko údajov pre OsmAnd (mapy, súbory stôp, atď.): %1$s.</string>
<string name="give_permission">Udeliť povolenie</string>
<string name="allow_access_location">Povoliť prístup k polohe</string>
<string name="first_usage_greeting">Získajte pokyny a objavte nové miesta bez pripojenia na Internet</string>
@ -2060,8 +2060,8 @@
<string name="trip_rec_notification_settings_desc">Zobraziť systémové oznámenie, ktoré umožňuje spustiť nahrávanie.</string>
<string name="shared_string_notifications">Oznámenia</string>
<string name="shared_string_resume">Pokračovať</string>
<string name="gpx_no_tracks_title">Nemáte zatiaľ žiadne súbory GPX</string>
<string name="gpx_no_tracks_title_folder">Do priečinka môžete pridať aj súbory GPX</string>
<string name="gpx_no_tracks_title">Nemáte zatiaľ žiadne súbory stôp</string>
<string name="gpx_no_tracks_title_folder">Do priečinka môžete pridať aj súbory stôp</string>
<string name="gpx_add_track">Pridať viac…</string>
<string name="shared_string_appearance">Vzhľad</string>
<string name="rendering_value_fine_name">Jemné</string>
@ -2910,10 +2910,10 @@
<string name="routeInfo_road_types_name">Druhy ciest</string>
<string name="exit_at">Vystúpte na</string>
<string name="sit_on_the_stop">Nastúpte na zastávke</string>
<string name="quick_action_show_hide_gpx_tracks">Zobraziť/skryť GPX stopy</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Tlačidlo pre zobrazenie alebo skrytie zvolených stôp GPX na mape.</string>
<string name="quick_action_gpx_tracks_hide">Skryť GPX stopy</string>
<string name="quick_action_gpx_tracks_show">Zobraziť GPX stopy</string>
<string name="quick_action_show_hide_gpx_tracks">Zobraziť/skryť stopy</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Tlačidlo pre zobrazenie alebo skrytie zvolených stôp na mape.</string>
<string name="quick_action_gpx_tracks_hide">Skryť stopy</string>
<string name="quick_action_gpx_tracks_show">Zobraziť stopy</string>
<string name="transfers_size">%1$d prestup(y)</string>
<string name="add_start_and_end_points">Pridať východzí a cieľový bod</string>
<string name="route_add_start_point">Pridať východzí bod</string>
@ -3885,4 +3885,5 @@
<string name="gpx_monitoring_stop">Pozastaviť nahrávanie výletu</string>
<string name="gpx_monitoring_start">Pokračovať v nahrávaní výletu</string>
<string name="one_point_error">Prosím pridajte aspoň dva body.</string>
<string name="shared_string_redo">Vykonať znova</string>
</resources>

15
OsmAnd/res/values-uk/strings.xml
View file

@ -1990,8 +1990,8 @@
<string name="route_roundabout_short">Поверніть на %1$d з’їзд</string>
<string name="upload_poi">Вивантажити POI</string>
<string name="route_calculation">Побудова маршруту</string>
<string name="gpx_no_tracks_title">Ви досі не маєте жодних GPX-файлів</string>
<string name="gpx_no_tracks_title_folder">Ви також можете додати GPX-файли до теки</string>
<string name="gpx_no_tracks_title">Ви досі не маєте жодних файлів з треками</string>
<string name="gpx_no_tracks_title_folder">Ви також можете додати файли з треками до теки</string>
<string name="gpx_add_track">Додати ще…</string>
<string name="shared_string_appearance">Зовнішній вигляд</string>
<string name="trip_rec_notification_settings">Ввімкнути швидкий запуск запису</string>
@ -2050,7 +2050,7 @@
<string name="no_inet_connection_desc_map">Необхідно завантажити мапи.</string>
<string name="search_location">Визначення місцезнаходження…</string>
<string name="storage_free_space">Вільне місце</string>
<string name="storage_place_description">Сховище даних OsmAnd (мапи, GPXфайли та ін.): %1$s.</string>
<string name="storage_place_description">Сховище даних OsmAnd (мапи, файли з треками, тощо): %1$s.</string>
<string name="give_permission">Дати дозвіл</string>
<string name="allow_access_location">Дозволити доступ до місця розташування</string>
<string name="first_usage_greeting">Прокладайте маршрути і відкривайте нові для себе місця без підключення до Інтернету</string>
@ -2853,9 +2853,9 @@
<string name="shared_string_swap">Поміняти</string>
<string name="show_more">Показати більше</string>
<string name="tracks_on_map">Показані треки</string>
<string name="quick_action_show_hide_gpx_tracks">Показати/Приховати GPX-треки</string>
<string name="quick_action_gpx_tracks_hide">Приховати GPX-треки</string>
<string name="quick_action_gpx_tracks_show">Показати GPX-треки</string>
<string name="quick_action_show_hide_gpx_tracks">Показати/Приховати треки</string>
<string name="quick_action_gpx_tracks_hide">Приховати треки</string>
<string name="quick_action_gpx_tracks_show">Показати треки</string>
<string name="add_destination_query">Спершу додайте пункт призначення</string>
<string name="previous_route">Попередній маршрут</string>
<string name="add_home">Додати домівку</string>
@ -2990,7 +2990,7 @@
\n</string>
<string name="time_of_day">Час доби</string>
<string name="by_transport_type">На %1$s</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Кнопка, що показує чи приховує вибрані треки GPX на мапі.</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Кнопка, що показує чи приховує вибрані треки на мапі.</string>
<string name="points_of_interests">Цікаві місця (POI)</string>
<string name="avoid_roads_descr">Оберіть дорогу, яку Ви хочете уникати при навігації, або на мапі, або зі списку нижче:</string>
<string name="show_along_the_route">Показувати поруч з маршрутом</string>
@ -3882,4 +3882,5 @@
<string name="simplified_track">Спрощений трек</string>
<string name="simplified_track_description">Буде збережено лише лінію маршруту, а проміжні точки буде видалено.</string>
<string name="shared_string_file_name">Назва файлу</string>
<string name="shared_string_redo">Повторити</string>
</resources>

10
OsmAnd/res/values/phrases.xml
View file

@ -136,6 +136,8 @@
<string name="poi_fire_hydrant_pressure_filter">Pressure</string>
<string name="poi_traffic_signals_vibration">Vibration</string>
<string name="poi_traffic_signals_arrow">Arrow</string>
<string name="poi_drinking_water_refill">Drinking water refill</string>
<string name="poi_departures_board">Departures board</string>
<!-- categories -->
<string name="poi_shop">Store</string>
@ -4220,7 +4222,7 @@
<string name="poi_seamark_water_level_below_mwl">Water level: below mean water level</string>
<string name="poi_seamark_obstruction">Obstruction</string>
<string name="poi_drinking_water_refill_yes">Drinking water refill: yes</string>
<string name="poi_drinking_water_refill_yes">Yes</string>
<string name="poi_drinking_water_refill_no">Drinking water refill: no</string>
<string name="poi_drinking_water_refill_network">Drinking water refill network</string>
@ -4243,5 +4245,11 @@
<string name="poi_elevator">Elevator</string>
<string name="poi_departures_board_no">Departures board: no</string>
<string name="poi_departures_board_yes">Yes</string>
<string name="poi_departures_board_delay">Delay</string>
<string name="poi_departures_board_realtime">Realtime</string>
<string name="poi_departures_board_timetable">Timetable</string>
</resources>

34
OsmAnd/src/net/osmand/SecondSplashScreenFragment.java
View file

@ -17,6 +17,7 @@ import androidx.fragment.app.FragmentActivity;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.Version;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.BaseOsmAndFragment;
@ -33,6 +34,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
public static boolean SHOW = true;
public static boolean VISIBLE = false;
private boolean systemDefaultNightMode;
public MapActivity getMapActivity() {
return (MapActivity) getActivity();
}
@ -75,14 +78,16 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
OsmandApplication app = requireMyApplication();
FragmentActivity activity = requireActivity();
UiUtilities iconsCache = app.getUIUtilities();
systemDefaultNightMode = app.getSettings().isSupportSystemDefaultTheme() &&
!app.getSettings().isLightSystemDefaultTheme();
RelativeLayout view = new RelativeLayout(activity);
view.setOnClickListener(null);
int backgroundColorId = R.color.map_background_color_light;
if (app.getSettings().isSupportSystemDefaultTheme()
&& !app.getSettings().isLightSystemDefaultTheme()) {
backgroundColorId = R.color.map_background_color_dark;
}
int backgroundColorId = systemDefaultNightMode ?
R.color.list_background_color_dark :
R.color.map_background_color_light;
view.setBackgroundColor(getResources().getColor(backgroundColorId));
ImageView logo = new ImageView(getContext());
@ -102,19 +107,22 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
ImageView text = new ImageView(activity);
text.setId(TEXT_ID);
int textColorId = systemDefaultNightMode ?
R.color.text_color_tertiary_dark :
R.color.text_color_tertiary_light;
if (Version.isFreeVersion(app)) {
if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_osmlive));
text.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_osmand_osmlive, textColorId));
} else if (InAppPurchaseHelper.isFullVersionPurchased(app)) {
text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_inapp));
text.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_osmand_inapp, textColorId));
} else {
text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand));
text.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_osmand, textColorId));
}
} else if (Version.isPaidVersion(app) || Version.isDeveloperVersion(app)) {
if (InAppPurchaseHelper.isSubscribedToLiveUpdates(app)) {
text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_plus_osmlive));
text.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_osmand_plus_osmlive, textColorId));
} else {
text.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_osmand_plus));
text.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_osmand_plus, textColorId));
}
}
RelativeLayout.LayoutParams textLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
@ -123,7 +131,7 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
ImageView osmText = new ImageView(activity);
osmText.setId(OSM_TEXT_ID);
osmText.setImageDrawable(AppCompatResources.getDrawable(activity, R.drawable.image_text_openstreetmap));
osmText.setImageDrawable(iconsCache.getIcon(R.drawable.image_text_openstreetmap, textColorId));
RelativeLayout.LayoutParams osmTextLayoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
osmTextLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
osmTextLayoutParams.addRule(RelativeLayout.CENTER_HORIZONTAL);
@ -178,6 +186,8 @@ public class SecondSplashScreenFragment extends BaseOsmAndFragment {
@Override
public int getStatusBarColorId() {
return R.color.status_bar_transparent_light;
return systemDefaultNightMode ?
R.color.status_bar_color_dark :
R.color.status_bar_transparent_light;
}
}

8
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -1392,7 +1392,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
});
if (item != null) {
LinearLayout.LayoutParams layoutParams = getContainerButtonLayoutParams(mapActivity, false);
layoutParams.setMargins(margin, 0, margin, 0);
AndroidUtils.setMargins(layoutParams, margin, 0, margin, 0);
optionsContainer.addView(item, layoutParams);
}
}
@ -1402,7 +1402,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
if (containerParams) {
int margin = AndroidUtils.dpToPx(context, 3);
LinearLayout.LayoutParams containerBtnLp = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT);
containerBtnLp.setMargins(margin, 0, margin, 0);
AndroidUtils.setMargins(containerBtnLp, margin, 0, margin, 0);
return containerBtnLp;
} else {
return new LinearLayout.LayoutParams(AndroidUtils.dpToPx(context, 100), ViewGroup.LayoutParams.MATCH_PARENT);
@ -1575,8 +1575,8 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
}
setupViaText(mainView);
FrameLayout viaButton = (FrameLayout) mainView.findViewById(R.id.via_button);
AndroidUiHelper.updateVisibility(viaButton, isFinishPointFromTrack());
FrameLayout viaButton = mainView.findViewById(R.id.via_button);
AndroidUiHelper.updateVisibility(viaButton, routeParams == null || isFinishPointFromTrack());
viaButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {

52
OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
View file

@ -179,6 +179,8 @@ public class OsmandSettings {
private static final String SHARED_PREFERENCES_NAME = "net.osmand.settings";
private static String CUSTOM_SHARED_PREFERENCES_NAME;
private static final String RENDERER_PREFERENCE_PREFIX = "nrenderer_";
private static final String ROUTING_PREFERENCE_PREFIX = "prouting_";
/// Settings variables
private final OsmandApplication ctx;
@ -219,6 +221,14 @@ public class OsmandSettings {
return Collections.unmodifiableMap(registeredPreferences);
}
public static boolean isRendererPreference(String key) {
return key.startsWith(RENDERER_PREFERENCE_PREFIX);
}
public static boolean isRoutingPreference(String key) {
return key.startsWith(ROUTING_PREFERENCE_PREFIX);
}
private static final String SETTING_CUSTOMIZED_ID = "settings_customized";
private void setCustomized() {
@ -958,7 +968,6 @@ public class OsmandSettings {
public class BooleanPreference extends CommonPreference<Boolean> {
private BooleanPreference(String id, boolean defaultValue) {
super(id, defaultValue);
}
@ -979,6 +988,30 @@ public class OsmandSettings {
}
}
public class BooleanStringPreference extends BooleanPreference {
public BooleanStringPreference(String id, boolean defaultValue) {
super(id, defaultValue);
}
@Override
protected Boolean getValue(Object prefs, Boolean defaultValue) {
Boolean value;
try {
value = parseString(settingsAPI.getString(prefs, getId(), defaultValue.toString()));
} catch (ClassCastException e) {
value = settingsAPI.getBoolean(prefs, getId(), defaultValue);
setValue(prefs, value);
}
return value;
}
@Override
protected boolean setValue(Object prefs, Boolean val) {
return settingsAPI.edit(prefs).putString(getId(), val != null ? val.toString() : null).commit();
}
}
private class BooleanAccessibilityPreference extends BooleanPreference {
private BooleanAccessibilityPreference(String id, boolean defaultValue) {
@ -3776,7 +3809,7 @@ public class OsmandSettings {
public CommonPreference<String> getCustomRenderProperty(String attrName) {
if (!customRendersProps.containsKey(attrName)) {
customRendersProps.put(attrName, new StringPreference("nrenderer_" + attrName, "").makeProfile());
customRendersProps.put(attrName, new StringPreference(RENDERER_PREFERENCE_PREFIX + attrName, "").makeProfile());
}
return customRendersProps.get(attrName);
}
@ -3790,30 +3823,25 @@ public class OsmandSettings {
public CommonPreference<Boolean> getCustomRenderBooleanProperty(String attrName) {
if (!customBooleanRendersProps.containsKey(attrName)) {
customBooleanRendersProps.put(attrName, new BooleanPreference("nrenderer_" + attrName, false).makeProfile());
customBooleanRendersProps.put(attrName, new BooleanPreference(RENDERER_PREFERENCE_PREFIX + attrName, false).makeProfile());
}
return customBooleanRendersProps.get(attrName);
}
Map<String, CommonPreference<String>> customRoutingProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<String>>();
Map<String, CommonPreference<String>> customRoutingProps = new LinkedHashMap<>();
public CommonPreference<String> getCustomRoutingProperty(String attrName, String defValue) {
if (!customRoutingProps.containsKey(attrName)) {
customRoutingProps.put(attrName, new StringPreference("prouting_" + attrName, defValue).makeProfile());
customRoutingProps.put(attrName, new StringPreference(ROUTING_PREFERENCE_PREFIX + attrName, defValue).makeProfile());
}
return customRoutingProps.get(attrName);
}
{
// CommonPreference<String> pref = getCustomRoutingProperty("appMode");
// pref.setModeDefaultValue(ApplicationMode.CAR, "car");
}
Map<String, CommonPreference<Boolean>> customBooleanRoutingProps = new LinkedHashMap<String, OsmandSettings.CommonPreference<Boolean>>();
Map<String, CommonPreference<Boolean>> customBooleanRoutingProps = new LinkedHashMap<>();
public CommonPreference<Boolean> getCustomRoutingBooleanProperty(String attrName, boolean defaulfValue) {
if (!customBooleanRoutingProps.containsKey(attrName)) {
customBooleanRoutingProps.put(attrName, new BooleanPreference("prouting_" + attrName, defaulfValue).makeProfile());
customBooleanRoutingProps.put(attrName, new BooleanStringPreference(ROUTING_PREFERENCE_PREFIX + attrName, defaulfValue).makeProfile());
}
return customBooleanRoutingProps.get(attrName);
}

53
OsmAnd/src/net/osmand/plus/settings/backend/SettingsHelper.java
View file

@ -35,6 +35,7 @@ import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
import net.osmand.plus.poi.PoiUIFilter;
import net.osmand.plus.quickaction.QuickAction;
import net.osmand.plus.quickaction.QuickActionRegistry;
import net.osmand.router.GeneralRouter;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
@ -767,11 +768,11 @@ public class SettingsHelper {
}
}
public abstract static class OsmandSettingsItemReader extends SettingsItemReader<OsmandSettingsItem> {
public abstract static class OsmandSettingsItemReader<T extends OsmandSettingsItem> extends SettingsItemReader<T> {
private OsmandSettings settings;
public OsmandSettingsItemReader(@NonNull OsmandSettingsItem item, @NonNull OsmandSettings settings) {
public OsmandSettingsItemReader(@NonNull T item, @NonNull OsmandSettings settings) {
super(item);
this.settings = settings;
}
@ -828,11 +829,11 @@ public class SettingsHelper {
}
}
public abstract static class OsmandSettingsItemWriter extends SettingsItemWriter<OsmandSettingsItem> {
public abstract static class OsmandSettingsItemWriter<T extends OsmandSettingsItem> extends SettingsItemWriter<T> {
private OsmandSettings settings;
public OsmandSettingsItemWriter(OsmandSettingsItem item, OsmandSettings settings) {
public OsmandSettingsItemWriter(@NonNull T item, @NonNull OsmandSettings settings) {
super(item);
this.settings = settings;
}
@ -896,7 +897,7 @@ public class SettingsHelper {
@Nullable
@Override
SettingsItemReader<? extends SettingsItem> getReader() {
return new OsmandSettingsItemReader(this, getSettings()) {
return new OsmandSettingsItemReader<OsmandSettingsItem>(this, getSettings()) {
@Override
protected void readPreferenceFromJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
preference.readFromJson(json, null);
@ -907,7 +908,7 @@ public class SettingsHelper {
@Nullable
@Override
SettingsItemWriter<? extends SettingsItem> getWriter() {
return new OsmandSettingsItemWriter(this, getSettings()) {
return new OsmandSettingsItemWriter<OsmandSettingsItem>(this, getSettings()) {
@Override
protected void writePreferenceToJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
preference.writeToJson(json, null);
@ -1127,20 +1128,56 @@ public class SettingsHelper {
@Nullable
@Override
SettingsItemReader<? extends SettingsItem> getReader() {
return new OsmandSettingsItemReader(this, getSettings()) {
return new OsmandSettingsItemReader<ProfileSettingsItem>(this, getSettings()) {
@Override
protected void readPreferenceFromJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
if (!appModeBeanPrefsIds.contains(preference.getId())) {
preference.readFromJson(json, appMode);
}
}
@Override
void readPreferencesFromJson(final JSONObject json) {
getSettings().getContext().runInUIThread(new Runnable() {
@Override
public void run() {
OsmandSettings settings = getSettings();
Map<String, OsmandPreference<?>> prefs = settings.getRegisteredPreferences();
Iterator<String> iter = json.keys();
while (iter.hasNext()) {
String key = iter.next();
OsmandPreference<?> p = prefs.get(key);
if (p == null) {
if (OsmandSettings.isRoutingPreference(key)) {
p = settings.registerStringPreference(key, "");
}
}
if (p != null) {
try {
readPreferenceFromJson(p, json);
if (OsmandSettings.isRoutingPreference(p.getId())) {
if (p.getId().endsWith(GeneralRouter.USE_SHORTEST_WAY)) {
settings.FAST_ROUTE_MODE.setModeValue(appMode,
!settings.getCustomRoutingBooleanProperty(GeneralRouter.USE_SHORTEST_WAY, false).getModeValue(appMode));
}
}
} catch (Exception e) {
LOG.error("Failed to read preference: " + key, e);
}
} else {
LOG.warn("No preference while importing settings: " + key);
}
}
}
});
}
};
}
@Nullable
@Override
SettingsItemWriter<? extends SettingsItem> getWriter() {
return new OsmandSettingsItemWriter(this, getSettings()) {
return new OsmandSettingsItemWriter<ProfileSettingsItem>(this, getSettings()) {
@Override
protected void writePreferenceToJson(@NonNull OsmandPreference<?> preference, @NonNull JSONObject json) throws JSONException {
if (!appModeBeanPrefsIds.contains(preference.getId())) {

2
OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
View file

@ -167,7 +167,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
if (pref instanceof OsmandSettings.MainContextMenuItemsSettings) {
mainActionItems = new ArrayList<>(((OsmandSettings.MainContextMenuItemsSettings) pref).getMainIds());
if (mainActionItems.isEmpty()) {
for (int i = 0; i < MAIN_BUTTONS_QUANTITY; i++) {
for (int i = 0; i < MAIN_BUTTONS_QUANTITY && i < defItems.size(); i++) {
mainActionItems.add(defItems.get(i).getId());
}
}

10
OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -36,6 +36,7 @@ import net.osmand.plus.activities.SettingsBaseActivity;
import net.osmand.plus.activities.SettingsNavigationActivity;
import net.osmand.plus.routing.RouteProvider;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.settings.backend.OsmandSettings.OsmandPreference;
import net.osmand.plus.settings.bottomsheets.RecalculateRouteInDeviationBottomSheet;
import net.osmand.plus.settings.preferences.ListPreferenceEx;
import net.osmand.plus.settings.preferences.MultiSelectBooleanPreference;
@ -230,14 +231,12 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
String description = SettingsBaseActivity.getRoutingStringPropertyDescription(app, p.getId(), p.getDescription());
if (p.getType() == RoutingParameterType.BOOLEAN) {
OsmandSettings.OsmandPreference pref = settings.getCustomRoutingBooleanProperty(p.getId(), p.getDefaultBoolean());
OsmandPreference<Boolean> pref = settings.getCustomRoutingBooleanProperty(p.getId(), p.getDefaultBoolean());
SwitchPreferenceEx switchPreferenceEx = (SwitchPreferenceEx) createSwitchPreferenceEx(pref.getId(), title, description, R.layout.preference_with_descr_dialog_and_switch);
switchPreferenceEx.setDescription(description);
switchPreferenceEx.setIcon(getRoutingPrefIcon(p.getId()));
switchPreferenceEx.setSummaryOn(R.string.shared_string_on);
switchPreferenceEx.setSummaryOff(R.string.shared_string_off);
screen.addPreference(switchPreferenceEx);
} else {
Object[] vls = p.getPossibleValues();
@ -246,12 +245,10 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
for (Object o : vls) {
svlss[i++] = o.toString();
}
OsmandSettings.OsmandPreference pref = settings.getCustomRoutingProperty(p.getId(), p.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
OsmandPreference<String> pref = settings.getCustomRoutingProperty(p.getId(), p.getType() == RoutingParameterType.NUMERIC ? "0.0" : "-");
ListPreferenceEx listPreferenceEx = (ListPreferenceEx) createListPreferenceEx(pref.getId(), p.getPossibleValueDescriptions(), svlss, title, R.layout.preference_with_descr);
listPreferenceEx.setDescription(description);
listPreferenceEx.setIcon(getRoutingPrefIcon(p.getId()));
screen.addPreference(listPreferenceEx);
}
}
@ -460,6 +457,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
}
recalculateRoute();
} else if (ROUTING_SHORT_WAY.equals(prefId) && newValue instanceof Boolean) {
applyPreference(ROUTING_SHORT_WAY, applyToAllProfiles, newValue);
applyPreference(settings.FAST_ROUTE_MODE.getId(), applyToAllProfiles, !(Boolean) newValue);
} else if (ROUTING_RECALC_DISTANCE.equals(prefId)) {
boolean enabled = false;

8
OsmAnd/src/net/osmand/plus/track/TrackColoringCard.java
View file

@ -15,6 +15,7 @@ import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.ColorUtils;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -45,6 +46,8 @@ import static net.osmand.plus.dialogs.GpxAppearanceAdapter.getAppearanceItems;
public class TrackColoringCard extends BaseCard implements ColorPickerListener {
private static final int MINIMUM_CONTRAST_RATIO = 3;
public static final int INVALID_VALUE = -1;
private final static String SOLID_COLOR = "solid_color";
@ -142,7 +145,12 @@ public class TrackColoringCard extends BaseCard implements ColorPickerListener {
private View createColorItemView(@ColorInt final int color, final FlowLayout rootView, boolean customColor) {
View colorItemView = createCircleView(rootView);
ImageView backgroundCircle = colorItemView.findViewById(R.id.background);
double contrastRatio = ColorUtils.calculateContrast(color, ContextCompat.getColor(app, nightMode ? R.color.card_and_list_background_dark : R.color.card_and_list_background_light));
if (contrastRatio < MINIMUM_CONTRAST_RATIO) {
backgroundCircle.setBackgroundResource(nightMode ? R.drawable.circle_contour_bg_dark : R.drawable.circle_contour_bg_light);
}
backgroundCircle.setImageDrawable(UiUtilities.tintDrawable(AppCompatResources.getDrawable(app, R.drawable.bg_point_circle), color));
backgroundCircle.setOnClickListener(new View.OnClickListener() {
@Override