From 1937681d50d12a8c1a7f21c854aa99d3f4b0277b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 9 Oct 2021 01:19:17 +0000 Subject: 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" --- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 1 file changed, 1 insertion(+) (limited to 'src/views/versioncontrol/fileviewversioncontrolplugin.desktop') diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 3867b88a2..d589acd31 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,6 +22,7 @@ Comment[hi]=फ़ाइल दृश्यों के लिए संस् Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kendali Versi untuk Tampilan File +Comment[is]=Útgáfustýringar-viðbót fyrir skráasýnir Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기용 버전 제어 플러그인 -- cgit v1.3