From b5ab50507438d2e4653d78ea716d8b1fe943ac56 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 2 Feb 2023 02:03:13 +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" --- app/org.kde.kdeconnect.app.desktop | 2 +- daemon/org.kde.kdeconnect.daemon.desktop.cmake | 2 +- data/kdeconnect-dde.desktop | 2 +- data/kdeconnect-thunar.desktop | 2 +- data/org.kde.kdeconnect_open.desktop | 6 +++--- fileitemactionplugin/kdeconnectsendfile.json | 4 ++-- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- kcm/kcm_kdeconnect.json | 2 +- plasmoid/package/metadata.desktop | 4 ++-- plugins/kdeconnect.notifyrc | 2 +- settings/org.kde.kdeconnect-settings.desktop | 2 +- smsapp/org.kde.kdeconnect.sms.desktop | 2 +- urlhandler/org.kde.kdeconnect.handler.desktop | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index acb3fb522..d6e771d20 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -44,7 +44,7 @@ Name[sr@ijekavianlatin]=KDE‑konekcija Name[sr@latin]=KDE‑konekcija Name[sv]=KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் -Name[tr]=KDE Connect +Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Name[zh_CN]=KDE Connect diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake index 42b7e4bf5..6309573a2 100644 --- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake +++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake @@ -52,7 +52,7 @@ Name[sr@ijekavianlatin]=KDE‑konekcija Name[sr@latin]=KDE‑konekcija Name[sv]=KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் -Name[tr]=KDE Connect +Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Name[zh_CN]=KDE Connect diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop index 4e278c1ea..c6b1636a1 100644 --- a/data/kdeconnect-dde.desktop +++ b/data/kdeconnect-dde.desktop @@ -43,7 +43,7 @@ Name[sk]=Odoslať pomocou KDE Connect Name[sl]=Pošlji prek KDE Connect Name[sv]=Skicka via KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் மூலம் அனுப்பு -Name[tr]=KDE Connect ile gönder +Name[tr]=KDE Bağlan ile gönder Name[uk]=Надіслати за допомогою KDE Connect Name[x-test]=xxSend via KDE Connectxx Name[zh_CN]=通过 KDE Connect 发送 diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index 14748549e..9c835f964 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -43,7 +43,7 @@ Name[sk]=Odoslať pomocou KDE Connect Name[sl]=Pošlji prek KDE Connect Name[sv]=Skicka via KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் மூலம் அனுப்பு -Name[tr]=KDE Connect ile gönder +Name[tr]=KDE Bağlan ile gönder Name[uk]=Надіслати за допомогою KDE Connect Name[x-test]=xxSend via KDE Connectxx Name[zh_CN]=通过 KDE Connect 发送 diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index b58c0f09c..476403579 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -36,7 +36,7 @@ GenericName[sk]=Otvoriť na pripojenom zariadení pomocou KDE Connect GenericName[sl]=Odpri na povezani napravi prek KDE Connect GenericName[sv]=Visa på ansluten apparat via KDE-anslut GenericName[ta]=கே.டீ.யீ. கனெக்ட் மூலம் இணைந்துள்ள சாதனத்தில் திற -GenericName[tr]=KDE Connect ile bağlı aygıtta aç +GenericName[tr]=KDE Bağlan ile bağlı aygıtta aç GenericName[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect GenericName[x-test]=xxOpen on connected device via KDE Connectxx GenericName[zh_CN]=通过 KDE Connect 在已连接的设备上打开 @@ -78,7 +78,7 @@ Name[sk]=Otvoriť na pripojenom zariadení pomocou KDE Connect Name[sl]=Odpri na povezani napravi prek KDE Connect Name[sv]=Visa på ansluten apparat via KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் மூலம் இணைந்துள்ள சாதனத்தில் திற -Name[tr]=KDE Connect aracılığıyla bağlı aygıtta aç +Name[tr]=KDE Bağlan aracılığıyla bağlı aygıtta aç Name[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect Name[x-test]=xxOpen on connected device via KDE Connectxx Name[zh_CN]=通过 KDE Connect在已连接的设备上打开 @@ -120,7 +120,7 @@ Comment[sk]=Otvorenie na pripojenom zariadení pomocou KDE Connect Comment[sl]=Odpri na povezani napravi z uporabo KDE Connect Comment[sv]=Visa på en ansluten apparat med användning av KDE-anslut Comment[ta]=கே.டீ.யீ. கனெக்ட் மூலம் இணைந்துள்ள சாதனத்தில் திற -Comment[tr]=KDE Connect kullanarak bağlı bir aygıtta açın +Comment[tr]=KDE Bağlan kullanarak bağlı bir aygıtta açın Comment[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect Comment[x-test]=xxOpen on a connected device using KDE Connectxx Comment[zh_CN]=通过 KDE Connect 在已连接的设备上打开 diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index e706915b0..adb5d4584 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -36,7 +36,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 Connect'i 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将文件发送到其他设备", @@ -82,7 +82,7 @@ "Name[sk]": "Odoslať súbor cez KDE Connect", "Name[sl]": "Pošlji datoteko prek KDE Connect", "Name[sv]": "Skicka fil via KDE:s anslutningstjänst", - "Name[tr]": "KDE Connect aracılığıyla dosya gönder", + "Name[tr]": "KDE Bağlan aracılığıyla dosya gönder", "Name[uk]": "Надіслати файл за допомогою KDE Connect", "Name[x-test]": "xxSend file via KDE Connectxx", "Name[zh_CN]": "通过 KDE Connect发送文件", diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index f603b9fc9..a3534df0a 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -39,7 +39,7 @@ Name[sr@ijekavian]=КДЕ‑конекцијин показатељ Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj Name[sr@latin]=KDE‑konekcijin pokazatelj Name[sv]=KDE-anslut indikator -Name[tr]=KDE Connect Göstergesi +Name[tr]=KDE Bağlan Göstergesi Name[uk]=Індикатор KDE Connect Name[x-test]=xxKDE Connect Indicatorxx Name[zh_CN]=KDE Connect 指示器 diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index d3a22363f..2519f5eb0 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -44,7 +44,7 @@ "Name[pt]": "KDE Connect", "Name[ru]": "KDE Connect", "Name[sl]": "KDE Connect", - "Name[tr]": "KDE Connect", + "Name[tr]": "KDE Bağlan", "Name[uk]": "KDE Connect", "Name[x-test]": "xxKDE Connectxx", "Name[zh_TW]": "KDE 連線" diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index ca3e4083d..73b8bba17 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -44,7 +44,7 @@ Name[sr@ijekavianlatin]=KDE‑konekcija Name[sr@latin]=KDE‑konekcija Name[sv]=KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் -Name[tr]=KDE Connect +Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Name[zh_CN]=KDE Connect @@ -92,7 +92,7 @@ Comment[sr@ijekavianlatin]=Prikazuje obaveštenja sa vašeg uređaja pomoću KDE Comment[sr@latin]=Prikazuje obaveštenja sa vašeg uređaja pomoću KDE‑konekcije Comment[sv]=Visa underrättelser från apparater med KDE anslut Comment[ta]=கே.டீ.யீ. கனெக்ட் மூலம் உங்கள் சாதனங்களிலிருந்து வரும் அறிவிப்புகளைக் காட்டும் -Comment[tr]=KDE Connect kullanılarak aygıtınızdan bildirimleri görüntüleyin +Comment[tr]=KDE Bağlan kullanılarak aygıtınızdan bildirimleri görüntüleyin Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE» Comment[x-test]=xxShow notifications from your devices using KDE Connectxx Comment[zh_CN]=通过 KDE Connect 显示来自其他设备的通知 diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 9ec7e4af1..0eb886e8b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -45,7 +45,7 @@ Name[sr@ijekavianlatin]=KDE‑konekcija Name[sr@latin]=KDE‑konekcija Name[sv]=KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் -Name[tr]=KDE Connect +Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Name[zh_CN]=KDE Connect diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop index 782d4b51c..06b99056c 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -45,7 +45,7 @@ Name[sr@ijekavianlatin]=Postavke za KDE‑konekciju Name[sr@latin]=Postavke za KDE‑konekciju Name[sv]=Inställning av KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் அமைப்புகள் -Name[tr]=KDE Connect Ayarları +Name[tr]=KDE Bağlan Ayarları Name[uk]=Параметри KDE Connect Name[x-test]=xxKDE Connect Settingsxx Name[zh_CN]=KDE Connect 设置 diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index 4b71ffaef..addc2ac87 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -36,7 +36,7 @@ Name[sk]=KDE Connect SMS Name[sl]=KDE Connect SMS Name[sv]=KDE-anslut SMS Name[ta]=கே.டீ.யீ. கனெக்ட் SMS -Name[tr]=KDE Connect SMS +Name[tr]=KDE Bağlan SMS Name[uk]=KDE Connect SMS Name[x-test]=xxKDE Connect SMSxx Name[zh_CN]=KDE Connect 短信 diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index 7bb8a2f34..0bcc215cf 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -44,7 +44,7 @@ Name[sr@ijekavianlatin]=KDE‑konekcija Name[sr@latin]=KDE‑konekcija Name[sv]=KDE-anslut Name[ta]=கே.டீ.யீ. கனெக்ட் -Name[tr]=KDE Connect +Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Name[zh_CN]=KDE Connect