mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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
026320183c
commit
1162a5cf20
|
@ -9,7 +9,7 @@ Name[es]=Validar página
|
||||||
Name[fi]=Tarkista sivu
|
Name[fi]=Tarkista sivu
|
||||||
Name[fr]=Valider la page
|
Name[fr]=Valider la page
|
||||||
Name[gl]=Validar a páxina
|
Name[gl]=Validar a páxina
|
||||||
Name[id]=Validasi halaman
|
Name[id]=Absahkan halaman
|
||||||
Name[it]=Convalida la pagina
|
Name[it]=Convalida la pagina
|
||||||
Name[ko]=페이지 검사
|
Name[ko]=페이지 검사
|
||||||
Name[nl]=Pagina valideren
|
Name[nl]=Pagina valideren
|
||||||
|
|
Loading…
Reference in New Issue
Block a user