From 22e7a1aa3dabe360f0135b91fb66bf0a9f7b9a17 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 21 Apr 2021 01:21:33 +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" --- desktop/konsolepart.desktop | 2 +- desktop/terminalemulator.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop/konsolepart.desktop b/desktop/konsolepart.desktop index 4782f3a1..e6258aa1 100644 --- a/desktop/konsolepart.desktop +++ b/desktop/konsolepart.desktop @@ -89,7 +89,7 @@ Name[sr@ijekavian]=Емулатор терминала Name[sr@ijekavianlatin]=Emulator terminala Name[sr@latin]=Emulator terminala Name[sv]=Terminalemulator -Name[ta]=கடைசி போட்டியாளர் +Name[ta]=முனையக் கருவி Name[te]=టెర్మినల్ ఎములేటర్ Name[tg]=Тақлидгари терминал Name[th]=โปรแกรมจำลองเทอร์มินัล diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop index 076511e0..7aad27d2 100644 --- a/desktop/terminalemulator.desktop +++ b/desktop/terminalemulator.desktop @@ -80,7 +80,7 @@ Name[sr@ijekavian]=Емулатор терминала Name[sr@ijekavianlatin]=Emulator terminala Name[sr@latin]=Emulator terminala Name[sv]=Terminalemulator -Name[ta]=கடைசி போட்டியாளர் +Name[ta]=முனையக் கருவி Name[te]=టెర్మినల్ ఎములేటర్ Name[tg]=Тақлидгари терминал Name[th]=โปรแกรมจำลองเทอร์มินัล