mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
Fixed merge conflicts
This commit is contained in:
parent
fece67e0f9
commit
7dd3dced35
42 changed files with 138 additions and 64 deletions
|
|
@ -134,7 +134,7 @@
|
|||
<string name="detail_description_empty">Ingen beskrivelse</string>
|
||||
<string name="detail_license_empty">Ukjent lisens</string>
|
||||
<string name="menu_refresh">Gjenoppfrisk</string>
|
||||
<string name="storage_permission_rationale">Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette.</string>
|
||||
<string name="read_storage_permission_rationale">Nødvendig tillatelse: Lese ekstern lagring. Appen virker ikke uten dette.</string>
|
||||
<string name="location_permission_rationale">Valgfri tillatelse: Hent nåværende posisjon for kategoriforslag</string>
|
||||
<string name="ok">OK</string>
|
||||
<string name="title_activity_nearby">Plasser i nærheten</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue