diff options
| author | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-16 13:31:20 +0000 |
| commit | a8a4981b2c58090c01cc96da933022909d6adf6b (patch) | |
| tree | 05b8a39ae915503b8fe9b63b00d399a415d642d4 /src/views | |
| parent | 1c1efb983c60ea57422317186047f744e23df114 (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 ff7c492ac..8f3966958 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -10,6 +10,7 @@ Comment[es]=Complemento de control de versiones para las vistas de archivos Comment[fi]=Versionhallintaliitännäinen tiedostonäkymille Comment[fr]=Module externe pour le contrôle de version applicable aux vues de fichiers Comment[gl]=Complemento de control de versión para vistas de ficheiros. +Comment[ia]=Plugin de controlo de version pro vistas de file Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas Comment[it]=Estensione di controllo delle versioni per le viste dei file Comment[ja]=ファイルビューのためのバージョン管理プラグイン |