diff options
| author | l10n daemon script <[email protected]> | 2022-07-02 02:06:49 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-02 02:06:49 +0000 |
| commit | 58a7772a19204f467432d098253a32f0fc705b34 (patch) | |
| tree | 8f568f96ce4d09e00deb4379b6c0c0af939d3a19 /src/views | |
| parent | 66505d643cb1612cdcf13743de6f8999225fa93c (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 bf788612f..78eb76b8c 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,6 +5,7 @@ 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[bg]=Приставка за контрол на версиите за преглед на файлове 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 |