mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Fixed merge conflicts
This commit is contained in:
parent
fece67e0f9
commit
7dd3dced35
42 changed files with 138 additions and 64 deletions
|
|
@ -133,7 +133,7 @@
|
|||
<string name="detail_description_empty">Deskrivadur ebet</string>
|
||||
<string name="detail_license_empty">Aotre-implijout dizanv</string>
|
||||
<string name="menu_refresh">Freskaat</string>
|
||||
<string name="storage_permission_rationale">Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro.</string>
|
||||
<string name="read_storage_permission_rationale">Aotre rekis : lenn ur stokañ diavaez. Hep se, n\'hall ket an arload mont en-dro.</string>
|
||||
<string name="location_permission_rationale">Aotre diret : kaout al lec\'hiadur red evit kinnig rummadoù</string>
|
||||
<string name="ok">Mat eo</string>
|
||||
<string name="title_activity_nearby">Lec\'hioù nes</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue