diff options
| author | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
| commit | bc8f3373fd98121fbe230842bbb104889961e6d7 (patch) | |
| tree | c7e72e274512eace488b9fab23293e009bb6d7cf /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 536d6ec8666ed89ed993aabb2a4982f8ebf5861c (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 f967fa4f1..172a991ac 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -3,6 +3,7 @@ Type=ServiceType X-KDE-ServiceType=FileViewVersionControlPlugin Comment=Version Control Plugin for File Views 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[de]=Versionskontroll-Modul für Dateiansichten Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων |