Merge branch '6400-change-chat-style-and-lang' of github.com:Ocelot-Social-Community/Ocelot-Social into 6400-change-chat-style-and-lang

webapp/locales/de.json

@@ -77,19 +77,19 @@
       }
     }
   },
-  "chat": {    
-    "roomsEmpty" : "Keine Räume",
-    "roomEmpty" : "Keinen Raum selektiert",
-    "newMessages" : "Neue Nachrichten",
+  "chat": {
+    "cancelSelectMessage": "Abbrechen",
+    "conversationStarted": "Unterhaltung startete am:",
+    "isOnline": "online",
+    "isTyping": "tippt...",
+    "lastSeen": "zuletzt gesehen ",
     "messageDeleted": "Diese Nachricht wuerde gelöscht",
     "messagesEmpty": "Keine Nachrichten",
-    "conversationStarted": "Unterhaltung startete am:",
-    "typeMessage": "Nachricht schreiben",
+    "newMessages": "Neue Nachrichten",
+    "roomEmpty": "Keinen Raum selektiert",
+    "roomsEmpty": "Keine Räume",
     "search": "Suche",
-    "isOnline": "online",
-    "lastSeen": "zuletzt gesehen ",
-    "isTyping": "tippt...",
-    "cancelSelectMessage": "Abbrechen"    
+    "typeMessage": "Nachricht schreiben"
   },
   "client-only": {
     "loading": "Lade …"

webapp/locales/en.json

@@ -77,19 +77,19 @@
       }
     }
   },
-  "chat": {    
-    "roomsEmpty" : "No rooms",
-    "roomEmpty" : "No room selected",
-    "newMessages" : "New Messages",
+  "chat": {
+    "cancelSelectMessage": "Cancel",
+    "conversationStarted": "Conversation started on:",
+    "isOnline": "is online",
+    "isTyping": "is writing...",
+    "lastSeen": "last seen ",
     "messageDeleted": "This message was deleted",
     "messagesEmpty": "No messages",
-    "conversationStarted": "Conversation started on:",
-    "typeMessage": "Type message",
+    "newMessages": "New Messages",
+    "roomEmpty": "No room selected",
+    "roomsEmpty": "No rooms",
     "search": "Search",
-    "isOnline": "is online",
-    "lastSeen": "last seen ",
-    "isTyping": "is writing...",
-    "cancelSelectMessage": "Cancel"    
+    "typeMessage": "Type message"
   },
   "client-only": {
     "loading": "Loading …"