From 3180d0c1acff905620c1b210e3ca982d21fdbbfe Mon Sep 17 00:00:00 2001
From: cYuza <59847833+cYuza@users.noreply.github.com>
Date: Sun, 5 Jul 2020 19:39:18 +0200
Subject: [PATCH 1/2] fixed translation size for button "Join Discord" under
 Calendar (#36)

* German translation

* prettier Translation file DE

* Update translation_de.json

* Update translation_de.json

* Update translation_de.json

* Update translation_de.json

* Update translation_de.json

* escape characters

* escape characters greek

* escape characters /n

* fixed mode name -

* fixed duplicate key

* changed file name

* Update translation.json

* Update translation.json
---
 frontend-react/public/locales/de/translation.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend-react/public/locales/de/translation.json b/frontend-react/public/locales/de/translation.json
index 0baa8b87c..f6222d5b3 100644
--- a/frontend-react/public/locales/de/translation.json
+++ b/frontend-react/public/locales/de/translation.json
@@ -1231,11 +1231,11 @@
     "Filter tournaments": "Turniersuche",
     "weekNumber": "Woche {{weekNumber}}",
     "This week": "Diese Woche",
-    "Join Discord": "Tritt dem Discordserver bei",
+    "Join Discord": "Discord",
     "Hide info": "Einklappen",
     "Show info": "Ausklappen",
     "Edit": "Bearbeiten",
-    "footer": "Alle Events werden in deiner Zeitzone angezeigt: {{timeNow}}<2>Dein Event fehlt? Kontaktiere Sendou#0043 auf Discord (auf englisch)</2>",
+    "footer": "Alle Events werden in deiner Zeitzone angezeigt: {{timeNow}}<2>Dein Event fehlt? Kontaktiere Sendou#0043 auf Discord (auf englisch)!</2>",
     "plusVotingInfo": "<0>Plus Server Wahlen</0> finden \u00fcber dieses Wochenende statt"
   },
   "builds": {
@@ -1356,7 +1356,8 @@
     "shield durability": "Schildhaltbarkeit",
     "full charge shooting duration": "Schussdauer (wenn voll aufgeladen)",
     "Slosher has weird physics so we haven't fully deciphered this parameter.": "der Schwapper hat einzigartige Physik, also ist dieser Parameter noch nicht implementiert.",
-    "damage": "Schaden"
+    "damage": "Schaden",
+    "Damage taken in enemy ink": "Schaden durch Gegnertinte"
   },
   "users": {
     "Filter by username, Twitter name or Discord ID": "Namen, Twitter Namen oder Discord ID suchen",
@@ -1525,4 +1526,4 @@
     "Misc": "Anderes",
     "englishOnly": "Dieser Inhalt ist soweit nur in English verf\u00fcgbar. Wir werden uns bem\u00fchen, weitere Sprachen hinzuzuf\u00fcgen."
   }
-}
+}
\ No newline at end of file

From c67bc9ae4836495f0bc17044ad32835637b3296d Mon Sep 17 00:00:00 2001
From: guigas7 <jimhorton7@outlook.com>
Date: Mon, 13 Jul 2020 16:54:31 -0300
Subject: [PATCH 2/2] Fix typo on calendar page (pt-BR translation) (#39)

Signed-off-by: Guigas <jimhorton7@outlook.com>
---
 frontend-react/public/locales/pt-BR/translation.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend-react/public/locales/pt-BR/translation.json b/frontend-react/public/locales/pt-BR/translation.json
index 2c781d209..1a2ac1752 100644
--- a/frontend-react/public/locales/pt-BR/translation.json
+++ b/frontend-react/public/locales/pt-BR/translation.json
@@ -1237,7 +1237,7 @@
     "This week": "Essa semana",
     "Join Discord": "Entrar no Discord",
     "Hide info": "Esconder info",
-    "Show info": "Mostrar infor",
+    "Show info": "Mostrar info",
     "Edit": "Editar",
     "footer": "Todos os eventos estão listados em seu fuso horário local: {{timeNow}}<2>Se quiser que seu evento apareça aqui, mande uma mensagem para Sendou#0043 no Discord</2>",
     "plusVotingInfo": "<0>A votação mensal do Plus Server</0> acontece nos finais de semana"