diff options
| author | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-13 05:34:06 +0200 |
| commit | 799c532d239c2c04cb7fe5014aceba449268fd3d (patch) | |
| tree | 48493d409c5b2d623e4b2bb1e470a00e61369737 /src/views/versioncontrol | |
| parent | 85f5156a332c5e2e38facf390dafd6a1fdf1c9a2 (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')
| -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 c3d4d1837..ec0bbbcd3 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -4,6 +4,7 @@ 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[az]=Fayl meneceri üçün versiyaya nəzarət əlavəsi 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 |