diff options
| author | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2019-10-28 05:14:09 +0100 |
| commit | e6dc4739c3c7373f203a27cde2e31f8de1811e3a (patch) | |
| tree | 9efbf8d07ef03e85bc43f5b88e934a69bdca4d2e /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | a516f46b44b0ac5b770a2065a9da15ba97d4a3b0 (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index a3b45fc42..efa6bb90c 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -22,7 +22,7 @@ Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kendali Versi untuk Tampilan File Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン -Comment[ko]=파일 보기를 위한 버전 관리 플러그인 +Comment[ko]=파일 보기용 버전 제어 플러그인 Comment[lt]=Failo rodinių versijų tvarkymo papildinys Comment[ml]=ഫയല് അവതരണദിശകൾക്കുള്ള പതിപ്പ് നിയന്ത്രണ സംയോജകം Comment[nb]=Versjonskontrollmodul for filvisninger |