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: Codeberg Translate <translate@codeberg.org> Co-authored-by: DCoderUltra <dcoderultra@noreply.codeberg.org> Co-authored-by: Fjuro <git@alius.cz> 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: brtc <brtc@noreply.codeberg.org> Co-authored-by: gedankenstuecke <gedankenstuecke@noreply.codeberg.org> Co-authored-by: gpesquero <gpesquero@noreply.codeberg.org> Co-authored-by: lennec <lennec@noreply.codeberg.org> Co-authored-by: map-per <map-per@noreply.codeberg.org> Co-authored-by: mirbyte <mirbyte@noreply.codeberg.org> Co-authored-by: oxisol <oxisol@noreply.codeberg.org> Co-authored-by: phama <phama@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/es/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/pl/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/es/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/pt/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-descriptions/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-descriptions/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-descriptions/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/fdroid-app-description/ Translate-URL: https://translate.codeberg.org/projects/comaps/fdroid-app-description/et/ Translate-URL: https://translate.codeberg.org/projects/comaps/fdroid-app-description/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/google-play-descriptions/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/google-play-descriptions/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/pl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-plurals/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/es/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/pl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/zh_Hant/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings
Co-authored-by: AnanasSux <ananassux@noreply.codeberg.org> 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: Githabnet <githabnet@noreply.codeberg.org> Co-authored-by: IdeallyGrey <ideallygrey@noreply.codeberg.org> Co-authored-by: Laurent FAVOLE <lfavole@noreply.codeberg.org> Co-authored-by: Moonshadow <moonshadow@noreply.codeberg.org> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org> Co-authored-by: jbb <jbb@noreply.codeberg.org> Co-authored-by: lucasmz.dev <git@lucasmz.dev> Co-authored-by: map-per <map-per@noreply.codeberg.org> Co-authored-by: oxisol <oxisol@noreply.codeberg.org> Co-authored-by: pastk <pastk@noreply.codeberg.org> 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/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS Plist Translation: CoMaps/iOS Plurals Translation: CoMaps/iOS UI Strings
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