diff options
| author | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-03 07:12:29 +0200 |
| commit | f4e2593aa79cdc0483121507012b2045bf2e9703 (patch) | |
| tree | 0edd69eac7762c248bfa1e64195d35b5ad0273b7 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 4bd6e9fb1397373b6c113fc25f9b4e17764a1504 (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 b0dfc2707..1e4c5b381 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -17,7 +17,7 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f Comment[gl]=Complemento de control de versión para vistas de ficheiros. Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez Comment[ia]=Plugin de controlo de version pro vistas de file -Comment[id]=Plugin Kendali Versi untuk Tampilan Fail +Comment[id]=Plugin Kendali Versi untuk Tampilan File Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン Comment[ko]=파일 보기를 위한 버전 관리 플러그인 |