From adbd8063f30131e469c0fa5cbc7ff2af5b38b015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Wed, 15 Dec 2021 08:56:53 +0000
Subject: [PATCH 1/6] [ru] Update translations.suml

---
 locale/ru/translations.suml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/ru/translations.suml b/locale/ru/translations.suml
index 2c64b244c..935f61148 100644
--- a/locale/ru/translations.suml
+++ b/locale/ru/translations.suml
@@ -482,7 +482,7 @@ profile:
         header: 'Редактор карточек'
         save: 'Сохранить Вашу карточку'
         defaults: 'Вернуть слова по умолчанию'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Изменения в этой колонке будут распространяться на все языки'
     opinion:
         yes: 'Да'
         jokingly: 'В шутку'

From 0b8da50606c2c25d1ba5a686f070ec0a4e0dfc21 Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 15 Dec 2021 19:30:02 +0100
Subject: [PATCH 2/6] fix verifying pleroma urls

---
 src/socialProviders.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socialProviders.js b/src/socialProviders.js
index 35e568cf2..8a6343d23 100644
--- a/src/socialProviders.js
+++ b/src/socialProviders.js
@@ -2,7 +2,7 @@ export const socialProviders = {
     mastodon: {
         name: 'Mastodon',
         instanceRequired: true,
-        linkRegex: (p) => `^https?://(?:www.)?${p.name.split('@')[1]}/(?:web/)?@${p.name.split('@')[0]}/?$`,
+        linkRegex: (p) => `^https?://(?:www.)?${p.name.split('@')[1]}/(?:(?:web/)?@|users/)?${p.name.split('@')[0]}/?$`,
     },
     twitter: {
         name: 'Twitter',

From 91884f7611583d6d53b9f939a4a03e5675bcf547 Mon Sep 17 00:00:00 2001
From: Lauren Liberda <laura@selfisekai.rocks>
Date: Wed, 15 Dec 2021 19:43:53 +0100
Subject: [PATCH 3/6] matrix icon for matrix.to links

---
 plugins/link.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/link.js b/plugins/link.js
index 57d281517..74d5299b8 100644
--- a/plugins/link.js
+++ b/plugins/link.js
@@ -75,6 +75,10 @@ const LINK_PROVIDERS = {
         icon: 'mastodon',
         iconSet: 'b',
     },
+    matrix: {
+        regex: '^https?://(?:www.)?matrix\\.to/#/([^/?]+)',
+        icon: 'https://raw.githubusercontent.com/vector-im/logos/master/matrix/matrix-favicon.png',
+    },
 };
 
 export default {

From bda2be255d07216fd2f3c7413bbed23f486e4f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Wed, 15 Dec 2021 19:50:33 +0100
Subject: [PATCH 4/6] [de] Update translations.suml

---
 locale/de/translations.suml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/de/translations.suml b/locale/de/translations.suml
index 8698f50cf..1e0e2728c 100644
--- a/locale/de/translations.suml
+++ b/locale/de/translations.suml
@@ -443,7 +443,7 @@ profile:
         header: 'Visitenkarte-Editor'
         save: 'Visitenkarte speichern'
         defaults: 'Standardwerte wiederherstellen'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Diese Änderung in allen Visitenkarten in allen Sprachen speichern'
     opinion:
         yes: 'Ja'
         jokingly: 'Scherzhaft'

From 5582de2375ea3d7e747f66685b0de5cd508dbba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Wed, 15 Dec 2021 19:31:05 +0000
Subject: [PATCH 5/6] [nl] Update translations.suml

---
 locale/nl/translations.suml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/nl/translations.suml b/locale/nl/translations.suml
index e103cfc86..88d31a9af 100644
--- a/locale/nl/translations.suml
+++ b/locale/nl/translations.suml
@@ -449,7 +449,7 @@ profile:
         header: 'Kaart editor'
         save: 'Sla jouw kaart op'
         defaults: 'Zet terug naar standaardwaarden'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Sla deze verandering op voor jouw kaarten in alle talen'
     opinion:
         yes: 'Ja'
         jokingly: 'Voor de grap'

From e5200fde03d52a23f647e7a87532edc87a0213e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Dembowski?= <pawel.dembowski@gmail.com>
Date: Wed, 15 Dec 2021 22:39:06 +0000
Subject: [PATCH 6/6] [fr] Update translations.suml

---
 locale/fr/translations.suml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr/translations.suml b/locale/fr/translations.suml
index 9e5f388b4..b47bc63bb 100644
--- a/locale/fr/translations.suml
+++ b/locale/fr/translations.suml
@@ -449,7 +449,7 @@ profile:
         header: 'Éditeur de carte'
         save: 'Sauvegarder votre carte'
         defaults: 'Restaurer les valeurs par défaut'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Sauvegarder ce changement sur vos cartes dans tous les langages'
     opinion:
         yes: 'Oui'
         jokingly: 'Pour plaisanter'