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

@ -119,7 +119,7 @@
<string name="detail_description_empty">Tanpa katerangan</string>
<string name="detail_license_empty">Lisènsi ora kaweruhan</string>
<string name="menu_refresh">Anyarana</string>
<string name="storage_permission_rationale">Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki.</string>
<string name="read_storage_permission_rationale">Butuh palilah: Maca panyimpenan njaba. Aplikasi mokal mlaku yèn tanpa iki.</string>
<string name="location_permission_rationale">Palilah manasuka: Njupuk pernah saiki kanggo saran ing kategori</string>
<string name="ok">Oké</string>
<string name="title_activity_nearby">Papan Cedhak Kéné</string>