TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-26 17:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved some duplicate strings

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-09-17 19:27:53 -07:00
parent 00e2e62c10
commit faad1e57ea
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/menu/conversation_list_batch.xml
View File

@ -6,7 +6,7 @@
android:icon="@drawable/ic_menu_trash_holo_dark" android:icon="@drawable/ic_menu_trash_holo_dark"
android:showAsAction="ifRoom" /> android:showAsAction="ifRoom" />
<item android:title="@string/menu_select_all" <item android:title="@string/menu_select_all2"
android:id="@+id/menu_select_all" android:id="@+id/menu_select_all"
android:icon="@drawable/ic_menu_selectall_holo_dark" /> android:icon="@drawable/ic_menu_selectall_holo_dark" />

6
res/values/strings.xml
View File

@ -232,10 +232,6 @@
<string name="passphrase">Passphrase:</string> <string name="passphrase">Passphrase:</string>
<string name="repeat">Repeat:</string> <string name="repeat">Repeat:</string>
<!-- mms_download_view -->
<string name="download">Download</string>
<string name="downloading">Downloading</string>
<!-- receive_key_activity --> <!-- receive_key_activity -->
<string name="session">Session</string> <string name="session">Session</string>
<string name="identities">Identities</string> <string name="identities">Identities</string>
@ -349,7 +345,7 @@
<!-- conversation_list_batch --> <!-- conversation_list_batch -->
<string name="menu_delete_selected">Delete Selected</string> <string name="menu_delete_selected">Delete Selected</string>
<string name="menu_select_all">Select All</string> <string name="menu_select_all2">Select All</string>
<!-- conversation_list --> <!-- conversation_list -->
<string name="menu_search">Search</string> <string name="menu_search">Search</string>