From 1f0bd423811c546d9e06f3c1a63696defd03f0a4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 15 Oct 2020 06:12:38 +0200 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" --- plugins/pausemusic/kdeconnect_pausemusic.json | 4 ++-- plugins/pausemusic/kdeconnect_pausemusic_config.desktop | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 5e4a88e7e..ac134c7fc 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -50,7 +50,7 @@ "Description[ar]": "ألبث الموسيقى/الفيديو أثناء المكالمات الهاتفيّة", "Description[ast]": "Posa la música o los vídeos demientres una llamada telefónica", "Description[az]": "Zəng zamanı musiqi/video fasiləsi", - "Description[ca@valencia]": "Pausa la música/vídeos durant una trucada telefònica", + "Description[ca@valencia]": "Fa una pausa a la música/vídeos durant una trucada telefònica", "Description[ca]": "Fa una pausa a la música/vídeos durant una trucada telefònica", "Description[cs]": "Pozastavit hudbu/video během telefonátu", "Description[da]": "Sæt musik/videoer på pause under opkald", @@ -95,7 +95,7 @@ "Name[ar]": "ألبث الوسائط أثناء المكالمات", "Name[ast]": "Posa de la reproducción demientres les llamaes", "Name[az]": "Zəng zamanı media fasiləsi", - "Name[ca@valencia]": "Pausa els suports durant les trucades", + "Name[ca@valencia]": "Fa una pausa els suports durant les trucades", "Name[ca]": "Fa una pausa els suports durant les trucades", "Name[cs]": "Pozastavit média během telefonátu", "Name[da]": "Sæt medier på pause under opkald", diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index a233a5c54..8be13548d 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -11,7 +11,7 @@ Name[az]=Musiqi qoşması ayarlarına fasilə Name[bg]=Настройки на приставката за поставяне на пауза Name[bs]=Zaustavi Muziku postavke dodatka Name[ca]=Ajustaments del connector Pausa a la música -Name[ca@valencia]=Ajustaments del connector Pausa la música +Name[ca@valencia]=Ajustaments del connector Pausa a la música Name[cs]=Nastavení modulu Pozastavení hudby Name[da]=Indstilling af plugin til at sætte musik på pause Name[de]=Modul-Einstellungen für das Anhalten der Musikwiedergabe