diff options
| author | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-06-04 11:19:31 +0000 |
| commit | 1c1efb983c60ea57422317186047f744e23df114 (patch) | |
| tree | ee5cf5fa6ff7a7094138758ce0138ca1a257ae52 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 586252341ea69a60b64f404dd23ef93e59c1e16c (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 737c35164..ff7c492ac 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -6,6 +6,7 @@ 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[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. |