diff options
| author | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-05-13 11:01:45 +0000 |
| commit | 8b12612bbf8ae4500a84634087a074d94a495eec (patch) | |
| tree | 2f32689ede0d74a38b7e81c88629e4419c41bf0f /src/views | |
| parent | a72543484b1358b29a06f2f45b065ad822981738 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
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]=檔案檢視的版本控制外掛程式 |