Merge pull request #4155 from vector-im/feature/bma/wording_update

Wording update

changelog.d/4155.bugfix

@@ -0,0 +1 @@
+Harmonize wording in the message bottom sheet and move up the View Reactions item

vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt

@@ -341,14 +341,14 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                 add(EventSharedAction.AddReaction(eventId))
             }
 
-            if (canQuote(timelineEvent, messageContent, actionPermissions)) {
-                add(EventSharedAction.Quote(eventId))
-            }
-
             if (canViewReactions(timelineEvent)) {
                 add(EventSharedAction.ViewReactions(informationData))
             }
 
+            if (canQuote(timelineEvent, messageContent, actionPermissions)) {
+                add(EventSharedAction.Quote(eventId))
+            }
+
             if (timelineEvent.hasBeenEdited()) {
                 add(EventSharedAction.ViewEditHistory(informationData))
             }

vector/src/main/res/values/strings.xml

@@ -378,7 +378,7 @@
     <string name="none">None</string>
     <string name="revoke">Revoke</string>
     <string name="disconnect">Disconnect</string>
-    <string name="report_content">Report content</string>
+    <string name="report_content">Report Content</string>
     <string name="active_call">Active call</string>
     <string name="play_video">Play</string>
     <string name="pause_video">Pause</string>