diff options
author | 2020-01-28 13:14:16 +0100 | |
---|---|---|
committer | 2020-01-28 13:14:16 +0100 | |
commit | 24ee1be12841d58fed05c4c0e2d7e7dadf76986e (patch) | |
tree | 2475c9da50c043a16807b033252ca3f324354aa1 | |
parent | Merge branch 'develop' (diff) | |
parent | Bump version number (diff) | |
download | ferdium-app-24ee1be12841d58fed05c4c0e2d7e7dadf76986e.tar.gz ferdium-app-24ee1be12841d58fed05c4c0e2d7e7dadf76986e.tar.zst ferdium-app-24ee1be12841d58fed05c4c0e2d7e7dadf76986e.zip |
Merge branch 'develop'v5.4.1-beta.6
-rw-r--r-- | .all-contributorsrc | 18 | ||||
-rw-r--r-- | README.md | 54 | ||||
-rw-r--r-- | branding/opencollective-header.jpg | bin | 0 -> 2229496 bytes | |||
-rw-r--r-- | branding/social-previeww-base.psd (renamed from branding/social-preview.psd) | bin | 2619596 -> 2619596 bytes | |||
-rw-r--r-- | branding/twitter-header.jpg | bin | 0 -> 213675 bytes | |||
-rw-r--r-- | build-helpers/notarize.js | 9 | ||||
-rw-r--r-- | package.json | 2 | ||||
m--------- | recipes | 0 | ||||
-rw-r--r-- | src/assets/images/tray/win32/tray-unread.ico | bin | 7387 -> 41805 bytes | |||
-rw-r--r-- | src/assets/images/tray/win32/tray.ico | bin | 4694 -> 38281 bytes | |||
-rw-r--r-- | src/i18n/locales/es.json | 110 | ||||
m--------- | src/internal-server | 0 |
12 files changed, 110 insertions, 83 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc index 20179d7dc..b62d0e442 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc | |||
@@ -260,6 +260,24 @@ | |||
260 | "contributions": [ | 260 | "contributions": [ |
261 | "doc" | 261 | "doc" |
262 | ] | 262 | ] |
263 | }, | ||
264 | { | ||
265 | "login": "Sauceee", | ||
266 | "name": "Sauceee", | ||
267 | "avatar_url": "https://avatars2.githubusercontent.com/u/17987941?v=4", | ||
268 | "profile": "https://github.com/Sauceee", | ||
269 | "contributions": [ | ||
270 | "design" | ||
271 | ] | ||
272 | }, | ||
273 | { | ||
274 | "login": "lhw", | ||
275 | "name": "Lennart Weller", | ||
276 | "avatar_url": "https://avatars2.githubusercontent.com/u/351875?v=4", | ||
277 | "profile": "http://lhw.ring0.de", | ||
278 | "contributions": [ | ||
279 | "platform" | ||
280 | ] | ||
263 | } | 281 | } |
264 | ], | 282 | ], |
265 | "contributorsPerLine": 6, | 283 | "contributorsPerLine": 6, |
@@ -17,29 +17,31 @@ | |||
17 | 17 | ||
18 | <details> | 18 | <details> |
19 | <summary>Toggle navigation</summary> | 19 | <summary>Toggle navigation</summary> |
20 | <ul> | 20 | |
21 | <li><a href="#what-is-ferdi">What is Ferdi?</a></li> | 21 | - [Ferdi](#ferdi) |
22 | <li><a href="#what-does-ferdi-look-like">What does Ferdi look like?</a></li> | 22 | - [Table of contents](#table-of-contents) |
23 | <li><a href="#download-ferdi">Download Ferdi</a> | 23 | - [What is Ferdi?](#what-is-ferdi) |
24 | <ul> | 24 | - [What does Ferdi look like?](#what-does-ferdi-look-like) |
25 | <li><a href="#or-use-homebrew-macos-only">Or use homebrew</a></li> | 25 | - [Download Ferdi](#download-ferdi) |
26 | </ul> | 26 | - [Or use homebrew (macOS only)](#or-use-homebrew-macos-only) |
27 | </li> | 27 | - [Or use AUR (Arch Linux)](#or-use-aur-arch-linux) |
28 | <li><a href="#ferdi-specific-features">Ferdi-specific features</a></li> | 28 | - [Ferdi-specific Features](#ferdi-specific-features) |
29 | <li><a href="#development">Development</a></li> | 29 | - [Development](#development) |
30 | <ul> | 30 | - [Install OS dependencies](#install-os-dependencies) |
31 | <li><a href="#install-os-dependencies">Install OS dependencies</a></li> | 31 | - [Node.js](#nodejs) |
32 | <li><a href="#clone-repository-with-submodule">Clone repository with submodule</a></li> | 32 | - [Git](#git) |
33 | <li><a href="#install-dependencies">Install dependencies</a></li> | 33 | - [Debian/Ubuntu](#debianubuntu) |
34 | <li><a href="#fix-native-modules-to-match-current-electron-node-version">Fix native modules to match current electron node version</a></li> | 34 | - [Fedora](#fedora) |
35 | <li><a href="#start-development-app">Start development app</a></li> | 35 | - [Windows](#windows) |
36 | <li><a href="#packaging">Packaging</a></li> | 36 | - [Clone repository with submodule](#clone-repository-with-submodule) |
37 | <li><a href="#release">Release</a></li> | 37 | - [Install dependencies](#install-dependencies) |
38 | </ul> | 38 | - [Fix native modules to match current electron node version](#fix-native-modules-to-match-current-electron-node-version) |
39 | <li><a href="#contributors-">Contributors ✨</a></li> | 39 | - [Start development app](#start-development-app) |
40 | <li><a href="#backers-via-opencollective">Backers via OpenCollective</a></li> | 40 | - [Packaging](#packaging) |
41 | <li><a href="#sponsors-via-opencollective">Sponsors via OpenCollective</a></li> | 41 | - [Release](#release) |
42 | </ul> | 42 | - [Contributors ✨](#contributors-%e2%9c%a8) |
43 | - [Backers via OpenCollective](#backers-via-opencollective) | ||
44 | - [Sponsors via OpenCollective](#sponsors-via-opencollective) | ||
43 | </details> | 45 | </details> |
44 | 46 | ||
45 | ### What is Ferdi? | 47 | ### What is Ferdi? |
@@ -196,6 +198,8 @@ Deliverables will be available in the `out` folder. | |||
196 | ```bash | 198 | ```bash |
197 | $ git checkout develop && git pull | 199 | $ git checkout develop && git pull |
198 | $ git submodule update --remote --force | 200 | $ git submodule update --remote --force |
201 | $ git add . | ||
202 | $ git commit -m "Update submodules" | ||
199 | $ git checkout master | 203 | $ git checkout master |
200 | $ git merge --no-ff develop | 204 | $ git merge --no-ff develop |
201 | $ git tag v5.3.4-beta.4 | 205 | $ git tag v5.3.4-beta.4 |
@@ -242,6 +246,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d | |||
242 | <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt=""/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td> | 246 | <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt=""/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">💻</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">🤔</a></td> |
243 | <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt=""/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td> | 247 | <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt=""/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">📖</a></td> |
244 | <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt=""/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td> | 248 | <td align="center"><a href="https://fwdekker.com/"><img src="https://avatars0.githubusercontent.com/u/13442533?v=4" width="40px;" alt=""/><br /><sub><b>Felix W. Dekker</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=FWDekker" title="Documentation">📖</a></td> |
249 | <td align="center"><a href="https://github.com/Sauceee"><img src="https://avatars2.githubusercontent.com/u/17987941?v=4" width="40px;" alt=""/><br /><sub><b>Sauceee</b></sub></a><br /><a href="#design-Sauceee" title="Design">🎨</a></td> | ||
250 | </tr> | ||
251 | <tr> | ||
252 | <td align="center"><a href="http://lhw.ring0.de"><img src="https://avatars2.githubusercontent.com/u/351875?v=4" width="40px;" alt=""/><br /><sub><b>Lennart Weller</b></sub></a><br /><a href="#platform-lhw" title="Packaging/porting to new platform">📦</a></td> | ||
245 | </tr> | 253 | </tr> |
246 | </table> | 254 | </table> |
247 | 255 | ||
diff --git a/branding/opencollective-header.jpg b/branding/opencollective-header.jpg new file mode 100644 index 000000000..4bb8d809f --- /dev/null +++ b/branding/opencollective-header.jpg | |||
Binary files differ | |||
diff --git a/branding/social-preview.psd b/branding/social-previeww-base.psd index 5a01e7d68..5a01e7d68 100644 --- a/branding/social-preview.psd +++ b/branding/social-previeww-base.psd | |||
Binary files differ | |||
diff --git a/branding/twitter-header.jpg b/branding/twitter-header.jpg new file mode 100644 index 000000000..39d9b1cb2 --- /dev/null +++ b/branding/twitter-header.jpg | |||
Binary files differ | |||
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js index d799a5624..26a627bea 100644 --- a/build-helpers/notarize.js +++ b/build-helpers/notarize.js | |||
@@ -1,18 +1,19 @@ | |||
1 | const { notarize } = require('electron-notarize'); | 1 | const { notarize } = require("electron-notarize"); |
2 | 2 | ||
3 | exports.default = async function notarizing(context) { | 3 | exports.default = async function notarizing(context) { |
4 | const { electronPlatformName, appOutDir } = context; | 4 | const { electronPlatformName, appOutDir } = context; |
5 | const isTagBuild = process.env.TRAVIS_TAG; | 5 | const isTagBuild = process.env.TRAVIS_TAG; |
6 | if (electronPlatformName !== 'darwin' || !isTagBuild) { | 6 | if (electronPlatformName !== "darwin" || !isTagBuild) { |
7 | return; | 7 | return; |
8 | } | 8 | } |
9 | 9 | ||
10 | const appName = context.packager.appInfo.productFilename; | 10 | const appName = context.packager.appInfo.productFilename; |
11 | 11 | ||
12 | return await notarize({ | 12 | return await notarize({ |
13 | appBundleId: 'com.kytwb.ferdi', | 13 | appBundleId: "com.kytwb.ferdi", |
14 | appPath: `${appOutDir}/${appName}.app`, | 14 | appPath: `${appOutDir}/${appName}.app`, |
15 | ascProvider: "B6J9X9DWFL", | ||
15 | appleId: process.env.APPLEID, | 16 | appleId: process.env.APPLEID, |
16 | appleIdPassword: process.env.APPLEID_PASSWORD, | 17 | appleIdPassword: process.env.APPLEID_PASSWORD |
17 | }); | 18 | }); |
18 | }; | 19 | }; |
diff --git a/package.json b/package.json index acf4852d2..cbb7191f1 100644 --- a/package.json +++ b/package.json | |||
@@ -2,7 +2,7 @@ | |||
2 | "name": "ferdi", | 2 | "name": "ferdi", |
3 | "productName": "Ferdi", | 3 | "productName": "Ferdi", |
4 | "appId": "com.kytwb.ferdi", | 4 | "appId": "com.kytwb.ferdi", |
5 | "version": "5.4.1-beta.5", | 5 | "version": "5.4.1-beta.6", |
6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", | 6 | "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", |
7 | "copyright": "kytwb", | 7 | "copyright": "kytwb", |
8 | "main": "index.js", | 8 | "main": "index.js", |
diff --git a/recipes b/recipes | |||
Subproject cea06d3a1645be7896659f06088caf9668ce783 | Subproject 3dcb305ffb706a7604cdfbadf7f2d2e236cb223 | ||
diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico index 9421512c8..34d21f185 100644 --- a/src/assets/images/tray/win32/tray-unread.ico +++ b/src/assets/images/tray/win32/tray-unread.ico | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico index dcb721ada..e3b7edf60 100644 --- a/src/assets/images/tray/win32/tray.ico +++ b/src/assets/images/tray/win32/tray.ico | |||
Binary files differ | |||
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index ddf2b89c7..99d802a83 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json | |||
@@ -25,9 +25,9 @@ | |||
25 | "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.", | 25 | "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.", |
26 | "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment", | 26 | "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment", |
27 | "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.", | 27 | "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.", |
28 | "feature.quickSwitch.info": "Select a service with TAB, ↑ and ↓. Open a service with ENTER.", | 28 | "feature.quickSwitch.info": "Seleccionar servicio con TAB y ↑ ↓. Abrir servicio con ENTER.", |
29 | "feature.quickSwitch.search": "Search...", | 29 | "feature.quickSwitch.search": "Buscar...", |
30 | "feature.quickSwitch.title": "QuickSwitch", | 30 | "feature.quickSwitch.title": "Cambio rápido", |
31 | "feature.serviceLimit.limitReached": "Has sumado {amount} servicios más de los que están incluídos en tu plan. Por favor mejora tu cuenta para sumar más servicios.", | 31 | "feature.serviceLimit.limitReached": "Has sumado {amount} servicios más de los que están incluídos en tu plan. Por favor mejora tu cuenta para sumar más servicios.", |
32 | "feature.shareFranz.action.email": "Enviar como correo", | 32 | "feature.shareFranz.action.email": "Enviar como correo", |
33 | "feature.shareFranz.action.facebook": "Compartir en Facebook", | 33 | "feature.shareFranz.action.facebook": "Compartir en Facebook", |
@@ -58,7 +58,7 @@ | |||
58 | "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5", | 58 | "import.notSupportedHeadline": "Servicios aún no admitidos en Ferdi 5", |
59 | "import.skip.label": "Quiero agregar servicios manualmente", | 59 | "import.skip.label": "Quiero agregar servicios manualmente", |
60 | "import.submit.label": "Importar servicios", | 60 | "import.submit.label": "Importar servicios", |
61 | "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | 61 | "infobar.authRequestFailed": "Error al intentar realizar la solicitud de autenticación. Por favor, cerrar la sesión y volver a entrar si este error persiste.", |
62 | "infobar.buttonChangelog": "¿Qué hay de nuevo?", | 62 | "infobar.buttonChangelog": "¿Qué hay de nuevo?", |
63 | "infobar.buttonInstallUpdate": "Reiniciar e instalar actualización", | 63 | "infobar.buttonInstallUpdate": "Reiniciar e instalar actualización", |
64 | "infobar.buttonReloadServices": "Recargar servicios", | 64 | "infobar.buttonReloadServices": "Recargar servicios", |
@@ -72,12 +72,12 @@ | |||
72 | "invite.skip.label": "Lo haré más tarde", | 72 | "invite.skip.label": "Lo haré más tarde", |
73 | "invite.submit.label": "Enviar invitaciones", | 73 | "invite.submit.label": "Enviar invitaciones", |
74 | "invite.successInfo": "Invitaciones enviadas correctamente", | 74 | "invite.successInfo": "Invitaciones enviadas correctamente", |
75 | "locked.headline": "Locked", | 75 | "locked.headline": "Bloqueado", |
76 | "locked.info": "Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.", | 76 | "locked.info": "Ferdi está bloqueado. Debe desbloquear Ferdi con su contraseña para ver mensajes.", |
77 | "locked.invalidCredentials": "Password invalid", | 77 | "locked.invalidCredentials": "Contraseña incorrecta", |
78 | "locked.password.label": "Password", | 78 | "locked.password.label": "Contraseña", |
79 | "locked.submit.label": "Unlock", | 79 | "locked.submit.label": "Desbloquear", |
80 | "login.changeServer": "Change server", | 80 | "login.changeServer": "Cambiar servidor", |
81 | "login.customServerQuestion": "Using a custom Ferdi server?", | 81 | "login.customServerQuestion": "Using a custom Ferdi server?", |
82 | "login.customServerSuggestion": "Try importing your Franz account", | 82 | "login.customServerSuggestion": "Try importing your Franz account", |
83 | "login.email.label": "Dirección de correo electrónico", | 83 | "login.email.label": "Dirección de correo electrónico", |
@@ -85,7 +85,7 @@ | |||
85 | "login.invalidCredentials": "Correo electrónico o contraseña no válidos ", | 85 | "login.invalidCredentials": "Correo electrónico o contraseña no válidos ", |
86 | "login.link.password": "Restablecer contraseña", | 86 | "login.link.password": "Restablecer contraseña", |
87 | "login.link.signup": "Crear una cuenta gratuita", | 87 | "login.link.signup": "Crear una cuenta gratuita", |
88 | "login.password.label": "Password", | 88 | "login.password.label": "Contraseña", |
89 | "login.serverLogout": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", | 89 | "login.serverLogout": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", |
90 | "login.submit.label": "Iniciar sesión", | 90 | "login.submit.label": "Iniciar sesión", |
91 | "login.tokenExpired": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", | 91 | "login.tokenExpired": "Tu sesión ha expirado, por favor inicia la sesión de nuevo.", |
@@ -93,7 +93,7 @@ | |||
93 | "menu.Todoss.openTodosDrawer": "Abrir la pestaña de tareas", | 93 | "menu.Todoss.openTodosDrawer": "Abrir la pestaña de tareas", |
94 | "menu.app.about": "Acerca de Ferdi", | 94 | "menu.app.about": "Acerca de Ferdi", |
95 | "menu.app.announcement": "¿Qué hay de nuevo?", | 95 | "menu.app.announcement": "¿Qué hay de nuevo?", |
96 | "menu.app.autohideMenuBar": "Auto-hide menu bar", | 96 | "menu.app.autohideMenuBar": "Auto-ocultar barra de menú", |
97 | "menu.app.checkForUpdates": "Comprobar actualizaciones", | 97 | "menu.app.checkForUpdates": "Comprobar actualizaciones", |
98 | "menu.app.hide": "Ocultar", | 98 | "menu.app.hide": "Ocultar", |
99 | "menu.app.hideOthers": "Ocultar otros", | 99 | "menu.app.hideOthers": "Ocultar otros", |
@@ -127,17 +127,17 @@ | |||
127 | "menu.services": "Servicios", | 127 | "menu.services": "Servicios", |
128 | "menu.services.activatePreviousService": "Activa el servicio previo", | 128 | "menu.services.activatePreviousService": "Activa el servicio previo", |
129 | "menu.services.addNewService": "Añadir Nuevo Servicio...", | 129 | "menu.services.addNewService": "Añadir Nuevo Servicio...", |
130 | "menu.services.goHome": "Home", | 130 | "menu.services.goHome": "Inicio", |
131 | "menu.services.setNextServiceActive": "Activa el siguiente servicio", | 131 | "menu.services.setNextServiceActive": "Activa el siguiente servicio", |
132 | "menu.todos": "Tareas pendientes", | 132 | "menu.todos": "Tareas pendientes", |
133 | "menu.todos.enableTodos": "Habilitar Tareas pendientes", | 133 | "menu.todos.enableTodos": "Habilitar Tareas pendientes", |
134 | "menu.view": "Mostrar", | 134 | "menu.view": "Mostrar", |
135 | "menu.view.back": "Back", | 135 | "menu.view.back": "Volver", |
136 | "menu.view.enterFullScreen": "Pasar a pantalla completa", | 136 | "menu.view.enterFullScreen": "Pasar a pantalla completa", |
137 | "menu.view.exitFullScreen": "Salir de Pantalla Completa", | 137 | "menu.view.exitFullScreen": "Salir de Pantalla Completa", |
138 | "menu.view.forward": "Forward", | 138 | "menu.view.forward": "Siguiente", |
139 | "menu.view.lockFerdi": "Lock Ferdi", | 139 | "menu.view.lockFerdi": "Bloquear Ferdi", |
140 | "menu.view.openQuickSwitch": "Open Quick Switch", | 140 | "menu.view.openQuickSwitch": "Abrir Cambio Rápido", |
141 | "menu.view.reloadFranz": "Recargar Ferdi", | 141 | "menu.view.reloadFranz": "Recargar Ferdi", |
142 | "menu.view.reloadService": "Recargar Servicio", | 142 | "menu.view.reloadService": "Recargar Servicio", |
143 | "menu.view.resetZoom": "Tamaño Actual", | 143 | "menu.view.resetZoom": "Tamaño Actual", |
@@ -163,24 +163,24 @@ | |||
163 | "password.submit.label": "Enviar", | 163 | "password.submit.label": "Enviar", |
164 | "password.successInfo": "Por favor revisa tu correo electrónico", | 164 | "password.successInfo": "Por favor revisa tu correo electrónico", |
165 | "premiumFeature.button.upgradeAccount": "Mejora tu cuenta", | 165 | "premiumFeature.button.upgradeAccount": "Mejora tu cuenta", |
166 | "pricing.features.accountSync": "Account Synchronisation", | 166 | "pricing.features.accountSync": "Sincronización de cuenta", |
167 | "pricing.features.adFree": "Sin anuncios para siempre!", | 167 | "pricing.features.adFree": "Sin anuncios para siempre!", |
168 | "pricing.features.appDelays": "Sin pantallas de espera", | 168 | "pricing.features.appDelays": "Sin pantallas de espera", |
169 | "pricing.features.customWebsites": "Agregue sitios personalizados", | 169 | "pricing.features.customWebsites": "Agregue sitios personalizados", |
170 | "pricing.features.desktopNotifications": "Desktop Notifications", | 170 | "pricing.features.desktopNotifications": "Notificaciones de escritorio", |
171 | "pricing.features.onPremise": "En sitio y otros servicios alojados", | 171 | "pricing.features.onPremise": "En sitio y otros servicios alojados", |
172 | "pricing.features.recipes": "Choose from more than 70 Services", | 172 | "pricing.features.recipes": "Elegir entre más de 70 servicios", |
173 | "pricing.features.serviceProxies": "Apoderados de Servicio", | 173 | "pricing.features.serviceProxies": "Apoderados de Servicio", |
174 | "pricing.features.spellchecker": "Soporte de corrector ortográfico", | 174 | "pricing.features.spellchecker": "Soporte de corrector ortográfico", |
175 | "pricing.features.teamManagement": "Administración de Equipo", | 175 | "pricing.features.teamManagement": "Administración de Equipo", |
176 | "pricing.features.thirdPartyServices": "Instalar servicios de terceros", | 176 | "pricing.features.thirdPartyServices": "Instalar servicios de terceros", |
177 | "pricing.features.unlimitedServices": "Agregar servicios ilimitados", | 177 | "pricing.features.unlimitedServices": "Agregar servicios ilimitados", |
178 | "pricing.features.upToSixServices": "Add up to 6 services", | 178 | "pricing.features.upToSixServices": "Añadir hasta 6 servicios", |
179 | "pricing.features.upToThreeServices": "Add up to 3 services", | 179 | "pricing.features.upToThreeServices": "Añadir hasta 3 servicios", |
180 | "pricing.features.workspaces": "Espacios de trabajo", | 180 | "pricing.features.workspaces": "Espacios de trabajo", |
181 | "pricing.plan.free": "Ferdi gratis", | 181 | "pricing.plan.free": "Ferdi gratis", |
182 | "pricing.plan.legacy": "Ferdi Premium", | 182 | "pricing.plan.legacy": "Ferdi Premium", |
183 | "pricing.plan.personal": "Ferdi Personal", | 183 | "pricing.plan.personal": "Ferdi Profesional", |
184 | "pricing.plan.personal-monthly": "Ferdi Personal Mensual", | 184 | "pricing.plan.personal-monthly": "Ferdi Personal Mensual", |
185 | "pricing.plan.personal-yearly": "Ferdi Personal Anual", | 185 | "pricing.plan.personal-yearly": "Ferdi Personal Anual", |
186 | "pricing.plan.pro": "Ferdi Profesional", | 186 | "pricing.plan.pro": "Ferdi Profesional", |
@@ -215,17 +215,17 @@ | |||
215 | "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.", | 215 | "service.restrictedHandler.customUrl.text": "Por favor suscribase al Plan Ferdi Profesional para utilizar urls personalizadas y servicios auto alojados.", |
216 | "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.", | 216 | "service.restrictedHandler.serviceLimit.headline": "Ha llegado al límite del servicio.", |
217 | "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.", | 217 | "service.restrictedHandler.serviceLimit.text": "Por favor mejore su cuenta para poder utilizar más de {count} servicios.", |
218 | "service.webviewLoader.loading": "Loading {service}", | 218 | "service.webviewLoader.loading": "Cargando {service}", |
219 | "services.getStarted": "Primeros pasos", | 219 | "services.getStarted": "Primeros pasos", |
220 | "services.login": "Please login to use Ferdi.", | 220 | "services.login": "Iniciar sesión para usar Ferdi.", |
221 | "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", | 221 | "services.serverInfo": "Opcionalmente, puede cambiar su servidor Ferdi pulsando en el icono de la esquina inferior izquierda.", |
222 | "services.serverless": "Use Ferdi without an Account", | 222 | "services.serverless": "Usar Ferdi sin una cuenta", |
223 | "services.welcome": "Bienvenido a Ferdi", | 223 | "services.welcome": "Bienvenido a Ferdi", |
224 | "settings.account.account.editButton": "Editar cuenta", | 224 | "settings.account.account.editButton": "Editar cuenta", |
225 | "settings.account.accountType.basic": "Cuenta Básica", | 225 | "settings.account.accountType.basic": "Cuenta Básica", |
226 | "settings.account.accountType.premium": "Cuenta Colaborador Premium", | 226 | "settings.account.accountType.premium": "Cuenta Colaborador Premium", |
227 | "settings.account.accountUnavailable": "Account is unavailable", | 227 | "settings.account.accountUnavailable": "La cuenta no está disponible", |
228 | "settings.account.accountUnavailableInfo": "You are using Ferdi without an account. If you want to use Ferdi with an account and keep your services synchronized across installations, please select a server in the Settings tab then login.", | 228 | "settings.account.accountUnavailableInfo": "Estás usando Ferdi sin una cuenta. Si desea utilizar Ferdi con una cuenta y así mantener sus servicios sincronizados entre instalaciones, debe seleccionar un servidor en la Configuración e iniciar sesión.", |
229 | "settings.account.buttonSave": "Actualizar perfil", | 229 | "settings.account.buttonSave": "Actualizar perfil", |
230 | "settings.account.deleteAccount": "Eliminar cuenta", | 230 | "settings.account.deleteAccount": "Eliminar cuenta", |
231 | "settings.account.deleteEmailSent": "Has recibido un correo electrónico con un enlace para confirmar la eliminación de su cuenta. ¡Tu cuenta y datos no podrán ser restaurados!", | 231 | "settings.account.deleteEmailSent": "Has recibido un correo electrónico con un enlace para confirmar la eliminación de su cuenta. ¡Tu cuenta y datos no podrán ser restaurados!", |
@@ -250,54 +250,54 @@ | |||
250 | "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional", | 250 | "settings.account.upgradeToPro.label": "Actualiza a Ferdi Profesional", |
251 | "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario", | 251 | "settings.account.userInfoRequestFailed": "No se pudo cargar la información de usuario", |
252 | "settings.account.yourLicense": "Su Licencia Ferdi", | 252 | "settings.account.yourLicense": "Su Licencia Ferdi", |
253 | "settings.app.accentColorInfo": "Write your accent color in a CSS-compatible format. (Default: #7367f0)", | 253 | "settings.app.accentColorInfo": "Escribir color de acento en formato compatible CSS. (Predeterminado: #7367f0)", |
254 | "settings.app.buttonClearAllCache": "Limpiar caché", | 254 | "settings.app.buttonClearAllCache": "Limpiar caché", |
255 | "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización", | 255 | "settings.app.buttonInstallUpdate": "Reiniciar e instalar actualización", |
256 | "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones", | 256 | "settings.app.buttonSearchForUpdate": "Comprobar actualizaciones", |
257 | "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", | 257 | "settings.app.cacheInfo": "El cache de Ferdi actualmente usa {size} de espacio en disco.", |
258 | "settings.app.currentVersion": "Versión actual:", | 258 | "settings.app.currentVersion": "Versión actual:", |
259 | "settings.app.form.accentColor": "Accent color", | 259 | "settings.app.form.accentColor": "Color de realce", |
260 | "settings.app.form.adaptableDarkMode": "Enable adaptable Dark Mode", | 260 | "settings.app.form.adaptableDarkMode": "Activar modo oscuro", |
261 | "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", | 261 | "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano", |
262 | "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", | 262 | "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar", |
263 | "settings.app.form.beta": "Incluir versiones beta", | 263 | "settings.app.form.beta": "Incluir versiones beta", |
264 | "settings.app.form.darkMode": "Únete al Lado Oscuro", | 264 | "settings.app.form.darkMode": "Únete al Lado Oscuro", |
265 | "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU", | 265 | "settings.app.form.enableGPUAcceleration": "Habilitar aceleración de GPU", |
266 | "settings.app.form.enableLock": "Enable Password Lock", | 266 | "settings.app.form.enableLock": "Activar bloqueo por contraseña", |
267 | "settings.app.form.enableSpellchecking": "Activar corrección ortográfica", | 267 | "settings.app.form.enableSpellchecking": "Activar corrección ortográfica", |
268 | "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema", | 268 | "settings.app.form.enableSystemTray": "Mostrar Ferdi en la bandeja del sistema", |
269 | "settings.app.form.enableTodos": "Activar Ferdi Todos", | 269 | "settings.app.form.enableTodos": "Activar Ferdi Todos", |
270 | "settings.app.form.hibernate": "Enable service hibernation", | 270 | "settings.app.form.hibernate": "Habilitar hibernación del servicio", |
271 | "settings.app.form.hibernationStrategy": "Hibernation strategy", | 271 | "settings.app.form.hibernationStrategy": "Estrategia de hibernación", |
272 | "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas", | 272 | "settings.app.form.keepAllWorkspacesLoaded": "Mantener todas las Áreas de trabajo cargadas", |
273 | "settings.app.form.language": "Idioma", | 273 | "settings.app.form.language": "Idioma", |
274 | "settings.app.form.lockPassword": "Password", | 274 | "settings.app.form.lockPassword": "Contraseña", |
275 | "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema", | 275 | "settings.app.form.minimizeToSystemTray": "Minimizar Ferdi a la bandeja del sistema", |
276 | "settings.app.form.noUpdates": "Disable updates", | 276 | "settings.app.form.noUpdates": "Desactivar actualizaciones", |
277 | "settings.app.form.privateNotifications": "Don't show message content in notifications", | 277 | "settings.app.form.privateNotifications": "No mostrar contenido de mensajes en notificaciones", |
278 | "settings.app.form.runInBackground": "Mantener Ferdi en segundo plano al cerrar la ventana", | 278 | "settings.app.form.runInBackground": "Mantener Ferdi en segundo plano al cerrar la ventana", |
279 | "settings.app.form.scheduledDNDEnabled": "Enable scheduled Do-not-Disturb", | 279 | "settings.app.form.scheduledDNDEnabled": "Activar programación \"No molestar\"", |
280 | "settings.app.form.scheduledDNDEnd": "To", | 280 | "settings.app.form.scheduledDNDEnd": "A", |
281 | "settings.app.form.scheduledDNDStart": "From", | 281 | "settings.app.form.scheduledDNDStart": "De", |
282 | "settings.app.form.server": "Server", | 282 | "settings.app.form.server": "Servidor", |
283 | "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados", | 283 | "settings.app.form.showDisabledServices": "Mostrar pestañas de servicios desactivados", |
284 | "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas", | 284 | "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas", |
285 | "settings.app.form.showServiceNavigationBar": "Always show service navigation bar", | 285 | "settings.app.form.showServiceNavigationBar": "Mostrar siempre barra de navegación", |
286 | "settings.app.form.todoServer": "Todo Server", | 286 | "settings.app.form.todoServer": "Servidor de tareas", |
287 | "settings.app.form.universalDarkMode": "Enable universal Dark Mode", | 287 | "settings.app.form.universalDarkMode": "Activar modo oscuro universal", |
288 | "settings.app.headline": "Configuración", | 288 | "settings.app.headline": "Configuración", |
289 | "settings.app.headlineAdvanced": "Avanzado", | 289 | "settings.app.headlineAdvanced": "Avanzado", |
290 | "settings.app.headlineAppearance": "Apariencia", | 290 | "settings.app.headlineAppearance": "Apariencia", |
291 | "settings.app.headlineGeneral": "General", | 291 | "settings.app.headlineGeneral": "General", |
292 | "settings.app.headlineLanguage": "Idioma", | 292 | "settings.app.headlineLanguage": "Idioma", |
293 | "settings.app.headlineUpdates": "Actualizaciones", | 293 | "settings.app.headlineUpdates": "Actualizaciones", |
294 | "settings.app.hibernateInfo": "By default, Ferdi will keep all your services open and loaded in the background so they are ready when you want to use them. Service Hibernation will unload your services after a specified amount. This is useful to save RAM or keeping services from slowing down your computer.", | 294 | "settings.app.hibernateInfo": "Por defecto, Ferdi mantendrá todos sus servicios abiertos y cargados en segundo plano para que estén listos cuando los necesite. La hibernación del servicio desactivará los mismos tras el tiempo especificado. Esto es útil para ahorrar RAM y evitar que los servicios ralentizen su sistema.", |
295 | "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.", | 295 | "settings.app.languageDisclaimer": "Las traducciones oficiales son en inglés y alemán. Todos los demás idiomas son traducciones basadas en la comunidad.", |
296 | "settings.app.lockInfo": "Password Lock allows you to keep your messages protected.\nUsing Password Lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.", | 296 | "settings.app.lockInfo": "El bloqueo de contraseña le permite mantener los mensajes protegidos.\nSi activa el bloqueo de contraseña, se le pedirá introducirla cada vez que inicie o bloquee Ferdi usando el símbolo de la esquina inferior izquierda o bien el acceso directo CMD/CTRL+Shift+L.", |
297 | "settings.app.lockedPassword": "Password", | 297 | "settings.app.lockedPassword": "Contraseña", |
298 | "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", | 298 | "settings.app.lockedPasswordInfo": "Por favor, asegúrese de recordar la contraseña que establezca.\nSi la perdiera u olvidara, tendría que reinstalar Ferdi.", |
299 | "settings.app.restartRequired": "Los cambios requieren reiniciar", | 299 | "settings.app.restartRequired": "Los cambios requieren reiniciar", |
300 | "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", | 300 | "settings.app.scheduledDNDInfo": "El \"No molestar\" programado permite definir un período de tiempo en el que no recibir notificaciones de Ferdi.", |
301 | "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", | 301 | "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", |
302 | "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", | 302 | "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", |
303 | "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", | 303 | "settings.app.serverMoneyInfo": "You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.", |
@@ -423,7 +423,7 @@ | |||
423 | "sidebar.addNewService": "Añadir nuevo servicio", | 423 | "sidebar.addNewService": "Añadir nuevo servicio", |
424 | "sidebar.closeTodosDrawer": "Close Ferdi Todos", | 424 | "sidebar.closeTodosDrawer": "Close Ferdi Todos", |
425 | "sidebar.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo", | 425 | "sidebar.closeWorkspaceDrawer": "Cerrar cajón de espacio de trabajo", |
426 | "sidebar.lockFerdi": "Lock Ferdi", | 426 | "sidebar.lockFerdi": "Bloquear Ferdi", |
427 | "sidebar.muteApp": "Desactivar notificaciones y sonido", | 427 | "sidebar.muteApp": "Desactivar notificaciones y sonido", |
428 | "sidebar.openTodosDrawer": "Open Ferdi Todos", | 428 | "sidebar.openTodosDrawer": "Open Ferdi Todos", |
429 | "sidebar.openWorkspaceDrawer": "Abrir diseñador de espacios de trabajo", | 429 | "sidebar.openWorkspaceDrawer": "Abrir diseñador de espacios de trabajo", |
@@ -438,7 +438,7 @@ | |||
438 | "signup.legal.privacy": "Declaración de privacidad", | 438 | "signup.legal.privacy": "Declaración de privacidad", |
439 | "signup.legal.terms": "Términos de servicio", | 439 | "signup.legal.terms": "Términos de servicio", |
440 | "signup.link.login": "Ya tienes una cuenta, ¿Iniciar sesión?", | 440 | "signup.link.login": "Ya tienes una cuenta, ¿Iniciar sesión?", |
441 | "signup.password.label": "Password", | 441 | "signup.password.label": "Contraseña", |
442 | "signup.submit.label": "Crear cuenta", | 442 | "signup.submit.label": "Crear cuenta", |
443 | "subscription.bestValue": "Best value", | 443 | "subscription.bestValue": "Best value", |
444 | "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial", | 444 | "subscription.cta.activateTrial": "Yes, start the free Ferdi Professional trial", |
@@ -467,9 +467,9 @@ | |||
467 | "validation.oneRequired": "Al menos uno es requerido", | 467 | "validation.oneRequired": "Al menos uno es requerido", |
468 | "validation.required": "{field} es obligatorio", | 468 | "validation.required": "{field} es obligatorio", |
469 | "validation.url": "{field} no es una URL válida", | 469 | "validation.url": "{field} no es una URL válida", |
470 | "webControls.back": "Back", | 470 | "webControls.back": "Volver", |
471 | "webControls.forward": "Forward", | 471 | "webControls.forward": "Siguiente", |
472 | "webControls.goHome": "Home", | 472 | "webControls.goHome": "Inicio", |
473 | "webControls.openInBrowser": "Open in Browser", | 473 | "webControls.openInBrowser": "Open in Browser", |
474 | "webControls.reload": "Volver a cargar", | 474 | "webControls.reload": "Volver a cargar", |
475 | "welcome.loginButton": "Accede a tu cuenta", | 475 | "welcome.loginButton": "Accede a tu cuenta", |
diff --git a/src/internal-server b/src/internal-server | |||
Subproject f534147e00fc889769845b9207572ce63ef3cad | Subproject c39e8b45a51387f24d30e62a170681fc3422ad0 | ||