From 68599c8273757303c63cff4778c97f853b80d222 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Jan 2021 06:55:46 +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" --- plugins/photo/kdeconnect_photo.json | 2 +- plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index 0d917548a..86a88763d 100644 --- a/plugins/photo/kdeconnect_photo.json +++ b/plugins/photo/kdeconnect_photo.json @@ -40,7 +40,7 @@ } ], "Description": "Use a connected device to take a photo", - "Description[ast]": "Usa un preséu coneutáu pa facer una semeya", + "Description[ast]": "Usa un preséu conectáu pa facer una semeya", "Description[az]": "Qoşulmuş cihazla şəkil çəkmək", "Description[ca@valencia]": "Usa un dispositiu connectat per a prendre una fotografia", "Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia", diff --git a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json index 83fdcacda..8bb0ee395 100644 --- a/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json +++ b/plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json @@ -40,7 +40,7 @@ } ], "Description": "Control the volume of the connected device", - "Description[ast]": "Controla'l volume del preséu coneutáu", + "Description[ast]": "Controla'l volume del preséu conectáu", "Description[az]": "Qoşulmuş cihazın səs səviyyəsini idarə etmək", "Description[ca@valencia]": "Controla el volum del dispositiu connectat", "Description[ca]": "Controla el volum del dispositiu connectat",