Merge branch 'master' into audio-track-selection

jellyfin · Jan 9, 2022 · 5b46785 · 5b46785
2 parents f6d9695 + e3c1ac5
commit 5b46785
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/locale/en_GB/translations.ts b/locale/en_GB/translations.ts
@@ -422,5 +422,42 @@
         <translation>Enter the server name or ip address</translation>
         <extracomment>Title of KeyboardDialog when manually entering a server URL</extracomment>
     </message>
+    <message>
+        <source>An error was encountered while playing this item.  Server did not provide required transcoding data.</source>
+        <translation>An error was encountered while playing this item.  Server did not provide required transcoding data.</translation>
+        <extracomment>Content of message box when trying to play an item which requires transcoding, and the server did not provide transcode url</extracomment>
+    </message>
+    <message>
+        <source>Error Getting Playback Information</source>
+        <translation>Error Getting Playback Information</translation>
+        <extracomment>Dialog Title: Received error from server when trying to get information about the selected item for playback</extracomment>
+    </message>
+    <message>
+        <source>...or enter server URL manually:</source>
+        <translation>...or enter server URL manually:</translation>
+        <extracomment>Instructions on initial app launch when the user is asked to manually enter a server URL</extracomment>
+    </message>
+    <message>
+        <source>Pick a Jellyfin server from the local network</source>
+        <translation>Pick a Jellyfin server from the local network</translation>
+        <extracomment>Instructions on initial app launch when the user is asked to pick a server from a list</extracomment>
+    </message>
+    <message>
+        <source>Enter the server name or ip address</source>
+        <translation>Enter the server name or IP address</translation>
+        <extracomment>Title of KeyboardDialog when manually entering a server URL</extracomment>
+    </message>
+    <message>
+        <source>On Now</source>
+        <translation>On Now</translation>
+    </message>
+    <message>
+        <source>Delete Saved</source>
+        <translation>Delete Saved</translation>
+    </message>
+    <message>
+        <source>Save Credentials?</source>
+        <translation>Save Credentials?</translation>
+    </message>
 </context>
 </TS>
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
@@ -6,7 +6,7 @@
     <name>default</name>
     <message>
         <source>192.168.1.100:8096 or https://example.com/jellyfin</source>
-        <translation>192.168.1.100:8096 or https://example.com/jellyfin</translation>
+        <translation>default192.168.1.100:8096 or https://example.com/jellyfin</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -95,7 +95,7 @@
     <message>
         <source>Save Credentials?</source>
         <translation>Save Credentials?</translation>
-    </message>    
+    </message>
     <message>
         <source>Delete Saved</source>
         <translation>Delete Saved</translation>
@@ -119,7 +119,7 @@
     <message>
         <source>On Now</source>
         <translation>On Now</translation>
-    </message>    
+    </message>
     <message>
         <source>Home</source>
         <translation>Home</translation>