From 50a5387b473a1b9380ef954bf485917ecb60c462 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 23 Mar 2022 03:29:36 +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" --- plugins/photo/kdeconnect_photo.json | 2 +- plugins/presenter/kdeconnect_presenter.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/photo/kdeconnect_photo.json b/plugins/photo/kdeconnect_photo.json index e25749276..a350dde84 100644 --- a/plugins/photo/kdeconnect_photo.json +++ b/plugins/photo/kdeconnect_photo.json @@ -47,7 +47,7 @@ "Description[ar]": "استعمل الجهاز المتصل لأخذ صورة", "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@valencia]": "Utilitza un dispositiu connectat per a prendre una fotografia", "Description[ca]": "Usa un dispositiu connectat per a prendre una fotografia", "Description[cs]": "Použít připojené zařízení pro pořízení fotografie", "Description[da]": "Brug en tilsluttet enhed til at tage et foto", diff --git a/plugins/presenter/kdeconnect_presenter.json b/plugins/presenter/kdeconnect_presenter.json index 5f566cdc8..174c3a1f8 100644 --- a/plugins/presenter/kdeconnect_presenter.json +++ b/plugins/presenter/kdeconnect_presenter.json @@ -50,7 +50,7 @@ "Description": "Use your mobile device to point to things on the screen", "Description[ar]": "استعمل جهازك الجوال لتؤشر على الأشياء في الشاشة", "Description[az]": "Ekrandakıları göstərmək üçün mobil cihazınızdan kursor kimi istifadə edin", - "Description[ca@valencia]": "Usa el dispositiu mòbil per a assenyalar coses a la pantalla", + "Description[ca@valencia]": "Utilitza el dispositiu mòbil per a assenyalar coses a la pantalla", "Description[ca]": "Usa el dispositiu mòbil per a assenyalar coses a la pantalla", "Description[cs]": "Použijte mobilní zařízení k ukázání na položky na obrazovce", "Description[da]": "Brug din mobiltelefon til at udpege ting på skærmen",