diff options
| author | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-11-11 09:42:43 +0100 |
| commit | 3984e607bb4437a38af16e007f1c23fbcff7dfb2 (patch) | |
| tree | 3f19b3d4d36c0f3eed6d827b771dcde9842bc63c /src/views | |
| parent | d8f9ca49d333540796713a8842a1bea7622d0444 (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')
| -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 efa6bb90c..a04f1cc60 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]=Failo rodinių versijų tvarkymo papildinys +Comment[lv]=Versiju kontroles spraudnis priekš datņu skata Comment[ml]=ഫയല് അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം Comment[nb]=Versjonskontrollmodul for filvisninger Comment[nl]=Plugin voor versiecontrole op bestandoverzichten |