mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-13 10:32:11 +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
fce7bddcac
commit
b0acd55546
|
@ -96,7 +96,7 @@ GenericName[lt]=Saityno naršyklė
|
||||||
GenericName[nl]=Webbrowser
|
GenericName[nl]=Webbrowser
|
||||||
GenericName[nn]=Nettlesar
|
GenericName[nn]=Nettlesar
|
||||||
GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
|
GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ
|
||||||
GenericName[pl]=Przeglądarka internetowa
|
GenericName[pl]=Przeglądarka sieciowa
|
||||||
GenericName[pt]=Navegador Web
|
GenericName[pt]=Navegador Web
|
||||||
GenericName[pt_BR]=Navegador Web
|
GenericName[pt_BR]=Navegador Web
|
||||||
GenericName[ru]=Веб-браузер
|
GenericName[ru]=Веб-браузер
|
||||||
|
|
Loading…
Reference in New Issue
Block a user