Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

# Conflicts:
#	src/i18n/en_US.jsonc
#	src/renderer/views/pages/settings.ejs
This commit is contained in:
child_duckling 2022-02-05 21:30:57 -08:00
commit 0a9ada76cc
5 changed files with 138 additions and 160 deletions

View file

@ -1,20 +1,15 @@
{ // Base File
// i18n Info
"i18n.languageName": "Engwish (OwO)", // name of language in native language
"i18n.languageNameEnglish": "Engwish (OwO)", // name of language in English
"i18n.category": "fun", // main = real language, fun = fun community languages
"i18n.authors": "@deerwithacurl", // Authors, if you contribute to this file feel free to add your name seperated with a space
// App info
"app.name": "Cidew",
"date.format": "${m} ${d}, ${y}",
// Dialogs
"dialog.cancel": "Nu",
"dialog.ok": "Oki",
// Notification
"notification.updatingLibrarySongs": "Updating wibwawy songs...",
"notification.updatingLibraryAlbums": "Updating wibwawy awbums...",
@ -142,7 +137,6 @@
"term.recordLabels": "Wecowd Wabews",
"term.videoExtras": "Videowo Extwas",
"term.top": "Top",
// Home
"home.title": "Home",
"home.recentlyPlayed": "Wecentwy Pwayed",
@ -157,7 +151,6 @@
"error.connectionError": "Thewe was a pwobwem connecting to Appwe Mewsic.",
"error.noResults": "No Wesuwts.",
"error.noResults.description": "Twy a new seawch.",
//Podcasts
"podcast.followOnCider": "Fowwow On Cidew",
"podcast.followedOnCider": "Fowwowing On Cidew",
@ -167,7 +160,6 @@
"podcast.episodes": "Episowodes",
"podcast.playEpisode": "Pway Episowode",
"podcast.website": "Pawdcast Website",
// Actions
"action.addToLibrary": "Add to Wibwawy",
"action.addToLibrary.success": "Added to Wibwawy",
@ -215,17 +207,14 @@
"action.update": "Update",
"action.newpreset": "New Pweset...", // Equalizer Preset
"action.deletepreset": "Dewete Pweset",
// Settings - General
"settings.header.general": "Genewaw",
"settings.header.general.description": "Adjust the genewaw settings fow Cidew.",
"settings.option.general.language": "Wanguage",
// Language optgroups
"settings.option.general.language.main": "Wanguages",
"settings.option.general.language.fun": "Fun Wanguages",
"settings.option.general.language.unsorted": "Unsowted",
// Settings - Audio
"settings.header.audio": "Audiowo",
"settings.header.audio.description": "Adjust the audiowo settings fow Cidew.",
@ -240,8 +229,12 @@
"settings.option.audio.seamlessTransition": "Seamwess Audiowo Twansition", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "Enabwe Advanced Functionawity", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "Enabwing AudiowoContext functionawity wiww awwow fow extended audiowo featuwes wike Audiowo Nowmawization, Equalizews and Visuawizews, howevew on some systems dis may cause stuttewing in audiowo twacks.",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cidew Pswychwoacwoustic Pwocessing Engwine", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Pwocessing wowkfwow that twicks youw bwain into thinking that the fiwes awe highew-quawity sownding.",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cidew Adwenawine Pwocess", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "CAP sets a pwe-defined advanced mix/pwocess that awwows media to pwoduwce mowe wich souwnding fwequwencies. (Designed by maikiwi)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.strength": "CAP stwength", // Multiple Choice
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.strength.description": "Changes the stwength of the mixing/pwocessing done to auwdio. (May cauwse cwipping ow abnowmaw wow fweq's if set too high.)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.strength.aggressive": "Aggwessive",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.strength.standard": "Standawd",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audiowo Nowmawization", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Nowmawizes peak vowume fow individuaw twacks to cweate a moar unifowm wistening expewience.",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audiowo Spatiawization", // Toggle
@ -270,7 +263,6 @@
"settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "Show Pewsonaw Info", // Toggle
// Settings - Lyrics
"settings.header.lyrics": "Wywics",
"settings.header.lyrics.description": "Adjust the wywics settings fow Cidew.",
@ -278,7 +270,6 @@
"settings.option.lyrics.enableMusixmatchKaraoke": "Enabwe Kawaoke Mode (Musixmatch onwy)", // Toggle
"settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch Twanswation Pwefewwed Wanguage", // Dropdown
"settings.option.lyrics.enableYoutubeLyrics": "Enabwe YouTube Wywics fow Mewsic Videowos", // Toggle
// Settings - Connectivity
"settings.header.connectivity": "Connectivity",
"settings.header.connectivity.description": "Adjust the connectivity settings fow Cidew.",
@ -294,14 +285,12 @@
"settings.option.connectivity.lastfmScrobble.removeFeatured": "Wemove featuwing awtists fwom song titwe (Wast.fm)",
"settings.option.connectivity.lastfmScrobble.filterLoop": "Fiwtew wooped twack (Wast.fm)",
// Refer to term.connect for the connect button
// Settings - Experimental
"settings.header.experimental": "Expewimentaw",
"settings.header.experimental.description": "Adjust the expewimentaw settings fow Cidew.",
"settings.option.experimental.compactUI": "Wittwe UI", // Toggle
"settings.option.experimental.close_button_hide": "Cwose Button Shouwd Hide the Appwication",
// Refer to term.disabled & term.enabled
// Spatialization Menu
"spatial.notTurnedOn": "Audiowo Spatiawization is disabwed. To use, pwease enabwe it fiwst.",
"spatial.spatialProperties": "Spatiaw Pwopewties",
@ -322,14 +311,11 @@
"spatial.down": "Down",
"spatial.listener": "Wistenew",
"spatial.audioSource": "Audiowo Souwce",
// Settings - Unfinished
"settings.header.unfinished": "Unfinished",
// Web Remote
"remote.web.title": "Cider Wiimote",
"remote.web.description": "Scan da QR code to paiw chur phone up with dis Cidew instance",
// About
"about.thanks": "Majow tanks to da Cidew Cowwective Team and aww of ouw contwibutows."
}

View file

@ -1,20 +1,15 @@
{ // Base File
// i18n Info
"i18n.languageName": "English (US)", // name of language in native language
"i18n.languageNameEnglish": "English (US)", // name of language in English
"i18n.category": "main", // main = real language, fun = fun community languages
"i18n.authors": "@maikirakiwi", // Authors, if you contribute to this file feel free to add your name seperated with a space
// App info
"app.name": "Cider",
"date.format": "${m} ${d}, ${y}",
// Dialogs
"dialog.cancel": "Cancel",
"dialog.ok": "OK",
// Notification
"notification.updatingLibrarySongs": "Updating library songs...",
"notification.updatingLibraryAlbums": "Updating library albums...",
@ -143,7 +138,6 @@
"term.recordLabels": "Record Labels",
"term.videoExtras": "Video Extras",
"term.top": "Top",
// Home
"home.title": "Home",
"home.recentlyPlayed": "Recently Played",
@ -158,7 +152,6 @@
"error.connectionError": "There was a problem connecting to Apple Music.",
"error.noResults": "No Results.",
"error.noResults.description": "Try a new search.",
//Podcasts
"podcast.followOnCider": "Follow On Cider",
"podcast.followedOnCider": "Following On Cider",
@ -168,7 +161,6 @@
"podcast.episodes": "Episodes",
"podcast.playEpisode": "Play Episode",
"podcast.website": "Podcast Website",
// Actions
"action.addToLibrary": "Add to Library",
"action.addToLibrary.success": "Added to Library",
@ -217,17 +209,14 @@
"action.copy": "Copy",
"action.newpreset": "New Preset...", // Equalizer Preset
"action.deletepreset": "Delete Preset",
// Settings - General
"settings.header.general": "General",
"settings.header.general.description": "Adjust the general settings for Cider.",
"settings.option.general.language": "Language",
// Language optgroups
"settings.option.general.language.main": "Languages",
"settings.option.general.language.fun": "Fun Languages",
"settings.option.general.language.unsorted": "Unsorted",
// Settings - Audio
"settings.header.audio": "Audio",
"settings.header.audio.description": "Adjust the audio settings for Cider.",
@ -243,8 +232,12 @@
"settings.option.audio.seamlessTransition": "Seamless Audio Transition", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "Enable Advanced Functionality", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "Enabling AudioContext functionality will allow for extended audio features like Audio Normalization , Equalizers and Visualizers, however on some systems this may cause stuttering in audio tracks.",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Process Engine", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "CAPE sets a pre-defined advanced mix/process that allows media to produce more rich sounding frequencies. (Designed by Maikiwi)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Psychoacoustic Enhancements that makes everything sound both richer and more lively. | Designed by Maikiwi",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAP Strength", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Changes the strength of the processing done to the audio. (Aggressive may yield undesirable results)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Standard",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Aggressive",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization", // Toggle
@ -272,14 +265,11 @@
"settings.header.visual.hardwareAcceleration.default": "Default",
"settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
"settings.header.visual.theme": "Theme",
// Settings - Visual - Theme name
"settings.option.visual.theme.default": "Cider",
"settings.option.visual.theme.dark": "Dark",
// Refer to term.disabled for the disabled option
"settings.option.visual.showPersonalInfo": "Show Personal Info", // Toggle
// Settings - Lyrics
"settings.header.lyrics": "Lyrics",
"settings.header.lyrics.description": "Adjust the lyrics settings for Cider.",
@ -287,7 +277,6 @@
"settings.option.lyrics.enableMusixmatchKaraoke": "Enable Karaoke Mode (Musixmatch only)", // Toggle
"settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch Translation Preferred Language", // Dropdown
"settings.option.lyrics.enableYoutubeLyrics": "Enable Youtube Lyrics for Music Videos", // Toggle
// Settings - Connectivity
"settings.header.connectivity": "Connectivity",
"settings.header.connectivity.description": "Adjust the connectivity settings for Cider.",
@ -303,7 +292,6 @@
"settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (Last.fm)",
"settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)",
// Refer to term.connect for the connect button
// Settings - Experimental
"settings.header.experimental": "Experimental",
"settings.header.experimental.description": "Adjust the experimental settings for Cider.",
@ -312,7 +300,6 @@
"settings.option.experimental.copy_log": "Copy logs to clipboard",
"settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
// Refer to term.disabled & term.enabled
// Spatialization Menu
"spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.",
"spatial.spatialProperties": "Spatial Properties",
@ -333,14 +320,11 @@
"spatial.down": "Down",
"spatial.listener": "Listener",
"spatial.audioSource": "Audio Source",
// Settings - Unfinished
"settings.header.unfinished": "Unfinished",
// Web Remote
"remote.web.title": "Cider Remote",
"remote.web.description": "Scan the QR code to pair your phone up with this Cider instance",
// About
"about.thanks": "Major thanks to the Cider Collective Team and all of our contributors."
}

View file

@ -208,8 +208,12 @@
"settings.option.audio.seamlessTransition": "曲間なしで再生", // Toggle
"settings.option.audio.enableAdvancedFunctionality": "先進的な機能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "AudioContext 機能を有効にすると、オーディオノーマライズ、空間オーディオ、イコライザーなどの機能を使用できますが、音が途切れるかもしれません。", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider PPE", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider AEP", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "圧縮音源を高解像度に処理することによって、ロスレス相当の音質に向上させます。", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "AEPの強さ", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Changes the strength of the processing done to the audio. (Aggressive may yield undesirable results)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "高",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "オーディオノーマライズ", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "さまざまな曲の音量を均一にし、より整った音を楽しめるようにする機能です。",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "オーディオ空間化", // Toggle

View file

@ -210,7 +210,11 @@
"settings.option.audio.enableAdvancedFunctionality": "進階機能", // Toggle
"settings.option.audio.enableAdvancedFunctionality.description": "啟用 AudioContext 將解鎖類似音訊標準化和等化器的進階機能。但是會在部分電腦造成音樂卡頓。",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider 數位增强音訊處理", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "將欺騙您的大腦使其感受近似保真壓縮的音質。",
"settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "將欺騙您的大腦使其感受近似保真壓縮的音質。| 由 Maikiwi 設計",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "數位增强音訊處理設置", // Toggle
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "將更改音訊處理的激進程度(增强選項有可能會引起雜訊)",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "標準",
"settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "增强",
"settings.option.audio.enableAdvancedFunctionality.audioNormalization": "音訊標準化", // Toggle
"settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "將平衡輕柔和響亮的歌曲,建立更統一的聆聽體驗。",
"settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音訊空間化", // Toggle

View file

@ -74,16 +74,16 @@
</div>
<div class="md-option-line" v-show="app.cfg.advanced.AudioContext && app.cfg.advanced.ciderPPE === true">
<div class="md-option-segment">
CAPE Strength
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength')}}
<br>
<small>Changes the strength of the mixing/processing done to audio. (May cause clipping or abnormal low freq's if set too high.)</small>
<small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description')}}</small>
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" :disabled="app.cfg.audio.ciderPPE_value === 0.55" v-model="app.cfg.audio.ciderPPE_value" onclick="app.cfg.audio.ciderPPE_value = 0.55">
Aggressive
<button class="md-btn" :disabled="app.cfg.audio.ciderPPE_value === 0.5" v-model="app.cfg.audio.ciderPPE_value" onclick="app.cfg.audio.ciderPPE_value = 0.5">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard')}}
</button>
<button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.ciderPPE_value === 0.5" v-model="app.cfg.audio.ciderPPE_value" onclick="app.cfg.audio.ciderPPE_value = 0.5">
Standard
<button class="md-btn" style="margin-top: 5px;" :disabled="app.cfg.audio.ciderPPE_value === 0.55" v-model="app.cfg.audio.ciderPPE_value" onclick="app.cfg.audio.ciderPPE_value = 0.55">
{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive')}}
</button>
</div>
</div>