Merge remote-tracking branch 'origin/develop' into develop

scripts/gen-i18n.js

@@ -222,10 +222,21 @@ const translatables = new Set();
 
 const walkOpts = {
     listeners: {
+        names: function(root, nodeNamesArray) {
+            // Sort the names case insensitively and alphabetically to
+            // maintain some sense of order between the different strings.
+            nodeNamesArray.sort((a, b) => {
+                a = a.toLowerCase();
+                b = b.toLowerCase();
+                if (a > b) return 1;
+                if (a < b) return -1;
+                return 0;
+            });
+        },
         file: function(root, fileStats, next) {
             const fullPath = path.join(root, fileStats.name);
 
-            let ltrs;
+            let trs;
             if (fileStats.name.endsWith('.js')) {
                 trs = getTranslationsJs(fullPath);
             } else if (fileStats.name.endsWith('.html')) {
@@ -235,7 +246,8 @@ const walkOpts = {
             }
             console.log(`${fullPath} (${trs.size} strings)`);
             for (const tr of trs.values()) {
-                translatables.add(tr);
+                // Convert DOS line endings to unix
+                translatables.add(tr.replace(/\r\n/g, "\n"));
             }
         },
     }

src/i18n/strings/en_EN.json

@@ -43,6 +43,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -82,6 +86,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "Error": "Error",
     "Unable to load! Check your network connectivity and try again.": "Unable to load! Check your network connectivity and try again.",
     "Dismiss": "Dismiss",
@@ -210,11 +215,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "This homeserver has hit its Monthly Active User limit.": "This homeserver has hit its Monthly Active User limit.",
     "This homeserver has exceeded one of its resource limits.": "This homeserver has exceeded one of its resource limits.",
     "Please <a>contact your service administrator</a> to continue using the service.": "Please <a>contact your service administrator</a> to continue using the service.",
@@ -222,7 +222,9 @@
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
-    "There was an error joining the room": "There was an error joining the room",
+    "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
+    "User %(user_id)s does not exist": "User %(user_id)s does not exist",
+    "Unknown server error": "Unknown server error",
     "Use a few words, avoid common phrases": "Use a few words, avoid common phrases",
     "No need for symbols, digits, or uppercase letters": "No need for symbols, digits, or uppercase letters",
     "Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",
@@ -248,9 +250,7 @@
     "A word by itself is easy to guess": "A word by itself is easy to guess",
     "Names and surnames by themselves are easy to guess": "Names and surnames by themselves are easy to guess",
     "Common names and surnames are easy to guess": "Common names and surnames are easy to guess",
-    "You do not have permission to invite people to this room.": "You do not have permission to invite people to this room.",
+    "There was an error joining the room": "There was an error joining the room",
-    "User %(user_id)s does not exist": "User %(user_id)s does not exist",
-    "Unknown server error": "Unknown server error",
     "Sorry, your homeserver is too old to participate in this room.": "Sorry, your homeserver is too old to participate in this room.",
     "Please contact your homeserver administrator.": "Please contact your homeserver administrator.",
     "Failed to join room": "Failed to join room",
@@ -491,11 +491,11 @@
     "At this time it is not possible to reply with an emote.": "At this time it is not possible to reply with an emote.",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -734,6 +734,7 @@
     "Remove this user from community?": "Remove this user from community?",
     "Failed to withdraw invitation": "Failed to withdraw invitation",
     "Failed to remove user from community": "Failed to remove user from community",
+    "Failed to load group members": "Failed to load group members",
     "Filter community members": "Filter community members",
     "Flair will appear if enabled in room settings": "Flair will appear if enabled in room settings",
     "Flair will not appear": "Flair will not appear",
@@ -1104,7 +1105,6 @@
     "Community %(groupId)s not found": "Community %(groupId)s not found",
     "This Home server does not support communities": "This Home server does not support communities",
     "Failed to load %(groupId)s": "Failed to load %(groupId)s",
-    "Failed to load group members": "Failed to load group members",
     "Couldn't load home page": "Couldn't load home page",
     "You are currently using Riot anonymously as a guest.": "You are currently using Riot anonymously as a guest.",
     "If you would like to create a Matrix account you can <a>register</a> now.": "If you would like to create a Matrix account you can <a>register</a> now.",