diff options
| author | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-02-06 05:34:55 +0100 |
| commit | 2c29c7ed28f7389ec79907760311fce3a26622c2 (patch) | |
| tree | 6a2ff416f91767db8b3d9db03195a2e3a3630a44 /src/views | |
| parent | 7002dc4e8aacf29826864271c0d11d20d94b4b7b (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 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |