From 8b12612bbf8ae4500a84634087a074d94a495eec Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 13 May 2015 11:01:45 +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 | 1 + 1 file changed, 1 insertion(+) (limited to 'src/views/versioncontrol') diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index d65c4da1b..737c35164 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -30,3 +30,4 @@ Comment[sv]=Insticksprogram för versionskontroll i filvyer Comment[uk]=Додаток керування версіями для панелей перегляду файлів Comment[x-test]=xxVersion Control Plugin for File Viewsxx Comment[zh_CN]=文件视图的版本控制插件 +Comment[zh_TW]=檔案檢視的版本控制外掛程式 -- cgit v1.3