diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 12:20:08 +0000 |
| commit | fe6a7ac9f8b5ce6180fe265ac95b524ecc7805f6 (patch) | |
| tree | 5eeee98ea7fb438017c7d93dd98d5065a33a1ba5 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | bed16191b5e9253d8658c0dac0d336b3dab5e0e3 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 80a17efc6..57a5883b7 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -6,6 +6,7 @@ Comment[ast]=Complementu de control de versiones pa vistes de ficheros Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory +Comment[da]=Versionsstyringsplugin til filvisninger Comment[de]=Versionskontroll-Modul für Dateiansichten Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων Comment[en_GB]=Version Control Plugin for File Views |