From 5bce4746b540369b5ec41ee7fca1fb39a5eec989 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Nov 2022 01:49:31 +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/notifications/kdeconnect_notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 4166fde7a..2a627a6a6 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -52,7 +52,7 @@ "Description[ar]": "أظهر إخطارات الجهاز على هذا الحاسوب وأبقها متزامنة", "Description[az]": "Cihaz bildirişlərini bu komputerdə göstərmək və onları eyniləşdirmək", "Description[bg]": "Показване и синхронизиране на известията на устройството с този компютър", - "Description[ca@valencia]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades", + "Description[ca@valencia]": "Mostra les notificacions del dispositiu en l'ordinador i les manté sincronitzades", "Description[ca]": "Mostra les notificacions del dispositiu a l'ordinador i les manté sincronitzades", "Description[cs]": "Zobrazit oznámení telefonu v počítači a udržovat je synchronizovaná", "Description[da]": "Vis enhedens bekendtgørelser på denne computer og hold dem synkroniseret",