TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 18:43:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add string resource for unarchive button title

Browse Source 
Fixes #4747
Closes #4748
// FREEBIE
This commit is contained in:
Geonu Kang 2015-11-28 21:10:12 +09:00 committed by Moxie Marlinspike
parent fa411f5623
commit 591ee92e45
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -174,7 +174,7 @@
</activity-alias>
<activity android:name=".ConversationListArchiveActivity"
android:label="@string/AndroidManifeset_conversations_archive"
android:label="@string/AndroidManifest_conversations_archive"
android:launchMode="singleTask"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
android:parentActivityName=".ConversationListActivity">

2
res/menu/conversation_list_batch_archive.xml
View File

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_list_batch__archive_selected"
<item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
android:id="@+id/menu_archive_selected"
android:icon="@drawable/ic_archive_white_24dp"
app:showAsAction="always"/>

2
res/menu/conversation_list_batch_unarchive.xml
View File

@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_list_batch__archive_selected"
<item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
android:id="@+id/menu_archive_selected"
android:icon="@drawable/ic_unarchive_white_24dp"
app:showAsAction="always"/>

5
res/values/strings.xml
View File

@ -873,7 +873,7 @@
<string name="AndroidManifest__message_details">Message details</string>
<string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
<string name="AndroidManifest__invite_friends">Invite friends</string>
<string name="AndroidManifeset_conversations_archive">Conversations archive</string>
<string name="AndroidManifest_conversations_archive">Conversations archive</string>
<!-- arrays.xml -->
<string name="arrays__import_export">Import / export</string>
@ -1055,7 +1055,8 @@
<!-- conversation_list_batch -->
<string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
<string name="conversation_list_batch__menu_select_all">Select all</string>
<string name="conversation_list_batch__archive_selected">Archive selected</string>
<string name="conversation_list_batch_archive__menu_archive_selected">Archive selected</string>
<string name="conversation_list_batch_unarchive__menu_unarchive_selected">Unarchive selected</string>
<!-- conversation_list -->
<string name="conversation_list__menu_search">Search</string>