Manually fixed merge conflict. Co-authored-by: Anonymous <anonymous@noreply.codeberg.org> Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: Fjuro <git@alius.cz> Co-authored-by: Lezurex <lezurex@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ghose <ghose@noreply.codeberg.org> Co-authored-by: phama <phama@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/et/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/gl/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/gsw/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/gl/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/ar/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/az/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/be/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/ca/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/da/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/el/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/es/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/et/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/eu/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/fr/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/he/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/hu/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/id/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/ko/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/mr/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/nb_NO/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/nl/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/pl/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/pt/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/ro/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/sk/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/sv/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/th/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/uk/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/vi/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/comaps/countries/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/fdroid-app-description/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/google-play-descriptions/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plist/gsw/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/gsw/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/pt/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/et/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/gl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/gsw/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings
Co-authored-by: AT <owje@protonmail.com> Co-authored-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Co-authored-by: Daniele Ziglioli <d.ziglioli@gmail.com> Co-authored-by: Emin Tufan Çetin <etcetin@gmail.com> Co-authored-by: Gari Araolaza <garaolaza@codesyntax.com> Co-authored-by: GiannosOB <giannos2105@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> Co-authored-by: Limfjorden <66277585+Limfjorden@users.noreply.github.com> Co-authored-by: Matija Nalis (weblate) <mnalis-weblate@voyager.hr> Co-authored-by: Michał Korczak <omikorin@users.noreply.hosted.weblate.org> Co-authored-by: Mikel Larreategi <mlarreategi@codesyntax.com> Co-authored-by: Shipa_2 <aurahag2@gmail.com> Co-authored-by: Sketch6580 <sketch6580@users.noreply.hosted.weblate.org> Co-authored-by: The Cats <philosoph@danwin1210.de> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: Yauhen <bugomol@users.noreply.hosted.weblate.org> Co-authored-by: Zelen Treti <ZelenTreti@proton.me> Co-authored-by: ZeljkoBG <zeljko.velickovic@gmail.com> Co-authored-by: Zozosticot <beunenzo@laposte.net> Co-authored-by: cultrarius <rpcom@pm.me> Co-authored-by: glemco <32201227+glemco@users.noreply.github.com> Co-authored-by: soshial <soshial@gmail.com> Co-authored-by: summoner001 <summoner@vivaldi.net> Signed-off-by: "Matija Nalis (weblate)" <mnalis-weblate@voyager.hr> Signed-off-by: AT <owje@protonmail.com> Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Signed-off-by: Daniele Ziglioli <d.ziglioli@gmail.com> Signed-off-by: Emin Tufan Çetin <etcetin@gmail.com> Signed-off-by: Gari Araolaza <garaolaza@codesyntax.com> Signed-off-by: GiannosOB <giannos2105@gmail.com> Signed-off-by: Hugoren Martinako <aumpfbahn@gmail.com> Signed-off-by: Limfjorden <66277585+Limfjorden@users.noreply.github.com> Signed-off-by: Michał Korczak <omikorin@users.noreply.hosted.weblate.org> Signed-off-by: Mikel Larreategi <mlarreategi@codesyntax.com> Signed-off-by: Roman Tsisyk <roman@tsisyk.com> Signed-off-by: Shipa_2 <aurahag2@gmail.com> Signed-off-by: Sketch6580 <sketch6580@users.noreply.hosted.weblate.org> Signed-off-by: The Cats <philosoph@danwin1210.de> Signed-off-by: Weblate <hosted@weblate.org> Signed-off-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Signed-off-by: Yauhen <bugomol@users.noreply.hosted.weblate.org> Signed-off-by: Zelen Treti <ZelenTreti@proton.me> Signed-off-by: ZeljkoBG <zeljko.velickovic@gmail.com> Signed-off-by: Zozosticot <beunenzo@laposte.net> Signed-off-by: cultrarius <rpcom@pm.me> Signed-off-by: glemco <32201227+glemco@users.noreply.github.com> Signed-off-by: soshial <soshial@gmail.com> Signed-off-by: summoner001 <summoner@vivaldi.net> Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/bg/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/da/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/es/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/eu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/fr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/it/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/lv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/nl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/pl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ru/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/ast/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/be/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/bg/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/da/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/eu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/fr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/hr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/hu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/it/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/lv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/nl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/pl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/sr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plist/be/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plist/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/id/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/nl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/pt/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/bg/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/da/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/es/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/eu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/fr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/it/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/lv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/nl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/pl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/zh_Hans/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/be/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/bg/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/da/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/es/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/eu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/fr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/hu/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/lv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/nl/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/sr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/zh_Hans/
Co-authored-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Co-authored-by: Andi Chandler <andi@gowling.com> Co-authored-by: Bora Atıcı <boratici.acc@gmail.com> Co-authored-by: Filip Bengtsson <me@autom.zone> Co-authored-by: GiannosOB <giannos2105@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: Laurent FAVOLE <lfavole@users.noreply.hosted.weblate.org> Co-authored-by: Lucas Eduardo <duduless2020@gmail.com> Co-authored-by: Noel Sinikallas <noel.sinikallas@gmail.com> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Signed-off-by: Andi Chandler <andi@gowling.com> Signed-off-by: Bora Atıcı <boratici.acc@gmail.com> Signed-off-by: Filip Bengtsson <me@autom.zone> Signed-off-by: GiannosOB <giannos2105@gmail.com> Signed-off-by: Laurent FAVOLE <lfavole@users.noreply.hosted.weblate.org> Signed-off-by: Lucas Eduardo <duduless2020@gmail.com> Signed-off-by: Noel Sinikallas <noel.sinikallas@gmail.com> Signed-off-by: Roman Tsisyk <roman@tsisyk.com> Signed-off-by: Weblate <hosted@weblate.org> Signed-off-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ast/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/ca/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/es/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/es_MX/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/sv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android-typestrings/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/en_GB/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/fi/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/android/it/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-plurals/pt/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/ast/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/ca/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/es/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/es_MX/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/pt_BR/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/sv/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios-typestrings/tr/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/ast/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/ca/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/el/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/en_GB/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/fi/ Translate-URL: https://hosted.weblate.org/projects/organicmaps/ios/it/
To expand with full Organic Maps and Maps.ME commits history run: git remote add om-historic [om-historic.git repo url] git fetch --tags om-historic git replace squashed-history historic-commits