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">無說明</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>