1
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:
l10n daemon script 2022-04-17 02:59:00 +00:00
parent 7220a0a544
commit f453cc458a

View File

@ -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