diff options
| author | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
| commit | 0fc2c24039bc0cf7ff0f4db4697254fea6947eeb (patch) | |
| tree | 9ba487046c78c781cbc9db8aeb84ddbda1b9e5ad /src/views | |
| parent | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (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 172a991ac..13bf4066d 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -2,6 +2,7 @@ Type=ServiceType X-KDE-ServiceType=FileViewVersionControlPlugin Comment=Version Control Plugin for File Views +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 |