Merge branch 'develop' into shorter-URLs-channels-accounts

1 files changed, 12 insertions, 12 deletions

diff --git a/client/src/locale/angular.nn.xlf b/client/src/locale/angular.nn.xlf
index a1f90049d..dfae18907 100644
--- a/client/src/locale/angular.nn.xlf
+++ b/client/src/locale/angular.nn.xlf
@@ -221,7 +221,7 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.SS" datatype="html">
         <source>SS</source>
-        <target/>
+        <target>SS</target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/@ng-bootstrap/ng-bootstrap/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">85,87</context>
@@ -229,7 +229,7 @@
       </trans-unit>
       <trans-unit id="ngb.timepicker.seconds" datatype="html">
         <source>Seconds</source>
-        <target/>
+        <target>Sekund</target>
         <context-group purpose="location">
           <context context-type="sourcefile">node_modules/@ng-bootstrap/ng-bootstrap/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">90,92</context>
@@ -1635,7 +1635,7 @@
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4668975178372693951" datatype="html">
+      <trans-unit id="28aca3fd95c8d941f643c617058636715b6f87d9" datatype="html">
         <source>Discover videos</source>
         <target/>
         <context-group purpose="location">
@@ -1643,7 +1643,7 @@
           <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8780831394889318512" datatype="html">
+      <trans-unit id="caa128fe5c4b611830f6138e844709c348f07948" datatype="html">
         <source>Trending pages</source>
         <target/>
         <context-group purpose="location">
@@ -1711,7 +1711,7 @@
           <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="664221386829541948" datatype="html">
+      <trans-unit id="93d74eb49a5e5c2af5f815178909adf425000af8" datatype="html">
         <source>Recently added videos</source>
         <target/>
         <context-group purpose="location">
@@ -1719,7 +1719,7 @@
           <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8681933925782924101" datatype="html">
+      <trans-unit id="b6307f83d9f43bff8d5129a7888e89964ddc3f7f" datatype="html">
         <source>Local videos</source>
         <target/>
         <context-group purpose="location">
@@ -2291,7 +2291,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="47188419949558046" datatype="html">
+      <trans-unit id="3070ae34708ac4b19ac0a2fdc2c0b82871754c7a" datatype="html">
         <source>Instance information</source>
         <target/>
         <context-group purpose="location">
@@ -2299,7 +2299,7 @@
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4403968622852357647" datatype="html">
+      <trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5" datatype="html">
         <source>Basic configuration</source>
         <target/>
         <context-group purpose="location">
@@ -2327,7 +2327,7 @@
           <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7368823469700320150" datatype="html">
+      <trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab" datatype="html">
         <source>Advanced configuration</source>
         <target/>
         <context-group purpose="location">
@@ -9350,7 +9350,7 @@
           <context context-type="linenumber">43,44</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8136608075220662349" datatype="html">
+      <trans-unit id="ef0f544578470cd6dd75432d0f1ba0e27914d2cc" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;https://chooser-beta.creativecommons.org/&quot; target=&quot;_blank&quot; rel=&quot;noopener noreferrer&quot;&gt;"/>Choose<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> the appropriate license for your work. </source>
         <target/>
         <context-group purpose="location">
@@ -11698,7 +11698,7 @@
           <context context-type="linenumber">123</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="232050922346936574" datatype="html">
+      <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807" datatype="html">
         <source>Trending</source>
         <target/>
         <context-group purpose="location">
@@ -11706,7 +11706,7 @@
           <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="2431286785954354122" datatype="html">
+      <trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1" datatype="html">
         <source>Recently added</source>
         <target/>
         <context-group purpose="location">