kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2017-12-28 04:40:23 +01:00
parent c0e6342b7f
commit 7aa6a8ec1e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/versioncontrol/fileviewversioncontrolplugin.desktop
View file

@ -17,7 +17,7 @@ Comment[fr]=Module externe pour le contrôle de version applicable aux vues de f
Comment[gl]=Complemento de control de versión para vistas de ficheiros.
Comment[hu]=Verziókezelő bővítmény a fájlnézetekhez
Comment[ia]=Plugin de controlo de version pro vistas de file
Comment[id]=Plugin Kontrol Versi untuk Tampilan Berkas
Comment[id]=Plugin Kendali Versi untuk Tampilan Berkas
Comment[it]=Estensione di controllo delle versioni per le viste dei file
Comment[ja]=ファイルビューのためのバージョン管理プラグイン
Comment[ko]=파일 보기를 위한 버전 관리 플러그인