diff --git a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
index 80dabd5021..d2f8c4022b 100644
--- a/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
@@ -118,7 +118,7 @@ object TextUtils {
 
     private fun appendHours(context: Context, builder: StringBuilder, hours: Int) {
         builder.append(hours)
-        builder.append(context.resources.getQuantityString(R.plurals.time_unit_hour_short, hours))
+        builder.append(context.resources.getString(R.string.time_unit_hour_short))
     }
 
     private fun appendMinutes(context: Context, builder: StringBuilder, minutes: Int) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
index daca48e7aa..838fbd46de 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
@@ -57,7 +57,6 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
         holder.locationLiveMessageBanner.stopButton.setOnClickListener {
             attributes.callback?.onTimelineItemAction(RoomDetailAction.StopLiveLocationSharing)
         }
-        // TODO adjust Copyright map placement if needed
     }
 
     private fun buildViewState(
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 93955e54b6..1851e33d7f 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -322,12 +322,11 @@
     <string name="start_chatting">Start Chatting</string>
     <string name="spaces">Spaces</string>
 
-    <!-- Time units -->
-    <plurals name="time_unit_hour_short">
-        <item quantity="one">hour</item>
-        <item quantity="other">hours</item>
-    </plurals>
+    <!-- Time unit for hour: if a short version exists, it should be used -->
+    <string name="time_unit_hour_short">h</string>
+    <!-- Time unit for minute: if a short version exists, it should be used -->
     <string name="time_unit_minute_short">min</string>
+    <!-- Time unit for second: if a short version exists, it should be used -->
     <string name="time_unit_second_short">sec</string>
 
     <!-- Permissions denied forever -->
@@ -3024,8 +3023,10 @@
     <string name="location_share_live_started">Loading live location…</string>
     <string name="location_share_live_ended">Live location ended</string>
     <string name="location_share_live_view">View live location</string>
+    <!-- Examples of usage: Live until 5:42 PM/Live until 17:42-->
     <string name="location_share_live_until">Live until %1$s</string>
     <string name="location_share_live_stop">Stop</string>
+    <!-- Examples of usage: 6h 15min 30sec left/15min 30sec left/30 sec left-->
     <string name="location_share_live_remaining_time">%1$s left</string>
     <string name="live_location_sharing_notification_title">${app_name} Live Location</string>
     <string name="live_location_sharing_notification_description">Location sharing is in progress</string>