diff --git a/locales/de-DE.yml b/locales/de-DE.yml index fe1f499ea..ffd2aa93f 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -746,8 +746,13 @@ gallery: "Galerie" recentPosts: "Neue Beiträge" popularPosts: "Beliebte Beiträge" shareWithNote: "Mit Notiz teilen" -expiration: "Abstimmung endet am" +ads: "Werbung" +expiration: "Frist" +memo: "Merkzettel" +priority: "Priorität" +high: "Hoch" middle: "Mittel" +low: "Niedrig" emailNotConfiguredWarning: "Keine Email-Adresse hinterlegt" _forgotPassword: enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit der du dein Passwort zurücksetzen kannst." diff --git a/locales/en-US.yml b/locales/en-US.yml index 15bf985f3..22dbd3524 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -748,8 +748,13 @@ gallery: "Gallery" recentPosts: "Recent posts" popularPosts: "Popular posts" shareWithNote: "Share with note" -expiration: "Poll ends on" +ads: "Advertisements" +expiration: "Deadline" +memo: "Memo" +priority: "Priority" +high: "High" middle: "Medium" +low: "Low" emailNotConfiguredWarning: "Email address not set" _forgotPassword: enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it." diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index da2932fae..8dc1b98fd 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -7,6 +7,7 @@ search: "Rechercher" notifications: "Notifications" username: "Nom d’utilisateur·rice" password: "Mot de passe" +forgotPassword: "Mot de passe oublié" fetchingAsApObject: "Récupération depuis le fédiverse …" ok: "OK" gotIt: "J’ai compris !" @@ -747,8 +748,18 @@ gallery: "Galerie" recentPosts: "Les plus récentes" popularPosts: "Les plus consultées" shareWithNote: "Partager dans une note" -expiration: "Fin du sondage" +ads: "Publicité" +expiration: "Échéance" +memo: "Mémo" +priority: "Priorité" +high: "Haute" middle: "Moyen" +low: "Basse" +emailNotConfiguredWarning: "Vous n'avez pas configuré d'adresse e-mail." +_forgotPassword: + enterEmail: "Entrez ici l'adresse e-mail que vous avez enregistrée pour votre compte. Un lien vous permettant de réinitialiser votre mot de passe sera envoyé à cette adresse." + ifNoEmail: "Si vous n'avez pas enregistré d'adresse e-mail, merci de contacter l'administrateur·rice de votre instance." + contactAdmin: "Cette instance ne permettant pas l'utilisation d'adresses e-mail, prenez contact avec l'administrateur·rice pour procéder à la réinitialisation de votre mot de passe." _gallery: my: "Mes publications" liked: " Publications que j'ai aimées" diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index d30a6cc8c..16f9eb23b 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -643,8 +643,12 @@ goBack: "戻る" info: "情報" user: "ユーザー" administration: "管理" +ads: "広告" expiration: "期限" +memo: "メモ" +high: "高い" middle: "中" +low: "低い" _gallery: unlike: "良くないわ" _email: diff --git a/package.json b/package.json index e0f3405d2..168017726 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.80.1", + "version": "12.80.2", "codename": "indigo", "repository": { "type": "git", diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue index c7ca67582..9636ee053 100644 --- a/src/client/components/date-separated-list.vue +++ b/src/client/components/date-separated-list.vue @@ -90,7 +90,7 @@ export default defineComponent({ } else { if (this.ad && item._shouldInsertAd_) { return [h(MkAd, { - class: 'ad', + class: 'a', // advertiseの意(ブロッカー対策) key: item.id + ':ad', prefer: 'horizontal', }), el]; diff --git a/src/client/components/global/ad.vue b/src/client/components/global/ad.vue index 53e6e8b8b..ee2a7ebe9 100644 --- a/src/client/components/global/ad.vue +++ b/src/client/components/global/ad.vue @@ -85,16 +85,23 @@ export default defineComponent({ background-image: repeating-linear-gradient(45deg, transparent, transparent 8px, var(--ad) 8px, var(--ad) 14px ); > .main { + text-align: center; + > a { - display: block; + display: inline-block; position: relative; - margin: 0 auto; + vertical-align: bottom; + + &:hover { + > img { + filter: contrast(120%); + } + } > img { display: block; - width: 100%; - height: 100%; object-fit: contain; + margin: auto; } > .menu { @@ -106,23 +113,26 @@ export default defineComponent({ } &.square { - > a { + > a , + > a > img { max-width: min(300px, 100%); - max-height: min(300px, 100%); + max-height: 300px; } } &.horizontal { padding: 8px; - > a { + > a , + > a > img { max-width: min(600px, 100%); - max-height: min(100px, 100%); + max-height: 80px; } } &.vertical { - > a { + > a , + > a > img { max-width: min(100px, 100%); } } diff --git a/src/client/ui/default.widgets.vue b/src/client/ui/default.widgets.vue index 0dd073409..c475e4272 100644 --- a/src/client/ui/default.widgets.vue +++ b/src/client/ui/default.widgets.vue @@ -1,7 +1,7 @@