From 86dc0efbf8f1ca3d81146394a0f1e52fd9901eed Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Jan 2019 05:26:20 +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" --- desktop/konsole.notifyrc | 2 +- desktop/konsolehere.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/konsole.notifyrc b/desktop/konsole.notifyrc index 1c628aab..69f66016 100644 --- a/desktop/konsole.notifyrc +++ b/desktop/konsole.notifyrc @@ -792,7 +792,7 @@ Name[uz]=Seans nolga teng boʻlmagan holat bilan tugadi Name[uz@cyrillic]=Сеанс нолга тенг бўлмаган ҳолат билан тугади Name[wa]=Session fineye avou on statut nén zero Name[x-test]=xxSession Finished With Non-Zero Statusxx -Name[zh_CN]=非零状态完成的会话 +Name[zh_CN]=会话以非零状态完成 Name[zh_TW]=工作階段以不正常狀態結束 Comment=A session has exited with non-zero status Comment[af]='n Sessie het met 'n nie-zero status geëindig diff --git a/desktop/konsolehere.desktop b/desktop/konsolehere.desktop index 111ffd27..e41ed568 100644 --- a/desktop/konsolehere.desktop +++ b/desktop/konsolehere.desktop @@ -99,7 +99,7 @@ Name[vi]=Mở cửa sổ dòng lệnh ở đây Name[wa]=Drovi on terminå chal Name[xh]=Vula Isiphelo Sendlela Apha Name[x-test]=xxOpen Terminal Herexx -Name[zh_CN]=在此打开终端 +Name[zh_CN]=在此处打开终端 Name[zh_TW]=在這裡開啟終端機 Comment=Opens a terminal at the current folder