mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 01:40:02 +00:00
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"
This commit is contained in:
parent
91eb6aa37a
commit
09dd74348e
|
@ -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]=파일 보기를 위한 버전 관리 플러그인
|
||||
|
|
Loading…
Reference in a new issue