diff options
| author | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-08-19 12:04:22 +0000 |
| commit | 438ede27dc86938275d4ea1d8bd57b1e174f6053 (patch) | |
| tree | d870eac6352d0ee940774751e858c414961da660 /src/views | |
| parent | 9c9c9be45db17b236a131f3209327ea79790fd96 (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 afd8276b3..cdec01b9d 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -11,6 +11,7 @@ Comment[de]=Versionskontroll-Modul für Dateiansichten Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων Comment[en_GB]=Version Control Plugin for File Views Comment[es]=Complemento de control de versiones para las vistas de archivos +Comment[et]=Failivaadete versioonihaldusplugin 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. |