From dc4feda73836380832a855d785e1d0bfd43a3121 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 23:21:38 +0000
Subject: [PATCH 1/6] Translated using Weblate (English)

Currently translated at 100.0% (1183 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 1cb538700..cb5d3c102 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1261,7 +1261,7 @@
     "contacts_mutedUsers": "Muted accounts",
     "contacts_muteInfo": "You will not receive any notifications or messages from muted users.<br>They will not know you have muted them. ",
     "team_inviteLinkTitle": "Create a personalized invitation to this team",
-    "team_inviteLinkTempName": "temporary name (visible in pending invitations list)",
+    "team_inviteLinkTempName": "Temporary name (visible in pending invitations list)",
     "team_inviteLinkSetPassword": "Protect the link with a password (recommended)",
     "team_inviteLinkNote": "Add a personal message",
     "team_inviteLinkNoteMsg": "This message will be shown before the recipient decides whether to join this team.",

From e3fc741402f0ecc723da87d2fd9e5b310e10df97 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Wed, 18 Dec 2019 23:21:39 +0000
Subject: [PATCH 2/6] Translated using Weblate (German)

Currently translated at 99.9% (1182 of 1183 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
---
 www/common/translations/messages.de.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 000e4cf53..a385d46df 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1267,7 +1267,17 @@
     "team_inviteLinkNoteMsg": "Diese Nachricht wird angezeigt, bevor der Empfänger entscheidet, ob er diesem Team beitreten möchte.",
     "team_inviteLinkLoading": "Dein Link wird generiert",
     "team_inviteLinkWarning": "Die erste Person, die auf diesen Link zugreift, kann diesem Team beitreten und dessen Inhalte einsehen. Teile ihn sorgfältig.",
-    "team_inviteLinkErrorName": "Bitte gib der Einladung einen Namen",
+    "team_inviteLinkErrorName": "Bitte gib einen Namen für die eingeladene Person ein. Er kann später geändert werden. ",
     "team_inviteLinkCreate": "Link erstellen",
-    "team_inviteLinkCopy": "Link kopieren"
+    "team_inviteLinkCopy": "Link kopieren",
+    "team_inviteFrom": "Von:",
+    "team_inviteFromMsg": "{0} hat dich ins Team <b>{1}</b> eingeladen",
+    "team_invitePleaseLogin": "Bitte logge dich ein oder registriere dich, um diese Einladung anzunehmen.",
+    "team_inviteEnterPassword": "Bitte gib das Passwort für die Einladung ein, um fortzufahren.",
+    "team_invitePasswordLoading": "Einladung wird entschlüsselt",
+    "team_inviteJoin": "Team beitreten",
+    "team_inviteTitle": "Team-Einladung",
+    "team_inviteGetData": "Team-Daten werden abgerufen",
+    "team_cat_link": "Einladungslink",
+    "team_links": "Einladungslinks"
 }

From d2ba3754910f4b52825ed8045070369eb2c3a6e1 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 10:34:08 +0100
Subject: [PATCH 3/6] Improve profile UI

---
 www/common/common-ui-elements.js |  4 ++--
 www/profile/app-profile.less     | 14 ++++++++++----
 www/profile/inner.js             |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 64ae9dd0d..27458c9f9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2073,12 +2073,12 @@ define([
         for (var k in actions) {
             $('<button>', {
                 'data-type': k,
-                'class': 'fa ' + actions[k].icon,
+                'class': 'pure-button fa ' + actions[k].icon,
                 title: Messages['mdToolbar_' + k] || k
             }).click(onClick).appendTo($toolbar);
         }
         $('<button>', {
-            'class': 'fa fa-question cp-markdown-help',
+            'class': 'pure-button fa fa-question cp-markdown-help',
             title: Messages.mdToolbar_help
         }).click(function () {
             var href = Messages.mdToolbar_tutorial;
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index 61b3bbbe6..9371a714a 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -25,6 +25,7 @@
             flex: 1;
             display: flex;
             flex-flow: column;
+            align-items: start;
         }
     }
     #cp-app-profile-avatar {
@@ -80,8 +81,6 @@
         text-align: center;
     }
     #cp-app-profile-displayname, #cp-app-profile-link {
-        width: 100%;
-        height: 40px;
         margin: 10px 0;
         input {
             width: 100%;
@@ -114,6 +113,14 @@
         }
         .cp-app-profile-link-code {
             display: none;
+            min-width: 500px;
+            input {
+                flex: 1;
+                min-width: 0;
+            }
+            button {
+                height: 48px !important;
+            }
         }
         & > button:empty {
             margin-left: 25px !important;
@@ -139,8 +146,7 @@
         float: right;
     }
     .cp-app-profile-viewprofile-button {
-        margin-bottom: 20px;
-        width: 300px;
+        margin-bottom: 5px !important;
     }
     #cp-app-profile-description {
         position: relative;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index a37991ad9..d9e874ccb 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -137,7 +137,7 @@ define([
         }, Messages.profile_addLink);
         APP.$linkEdit = $(button);
         $block.append(button);
-        var save = h('button.btn.btn-success', Messages.settings_save);
+        var save = h('button.btn.btn-primary', Messages.settings_save);
         var text = h('input');
         var code = h('div.cp-app-profile-link-code', [
             text,
@@ -149,7 +149,7 @@ define([
         $block.append(div);
         $(button).click(function () {
             $(text).val(APP.$link.attr('href'));
-            $(code).show();
+            $(code).css('display', 'flex');
             APP.editor.refresh();
             $(button).hide();
         });

From 3bebab57e4d868b15878c3f9224bc4516eea2344 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 19 Dec 2019 10:54:58 +0100
Subject: [PATCH 4/6] Remove XXX

---
 www/common/common-ui-elements.js | 1 -
 www/teams/inner.js               | 2 --
 2 files changed, 3 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 5f4e0b9eb..14d030856 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1730,7 +1730,6 @@ define([
                     bytes64 = _bytes;
                 }));
             }).nThen(function (waitFor) {
-                $(linkSpinText).text(Messages.team_inviteLinkAdding); // XXX
                 module.execCommand('CREATE_INVITE_LINK', {
                     name: name,
                     password: pw,
diff --git a/www/teams/inner.js b/www/teams/inner.js
index 06f23c39d..0bd985442 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -1130,8 +1130,6 @@ define([
                 }, waitFor(function (obj) {
                     if (obj && obj.error) {
                         // Wrong password or other error...
-                        // XXX if DELETED, password prompt again?
-                        console.error(obj.error);
                         waitFor.abort();
                         if (obj.error === 'INVALID_INVITE_CONTENT') {
                             // Wrong password...

From 675ef603621a140851472899f8651b493d9605dc Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Dec 2019 10:08:09 +0000
Subject: [PATCH 5/6] Translated using Weblate (English)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1184 of 1184 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
---
 www/common/translations/messages.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index cb5d3c102..59fe42b8a 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1279,5 +1279,7 @@
     "team_inviteTitle": "Team invitation",
     "team_inviteGetData": "Getting team data",
     "team_cat_link": "Invitation Link",
-    "team_links": "Invitation Links"
+    "team_links": "Invitation Links",
+    "team_inviteInvalidLinkError": "This invitation link is not valid.",
+    "team_inviteLinkError": "There was an error while creating the link."
 }

From 92c6bbc99af465ed71cc0be167f5ce9996774d75 Mon Sep 17 00:00:00 2001
From: Weblate <weblate@cryptpad.fr>
Date: Thu, 19 Dec 2019 10:08:10 +0000
Subject: [PATCH 6/6] Translated using Weblate (French)

Currently translated at 100.0% (1185 of 1185 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
---
 www/common/translations/messages.fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index 7b2d80227..9f957ea17 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1279,5 +1279,7 @@
     "team_inviteTitle": "Invitation à une équipe",
     "team_inviteGetData": "Obtention des données de l'équipe",
     "team_cat_link": "Invitation",
-    "team_links": "Liens d'invitation"
+    "team_links": "Liens d'invitation",
+    "team_inviteInvalidLinkError": "Ce lien d'invitation n'est pas valide.",
+    "team_inviteLinkError": "Erreur lors de la génération du lien."
 }