Merge branch 'develop' into releasev5.6.8

12 files changed, 22 insertions, 8 deletions

diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index c801ab978..367ae9712 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -286,7 +286,11 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Διαθέσιμες υπηρεσίες",
   "settings.recipes.missingService": "Λείπει κάποια υπηρεσία;",
+<<<<<<< HEAD
+  "settings.recipes.mostPopular": "Most popular",
+=======
   "settings.recipes.mostPopular": "Τα πιο δημοφιλή",
+>>>>>>> develop
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.servicesSuccessfulAddedInfo": "Η υπηρεσία προστέθηκε με επιτυχία",
   "settings.searchService": "Αναζήτηση υπηρεσίας",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index ea0bf1a51..5537ca0d7 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -198,7 +198,7 @@
   "settings.app.form.autoLaunchInBackground": "Abrir en segundo plano",
   "settings.app.form.autoLaunchOnStart": "Iniciar Ferdi al iniciar",
   "settings.app.form.automaticUpdates": "Activar actualizaciones",
-  "settings.app.form.beta": "Include pre-releases",
+  "settings.app.form.beta": "Incluir versiones beta",
   "settings.app.form.clipboardNotifications": "Dejar de mostrar notificaciones acerca del portapapeles",
   "settings.app.form.closeToSystemTray": "Cerrar Ferdi a la barra de tareas",
   "settings.app.form.confirmOnQuit": "Confirmar al salir de Ferdi",
@@ -237,7 +237,7 @@
   "settings.app.form.showDragArea": "Mostrar área arrastrable en la ventana",
   "settings.app.form.showMessagesBadgesWhenMuted": "Mostrar la insignia de mensajes sin leer cuando las notificaciones están desactivadas",
   "settings.app.form.showServiceName": "Mostrar el nombre del servicio debajo del icono",
-  "settings.app.form.splitColumns": "Number of columns",
+  "settings.app.form.splitColumns": "Número de columnas",
   "settings.app.form.splitMode": "Activar el modo de vista separada",
   "settings.app.form.startMinimized": "Iniciar minimizado",
   "settings.app.form.universalDarkMode": "Activar modo oscuro universal",
@@ -266,7 +266,7 @@
   "settings.app.translationHelp": "Ayúdanos a traducir Ferdi a tu idioma.",
   "settings.app.universalDarkModeInfo": "El Modo Oscuro Universal intenta generar dinámicamente estilos de modo oscuro para servicios que de otro modo no están soportados actualmente.",
   "settings.app.updateStatusAvailable": "Actualización disponible, descargando...",
-  "settings.app.updateStatusSearching": "Searching for updates...",
+  "settings.app.updateStatusSearching": "Buscando actualizaciones...",
   "settings.app.updateStatusUpToDate": "Estás utilizando la última versión de Ferdi",
   "settings.invite.headline": "Invitar amigos",
   "settings.navigation.account": "Cuenta",
@@ -281,7 +281,7 @@
   "settings.recipes.customService.headline.communityRecipes": "Recetas de terceros comunitarios",
   "settings.recipes.customService.headline.customRecipes": "Recetas de terceros comunitarios",
   "settings.recipes.customService.headline.devRecipes": "Sus recetas de Servicio de Desarrollo",
-  "settings.recipes.customService.intro": "To add a custom service, copy the service recipe folder inside:",
+  "settings.recipes.customService.intro": "Para añadir un servicio personalizado, copie la carpeta con la configuración (recipe) del servicio en:",
   "settings.recipes.customService.openDevDocs": "Documentación para desarrolladores",
   "settings.recipes.customService.openFolder": "Abrir carpeta",
   "settings.recipes.headline": "Servicios disponibles",
@@ -308,7 +308,7 @@
   "settings.service.form.enableHibernation": "Habilitar hibernación",
   "settings.service.form.enableNotification": "Activar notificaciones",
   "settings.service.form.enableService": "Activar servicio",
-  "settings.service.form.enableWakeUp": "Enable wake up",
+  "settings.service.form.enableWakeUp": "Habilitar despertar",
   "settings.service.form.headlineBadges": "Insignias de mensaje no leídos",
   "settings.service.form.headlineDarkReaderSettings": "Configuración del Lector Oscuro",
   "settings.service.form.headlineGeneral": "General",
@@ -344,14 +344,14 @@
   "settings.services.discoverServices": "Descubrir servicios",
   "settings.services.headline": "Tus servicios",
   "settings.services.noServicesAdded": "Empieze añadiendo un servicio.",
-  "settings.services.nothingFound": "Sorry, but no service matched your search term.",
+  "settings.services.nothingFound": "Lo sentimos, no hay ningún servicio que coincida con la búsqueda.",
   "settings.services.servicesRequestFailed": "No pudo cargar tus servicios",
   "settings.services.tooltip.isDisabled": "El servicio está desactivado",
   "settings.services.tooltip.isMuted": "Todos los sonidos están silenciados",
   "settings.services.tooltip.notificationsDisabled": "Las notificaciones están desactivadas",
   "settings.services.updatedInfo": "Tus cambios han sido guardados",
-  "settings.supportFerdi.about": "The development of Ferdi is done by contributors. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
-  "settings.supportFerdi.aboutIntro": "Special thanks goes to these awesome people:",
+  "settings.supportFerdi.about": "El desarrollo de Ferdi lo realizan voluntarios. Gente que usa Ferdi como tú. Mantienen, corrigen y mejoran Ferdi en su tiempo libre.",
+  "settings.supportFerdi.aboutIntro": "Un especial agradecimiento a estas increíbles personas:",
   "settings.supportFerdi.headline": "Acerca de Ferdi",
   "settings.team.contentHeadline": "Administración de Equipo",
   "settings.team.copy": "La gestión de equipos de Franz's te permite administrar suscripciones de Franz para múltiples usuarios. Por favor, ten en cuenta que tener una suscripción a Franz Premium no te dará ninguna ventaja en el uso de Ferdi: la única razón por la que todavía tienes acceso a la Gestión de Equipos es para que puedas gestionar tus equipos de Franz y para que no pierdas ninguna funcionalidad en la gestión de tu cuenta.",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index a150280bc..84c7c854a 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Avaa kansio",
   "settings.recipes.headline": "Käytettävissä olevat palvelut",
   "settings.recipes.missingService": "Palvelu puuttuu?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Pahoittelut, mutta yksikään palvelu ei täsmää hakutermiisi - saatat kuitenkin pystyä lisäämään sen käyttämällä \"Mukautettu sivusto\" -vaihtoehtoa. Huomioithan, että sivusto saattaa näyttää enemmän palveluja mitä asennetussa Ferdin versiossa on. Saadaksesi käyttöön nämä uudet palvelut, harkitse päivittämistä uudempaan Ferdin versioon.",
   "settings.recipes.mostPopular": "Suosituin",
   "settings.recipes.servicesSuccessfulAddedInfo": "Palvelu lisätty onnistuneesti",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 70a48f86a..c5b4957b8 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Ouvrir le dossier",
   "settings.recipes.headline": "Services disponibles",
   "settings.recipes.missingService": "Un service est manquant?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Désolé, mais aucun service ne correspond à votre recherche - mais vous pouvez toujours l'ajouter en utilisant l'option \"Custom Website\". Veuillez noter que le site Web pourrait afficher plus de services qui ont été ajoutés à Ferdi depuis la version sur laquelle vous êtes actuellement. Pour obtenir ces nouveaux services, veuillez envisager la mise à niveau vers une version plus récente de Ferdi.",
   "settings.recipes.mostPopular": "Les plus populaires",
   "settings.recipes.servicesSuccessfulAddedInfo": "Le service a été ajouté avec succès",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 2d4e17a2f..49f67cd59 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Apri cartella",
   "settings.recipes.headline": "Servizi disponibili",
   "settings.recipes.missingService": "Manca un servizio?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Non è stato trovato alcun servizio corrispondente alla ricerca impostata. Ricorda che anche se non esiste un servizio specifico, potrebbe essere possibile usare la funzionalità \"Sito Custom\". Inoltre potrebbe essere che sul sito web di Ferdi siano mostrati più servizi di quanti disponibili nella applicazione correntemente in uso. Nel caso, per accedere a questi servizi, è possibile aggiornare Ferdi.",
   "settings.recipes.mostPopular": "Più popolari",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servizio aggiunto con successo",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index c122eef2f..a4abdd867 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Abrir pasta",
   "settings.recipes.headline": "Serviços disponíveis",
   "settings.recipes.missingService": "Falta um serviço?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Desculpe, mas nenhum serviço corresponde ao seu termo de pesquisa - mas você provavelmente pode adicioná-lo usando a opção \"Site personalizado\". Por favor, note que o site pode mostrar mais serviços que foram adicionados ao Ferdi desde a versão em que você está atualmente. Para obter esses novos serviços, por favor, considere atualizar para uma versão mais recente do Ferdi.",
   "settings.recipes.mostPopular": "Os mais populares",
   "settings.recipes.servicesSuccessfulAddedInfo": "Serviço adicionado com sucesso",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 5b478d176..4db21a32c 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Открыть папку",
   "settings.recipes.headline": "Доступные сервисы",
   "settings.recipes.missingService": "Не можете найти сервис?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Извините, но сервис не соответствует вашему поисковому запросу - но вы все еще можете добавить его, используя опцию \"Пользовательский сайт\". Пожалуйста, обратите внимание, что на сайте может отображаться больше служб, которые могли быть добавлены в новых версиях Ferdi. Для получения новых сервисов, пожалуйста, обновите Ferdi до актуальной версии.",
   "settings.recipes.mostPopular": "Самые популярные",
   "settings.recipes.servicesSuccessfulAddedInfo": "Сервис успешно добавлен",
diff --git a/src/i18n/locales/si.json b/src/i18n/locales/si.json
index 55ef9a132..e6d533666 100644
--- a/src/i18n/locales/si.json
+++ b/src/i18n/locales/si.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "තිබෙන සේවා",
   "settings.recipes.missingService": "Missing a service?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index ef1fc6072..8073a2ef6 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Otvoriť priečinok",
   "settings.recipes.headline": "Dostupné služby",
   "settings.recipes.missingService": "Chýba vám služba?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Je nám ľúto, vášmu hľadanému výrazu nezodpovedá žiadna služba, ale pravdepodobne ju môžete pridať pomocou možnosti \"Custom Website\". Upozorňujeme, že na webovej lokalite sa môžu zobraziť ďalšie služby, ktoré boli do Ferdi pridané od verzie, na ktorej sa práve nachádzate. Ak chcete získať tieto nové služby, zvážte aktualizáciu na novšiu verziu Ferdi.",
   "settings.recipes.mostPopular": "Najpopulárnejšie",
   "settings.recipes.servicesSuccessfulAddedInfo": "Služba bola úspešne pridaná",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index fdcf441a0..ebb7a5b33 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Öppna mapp",
   "settings.recipes.headline": "Tillgängliga tjänster",
   "settings.recipes.missingService": "Saknar du en tjänst?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Tyvärr, men ingen tjänst matchade ditt sökord - men du kan fortfarande förmodligen lägga till det med \"Anpassad webbplats\" alternativet. Observera att webbplatsen kan visa fler tjänster som har lagts till Ferdi sedan den version som du för närvarande är på. För att få dessa nya tjänster, överväg att uppgradera till en nyare version av Ferdi.",
   "settings.recipes.mostPopular": "Mest populära",
   "settings.recipes.servicesSuccessfulAddedInfo": "Tjänsten har lagts till",
diff --git a/src/i18n/locales/te.json b/src/i18n/locales/te.json
index ac2838683..adbd827ca 100644
--- a/src/i18n/locales/te.json
+++ b/src/i18n/locales/te.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Open folder",
   "settings.recipes.headline": "Available services",
   "settings.recipes.missingService": "Missing a service?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Sorry, but no service matched your search term - but you can still probably add it using the \"Custom Website\" option. Please note that the website might show more services that have been added to Ferdi since the version that you are currently on. To get those new services, please consider upgrading to a newer version of Ferdi.",
   "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.servicesSuccessfulAddedInfo": "Service successfully added",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index d877fdccd..6324bcda3 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -286,6 +286,7 @@
   "settings.recipes.customService.openFolder": "Klasörü aç",
   "settings.recipes.headline": "Mevcut servisler",
   "settings.recipes.missingService": "Aradığın servisi bulamadın mı?",
+  "settings.recipes.mostPopular": "Most popular",
   "settings.recipes.nothingFound": "Üzgünüz, ancak hiçbir hizmet arama teriminizle eşleşmedi - ancak \"Özel Web Sitesi\" seçeneğini kullanarak yeni bir tane ekleyebilirsiniz. Web sitesinde, şu anda bulunduğunuz sürümden bu yana Ferdi'ye eklenen daha fazla hizmet gösterilebileceğini lütfen unutmayın. Bu yeni hizmetleri almak için lütfen Ferdi'nin daha yeni bir sürümüne geçmeyi düşünün.",
   "settings.recipes.mostPopular": "En popüler",
   "settings.recipes.servicesSuccessfulAddedInfo": "Servis başarıyla eklendi",