Merge branch 'dev' into trending
This commit is contained in:
commit
f7534b3a0f
25 changed files with 747 additions and 291 deletions
|
|
@ -194,7 +194,7 @@
|
|||
<!-- Missions -->
|
||||
<string name="start">Start</string>
|
||||
<string name="pause">Pause</string>
|
||||
<string name="view">View</string>
|
||||
<string name="view">Play</string>
|
||||
<string name="delete">Delete</string>
|
||||
<string name="checksum">Checksum</string>
|
||||
|
||||
|
|
@ -265,6 +265,7 @@
|
|||
<string name="history_empty">The history is empty</string>
|
||||
<string name="history_cleared">History cleared</string>
|
||||
<string name="item_deleted">Item deleted</string>
|
||||
<string name="delete_item_search_history">Do you want to delete this item from search history?</string>
|
||||
|
||||
<!-- Content -->
|
||||
<string name="main_page_content">Content of main page</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue