From cd9f45c1ed80e7c89772937c7980b1d88179e84a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 12 Dec 2018 06:07:35 +0100 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" --- juk.notifyrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/juk.notifyrc b/juk.notifyrc index 10fcd1a0..3b93c303 100644 --- a/juk.notifyrc +++ b/juk.notifyrc @@ -389,6 +389,6 @@ Comment[sv]=Använd sammanhangsberoende meny i systembrickan för att återstäl Comment[tr]=Geri yüklemek için sistem çekmecesindeki bağlam menüsünü kullanın. Comment[uk]=Скористайтеся контекстним меню піктограми системного лотка, щоб розгорнути вікно програми. Comment[x-test]=xxUse context menu in system tray to restore.xx -Comment[zh_CN]=在系统托盘中使用上下文菜单还原。 +Comment[zh_CN]=在系统托盘中使用右键菜单还原。 Comment[zh_TW]=用系統匣的內文選單來回復。 Action=Popup -- GitLab