From 13963d92ef5e1d2662ea1e050b3db63d3cc107d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Aug 2024 03:08:47 +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" --- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 07bfd1d5f..e909c58a9 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -49,7 +49,7 @@ Name[tr]=KDE Bağlan Göstergesi Name[uk]=Індикатор KDE Connect Name[x-test]=xxKDE Connect Indicatorxx Name[zh_CN]=KDE Connect 指示器 -Name[zh_TW]=KDE 連線指示符號 +Name[zh_TW]=KDE 連線指示器 Comment=Display information about your devices Comment[ar]=اعرض معلومات عن أجهزتك Comment[az]=Cihazınız haqqında məlumatı gösətrmək