Merge branch 'master' of github.com:cutls/TheDesk

app/package.json

@@ -65,12 +65,12 @@
         "jimp": "^0.16.1",
         "jquery": "^3.5.1",
         "jquery-ui-dist": "^1.12.1",
-        "json5": "^2.1.3",
+        "json5": "^2.2.0",
         "lodash": "^4.17.20",
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
-        "sanitize-html": "^2.3.1",
+        "sanitize-html": "^2.3.2",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^10.13.0",
+        "sweetalert2": "^10.14.0",
         "system-font-families": "^0.4.1",
         "vue": "^2.6.12"
     },

app/view/make/language/de-DE/acct.json

@@ -17,7 +17,7 @@
     "safety": "Verbindung",
     "ver": "Mastodon Version",
     "ko": "",
-    "thisismisskey": "Als Misskey anmelden",
+    "thisismisskey": "Login als Misskey",
     "misskeylogin": "Lies die <a href=\"https://thedesk.top/how-to-misskey-login.html\">Doku (japanisch)</a> um dich bei Misskey einzuloggen.",
     "nodata": "Keine Daten",
     "accessTokenSetup": "Benutze Zugangs-Token zum Anmelden (Klicke nach Ausfüllen nicht den Code, sondern den Access-Token im Kästchen: Erweitert)",

app/view/make/language/de-DE/index.json

@@ -47,7 +47,7 @@
     "thingsEmoji": "Emojis vom Werkzeugen",
     "symbolEmoji": "Emojis von Symbolen",
     "flagsEmoji": "Emojis der Flaggen",
-    "draft": "Draft",
+    "draft": "Entwurf",
     "poll": "Umfrage",
     "pollDdisabled": "Umfragen: Deaktiviert",
     "pollProvider": "Anbieter von Umfragen",

app/view/make/language/de-DE/main.json

@@ -48,8 +48,8 @@
     "lang_manager_none": "Ohne",
     "lang_manager_godev": "Öffnen Sie das DevCenter von Misskey. Wir zeigen auch ein offizielles Dokument als Referenz.",
     "lang_manager_logout": "Abmelden",
-    "lang_manager_maxChars": "Max chars of toots",
+    "lang_manager_maxChars": "Max Zeichen von toots",
-    "lang_manager_refreshAt": "Login with this domain",
+    "lang_manager_refreshAt": "Mit dieser Domain anmelden",
     "lang_bbmd_misskey": "TheDesk betrachtet \"@\" als Antwort, setzt aber einen anderen Parameter. Nicht auf Mastodon gelistet bedeutet Home on Misskey.",
     "lang_emoji_get": "Hole Emojis",
     "lang_emoji_custom": "Eigene Emojis",
@@ -71,8 +71,8 @@
     "lang_post_btn2": "Text automatisch ausblenden",
     "lang_post_btn3": "Weiter mit Senden",
     "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
-    "lang_post_retry": "Retry",
+    "lang_post_retry": "Erneut versuchen",
-    "lang_post_offline": "Add to the drafts because of offline",
+    "lang_post_offline": "Zu den Entwürfen wegen offline hinzufügen",
     "lang_status_favWarn": "Es braucht einen Moment, um ein entferntes Tröt zu favorisieren.",
     "lang_status_btWarn": "Es braucht einen Moment, um ein entferntes Tröt zu verstärken.",
     "lang_status_follow": "Folgen",
@@ -89,8 +89,8 @@
     "lang_status_endorse": "Auf dem Profil zeigen",
     "lang_status_followers": "Folgende",
     "lang_status_active": "Letzter Status",
-    "lang_secure_draft": "Add to draft",
+    "lang_secure_draft": "Zum Entwurf hinzufügen",
-    "lang_secure_useThis": "Use this",
+    "lang_secure_useThis": "Benutze dies",
     "lang_secure_deleteThis": "Diesen Tröt löschen",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Antwortmodus. Strg+Umschalt+C zum Löschen.",
@@ -142,19 +142,19 @@
     "lang_layout_dm": "Direkte Nachricht",
     "lang_layout_webviewmode": "Web-Ansicht bevorzugen",
     "lang_layout_excluded": "Excluded type of notification",
-    "lang_layout_mention": "Mentions",
+    "lang_layout_mention": "Erwähnungen",
-    "lang_layout_fav": "Favourites",
+    "lang_layout_fav": "Favoriten",
     "lang_layout_bt": "Boosts",
-    "lang_layout_poll": "Polls",
+    "lang_layout_poll": "Umfragen",
     "lang_layout_excludingbt": "BT-Modus anzeigen (aus/kein BT/Nur BT)",
     "lang_layout_leftFold": "Nach links Stapeln",
     "lang_layout_leftUnfold": "Rechts Anheften",
     "lang_layout_deleteColumn": "Diese Spalte löschen",
     "lang_layout_deleteColumnDesc": "Diese Spalte löschen",
     "lang_layout_unread": "ungelesen",
-    "lang_layout_tagManager": "Tag timeline manager",
+    "lang_layout_tagManager": "Tag-Zeitleiste Manager",
     "lang_layout_announ": "Announcement: the counter is the number of your unread announcements. If not shown, it means announcements are all marked as read.",
-    "lang_layout_resetWidth": "Stretch this column",
+    "lang_layout_resetWidth": "Diese Spalte strecken",
     "lang_sort_gothis": "Gehe zu dieser Spalte",
     "lang_sort_remthis": "Diese Spalte löschen",
     "lang_spotify_img": "Albumcover anhängen",
@@ -171,12 +171,12 @@
     "lang_showontl_movebtn": "Auf dem neuen Konto fortfahren",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Folgt dir",
-    "lang_parse_request": "Follow request",
+    "lang_parse_request": "Anfrage folgen",
     "lang_showontl_notf": "Benachrichtigung ",
     "lang_showontl_domain": "Domäne ",
     "lang_showontl_listwarn": "Folgen, um diesen Benutzer zu Listen hinzuzufügen.",
     "lang_showontl_verified": "This website is verified by owner at ",
-    "lang_status_requesting": "Requesting",
+    "lang_status_requesting": "Anfordern",
     "lang_parse_mentioned": " hat dir geantwortet",
     "lang_parse_faved": " favorisierte deinen Tröt",
     "lang_parse_bted": " hat deinen Tröt verstärkt",
@@ -185,7 +185,7 @@
     "lang_parse_notftime": "Bearbeitet am",
     "lang_parse_cwshow": "Anzeigen",
     "lang_parse_cwshow_acc": "This is a post with content warning. click to show the whole content",
-    "lang_parse_fulltext": "Full size text:",
+    "lang_parse_fulltext": "Text in voller Größe:",
     "lang_parse_autofold": "Automatisches Zusammenfalten",
     "lang_parse_more": "Mehr",
     "lang_parse_url": "URL-Analyse",
@@ -225,11 +225,11 @@
     "lang_parse_vote": "Abstimmen",
     "lang_parse_unvoted": "Ergebnis ohne Abstimmung anzeigen",
     "lang_parse_endedvote": "Abgelaufen",
-    "lang_parse_people": "people",
+    "lang_parse_people": "personen",
     "lang_parse_thread": "Konversation anzeigen",
     "lang_parse_unknown": "Angehängte Datei",
     "lang_parse_nsfw": "NSFW Medien",
-    "lang_parse_html": "Show embed HTML",
+    "lang_parse_html": "Eingebettetes HTML anzeigen",
     "lang_parse_notffilter": "Benachrichtigungen dieses Benutzers anzeigen",
     "lang_parse_hidden": "Unvisible quoted toot",
     "lang_parse_disconnected": "Streaming has been disconnected(retry after 3s)",
@@ -247,7 +247,7 @@
     "lang_misskeyparse_reacted": " hat auf Ihren folgenden Beitrag reagiert.",
     "lang_setting_time": "Zeitformat:{{set}}",
     "lang_setting_theme": "Design:{{set}}",
-    "lang_setting_compat": "Compatible",
+    "lang_setting_compat": "Kompatibel",
     "lang_setting_nsfw": "NSFW:{{set}}",
     "lang_setting_cw": "NSFW:{{set}}",
     "lang_setting_cwtext": "Standard-NSFW-Text:{{set}}",

app/view/make/language/de-DE/setting.json

@@ -20,7 +20,7 @@
   "theme": "Designs",
   "popup": "Popup-Benachrichtigung(unter Windows)",
   "popupwarn": "Bei \"0\" Ausgeschaltet.",
-  "s": "Sek",
+  "s": "Sekunden",
   "nativenotf": "System Benachrichtigungen",
   "nnwarn": "Dies funktioniert nicht mit der Portablen Windows Version.",
   "nntest": "Benachrichtigungen testen",
@@ -48,12 +48,12 @@
   "customthemeDirection": "Farbschema",
   "advanced": "Erweiterte Einstellungen",
   "advancedWarn": "",
-  "use": "Use this",
+  "use": "Benutze dies",
   "copyFrom": "Kopieren von",
   "bg": "Hintergrundfarbe",
-  "subcolor": "Distinguishable from background",
+  "subcolor": "Vom Hintergrund unterscheidbar",
   "text": "Textfarbe",
-  "accent": "Hintergrund des Boosts",
+  "accent": "Hintergrund der Boosts",
   "modal": "Background of modal window",
   "modalFooter": "Background of modal window's footer",
   "thirdColor": "Backgroud of tag buttons, etc(near to Background)",

app/view/make/language/fr-FR/acct.json

@@ -7,7 +7,7 @@
     "codesetup": "Code setup",
     "mainacct": "Main an account",
     "selacct": "Choisir un compte",
-    "codepastewarn": "Paste the code and close browser.",
+    "codepastewarn": "Insérer le code et fermez le navigateur.",
     "codepaste": "Code",
     "domain": "Domaine",
     "connect": "Serveur fédérées",
@@ -17,9 +17,9 @@
     "safety": "Connection",
     "ver": "Version de Mastodon",
     "ko": "",
-    "thisismisskey": "Login as Misskey",
+    "thisismisskey": "Connexion en tant que Misskey",
     "misskeylogin": "Read <a href=\"https://thedesk.top/how-to-misskey-login.html\">Docs(ja)</a> to login Misskey.",
-    "nodata": "No data",
+    "nodata": "Aucune donnée",
     "accessTokenSetup": "Use access token to login(click after fill not code but access-token in box: Advanced)",
     "haveExported": "Having the exported file of TheDesk, click here to jump setting page"
 }

app/view/make/language/fr-FR/main.json

@@ -9,7 +9,7 @@
     "lang_edit": "Modifier",
     "lang_del": "Supprimer",
     "lang_add": "Ajouter",
-    "lang_fatalerroroccured": "Error",
+    "lang_fatalerroroccured": "Erreur",
     "lang_speech": "Google U.S en anglais",
     "lang_lang": "Langue",
     "lang_langlocale": "Anglais",
@@ -28,11 +28,11 @@
     "lang_time_hours": "%d h",
     "lang_time_day": "1 d",
     "lang_time_days": "%d d",
-    "lang_time_month": "1 month",
+    "lang_time_month": "1 mois",
-    "lang_time_months": "%d months",
+    "lang_time_months": "%d mois",
     "lang_time_year": "y",
     "lang_time_years": "%d y",
-    "lang_version_usever": "No update is found({{ver}})",
+    "lang_version_usever": "Aucune mise à jour n'a été trouvée ({{ver}})",
     "lang_version_skipver": "La mise à jour a été ignorée.",
     "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')",
     "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')",
@@ -48,18 +48,18 @@
     "lang_manager_none": "Aucun",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Se déconnecter",
-    "lang_manager_maxChars": "Max chars of toots",
+    "lang_manager_maxChars": "Nombre maximum de caractères de pouets",
-    "lang_manager_refreshAt": "Login with this domain",
+    "lang_manager_refreshAt": "Se connecter avec ce domaine",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Téléchargez les émojis",
     "lang_emoji_custom": "Émojis personnalisés",
     "lang_defaultemojis_text": "Emojis about {{cat}}",
-    "lang_emoji_uncat": "Uncategorized",
+    "lang_emoji_uncat": "Non catégorisé",
-    "lang_postimg_previewdis": "cannot preview",
+    "lang_postimg_previewdis": "impossible de prévisualiser",
     "lang_postimg_aftupload": "You cannot change accounts after uploading.",
-    "lang_postimg_failupload": "Failed",
+    "lang_postimg_failupload": "Échec",
     "lang_postimg_delete": "Click to add description, right-click to delete this",
-    "lang_postimg_desc": "Description",
+    "lang_postimg_desc": "Déscription",
     "lang_postimg_leadContext": "right-click the thumbnail to delete this",
     "lang_post_syncDetail": "Upload media synchronously",
     "lang_post_syncDetailText": "Click each picture icon to get the thumbnail. If you can get, the media you uploaded are completely processed.",
@@ -90,7 +90,7 @@
     "lang_status_followers": "Followers",
     "lang_status_active": "Last status",
     "lang_secure_draft": "Add to draft",
-    "lang_secure_useThis": "Use this",
+    "lang_secure_useThis": "Utiliser ceci",
     "lang_secure_deleteThis": "Supprimer ce pouet",
     "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
     "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",

app/view/make/language/fr-FR/setting.json

@@ -48,12 +48,12 @@
   "customthemeDirection": "Jeu de couleurs",
   "advanced": "Options avancées",
   "advancedWarn": "",
-  "use": "Use this",
+  "use": "Utiliser ceci",
   "copyFrom": "Copier depuis",
   "bg": "Couleur de l'arrière-plan",
   "subcolor": "Distinguishable from background",
   "text": "Couleur du texte",
-  "accent": "Background of boosts",
+  "accent": "Arrière-plan des boosts",
   "modal": "Background of modal window",
   "modalFooter": "Background of modal window's footer",
   "thirdColor": "Backgroud of tag buttons, etc(near to Background)",

app/view/make/language/fr-FR/update.json

@@ -13,7 +13,7 @@
     "nextver": "Hidden until next version",
     "problem1": "Some problems?",
     "problem2": "Please download on <a href=\"https://thedesk.top\">Oficial HP</a>.",
-    "continue": "Continue updating",
+    "continue": "Continuer la mise à jour",
-    "dlnow": "Downloading...",
+    "dlnow": "Téléchargement...",
-    "checkWhatIsNew": "What is new?"
+    "checkWhatIsNew": "Quoi de neuf ?"
 }

app/yarn.lock

@@ -2863,10 +2863,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.2, json5@^2.1.3:
+json5@^2.1.2, json5@^2.2.0:
-  version "2.1.3"
+  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
   dependencies:
     minimist "^1.2.5"
 
@@ -3999,10 +3999,10 @@ sanitize-filename@^1.6.2, sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sanitize-html@^2.3.1:
+sanitize-html@^2.3.2:
-  version "2.3.1"
+  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.1.tgz#ab26df3b13041dee312033c4444d2a4fff7b7d43"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.2.tgz#a1954aea877a096c408aca7b0c260bef6e4fc402"
-  integrity sha512-JYziKrrtCEGhrsUAZK1mL0RdEcRxBGZ+ptgppv7ulAsan7MZVL+oVKRSPCIcYinfM1rVOMYh5dHLydMuHaQOUA==
+  integrity sha512-p7neuskvC8pSurUjdVmbWPXmc9A4+QpOXIL+4gwFC+av5h+lYCXFT8uEneqsFQg/wEA1IH+cKQA60AaQI6p3cg==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
@@ -4397,10 +4397,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-sweetalert2@^10.13.0:
+sweetalert2@^10.14.0:
-  version "10.13.0"
+  version "10.14.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.13.0.tgz#fd3c25ae511c36608d205aa020214508641ebd45"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.14.0.tgz#73a7487b12b56dec4c1e47d7d4926e8fe880e727"
-  integrity sha512-kF6Pnr7s7GDqVYRqqgyfxvG5vlUqfP+j+JF7oZ7DOs0/35jg6sTu8hyi6oD6Rb3fIKWIf1S9mCU7wR8iKa7dAA==
+  integrity sha512-EBUh4k9qyRRsttm9X9j7WUhLExetvTJpcbp1VTMJCpuI2UwHLesXMIw9M+UeuqBywv0UjNMR5PKH7Qnv65m8rw==
 
 syntax-error@^1.1.1:
   version "1.4.0"