mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +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">没有说明</string>
|
||||
<string name="detail_license_empty">未知许可协议</string>
|
||||
<string name="menu_refresh">刷新</string>
|
||||
<string name="storage_permission_rationale">需要权限:读取外部存储。应用不能在没有它的情况下运行。</string>
|
||||
<string name="read_storage_permission_rationale">需要权限:读取外部存储。应用不能在没有它的情况下运行。</string>
|
||||
<string name="location_permission_rationale">可选权限:获取当前位置以提供分类建议</string>
|
||||
<string name="ok">确定</string>
|
||||
<string name="title_activity_nearby">附近地点</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue