From 44160dc1040ec1eb63183dc3c86fc27539a7425e Mon Sep 17 00:00:00 2001 From: Pedro Galhardo Date: Tue, 10 May 2022 05:20:13 +0100 Subject: [PATCH 1/8] Add missing button labels (fix for screen readers) (#1016) --- src/i18n/en_US.json | 11 +++++ src/i18n/source/en_US.json | 11 +++++ src/renderer/views/app/chrome-bottom.ejs | 34 ++++++++++----- src/renderer/views/app/chrome-top.ejs | 43 +++++++++++++------ src/renderer/views/app/sidebar.ejs | 38 ++++++++++------ .../views/components/add-to-playlist.ejs | 4 +- .../views/components/airplay-modal.ejs | 2 +- .../views/components/audio-controls.ejs | 2 +- .../views/components/audio-playbackrate.ejs | 2 +- .../views/components/audio-settings.ejs | 2 +- src/renderer/views/components/castmenu.ejs | 6 +-- src/renderer/views/components/cider-modal.ejs | 6 +-- src/renderer/views/components/equalizer.ejs | 8 ++-- src/renderer/views/components/fullscreen.ejs | 42 +++++++++++------- .../components/inline-collection-list.ejs | 2 +- .../views/components/mediaitem-list-item.ejs | 8 ++-- .../views/components/mediaitem-square.ejs | 20 +++++---- .../views/components/moreinfo-modal.ejs | 6 +-- src/renderer/views/components/plugin-menu.ejs | 2 +- .../views/components/qrcode-modal.ejs | 10 ++--- src/renderer/views/components/queue.ejs | 6 ++- src/renderer/views/components/share-sheet.ejs | 4 +- .../views/components/spatial-properties.ejs | 10 ++--- src/renderer/views/pages/artist.ejs | 16 +++---- src/renderer/views/pages/cider-playlist.ejs | 4 +- src/renderer/views/pages/collection-list.ejs | 2 +- src/renderer/views/pages/library-albums.ejs | 15 ++++--- .../views/pages/library-recentlyadded.ejs | 4 +- src/renderer/views/pages/library-songs.ejs | 9 ++-- src/renderer/views/pages/playlist-inline.ejs | 22 +++++----- src/renderer/views/pages/podcasts.ejs | 2 +- .../views/components/mediaitem-square.ejs | 10 +++-- 32 files changed, 225 insertions(+), 138 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index bd87cf25..dbb254fb 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Logout", "term.login": "Log In", + "term.quickNav": "Quick Nav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Private Session", "term.disablePrivateSession": "Disable Private Session", "term.queue": "Queue", + "term.autoplay": "Autoplay", "term.lyrics": "Lyrics", "term.miniplayer": "MiniPlayer", "term.history": "History", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Create New Playlist", "term.createNewPlaylistFolder": "Create New Playlist Folder", "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.navigateBack": "Navigate back", + "term.navigateForward": "Navigate forward", "term.play": "Play", "term.pause": "Pause", "term.previous": "Previous", "term.next": "Next", "term.shuffle": "Shuffle", + "term.enableShuffle": "Enable shuffle", + "term.disableShuffle": "Disable shuffle", "term.repeat": "Repeat", + "term.enableRepeatOne": "Enable repeat one", + "term.disableRepeatOne": "Disable repeat one", + "term.disableRepeat": "Disable repeat", "term.volume": "Volume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "New Preset...", "action.deletepreset": "Delete Preset", "action.open": "Open", + "action.close": "Close", "action.relaunch.confirm": "Do you want to relaunch Cider?", "action.cast.chromecast": "Chromecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,7 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "action.scrollToTop": "Scroll to top", "menubar.options.about": "About", "menubar.options.settings": "Settings", "menubar.options.quit": "Quit Cider", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index bd87cf25..dbb254fb 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Logout", "term.login": "Log In", + "term.quickNav": "Quick Nav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Private Session", "term.disablePrivateSession": "Disable Private Session", "term.queue": "Queue", + "term.autoplay": "Autoplay", "term.lyrics": "Lyrics", "term.miniplayer": "MiniPlayer", "term.history": "History", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Create New Playlist", "term.createNewPlaylistFolder": "Create New Playlist Folder", "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.navigateBack": "Navigate back", + "term.navigateForward": "Navigate forward", "term.play": "Play", "term.pause": "Pause", "term.previous": "Previous", "term.next": "Next", "term.shuffle": "Shuffle", + "term.enableShuffle": "Enable shuffle", + "term.disableShuffle": "Disable shuffle", "term.repeat": "Repeat", + "term.enableRepeatOne": "Enable repeat one", + "term.disableRepeatOne": "Disable repeat one", + "term.disableRepeat": "Disable repeat", "term.volume": "Volume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "New Preset...", "action.deletepreset": "Delete Preset", "action.open": "Open", + "action.close": "Close", "action.relaunch.confirm": "Do you want to relaunch Cider?", "action.cast.chromecast": "Chromecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,7 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "action.scrollToTop": "Scroll to top", "menubar.options.about": "About", "menubar.options.settings": "Settings", "menubar.options.quit": "Quit Cider", diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs index e27a6e13..733b73e7 100644 --- a/src/renderer/views/app/chrome-bottom.ejs +++ b/src/renderer/views/app/chrome-bottom.ejs @@ -39,7 +39,8 @@ @@ -99,17 +109,17 @@ -
- +
+
-
+ - + diff --git a/src/renderer/views/components/inline-collection-list.ejs b/src/renderer/views/components/inline-collection-list.ejs index 964f7847..bc7333c1 100644 --- a/src/renderer/views/components/inline-collection-list.ejs +++ b/src/renderer/views/components/inline-collection-list.ejs @@ -18,7 +18,7 @@ - diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs index abd2909d..6ea0d3bc 100644 --- a/src/renderer/views/components/mediaitem-list-item.ejs +++ b/src/renderer/views/components/mediaitem-list-item.ejs @@ -20,10 +20,10 @@
- -
@@ -42,7 +42,9 @@ :size="48" :bgcolor="getBgColor()" :type="item.type"> - +
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs index 5f4a9aa0..901a34af 100644 --- a/src/renderer/views/components/mediaitem-square.ejs +++ b/src/renderer/views/components/mediaitem-square.ejs @@ -8,7 +8,7 @@
{{item?.meta?.reason?.stringForDisplay ?? ''}}
- @@ -361,7 +361,7 @@ if (this.data.type.includes('albums')) { let date = this.data.attributes.releaseDate; if (date == null || date === "") return ""; - return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` + return `${this.data.relationships.tracks.data[0].attributes.genreNames[0]} · ${new Date(date).getFullYear()}` } }, async isInLibrary() { diff --git a/src/renderer/views/pages/podcasts.ejs b/src/renderer/views/pages/podcasts.ejs index 7430c01d..169a8b76 100644 --- a/src/renderer/views/pages/podcasts.ejs +++ b/src/renderer/views/pages/podcasts.ejs @@ -68,7 +68,7 @@
- +
diff --git a/src/web-remote/views/components/mediaitem-square.ejs b/src/web-remote/views/components/mediaitem-square.ejs index b58a5271..546eb2b2 100644 --- a/src/web-remote/views/components/mediaitem-square.ejs +++ b/src/web-remote/views/components/mediaitem-square.ejs @@ -14,9 +14,13 @@ :type="item.type">
+ @click="contextMenu" :aria-label="$root.getLz('term.more')"> + <%- include("../svg/more.svg") %> + + @click="app.playMediaItem(item)" :aria-label="$root.getLz('term.play')"> + <%- include("../svg/play.svg") %> +
{{ item.attributes.name }}
-
+
{{ getSubtitle() }} From b432fa4d6bf8a08a99a0ca9465b11472668d9f47 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Tue, 10 May 2022 02:17:44 -0700 Subject: [PATCH 2/8] added some attributes for themes https://docs.cider.sh/themes/available-attributes --- src/renderer/main/vueapp.js | 7 ++++++- src/renderer/views/main.ejs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 9ddb2f88..6764e0de 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -828,8 +828,9 @@ const app = new Vue({ } }); - this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, () => { + this.mk.addEventListener(MusicKit.Events.playbackStateDidChange, (event) => { ipcRenderer.send('wsapi-updatePlaybackState', wsapi.getAttributes()); + document.body.setAttribute("playback-state", event.state == 2 ? "playing" : "paused") }) this.mk.addEventListener(MusicKit.Events.playbackTimeDidChange, (a) => { @@ -887,8 +888,10 @@ const app = new Vue({ if (type.includes("musicVideo") || type.includes("uploadedVideo") || type.includes("music-movie")) { document.getElementById("apple-music-video-container").style.display = "block"; + document.body.setAttribute("video-playing", "true") // app.chrome.topChromeVisible = false } else { + document.body.removeAttribute("video-playing") document.getElementById("apple-music-video-container").style.display = "none"; // app.chrome.topChromeVisible = true } @@ -3869,12 +3872,14 @@ const app = new Vue({ el.play() }) document.querySelector("body").classList.remove("stopanimation") + document.body.setAttribute("focus-state", "focused") this.animateBackground = true } else { document.querySelectorAll(".animated-artwork-video").forEach(el => { el.pause() }) document.querySelector("body").classList.add("stopanimation") + document.body.setAttribute("focus-state", "blurred") this.animateBackground = false } }, diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 15f02bf9..8d2a0b98 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -65,7 +65,7 @@
<%- include("../assets/cider-round.svg") %>
-
+
<%- include('app/chrome-top'); %> From 8754001f0d71fc0467c68624b86d29d1ba851d84 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 11:24:21 +0200 Subject: [PATCH 3/8] Fix unlove --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 6764e0de..1623546d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3770,7 +3770,7 @@ const app = new Vue({ unlove(item) { let type = item.type.slice(-1) === "s" ? item.type : item.type + "s" let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id - if (item.id.startsWith("i.")) { + if (item.id != null && (item.id.toString()).startsWith("i.")) { if (!type.startsWith("library-")) { type = "library-" + type } From 3c8c3d484c587a0c4008215ad2ed0ecc894ad7b2 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 12:54:09 +0200 Subject: [PATCH 4/8] Revert "Fix unlove" --- src/renderer/main/vueapp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 1623546d..6764e0de 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -3770,7 +3770,7 @@ const app = new Vue({ unlove(item) { let type = item.type.slice(-1) === "s" ? item.type : item.type + "s" let id = item.attributes.playParams.catalogId ? item.attributes.playParams.catalogId : item.id - if (item.id != null && (item.id.toString()).startsWith("i.")) { + if (item.id.startsWith("i.")) { if (!type.startsWith("library-")) { type = "library-" + type } From b008949347dc5e5d7ac97455f15356959429d52b Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Tue, 10 May 2022 09:45:27 -0700 Subject: [PATCH 5/8] Update ja_JP.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drafted by あづき#8046 Finalized by Maikiwi --- src/i18n/ja_JP.json | 238 ++++++++++++++++++++++---------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 7e7d7e79..8dba8e4e 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -23,12 +23,12 @@ "term.login": "サインイン", "term.cast": "Cast", "term.about": "Ciderについて", - "term.privateSession": "プライベートセッション", + "term.privateSession": "プライベートセッション", "term.disablePrivateSession": "プライベートセッションを無効にする", "term.queue": "次はこちら", "term.lyrics": "歌詞", - "term.miniplayer": "MiniPlayer", - "term.history": "History", + "term.miniplayer": "ミニプレイヤー", + "term.history": "履歴", "term.search": "検索", "term.library": "ライブラリ", "term.listenNow": "今すぐ聴く", @@ -38,14 +38,14 @@ "term.songs": "曲", "term.albums": "アルバム", "term.artists": "アーティスト", - "term.podcasts": "Podcasts", + "term.podcasts": "ポッドキャスト", "term.playlists": "プレイリスト", "term.playlist": "プレイリスト", "term.newPlaylist": "New Playlist", - "term.newPlaylistFolder": "New Playlist Folder", - "term.createNewPlaylist": "Create New Playlist", - "term.createNewPlaylistFolder": "Create New Playlist Folder", - "term.deletePlaylist": "Are you sure you want to delete this playlist?", + "term.newPlaylistFolder": "新しいプレイリストフォルダ", + "term.createNewPlaylist": "新しいプレイリストを作る", + "term.createNewPlaylistFolder": "新しいプレイリストフォルダを作る", + "term.deletePlaylist": "本当にこのプレイリストを削除しますか?", "term.play": "再生", "term.pause": "停止", "term.previous": "戻る", @@ -116,19 +116,19 @@ "term.fullscreenView": "全画面表示", "term.defaultView": "ウィンドウ表示", "term.audioSettings": "オーディオ設定", - "term.audioControls": "Volume Controls", + "term.audioControls": "ボリューム設定", "term.clearAll": "消去", "term.recentStations": "最近の再生", "term.language": "言語", "term.funLanguages": "Fun", - "term.noLyrics": "ローディング。。 / 歌詞が見つからない / 器楽曲.", + "term.noLyrics": "ローディング。。 / 歌詞が見つからない / 器楽曲.", "term.copyright": "Copyright", "term.rightsReserved": "All Rights Reserved.", "term.sponsor": "スポンサーになりましょう", "term.ciderTeam": "Cider チーム", "term.developer": "開発者", "term.socialTeam": "ソーシャル チーム", - "term.socials": "Socials", + "term.socials": "ソーシャル", "term.contributors": "貢献者", "term.equalizer": "イコライザー", "term.reset": "リセット", @@ -141,43 +141,43 @@ "term.menu": "メニュー", "term.check": "確認", "term.aboutArtist": "{{artistName}}について", - "term.topResult": "Top Result", + "term.topResult": "検索結果", "term.sharedPlaylists": "プレイリストを共有", - "term.people": "ユーサ", + "term.people": "ユーザー", "term.newpreset.name": "名前を入力", - "term.addedpreset": "Added Preset", - "term.deletepreset.warn": "Are you sure you want to delete this preset?", - "term.deletedpreset": "Removed preset", - "term.defaultPresets": "Default Presets", - "term.userPresets": "User Presets", - "term.requestError": "There was a problem with the request.", - "term.song.link.generate": "Getting song.link share URL...", + "term.addedpreset": "プリセットを追加", + "term.deletepreset.warn": "本当にこのプリセットを削除しますか?", + "term.deletedpreset": "プリセットを削除", + "term.defaultPresets": "プリセットを初期化", + "term.userPresets": "ユーザープリセット", + "term.requestError": "リクエストに問題がありました", + "term.song.link.generate": "song.link を取得する", "term.musicVideos": "ミュージックビデオ", "term.stations": "ステーション", - "term.curators": "Curators", - "term.appleCurators": "Apple Curators", - "term.radioShows": "Radio Shows", - "term.recordLabels": "Record Labels", - "term.videoExtras": "Video Extras", - "term.top": "Top", + "term.curators": "キュレーター", + "term.appleCurators": "Apple キュレーター", + "term.radioShows": "ラジオ", + "term.recordLabels": "レーベル", + "term.videoExtras": "出演者", + "term.top": "トップ", "term.version": "バージョン", - "term.noVideos": "No videos found.", - "term.plugin": "Plug-in", - "term.pluginMenu": "Plug-in Menu", + "term.noVideos": "ビデオが見つかりませんでした", + "term.plugin": "プラグイン", + "term.pluginMenu": "プラグインメニュー", "term.pluginMenu.none": "プラグインが見つかりませんでした", "term.replay": "リプレイ", - "term.uniqueAlbums": "Unique Albums", - "term.uniqueArtists": "Unique Artists", - "term.uniqueSongs": "Unique Songs", - "term.topArtists": "Top Artists", - "term.listenedTo": "Listened to:", - "term.times": "times", - "term.topAlbums": "Top Albums", - "term.plays": "Plays", - "term.topGenres": "Top Genres", + "term.uniqueAlbums": "ユニークアルバム", + "term.uniqueArtists": "ユニークアーティスト", + "term.uniqueSongs": "ユニークソング", + "term.topArtists": "トップアーティスト", + "term.listenedTo": "Now Playing:", + "term.times": "時間", + "term.topAlbums": "トップアルバム", + "term.plays": "再生", + "term.topGenres": "トップジャンル", "term.confirmLogout": "本当にログアウトしますか?", "term.creditDesignedBy": "${authorUsername}によってデザインされました", - "term.discNumber": "Disc ${discNumber}", + "term.discNumber": "ディスク ${discNumber}", "home.title": "ホーム", "home.recentlyPlayed": "最近の再生", "home.recentlyAdded": "最近追加した項目", @@ -193,14 +193,14 @@ "podcast.followOnCider": "Ciderでフォロー", "podcast.followedOnCider": "フォロー中", "podcast.subscribeOnItunes": "iTunesで購読", - "podcast.subscribedOnItunes": "Subscribed On iTunes", + "podcast.subscribedOnItunes": "iTunesで購読中", "podcast.itunesStore": "iTunes Store", "podcast.episodes": "番組", "podcast.playEpisode": "再生", "podcast.website": "Podcastウェブ", - "action.edit": "Edit", - "action.done": "Done", - "action.editTracklist": "Edit Tracklist", + "action.edit": "編集", + "action.done": "完了", + "action.editTracklist": "トラックリストを編集", "action.addToLibrary": "ライブラリに追加", "action.addToLibrary.success": "ライブラリに追加されました", "action.addToLibrary.error": "ライブラリへの追加に失敗しました", @@ -212,9 +212,9 @@ "action.removeFromQueue": "「次はこちら」から項目を削除", "action.removeFromQueue.success": "「次はこちら」から項目を削除されました", "action.removeFromQueue.error": "操作を完了できませんでした", - "action.createPlaylist": "Create a New Playlist", - "action.addToPlaylist": "Add to Playlist", - "action.removeFromPlaylist": "Remove from Playlist", + "action.createPlaylist": "新しいプレイリストを作成する", + "action.addToPlaylist": "プレイリストに追加する", + "action.removeFromPlaylist": "プレイリストから削除する", "action.addToFavorites": "ラブに追加", "action.follow": "フォロー", "action.follow.success": "フォロー中", @@ -243,7 +243,7 @@ "action.showAlbum": "アルバムを表示", "action.tray.minimize": "最小化", "action.tray.quit": "終了", - "action.tray.show": "Show Cider", + "action.tray.show": "表示", "action.update": "アップデート", "action.install": "インストール", "action.copy": "コピー", @@ -252,52 +252,52 @@ "action.open": "開く", "action.relaunch.confirm": "Ciderを再開しますか?", "action.cast.chromecast": "Chromecast", - "action.cast.todevices": "Cast to Devices", - "action.cast.stop": "Stop casting to all devices", + "action.cast.todevices": "デバイスにキャストする", + "action.cast.stop": "すべてのデバイスでキャストを中止する", "action.cast.airplay": "AirPlay", - "action.cast.airplay.underdevelopment": "AirPlay is still under development", - "action.cast.scan": "Scan", - "action.cast.scanning": "Scanning...", - "action.createNew": "Create New...", - "action.openArtworkInBrowser": "Open artwork in browser", + "action.cast.airplay.underdevelopment": "AirPlayはまだ開発中です", + "action.cast.scan": "スキャン", + "action.cast.scanning": "スキャン中...", + "action.createNew": "新規作成...", + "action.openArtworkInBrowser": "アートワークをブラウザで表示する", "settings.header.general": "一般", "settings.header.general.description": "Ciderの一般設定", "settings.option.general.language": "言語", - "settings.option.general.resumebehavior": "Resume behavior", - "settings.option.general.resumebehavior.description": "Resume behavior affects how Cider will resume your session when you return to the app.", - "settings.option.general.resumebehavior.locally": "Locally", + "settings.option.general.resumebehavior": "再開の動作", + "settings.option.general.resumebehavior.description": "この設定はciderを再起動した際に影響します", + "settings.option.general.resumebehavior.locally": "ローカル", "settings.option.general.resumebehavior.locally.description": "このコンピューターでの最終セッションを復元", - "settings.option.general.resumebehavior.history": "History", + "settings.option.general.resumebehavior.history": "履歴", "settings.option.general.resumebehavior.history.description": "Apple Musicの履歴から曲を復元", - "settings.option.general.resumetabs" : "Open Tab on Launch", - "settings.option.general.resumetabs.description" : "You can choose what tab you want to open when you launch Cider.", - "settings.option.general.resumetabs.dynamic" : "Dynamic", - "settings.option.general.resumetabs.dynamic.description" : "Cider will open the tab that you last used.", + "settings.option.general.resumetabs" : "起動時にタブを開く", + "settings.option.general.resumetabs.description" : "Ciderを起動したときに開くタブを選択することができます", + "settings.option.general.resumetabs.dynamic" : "ダイナミック", + "settings.option.general.resumetabs.dynamic.description" : "最後のセッションで開いていたタブを開きます", "settings.option.general.language.main": "メイン", "settings.option.general.language.fun": "荒らし", "settings.option.general.language.unsorted": "未分類", "settings.option.general.updateCider": "アップデート", - "settings.option.general.updateCider.branch": "Cider Update Branch", - "settings.option.general.updateCider.branch.description": "Select the branch to update Cider to", - "settings.option.general.updateCider.branch.main": "Stable", - "settings.option.general.updateCider.branch.develop": "Development", - "settings.option.general.customizeSidebar": "Customize Sidebar Items", - "settings.option.general.customizeSidebar.customize": "Customize", - "settings.option.general.keybindings": "Keybindings", - "settings.notyf.general.keybindings.update.success": "Keybind updated successfully", - "settings.prompt.general.keybindings.update.success": "Keybind updated successfully. Press OK to relaunch Cider", - "settings.option.general.keybindings.open": "Open", - "settings.description.search": "Search", - "settings.description.albums": "Library Albums", - "settings.description.artists": "Library Artists", - "settings.description.browse": "Browse", - "settings.description.private": "Toggle Private Session", - "settings.description.remote": "Web Remote", - "settings.description.audio": "Audio Settings", - "settings.description.plugins": "Plugins Menu", - "settings.description.cast": "Cast to Devices", - "settings.description.settings": "Settings", - "settings.description.developer": "Developer Tools", + "settings.option.general.updateCider.branch": "ciderのバージョン詳細", + "settings.option.general.updateCider.branch.description": "ciderのバージョンを設定できます", + "settings.option.general.updateCider.branch.main": "安定版", + "settings.option.general.updateCider.branch.develop": "ベータ版", + "settings.option.general.customizeSidebar": "サイドバーをカスタマイズ", + "settings.option.general.customizeSidebar.customize": "カスタマイズ", + "settings.option.general.keybindings": "キーバインド", + "settings.notyf.general.keybindings.update.success": "キーバインドのアップデートに成功しました", + "settings.prompt.general.keybindings.update.success": "キーバインドのアップデートに成功しました。OKを押すとciderが再起動します", + "settings.option.general.keybindings.open": "開く", + "settings.description.search": "検索", + "settings.description.albums": "ライブラリのアルバム", + "settings.description.artists": "ライブラリのアーティスト", + "settings.description.browse": "検索", + "settings.description.private": "プライベートセッションに切り替える", + "settings.description.remote": "WEBで遠隔操作", + "settings.description.audio": "オーディオの設定", + "settings.description.plugins": "プラグインのメニュー", + "settings.description.cast": "デバイスでキャストする", + "settings.description.settings": "設定", + "settings.description.developer": "デベロッパーツール", "settings.notyf.updateCider.update-not-available": "現在最新版です", "settings.notyf.updateCider.update-downloaded": "アップデートは再起動後に適用されます", "settings.notyf.updateCider.update-error": "アップデートに失敗しました", @@ -306,9 +306,9 @@ "settings.header.audio.description": "Ciderのオーディオ設定", "settings.option.audio.volumeStep": "音量調整のステップ", "settings.option.audio.maxVolume": "最大音量", - "settings.option.audio.changePlaybackRate": "Change Playback Rate", - "settings.option.audio.playbackRate": "Playback Rate", - "settings.option.audio.playbackRate.change": "Change", + "settings.option.audio.changePlaybackRate": "再生速度の変更", + "settings.option.audio.playbackRate": "再生速度の変更", + "settings.option.audio.playbackRate.change": "変更", "settings.option.audio.quality": "音質", "settings.header.audio.quality.hireslossless": "ハイレゾロスレス", "settings.header.audio.quality.hireslossless.description": "(最大解像度 24 ビット/192 kHz)", @@ -320,23 +320,23 @@ "settings.option.audio.seamlessTransition": "曲間なしで再生", "settings.option.audio.enableAdvancedFunctionality": "先進的な機能", "settings.option.audio.enableAdvancedFunctionality.description": "AudioContextを有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。", - "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider thinks your PC can't handle these features. Are you sure you want to continue?", + "settings.warn.audio.enableAdvancedFunctionality.lowcores": "あなたのPCがこの処理に耐えられないかもしれません。", "settings.option.audio.audioLab": "Cider Audio Lab", "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.", - "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.", + "settings.warn.audioLab.withoutAF": "Cider Audio Labを有効にするにはAudioContextを有効にする必要があります", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Korg Nutube 6P1をモデルにしたオーディオをシミュレートします", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Changes the intensity of the Analog Warmth Module processing.", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Smooth", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Warm", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "なめらか", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "暖かい", "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Cider Atmosphere Realizer™️", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Realizes a different musical atmosphere modelled after the state of the art audio setups.", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ Mode", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Changes the mode of operation of the Atmosphere Realizer module.", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "Natural (Standard)", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "Natural (High)", - "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "Natural (Plus)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "最先端のオーディオセットアップを模した、異なる音楽の雰囲気を実現します。", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Cider Atmosphere Realizer™️ モード", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Atmosphere Realizer™️のモードを変更します", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "自然 (普通)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "自然 (高い)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "自然 (プラス)", "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "音楽をより豊かに、生き生きとさせます", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAPはSpatializationと互換性がありません", @@ -345,13 +345,15 @@ "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Managed by Audio Lab", +"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Audio Labの設定", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "オーディオ空間化", + "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "音声を空間化しすることで、より立体的にできます(Dolby Atmosではありません)", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Cider Tuned Spatialization", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "開発チームがチューニングした設定を使用することができます。(オーディオ空間化を有効にする必要があります)", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Cider Spatialization Profile", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Changes the Tuning Profile of the Spatialization.", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Standard", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "プロファイルをSpatializationに変更します", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "スタンダード", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiophile", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "オーディオ空間化はCAPと互換性がありません", "settings.header.visual": "ビジュアル", @@ -379,7 +381,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "テーマ", "settings.option.visual.theme.github.download": "GitHub URLからインストール", - "settings.option.visual.theme.github.openfolder": "Open Themes Folder", + "settings.option.visual.theme.github.openfolder": "テーマフォルダを開く", "settings.option.visual.theme.github.explore": "GitHubで探す", "settings.header.visual.theme.github.page": "GitHub", "settings.option.visual.theme.github.install.confirm": "本当に {{ repo }} をインストールしますか?", @@ -402,38 +404,38 @@ "settings.header.window.description": "ウィンドウの設定", "settings.option.window.openOnStartup": "Ciderをスタートアップに設定する", "settings.option.window.openOnStartup.hidden": "パソコン起動時にCiderをトレイに最小化", - "settings.option.window.useNativeTitleBar": "Use Native Title Bar", - "settings.option.window.windowControlStyle": "Window Control Style", + "settings.option.window.useNativeTitleBar": "タイトルバーを使用する", + "settings.option.window.windowControlStyle": "ウィンドウの設定", "settings.option.window.windowControlStyle.right": "右側", "settings.option.window.windowControlStyle.left": "左側", "settings.header.lyrics": "歌詞", - "settings.header.lyrics.description": "Adjust the lyrics settings for Cider.", + "settings.header.lyrics.description": "歌詞の設定", "settings.option.lyrics.enableMusixmatch": "Musixmatchが提供する歌詞を表示する", "settings.option.lyrics.enableMusixmatchKaraoke": "カラオケモードを有効にする (Musixmatchのみで利用できます)", "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatchで表示する歌詞の言語", "settings.option.lyrics.enableYoutubeLyrics": "YouTubeの歌詞をミュージックビデオで使用する", - "settings.option.lyrics.enableQQLyrics": "Enable QQ Lyrics", + "settings.option.lyrics.enableQQLyrics": "QQの歌詞を表示する", "settings.header.connectivity": "接続", "settings.header.connectivity.description": "Ciderの接続設定", "settings.option.connectivity.playbackNotifications": "再生している曲を通知する", "settings.option.connectivity.discordRPC": "Discord Rich Presence", - "settings.option.connectivity.discordRPC.clientName": "Client Name", - "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", - "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discord Rich Presence", - "settings.option.connectivity.discordRPC.detailsFormat": "Details Format", - "settings.option.connectivity.discordRPC.stateFormat": "State Format", + "settings.option.connectivity.discordRPC.clientName": "クライアントの名前", + "settings.option.connectivity.discordRPC.clearOnPause": "一時停止した時にDiscord Rich Presenceを非表示にする", + "settings.option.connectivity.discordRPC.hideButtons": "Discord Rich Presenceのボタンを非表示にする", + "settings.option.connectivity.discordRPC.detailsFormat": "ディティールのフォーマット", + "settings.option.connectivity.discordRPC.stateFormat": "状態のフォーマット", "settings.option.connectivity.lastfmScrobble": "Last.fm に接続する", "settings.option.connectivity.lastfmScrobble.delay": "遅延 (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Last.fm Now Playingを有効化する", "settings.option.connectivity.lastfmScrobble.removeFeatured": "曲名からフューチャリングいているアーティストの名前を削除する (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop": "ループトラックのフィルター(Last.fm)", "settings.header.debug": "デバッグ", - "settings.option.debug.copy_log": "Copy logs to clipboard", - "settings.option.debug.openAppData": "Open Cider Folder", + "settings.option.debug.copy_log": "ログをクリップボードにコピーする", + "settings.option.debug.openAppData": "Ciderのフォルダを開く", "settings.header.experimental": "試験的な機能", "settings.header.experimental.description": "試験的な設定", - "settings.option.experimental.reinstallwidevine": "Reinstall WidevineCDM", - "settings.option.experimental.reinstallwidevine.confirm": "Are you sure you want to reinstall Widevine?", + "settings.option.experimental.reinstallwidevine": "WidevineCDMを再インストールする", + "settings.option.experimental.reinstallwidevine.confirm": "本当にWidevineを再インストールしますか?", "settings.option.experimental.unknownPlugin": "未知のダウンロード元", "settings.option.experimental.unknownPlugin.description": "外部からプラグインをインストールできるようにする", "settings.option.experimental.compactUI": "コンパクトUI", @@ -443,10 +445,10 @@ "settings.option.advanced.playlistTrackMapping.description": "プレイリストをスキャンすることで含まれる曲をより識別しやすくなります", "settings.option.visual.transparent": "背景の透過", "settings.option.visual.transparent.description": "(テーマがこの機能をサポートしている必要があります)", - "settings.header.advanced": "Advanced", - "settings.header.connect": "Sync", - "settings.option.connect.link_account": "Enable Sync with Cider Connect", - "settings.option.connect.link_account.description": "Linking your Discord account with Cider Connect allows you to store userdata including Settings, EQ's, and eventually more once finished. (Work In Progress)", + "settings.header.advanced": "アドバンス", + "settings.header.connect": "リンク", + "settings.option.connect.link_account": "Ciderと他のアプリをリンクさせることができます", + "settings.option.connect.link_account.description": "DiscordとCiderを接続することで、Ciderの設定を保存することができます(開発中)", "spatial.notTurnedOn": "オーディオ空間化が無効になっています。この機能を使用するには有効にしてください!", "spatial.spatialProperties": "空間化のプロパティ", "spatial.width": "幅", From 623602e676f3a0219302f23a641d9c67fcbd10b8 Mon Sep 17 00:00:00 2001 From: Maikiwi Date: Tue, 10 May 2022 09:51:19 -0700 Subject: [PATCH 6/8] ja_JP credit change --- src/i18n/ja_JP.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/ja_JP.json b/src/i18n/ja_JP.json index 8dba8e4e..dc6cd4c5 100644 --- a/src/i18n/ja_JP.json +++ b/src/i18n/ja_JP.json @@ -2,7 +2,7 @@ "i18n.languageName": "日本語", "i18n.languageNameEnglish": "Japanese", "i18n.category": "main", - "i18n.authors": "@maikirakiwi @aduki_0628", + "i18n.authors": "@maikirakiwi @tanaka_kakuel", "app.name": "Cider", "date.format": "${y}年${m}月${d}日", "dialog.cancel": "キャンセル", From 868984511a1e0ce6247f4bf056bc8eb4b07568bd Mon Sep 17 00:00:00 2001 From: GamingLiamStudios <58615717+GamingLiamStudios@users.noreply.github.com> Date: Wed, 11 May 2022 03:59:06 +1000 Subject: [PATCH 7/8] Update en_OWO.json --- src/i18n/en_OWO.json | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json index bdf3365f..37e9b687 100644 --- a/src/i18n/en_OWO.json +++ b/src/i18n/en_OWO.json @@ -21,11 +21,13 @@ "term.accountSettings": "Account Settings", "term.logout": "Wogout", "term.login": "Wog In", + "term.quickNav": "Quick Nyav", "term.cast": "Cast", "term.about": "About", "term.privateSession": "Pwivate Session", "term.disablePrivateSession": "Disabwe Pwivate Session", "term.queue": "Queue", + "term.autoplay": "Autopway", "term.lyrics": "Wywics", "term.miniplayer": "MinyiPwayew", "term.history": "Histowy", @@ -46,12 +48,19 @@ "term.createNewPlaylist": "Cweate Nyew Pwaywist", "term.createNewPlaylistFolder": "Cweate Nyew Pwaywist Fowdew", "term.deletePlaylist": "Awe you suwe you want to dewete this pwaywist?", + "term.navigateBack": "Nyavigate back", + "term.navigateForward": "Nyavigate fowwawd", "term.play": "Pway", "term.pause": "Pause", "term.previous": "Pwevious", "term.next": "Nyext", "term.shuffle": "Shuffwe", + "term.enableShuffle": "Enyabwe shuffwe", + "term.disableShuffle": "Disabwe shuffwe", "term.repeat": "Wepeat", + "term.enableRepeatOne": "Enyabwe wepeat onye", + "term.disableRepeatOne": "Disabwe wepeat onye", + "term.disableRepeat": "Disabwe wepeat", "term.volume": "Vowume", "term.mute": "Mute", "term.unmute": "Unmute", @@ -254,6 +263,7 @@ "action.newpreset": "Nyew Pweset...", "action.deletepreset": "Dewete Pweset", "action.open": "Open", + "action.close": "Cwose", "action.relaunch.confirm": "Do you want to wewaunch Cidew?", "action.cast.chromecast": "Chwomecast", "action.cast.todevices": "Cast to Devices", @@ -264,6 +274,43 @@ "action.cast.scanning": "Scannying...", "action.createNew": "Cweate Nyew...", "action.openArtworkInBrowser": "Open awtwowk in bwowsew", + "action.scrollToTop": "Scwoww to top", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.quit": "Quit Cidew", + "menubar.options.view": "View ", + "menubar.options.reload": "Wewoad", + "menubar.options.forcereload": "Fowce Wewoad", + "menubar.options.toggledevtools": "Toggwe Devewopew Toows", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minyimize", + "menubar.options.toggleprivate": "Toggwe Pwivate Session", + "menubar.options.webremote": "Web Wemote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Pwu-gins Menyu", + "menubar.options.controls": "Contwows", + "menubar.options.next": "Nyext", + "menubar.options.playpause": "Pway/Pause", + "menubar.options.previous": "Pwevious", + "menubar.options.volumeup": "Vowume Up", + "menubar.options.volumedown": "Vowume Down", + "menubar.options.browse": "Bwowse", + "menubar.options.artists": "Awtists", + "menubar.options.search": "Seawch", + "menubar.options.albums": "Awbums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Suppowt", + "menubar.options.discord": "Discowd", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Wepowt a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Featuwe Wequest", + "menubar.options.trans": "Twanswation Wepowt/Wequest", + "menubar.options.license": "View Wicense", + "menubar.options.conf": "Open Configuwation Fiwe in Editow", "settings.header.general": "Genyewaw", "settings.header.general.description": "Adjust the genyewaw settings fow Cidew.", "settings.option.general.language": "Wanguage", @@ -330,6 +377,7 @@ "settings.option.audio.audioLab.description": "An assowtment of in-house devewoped audio effects fow Cidew.", "settings.option.audio.audioLab.subheader": "Designyed by Cidew Acoustic Technyowogies in Cawifownyia", "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionyawity) is wequiwed to enyabwe Cidew Audio Wabowatowy.", + "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionyawity) is wequiwed to enyabwe this featuwe.", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Anyawog Wawmth", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simuwates the anyawog wawmth modewwed aftew the Kowg Nyutube 6P1", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Anyawog Wawmth intensity", @@ -390,6 +438,13 @@ "settings.header.visual.theme.github.page": "Themes fwom GitHub", "settings.option.visual.theme.github.install.confirm": "Awe you suwe you want to instaww {{ repo }}?", "settings.prompt.visual.theme.github.URL": "Entew the UWW of the theme you want to instaww", + "settings.prompt.visual.theme.uninstallTheme": "Awe you suwe you want to unyinstaww {{ theme }}?", + "settings.option.visual.theme.checkForUpdates": "Check fow updates", + "settings.option.visual.theme.manageStyles": "Manyage Stywes", + "settings.option.visual.theme.uninstall": "Unyinstaww", + "settings.option.visual.theme.viewInfo": "View Info", + "settings.option.visual.theme.github.available": "Avaiwabwe", + "settings.option.visual.theme.github.applied": "Appwied", "settings.notyf.visual.theme.install.success": "Theme instawwed successfuwwy", "settings.notyf.visual.theme.install.error": "Theme instawwation faiwed", "settings.header.visual.plugin": "Pwugin", @@ -426,6 +481,7 @@ "settings.option.connectivity.discordRPC.clientName": "Cwient Nyame", "settings.option.connectivity.discordRPC.clearOnPause": "Cweaw Discowd Wich Pwesence on Pause", "settings.option.connectivity.discordRPC.hideButtons": "Hide buttons on Discowd Wich Pwesence", + "settings.option.connectivity.discordRPC.hideTimestamp": "Hide timestamp on Discowd Wich Pwesence", "settings.option.connectivity.discordRPC.detailsFormat": "Detaiws Fowmat", "settings.option.connectivity.discordRPC.stateFormat": "State Fowmat", "settings.option.connectivity.lastfmScrobble": "Wast.fm Scwobbwing", From d1dca1c613876f6bbf8c1a03bb7fdf9284061936 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Tue, 10 May 2022 21:11:03 +0200 Subject: [PATCH 8/8] Add Relaunch Prompt to nativeTitleBar and hw_acc --- src/renderer/views/pages/settings.ejs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 59088eab..4e030e9d 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -597,7 +597,7 @@