diff options
| author | l10n daemon script <[email protected]> | 2020-09-14 09:58:23 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-14 09:58:23 +0200 |
| commit | 65c2d95a7dca988f0ead00e105b8aad0c57732f7 (patch) | |
| tree | 9955740ef44c454ae65be0a0443a71ea49452c20 /src/views/versioncontrol | |
| parent | 214b0172661d9907ac2959f6331b3331f0b827f9 (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 7dc7ab875..26d9993fc 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -34,6 +34,7 @@ Comment[pa]=ਫਾਇਲ ਝਲਕ ਲਈ ਵਰਜਨ ਕੰਟਰੋਲ ਪਲ Comment[pl]=Wtyczka systemu zarządzania wersjami dla widoku plików Comment[pt]='Plugin' de Controlo de Versões para as Áreas de Ficheiros Comment[pt_BR]=Extensão de controle de versões para as visualizações de arquivos +Comment[ro]=Extensie de control al versiunilor pentru vizualizări de fișiere Comment[ru]=Расширение для управления версиями для компонента просмотра папки Comment[sk]=Modul pre správu verzií v súborovom zobrazení Comment[sl]=Vstavek za delo s sistemi za nadzor različic |