Merge branch 'master' of ssh://github.com/osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2014-07-30 16:15:49 +02:00
commit f084f26472
9 changed files with 98 additions and 68 deletions

30
AUTHORS
View file

@ -1,17 +1,17 @@
(C) OsmAnd 2010-2014
### Credits to all major contributors/developers :
* Victor Shcherb - all parts of the project, originator
* Pavol Zibrita - first contributor and developer of some utilities
* Dusan Kazik - one of the first contributors
* Andre Van Atten - project supporter, active forum participant, one of the first users.
* Dr. Hardy Mueller - map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
* Yvecai - main contributor to Contour Lines and Hillshade maps
* Alexey Pelykh - C++ developer, created native library and made application much snappier.
* Max (Zahnstocher) - Java contributor, active forum participant.
* Harry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
* Robin `ypid` Schneider - opening hours contributor
Copyright © OsmAnd 20102014
### Credits to all major contributors/developers:
* Victor Shcherb all parts of the project, originator
* Pavol Zibrita first contributor and developer of some utilities
* Dusan Kazik one of the first contributors
* Andre Van Atten project supporter, active forum participant, one of the first users.
* Dr. Hardy Mueller map appearance concept and base renderers, international consistency and testing, usability, app scoping, concepts, documentation, wiki, market research.
* Yvecai main contributor to Contour Lines and Hillshade maps
* Alexey Pelykh C++ developer, created native library and made application much snappier.
* Max (Zahnstocher) Java contributor, active forum participant.
* Harry van der Wolf contributor to country boundaries, configuration files, address files, and much else; active forum participant.
* Robin ypid Schneider opening hours contributor
### Other Pull requests
(C) All authors of translations and pull requests could be found in commits history :
- Translations are under special "contributor" name 'weblate'
- Pull requests have 2 committers, first is original contributor and second is project maintainer
Copyright © All authors of translations and pull requests could be found in commits history:
- Translations are under special “contributor” name weblate
- Pull requests have two committers, first is original contributor and second is project maintainer

77
LICENSE
View file

@ -1,16 +1,16 @@
OsmAnd - OSM Automated Navigation Directions - navigation software based on OSM maps.
Copyright (C) 2010-2014 OsmAnd ( Amstelveen, Netherlands - KvK 55730183).
The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources.
ATTENTION : please be aware that some art work has proprietary license.
Main AUTHORS (more detailed list in AUTHORS):
Victor Shcherb - all parts of the project, originator
Alexey Pelykh - rendering and core parts
Hardy Mueller - main parts of the project, mostly rendering, UI interaction design
Pavol Zibrita - first contributor and developer of some utilities
OsmAnd OSM Automated Navigation Directions navigation software based on OpenStreetMap.
Copyright © 20102014 OsmAnd (Amstelveen, Netherlands - KvK 55730183).
The code in that repository is mainly covered by *GPLv3*, except some 3rd party libs and resources.
ATTENTION: please be aware that some artwork has proprietary license.
Main AUTHORS (more detailed list in AUTHORS):
Victor Shcherb all parts of the project, originator
Alexey Pelykh rendering and core parts
Hardy Mueller main parts of the project, mostly rendering, UI interaction design
Pavol Zibrita first contributor and developer of some utilities
-------------------------- GPLv3 ----------------------------------
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
@ -27,7 +27,7 @@
-------------------------------------------------------------------
* Source code in main repositories is covered by GPLv3 (license exceptions below) :
* Source code in main repositories is covered by GPLv3 (license exceptions below):
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java
- https://github.com/osmandapp/Osmand-core/tree/legacy_core
@ -38,22 +38,22 @@
* UI Design and UX work, such as layout, icons is covered by CC-BY-ND
- https://github.com/osmandapp/Osmand/tree/master/OsmAnd/res and others
* Map icons and their derived primities are covered by proprietary license :
- (C) icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
* Map icons and their derived primities are covered by proprietary license:
- © icons8.com (https://github.com/osmandapp/OsmAnd-resources/tree/master/icons/svg/icons8)
* Generated voice files from TTS files are covered by proprietary license :
* Generated voice files from TTS files are covered by proprietary license:
- Voice files (https://github.com/osmandapp/OsmAnd-resources/tree/master/voice)
* Fonts (https://github.com/osmandapp/OsmAnd-resources/tree/master/rendering_styles/fonts)
- Google Fonts (Apache License 2)
* Map icons (Mapnik) :
- Open-SVG-Map-Icons - Public Domain
* Non patched source libraries :
* Map icons (Mapnik):
- Open-SVG-Map-Icons - Public Domain
* Non patched source libraries:
- SherlockBar - Apache Lisense - https://github.com/osmandapp/Osmand/tree/master/SherlockBar (https://github.com/JakeWharton/ActionBarSherlock/blob/master/LICENSE.txt)
* Patched libraries :
* Patched libraries:
- Protobuf - New BSD License (patches - https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/protobuf-src, https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/protobuf)
- Expat - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/expat)
- Freetype - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/freetype)
@ -63,31 +63,30 @@
- Skia - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/skia)
- ZLib - (https://github.com/osmandapp/OsmAnd-core/tree/legacy_core/externals/zlib)
* 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs):
- bzip2-20090327.jar Bzip2 - Apache License
* 3rd party libraries present in the libs folder (https://github.com/osmandapp/Osmand/tree/master/OsmAnd-java/libs):
- bzip2-20090327.jar Bzip2 - Apache License
- bsh-core-2.0b4.jar Bean Shell - SPL and LGPL (http://www.beanshell.org/license.html)
- commons-logging-1.1.1.jar - Apache License
- gnu-trove-osmand.jar GNU trove - LGPL
- icu4j-49_1.jar - ICU license ( http://source.icu-project.org/repos/icu/icu/trunk/license.html)
- commons-logging-1.1.1.jar - Apache License
- gnu-trove-osmand.jar GNU trove - LGPL
- icu4j-49_1.jar - ICU license (http://source.icu-project.org/repos/icu/icu/trunk/license.html)
- json-20090211.jar - BSD alike (http://www.json.org/license.html)
- junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/)
- kxml2-2.3.0.jar - BSD license ( http://www.kxml.org/)
- junidecode-0.1.jar - BSD-4-Clause-UC (http://sourceforge.net/projects/junidecode/)
- kxml2-2.3.0.jar - BSD license (http://www.kxml.org/)
- tuprolog.jar - LGPL (http://apice.unibo.it/xwiki/bin/view/Tuprolog/)
* Pull-requests and translations :
- All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list )
* Pull-requests and translations:
- All pull requests are accepted under MIT License (most honorable contributors are mentioned in AUTHORS list)
* Libraries not used in final product (https://github.com/osmandapp/OsmAnd-tools/tree/master/OsmAndMapCreator/libi)
- Ant libraries - (tools) https://github.com/osmandapp/Osmand/tree/master/OsmAnd/ant-lib
- jleveldb-v01.jar
- jleveldb-v01.jar
- jsch-20120101.jar
- junit-4.10.jar
- mysql-connector-java-5.1.18-bin.jar
- sqlite-jdbc-3.7.6.3-20110609.081603-3.jar
- h2-latest.jar
* Special tools for new rendering (GPLv3) - (C) Alexey Pelykh
* Special tools for new rendering (GPLv3) - © Alexey Pelykh
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-inspector
- https://github.com/osmandapp/OsmAnd-tools/tree/master/obf-verifier
- https://github.com/osmandapp/OsmAnd-tools/tree/master/route-tester
@ -96,7 +95,7 @@
- Extracts - https://github.com/osmandapp/OsmAnd-misc/blob/master/osm-planet/osm-data/
* Data files
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons (C) by Geofabrik - data free to use
- Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons (C) by http://be.gis-lab.info - data free to use
- Country boundaries - https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/geo-polygons © by Geofabrik - data free to use
- Country boundaries https://github.com/osmandapp/OsmAnd-misc/tree/master/osm-planet/gislab-polygons © by http://be.gis-lab.info - data free to use

View file

@ -1677,4 +1677,5 @@ s často kladenými otázkami.</string>
<string name="rendering_attr_showAccess_name">Zobrazit typ přístupu</string>
<string name="rendering_attr_showSurfaceGrade_name">Zobrazit kvalitu cest</string>
<string name="osmo_group_by_invite">Vstoupit na pozvánku</string>
</resources>
<string name="rendering_attr_subwayMode_name">Metro režim</string>
</resources>

View file

@ -1940,4 +1940,6 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
<string name="lang_zh_TW">Kinesisk, traditionelt</string>
<string name="lang_sc">Sardisk</string>
<string name="rendering_attr_subwayMode_name">Metrotilstand</string>
</resources>
<string name="continue_navigation">Fortsæt navigationen</string>
<string name="pause_navigation">Pause navigationen</string>
</resources>

View file

@ -1829,4 +1829,6 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="lang_zh_CN">Chino Simplificado</string>
<string name="lang_zh_TW">Chino Tradicional</string>
<string name="rendering_attr_subwayMode_name">Modo subterráneo</string>
</resources>
<string name="continue_navigation">Continuar Navegación</string>
<string name="pause_navigation">Pausar Navegación</string>
</resources>

View file

@ -1967,4 +1967,26 @@ OsmAndはオープンソースであり、活発に開発が進められいま
<string name="keep_informing_descr">定期的にナビゲーション指示を繰り返す</string>
<string name="arrival_distance">目的地周辺のお知らせ</string>
<string name="arrival_distance_descr">どの程度の距離で目的地周辺のアナウンスを希望するか?</string>
</resources>
<string name="osmo_plugin_description">"OpenStreetMapは、http://osmo.mobiを参照し高度なリアルタイム監視をします。他のデバイスを相互に追跡します。匿名のグループを作成し、互いの場所を共有しコミュニケーションもできます。セッション追跡または恒久的な追跡用設定ができます。匿名のグループは数日間いくつかの機能が制限されており、その場合遠隔操作は出来ずグループ管理者は存在しません。完全に機能するグループはウェブサイト上で作成する必要があり、登録ユーザーのみがそれらにアクセスすることができます。 "</string>
<string name="osmo_plugin_name">OsMo(高度なリアルタイム監視)</string>
<string name="always_center_position_on_map">位置を常に中央表示</string>
<string name="voice_pref_title">音声</string>
<string name="misc_pref_title">その他備考</string>
<string name="localization_pref_title">ローカライズ</string>
<string name="index_item_nation_addresses">全国の住所</string>
<string name="index_item_world_altitude_correction">世界基準による標高補正</string>
<string name="index_item_world_seamarks">全世界の満潮水位線</string>
<string name="index_item_world_bitcoin_payments">全世界ビットコインでの支払い</string>
<string name="index_item_world_basemap">世界の概観マップ</string>
<string name="index_item_world_ski">世界スキーマップ</string>
<string name="lang_zh">中国語</string>
<string name="lang_pt_br">ポルトガル語(ブラジル)</string>
<string name="lang_en">英語</string>
<string name="lang_af">アフリカーンス語</string>
<string name="lang_al">アルバニア語</string>
<string name="lang_ar">アラビア語</string>
<string name="lang_hy">アルメニア語</string>
<string name="lang_eu">バスク語</string>
<string name="lang_be">ベラルーシ語</string>
<string name="lang_bs">ボスニア語</string>
</resources>

View file

@ -1792,4 +1792,6 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
<string name="lang_sc">Sardinų</string>
<string name="lang_zh_CN">Supaprastinta kinų</string>
<string name="rendering_attr_subwayMode_name">Metro režimas</string>
</resources>
<string name="continue_navigation">Tęsti navigaciją</string>
<string name="pause_navigation">Pristabdyti navigaciją</string>
</resources>

View file

@ -247,7 +247,7 @@
<string name="osmand_extra_settings_description">顯示進階的地圖組態(比如增加地圖細節)和一些裝置的詳情。</string>
<string name="osmand_development_plugin_description">顯示開發與除錯功能的設定,如導航模擬或繪製顯示效能。</string>
<string name="plugins_screen">外掛元件管理</string>
<string name="select_plugin_to_activate">輕觸外掛元件以啟用或關閉它。(可能需要重新啟動 OsmAnd。)</string>
<string name="select_plugin_to_activate">輕觸外掛元件以啟用或停用它。(可能需要重新啟動 OsmAnd。)</string>
<string name="prefs_plugins_descr">啟動外掛元件進階的設定和更多的附加功能</string>
<string name="prefs_plugins">外掛元件管理</string>
<string name="osm_editing_plugin_description">顯示 OSM 回報所需的設定,如收集/修改 OSM POI 物件、開啟/評論 OSM 錯誤、提供 GPX 檔案(需有OSM帳號)。</string>
@ -486,13 +486,13 @@
<string name="local_index_installed">版本</string>
<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已解除成功</string>
<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已刪除成功</string>
<string name="local_index_items_restored">%2$d 項中的 %1$d 項已啟動成功</string>
<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用</string>
<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
<string name="local_index_action_do">您即將 %1$s %2$s 項,要繼續嗎?</string>
<string name="local_index_descr_title">管理地圖檔案</string>
<string name="local_index_mi_restore">啟用</string>
<string name="local_index_mi_backup">解除</string>
<string name="local_index_mi_backup">停用</string>
<string name="local_index_mi_delete">刪除</string>
<string name="local_index_mi_reload">由 SD 卡重新載入</string>
<string name="local_index_download">下載</string>
@ -501,7 +501,7 @@
<string name="local_index_address_data">地址資料</string>
<string name="local_index_transport_data">交通設施資料</string>
<string name="local_index_map_data">地圖資料</string>
<string name="local_indexes_cat_backup">解除</string>
<string name="local_indexes_cat_backup">停用</string>
<string name="local_indexes_cat_tts">語音資料(TTS)</string>
<string name="local_indexes_cat_voice">語音資料(真人)</string>
<string name="local_indexes_cat_gpx">GPX 資料</string>
@ -1721,7 +1721,7 @@ OsmAnd 是開放原始碼,而且正在積極的開發。應用程式從報告
<string name="always_center_position_on_map">位置顯示始終處於中心</string>
<string name="voice_pref_title">聲音</string>
<string name="localization_pref_title">定位</string>
<string name="interrupt_music_descr">制作預告時中斷音樂</string>
<string name="interrupt_music_descr">語音預告時中斷音樂</string>
<string name="interrupt_music">中斷音樂</string>
<string name="misc_pref_title">雜項</string>
<string name="share_route_as_gpx">以 GPX 檔案分享路線</string>
@ -1920,4 +1920,6 @@ OsmAnd 是開放原始碼,而且正在積極的開發。應用程式從報告
<string name="lang_zh_CN">簡體中文</string>
<string name="lang_zh_TW">正體中文</string>
<string name="rendering_attr_subwayMode_name">地鐵模式</string>
</resources>
<string name="continue_navigation">繼續導航</string>
<string name="pause_navigation">暫停導航</string>
</resources>

View file

@ -78,5 +78,5 @@ Functionality
<p>
List of countries supported (basically world wide!):
Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Cura<EFBFBD>ao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe.
</p>