mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 12:46:35 +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
a75e26c5af
commit
91612fcb55
@ -106,7 +106,7 @@ Name[es]=Abrir nueva pestaña
|
|||||||
Name[et]=Uue kaardi avamine
|
Name[et]=Uue kaardi avamine
|
||||||
Name[fi]=Avaa uusi välilehti
|
Name[fi]=Avaa uusi välilehti
|
||||||
Name[fr]=Ouvrir un nouvel onglet
|
Name[fr]=Ouvrir un nouvel onglet
|
||||||
Name[gl]=Abrir unha lapela nova
|
Name[gl]=Abrir un novo separador
|
||||||
Name[id]=Buka tab baru
|
Name[id]=Buka tab baru
|
||||||
Name[it]=Apri una nuova scheda
|
Name[it]=Apri una nuova scheda
|
||||||
Name[ko]=새 탭 열기
|
Name[ko]=새 탭 열기
|
||||||
|
Loading…
Reference in New Issue
Block a user