mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-14 02:52:12 +01: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
7220a0a544
commit
f453cc458a
|
@ -17,7 +17,7 @@ Name[gl]=MiddleClickLoader
|
||||||
Name[ia]=MiddleClickLoader
|
Name[ia]=MiddleClickLoader
|
||||||
Name[id]=MiddleClickLoader
|
Name[id]=MiddleClickLoader
|
||||||
Name[it]=Caricatore al clic centrale
|
Name[it]=Caricatore al clic centrale
|
||||||
Name[ko]=가운데 단추 누름 로더
|
Name[ko]=가운데 단추 클릭 로더
|
||||||
Name[lt]=Įkėlimas viduriniojo mygtuko spustelėjimu
|
Name[lt]=Įkėlimas viduriniojo mygtuko spustelėjimu
|
||||||
Name[nl]=MiddleClickLoader
|
Name[nl]=MiddleClickLoader
|
||||||
Name[nn]=Lasting med midtklikk
|
Name[nn]=Lasting med midtklikk
|
||||||
|
|
Loading…
Reference in New Issue
Block a user