diff options
| author | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
| commit | a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee (patch) | |
| tree | 62bdee7282cac2994ff94f208593cf24b44d9d01 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 068c6e73209dd6e3f14e9ab8ef573a5dbdb71a2d (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 9896d9cae..4fedd4e04 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[en_GB]=Version Control Plugin for File Views 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. |