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: Lezurex <lezurex@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: openfab <openfab@noreply.codeberg.org> Co-authored-by: oster5 <oster5@noreply.codeberg.org> Co-authored-by: pastk <pastk@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/gsw/ Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/it/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/bn/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/hr/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/ia/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/it/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/kab/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/ml/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/sk/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/sq/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/th/ Translate-URL: https://translate.codeberg.org/projects/comaps/android/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/cs/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/fr/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/it/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/pt_BR/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/ru/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/zh_Hans/ Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/zh_Hant/ Translate-URL: https://translate.codeberg.org/projects/comaps/google-play-descriptions/gl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/de/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/it/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/af/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ar/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ast/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/az/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/be/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/bg/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/bn/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ca/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/da/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/el/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/es/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/es_MX/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/eu/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/fa/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/fi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/fr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/gl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/he/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/hi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/hr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/hu/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ia/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/id/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/is/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/it/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ja/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/kab/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ko/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/lt/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/lv/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ml/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/mr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/mt/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/nb_NO/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/nl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/pl/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/pt/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/pt_BR/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ro/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/ru/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/sk/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/sq/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/sr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/sv/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/sw/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/th/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/tr/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/uk/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/vi/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios/zh_Hans/ 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/Google Play and Huawei AppGallery descriptions Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>