diff options
| author | l10n daemon script <[email protected]> | 2018-06-05 05:34:15 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-06-05 05:34:15 +0200 |
| commit | a8bd6f4b1f65d402aacc2d66097fc0cbde870028 (patch) | |
| tree | a3de7379606d7896e98f2b3047a24c095f2198ce /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 3c6ecfa246c17077f2e84a45e56da8943d6db1c3 (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 b42ed91a6..71d1603e6 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[ar]=ملحقة تحكّم بالإصدارات لمناظير الملفّات +Comment[ast]=Complementu de control de versiones pa les 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 |