Merge branch 'master' of https://github.com/johni0702/mumble-web

loc/en.json

@@ -31,6 +31,19 @@
     "title": "Mumble Voice Conference",
     "connect": "Join Conference"
   },
+  "toolbar": {
+    "orientation": "Switch Orientation",
+    "connect": "Connection",
+    "information": "Information",
+    "mute": "Mute",
+    "unmute": "Unmute",
+    "deaf": "Deafen",
+    "undeaf": "Undeafen",
+    "record": "Record",
+    "comment": "Comment",
+    "settings": "Settings",
+    "sourcecode": "Open Source Code"
+  },
   "usercontextmenu": {
     "mute": "Mute",
     "deafen": "Deafen",
@@ -66,6 +79,7 @@
     "connecting": "Connecting to server",
     "connected": "Connected!",
     "connection_error": "Connection error:",
+    "connection_fallback_mode": "Server does not support WebRTC, re-trying in fallback mode..",
     "unknown_voice_mode": "Unknown voice mode:",
     "mic_init_error": "Cannot initialize user media. Microphone will not work:"
   },