diff options
| author | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-05-22 05:14:39 +0200 |
| commit | 22f78c474acec7e2c4a81caa8a4a2d0025bec663 (patch) | |
| tree | 72496d0ecdcd3cc866da8fa7cb398083277f8829 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 1b985d1ef400de024ed221264a55fd58affdec0c (diff) | |
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"
Diffstat (limited to 'src/views/versioncontrol/fileviewversioncontrolplugin.desktop')
| -rw-r--r-- | src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 71d1603e6..72c02b735 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -24,6 +24,7 @@ Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기를 위한 버전 관리 플러그인 Comment[lt]=Versijų kontrolės papildinys failų tvarkyklėms +Comment[ml]=ഫയല് അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten Comment[nn]=Versjonskontroll-tillegg for filvisingar |