diff options
| author | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2020-09-10 06:35:50 +0200 |
| commit | 98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e (patch) | |
| tree | 4572b3604d0e83ff75e3f98a8e2c94c7b7339857 /src/views | |
| parent | 736c9958e7b97ac651a8d7074fd74650ddb5f1ab (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index d2fd13dae..7dc7ab875 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -44,7 +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 tin +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]=檔案檢視的版本控制外掛程式 |