From 2c29c7ed28f7389ec79907760311fce3a26622c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 6 Feb 2020 05:34:55 +0100 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/views/versioncontrol/fileviewversioncontrolplugin.desktop') diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index a04f1cc60..c3d4d1837 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -25,7 +25,7 @@ Comment[ja]=ファイルビューのためのバージョン管理プラグイ Comment[ko]=파일 보기용 버전 제어 플러그인 Comment[lt]=Failo rodinių versijų tvarkymo papildinys Comment[lv]=Versiju kontroles spraudnis priekš datņu skata -Comment[ml]=ഫയല്‍ അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം +Comment[ml]=ഫയൽ കാഴ്‌ചകൾക്കായുള്ള പതിപ്പ് നിയന്ത്രണ പ്ലഗിൻ Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar -- cgit v1.3