From 329ea4b4ffff597f305e6899c93ddad081468122 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 20 Sep 2020 05:41:08 +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" --- examples/applets/bugreport/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/applets/bugreport/metadata.desktop b/examples/applets/bugreport/metadata.desktop index 3d496e729..ef87ff57e 100644 --- a/examples/applets/bugreport/metadata.desktop +++ b/examples/applets/bugreport/metadata.desktop @@ -42,7 +42,7 @@ Comment[sv]=Rapportera ett fel i Plasma Comment[tg]=Гузориш дар бораи хатои Plasma Comment[tr]=Plasma'da hata raporla Comment[uk]=Повідомити про ваду у Плазмі -Comment[vi]=Báo cáo một lỗi trong Plasma +Comment[vi]=Báo một lỗi trong Plasma Comment[x-test]=xxReport a bug in Plasmaxx Comment[zh_CN]=报告 Plasma 的错误 Comment[zh_TW]=在 Plasma 中回報問題