diff options
| author | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-06-17 16:57:19 +0200 |
| commit | d5c1ac07db9bf9d97cab3cc09918286870fa377c (patch) | |
| tree | 9fbd9bca7e1722e0f0a8196c110a1774ce5c2060 /src/views/versioncontrol/fileviewversioncontrolplugin.desktop | |
| parent | 418b225f89e39e06f8ce881ecb7889de31ad4c51 (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, 0 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index c3d4d1837..1d47a48b0 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -43,6 +43,5 @@ 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[x-test]=xxVersion Control Plugin for File Viewsxx Comment[zh_CN]=文件视图的版本控制插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 |