diff options
| author | l10n daemon script <[email protected]> | 2020-09-10 10:12:36 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-10 10:12:36 +0200 |
| commit | 214b0172661d9907ac2959f6331b3331f0b827f9 (patch) | |
| tree | 48a00013ffabd496882d31a478cd86489e333d2c /src/views/versioncontrol | |
| parent | ae5ac1dbb8b960925366710ed5cc4906d1643e46 (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 ec0bbbcd3..7dc7ab875 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -44,6 +44,7 @@ Comment[sr@latin]=Priključak upravljanja verzijama za fajl prikaze Comment[sv]=Insticksprogram för versionskontroll i filvyer Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[uk]=Додаток керування версіями для панелей перегляду файлів +Comment[vi]=Phần bổ sung Quản lí Phiên bản cho khung xem tệp Comment[x-test]=xxVersion Control Plugin for File Viewsxx Comment[zh_CN]=文件视图的版本控制插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 |