fix build
This commit is contained in:
parent
52aa92601b
commit
197146afe3
1 changed files with 0 additions and 4 deletions
|
@ -2014,11 +2014,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="home_button">Startbildschirm</string>
|
||||
<string name="osmo_use_https_descr">Sichere Server-Verbindung verwenden</string>
|
||||
<string name="osmo_use_https">Https nutzen</string>
|
||||
<<<<<<< HEAD
|
||||
<string name="map_update">Aktualisierungen für %1$s Karten sind verfügbar</string>
|
||||
=======
|
||||
<string name="map_update">Noch %1$s Karten zum Aktualisieren</string>
|
||||
>>>>>>> origin/master
|
||||
<string name="search_for">Suchen nach</string>
|
||||
<string name="show_map">KARTE ZEIGEN</string>
|
||||
<string name="show_all">ALLES ZEIGEN</string>
|
||||
|
|
Loading…
Reference in a new issue