From e76bf5cb18ca46a0adc84ead3801726814cf6fd3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Aug 2021 01:28:23 +0000 Subject: 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" --- src/views/versioncontrol/fileviewversioncontrolplugin.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/views/versioncontrol') diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 26bee0bce..b82ac8483 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -49,5 +49,5 @@ Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[uk]=Додаток керування версіями для панелей перегляду файлів Comment[vi]=Phần cài cắm "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_CN]=文件视图的版本控制系统插件 Comment[zh_TW]=檔案檢視的版本控制外掛程式 -- cgit v1.3