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

Wording ambiguity: Archived conversation -> Conversation archived

Browse Source 
Closes #4802
// FREEBIE
This commit is contained in:
RiseT 2015-12-04 14:13:09 +01:00 committed by Moxie Marlinspike
parent 8a3762b337
commit 307578eb18
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

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

6
res/values/strings.xml
View File

@ -174,10 +174,10 @@
</plurals> </plurals>
<string name="ConversationListFragment_deleting">Deleting</string> <string name="ConversationListFragment_deleting">Deleting</string>
<string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations...</string> <string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations...</string>
<string name="ConversationListFragment_archived_conversations">Archived conversations</string> <string name="ConversationListFragment_conversations_archived">Conversations archived</string>
<string name="ConversationListFragment_undo">UNDO</string> <string name="ConversationListFragment_undo">UNDO</string>
<string name="ConversationListFragment_moved_conversation_to_inbox">Moved conversation to inbox</string> <string name="ConversationListFragment_moved_conversation_to_inbox">Moved conversation to inbox</string>
<string name="ConversationListFragment_archived_conversation">Archived conversation</string> <string name="ConversationListFragment_conversation_archived">Conversation archived</string>
<string name="ConversationListFragment_moved_conversations_to_inbox">Moved conversations to inbox</string> <string name="ConversationListFragment_moved_conversations_to_inbox">Moved conversations to inbox</string>
<!-- ConversationListItem --> <!-- ConversationListItem -->
@ -876,7 +876,7 @@
<string name="AndroidManifest__message_details">Message details</string> <string name="AndroidManifest__message_details">Message details</string>
<string name="AndroidManifest_manage_linked_devices">Manage linked devices</string> <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
<string name="AndroidManifest__invite_friends">Invite friends</string> <string name="AndroidManifest__invite_friends">Invite friends</string>
<string name="AndroidManifest_conversations_archive">Conversations archive</string> <string name="AndroidManifest_archived_conversations">Archived conversations</string>
<!-- arrays.xml --> <!-- arrays.xml -->
<string name="arrays__import_export">Import / export</string> <string name="arrays__import_export">Import / export</string>

4
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@ -201,7 +201,7 @@ public class ConversationListFragment extends Fragment
String snackBarTitle; String snackBarTitle;
if (archive) snackBarTitle = getString(R.string.ConversationListFragment_moved_conversations_to_inbox); if (archive) snackBarTitle = getString(R.string.ConversationListFragment_moved_conversations_to_inbox);
else snackBarTitle = getString(R.string.ConversationListFragment_archived_conversations); else snackBarTitle = getString(R.string.ConversationListFragment_conversations_archived);
new SnackbarAsyncTask<Void>(getView(), snackBarTitle, new SnackbarAsyncTask<Void>(getView(), snackBarTitle,
getString(R.string.ConversationListFragment_undo), getString(R.string.ConversationListFragment_undo),
@ -452,7 +452,7 @@ public class ConversationListFragment extends Fragment
}.execute(threadId); }.execute(threadId);
} else { } else {
new SnackbarAsyncTask<Long>(getView(), new SnackbarAsyncTask<Long>(getView(),
getString(R.string.ConversationListFragment_archived_conversation), getString(R.string.ConversationListFragment_conversation_archived),
getString(R.string.ConversationListFragment_undo), getString(R.string.ConversationListFragment_undo),
getResources().getColor(R.color.amber_500), getResources().getColor(R.color.amber_500),
Snackbar.LENGTH_LONG, false) Snackbar.LENGTH_LONG, false)