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

@ -134,7 +134,7 @@
<string name="detail_description_empty">Gnun-a descrission</string>
<string name="detail_license_empty">Licensa sconossùa</string>
<string name="menu_refresh">Rinfrësché</string>
<string name="storage_permission_rationale">Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn.</string>
<string name="read_storage_permission_rationale">Autorisassion necessaria: Lese n\'anmagasinament estern. L\'aplicassion a peul pa marcé sensa lòn.</string>
<string name="location_permission_rationale">Autorisassion facoltativa: Oten-e la posission atual për dij sugeriment ëd categorìa</string>
<string name="ok">Va bin</string>
<string name="title_activity_nearby">Pòst davzin</string>