From b7ac0291a6a3811e7013d7a6d1123ca2f1e46cdb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Jan 2020 06:07:53 +0100 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" --- lookandfeel/metadata.desktop | 2 +- soliduiserver/soliduiserver.desktop | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index 52d5287c8..66c4c1ac4 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Comment=Breeze by the KDE VDG -Comment[ca]=Brisa, creat per la comunitat VDG del KDE +Comment[ca]=Brisa, creat pel VDG del KDE Comment[ca@valencia]=Brisa per a VDG de KDE Comment[cs]=Breeze od KDE VDG Comment[da]=Breeze af KDE VDG diff --git a/soliduiserver/soliduiserver.desktop b/soliduiserver/soliduiserver.desktop index 5498f13dc..153b4523c 100644 --- a/soliduiserver/soliduiserver.desktop +++ b/soliduiserver/soliduiserver.desktop @@ -20,7 +20,7 @@ Name[et]=Riistvara tuvastamine Name[eu]=Hardware-detekzioa Name[fi]=Laitteiston tunnistus Name[fr]=Détection du matériel -Name[gl]=Detección do hardware +Name[gl]=Detección de soporte físico Name[he]=זיהוי חומרה Name[hu]=Hardverfelismerés Name[ia]=Relevamento de Hardware @@ -66,7 +66,7 @@ Comment[et]=Riistvarasündmuste kasutajaliides Comment[eu]=Hardware gertakarientzako erabiltzaile interfaze bat hornitzen du Comment[fi]=Tarjoaa käyttöliittymän laitteistotapahtumille Comment[fr]=Fournit une interface utilisateur pour les évènements matériels -Comment[gl]=Fornece unha interface de usuario para os eventos do hardware +Comment[gl]=Fornece unha interface de usuario para os eventos de soporte físico Comment[he]=מספק ממשק משתמש לארועי חומרה Comment[hu]=Felhasználói felületet biztosít a hardvereseményekhez Comment[ia]=Il forni un interface de usator pro eventos hardware