From 5aa8979b05161fbd5ea288101a8ea6c316e4900b Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 27 Mar 2022 20:28:50 -0500 Subject: [PATCH 01/23] Update config.yml --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 39bbb26c..bb27b3cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,9 @@ version: 2.1 orbs: # adds orbs to your configuration jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible branches: - ignore: feature/i10n + ignore: + - feature/i10n + - feature/electron18 jobs: build: working_directory: ~/Cider From 088f1b6d282b218e2b1fbf1ba44696f5152a1269 Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Sun, 27 Mar 2022 21:46:25 -0700 Subject: [PATCH 02/23] Update bug_report.yaml --- .github/ISSUE_TEMPLATE/bug_report.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index dc1856ec..c5d6402b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -33,12 +33,12 @@ body: description: | Examples: - **OS**: Ubuntu 20.04 - - **App Version**: 1.0.0 - - **Commit ID**: c9d43be + - **App Version** and/or **Commit ID**: 1.0.0 c9d43be + + To find app version, go to the About page. value: | - OS: - - App Version: - - Commit ID: + - App Version and/or Commit ID: validations: required: true - type: textarea From 9b1a22b1c36f908aadd31ec4cfc6dcbab19da945 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Tue, 29 Mar 2022 18:50:07 -0500 Subject: [PATCH 03/23] Update config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b92257e2..33bb1096 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,9 +2,9 @@ version: 2.1 orbs: # adds orbs to your configuration jira: circleci/jira@1.0.5 # invokes the Jira orb, making its commands accessible branches: - ignore: - - feature/i10n - - feature/electron18 + only: + - main + - develop jobs: build: working_directory: ~/Cider From 60ea677c419c9d9aac16ea5f312c8754f7a71cbf Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Wed, 30 Mar 2022 20:10:09 -0700 Subject: [PATCH 04/23] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 1966f643..76c768ac 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,6 @@ --> [![Get it from the AUR](https://img.shields.io/badge/Get_It_From_The_AUR-100000?style=for-the-badge&logo=archlinux)](https://aur.archlinux.org/packages/cider) -[![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider) - ### Compiling and Configuration For more information surrounding configuration, compiling and other developer documentation, see the [compilation docs](https://cider.sh/compile.html). From a79f4e9935c92c36500318617352f6e33bbaf119 Mon Sep 17 00:00:00 2001 From: David Copano Date: Sat, 2 Apr 2022 12:09:04 +0200 Subject: [PATCH 05/23] Updated es_ES translations --- src/i18n/es_ES.json | 139 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index f4017664..6eb14600 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -115,6 +115,54 @@ "term.menu": "Menú", "term.check": "Comprobar", "term.aboutArtist": "Más sobre {{artistName}}", + "term.creditDesignedBy": "Diseñado por ${authorUsername}", + "term.lyrics": "Letra", + "term.miniplayer": "Minireproductor", + "term.history": "Historial", + "term.share.success": "Copiado al portapapeles", + "term.sortBy.dateAdded": "Fecha añadida", + "term.time.days": "días", + "term.time.day": "día", + "term.audioControls": "Controles de volumen", + "term.track": { + "one": "canción", + "other": "canciones" + }, + "term.topResult": "Resultado principal", + "term.sharedPlaylists": "Playlists compartidas", + "term.people": "Personas", + "term.newpreset.name": "Nuevo nombre del preajuste del EQ", + "term.addedpreset": "Preajuste añadido", + "term.deletepreset.warn": "¿Estás seguro de que quieres eliminar este preajuste?", + "term.deletedpreset": "Preajuste eliminado", + "term.defaultPresets": "Preajustes por defecto", + "term.userPresets": "Preajustes del usuario", + "term.requestError": "Hubo un problema con la solicitud.", + "term.song.link.generate": "Obteniendo enlace para compartir con song.link...", + "term.musicVideos": "Vídeos de música", + "term.stations": "Emisoras", + "term.curators": "Discográficas", + "term.appleCurators": "Discográficas de Apple", + "term.radioShows": "Programas de radio", + "term.recordLabels": "Sellos discográficos", + "term.videoExtras": "Extras de vídeo", + "term.top": "Top", + "term.version": "Versión", + "term.noVideos": "No se han encontrado vídeos.", + "term.plugin": "Plugin", + "term.pluginMenu": "Menú de plugins", + "term.pluginMenu.none": "No hay plugins interactivos", + "term.replay": "Repetir", + "term.uniqueAlbums": "Álbumes únicos", + "term.uniqueArtists": "Artistas únicos", + "term.uniqueSongs": "Canciones únicas", + "term.topArtists": "Artistas principales", + "term.listenedTo": "Escuchado:", + "term.times": "veces", + "term.topAlbums": "Álbumes principales", + "term.plays": "reproducciones", + "term.topGenres": "Géneros principales", + "term.confirmLogout": "¿Seguro que quieres cerrar la sesión?", "home.title": "Inicio", "home.recentlyPlayed": "Reproducciones recientes", "home.recentlyAdded": "Añadido recientemente", @@ -179,6 +227,14 @@ "action.tray.quit": "Salir", "action.tray.show": "Abrir", "action.update": "Actualizar", + "action.showInAppleMusic": "Mostrar en Apple Music", + "action.install": "Instalar", + "action.copy": "Copiar", + "action.newpreset": "Nuevo preajuste", + "action.deletepreset": "Eliminar preajuste", + "action.open": "Abrir", + "action.relaunch.confirm": "¿Quieres reiniciar Cider?", + "action.showInPlaylist": "Mostrar en playlist", "settings.header.general": "General", "settings.header.general.description": "Ajustes generales de Cider.", "settings.option.general.language": "Idioma", @@ -186,6 +242,71 @@ "settings.option.general.language.fun": "Idiomas divertidos", "settings.option.general.language.unsorted": "Sin clasificar", "settings.option.general.updateCider": "Actualizar Cider", + "settings.option.general.resumebehavior": "Comportamiento al reanudarse", + "settings.option.general.resumebehavior.description": "El comportamiento de reanudación afecta a la forma en que Cider reanudará su sesión cuando vuelva a la aplicación.", + "settings.option.general.resumebehavior.locally": "Local", + "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en este dispositivo.", + "settings.option.general.resumebehavior.history": "Historial", + "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de todo tu historial de Apple Music, en todos los dispositivos.", + "settings.option.general.updateCider.branch": "Rama de actualización de Cider", + "settings.option.general.updateCider.branch.description": "Selecciona la rama a la que deseas actualizar Cider", + "settings.option.general.updateCider.branch.main": "Estable", + "settings.option.general.updateCider.branch.develop": "Desarrollo", + "settings.notyf.updateCider.update-not-available": "No hay actualización disponible", + "settings.notyf.updateCider.update-downloaded": "La actualización se ha descargado, reinicia Cider para aplicarla", + "settings.notyf.updateCider.update-error": "Error al actualizar Cider", + "settings.notyf.updateCider.update-timeout": "No se ha podido actualizar", + "settings.option.audio.volumeStep": "Paso de volumen", + "settings.option.audio.maxVolume": "Volumen máximo", + "settings.header.audio.quality.hireslossless": "Sin pérdida de alta resolución", + "settings.header.audio.quality.hireslossless.description": "hasta 24 bits/192 kHz", + "settings.header.audio.quality.lossless": "Sin pérdida", + "settings.header.audio.quality.lossless.description": "hasta 24 bits/48 kHz", + "settings.header.audio.quality.standard": "Estándar", + "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider cree que su PC no puede manejar estas características. ¿Estás seguro de que quieres continuar?", + "settings.option.audio.audioLab.description": "Un surtido de efectos de audio desarrollados internamente para Cider.", + "settings.warn.audioLab.withoutAF": "AudioContext (Funcionalidad avanzada) es necesario para habilitar el Laboratorio de Audio Cider.", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Espacialización de Cider", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Efecto de espacialización preajustado, desactiva los ajustes personalizables de la espacialización de audio. La espacialización debe estar activada como requisito previo.", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Perfil de espacialización de Cider", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Cambia el perfil de ajuste de la espacialización (requiere reiniciar la aplicación)", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Estándar", + "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiófilo", + "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "La espacialización no es compatible con CAP. Por favor, desactiva CAP para continuar.", + "settings.header.visual.theme": "Tema", + "settings.option.visual.theme.github.download": "Instalar desde enlace de Github", + "settings.option.visual.theme.github.explore": "Explorar temas de Github", + "settings.header.visual.theme.github.page": "Temas de Github", + "settings.option.visual.theme.github.install.confirm": "¿Estás seguro de que quieres instalar {{ repo }}?", + "settings.prompt.visual.theme.github.URL": "Introduce el enlace del tema que deseas instalar", + "settings.notyf.visual.theme.install.success": "Tema instalado con éxito", + "settings.notyf.visual.theme.install.error": "No se ha podido instalar el tema", + "settings.header.visual.plugin": "Plugin", + "settings.option.visual.plugin.github.download": "Instalar desde enlace de Github", + "settings.option.visual.plugin.github.explore": "Explorar plugins de Github", + "settings.header.visual.plugin.github.page": "Plugins de Github", + "settings.option.visual.plugin.github.install.confirm": "¿Estás seguro de que quieres instalar {{ repo }}?", + "settings.prompt.visual.plugin.github.URL": "Introduce el enlace del plugin que deseas instalar", + "settings.prompt.visual.plugin.github.success": "El plugin se ha instalado correctamente, pulsa OK para reiniciar Cider", + "settings.notyf.visual.plugin.install.success": "El plugin se ha instalado correctamente", + "settings.notyf.visual.plugin.install.error": "No se ha podido instalar el plugin", + "settings.option.visual.theme.dark": "Oscuro", + "settings.header.debug": "Depuración", + "settings.option.debug.copy_log": "Copiar los registros en el portapapeles", + "settings.option.debug.openAppData": "Abrir carpeta de Cider", + "settings.option.experimental.reinstallwidevine": "Reinstalar WidevineCDM", + "settings.option.experimental.reinstallwidevine.confirm": "¿Estás seguro de que quieres reinstalar Widevine?", + "settings.option.experimental.unknownPlugin": "Fuentes desconocidas", + "settings.option.experimental.unknownPlugin.description": "Permitir la instalación de plugins desde otros repositorios distintos al de Cider", + "settings.option.experimental.inline_playlists": "PLaylists y álbumes en línea", + "settings.option.advanced.playlistTrackMapping": "Asignación de canción a la playlist", + "settings.option.advanced.playlistTrackMapping.description": "Permite el escaneo profundo de las playlist para determinar qué canciones están en cada una de ellas. Los tiempos de construcción de la caché de las playlist pueden aumentar significativamente.", + "settings.option.visual.transparent": "Marco transparente", + "settings.option.visual.transparent.description": "Marco transparente (necesita soporte de tema, requiere reinicio)", + "settings.header.advanced": "Avanzado", + "share.platform.twitter.tweet": "Escucha {{song}} en Apple Music.\n\n{{url}}\n\n#AppleMusic #Cider", + "share.platform.songLink": "Copiar con song.link", + "share.platform.clipboard": "Copiar enlace", "settings.header.audio": "Audio", "settings.header.audio.description": "Ajustes del audio de Cider.", "settings.option.audio.quality": "Calidad de audio", @@ -194,6 +315,20 @@ "settings.header.audio.quality.auto": "Auto", "settings.option.audio.seamlessTransition": "Transición de audio perfecta", "settings.option.audio.enableAdvancedFunctionality": "Activar funciones avanzadas", + "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Calidez analógica", + "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simula la calidez analógica modelada según el Korg Nutube 6P1", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Intensidad de la calidez analógica", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Cambia la intensidad del procesamiento del módulo de calidez analógica.", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Suave", + "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Cálido", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", + "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Mejora la calidad de audio percibida del audio AAC de 256 kbps mediante un algoritmo en tiempo real que aprovecha tanto los modelos psicoacústicos de la audición humana como las características de la codificación AAC.", + "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP no es compatible con la espacialización. Por favor, desactive la espacialización para continuar.", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "Fuerza de CAP", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Cambia la intensidad del procesamiento realizado al audio (Agresivo puede producir resultados no deseados)", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Estándar", + "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Agresivo", + "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Gestionado por Audio Lab", "settings.option.audio.enableAdvancedFunctionality.description": "Habilitar la funcionalidad de AudioContext permitirá funciones de audio extendidas como Normalización de audio, Ecualizadores y Visualizadores; sin embargo, en algunos sistemas esto puede causar interrupciones en las canciones.", "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Normalizar volumen", "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normaliza los picos altos de canciones para hacer la experiencia de escucha mejor.", @@ -243,6 +378,10 @@ "settings.header.experimental.description": "Ajustes en pruebas para Cider.", "settings.option.experimental.compactUI": "Interfaz de usuario compacto", "settings.option.window.close_button_hide": "El botón de cerrar minimizará la aplicación en la bandeja", + "settings.header.window": "Ventana", + "settings.header.window.description": "Ajustes de la ventana de Cider", + "settings.option.window.openOnStartup": "Abrir Cider al iniciar", + "settings.option.window.openOnStartup.hidden": "Abrir oculto", "spatial.notTurnedOn": "La espacialización del audio esta desactivada. Para usarlo primero actívelo.", "spatial.spatialProperties": "Propiedades espaciales", "spatial.width": "Ancho", From ca4e50a4a8886a2296a00ff28cd91045cd50236f Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 2 Apr 2022 23:51:26 +0100 Subject: [PATCH 06/23] Delete feature_request.yaml --- .github/ISSUE_TEMPLATE/feature_request.yaml | 34 --------------------- 1 file changed, 34 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml deleted file mode 100644 index b64f200e..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Feature Request -description: Suggest an idea to improve Cider. -title: "[Feature Request]: " -labels: ["enhancement", "triage"] -assignees: [] -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this report! - - type: textarea - id: description - attributes: - label: The feature you would like - description: A clear and concise description of what you would like to be added to the application. State if your request if related to an issue. - placeholder: A great addition to this project would be... - validations: - required: true - - type: textarea - id: other - attributes: - label: Alternatives and Other Information - description: If you have any alternative solutions to implement your request or other information that could help. - placeholder: Anything that can help us? - validations: - required: false - - type: checkboxes - id: terms - attributes: - label: Code of Conduct - description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/ciderapp/Cider/blob/main/CODE_OF_CONDUCT.md) - options: - - label: I agree to follow this project's Code of Conduct - required: true From f742dd5f805b883194c47e1b43bd1f291825337e Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 2 Apr 2022 23:55:36 +0100 Subject: [PATCH 07/23] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 7c91e996..ed95f376 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,8 @@ blank_issues_enabled: false contact_links: + - name: Feature Request + url: https://github.com/ciderapp/Cider/discussions/new?category=feature-request + about: Have a feature you would like to have in the app? Make a request. - name: Discord Support url: https://discord.com/invite/AppleMusic about: For quick support, make a ticket or ask for community support here. @@ -8,4 +11,4 @@ contact_links: about: In most cases, these troubleshooting tips can resolve basic issues. Try them out before opening an issue. - name: GitHub Issues url: https://github.com/ciderapp/Cider/issues - about: Check to make sure there is not an issues already open that is related to your issue. \ No newline at end of file + about: Check to make sure there is not an issues already open that is related to your issue. From 15d3c19fa968b6acf77f87b7ea2c7406d23daa9a Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sat, 2 Apr 2022 23:58:40 +0100 Subject: [PATCH 08/23] Changed links --- README.md | 2 +- src/main/plugins/menubar.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 76c768ac..fba9ca3e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ #### Links * [Wiki](https://github.com/ciderapp/Cider/wiki) -* [Request Feature](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=%5BEnhancement%5D) +* [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request) * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+) * [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index 857d9461..e8b5f185 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -193,7 +193,7 @@ export default class Thumbar { }, { label: 'Feature Request', - click: () => shell.openExternal("https://github.com/ciderapp/Cider/issues/new?assignees=&labels=enhancement%2Ctriage&template=feature_request.yaml&title=%5BEnhancement%5D%3A+").catch(console.error) + click: () => shell.openExternal("https://github.com/ciderapp/Cider/discussions/new?category=feature-request").catch(console.error) }, { label: 'Translation Report/Request', From 1dcd5ec43184d4ea69e8cea149f47821ec59a295 Mon Sep 17 00:00:00 2001 From: Quacksire <19170969+quacksire@users.noreply.github.com> Date: Wed, 6 Apr 2022 18:31:46 -0700 Subject: [PATCH 09/23] test --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 92509691..f274bacc 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,4 @@ github: ciderapp ko_fi: cryptofyre open_collective: ciderapp +custom: "https://opencollective.com/ciderapp/donate/10/month/Support%20Development?redirect=https://cidercollective.dev/thanks" From c6fdd7116b7540f328a22d4f4612ef8289aded17 Mon Sep 17 00:00:00 2001 From: yazninja <71800112+yazninja@users.noreply.github.com> Date: Fri, 8 Apr 2022 12:18:25 +0800 Subject: [PATCH 10/23] Update winget links --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fba9ca3e..faf8a34d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,11 @@ [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) -[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly) +[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Stable)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider) + + [![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider) From 537300490f8d38daf24524136545f3e8c4d8a8c3 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Tue, 12 Apr 2022 23:19:48 -0500 Subject: [PATCH 11/23] add funny about --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index faf8a34d..6fac54ff 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@

- Banner

+ Banner
+ A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind. 🚀 +

GitHub Stars GitHub Forks From 28810c600f7a6baaae38fd1583774153932563a0 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Tue, 12 Apr 2022 23:23:30 -0500 Subject: [PATCH 12/23] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6fac54ff..6eb92c5d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@

#### Links -* [Wiki](https://github.com/ciderapp/Cider/wiki) +* [Wiki](https://docs.cider.sh) * [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request) * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+) * [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest) From aa4033650e48288558843180971323d626458c47 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:04:36 +0200 Subject: [PATCH 13/23] Use i18n string for Open Themes Folder --- src/i18n/en_US.json | 1 + src/i18n/source/en_US.json | 1 + src/renderer/views/pages/themes-github.ejs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 3b92951b..a87e07ed 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -361,6 +361,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", + "settings.button.visual.theme.github.openfolder": "Open Themes Folder", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", "settings.header.visual.theme.github.page": "Themes from GitHub", "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 2d5f4bf5..3dab4fd2 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -361,6 +361,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", + "settings.button.visual.theme.github.openfolder": "Open Themes Folder", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", "settings.header.visual.theme.github.page": "Themes from GitHub", "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?", diff --git a/src/renderer/views/pages/themes-github.ejs b/src/renderer/views/pages/themes-github.ejs index a8afaaf1..0f4e6a12 100644 --- a/src/renderer/views/pages/themes-github.ejs +++ b/src/renderer/views/pages/themes-github.ejs @@ -15,7 +15,7 @@
From f4b589665e419d230ef26fbca36d97ad592eb0f5 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:16:24 +0200 Subject: [PATCH 14/23] Translate the string to Hungarian --- src/i18n/hu_HU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index 4d40862b..0727352b 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -352,6 +352,7 @@ "settings.option.visual.uiscale": "Nagyítás mértéke", "settings.header.visual.theme": "Téma", "settings.option.visual.theme.github.download": "Telepítés GitHub URL-ről", + "settings.button.visual.theme.github.openfolder": "Témamappa megnyitása", "settings.option.visual.theme.github.explore": "Témák felfedezése", "settings.header.visual.theme.github.page": "Témák a GitHub-ról", "settings.option.visual.theme.github.install.confirm": "Biztosan szeretnéd telepíteni a(z) {{ repo }} témát?", From a53d19067bca0f6341e60e9b7299a8e2d74e8a0e Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Fri, 22 Apr 2022 14:19:14 +0200 Subject: [PATCH 15/23] Add to i18n README and fix name --- src/i18n/README.md | 4 ++++ src/i18n/en_US.json | 2 +- src/i18n/source/en_US.json | 2 +- src/renderer/views/pages/themes-github.ejs | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/i18n/README.md b/src/i18n/README.md index c4220aa0..f72b36c0 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -258,3 +258,7 @@ Update 16/04/2022 9:30 UTC * `settings.header.connect`: Added for `en_US` +Update 22/04/2022 14:30 UTC + +* `settings.option.visual.theme.github.openfolder`: Added for `en_US` + diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index a87e07ed..5e2349ee 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -361,7 +361,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", - "settings.button.visual.theme.github.openfolder": "Open Themes Folder", + "settings.option.visual.theme.github.openfolder": "Open Themes Folder", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", "settings.header.visual.theme.github.page": "Themes from GitHub", "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index 3dab4fd2..43df9892 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -361,7 +361,7 @@ "settings.option.visual.uiscale": "UI Scale", "settings.header.visual.theme": "Theme", "settings.option.visual.theme.github.download": "Install from GitHub URL", - "settings.button.visual.theme.github.openfolder": "Open Themes Folder", + "settings.option.visual.theme.github.openfolder": "Open Themes Folder", "settings.option.visual.theme.github.explore": "Explore GitHub Themes", "settings.header.visual.theme.github.page": "Themes from GitHub", "settings.option.visual.theme.github.install.confirm": "Are you sure you want to install {{ repo }}?", diff --git a/src/renderer/views/pages/themes-github.ejs b/src/renderer/views/pages/themes-github.ejs index 0f4e6a12..1c67defa 100644 --- a/src/renderer/views/pages/themes-github.ejs +++ b/src/renderer/views/pages/themes-github.ejs @@ -15,7 +15,7 @@
From 21fe786d4e088f3b369cae67baf26b3b09702817 Mon Sep 17 00:00:00 2001 From: Amaru8 <52407090+Amaru8@users.noreply.github.com> Date: Sat, 23 Apr 2022 17:35:05 +0200 Subject: [PATCH 16/23] Fix Web Remote hotkey --- src/main/plugins/menubar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts index b2e7caba..04236d5a 100644 --- a/src/main/plugins/menubar.ts +++ b/src/main/plugins/menubar.ts @@ -112,7 +112,7 @@ export default class Thumbar { label: 'Web Remote', accelerator: 'CommandOrControl+Shift+W', sublabel: 'Opens in external window', - click: () => this._win.webContents.executeJavaScript(`ipcRenderer.invoke('showQR')`) + click: () => this._win.webContents.executeJavaScript(`app.appRoute('remote-pair')`) }, { label: 'Audio Settings', From 6d2652a53874fdcd07ea647363378d87d9452ebb Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 24 Apr 2022 02:41:17 -0500 Subject: [PATCH 17/23] a --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 158ca19e..17551329 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@

- Banner

+ Banner
+ A new cross-platform Apple Music experience based on Electron and Vue.js written from scratch with performance in mind. 🚀 +

GitHub Stars GitHub Forks @@ -26,8 +28,6 @@ [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) -[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Stable)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider) - [![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly) [![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider) @@ -40,7 +40,6 @@ --> [![Get it from the AUR](https://img.shields.io/badge/Get_It_From_The_AUR-100000?style=for-the-badge&logo=archlinux)](https://aur.archlinux.org/packages/cider) - ### Compiling and Configuration For more information surrounding configuration, compiling and other developer documentation, see the [compilation docs](https://cider.sh/compile.html). From 5acebfce378d7a2c3e2b29f5def97659e336a5c3 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 24 Apr 2022 02:48:15 -0500 Subject: [PATCH 18/23] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 5917cc45..4e3ea464 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,7 @@

#### Links -<<<<<<< HEAD -* [Wiki](https://github.com/ciderapp/Cider/wiki) -======= * [Wiki](https://docs.cider.sh) ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 * [Request Feature](https://github.com/ciderapp/Cider/discussions/new?category=feature-request) * [Report Bug](https://github.com/ciderapp/Cider/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+) * [**View The Releases**](https://github.com/ciderapp/Cider/releases/latest) From 2bf75ec2f2832e24f466b44e0488ad75159f88cb Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 24 Apr 2022 02:48:33 -0500 Subject: [PATCH 19/23] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 4e3ea464..7b8fface 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,11 @@ [![Get it from the Microsoft Store](https://img.shields.io/badge/Get_It_From_The_Microsoft_Store-100000?style=for-the-badge&logo=microsoft)](https://www.microsoft.com/store/apps/9P21XJ9D9G66) -<<<<<<< HEAD [![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Nightly)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider.Nightly) -======= -[![Get it from Windows Package Manager](https://custom-icon-badges.herokuapp.com/badge/Get_It_via_Winget_(Stable)_-100000?style=for-the-badge&logo=winstall)](https://winstall.app/apps/CiderCollective.Cider) ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 [![Get it from Flathub](https://img.shields.io/badge/Get_It_From_Flathub-100000?style=for-the-badge&logo=flathub)](https://flathub.org/apps/details/sh.cider.Cider) From 39802835d56ad40ffaf8f14a06f15db0052ab407 Mon Sep 17 00:00:00 2001 From: cryptofyre Date: Sun, 24 Apr 2022 02:53:21 -0500 Subject: [PATCH 20/23] i fucking hate git. --- src/i18n/es_ES.json | 175 -------------------------------------------- 1 file changed, 175 deletions(-) diff --git a/src/i18n/es_ES.json b/src/i18n/es_ES.json index d6d6336e..1a6cadb7 100644 --- a/src/i18n/es_ES.json +++ b/src/i18n/es_ES.json @@ -140,7 +140,6 @@ "term.videos": "Videos", "term.menu": "Menú", "term.check": "Comprobar", -<<<<<<< HEAD "term.aboutArtist": "Acerca de {{artistName}}", "term.topResult": "Mejor resultado", "term.sharedPlaylists": "Listas de Reproducción Compartidas", @@ -184,62 +183,6 @@ "home.recentlyAdded": "Agregado Recientemente", "home.artistsFeed": "Tu feed de artistas", "home.artistsFeed.noArtist": "Sigue a algunos artistas para ver sus últimos lanzamientos", -======= - "term.aboutArtist": "Más sobre {{artistName}}", - "term.creditDesignedBy": "Diseñado por ${authorUsername}", - "term.lyrics": "Letra", - "term.miniplayer": "Minireproductor", - "term.history": "Historial", - "term.share.success": "Copiado al portapapeles", - "term.sortBy.dateAdded": "Fecha añadida", - "term.time.days": "días", - "term.time.day": "día", - "term.audioControls": "Controles de volumen", - "term.track": { - "one": "canción", - "other": "canciones" - }, - "term.topResult": "Resultado principal", - "term.sharedPlaylists": "Playlists compartidas", - "term.people": "Personas", - "term.newpreset.name": "Nuevo nombre del preajuste del EQ", - "term.addedpreset": "Preajuste añadido", - "term.deletepreset.warn": "¿Estás seguro de que quieres eliminar este preajuste?", - "term.deletedpreset": "Preajuste eliminado", - "term.defaultPresets": "Preajustes por defecto", - "term.userPresets": "Preajustes del usuario", - "term.requestError": "Hubo un problema con la solicitud.", - "term.song.link.generate": "Obteniendo enlace para compartir con song.link...", - "term.musicVideos": "Vídeos de música", - "term.stations": "Emisoras", - "term.curators": "Discográficas", - "term.appleCurators": "Discográficas de Apple", - "term.radioShows": "Programas de radio", - "term.recordLabels": "Sellos discográficos", - "term.videoExtras": "Extras de vídeo", - "term.top": "Top", - "term.version": "Versión", - "term.noVideos": "No se han encontrado vídeos.", - "term.plugin": "Plugin", - "term.pluginMenu": "Menú de plugins", - "term.pluginMenu.none": "No hay plugins interactivos", - "term.replay": "Repetir", - "term.uniqueAlbums": "Álbumes únicos", - "term.uniqueArtists": "Artistas únicos", - "term.uniqueSongs": "Canciones únicas", - "term.topArtists": "Artistas principales", - "term.listenedTo": "Escuchado:", - "term.times": "veces", - "term.topAlbums": "Álbumes principales", - "term.plays": "reproducciones", - "term.topGenres": "Géneros principales", - "term.confirmLogout": "¿Seguro que quieres cerrar la sesión?", - "home.title": "Inicio", - "home.recentlyPlayed": "Reproducciones recientes", - "home.recentlyAdded": "Añadido recientemente", - "home.artistsFeed": "Historial de tus artistas", - "home.artistsFeed.noArtist": "Sigue primero a algunos artistas y sus últimos lanzamientos aparecerán aquí", ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 "home.madeForYou": "Hecho para ti", "home.friendsListeningTo": "Amigos escuchando", "home.followedArtists": "Artistas seguidos", @@ -301,7 +244,6 @@ "action.tray.quit": "Salir", "action.tray.show": "Mostrar Cider", "action.update": "Actualizar", -<<<<<<< HEAD "action.install": "Instalar", "action.copy": "Copiar", "action.newpreset": "Nuevo preset...", @@ -316,16 +258,6 @@ "action.cast.scan": "Escanear", "action.cast.scanning": "Escaneando...", "action.createNew": "Crear Nuevo...", -======= - "action.showInAppleMusic": "Mostrar en Apple Music", - "action.install": "Instalar", - "action.copy": "Copiar", - "action.newpreset": "Nuevo preajuste", - "action.deletepreset": "Eliminar preajuste", - "action.open": "Abrir", - "action.relaunch.confirm": "¿Quieres reiniciar Cider?", - "action.showInPlaylist": "Mostrar en playlist", ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 "settings.header.general": "General", "settings.header.general.description": "Ajuste la configuración general de Cider.", "settings.option.general.language": "Idioma", @@ -339,7 +271,6 @@ "settings.option.general.language.fun": "Idiomas Fun (Parodias)", "settings.option.general.language.unsorted": "Sin Clasificar", "settings.option.general.updateCider": "Actualizar Cider", -<<<<<<< HEAD "settings.option.general.updateCider.branch": "Rama de Actualización de Cider", "settings.option.general.updateCider.branch.description": "Seleccione la Rama para actualizar Cider", "settings.option.general.updateCider.branch.main": "Estable", @@ -350,73 +281,6 @@ "settings.notyf.updateCider.update-downloaded": "La actualización se ha descargado, reinicie para aplicarla", "settings.notyf.updateCider.update-error": "Error al actualizar Cider", "settings.notyf.updateCider.update-timeout": "Tiempo de espera agotado para actualizar Cider", -======= - "settings.option.general.resumebehavior": "Comportamiento al reanudarse", - "settings.option.general.resumebehavior.description": "El comportamiento de reanudación afecta a la forma en que Cider reanudará su sesión cuando vuelva a la aplicación.", - "settings.option.general.resumebehavior.locally": "Local", - "settings.option.general.resumebehavior.locally.description": "Cider reanudará su última sesión en este dispositivo.", - "settings.option.general.resumebehavior.history": "Historial", - "settings.option.general.resumebehavior.history.description": "Cider pondrá en cola la última canción de todo tu historial de Apple Music, en todos los dispositivos.", - "settings.option.general.updateCider.branch": "Rama de actualización de Cider", - "settings.option.general.updateCider.branch.description": "Selecciona la rama a la que deseas actualizar Cider", - "settings.option.general.updateCider.branch.main": "Estable", - "settings.option.general.updateCider.branch.develop": "Desarrollo", - "settings.notyf.updateCider.update-not-available": "No hay actualización disponible", - "settings.notyf.updateCider.update-downloaded": "La actualización se ha descargado, reinicia Cider para aplicarla", - "settings.notyf.updateCider.update-error": "Error al actualizar Cider", - "settings.notyf.updateCider.update-timeout": "No se ha podido actualizar", - "settings.option.audio.volumeStep": "Paso de volumen", - "settings.option.audio.maxVolume": "Volumen máximo", - "settings.header.audio.quality.hireslossless": "Sin pérdida de alta resolución", - "settings.header.audio.quality.hireslossless.description": "hasta 24 bits/192 kHz", - "settings.header.audio.quality.lossless": "Sin pérdida", - "settings.header.audio.quality.lossless.description": "hasta 24 bits/48 kHz", - "settings.header.audio.quality.standard": "Estándar", - "settings.warn.audio.enableAdvancedFunctionality.lowcores": "Cider cree que su PC no puede manejar estas características. ¿Estás seguro de que quieres continuar?", - "settings.option.audio.audioLab.description": "Un surtido de efectos de audio desarrollados internamente para Cider.", - "settings.warn.audioLab.withoutAF": "AudioContext (Funcionalidad avanzada) es necesario para habilitar el Laboratorio de Audio Cider.", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization": "Espacialización de Cider", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description": "Efecto de espacialización preajustado, desactiva los ajustes personalizables de la espacialización de audio. La espacialización debe estar activada como requisito previo.", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile": "Perfil de espacialización de Cider", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.description": "Cambia el perfil de ajuste de la espacialización (requiere reiniciar la aplicación)", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Estándar", - "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiófilo", - "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "La espacialización no es compatible con CAP. Por favor, desactiva CAP para continuar.", - "settings.header.visual.theme": "Tema", - "settings.option.visual.theme.github.download": "Instalar desde enlace de Github", - "settings.option.visual.theme.github.explore": "Explorar temas de Github", - "settings.header.visual.theme.github.page": "Temas de Github", - "settings.option.visual.theme.github.install.confirm": "¿Estás seguro de que quieres instalar {{ repo }}?", - "settings.prompt.visual.theme.github.URL": "Introduce el enlace del tema que deseas instalar", - "settings.notyf.visual.theme.install.success": "Tema instalado con éxito", - "settings.notyf.visual.theme.install.error": "No se ha podido instalar el tema", - "settings.header.visual.plugin": "Plugin", - "settings.option.visual.plugin.github.download": "Instalar desde enlace de Github", - "settings.option.visual.plugin.github.explore": "Explorar plugins de Github", - "settings.header.visual.plugin.github.page": "Plugins de Github", - "settings.option.visual.plugin.github.install.confirm": "¿Estás seguro de que quieres instalar {{ repo }}?", - "settings.prompt.visual.plugin.github.URL": "Introduce el enlace del plugin que deseas instalar", - "settings.prompt.visual.plugin.github.success": "El plugin se ha instalado correctamente, pulsa OK para reiniciar Cider", - "settings.notyf.visual.plugin.install.success": "El plugin se ha instalado correctamente", - "settings.notyf.visual.plugin.install.error": "No se ha podido instalar el plugin", - "settings.option.visual.theme.dark": "Oscuro", - "settings.header.debug": "Depuración", - "settings.option.debug.copy_log": "Copiar los registros en el portapapeles", - "settings.option.debug.openAppData": "Abrir carpeta de Cider", - "settings.option.experimental.reinstallwidevine": "Reinstalar WidevineCDM", - "settings.option.experimental.reinstallwidevine.confirm": "¿Estás seguro de que quieres reinstalar Widevine?", - "settings.option.experimental.unknownPlugin": "Fuentes desconocidas", - "settings.option.experimental.unknownPlugin.description": "Permitir la instalación de plugins desde otros repositorios distintos al de Cider", - "settings.option.experimental.inline_playlists": "PLaylists y álbumes en línea", - "settings.option.advanced.playlistTrackMapping": "Asignación de canción a la playlist", - "settings.option.advanced.playlistTrackMapping.description": "Permite el escaneo profundo de las playlist para determinar qué canciones están en cada una de ellas. Los tiempos de construcción de la caché de las playlist pueden aumentar significativamente.", - "settings.option.visual.transparent": "Marco transparente", - "settings.option.visual.transparent.description": "Marco transparente (necesita soporte de tema, requiere reinicio)", - "settings.header.advanced": "Avanzado", - "share.platform.twitter.tweet": "Escucha {{song}} en Apple Music.\n\n{{url}}\n\n#AppleMusic #Cider", - "share.platform.songLink": "Copiar con song.link", - "share.platform.clipboard": "Copiar enlace", ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 "settings.header.audio": "Audio", "settings.header.audio.description": "Ajuste la configuración de audio para Cider.", "settings.option.audio.volumeStep": "Paso de Volumen", @@ -427,7 +291,6 @@ "settings.header.audio.quality.lossless": "Sin Pérdidas (Lossless)", "settings.header.audio.quality.lossless.description": "arriba de 24-bit/48 kHz", "settings.header.audio.quality.high": "Alto", -<<<<<<< HEAD "settings.header.audio.quality.high.description": "256 kbps", "settings.header.audio.quality.standard": "Estándar", "settings.header.audio.quality.standard.description": "64 kbps", @@ -463,31 +326,6 @@ "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.standard": "Estándar", "settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.profile.audiophile": "Audiófilo", "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "La espacialización no es compatible con CAP. Deshabilite CAP para continuar.", -======= - "settings.header.audio.quality.low": "Bajo", - "settings.header.audio.quality.auto": "Auto", - "settings.option.audio.seamlessTransition": "Transición de audio perfecta", - "settings.option.audio.enableAdvancedFunctionality": "Activar funciones avanzadas", - "settings.option.audio.enableAdvancedFunctionality.analogWarmth": "Calidez analógica", - "settings.option.audio.enableAdvancedFunctionality.analogWarmth.description": "Simula la calidez analógica modelada según el Korg Nutube 6P1", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity": "Intensidad de la calidez analógica", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.description": "Cambia la intensidad del procesamiento del módulo de calidez analógica.", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.smooth": "Suave", - "settings.option.audio.enableAdvancedFunctionality.analogWarmthIntensity.warm": "Cálido", - "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", - "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Mejora la calidad de audio percibida del audio AAC de 256 kbps mediante un algoritmo en tiempo real que aprovecha tanto los modelos psicoacústicos de la audición humana como las características de la codificación AAC.", - "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP no es compatible con la espacialización. Por favor, desactive la espacialización para continuar.", - "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "Fuerza de CAP", - "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Cambia la intensidad del procesamiento realizado al audio (Agresivo puede producir resultados no deseados)", - "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Estándar", - "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Agresivo", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.disabled": "Gestionado por Audio Lab", - "settings.option.audio.enableAdvancedFunctionality.description": "Habilitar la funcionalidad de AudioContext permitirá funciones de audio extendidas como Normalización de audio, Ecualizadores y Visualizadores; sin embargo, en algunos sistemas esto puede causar interrupciones en las canciones.", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Normalizar volumen", - "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normaliza los picos altos de canciones para hacer la experiencia de escucha mejor.", - "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Espacialización del audio", - "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Espacializa más el audio y conviértelo más 3-dimensional (nota: Esto no es Dolby Atmos)", ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 "settings.header.visual": "Visual", "settings.header.visual.description": "Ajuste la configuración visual de Cider.", "settings.option.visual.windowStyle": "Estilo de ventana", @@ -557,7 +395,6 @@ "settings.option.connectivity.lastfmScrobble.nowPlaying": "Activar Last.fm Now Playing", "settings.option.connectivity.lastfmScrobble.removeFeatured": "Eliminar artistas destacados del título de la canción (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop": "Filtrar pista en bucle (Last.fm)", -<<<<<<< HEAD "settings.header.debug": "Debug", "settings.option.debug.copy_log": "Copiar Logs al portapapeles", "settings.option.debug.openAppData": "Abrir carpeta de Cider", @@ -577,18 +414,6 @@ "settings.header.advanced": "Avanzado", "spatial.notTurnedOn": "La espacialización de audio está deshabilitada. Para usar, habilítelo primero.", "spatial.spatialProperties": "Propiedades de Espacialización", -======= - "settings.header.experimental": "En pruebas", - "settings.header.experimental.description": "Ajustes en pruebas para Cider.", - "settings.option.experimental.compactUI": "Interfaz de usuario compacto", - "settings.option.window.close_button_hide": "El botón de cerrar minimizará la aplicación en la bandeja", - "settings.header.window": "Ventana", - "settings.header.window.description": "Ajustes de la ventana de Cider", - "settings.option.window.openOnStartup": "Abrir Cider al iniciar", - "settings.option.window.openOnStartup.hidden": "Abrir oculto", - "spatial.notTurnedOn": "La espacialización del audio esta desactivada. Para usarlo primero actívelo.", - "spatial.spatialProperties": "Propiedades espaciales", ->>>>>>> 28810c600f7a6baaae38fd1583774153932563a0 "spatial.width": "Ancho", "spatial.height": "Alto", "spatial.depth": "Profundidad", From c925e15b076ade8d1e4777d14c3d1088e9c4490c Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 24 Apr 2022 09:16:34 +0700 Subject: [PATCH 21/23] txt --- src/main/plugins/raop.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/plugins/raop.ts b/src/main/plugins/raop.ts index 8c58c488..c466b915 100644 --- a/src/main/plugins/raop.ts +++ b/src/main/plugins/raop.ts @@ -88,13 +88,14 @@ export default class RAOP { `; - private ondeviceup(name: any, host: any, port: any, addresses: any) { + private ondeviceup(name: any, host: any, port: any, addresses: any, text: any) { if (this.castDevices.findIndex((item: any) => item.name === host && item.port === port && item.addresses === addresses) === -1) { this.castDevices.push({ name: host, host: addresses ? addresses[0] : '', port: port, - addresses: addresses + addresses: addresses, + txt: text }); if (this.devices.indexOf(host) === -1) { this.devices.push(host); @@ -146,10 +147,11 @@ export default class RAOP { browser.on('update', (service: any) => { if (service.addresses && service.fullname && service.fullname.includes('_raop._tcp')) { + console.log(service.txt) this._win.webContents.executeJavaScript(`console.log( "${service.name} ${service.host}:${service.port} ${service.addresses}" - )`);} - this.ondeviceup(service.name, service.host, service.port, service.addresses); + )`); + this.ondeviceup(service.name, service.host, service.port, service.addresses, service.txt);} }); }); From 589e0385714bd680fc9d29530dccf0caf75d9f8c Mon Sep 17 00:00:00 2001 From: vapormusic Date: Sun, 24 Apr 2022 18:50:50 +0700 Subject: [PATCH 22/23] lol --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 29b2da45..6e4a017c 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "@types/express": "^4.17.13", "@types/qrcode-terminal": "^0.12.0", "@types/ws": "^8.5.3", - "electron": "git+https://github.com/castlabs/electron-releases.git", + "electron": "git+https://github.com/castlabs/electron-releases.git#18-x-y", "electron-builder": "^23.0.3", "electron-builder-notarize-pkg": "^1.2.0", "electron-webpack": "^2.8.2", From 53472867e5f0e7772a409cff7a96da29f9916014 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sun, 24 Apr 2022 21:16:15 +0800 Subject: [PATCH 23/23] remove playlist-display styling --- src/renderer/views/pages/cider-playlist.ejs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/renderer/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs index dbf67565..6186d7f1 100644 --- a/src/renderer/views/pages/cider-playlist.ejs +++ b/src/renderer/views/pages/cider-playlist.ejs @@ -9,11 +9,7 @@