From 10a307f45bbbf3301e9b20fba526c671cf6290bb Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 25 Apr 2022 21:30:06 -0500 Subject: [PATCH 01/44] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b2b54da..34d1257f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.4.4", + "version": "1.4.5", "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", From 8ef2ca6b6542fdad8f8bed331c77e7e0dcabaa3a Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Mon, 25 Apr 2022 21:31:35 -0500 Subject: [PATCH 02/44] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34d1257f..4b2b54da 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.4.5", + "version": "1.4.4", "description": "A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind.", "license": "AGPL-3.0", "main": "./build/index.js", From 3453a9733b3f895c16bd317a1333668736ade27f Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Thu, 28 Apr 2022 19:59:58 -0300 Subject: [PATCH 03/44] some test --- src/i18n/en_US.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 78413968..64eec84b 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -263,6 +263,14 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.services": "Services", + "menubar.options.hide": "Hide Cider", + "menubar.options.hideothers": "Hide Others", + "menubar.options.unhide": "Show All", + "menubar.options.quit": "Quit Cider", + "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", From b33cf304a794dca33ec48d7cb830f0f1a42f4d13 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 21:47:05 -0300 Subject: [PATCH 04/44] Cider Strings RE-Work --- src/main/plugins/menubar.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index b47dcabe..fb5e7594 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -3,6 +3,7 @@ import {utils} from "../base/utils"; export default class Thumbar { + private i18n: any = undefined; /** * Base Plugin Details (Eventually implemented into a GUI in settings) */ @@ -22,23 +23,23 @@ export default class Thumbar { label: app.getName(), submenu: [ { - label: 'About', + label: utils.getLocale('About', 'menubar.options.about'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) }, {type: 'separator'}, { - label: 'Settings', + label: utils.getLocale('Settings', 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) }, {type: 'separator'}, - {role: 'services'}, + {role: 'services', label: utils.getLocale('services', 'menubar.options.services')}, {type: 'separator'}, - {role: 'hide'}, - {role: 'hideOthers'}, - {role: 'unhide'}, + {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')}, + {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')}, + {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')}, {type: 'separator'}, - {role: 'quit'} + {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')} ] }, { From 0d686439d3407ab0f599007241ff21b880ea1549 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 22:23:50 -0300 Subject: [PATCH 05/44] Part 2 set strings in en_US.json pending add to readme file --- src/i18n/en_US.json | 51 +++++++++++++++++++++++++++++++++++++ src/main/plugins/menubar.ts | 4 +-- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 64eec84b..a6830119 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -270,7 +270,58 @@ "menubar.options.hideothers": "Hide Others", "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", + "menubar.options.view": "View ", + "menubar.options.reload": "Reload", + "menubar.options.forcereload": "Force Reload", + "menubar.options.toggledevtools": "Toggle Developer Tools", + "menubar.options.resetzoom": "Reset Zoom", + "menubar.options.zoomin": "Zoom In", + "menubar.options.zoomout": "Zoom Out", + "menubar.options.togglefullscreen": "Toggle Fullscreen", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minimize", + "menubar.options.show": "Show", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Front", + "menubar.options.close": "Close", + "menubar.options.edit": "Edit", + "menubar.options.update": "Undo", + "menubar.options.redo": "Redo", + "menubar.options.cut": "Cut", + "menubar.options.copy": "Copy", + "menubar.options.paste": "Paste", + "menubar.options.toggleprivate": "Toggle Private Session", + "menubar.options.webremote": "Web Remote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Plu-gins Menu", + "menubar.options.control": "Controls", + "menubar.options.next": "Next", + "menubar.options.previous ": "Previous", + "menubar.options.volumeup": "Volume Up", + "menubar.options.volumedown": "Volume Down", + "menubar.options.browse": "Browse", + "menubar.options.artists": "Artists", + "menubar.options.search": "Search", + "menubar.options.albums": "Albums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Support", + "menubar.options.help": "Help", + "menubar.options.discord": "Discord", + "menubar.options.gihu": "GitHub Wiki", + "menubar.options.report": "Report a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Feature Request", + "menubar.options.trans": "Translation Report/Request", + "menubar.options.license": "View License", + "menubar.options.conf": "Open Configuration File in Editor", + + + + "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index fb5e7594..c7388912 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -43,9 +43,9 @@ export default class Thumbar { ] }, { - label: 'View', + label: utils.getLocale('View', 'menubar.options.view'), submenu: [ - {role: 'reload'}, + {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')}, {role: 'forceReload'}, {role: 'toggleDevTools'}, {type: 'separator'}, From 518b870f0ff6f764ae01167e4dd464163bbc6d1c Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 22:46:54 -0300 Subject: [PATCH 06/44] fully translation menubar strings (No more Hardcoded) --- src/i18n/en_US.json | 7 +-- src/main/plugins/menubar.ts | 98 ++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 52 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index a6830119..dbec1149 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -294,8 +294,9 @@ "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", "menubar.options.plugins": "Plu-gins Menu", - "menubar.options.control": "Controls", + "menubar.options.controls": "Controls", "menubar.options.next": "Next", + "menubar.options.playpause": "Play/Pause", "menubar.options.previous ": "Previous", "menubar.options.volumeup": "Volume Up", "menubar.options.volumedown": "Volume Down", @@ -310,14 +311,14 @@ "menubar.options.support": "Support", "menubar.options.help": "Help", "menubar.options.discord": "Discord", - "menubar.options.gihu": "GitHub Wiki", + "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", "menubar.options.bug": "Bug", "menubar.options.feature": "Feature Request", "menubar.options.trans": "Translation Report/Request", "menubar.options.license": "View License", "menubar.options.conf": "Open Configuration File in Editor", - + diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index c7388912..e4aa67e2 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -45,185 +45,185 @@ export default class Thumbar { { label: utils.getLocale('View', 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale('reload', 'menubar.view.reload')}, - {role: 'forceReload'}, - {role: 'toggleDevTools'}, + {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')}, + {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')}, + {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')}, {type: 'separator'}, - {role: 'resetZoom'}, - {role: 'zoomIn'}, - {role: 'zoomOut'}, + {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')}, + {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')}, + {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')}, {type: 'separator'}, - {role: 'togglefullscreen'}, + {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')}, ] }, { - label: 'Window', + label: utils.getLocale('Window', 'menubar.options.window'), submenu: [ - {role: 'minimize'}, + {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')}, { - label: 'Show', + label: utils.getLocale('Show', 'menubar.options.show'), click: () => utils.getWindow().show() }, - {role: 'zoom'}, + {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')}, ...(this.isMac ? [ {type: 'separator'}, - {role: 'front'}, - {role: 'close'}, + {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, + {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ] : [ - {role: 'close'}, + {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ]), { - label: 'Edit', + label: utils.getLocale('Edit', 'menubar.options.edit'), submenu: [ - {role: 'undo'}, - {role: 'redo'}, + {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')}, + {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')}, {type: 'separator'}, - {role: 'cut'}, - {role: 'copy'}, - {role: 'paste'}, + {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')}, + {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')}, + {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')}, ] }, {type: 'separator'}, { - label: 'Toggle Private Session', + label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'), accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`) }, {type: 'separator'}, { - label: 'Web Remote', + label: utils.getLocale('Web Remote', 'menubar.options.webremote'), accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'), sublabel: 'Opens in external window', click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`) }, { - label: 'Audio Settings', + label: utils.getLocale('Audio Settings', 'menubar.options.audio'), accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`) }, { - label: 'Plug-in Menu', + label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'), accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`) } ] }, { - label: 'Controls', + label: utils.getLocale('Controls', 'menubar.options.controls'), submenu: [ { - label: 'Pause / Play', + label: utils.getLocale('Pause / Play', 'menubar.options.playpause'), accelerator: 'Space', click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`) }, { - label: 'Next', + label: utils.getLocale('Next', 'menubar.options.next'), accelerator: 'CommandOrControl+Right', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`) }, { - label: 'Previous', + label: utils.getLocale('Previous', 'menubar.options.previous'), accelerator: 'CommandOrControl+Left', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`) }, {type: 'separator'}, { - label: 'Volume Up', + label: utils.getLocale('Volume Up', 'menubar.options.volumeup'), accelerator: 'CommandOrControl+Up', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`) }, { - label: 'Volume Down', + label: utils.getLocale('Volume Down', 'menubar.options.volumedown'), accelerator: 'CommandOrControl+Down', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`) }, { - label: 'Browse', + label: utils.getLocale('Browse', 'menubar.options.browse'), accelerator: utils.getStoreValue("general.keybindings.browse").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`) }, {type: 'separator'}, { - label: 'Artists', + label: utils.getLocale('Artists', 'menubar.options.artists'), accelerator: utils.getStoreValue("general.keybindings.artists").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`) }, { - label: 'Search', + label: utils.getLocale('Search', 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`) }, {type: 'separator'}, { - label: 'Album', + label: utils.getLocale('Album', 'menubar.options.albums'), accelerator: utils.getStoreValue("general.keybindings.albums").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`) }, {type: 'separator'}, { - label: 'Cast To Devices', + label: utils.getLocale('Cast To Devices', 'menubar.options.cast'), accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`) } ] }, { - label: 'Account', + label: utils.getLocale('Account', 'menubar.options.account'), submenu: [ { - label: 'Account Settings', + label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`) }, { - label: 'Sign Out', + label: utils.getLocale('Sign Out', 'menubar.options.signout'), click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`) } ] }, { - label: 'Support', - role: 'help', + label: utils.getLocale('Support', 'menubar.options.support'), + role: utils.getLocale('help', 'menubar.options.help'), submenu: [ { - label: 'Discord', + label: utils.getLocale('Discord', 'menubar.options.discord'), click: () => shell.openExternal("https://discord.gg/AppleMusic").catch(console.error) }, { - label: 'GitHub Wiki', + label: utils.getLocale('GitHub Wiki', 'menubar.options.github'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error) }, {type: 'separator'}, { - label: 'Report a...', + label: utils.getLocale('Report a...', 'menubar.options.report'), submenu: [ { - label: 'Bug', + label: utils.getLocale('Bug', 'menubar.options.bug'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error) }, { - label: 'Feature Request', + label: utils.getLocale('Feature Request', 'menubar.options.feature'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error) }, { - label: 'Translation Report/Request', + label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error) }, ] }, {type: 'separator'}, { - label: 'View License', + label: utils.getLocale('View License', 'menubar.options.license'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error) }, {type: 'separator'}, { - label: 'Toggle Developer Tools', + label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, { - label: 'Open Configuration File in Editor', + label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'), click: () => utils.getStoreInstance().openInEditor() } ] From d317df2f2058beedf1f646b46fee102128073d53 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Fri, 29 Apr 2022 23:05:16 -0300 Subject: [PATCH 07/44] bugfix --- src/i18n/en_US.json | 2 +- src/main/plugins/menubar.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index dbec1149..f975a81e 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -297,7 +297,7 @@ "menubar.options.controls": "Controls", "menubar.options.next": "Next", "menubar.options.playpause": "Play/Pause", - "menubar.options.previous ": "Previous", + "menubar.options.previous": "Previous", "menubar.options.volumeup": "Volume Up", "menubar.options.volumedown": "Volume Down", "menubar.options.browse": "Browse", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index e4aa67e2..07c860d1 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -218,7 +218,7 @@ export default class Thumbar { }, {type: 'separator'}, { - label: utils.getLocale('Toggle Developer Tools', 'menubar.options.devtools'), + label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, From 4b07eff71cfd08cef3559c3f789e3e74751950c1 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 00:19:26 -0300 Subject: [PATCH 08/44] update documentation for now. added strings for readme and en_US source file pending found string to web pair (not found) --- src/i18n/README.md | 58 ++++++++++++++++++++++++++++++++++++++ src/i18n/en_US.json | 6 +--- src/i18n/source/en_US.json | 55 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 5 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 4246957d..5531ab28 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -297,5 +297,63 @@ Update 28/04/2022 21:45 UTC * `settings.option.general.resumetabs.description`: Added for `en_US` * `settings.option.general.resumetabs.dynamic`: Added for `en_US` * `settings.option.general.resumetabs.dynamic.description`: Added for `en_US` +* `term.dynamic`: Added for `en_US` + +Update 29/04/2022 00:00 UTC + + * `menubar.options.about`: Added for `en_US` + * `menubar.options.settings`: Added for `en_US` + * `menubar.options.services`: Added for `en_US` + * `menubar.options.hide`: Added for `en_US` + * `menubar.options.hideothers`: Added for `en_US` + * `menubar.options.unhide`: Added for `en_US` + * `menubar.options.quit`: Added for `en_US` + * `menubar.options.view`: Added for `en_US` + * `menubar.options.reload`: Added for `en_US` + * `menubar.options.forcereload`: Added for `en_US` + * `menubar.options.toggledevtools`: Added for `en_US` + * `menubar.options.resetzoom`: Added for `en_US` + * `menubar.options.zoomin`: Added for `en_US` + * `menubar.options.zoomout`: Added for `en_US` + * `menubar.options.togglefullscreen`: Added for `en_US` + * `menubar.options.window`: Added for `en_US` + * `menubar.options.minimize`: Added for `en_US` + * `menubar.options.show`: Added for `en_US` + * `menubar.options.zoom`: Added for `en_US` + * `menubar.options.front`: Added for `en_US` + * `menubar.options.close`: Added for `en_US` + * `menubar.options.edit`: Added for `en_US` + * `menubar.options.update`: Added for `en_US` + * `menubar.options.redo`: Added for `en_US` + * `menubar.options.cut`: Added for `en_US` + * `menubar.options.copy`: Added for `en_US` + * `menubar.options.paste`: Added for `en_US` + * `menubar.options.toggleprivate`: Added for `en_US` + * `menubar.options.webremote`: Added for `en_US` + * `menubar.options.audio`: Added for `en_US` + * `menubar.options.plugins`: Added for `en_US` + * `menubar.options.control`: Added for `en_US` + * `menubar.options.next`: "Added for `en_US` + * `menubar.options.previous`: Added for `en_US` + * `menubar.options.volumeup`: Added for `en_US` + * `menubar.options.volumedown`: Added for `en_US` + * `menubar.options.browse`: Added for `en_US` + * `menubar.options.artists`: Added for `en_US` + * `menubar.options.search`: Added for `en_US` + * `menubar.options.albums`: Added for `en_US` + * `menubar.options.cast`: Added for `en_US` + * `menubar.options.account`: Added for `en_US` + * `menubar.options.accountsettings`: Added for `en_US` + * `menubar.options.signout`: Added for `en_US` + * `menubar.options.support`: Added for `en_US` + * `menubar.options.help`: Added for `en_US` + * `menubar.options.discord`: Added for `en_US` + * `menubar.options.gihu`: Added for `en_US` + * `menubar.options.report`: Added for `en_US` + * `menubar.options.bug`: Added for `en_US` + * `menubar.options.feature`: Added for `en_US` + * `menubar.options.trans`: Added for `en_US` + * `menubar.options.license`: Added for `en_US` + * `menubar.options.conf`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index f975a81e..89134fba 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -73,6 +73,7 @@ "term.viewAs": "View As", "term.viewAs.coverArt": "Cover Art", "term.viewAs.list": "List", + "term.dynamic": "Dynamic", "term.size": "Size", "term.size.normal": "Normal", "term.size.compact": "Compact", @@ -318,11 +319,6 @@ "menubar.options.trans": "Translation Report/Request", "menubar.options.license": "View License", "menubar.options.conf": "Open Configuration File in Editor", - - - - - "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 71d7a3d8..89134fba 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -264,6 +264,61 @@ "action.cast.scanning": "Scanning...", "action.createNew": "Create New...", "action.openArtworkInBrowser": "Open artwork in browser", + "menubar.options.about": "About", + "menubar.options.settings": "Settings", + "menubar.options.services": "Services", + "menubar.options.hide": "Hide Cider", + "menubar.options.hideothers": "Hide Others", + "menubar.options.unhide": "Show All", + "menubar.options.quit": "Quit Cider", + "menubar.options.view": "View ", + "menubar.options.reload": "Reload", + "menubar.options.forcereload": "Force Reload", + "menubar.options.toggledevtools": "Toggle Developer Tools", + "menubar.options.resetzoom": "Reset Zoom", + "menubar.options.zoomin": "Zoom In", + "menubar.options.zoomout": "Zoom Out", + "menubar.options.togglefullscreen": "Toggle Fullscreen", + "menubar.options.window": "Window", + "menubar.options.minimize": "Minimize", + "menubar.options.show": "Show", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Front", + "menubar.options.close": "Close", + "menubar.options.edit": "Edit", + "menubar.options.update": "Undo", + "menubar.options.redo": "Redo", + "menubar.options.cut": "Cut", + "menubar.options.copy": "Copy", + "menubar.options.paste": "Paste", + "menubar.options.toggleprivate": "Toggle Private Session", + "menubar.options.webremote": "Web Remote", + "menubar.options.audio": "Audio Settings", + "menubar.options.plugins": "Plu-gins Menu", + "menubar.options.controls": "Controls", + "menubar.options.next": "Next", + "menubar.options.playpause": "Play/Pause", + "menubar.options.previous": "Previous", + "menubar.options.volumeup": "Volume Up", + "menubar.options.volumedown": "Volume Down", + "menubar.options.browse": "Browse", + "menubar.options.artists": "Artists", + "menubar.options.search": "Search", + "menubar.options.albums": "Albums", + "menubar.options.cast": "Cast To Devices", + "menubar.options.account": "Account", + "menubar.options.accountsettings": "Account Settings", + "menubar.options.signout": "Sign Out", + "menubar.options.support": "Support", + "menubar.options.help": "Help", + "menubar.options.discord": "Discord", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Report a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Feature Request", + "menubar.options.trans": "Translation Report/Request", + "menubar.options.license": "View License", + "menubar.options.conf": "Open Configuration File in Editor", "settings.header.general": "General", "settings.header.general.description": "Adjust the general settings for Cider.", "settings.option.general.language": "Language", From 092a1931ace0b20f81df7a27153d35e6fb22fb71 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 01:00:22 -0300 Subject: [PATCH 09/44] some bugfixes and updated es_ES json file to last string in cider --- src/i18n/README.md | 2 +- src/i18n/en_US.json | 2 +- src/i18n/es_ES.json | 70 +++++++++++++++++++++++++++++++++++++- src/i18n/source/en_US.json | 2 +- 4 files changed, 72 insertions(+), 4 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 5531ab28..cec535da 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -323,7 +323,7 @@ Update 29/04/2022 00:00 UTC * `menubar.options.front`: Added for `en_US` * `menubar.options.close`: Added for `en_US` * `menubar.options.edit`: Added for `en_US` - * `menubar.options.update`: Added for `en_US` + * `menubar.options.undo`: Added for `en_US` * `menubar.options.redo`: Added for `en_US` * `menubar.options.cut`: Added for `en_US` * `menubar.options.copy`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 89134fba..9dafaf53 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -286,7 +286,7 @@ "menubar.options.front": "Front", "menubar.options.close": "Close", "menubar.options.edit": "Edit", - "menubar.options.update": "Undo", + "menubar.options.undo": "Undo", "menubar.options.redo": "Redo", "menubar.options.cut": "Cut", "menubar.options.copy": "Copy", diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index e10bab53..51701558 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -73,6 +73,7 @@ "term.viewAs": "Ver como", "term.viewAs.coverArt": "Portada", "term.viewAs.list": "Lista", + "term.dynamic": "Dinámico", "term.size": "Tamaño", "term.size.normal": "Normal", "term.size.compact": "Compacto", @@ -199,6 +200,9 @@ "podcast.episodes": "Episodios", "podcast.playEpisode": "Reproducir Episodio", "podcast.website": "Sitio web de Podcasts", + "action.edit": "Editar", + "action.done": "Hecho", + "action.editTracklist": "Edit Tracklist", "action.addToLibrary": "Agregar a la Biblioteca", "action.addToLibrary.success": "Agregado a la Biblioteca", "action.addToLibrary.error": "Error al agregar a la Biblioteca", @@ -260,6 +264,61 @@ "action.cast.scanning": "Escaneando...", "action.createNew": "Crear Nuevo...", "action.openArtworkInBrowser": "Abrir Ilustración en el navegador", + "menubar.options.about": "Acerca de", + "menubar.options.settings": "Ajustes", + "menubar.options.services": "Servicios", + "menubar.options.hide": "Ocultar Cider", + "menubar.options.hideothers": "Ocultar Otros", + "menubar.options.unhide": "Mostrar Todos", + "menubar.options.quit": "Salir", + "menubar.options.view": "Ver", + "menubar.options.reload": "Recargar", + "menubar.options.forcereload": "Forzar Recarga", + "menubar.options.toggledevtools": "Herramientas de Desarrollo", + "menubar.options.resetzoom": "Restablecer Zoom", + "menubar.options.zoomin": "Acercar", + "menubar.options.zoomout": "Alejar", + "menubar.options.togglefullscreen": "Pantalla Completa", + "menubar.options.window": "Ventana", + "menubar.options.minimize": "Minimizar", + "menubar.options.show": "Mostrar", + "menubar.options.zoom": "Zoom", + "menubar.options.front": "Frente", + "menubar.options.close": "Cerrar", + "menubar.options.edit": "Editar", + "menubar.options.undo": "Deshacer", + "menubar.options.redo": "Rehacer", + "menubar.options.cut": "Cortar", + "menubar.options.copy": "Copiar", + "menubar.options.paste": "Pegar", + "menubar.options.toggleprivate": "Cambiar Sesión Privada", + "menubar.options.webremote": "Web Remoto", + "menubar.options.audio": "Configuraciones de Audio", + "menubar.options.plugins": "Menu de Plu-gins", + "menubar.options.controls": "Controles", + "menubar.options.next": "Siguiente", + "menubar.options.playpause": "Reproducir/Pausar", + "menubar.options.previous": "Anterior", + "menubar.options.volumeup": "Subir Volumen", + "menubar.options.volumedown": "Bajar Volumen", + "menubar.options.browse": "Explorar", + "menubar.options.artists": "Artistas", + "menubar.options.search": "Buscar", + "menubar.options.albums": "Álbumes", + "menubar.options.cast": "Transmitir a Dispositivos", + "menubar.options.account": "Cuenta", + "menubar.options.accountsettings": "Ajustes de Cuenta", + "menubar.options.signout": "Cerrar Sesión", + "menubar.options.support": "Soporte", + "menubar.options.help": "Ayuda", + "menubar.options.discord": "Discord", + "menubar.options.github": "GitHub Wiki", + "menubar.options.report": "Reportar a...", + "menubar.options.bug": "Bug", + "menubar.options.feature": "Solicitud de características", + "menubar.options.trans": "Solicitud de Informe/Traducción", + "menubar.options.license": "Ver licencia", + "menubar.options.conf": "Abrir archivo de configuración en el editor", "settings.header.general": "General", "settings.header.general.description": "Ajuste la configuración general de Cider.", "settings.option.general.language": "Idioma", @@ -269,6 +328,10 @@ "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en esta PC.", "settings.option.general.resumebehavior.history": "Histórico", "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de su historial general de Apple Music, en todos sus dispositivos.", + "settings.option.general.resumetabs" : "Abrir pestaña al iniciar", + "settings.option.general.resumetabs.description" : "Puede elegir qué pestaña desea abrir cuando inicie Cider.", + "settings.option.general.resumetabs.dynamic" : "Dinámico", + "settings.option.general.resumetabs.dynamic.description" : "Cider abrirá la pestaña que utilizó por última vez.", "settings.option.general.language.main": "Idiomas", "settings.option.general.language.fun": "Idiomas Fun (Parodias)", "settings.option.general.language.unsorted": "Sin Clasificar", @@ -280,6 +343,8 @@ "settings.option.general.customizeSidebar": "Personalizar elementos de la barra lateral", "settings.option.general.customizeSidebar.customize": "Personalizar", "settings.option.general.keybindings": "Combinaciones de Teclas", + "settings.notyf.general.keybindings.update.success": "Combinación de teclas actualizada correctamente", + "settings.prompt.general.keybindings.update.success": "La combinación de teclas se actualizó correctamente. Pulsa OK para reiniciar Cider", "settings.option.general.keybindings.open": "Abrir", "settings.description.search": "Buscar", "settings.description.albums": "Álbumes de la biblioteca", @@ -410,6 +475,7 @@ "settings.option.lyrics.enableMusixmatchKaraoke": "Habilitar el modo Karaoke (solo Musixmatch)", "settings.option.lyrics.musixmatchPreferredLanguage": "Idioma preferido de traducción de Musixmatch", "settings.option.lyrics.enableYoutubeLyrics": "Habilitar letras de YouTube para videos musicales", + "settings.option.lyrics.enableQQLyrics": "Habilitar letras de QQ", "settings.header.connectivity": "Conectividad", "settings.header.connectivity.description": "Ajuste la configuración de conectividad para Cider.", "settings.option.connectivity.playbackNotifications": "Notificaciones de Reproducción", @@ -442,7 +508,9 @@ "settings.option.visual.transparent.description": "Marco transparente (necesita compatibilidad con temas, requiere reiniciar)", "settings.header.advanced": "Avanzado", "settings.header.connect": "Conectar", - "spatial.notTurnedOn": "La espacialización de audio está deshabilitada. Para usar, habilítelo primero.", + "settings.option.connect.link_account": "Habilitar sincronización con Cider Connect", + "settings.option.connect.link_account.description": "Vincular su cuenta de Discord con Cider Connect le permite almacenar datos de usuario que incluyen configuraciones, ecualizadores y eventualmente más, una vez que haya terminado. (Trabajo en progreso)", + "spatial.notTurnedOn": "La Espacialización de audio está deshabilitada. Para usar, habilítelo primero.", "spatial.spatialProperties": "Propiedades de Espacialización", "spatial.width": "Ancho", "spatial.height": "Alto", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 89134fba..9dafaf53 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -286,7 +286,7 @@ "menubar.options.front": "Front", "menubar.options.close": "Close", "menubar.options.edit": "Edit", - "menubar.options.update": "Undo", + "menubar.options.undo": "Undo", "menubar.options.redo": "Redo", "menubar.options.cut": "Cut", "menubar.options.copy": "Copy", From b0c4240c17e0dcd6c869d92ae88ed9a6293aad65 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 30 Apr 2022 18:37:21 +0100 Subject: [PATCH 10/44] Update config.yml --- .circleci/config.yml | 162 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 32 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62dc1183..c9484eb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,18 +1,21 @@ version: 2.1 -orbs: # adds orbs to your configuration - jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible -branches: - only: - - main - - develop -jobs: - build: - working_directory: ~/Cider + +executors: + cider-ci: docker: - image: circleci/node:16 - + working_directory: ~/Cider + +orbs: # adds orbs to your configuration + jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible + +# The jobs for this project +jobs: + prepare-build: + executor: cider-ci steps: - checkout + - run: ls -la - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV @@ -32,50 +35,145 @@ jobs: paths: - ~/.cache/yarn - run: - name: Install system build dependencies - command: | - sudo apt-get update -y - curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg - echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null - sudo apt-get install -y dpkg fakeroot wine64 - sudo dpkg --add-architecture i386 - sudo apt-get update -y - sudo apt-get install -y wine32 - sudo apt install -y gh + name: TypeScript Compile + command: yarn build + - persist_to_workspace: + # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is + # taken to be the root directory of the workspace. + root: . + # Must be relative path from root + paths: + - node_modules + - build + - resources + - yarn.lock + - package.json + - winget.json # winget.json is a file that is generated by the winget package manager + - LICENSE + - license.txt + + build-linux: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider - run: name: Fix Versioning and Add Channel command: yarn circle:script - - run: - name: TypeScript Compile - command: yarn build - run: name: Generate Builds (Linux) command: yarn electron-builder -l -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.deb + - dist/*.AppImage + - dist/*.snap + - dist/latest-linux.yml + + build-windows: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Windows) command: yarn electron-builder -w --x64 -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-*.exe.blockmap + - dist/latest.yml + + build-winget: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider + - run: + name: Install Windows System Build Dependencies + command: | + sudo apt-get update -y + sudo apt-get install -y dpkg fakeroot wine64 + sudo dpkg --add-architecture i386 + sudo apt-get update -y + sudo apt-get install -y wine32 + - run: + name: Fix Versioning and Add Channel + command: yarn circle:script - run: name: Generate Builds (Winget) command: yarn electron-builder --win -c winget.json -p never post-steps: - jira/notify + - persist_to_workspace: + root: . + paths: + - dist/*.exe + - dist/Cider-Setup-winget-*.exe.blockmap + + release: + executor: cider-ci + steps: + - attach_workspace: + at: ~/Cider/ + - run: + name: Installing GitHub Command Line Interface + command: | + sudo apt-get update -y + curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null + sudo apt-get update -y + sudo apt install -y gh - run: name: Move Build Files command: | - mkdir ~/Cider/dist/artifacts/ - mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts - mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts - mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts - mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts - mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts - mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts + mkdir ~/Cider/dist/artifacts/ + mv ~/Cider/dist/*.exe ~/Cider/dist/artifacts + mv ~/Cider/dist/*.deb ~/Cider/dist/artifacts + mv ~/Cider/dist/*.AppImage ~/Cider/dist/artifacts + mv ~/Cider/dist/*.snap ~/Cider/dist/artifacts + mv ~/Cider/dist/*.yml ~/Cider/dist/artifacts + mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: - path: ~/Cider/dist/artifacts + path: ~/Cider/dist/artifacts - run: name: Publish Release command: | - gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap + +# Orchestrate our job run sequence +workflows: + build_and_release: + jobs: + - prepare-build + - build-windows: + requires: + - prepare-build + - build-linux: + requires: + - prepare-build + - build-winget: + requires: + - prepare-build + - release: + requires: + - build-windows + - build-linux + - build-winget From 0baafbf447330edb3cf766406b4b9fa3da223198 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sat, 30 Apr 2022 23:22:15 -0300 Subject: [PATCH 11/44] Now works with other languages pending MacOS Strings deletes --- src/main/plugins/menubar.ts | 110 ++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 07c860d1..54092c80 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -3,7 +3,7 @@ import {utils} from "../base/utils"; export default class Thumbar { - private i18n: any = undefined; + /** * Base Plugin Details (Eventually implemented into a GUI in settings) */ @@ -17,173 +17,173 @@ export default class Thumbar { * Menubar Assets * @private */ - private isMac: boolean = process.platform === 'darwin'; + private isMac: boolean = process.platform === 'darwin'; private _menuTemplate: any = [ { label: app.getName(), submenu: [ { - label: utils.getLocale('About', 'menubar.options.about'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.about'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('about')`) }, {type: 'separator'}, { - label: utils.getLocale('Settings', 'menubar.options.settings'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) }, {type: 'separator'}, - {role: 'services', label: utils.getLocale('services', 'menubar.options.services')}, + {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')}, {type: 'separator'}, - {role: 'hide', label: utils.getLocale('hide', 'menubar.options.hide')}, - {role: 'hideOthers', label: utils.getLocale('hideOthers', 'menubar.options.hideothers')}, - {role: 'unhide', label: utils.getLocale('unhide', 'menubar.options.unhide')}, + {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')}, + {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')}, + {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')}, {type: 'separator'}, - {role: 'quit', label: utils.getLocale('quit', 'menubar.options.quit')} + {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')} ] }, { - label: utils.getLocale('View', 'menubar.options.view'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale('reload', 'menubar.options.reloads')}, - {role: 'forceReload', label: utils.getLocale('forceReload', 'menubar.options.forcereload')}, - {role: 'toggleDevTools', label: utils.getLocale('toggleDevTools', 'menubar.options.toggledevtools')}, + {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')}, + {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, + {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, {type: 'separator'}, - {role: 'resetZoom', label: utils.getLocale('resetZoom', 'menubar.options.resetzoom')}, - {role: 'zoomIn', label: utils.getLocale('zoomIn', 'menubar.options.zoomin')}, - {role: 'zoomOut', label: utils.getLocale('zoomOut', 'menubar.options.zoomout')}, + {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')}, + {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')}, + {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')}, {type: 'separator'}, - {role: 'togglefullscreen', label: utils.getLocale('togglefullscreen', 'menubar.options.togglefullscreen')}, + {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')}, ] }, { - label: utils.getLocale('Window', 'menubar.options.window'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), submenu: [ - {role: 'minimize', label: utils.getLocale('minimize', 'menubar.options.minimize')}, + {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')}, { - label: utils.getLocale('Show', 'menubar.options.show'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'), click: () => utils.getWindow().show() }, - {role: 'zoom', label: utils.getLocale('zoom', 'menubar.options.zoom')}, + {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')}, ...(this.isMac ? [ {type: 'separator'}, {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, ] : [ - {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, + {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')}, ]), { - label: utils.getLocale('Edit', 'menubar.options.edit'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'), submenu: [ - {role: 'undo', label: utils.getLocale('undo', 'menubar.options.undo')}, - {role: 'redo', label: utils.getLocale('redo', 'menubar.options.redo')}, + {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')}, + {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')}, {type: 'separator'}, - {role: 'cut', label: utils.getLocale('cut', 'menubar.options.cut')}, - {role: 'copy', label: utils.getLocale('copy', 'menubar.options.copy')}, - {role: 'paste', label: utils.getLocale('paste', 'menubar.options.paste')}, + {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')}, + {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')}, + {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')}, ] }, {type: 'separator'}, { - label: utils.getLocale('Toggle Private Session', 'menubar.options.toggleprivate'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'), accelerator: utils.getStoreValue("general.keybindings.togglePrivateSession").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.cfg.general.privateEnabled = !app.cfg.general.privateEnabled`) }, {type: 'separator'}, { - label: utils.getLocale('Web Remote', 'menubar.options.webremote'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.webremote'), accelerator: utils.getStoreValue("general.keybindings.webRemote").join('+'), sublabel: 'Opens in external window', click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('remote-pair')`) }, { - label: utils.getLocale('Audio Settings', 'menubar.options.audio'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.audio'), accelerator: utils.getStoreValue("general.keybindings.audioSettings").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.audioSettings = true`) }, { - label: utils.getLocale('Plug-in Menu', 'menubar.options.plugins'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.plugins'), accelerator: utils.getStoreValue("general.keybindings.pluginMenu").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.pluginMenu = true`) } ] }, { - label: utils.getLocale('Controls', 'menubar.options.controls'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.controls'), submenu: [ { - label: utils.getLocale('Pause / Play', 'menubar.options.playpause'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.playpause'), accelerator: 'Space', click: () => utils.getWindow().webContents.executeJavaScript(`app.SpacePause()`) }, { - label: utils.getLocale('Next', 'menubar.options.next'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.next'), accelerator: 'CommandOrControl+Right', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.next()`) }, { - label: utils.getLocale('Previous', 'menubar.options.previous'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.previous'), accelerator: 'CommandOrControl+Left', click: () => utils.getWindow().webContents.executeJavaScript(`MusicKitInterop.previous()`) }, {type: 'separator'}, { - label: utils.getLocale('Volume Up', 'menubar.options.volumeup'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumeup'), accelerator: 'CommandOrControl+Up', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeUp()`) }, { - label: utils.getLocale('Volume Down', 'menubar.options.volumedown'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.volumedown'), accelerator: 'CommandOrControl+Down', click: () => utils.getWindow().webContents.executeJavaScript(`app.volumeDown()`) }, { - label: utils.getLocale('Browse', 'menubar.options.browse'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.browse'), accelerator: utils.getStoreValue("general.keybindings.browse").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('browse')`) }, {type: 'separator'}, { - label: utils.getLocale('Artists', 'menubar.options.artists'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.artists'), accelerator: utils.getStoreValue("general.keybindings.artists").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-artists')`) }, { - label: utils.getLocale('Search', 'menubar.options.search'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.search'), accelerator: utils.getStoreValue("general.keybindings.search").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('search')`) }, {type: 'separator'}, { - label: utils.getLocale('Album', 'menubar.options.albums'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.albums'), accelerator: utils.getStoreValue("general.keybindings.albums").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('library-albums')`) }, {type: 'separator'}, { - label: utils.getLocale('Cast To Devices', 'menubar.options.cast'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cast'), accelerator: utils.getStoreValue("general.keybindings.castToDevices").join('+'), click: () => utils.getWindow().webContents.executeJavaScript(`app.modals.castMenu = true`) } ] }, { - label: utils.getLocale('Account', 'menubar.options.account'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.account'), submenu: [ { - label: utils.getLocale('Account Settings', 'menubar.options.accountsettings'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.accountsettings'), click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('apple-account-settings')`) }, { - label: utils.getLocale('Sign Out', 'menubar.options.signout'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.signout'), click: () => utils.getWindow().webContents.executeJavaScript(`app.unauthorize()`) } ] }, { - label: utils.getLocale('Support', 'menubar.options.support'), - role: utils.getLocale('help', 'menubar.options.help'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'), + role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'), submenu: [ { label: utils.getLocale('Discord', 'menubar.options.discord'), @@ -195,35 +195,35 @@ export default class Thumbar { }, {type: 'separator'}, { - label: utils.getLocale('Report a...', 'menubar.options.report'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.report'), submenu: [ { - label: utils.getLocale('Bug', 'menubar.options.bug'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.bug'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+").catch(console.error) }, { - label: utils.getLocale('Feature Request', 'menubar.options.feature'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.feature'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error) }, { - label: utils.getLocale('Translation Report/Request', 'menubar.options.trans'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.trans'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=%F0%9F%8C%90+Translations&template=translation.yaml&title=%5BTranslation%5D%3A+").catch(console.error) }, ] }, {type: 'separator'}, { - label: utils.getLocale('View License', 'menubar.options.license'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.license'), click: () => shell.openExternal("https://github.com/ciderapp/Cider/blob/main/LICENSE").catch(console.error) }, {type: 'separator'}, { - label: utils.getLocale('Toggle Developer Tools', 'menubar.options.toggledevtools'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools'), accelerator: utils.getStoreValue("general.keybindings.openDeveloperTools").join('+'), click: () => utils.getWindow().webContents.openDevTools() }, { - label: utils.getLocale('Open Configuration File in Editor', 'menubar.options.conf'), + label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.conf'), click: () => utils.getStoreInstance().openInEditor() } ] From 609eb9225f175599723e7bd867ac1b1b8d9b1506 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 06:47:55 -0300 Subject: [PATCH 12/44] MacOS Localizated only MacOS strings --- src/main/plugins/menubar.ts | 52 +++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 54092c80..14bd8b48 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -30,22 +30,27 @@ export default class Thumbar { { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.settings'), accelerator: utils.getStoreValue("general.keybindings.settings").join('+'), - click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`) + click: () => utils.getWindow().webContents.executeJavaScript(`app.appRoute('settings')`), }, + ...(this.isMac ? [ {type: 'separator'}, - {role: 'services', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.services')}, + {role: 'services'}, {type: 'separator'}, - {role: 'hide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hide')}, - {role: 'hideOthers', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.hideothers')}, - {role: 'unhide', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.unhide')}, + {role: 'hide'}, + {role: 'hideOthers'}, + {role: 'unhide'}, + ]: [ {type: 'separator'}, - {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')} - ] + {role: 'quit', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.quit')}, + ]), + ], }, + + { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.view'), submenu: [ - {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reloads')}, + {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')}, {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, {type: 'separator'}, @@ -60,30 +65,33 @@ export default class Thumbar { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), submenu: [ {role: 'minimize', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.minimize')}, + ...(this.isMac ? [ { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.show'), + label: 'Show', click: () => utils.getWindow().show() }, - {role: 'zoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoom')}, - ...(this.isMac ? [ + {role: 'zoom'}, + {type: 'separator'}, - {role: 'front', label: utils.getLocale('front', 'menubar.options.front')}, - {role: 'close', label: utils.getLocale('close', 'menubar.options.close')}, - ] : [ - {role: 'close', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.close')}, - ]), + {role: 'front'}, + {role: 'close'}, + + {role: 'close'}, + { - label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.edit'), + label: 'Edit', submenu: [ - {role: 'undo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.undo')}, - {role: 'redo', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.redo')}, + {role: 'undo'}, + {role: 'redo'}, {type: 'separator'}, - {role: 'cut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.cut')}, - {role: 'copy', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.copy')}, - {role: 'paste', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.paste')}, + {role: 'cut'}, + {role: 'copy'}, + {role: 'paste'}, ] }, + ] : [] + ), {type: 'separator'}, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggleprivate'), From d5e142608a4258ced1cd737b25cb648121ccead4 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 07:00:49 -0300 Subject: [PATCH 13/44] linux dont need this --- src/main/plugins/menubar.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 14bd8b48..4783c0a4 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -52,14 +52,17 @@ export default class Thumbar { submenu: [ {role: 'reload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.reload')}, {role: 'forceReload', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.forcereload')}, - {role: 'toggleDevTools', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.toggledevtools')}, + ...(this.isMac ? [ + {role: 'toggleDevTools'}, {type: 'separator'}, - {role: 'resetZoom', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.resetzoom')}, - {role: 'zoomIn', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomin')}, - {role: 'zoomOut', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.zoomout')}, + {role: 'resetZoom'}, + {role: 'zoomIn'}, + {role: 'zoomOut'}, {type: 'separator'}, - {role: 'togglefullscreen', label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.togglefullscreen')}, - ] + {role: 'togglefullscreen'}, + + ]: []), + ], }, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.window'), From b0bf97fcb50a2f3a8e271f46ef6535fad622ce79 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 07:28:30 -0300 Subject: [PATCH 14/44] Update Documentation --- src/i18n/README.md | 19 ------------------- src/i18n/en_US.json | 19 ------------------- src/i18n/es_ES.json | 19 ------------------- src/i18n/source/en_US.json | 19 ------------------- src/main/plugins/menubar.ts | 2 +- 5 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index cec535da..1622644a 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -303,31 +303,13 @@ Update 29/04/2022 00:00 UTC * `menubar.options.about`: Added for `en_US` * `menubar.options.settings`: Added for `en_US` - * `menubar.options.services`: Added for `en_US` - * `menubar.options.hide`: Added for `en_US` - * `menubar.options.hideothers`: Added for `en_US` - * `menubar.options.unhide`: Added for `en_US` * `menubar.options.quit`: Added for `en_US` * `menubar.options.view`: Added for `en_US` * `menubar.options.reload`: Added for `en_US` * `menubar.options.forcereload`: Added for `en_US` * `menubar.options.toggledevtools`: Added for `en_US` - * `menubar.options.resetzoom`: Added for `en_US` - * `menubar.options.zoomin`: Added for `en_US` - * `menubar.options.zoomout`: Added for `en_US` - * `menubar.options.togglefullscreen`: Added for `en_US` * `menubar.options.window`: Added for `en_US` * `menubar.options.minimize`: Added for `en_US` - * `menubar.options.show`: Added for `en_US` - * `menubar.options.zoom`: Added for `en_US` - * `menubar.options.front`: Added for `en_US` - * `menubar.options.close`: Added for `en_US` - * `menubar.options.edit`: Added for `en_US` - * `menubar.options.undo`: Added for `en_US` - * `menubar.options.redo`: Added for `en_US` - * `menubar.options.cut`: Added for `en_US` - * `menubar.options.copy`: Added for `en_US` - * `menubar.options.paste`: Added for `en_US` * `menubar.options.toggleprivate`: Added for `en_US` * `menubar.options.webremote`: Added for `en_US` * `menubar.options.audio`: Added for `en_US` @@ -346,7 +328,6 @@ Update 29/04/2022 00:00 UTC * `menubar.options.accountsettings`: Added for `en_US` * `menubar.options.signout`: Added for `en_US` * `menubar.options.support`: Added for `en_US` - * `menubar.options.help`: Added for `en_US` * `menubar.options.discord`: Added for `en_US` * `menubar.options.gihu`: Added for `en_US` * `menubar.options.report`: Added for `en_US` diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 9dafaf53..bd3edd6a 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Open artwork in browser", "menubar.options.about": "About", "menubar.options.settings": "Settings", - "menubar.options.services": "Services", - "menubar.options.hide": "Hide Cider", - "menubar.options.hideothers": "Hide Others", - "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", "menubar.options.view": "View ", "menubar.options.reload": "Reload", "menubar.options.forcereload": "Force Reload", "menubar.options.toggledevtools": "Toggle Developer Tools", - "menubar.options.resetzoom": "Reset Zoom", - "menubar.options.zoomin": "Zoom In", - "menubar.options.zoomout": "Zoom Out", - "menubar.options.togglefullscreen": "Toggle Fullscreen", "menubar.options.window": "Window", "menubar.options.minimize": "Minimize", - "menubar.options.show": "Show", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Front", - "menubar.options.close": "Close", - "menubar.options.edit": "Edit", - "menubar.options.undo": "Undo", - "menubar.options.redo": "Redo", - "menubar.options.cut": "Cut", - "menubar.options.copy": "Copy", - "menubar.options.paste": "Paste", "menubar.options.toggleprivate": "Toggle Private Session", "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Account Settings", "menubar.options.signout": "Sign Out", "menubar.options.support": "Support", - "menubar.options.help": "Help", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index 51701558..eb31ea60 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Abrir Ilustración en el navegador", "menubar.options.about": "Acerca de", "menubar.options.settings": "Ajustes", - "menubar.options.services": "Servicios", - "menubar.options.hide": "Ocultar Cider", - "menubar.options.hideothers": "Ocultar Otros", - "menubar.options.unhide": "Mostrar Todos", "menubar.options.quit": "Salir", "menubar.options.view": "Ver", "menubar.options.reload": "Recargar", "menubar.options.forcereload": "Forzar Recarga", "menubar.options.toggledevtools": "Herramientas de Desarrollo", - "menubar.options.resetzoom": "Restablecer Zoom", - "menubar.options.zoomin": "Acercar", - "menubar.options.zoomout": "Alejar", - "menubar.options.togglefullscreen": "Pantalla Completa", "menubar.options.window": "Ventana", "menubar.options.minimize": "Minimizar", - "menubar.options.show": "Mostrar", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Frente", - "menubar.options.close": "Cerrar", - "menubar.options.edit": "Editar", - "menubar.options.undo": "Deshacer", - "menubar.options.redo": "Rehacer", - "menubar.options.cut": "Cortar", - "menubar.options.copy": "Copiar", - "menubar.options.paste": "Pegar", "menubar.options.toggleprivate": "Cambiar Sesión Privada", "menubar.options.webremote": "Web Remoto", "menubar.options.audio": "Configuraciones de Audio", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Ajustes de Cuenta", "menubar.options.signout": "Cerrar Sesión", "menubar.options.support": "Soporte", - "menubar.options.help": "Ayuda", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Reportar a...", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 9dafaf53..bd3edd6a 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -266,31 +266,13 @@ "action.openArtworkInBrowser": "Open artwork in browser", "menubar.options.about": "About", "menubar.options.settings": "Settings", - "menubar.options.services": "Services", - "menubar.options.hide": "Hide Cider", - "menubar.options.hideothers": "Hide Others", - "menubar.options.unhide": "Show All", "menubar.options.quit": "Quit Cider", "menubar.options.view": "View ", "menubar.options.reload": "Reload", "menubar.options.forcereload": "Force Reload", "menubar.options.toggledevtools": "Toggle Developer Tools", - "menubar.options.resetzoom": "Reset Zoom", - "menubar.options.zoomin": "Zoom In", - "menubar.options.zoomout": "Zoom Out", - "menubar.options.togglefullscreen": "Toggle Fullscreen", "menubar.options.window": "Window", "menubar.options.minimize": "Minimize", - "menubar.options.show": "Show", - "menubar.options.zoom": "Zoom", - "menubar.options.front": "Front", - "menubar.options.close": "Close", - "menubar.options.edit": "Edit", - "menubar.options.undo": "Undo", - "menubar.options.redo": "Redo", - "menubar.options.cut": "Cut", - "menubar.options.copy": "Copy", - "menubar.options.paste": "Paste", "menubar.options.toggleprivate": "Toggle Private Session", "menubar.options.webremote": "Web Remote", "menubar.options.audio": "Audio Settings", @@ -310,7 +292,6 @@ "menubar.options.accountsettings": "Account Settings", "menubar.options.signout": "Sign Out", "menubar.options.support": "Support", - "menubar.options.help": "Help", "menubar.options.discord": "Discord", "menubar.options.github": "GitHub Wiki", "menubar.options.report": "Report a...", diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 4783c0a4..a9d73428 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -194,7 +194,7 @@ export default class Thumbar { }, { label: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.support'), - role: utils.getLocale(utils.getStoreValue('general.language'), 'menubar.options.help'), + role: 'help', submenu: [ { label: utils.getLocale('Discord', 'menubar.options.discord'), From 57b59d64c1ce902e61a62fe255060177330ed388 Mon Sep 17 00:00:00 2001 From: Mefsaal Date: Sun, 1 May 2022 18:06:53 -0300 Subject: [PATCH 15/44] im stupid --- src/i18n/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index 1622644a..3422daa7 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -329,7 +329,7 @@ Update 29/04/2022 00:00 UTC * `menubar.options.signout`: Added for `en_US` * `menubar.options.support`: Added for `en_US` * `menubar.options.discord`: Added for `en_US` - * `menubar.options.gihu`: Added for `en_US` + * `menubar.options.github`: Added for `en_US` * `menubar.options.report`: Added for `en_US` * `menubar.options.bug`: Added for `en_US` * `menubar.options.feature`: Added for `en_US` From 6940c8bf7e146e7a50bf5f1705301db4aa912385 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 05:15:22 +0100 Subject: [PATCH 16/44] Fixed the fails --- .circleci/config.yml | 2 +- resources/circle.js | 56 +++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9484eb6..91941e53 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ executors: - image: circleci/node:16 working_directory: ~/Cider -orbs: # adds orbs to your configuration +orbs: # Add orbs to your configuration jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible # The jobs for this project diff --git a/resources/circle.js b/resources/circle.js index dcf1d0ef..8a4a2ccb 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -1,53 +1,51 @@ - - if (!process.env['CIRCLECI']) { - console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`) - return + console.log(`[CIRCLECI SCRIPT] CircleCI not found... Aborting script`) + return } let fs = require('fs') -var data = fs.readFileSync('package.json'); -var package = JSON.parse(data); - - +const data = fs.readFileSync('package.json'); +const pkg = JSON.parse(data.toString()); let channel; if (process.env['CIRCLE_BRANCH'] === 'lts') { - channel = 'latest' + channel = 'latest' } else if (process.env['CIRCLE_BRANCH'] === 'main') { - channel = 'beta' + channel = 'beta' } else if (process.env['CIRCLE_BRANCH'] === 'develop') { - channel = 'alpha' + channel = 'alpha' } else { - channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support + channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support } +if (channel.concat('/')) { + channel.replace('/', '-') +} // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables -var pvers = package.version.split('.') -package.version = `${pvers[0]}.${pvers[1]}.${pvers[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` +const version = pkg.version.split('.'); +pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` // package.build.channel = channel -package.publish = { - "provider": "github", - "repo": "cider-releases", - "owner": "ciderapp", - "vPrefixedTagName": true, - "tag": `v${package.version}`, - "channel": channel, - "releaseType": "release" +pkg.publish = { + "provider": "github", + "repo": "cider-releases", + "owner": "ciderapp", + "vPrefixedTagName": true, + "tag": `v${pkg.version}`, + "channel": channel, + "releaseType": "release" } let {exec} = require('child_process') -exec('echo $APP_VERSION', {env: {'APP_VERSION': package.version}}, function (error, stdout, stderr) -{ - console.log(stdout, stderr, error); +exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { + console.log(stdout, stderr, error); }); -fs.writeFile('package.json', JSON.stringify(package), err => { - // error checking - if(err) throw err; - console.log(`VERSION CHANGED TO ${package.version}`); +fs.writeFile('package.json', JSON.stringify(pkg), err => { + // error checking + if (err) throw err; + console.log(`VERSION CHANGED TO ${pkg.version}`); }); From 4c2d64ef0dc9522548a0d62628c72224a6a042fe Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 05:18:01 +0100 Subject: [PATCH 17/44] shit --- .circleci/config.yml | 3 +-- resources/circle.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 91941e53..c0038416 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,6 @@ jobs: executor: cider-ci steps: - checkout - - run: ls -la - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV @@ -27,7 +26,7 @@ jobs: keys: - yarn-packages-{{ checksum "cider.lock" }} - run: - name: Install Dependencies + name: Install Node Dependencies command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn - save_cache: name: Save Yarn Package Cache diff --git a/resources/circle.js b/resources/circle.js index 8a4a2ccb..e6349ff5 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -21,7 +21,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') { } -if (channel.concat('/')) { +if (channel.includes('/')) { channel.replace('/', '-') } From 561ee3fe82ef908018cccc6b5b7449ce1cb87d21 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 05:22:41 +0100 Subject: [PATCH 18/44] is this gonna work --- resources/circle.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/circle.js b/resources/circle.js index e6349ff5..d62344b3 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -20,10 +20,7 @@ if (process.env['CIRCLE_BRANCH'] === 'lts') { channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support } - -if (channel.includes('/')) { - channel.replace('/', '-') -} +channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables const version = pkg.version.split('.'); From a417e8680f287da3fc11983c2e214ab33fb7602e Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 05:38:37 +0100 Subject: [PATCH 19/44] im a bit dumb --- resources/circle.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/resources/circle.js b/resources/circle.js index d62344b3..210690fe 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -3,24 +3,20 @@ if (!process.env['CIRCLECI']) { return } -let fs = require('fs') +const {readFileSync, writeFile} = require('fs') +const pkg = JSON.parse(readFileSync('package.json').toString()); +let channel = process.env['CIRCLE_BRANCH']; -const data = fs.readFileSync('package.json'); -const pkg = JSON.parse(data.toString()); - -let channel; if (process.env['CIRCLE_BRANCH'] === 'lts') { channel = 'latest' } else if (process.env['CIRCLE_BRANCH'] === 'main') { channel = 'beta' } else if (process.env['CIRCLE_BRANCH'] === 'develop') { channel = 'alpha' -} else { - channel = process.env['CIRCLE_BRANCH'] // It won't have auto update support } -channel.split('/').join('-') +channel = channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables const version = pkg.version.split('.'); @@ -36,11 +32,13 @@ pkg.publish = { "releaseType": "release" } -let {exec} = require('child_process') +const {exec} = require('child_process') + exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { console.log(stdout, stderr, error); }); -fs.writeFile('package.json', JSON.stringify(pkg), err => { + +writeFile('package.json', JSON.stringify(pkg), err => { // error checking if (err) throw err; console.log(`VERSION CHANGED TO ${pkg.version}`); From 3518542eeec3e5485b80121b3ae0775e73943877 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 05:51:11 +0100 Subject: [PATCH 20/44] only run on main now --- .circleci/config.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0038416..a6d9791f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,18 +161,33 @@ jobs: workflows: build_and_release: jobs: - - prepare-build + - prepare-build: + filters: + branches: + only: main - build-windows: requires: - prepare-build + filters: + branches: + only: main - build-linux: requires: - prepare-build + filters: + branches: + only: main - build-winget: requires: - prepare-build + filters: + branches: + only: main - release: requires: - build-windows - build-linux - build-winget + filters: + branches: + only: main From 010a2fdbc9e3a6d619bab7c6f75d331b26173883 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:00:19 +0100 Subject: [PATCH 21/44] test --- .circleci/config.yml | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6d9791f..7738f477 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,9 @@ jobs: - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV + - run: + name: Rename Repository + command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json - run: name: Update Package Managers command: sudo npm update -g npm yarn @@ -61,7 +64,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Linux) - command: yarn electron-builder -l -p never + command: yarn electron-builder -l -p onTagOrDraft post-steps: - jira/notify - persist_to_workspace: @@ -90,7 +93,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Windows) - command: yarn electron-builder -w --x64 -p never + command: yarn electron-builder -w --x64 -p onTagOrDraft post-steps: - jira/notify - persist_to_workspace: @@ -118,7 +121,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Winget) - command: yarn electron-builder --win -c winget.json -p never + command: yarn electron-builder --win -c winget.json -p onTagOrDraft post-steps: - jira/notify - persist_to_workspace: @@ -162,27 +165,27 @@ workflows: build_and_release: jobs: - prepare-build: - filters: - branches: - only: main +# filters: +# branches: +# only: main - build-windows: requires: - prepare-build - filters: - branches: - only: main +# filters: +# branches: +# only: main - build-linux: requires: - prepare-build - filters: - branches: - only: main +# filters: +# branches: +# only: main - build-winget: requires: - prepare-build - filters: - branches: - only: main +# filters: +# branches: +# only: main - release: requires: - build-windows From e257018c5e04f75db1a777068366d641dce21878 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:00:35 +0100 Subject: [PATCH 22/44] oops --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7738f477..cb19f249 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -164,7 +164,7 @@ jobs: workflows: build_and_release: jobs: - - prepare-build: + - prepare-build # filters: # branches: # only: main From 499d40af6f8b7805f7719e95ebbd1c62731e9607 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:05:45 +0100 Subject: [PATCH 23/44] stop it now --- .circleci/config.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb19f249..7021cabf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,9 @@ jobs: name: Restore Yarn Package Cache keys: - yarn-packages-{{ checksum "cider.lock" }} + - run: + name: Move Lockfile + command: mv cider.lock yarn.lock - run: name: Install Node Dependencies command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn @@ -165,27 +168,27 @@ workflows: build_and_release: jobs: - prepare-build -# filters: -# branches: -# only: main + # filters: + # branches: + # only: main - build-windows: requires: - prepare-build -# filters: -# branches: -# only: main + # filters: + # branches: + # only: main - build-linux: requires: - prepare-build -# filters: -# branches: -# only: main + # filters: + # branches: + # only: main - build-winget: requires: - prepare-build -# filters: -# branches: -# only: main + # filters: + # branches: + # only: main - release: requires: - build-windows From f35594c287b9e482e311003f2122e4d26211a4fb Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:06:59 +0100 Subject: [PATCH 24/44] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7021cabf..7f0e5f24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: command: mv cider.lock yarn.lock - run: name: Install Node Dependencies - command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn + command: yarn install --cache-folder ~/.cache/yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-{{ checksum "cider.lock" }} From 2fda5bab40c171eee407f7291f6cb8c27447f8ab Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:08:27 +0100 Subject: [PATCH 25/44] oops --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f0e5f24..c0826a57 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,12 +28,9 @@ jobs: name: Restore Yarn Package Cache keys: - yarn-packages-{{ checksum "cider.lock" }} - - run: - name: Move Lockfile - command: mv cider.lock yarn.lock - run: name: Install Node Dependencies - command: yarn install --cache-folder ~/.cache/yarn + command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn - save_cache: name: Save Yarn Package Cache key: yarn-packages-{{ checksum "cider.lock" }} From 70a0e4dd72b60ad5215bd2fb88fd49f88cef9982 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:12:58 +0100 Subject: [PATCH 26/44] oops --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0826a57..84afba1b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Linux) - command: yarn electron-builder -l -p onTagOrDraft + command: yarn electron-builder -l -p always post-steps: - jira/notify - persist_to_workspace: @@ -93,7 +93,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Windows) - command: yarn electron-builder -w --x64 -p onTagOrDraft + command: yarn electron-builder -w --x64 -p always post-steps: - jira/notify - persist_to_workspace: @@ -121,7 +121,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Winget) - command: yarn electron-builder --win -c winget.json -p onTagOrDraft + command: yarn electron-builder --win -c winget.json -p always post-steps: - jira/notify - persist_to_workspace: From 1efa3c1e6580a73d732ee64963a96cc89e27986f Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:24:16 +0100 Subject: [PATCH 27/44] test --- .circleci/config.yml | 3 +++ resources/circle.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 84afba1b..d180b1c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,6 +59,9 @@ jobs: steps: - attach_workspace: at: ~/Cider + - run: + name: Install Snap + command: sudo snap install snapcraft --classic - run: name: Fix Versioning and Add Channel command: yarn circle:script diff --git a/resources/circle.js b/resources/circle.js index 210690fe..80e7c8cf 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -20,7 +20,7 @@ channel = channel.split('/').join('-') // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables const version = pkg.version.split('.'); -pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` +pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}` // package.build.channel = channel pkg.publish = { "provider": "github", From f88e2420084279281122241bc7736d550b67f8f3 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:28:41 +0100 Subject: [PATCH 28/44] test --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d180b1c0..165e4340 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,7 +61,9 @@ jobs: at: ~/Cider - run: name: Install Snap - command: sudo snap install snapcraft --classic + command: | + sudo apt update + sudo apt install snapd - run: name: Fix Versioning and Add Channel command: yarn circle:script From d457c573395d918242a9e77cece2e90e67c84c63 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:29:48 +0100 Subject: [PATCH 29/44] yml bad --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 165e4340..d15aafdf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,8 +62,8 @@ jobs: - run: name: Install Snap command: | - sudo apt update - sudo apt install snapd + sudo apt update + sudo apt install snapd - run: name: Fix Versioning and Add Channel command: yarn circle:script From 42384afa1f313de8464906f0d031e628fa45f845 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:37:39 +0100 Subject: [PATCH 30/44] test --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d15aafdf..0abfc335 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,8 +62,9 @@ jobs: - run: name: Install Snap command: | - sudo apt update - sudo apt install snapd + sudo apt update && sudo apt install -y snapd + sudo snap install snapcraft --edge --classic + /snap/bin/snapcraft - run: name: Fix Versioning and Add Channel command: yarn circle:script From ee9f65ddb63c1f18b567037f6b0073234ff224ce Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:40:43 +0100 Subject: [PATCH 31/44] test --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0abfc335..8f50e672 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,6 +63,8 @@ jobs: name: Install Snap command: | sudo apt update && sudo apt install -y snapd + service snapd start + sudo systemctl start snapd.service sudo snap install snapcraft --edge --classic /snap/bin/snapcraft - run: From 5e8e8450dfdf765cebcfff0c74df14c6591ad8b0 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:43:26 +0100 Subject: [PATCH 32/44] fuk --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f50e672..b3e4a939 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,6 @@ jobs: command: | sudo apt update && sudo apt install -y snapd service snapd start - sudo systemctl start snapd.service sudo snap install snapcraft --edge --classic /snap/bin/snapcraft - run: From f5a6724308eb08902c567c66f73ba822d534baac Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:49:11 +0100 Subject: [PATCH 33/44] test --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b3e4a939..62abab43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,9 +63,7 @@ jobs: name: Install Snap command: | sudo apt update && sudo apt install -y snapd - service snapd start - sudo snap install snapcraft --edge --classic - /snap/bin/snapcraft + docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft" - run: name: Fix Versioning and Add Channel command: yarn circle:script From 36e5720362f382d3a9a173054b1764eba28de0d3 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:53:38 +0100 Subject: [PATCH 34/44] test --- .circleci/config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62abab43..70987eb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,15 +55,17 @@ jobs: - license.txt build-linux: - executor: cider-ci + working_directory: ~/Cider + machine: true steps: - attach_workspace: at: ~/Cider - run: - name: Install Snap + name: Setup Snapcraft command: | sudo apt update && sudo apt install -y snapd - docker run -v $(pwd):$(pwd) -t ubuntu:xenial sh -c "apt update -qq && apt install snapcraft -y && cd $(pwd) && snapcraft" + sudo snap install snapcraft --edge --classic + /snap/bin/snapcraft - run: name: Fix Versioning and Add Channel command: yarn circle:script From 7c90b03b244fccf445c8955b6d76db87e654a214 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 08:57:19 +0100 Subject: [PATCH 35/44] test --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70987eb6..37f8d306 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,6 +64,8 @@ jobs: name: Setup Snapcraft command: | sudo apt update && sudo apt install -y snapd + sudo snap install core snapd + snap refresh core sudo snap install snapcraft --edge --classic /snap/bin/snapcraft - run: From a76e795bfa7f3c7756751145e05bd903cb6b7116 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 09:00:00 +0100 Subject: [PATCH 36/44] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 37f8d306..5952714f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,9 +64,9 @@ jobs: name: Setup Snapcraft command: | sudo apt update && sudo apt install -y snapd + sudo snap install snapcraft --edge --classic sudo snap install core snapd snap refresh core - sudo snap install snapcraft --edge --classic /snap/bin/snapcraft - run: name: Fix Versioning and Add Channel From 2c54d6c16613ed7d9bf44cfb92eb22388dbdcfcf Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 09:05:40 +0100 Subject: [PATCH 37/44] ok --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5952714f..206ddd8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,9 +64,9 @@ jobs: name: Setup Snapcraft command: | sudo apt update && sudo apt install -y snapd + sudo snap install core sudo snap install snapcraft --edge --classic - sudo snap install core snapd - snap refresh core + sudo snap refresh core /snap/bin/snapcraft - run: name: Fix Versioning and Add Channel From c009514c9d2e46d0d68cfb81fb31faff07cb7437 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 2 May 2022 09:12:54 +0100 Subject: [PATCH 38/44] hmm --- .circleci/config.yml | 49 ++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 206ddd8e..2d7b5b75 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,9 +18,9 @@ jobs: - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV - - run: - name: Rename Repository - command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json + # - run: + # name: Rename Repository + # command: sed -i 's/github:ciderapp\/Cider/github:ciderapp\/cider-releases/' package.json - run: name: Update Package Managers command: sudo npm update -g npm yarn @@ -55,25 +55,16 @@ jobs: - license.txt build-linux: - working_directory: ~/Cider - machine: true + executor: cider-ci steps: - attach_workspace: at: ~/Cider - - run: - name: Setup Snapcraft - command: | - sudo apt update && sudo apt install -y snapd - sudo snap install core - sudo snap install snapcraft --edge --classic - sudo snap refresh core - /snap/bin/snapcraft - run: name: Fix Versioning and Add Channel command: yarn circle:script - run: name: Generate Builds (Linux) - command: yarn electron-builder -l -p always + command: yarn electron-builder -l -p never post-steps: - jira/notify - persist_to_workspace: @@ -102,7 +93,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Windows) - command: yarn electron-builder -w --x64 -p always + command: yarn electron-builder -w --x64 -p never post-steps: - jira/notify - persist_to_workspace: @@ -130,7 +121,7 @@ jobs: command: yarn circle:script - run: name: Generate Builds (Winget) - command: yarn electron-builder --win -c winget.json -p always + command: yarn electron-builder --win -c winget.json -p never post-steps: - jira/notify - persist_to_workspace: @@ -173,28 +164,28 @@ jobs: workflows: build_and_release: jobs: - - prepare-build - # filters: - # branches: - # only: main + - prepare-build: + filters: + branches: + only: main - build-windows: requires: - prepare-build - # filters: - # branches: - # only: main + filters: + branches: + only: main - build-linux: requires: - prepare-build - # filters: - # branches: - # only: main + filters: + branches: + only: main - build-winget: requires: - prepare-build - # filters: - # branches: - # only: main + filters: + branches: + only: main - release: requires: - build-windows From 642f1784ecfe5beb21b5163c4125f8d8fbac221f Mon Sep 17 00:00:00 2001 From: Vasilis Date: Tue, 3 May 2022 14:12:48 +0300 Subject: [PATCH 39/44] Update Greek translations --- src/i18n/el_GR.json | 202 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 164 insertions(+), 38 deletions(-) diff --git a/src/i18n/el_GR.json b/src/i18n/el_GR.json index eda64396..c116b244 100644 --- a/src/i18n/el_GR.json +++ b/src/i18n/el_GR.json @@ -10,6 +10,7 @@ "notification.updatingLibrarySongs": "Ενημέρωση βιβλιοθήκης τραγουδιών...", "notification.updatingLibraryAlbums": "Ενημέρωση βιβλιοθήκης άλμπουμ...", "notification.updatingLibraryArtists": "Ενημέρωση βιβλιοθήκης καλλιτεχνών...", + "term.variables": "Μεταβλητές", "term.appleInc": "Apple Inc.", "term.appleMusic": "Apple Music", "term.applePodcasts": "Apple Podcasts", @@ -20,9 +21,13 @@ "term.accountSettings": "Ρυθμίσεις λογαριασμού", "term.logout": "Αποσύνδεση", "term.login": "Σύνδεση", + "term.cast": "Μετάδοση", "term.about": "Σχετικά με", "term.privateSession": "Ιδιωτική περίοδος λειτουργίας", + "term.disablePrivateSession": "Απενεργ. ιδιωτικής περ. λειτουργίας", "term.queue": "Ουρά", + "term.lyrics": "Στίχοι", + "term.miniplayer": "MiniPlayer", "term.history": "Ιστορικό", "term.search": "Εύρεση", "term.library": "Βιβλιοθήκη", @@ -68,6 +73,7 @@ "term.viewAs": "Προβολή ως", "term.viewAs.coverArt": "Εξώφυλλο", "term.viewAs.list": "Λίστα", + "term.dynamic": "Δυναμικό", "term.size": "Μέγεθος", "term.size.normal": "Κανονικό", "term.size.compact": "Συμπαγή", @@ -89,12 +95,26 @@ "term.time.added": "Προστέθηκε", "term.time.released": "Κυκλοφόρησε", "term.time.updated": "Ενημερώθηκε", + "term.time.days": "μέρες", + "term.time.day": { + "one": "μέρα", + "other": "μέρες" + }, "term.time.hours": "ώρες", - "term.time.hour": "ώρα", + "term.time.hour": { + "one": "ώρα", + "other": "ώρες" + }, "term.time.minutes": "λεπτά", - "term.time.minute": "λεπτό", + "term.time.minute": { + "one": "λεπτό", + "other": "λεπτά" + }, "term.time.seconds": "δευτερόλεπτα", - "term.time.second": "δευτερόλεπτο", + "term.time.second": { + "one": "δευτερόλεπτο", + "other": "δευτερόλεπτα" + }, "term.fullscreenView": "Πλήρης οθόνη", "term.defaultView": "Κανονική οθόνη", "term.audioSettings": "Ρυθμίσεις ήχου", @@ -114,7 +134,8 @@ "term.contributors": "Συνεισφέροντες", "term.equalizer": "Ισοσταθμιστής", "term.reset": "Επαναφορά", - "term.tracks": { + "term.tracks": "τραγούδια", + "term.track": { "one": "τραγούδι", "other": "τραγούδια" }, @@ -145,6 +166,7 @@ "term.noVideos": "Δεν βρέθηκαν βίντεο", "term.plugin": "Πρόσθετα", "term.pluginMenu": "Μενού πρόσθετων", + "term.pluginMenu.none": "Δεν υπάρχουν πρόσθετα", "term.replay": "Replay", "term.uniqueAlbums": "Μοναδικά άλμπουμ", "term.uniqueArtists": "Μοναδικοί καλλιτέχνες", @@ -156,10 +178,12 @@ "term.plays": "Αναπαραγωγές", "term.topGenres": "Κορυφαία είδη", "term.confirmLogout": "Θέλετε σίγουρα να αποσυνδεθείτε;", + "term.creditDesignedBy": "Σχεδιάστηκε από ${authorUsername}", + "term.discNumber": "Δίσκος ${discNumber}", "home.title": "Αρχική", "home.recentlyPlayed": "Έπαιξαν πρόσφατα", "home.recentlyAdded": "Πρόσφατες προσθήκες", - "home.artistsFeed": "Ροή των καλλιτεχνών σου", + "home.artistsFeed": "Ροή των καλλιτεχνών σας", "home.artistsFeed.noArtist": "Ακολούθησε μερικούς καλλιτέχνες πρώτα και οι τελευταίες κυκλοφορίες τους θα εμφανίζονται εδώ", "home.madeForYou": "Δημιουργήθηκε για εσάς", "home.friendsListeningTo": "Οι φίλοι σου ακούν", @@ -176,6 +200,9 @@ "podcast.episodes": "Επεισόδια", "podcast.playEpisode": "Αναπαραγωγή επεισοδίου", "podcast.website": "Ιστότοπος Podcast", + "action.edit": "Επεξεργασία", + "action.done": "Τέλος", + "action.editTracklist": "Επεξεργασία λίστας τραγουδιών", "action.addToLibrary": "Προσθήκη στη βιβλιοθήκη", "action.addToLibrary.success": "Προστέθηκε στη βιβλιοθήκη", "action.addToLibrary.error": "Σφάλμα Προσθήκης στη βιβλιοθήκης", @@ -202,6 +229,8 @@ "action.startRadio": "Έναρξη ραδιοφώνου", "action.goToArtist": "Μετάβαση σε καλλιτέχνη", "action.goToAlbum": "Μετάβαση σε άλμπουμ", + "action.showInPlaylist": "Εμφάνιση στη λίστα αναπαραγωγής", + "action.showInAppleMusic": "Εμφάνιση στο Apple Music", "action.moveToTop": "Μετακίνηση στη κορυφή", "action.share": "Κοινή χρήση", "action.rename": "Μετονομασία", @@ -209,7 +238,7 @@ "action.unlove": "Αναίρεση \"Μου αρέσει\"", "action.dislike": "Δεν μου αρέσει", "action.undoDislike": "Αναίρεση \"Δεν μου αρέσει\"", - "action.showWebRemoteQR": "Εμφάνιση Web Remote QR", + "action.showWebRemoteQR": "Web Remote", "action.playTracksNext": "Αναπαραγωγή ${app.selectedMediaItems.length} τραγουδιών ως επόμενων", "action.playTracksLater": "Αναπαραγωγή ${app.selectedMediaItems.length} τραγουδιών αργότερα", "action.removeTracks": "Αφαίρεση ${self.selectedItems.length} τραγουδιών από την ουρά", @@ -218,13 +247,23 @@ "action.showAlbum": "Εμφάνιση ολόκληρου άλμπουμ", "action.tray.minimize": "Ελαχιστοποίηση στη γωνία γραμμής εργασιών", "action.tray.quit": "Έξοδος", - + "action.tray.show": "Εμφάνιση Cider", "action.update": "Ενημέρωση", "action.install": "Εγκατάσταση", "action.copy": "Αντιγραφή", "action.newpreset": "Νέα προρύθμιση...", "action.deletepreset": "Διαγραφή προρύθμισης", "action.open": "Άνοιγμα", + "action.relaunch.confirm": "Θέλετε να επανεκκινήσετε τον Cider;", + "action.cast.chromecast": "Chromecast", + "action.cast.todevices": "Μετάδοση σε συσκευές", + "action.cast.stop": "Διακοπή μετάδοσης σε όλες τις συσκευές", + "action.cast.airplay": "AirPlay", + "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": "Γλώσσα", @@ -234,6 +273,10 @@ "settings.option.general.resumebehavior.locally.description": "Το Cider θα συνεχίσει την τελευταία συνεδρία σας αυτής της συσκευής.", "settings.option.general.resumebehavior.history": "Ιστορικό", "settings.option.general.resumebehavior.history.description": "Το Cider θα βάλει στην ουρά το τελευταίο τραγούδι από το συνολικό ιστορικό Apple Music, όλων των συσκευών σας.", + "settings.option.general.resumetabs": "Άνοιγμα καρτέλας στην εκκίνηση", + "settings.option.general.resumetabs.description": "Μπορείτε να επιλέξετε ποια καρτέλα θα εμφανίζεται όταν ανοίγετε τον Cider.", + "settings.option.general.resumetabs.dynamic": "Δυναμικό", + "settings.option.general.resumetabs.dynamic.description": "Ο Cider θα ανοίγει την καρτέλα που χρησιμοποιήσατε τελευταία.", "settings.option.general.language.main": "Γλώσσες", "settings.option.general.language.fun": "Γλώσσες για πλάκα", "settings.option.general.language.unsorted": "Αταξινόμητες", @@ -242,10 +285,34 @@ "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": "Ο συνδιασμός ενημερώθηκε με επιτυχία. Πατήστε ΟΚ για επανεκκίνηση του 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 Remote", + "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": "Σφάλμα ενημέρωσης του Cider", + "settings.notyf.updateCider.update-timeout": "Λήξη χρόνου ενημέρωσης", "settings.header.audio": "Ήχος", "settings.header.audio.description": "Προσαρμογή ρυθμίσεων ήχου για το Cider.", "settings.option.audio.volumeStep": "Βήματα έντασης", "settings.option.audio.maxVolume": "Μέγιστη ένταση", + "settings.option.audio.changePlaybackRate": "Αλλαγή ταχύτητας αναπαραγωγής", + "settings.option.audio.playbackRate": "Ταχύτητα αναπαραγωγής", + "settings.option.audio.playbackRate.change": "Αλλαγή", "settings.option.audio.quality": "Ποιότητα ήχου", "settings.header.audio.quality.hireslossless": "Lossless υψηλής ανάλυσης", "settings.header.audio.quality.hireslossless.description": "έως και 24-bit/192 kHz", @@ -258,18 +325,34 @@ "settings.option.audio.seamlessTransition": "Αδιάκοπη μετάβαση ήχου", "settings.option.audio.enableAdvancedFunctionality": "Ενεργοποίηση προηγμένης λειτουργικότητας", "settings.option.audio.enableAdvancedFunctionality.description": "Ενεργοποιώντας τη λειτουργικότητα AudioContext θα επιτρέψει σε επεκταμένες δυνατότητες ήχου όπως Κανονικοποίηση Έντασης Ήχου, Ισοσταθμιστές και Οπτικοποιητές, ωστόσο σε κάποια συστήματα μπορεί να προκαλέσει τραύλισμα ήχου.", + "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Η συσκευή σου ίσως να μη μπορέσει να χειρηστεί αυτές τις δυνατότητες. Σίγουρα θέλετε να συνεχίσετε;", "settings.option.audio.audioLab": "Cider Audio Lab", - "settings.option.audio.audioLab.description": "Περιέχει μια ποικιλία από τροποποιήσεις ήχου που έγιναν από την ομάδα προγραμματιστών του Cider", + "settings.option.audio.audioLab.description": "Μια ποικιλία τροποποιήσεων ήχου από την ομάδα προγραμματιστών του Cider.", + "settings.option.audio.audioLab.subheader": "Σχεδιάστηκε από τους προγραμματιστές του Cider", "settings.warn.audioLab.withoutAF": "Το AudioContext (προηγμένη λειτουργικότητα) απαιτείται για την ενεργοποίηση του Cider Audio Laboratory.", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Ένταση Analog Warmth", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Αλλάζει την ένταση της επεξεργασίας του Analog Warmth Module.", + "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Αναλογική ζεστασιά", + "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Προσομοιώνει την αναλογική ζεστασιά του Korg Nutube 6P1", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Ένταση αναλογικής ζεστασιάς", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Αλλάζει την ένταση της επεξεργασίας της αναλογικής ζεστασιάς.", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Λείο", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Θερμό", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer": "Ατμόσφαιρα ήχου", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizer.description": "Εφαρμόζει μια διαφορετική ατμόσφαιρα στον ήχο.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode": "Λειτουργία ατμόσφαιρας ήχου", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.description": "Αλλάζει τη λειτουργία ατμόσφαιρας ήχου.", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural1": "Φυσική (Κανονικό)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural2": "Φυσική (Υψηλό)", + "settings.option.audio.enableAdvancedFunctionality.atmosphereRealizerMode.natural3": "Φυσική (Υψηλότερο)", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Επεξεργαστής ήχου Cider (CAP)", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Βελτιώνει την αντιληπτή ποιότητα ήχου χρησιμοποιώντας αλγορίθμους.", "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "Το CAP δεν είναι συμβατό με τη Χωρικοποίηση Ήχου. Παρακαλούμε απενεργοποιήστε τη Χωρικοποίηση Ήχου για να συνεχίσετε.", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "Ένταση CAP", "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Αλλάζει την ένταση της επεξεργασίας του ήχου. (Η επιθετική επεξεργασία μπορεί να αποφέρει ανεπιθύμητα αποτελέσματα)", "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": "Κανονικοποίηση έντασης ήχου", + "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", @@ -281,15 +364,16 @@ "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Η Χωρικοποίηση δεν είναι συμβατή με το CAP. Παρακαλούμε απενεργοποιήστε το CAP για να συνεχίσετε.", "settings.header.visual": "Οπτικά", "settings.header.visual.description": "Προσαρμογή οπτικών ρυθμίσεων για το Cider.", - "settings.option.visual.windowBackgroundStyle": "Στυλ Φόντου Παραθύρου", + "settings.option.visual.windowStyle": "Στυλ παραθύρου", + "settings.option.visual.windowBackgroundStyle": "Στυλ φόντου παραθύρου", "settings.header.visual.windowBackgroundStyle.none": "Κανένα", "settings.header.visual.windowBackgroundStyle.artwork": "Εξώφυλλο", "settings.header.visual.windowBackgroundStyle.image": "Εικόνα", - "settings.option.visual.animatedArtwork": "Κινούμενο Εξώφυλλο", + "settings.option.visual.animatedArtwork": "Κινούμενο εξώφυλλο", "settings.header.visual.animatedArtwork.always": "Πάντα", "settings.header.visual.animatedArtwork.limited": "Περιορισμός σε σελίδες και ειδικές καταχωρήσεις", "settings.header.visual.animatedArtwork.disable": "Απενεργοποιημένο παντού", - "settings.option.visual.animatedArtworkQuality": "Ποιότητα Κινούμενου Εξωφύλλου", + "settings.option.visual.animatedArtworkQuality": "Ποιότητα κινούμενου εξωφύλλου", "settings.header.visual.animatedArtworkQuality.low": "Χαμηλή", "settings.header.visual.animatedArtworkQuality.medium": "Μέτρια", "settings.header.visual.animatedArtworkQuality.high": "Υψηλή", @@ -300,30 +384,52 @@ "settings.option.visual.hardwareAcceleration.description": "Απαιτεί επανεκκίνηση", "settings.header.visual.hardwareAcceleration.default": "Προεπιλογή", "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU", + "settings.option.visual.uiscale": "Κλίμακα διεπαφής χρήστη", "settings.header.visual.theme": "Θέμα", "settings.option.visual.theme.github.download": "Εγκατάσταση από σύνδεσμο GitHub", + "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 }};", "settings.prompt.visual.theme.github.URL": "Εισάγετε τον σύνδεσμο του θέματος που θέλετε να εγκαταστήσετε", "settings.notyf.visual.theme.install.success": "Το θέμα εγκαταστάθηκε με επιτυχία", "settings.notyf.visual.theme.install.error": "Αποτυχία εγκατάστασης του θέματος", + "settings.header.visual.plugin": "Πρόσθετο", + "settings.option.visual.plugin.github.download": "Εγκατάσταση από σύνδεσμο GitHub", + "settings.option.visual.plugin.github.explore": "Εξερεύνηση πρόσθετων GitHub", + "settings.header.visual.plugin.github.page": "Πρόσθετα από το GitHub", + "settings.option.visual.plugin.github.install.confirm": "Θέλετε σίγουρα να εγκαταστήσετε το πρόσθετο {{ repo }};", + "settings.prompt.visual.plugin.github.URL": "Εισάγετε τον σύνδεσμο του πρόσθετου που θέλετε να εγκαταστήσετε", + "settings.prompt.visual.plugin.github.success": "Το πρόσθετο εγκαταστάθηκε με επιτυχία, πατήστε ΟΚ για επανεκκίνηση του Cider", + "settings.notyf.visual.plugin.install.success": "Το πρόσθετο εγκαταστάθηκε με επιτυχία", + "settings.notyf.visual.plugin.install.error": "Αποτυχία εγκατάστασης του πρόσθετου", "settings.option.visual.theme.default": "Cider", "settings.option.visual.theme.dark": "Σκοτεινό", "settings.option.visual.showPersonalInfo": "Εμφάνιση προσωπικών στοιχείων", + "settings.header.window": "Παράθυρο", + "settings.header.window.description": "Προσαρμογή ρυθμίσεων παραθύρου για το Cider.", + "settings.option.window.openOnStartup": "Άνοιγμα του Cider στην εκκίνηση", + "settings.option.window.openOnStartup.hidden": "Άνοιγμα κρυμμένο", + "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": "Προσαρμογή ρυθμίσεων στίχων για το Cider.", - "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση Στίχων Musixmatch", - "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση Λειτουργίας Καραόκε (Musixmatch μόνο)", - "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη Γλώσσα Μετάφρασης Musixmatch", - "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση Στίχων Youtube για Μουσικά Βίντεο", - "settings.header.connectivity": "Σύνδεση", - "settings.header.connectivity.description": "Προσαρμογή ρυθμίσεων σύνδεσης για το Cider.", + "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση στίχων Musixmatch", + "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση λειτουργίας καραόκε (Musixmatch μόνο)", + "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη γλώσσα μετάφρασης Musixmatch", + "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων Youtube για μουσικά βίντεο", + "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.playbackNotifications": "Ειδοποιήσεις Αναπαραγωγής", - "settings.header.connectivity.discordRPC.cider": "Εμφάνιση ως 'Cider'", - "settings.header.connectivity.discordRPC.appleMusic": "Εμφάνιση ως 'Apple Music'", + "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": "LastFM Scrobbling", "settings.option.connectivity.lastfmScrobble.delay": "Καθυστέρηση LastFM Scrobble (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Ενεργοποίηση LastFM \"Now Playing\"", @@ -334,32 +440,52 @@ "settings.option.debug.openAppData": "Άνοιγμα του φακέλου Cider", "settings.header.experimental": "Πειραματικές", "settings.header.experimental.description": "Προσαρμογή πειραματικών ρυθμίσεων για το Cider.", - "settings.option.experimental.compactUI": "Συμπαγής Διεπαφή", - "settings.option.experimental.closeButtonBehaviour": "Συμπεριφορά Κουμπιού Εξόδου", - "settings.option.experimental.closeButtonBehaviour.quit": "Έξοδος του Cider", - "settings.option.experimental.closeButtonBehaviour.minimizeTaskbar": "Ελαχιστοποίηση στη γραμμή εργασιών", - "settings.option.experimental.closeButtonBehaviour.minimizeTray": "Ελαχιστοποίηση στη γωνία γραμμής εργασιών", + "settings.option.experimental.reinstallwidevine": "Επανεγκατάσταση του WidevineCDM", + "settings.option.experimental.reinstallwidevine.confirm": "Θέλετε σίγουρα να επανεγκαταστήσετε το Widevine;", + "settings.option.experimental.unknownPlugin": "Άγνωστες πηγές", + "settings.option.experimental.unknownPlugin.description": "Να επιτρέπεται η εγκατάσταση πρόσθετων από repo εκτός του Cider Plugin Repository", + "settings.option.experimental.compactUI": "Συμπαγής διεπαφή", + "settings.option.window.close_button_hide": "Απόκρυψη εφαρμογής με το πάτημα του κουμπιού κλεισίματος", + "settings.option.experimental.inline_playlists": "Ενσωμάτωση λιστών αναπαραγωγής και άλμπουμ", + "settings.option.advanced.playlistTrackMapping": "Χαρτογράφηση κομματιών λίστών αναπαραγωγής", + "settings.option.advanced.playlistTrackMapping.description": "Ενεργοποιεί τη βαθιά σάρωση των λιστών αναπαραγωγής για να προσδιορίσει ποια κομμάτια βρίσκονται σε ποιες λίστες αναπαραγωγής. Οι χρόνοι δημιουργίας της προσωρινής μνήμης των λιστών αναπαραγωγής μπορεί να αυξηθούν σημαντικά.", + "settings.option.visual.transparent": "Διαφανές πλαίσιο", + "settings.option.visual.transparent.description": "(χρειάζεται υποστήριξη θέματος, απαιτεί επανεκκίνηση)", + "settings.header.advanced": "Για προχωρημένους", + "settings.header.connect": "Συγχρονισμός", + "settings.option.connect.link_account": "Ενεργοποίηση συγχρονισμού με Cider Connect", + "settings.option.connect.link_account.description": "Η σύνδεση του λογαριασμού σας Discord με το Cider Connect σάς επιτρέπει να αποθηκεύετε δεδομένα χρήστη, συμπεριλαμβανομένων των Ρυθμίσεων, των EQ, και άλλα. (Υπό ανάπτυξη)", "spatial.notTurnedOn": "Η Χωρικοποίηση Ήχου είναι απενεργοποιημένη. Για χρήση, παρακαλούμε ενεργοποιήστε την πρώτα.", - "spatial.spatialProperties": "Χωρικές Ιδιότητες", + "spatial.spatialProperties": "Χωρικές ιδιότητες", "spatial.width": "Πλάτος", "spatial.height": "Ύψος", "spatial.depth": "Βάθος", "spatial.gain": "Απολαβή", - "spatial.roomMaterials": "Υλικά Δωματίου", - "spatial.roomDimensions": "Διαστάσεις Δωματίου", - "spatial.roomPositions": "Θέσεις Δωματίου", - "spatial.setDimensions": "Ορισμός Διαστάσεων", - "spatial.setPositions": "Ορισμός Θέσεων", + "spatial.roomMaterials": "Υλικά δωματίου", + "spatial.roomDimensions": "Διαστάσεις δωματίου", + "spatial.roomPositions": "Θέσεις δωματίου", + "spatial.setDimensions": "Ορισμός διαστάσεων", + "spatial.setPositions": "Ορισμός θέσεων", "spatial.up": "Πάνω", "spatial.front": "Πρόσοψη", "spatial.left": "Αριστερά", "spatial.right": "Δεξιά", - "spatial.back": "Πίσω Όψη", + "spatial.back": "Πίσω όψη", "spatial.down": "Κάτω", "spatial.listener": "Ακροατής", - "spatial.audioSource": "Πηγή Ήχου", + "spatial.audioSource": "Πηγή ήχου", "settings.header.unfinished": "Ημιτελής", "remote.web.title": "Cider Remote", "remote.web.description": "Σαρώστε τον κωδικό QR για σύζευξη του Cider με το κινητό σας", + "share.platform.twitter.tweet": "Ακούστε το {{song}} στο Apple Music.\n\n{{url}}\n\n#AppleMusic #Cider", + "share.platform.twitter": "Twitter", + "share.platform.facebook": "Facebook", + "share.platform.reddit": "Reddit", + "share.platform.telegram": "Telegram", + "share.platform.whatsapp": "WhatsApp", + "share.platform.messenger": "Messenger", + "share.platform.email": "Email", + "share.platform.songLink": "Αντιγραφή με song.link", + "share.platform.clipboard": "Αντιγραφή συνδέσμου", "about.thanks": "Μεγάλα ευχαριστώ στην Ομάδα Cider Collective και σε όλους τους συνεισφέροντές μας." -} \ No newline at end of file +} From 5da7926eb50dbccb4a41235b229e3a2f48dd9e2f Mon Sep 17 00:00:00 2001 From: Vasilis Date: Tue, 3 May 2022 14:27:13 +0300 Subject: [PATCH 40/44] Correction --- src/i18n/el_GR.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i18n/el_GR.json b/src/i18n/el_GR.json index c116b244..2c7843c6 100644 --- a/src/i18n/el_GR.json +++ b/src/i18n/el_GR.json @@ -262,7 +262,7 @@ "action.cast.airplay.underdevelopment": "Το AirPlay είναι ακόμη υπό ανάπτυξη", "action.cast.scan": "Σάρωση", "action.cast.scanning": "Γίνεται σάρωση...", - "action.createNew": "Δημιουργία νέου...", + "action.createNew": "Δημιουργία νέας...", "action.openArtworkInBrowser": "Άνοιγμα εξώφυλλου στον περιηγητή", "settings.header.general": "Γενικά", "settings.header.general.description": "Προσαρμογή γενικών ρυθμίσεων για το Cider.", @@ -419,14 +419,14 @@ "settings.option.lyrics.enableMusixmatch": "Ενεργοποίηση στίχων Musixmatch", "settings.option.lyrics.enableMusixmatchKaraoke": "Ενεργοποίηση λειτουργίας καραόκε (Musixmatch μόνο)", "settings.option.lyrics.musixmatchPreferredLanguage": "Προτιμώμενη γλώσσα μετάφρασης Musixmatch", - "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων Youtube για μουσικά βίντεο", + "settings.option.lyrics.enableYoutubeLyrics": "Ενεργοποίηση στίχων YouTube για μουσικά βίντεο", "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": "Τίτλος", - "settings.option.connectivity.discordRPC.clearOnPause": "Εκκαθάριση του Discord Rich Presence στην Παύση", + "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": "Δομή κατάστασης", From dff0aee3703949402406f7f05ea601d57377021a Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sat, 7 May 2022 09:04:22 +0700 Subject: [PATCH 41/44] use notyf instead of just hiding cast button --- src/i18n/en_US.json | 1 + src/renderer/main/vueapp.js | 1 + src/renderer/views/app/sidebar.ejs | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 7d85fa35..14fad310 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -330,6 +330,7 @@ "settings.option.audio.audioLab.description": "An assortment of in-house developed audio effects for Cider.", "settings.option.audio.audioLab.subheader": "Designed by Cider Acoustic Technologies in California", "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionality) is required to enable Cider Audio Laboratory.", + "settings.warn.enableAdvancedFunctionality": "AudioContext (Advanced Functionality) is required to enable this feature.", "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Analog Warmth", "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simulates the analog warmth modelled after the Korg Nutube 6P1", "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Analog Warmth intensity", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 3b39a419..8218881d 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -235,6 +235,7 @@ const app = new Vue({ pages: [], }, moreinfodata: [], + notyf: notyf }, watch: { cfg: { diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs index 17fe8fc1..979db2f5 100644 --- a/src/renderer/views/app/sidebar.ejs +++ b/src/renderer/views/app/sidebar.ejs @@ -142,13 +142,13 @@ {{$root.getLz('action.showWebRemoteQR')}} - -