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

2017-06-30 16:15:41 +01:00
parent c07057d1d4 0b46184a21
commit 8468a118b5
23 changed files with 1956 additions and 1086 deletions
@@ -1,4 +1,5 @@
 {
+    "Add a widget": "Add a widget",
    "af": "Afrikaans",
    "ar-ae": "Arabic (U.A.E.)",
    "ar-bh": "Arabic (Bahrain)",
@@ -311,6 +312,7 @@
    "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
    "had": "had",
    "Hangup": "Hangup",
+    "Hide Apps": "Hide Apps",
    "Hide read receipts": "Hide read receipts",
    "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
    "Historical": "Historical",
@@ -362,6 +364,7 @@
    "Markdown is disabled": "Markdown is disabled",
    "Markdown is enabled": "Markdown is enabled",
    "matrix-react-sdk version:": "matrix-react-sdk version:",
+    "Matrix Apps": "Matrix Apps",
    "Members only": "Members only",
    "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
    "Missing room_id in request": "Missing room_id in request",
@@ -464,6 +467,7 @@
    "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
    "Settings": "Settings",
+    "Show Apps": "Show Apps",
    "Show panel": "Show panel",
    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
    "Signed Out": "Signed Out",