Fixed merge conflicts

This commit is contained in:
Paul Hawke 2017-09-26 22:33:59 -05:00
parent fece67e0f9
commit 7dd3dced35
42 changed files with 138 additions and 64 deletions

View file

@ -133,7 +133,7 @@
<string name="detail_description_empty">Nian beskriiwang</string>
<string name="detail_license_empty">Ünbekäänd lisens</string>
<string name="menu_refresh">Nei loose</string>
<string name="storage_permission_rationale">Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke.</string>
<string name="read_storage_permission_rationale">Ferlangd rochten: Ekstern spiiker lees. Det app koon saner detdiar rocht ei werke.</string>
<string name="location_permission_rationale">Mögelk rocht: Rept di aktuel plak för kategoriiföörslacher ap.</string>
<string name="ok">OK</string>
<string name="title_activity_nearby">Steeden naibi</string>