From 6095b4bf832260bc37eb4bdd205d122d710bfe09 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 17 Apr 2022 01:50:43 +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 9282a7c5..f01de49e 100644 --- a/desktop/konsolepart.desktop +++ b/desktop/konsolepart.desktop @@ -93,7 +93,7 @@ Name[ta]=முனைய செயலி Name[te]=టెర్మినల్ ఎములేటర్ Name[tg]=Тақлидгари терминал Name[th]=โปรแกรมจำลองเทอร์มินัล -Name[tr]=Uçbirim Öykünücüsü +Name[tr]=Uçbirim Öykünücü Name[ug]=تېرمىنال تەقلىدلەشتۈرگۈچ Name[uk]=Емулятор термінала Name[uz]=Terminal emulyatori diff --git a/desktop/terminalemulator.desktop b/desktop/terminalemulator.desktop index bc3d0b07..9b022d6c 100644 --- a/desktop/terminalemulator.desktop +++ b/desktop/terminalemulator.desktop @@ -84,7 +84,7 @@ Name[ta]=முனைய செயலி Name[te]=టెర్మినల్ ఎములేటర్ Name[tg]=Тақлидгари терминал Name[th]=โปรแกรมจำลองเทอร์มินัล -Name[tr]=Uçbirim Öykünücüsü +Name[tr]=Uçbirim Öykünücü Name[ug]=تېرمىنال تەقلىدلەشتۈرگۈچ Name[uk]=Емулятор термінала Name[uz]=Terminal emulyatori