From 4e16c01021f24ebddaf0965bd8df61543eb748ce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 1 Jun 2022 01:54:20 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/services/ampache/amarok_service_ampache_config.desktop | 4 ++-- src/services/lastfm/amarok_service_lastfm_config.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/ampache/amarok_service_ampache_config.desktop b/src/services/ampache/amarok_service_ampache_config.desktop index 1b91eea819..665a63d99c 100644 --- a/src/services/ampache/amarok_service_ampache_config.desktop +++ b/src/services/ampache/amarok_service_ampache_config.desktop @@ -64,8 +64,8 @@ Name[zh_TW]=Ampache 服務設定 Comment=Sets up the ampache server(s) to connect to Comment[bg]=Настройване на ampache сървър/и Comment[bs]=Određuje Ampačeve servere za povezivanje -Comment[ca]=Defineix el servidor(s) Ampache al qual connectar -Comment[ca@valencia]=Defineix el servidor(s) Ampache al qual connectar +Comment[ca]=Defineix el/s servidor/s Ampache al/s qual/s connectar +Comment[ca@valencia]=Definix els servidors Ampache als quals connectar Comment[cs]=Nastaví server(y) ampache ke kterým se připojit Comment[da]=Sætter de Ampache-servere op, der skal forbindes til Comment[de]=Richtet die Verbindungen zu Ampache-Servern ein diff --git a/src/services/lastfm/amarok_service_lastfm_config.desktop b/src/services/lastfm/amarok_service_lastfm_config.desktop index 09b6cda4b1..be6a10435c 100644 --- a/src/services/lastfm/amarok_service_lastfm_config.desktop +++ b/src/services/lastfm/amarok_service_lastfm_config.desktop @@ -69,7 +69,7 @@ Comment=Set up Last.fm username and password Comment[bg]=Настройване на потребител и парола за Last.fm Comment[bs]=Podesite korisničko ime i lozinku na LastFM‑u Comment[ca]=Defineix el nom d'usuari i contrasenya del Last.fm -Comment[ca@valencia]=Defineix el nom d'usuari i contrasenya del Last.fm +Comment[ca@valencia]=Definix el nom d'usuari i contrasenya de Last.fm Comment[cs]=Nastavit uživatelské jméno a heslo pro last.fm Comment[csb]=Nastôwi miono brëkòwnika ë parolã z Last.fm Comment[da]=Sæt brugernavn og adgangskode til Last.fm