diff --git a/scm-ui/ui-components/src/Duration.stories.tsx b/scm-ui/ui-components/src/Duration.stories.tsx
index 57d16832db..66be01f77d 100644
--- a/scm-ui/ui-components/src/Duration.stories.tsx
+++ b/scm-ui/ui-components/src/Duration.stories.tsx
@@ -20,21 +20,39 @@ import React from "react";
 
 storiesOf("Duration", module).add("Duration", () => (
   <div className="m-5 p-5">
+    <p>
+      <Duration duration={1} />
+    </p>
     <p>
       <Duration duration={500} />
     </p>
+    <p>
+      <Duration duration={1000 + 1} />
+    </p>
     <p>
       <Duration duration={2000} />
     </p>
+    <p>
+      <Duration duration={1000 * 60 + 1} />
+    </p>
     <p>
       <Duration duration={42 * 1000 * 60} />
     </p>
+    <p>
+      <Duration duration={1000 * 60 * 60 + 1} />
+    </p>
     <p>
       <Duration duration={21 * 1000 * 60 * 60} />
     </p>
+    <p>
+      <Duration duration={1000 * 60 * 60 * 24 + 1} />
+    </p>
     <p>
       <Duration duration={5 * 1000 * 60 * 60 * 24} />
     </p>
+    <p>
+      <Duration duration={1000 * 60 * 60 * 24 * 7 + 1} />
+    </p>
     <p>
       <Duration duration={3 * 1000 * 60 * 60 * 24 * 7} />
     </p>
diff --git a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
index c6683459fa..bb65cefd8a 100644
--- a/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
+++ b/scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap
@@ -1521,6 +1521,13 @@ exports[`Storyshots Duration Duration 1`] = `
 <div
   className="m-5 p-5"
 >
+  <p>
+    <time
+      dateTime="1ms"
+    >
+      duration.ms
+    </time>
+  </p>
   <p>
     <time
       dateTime="500ms"
@@ -1528,6 +1535,13 @@ exports[`Storyshots Duration Duration 1`] = `
       duration.ms
     </time>
   </p>
+  <p>
+    <time
+      dateTime="1s"
+    >
+      duration.s
+    </time>
+  </p>
   <p>
     <time
       dateTime="2s"
@@ -1535,6 +1549,13 @@ exports[`Storyshots Duration Duration 1`] = `
       duration.s
     </time>
   </p>
+  <p>
+    <time
+      dateTime="1m"
+    >
+      duration.m
+    </time>
+  </p>
   <p>
     <time
       dateTime="42m"
@@ -1542,6 +1563,13 @@ exports[`Storyshots Duration Duration 1`] = `
       duration.m
     </time>
   </p>
+  <p>
+    <time
+      dateTime="1h"
+    >
+      duration.h
+    </time>
+  </p>
   <p>
     <time
       dateTime="21h"
@@ -1549,6 +1577,13 @@ exports[`Storyshots Duration Duration 1`] = `
       duration.h
     </time>
   </p>
+  <p>
+    <time
+      dateTime="1d"
+    >
+      duration.d
+    </time>
+  </p>
   <p>
     <time
       dateTime="5d"
@@ -1556,6 +1591,13 @@ exports[`Storyshots Duration Duration 1`] = `
       duration.d
     </time>
   </p>
+  <p>
+    <time
+      dateTime="1w"
+    >
+      duration.w
+    </time>
+  </p>
   <p>
     <time
       dateTime="3w"
diff --git a/scm-ui/ui-webapp/public/locales/de/admin.json b/scm-ui/ui-webapp/public/locales/de/admin.json
index 46abb35a67..6bee58dcf6 100644
--- a/scm-ui/ui-webapp/public/locales/de/admin.json
+++ b/scm-ui/ui-webapp/public/locales/de/admin.json
@@ -38,7 +38,7 @@
     "showPending": "Änderungen anzeigen",
     "executePending": "Warten auf Neustart",
     "outdatedPlugins": "{{count}} Plugin aktualisieren",
-    "outdatedPlugins_plural": "{{count}} Plugins aktualisieren",
+    "outdatedPlugins_other": "{{count}} Plugins aktualisieren",
     "updateAll": "Alle Plugins aktualisieren",
     "cancelPending": "Änderungen verwerfen",
     "noPlugins": "Keine Plugins gefunden.",
diff --git a/scm-ui/ui-webapp/public/locales/de/commons.json b/scm-ui/ui-webapp/public/locales/de/commons.json
index 682b335d6e..d0638c1c29 100644
--- a/scm-ui/ui-webapp/public/locales/de/commons.json
+++ b/scm-ui/ui-webapp/public/locales/de/commons.json
@@ -232,7 +232,7 @@
   "notifications": {
     "toastTitle": "Benachrichtigung",
     "xMore": "+{{ count }} Benachrichtigung",
-    "xMore_plural": "+{{ count }} Benachrichtigungen",
+    "xMore_other": "+{{ count }} Benachrichtigungen",
     "loading": "Lade ...",
     "bellTitle": "Benachrichtigungen",
     "empty": "Keine Benachrichtigungen",
@@ -249,17 +249,17 @@
   },
   "duration": {
     "ms": "{{count}} Millisekunde",
-    "ms_plural": "{{count}} Millisekunden",
+    "ms_other": "{{count}} Millisekunden",
     "s": "{{count}} Sekunde",
-    "s_plural": "{{count}} Sekunden",
+    "s_other": "{{count}} Sekunden",
     "m": "{{count}} Minute",
-    "m_plural": "{{count}} Minuten",
+    "m_other": "{{count}} Minuten",
     "h": "{{count}} Stunde",
-    "h_plural": "{{count}} Stunden",
+    "h_other": "{{count}} Stunden",
     "d": "{{count}} Tag",
-    "d_plural": "{{count}} Tage",
+    "d_other": "{{count}} Tage",
     "w": "{{count}} Woche",
-    "w_plural": "{{count}} Wochen"
+    "w_other": "{{count}} Wochen"
   },
   "search": {
     "ariaLabel": "Globale Suche",
@@ -281,7 +281,7 @@
       "hints": "Hinweise zu ihrer Suche",
       "screenReaderHintNoResult": "Keine Repositories gefunden. Mögliche weitere Ergebnistypen mit Enter anzeigen.",
       "screenReaderHint": "Ein Repository gefunden. Mögliche weitere Ergebnistypen mit Enter anzeigen oder Pfeiltasten verwenden um zu den gefunden Repositories zu navigieren und mit Enter bestätigen.",
-      "screenReaderHint_plural": "Mindestens {{ count }} Repositories gefunden. Mögliche weitere Ergebnistypen mit Enter anzeigen oder Pfeiltasten verwenden um zu den gefunden Repositories zu navigieren und mit Enter bestätigen.",
+      "screenReaderHint_other": "Mindestens {{ count }} Repositories gefunden. Mögliche weitere Ergebnistypen mit Enter anzeigen oder Pfeiltasten verwenden um zu den gefunden Repositories zu navigieren und mit Enter bestätigen.",
       "searchRepo": "In Repository suchen",
       "searchNamespace": "In Namespace suchen",
       "searchEverywhere": "Überall suchen"
diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json
index 932237e9a4..e5a28265ee 100644
--- a/scm-ui/ui-webapp/public/locales/de/repos.json
+++ b/scm-ui/ui-webapp/public/locales/de/repos.json
@@ -325,7 +325,7 @@
     },
     "parents": {
       "label": "Parent",
-      "label_plural": "Parents"
+      "label_other": "Parents"
     },
     "contributors": {
       "mailto": "Mail senden an",
@@ -337,7 +337,7 @@
       "coAuthoredBy": "Co-Autoren",
       "more": "{{count}} mehr",
       "count": "{{count}} Mitwirkender",
-      "count_plural": "{{count}} Mitwirkende"
+      "count_other": "{{count}} Mitwirkende"
     },
     "buttons": {
       "details": "Details",
diff --git a/scm-ui/ui-webapp/public/locales/en/admin.json b/scm-ui/ui-webapp/public/locales/en/admin.json
index f43ca878aa..5d27143974 100644
--- a/scm-ui/ui-webapp/public/locales/en/admin.json
+++ b/scm-ui/ui-webapp/public/locales/en/admin.json
@@ -38,7 +38,7 @@
     "showPending": "Show Changes",
     "executePending": "Waiting for restart",
     "outdatedPlugins": "Update {{count}} Plugin",
-    "outdatedPlugins_plural": "Update {{count}} Plugins",
+    "outdatedPlugins_other": "Update {{count}} Plugins",
     "updateAll": "Update All Plugins",
     "cancelPending": "Discard Changes",
     "noPlugins": "No plugins found.",
diff --git a/scm-ui/ui-webapp/public/locales/en/commons.json b/scm-ui/ui-webapp/public/locales/en/commons.json
index 429d0cf87e..52a4bfd2d0 100644
--- a/scm-ui/ui-webapp/public/locales/en/commons.json
+++ b/scm-ui/ui-webapp/public/locales/en/commons.json
@@ -233,7 +233,7 @@
   "notifications": {
     "toastTitle": "Notification",
     "xMore": "+{{ count }} Notification",
-    "xMore_plural": "+{{ count }} Notifications",
+    "xMore_other": "+{{ count }} Notifications",
     "loading": "Loading ...",
     "bellTitle": "Notifications",
     "empty": "No notifications",
@@ -250,17 +250,17 @@
   },
   "duration": {
     "ms": "{{count}} millisecond",
-    "ms_plural": "{{count}} milliseconds",
+    "ms_other": "{{count}} milliseconds",
     "s": "{{count}} second",
-    "s_plural": "{{count}} seconds",
+    "s_other": "{{count}} seconds",
     "m": "{{count}} minute",
-    "m_plural": "{{count}} minutes",
+    "m_other": "{{count}} minutes",
     "h": "{{count}} hour",
-    "h_plural": "{{count}} hours",
+    "h_other": "{{count}} hours",
     "d": "{{count}} day",
-    "d_plural": "{{count}} days",
+    "d_other": "{{count}} days",
     "w": "{{count}} week",
-    "w_plural": "{{count}} weeks"
+    "w_other": "{{count}} weeks"
   },
   "search": {
     "ariaLabel": "Global search",
@@ -282,7 +282,7 @@
       "hints": "Hints for your Search",
       "screenReaderHintNoResult": "No repositories found. Other result types may be available, hit enter to navigate to complete search result.",
       "screenReaderHint": "Found one repository. Hit enter to see search results of all types or use arrow keys to navigate to repository quick results and hit enter to select one of them.",
-      "screenReaderHint_plural": "Found at least {{ count }} repositories. Hit enter to see search results of all types or use arrow keys to navigate to repository quick results and hit enter to select one of them.",
+      "screenReaderHint_other": "Found at least {{ count }} repositories. Hit enter to see search results of all types or use arrow keys to navigate to repository quick results and hit enter to select one of them.",
       "searchRepo": "Search in repository",
       "searchNamespace": "Search in namespace",
       "searchEverywhere": "Search everywhere"
diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json
index 8e2b638f2c..e6b7727b47 100644
--- a/scm-ui/ui-webapp/public/locales/en/repos.json
+++ b/scm-ui/ui-webapp/public/locales/en/repos.json
@@ -329,7 +329,7 @@
     },
     "parents": {
       "label": "Parent",
-      "label_plural": "Parents"
+      "label_other": "Parents"
     },
     "contributors": {
       "mailto": "Send mail to",
@@ -341,7 +341,7 @@
       "coAuthoredBy": "co authored by",
       "more": "{{count}} more",
       "count": "{{count}} Contributor",
-      "count_plural": "{{count}} Contributors"
+      "count_other": "{{count}} Contributors"
     },
     "tag": {
       "create": "Create Tag"