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
f72e3dc341
commit
8e9baf047f
|
@ -187,7 +187,7 @@ Name[fi]=Avaa uusi ikkuna
|
|||
Name[fr]=Ouvrir une nouvelle fenêtre
|
||||
Name[gl]=Abrir unha xanela nova
|
||||
Name[ia]=Aperi nove fenestra
|
||||
Name[id]=Buka window baru
|
||||
Name[id]=Buka jendela baru
|
||||
Name[is]=Opna nýjan glugga
|
||||
Name[it]=Apre una nuova finestra
|
||||
Name[ka]=ახალ ფანჯრის გახსნა
|
||||
|
|
Loading…
Reference in New Issue
Block a user