[translations] Fix translation merge conflict

Signed-off-by: map-per <map-per@gmx.de>
This commit is contained in:
map-per
2025-11-16 17:35:29 +01:00
parent ef280c7f89
commit a62f6c0ef6
3 changed files with 13 additions and 0 deletions

View File

@@ -894,4 +894,7 @@
<string name="error_invalid_number">ungültige Zahl</string> <string name="error_invalid_number">ungültige Zahl</string>
<string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string> <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
<string name="avoid_paved">Befst. Straßen vermeiden</string> <string name="avoid_paved">Befst. Straßen vermeiden</string>
<string name="opens_at">Öffnet um %s</string>
<string name="closes_at">Schließt um %s</string>
<string name="opens_day_at">Öffnet am %1$s um %2$s</string>
</resources> </resources>

View File

@@ -1489,5 +1489,10 @@
<string name="type.amenity.payment_centre">Zahlungszentrum</string> <string name="type.amenity.payment_centre">Zahlungszentrum</string>
<string name="type.social_facility.soup_kitchen">Suppenküche</string> <string name="type.social_facility.soup_kitchen">Suppenküche</string>
<string name="type.social_facility.food_bank">Tafel</string> <string name="type.social_facility.food_bank">Tafel</string>
<string name="type.amenity.flight_school">Flugschule</string>
<string name="type.amenity.sailing_school">Segelschule</string>
<string name="type.amenity.prep_school">Nachhilfeschule</string>
<string name="type.shop.beauty.day_spa">Tages-Spa</string>
<string name="type.amenity.give_box">Spendenbox</string>
<string name="type.xmas.tree">Weihnachtsbaum</string> <string name="type.xmas.tree">Weihnachtsbaum</string>
</resources> </resources>

View File

@@ -1577,4 +1577,9 @@
"type.amenity.payment_centre" = "Zahlungszentrum"; "type.amenity.payment_centre" = "Zahlungszentrum";
"type.social_facility.food_bank" = "Tafel"; "type.social_facility.food_bank" = "Tafel";
"type.social_facility.soup_kitchen" = "Suppenküche"; "type.social_facility.soup_kitchen" = "Suppenküche";
"type.amenity.sailing_school" = "Segelschule";
"type.amenity.flight_school" = "Flugschule";
"type.amenity.prep_school" = "Nachhilfeschule";
"type.shop.beauty.day_spa" = "Tages-Spa";
"type.amenity.give_box" = "Spendenbox";
"type.xmas.tree" = "Weihnachtsbaum"; "type.xmas.tree" = "Weihnachtsbaum";