From 95316a336e6a7c5534c1ed73f887acf4513c7e8b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 10 Feb 2024 01:16:07 +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" --- fileitemactionplugin/kdeconnectsendfile.json | 2 +- plasmoid/package/metadata.json | 2 +- plugins/share/kdeconnect_share.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index e8fee6e7d..69800cd61 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -40,7 +40,7 @@ "Description[sk]": "Odoslať súbor do iného zariadenia pomocou KDE Connect", "Description[sl]": "Pošljite datoteko na drugo napravo s pomočjo KDE Connect", "Description[sv]": "Skicka fil till en annan enhet med användning av KDE:s anslutningstjänst", - "Description[tr]": "KDE Bağlan'ı kullanarak dosyayı başka bir aygıta gönder", + "Description[tr]": "KDE Bağlan’ı kullanarak dosyayı başka bir aygıta gönder", "Description[uk]": "Надіслати файл на інший пристрій за допомогою KDE Connect", "Description[x-test]": "xxSend file to other device using KDE Connectxx", "Description[zh_CN]": "使用 KDE Connect将文件发送到其他设备", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index b1f7f2444..e31816ed8 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -76,7 +76,7 @@ "Description[ru]": "Просмотр уведомлений с мобильных устройств с помощью KDE Connect", "Description[sl]": "Pošljite obvestila iz drugih naprav s pomočjo KDE Connect", "Description[sv]": "Visa underrättelser från apparater med KDE anslut", - "Description[tr]": "KDE Bağlan'ı kullanarak aygıttan gelen bildirimleri göster", + "Description[tr]": "KDE Bağlan’ı kullanarak aygıttan gelen bildirimleri göster", "Description[uk]": "Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE»", "Description[x-test]": "xxShow notifications from your devices using KDE Connectxx", "Description[zh_CN]": "通过 KDE Connect 显示来自其他设备的通知", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 9acacda14..8da89b34a 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -86,7 +86,7 @@ "Description[sr@latin]": "Primaj i šalji fajlove, URL‑ove ili običan tekst, sa lakoćom", "Description[sr]": "Примај и шаљи фајлове, УРЛ‑ове или обичан текст, са лакоћом", "Description[sv]": "Ta emot och skicka filer, webbadresser eller vanlig text enkelt", - "Description[tr]": "Dosyaları, URL'leri ve düz metinleri kolayca al ve gönder", + "Description[tr]": "Dosyaları, URL’leri ve düz metinleri kolayca al ve gönder", "Description[uk]": "Спрощене отримання і надсилання файлів, адрес або текстових фрагментів", "Description[x-test]": "xxReceive and send files, URLs or plain text easilyxx", "Description[zh_CN]": "简单地接收和发送文件，URL 或者文本",