diff options
| author | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
| commit | 07dae709d9fe68283caa71d13468b3edc4f0e2be (patch) | |
| tree | f317df1201588aa67e72ee524db78360b57691c2 /src/views | |
| parent | f5fd8e5cfb43deb1ccb0fef76e335afbde088965 (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 1c673a5d5..f967fa4f1 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,6 +5,7 @@ Comment=Version Control Plugin for File Views Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory 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[fi]=Versionhallintaliitännäinen tiedostonäkymille |