mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +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
0309bb1818
commit
82cfc125f4
|
@ -124,6 +124,7 @@ Name[hu]=Kompakt
|
||||||
Name[ia]=Compacte
|
Name[ia]=Compacte
|
||||||
Name[id]=Sederhana
|
Name[id]=Sederhana
|
||||||
Name[it]=Compatta
|
Name[it]=Compatta
|
||||||
|
Name[ja]=コンパクト
|
||||||
Name[ko]=축소됨
|
Name[ko]=축소됨
|
||||||
Name[lt]=Kompaktiškas
|
Name[lt]=Kompaktiškas
|
||||||
Name[nb]=Kompakt
|
Name[nb]=Kompakt
|
||||||
|
|
|
@ -198,6 +198,7 @@ X-KDE-Keywords[hu]=fájlkezelő
|
||||||
X-KDE-Keywords[ia]=gerente de file
|
X-KDE-Keywords[ia]=gerente de file
|
||||||
X-KDE-Keywords[id]=manajer berkas
|
X-KDE-Keywords[id]=manajer berkas
|
||||||
X-KDE-Keywords[it]=gestore dei file
|
X-KDE-Keywords[it]=gestore dei file
|
||||||
|
X-KDE-Keywords[ja]=ファイルマネージャ
|
||||||
X-KDE-Keywords[ko]=파일 관리자
|
X-KDE-Keywords[ko]=파일 관리자
|
||||||
X-KDE-Keywords[lt]=Failų tvarkyklė
|
X-KDE-Keywords[lt]=Failų tvarkyklė
|
||||||
X-KDE-Keywords[nb]=filbehandler
|
X-KDE-Keywords[nb]=filbehandler
|
||||||
|
|
|
@ -199,6 +199,7 @@ X-KDE-Keywords[hu]=fájlkezelő
|
||||||
X-KDE-Keywords[ia]=gerente de file
|
X-KDE-Keywords[ia]=gerente de file
|
||||||
X-KDE-Keywords[id]=manajer berkas
|
X-KDE-Keywords[id]=manajer berkas
|
||||||
X-KDE-Keywords[it]=gestore dei file
|
X-KDE-Keywords[it]=gestore dei file
|
||||||
|
X-KDE-Keywords[ja]=ファイルマネージャ
|
||||||
X-KDE-Keywords[ko]=파일 관리자
|
X-KDE-Keywords[ko]=파일 관리자
|
||||||
X-KDE-Keywords[lt]=Failų tvarkyklė
|
X-KDE-Keywords[lt]=Failų tvarkyklė
|
||||||
X-KDE-Keywords[nb]=filbehandler
|
X-KDE-Keywords[nb]=filbehandler
|
||||||
|
|
|
@ -154,6 +154,7 @@ X-KDE-Keywords[hu]=fájlkezelő
|
||||||
X-KDE-Keywords[ia]=gerente de file
|
X-KDE-Keywords[ia]=gerente de file
|
||||||
X-KDE-Keywords[id]=manajer berkas
|
X-KDE-Keywords[id]=manajer berkas
|
||||||
X-KDE-Keywords[it]=gestore dei file
|
X-KDE-Keywords[it]=gestore dei file
|
||||||
|
X-KDE-Keywords[ja]=ファイルマネージャ
|
||||||
X-KDE-Keywords[ko]=파일 관리자
|
X-KDE-Keywords[ko]=파일 관리자
|
||||||
X-KDE-Keywords[lt]=Failų tvarkyklė
|
X-KDE-Keywords[lt]=Failų tvarkyklė
|
||||||
X-KDE-Keywords[nb]=filbehandler
|
X-KDE-Keywords[nb]=filbehandler
|
||||||
|
|
|
@ -199,6 +199,7 @@ X-KDE-Keywords[hu]=fájlkezelő
|
||||||
X-KDE-Keywords[ia]=gerente de file
|
X-KDE-Keywords[ia]=gerente de file
|
||||||
X-KDE-Keywords[id]=manajer berkas
|
X-KDE-Keywords[id]=manajer berkas
|
||||||
X-KDE-Keywords[it]=gestore dei file
|
X-KDE-Keywords[it]=gestore dei file
|
||||||
|
X-KDE-Keywords[ja]=ファイルマネージャ
|
||||||
X-KDE-Keywords[ko]=파일 관리자
|
X-KDE-Keywords[ko]=파일 관리자
|
||||||
X-KDE-Keywords[lt]=Failų tvarkyklė
|
X-KDE-Keywords[lt]=Failų tvarkyklė
|
||||||
X-KDE-Keywords[nb]=filbehandler
|
X-KDE-Keywords[nb]=filbehandler
|
||||||
|
|
Loading…
Reference in a new issue