diff --git a/assets/icons/128.png b/assets/icons/128.png new file mode 100644 index 0000000000..0bfa5aeb3e Binary files /dev/null and b/assets/icons/128.png differ diff --git a/assets/icons/16.png b/assets/icons/16.png new file mode 100644 index 0000000000..9d3226d37a Binary files /dev/null and b/assets/icons/16.png differ diff --git a/assets/icons/192.png b/assets/icons/192.png new file mode 100644 index 0000000000..3fa9b0dab7 Binary files /dev/null and b/assets/icons/192.png differ diff --git a/assets/icons/256.png b/assets/icons/256.png new file mode 100644 index 0000000000..b3c4be42af Binary files /dev/null and b/assets/icons/256.png differ diff --git a/assets/icons/32.png b/assets/icons/32.png new file mode 100644 index 0000000000..29b3876cb8 Binary files /dev/null and b/assets/icons/32.png differ diff --git a/assets/icons/64.png b/assets/icons/64.png new file mode 100644 index 0000000000..ab35f8fec1 Binary files /dev/null and b/assets/icons/64.png differ diff --git a/locales/en.yml b/locales/en.yml index 3290b9642c..535bb2fcea 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -47,7 +47,7 @@ common: ok: "OK" update-available: "A new version of Misskey is now available({newer}, the current version is {current}). Reload the page to apply updates." my-token-regenerated: "Your token has been renewed so you will be signed out." - i-like-sushi: "私は(プリンよりむしろ)寿司が好き" + i-like-sushi: "I like sushi rather than pudding" widgets: analog-clock: "Analog clock" profile: "Profile" diff --git a/locales/ja.yml b/locales/ja.yml index 29decefe68..f2a85eb4e6 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -52,6 +52,7 @@ common: ok: "わかった" update-available: "Misskeyの新しいバージョンがあります({newer}。現在{current}を利用中)。ページを再度読み込みすると更新が適用されます。" my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。" + i-like-sushi: "私は(プリンよりむしろ)寿司が好き" widgets: analog-clock: "アナログ時計" diff --git a/package.json b/package.json index 6691723386..9961782c9d 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "4.1.1", - "clientVersion": "1.0.6542", + "version": "4.3.0", + "clientVersion": "1.0.6630", "codename": "nighthike", "main": "./built/index.js", "private": true, @@ -215,9 +215,7 @@ "webpack-cli": "2.1.4", "websocket": "1.0.26", "ws": "5.2.0", - "xev": "2.0.1" - }, - "devDependencies": { + "xev": "2.0.1", "@types/file-type": "5.2.1", "@types/jsdom": "11.0.5" } diff --git a/src/client/app/common/views/components/reaction-icon.vue b/src/client/app/common/views/components/reaction-icon.vue index 7d24f4f9e9..2d5391a21e 100644 --- a/src/client/app/common/views/components/reaction-icon.vue +++ b/src/client/app/common/views/components/reaction-icon.vue @@ -8,7 +8,10 @@ %i18n:common.reactions.congrats% %i18n:common.reactions.angry% %i18n:common.reactions.confused% - %i18n:common.reactions.pudding% + diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue index c660c2869a..536d270dce 100644 --- a/src/client/app/desktop/views/components/settings.vue +++ b/src/client/app/desktop/views/components/settings.vue @@ -45,6 +45,7 @@ + @@ -362,6 +363,12 @@ export default Vue.extend({ value: v }); }, + onChangeILikeSushi(v) { + this.$store.dispatch('settings/set', { + key: 'iLikeSushi', + value: v + }); + }, onChangeGradientWindowHeader(v) { this.$store.dispatch('settings/set', { key: 'gradientWindowHeader', diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue index 70fa0123af..029e44e27c 100644 --- a/src/client/app/desktop/views/pages/welcome.vue +++ b/src/client/app/desktop/views/pages/welcome.vue @@ -13,7 +13,7 @@

Misskey

powerd by Misskey

- %i18n:@signup% + 📦 %i18n:@signup%