From c041da111e481bc2aefd0f3c72ed8158610bfdff Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 10 Oct 2020 09:50:45 +0200 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" --- menu/desktop/kf5-internet.directory | 2 +- runners/baloo/plasma-runner-baloosearch.desktop | 2 +- wallpapers/color/plasma-wallpaper-color.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/menu/desktop/kf5-internet.directory b/menu/desktop/kf5-internet.directory index 4ed2ec130..efe67e9d6 100644 --- a/menu/desktop/kf5-internet.directory +++ b/menu/desktop/kf5-internet.directory @@ -87,7 +87,7 @@ Name[ug]=ئىنتېرنېت Name[uk]=Інтернет Name[uz]=Internet Name[uz@cyrillic]=Интернет -Name[vi]=Internet +Name[vi]=Liên Mạng Name[wa]=Daegntoele Name[x-test]=xxInternetxx Name[zh_CN]=网络 diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index 930bae420..9c1e59203 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -86,7 +86,7 @@ Comment[sr@ijekavianlatin]=Traženje kroz fajlove, e‑poštu i kontakte Comment[sr@latin]=Traženje kroz fajlove, e‑poštu i kontakte Comment[tr]=Dosyalar, e-postalar ve kişiler arasında arar Comment[uk]=Засіб пошуку у файлах, повідомленнях електронної пошти та записах контактів -Comment[vi]=Tìm kiếm tệp, email và liên hệ +Comment[vi]=Tìm kiếm tệp, thư và liên hệ Comment[x-test]=xxSearches through files, emails and contactsxx Comment[zh_CN]=在文件、电子邮件和联系人中进行搜索 Comment[zh_TW]=搜尋檔案、電子郵件與聯絡人 diff --git a/wallpapers/color/plasma-wallpaper-color.desktop b/wallpapers/color/plasma-wallpaper-color.desktop index 59e428aba..9033b57a6 100644 --- a/wallpapers/color/plasma-wallpaper-color.desktop +++ b/wallpapers/color/plasma-wallpaper-color.desktop @@ -97,7 +97,7 @@ Comment[sr@ijekavianlatin]=Obična boja ili preliv Comment[sr@latin]=Obična boja ili preliv Comment[tr]=Düz veya gradyan bir renk Comment[uk]=Простий колір або градієнт -Comment[vi]=Một màu trơn hoặc gradient +Comment[vi]=Một màu trơn hoặc dốc màu Comment[x-test]=xxA plain color or gradientxx Comment[zh_CN]=纯色或渐变色 Comment[zh_TW]=簡單的顏色或漸層