From f8c292c556b87a19e9099cc98bf0ab88424472b2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Sep 2021 01:28:18 +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 b82ac8483..3867b88a2 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -28,6 +28,7 @@ Comment[ko]=파일 보기용 버전 제어 플러그인 Comment[lt]=Failo rodinių versijų tvarkymo papildinys Comment[lv]=Versiju kontroles spraudnis priekš datņu skata Comment[ml]=ഫയൽ കാഴ്‌ചകൾക്കായുള്ള പതിപ്പ് നിയന്ത്രണ പ്ലഗിൻ +Comment[my]=ဖိုင်လ်မြင်ကွင်းများအတွက် ဗားရှင်းထိန်းချုပ်ပလပ်ဂင် Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar -- cgit v1.3