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
1ca4a6791b
commit
ae495bcc60
@ -10,7 +10,7 @@ Name[es]=Gestos de ratón
|
||||
Name[fi]=Hiirieleet
|
||||
Name[fr]=Mouvements de souris
|
||||
Name[gl]=Xestos do rato
|
||||
Name[id]=Gerak-gerik Mouse
|
||||
Name[id]=Gestur Mouse
|
||||
Name[it]=Gesti del mouse
|
||||
Name[nl]=Muisgebaren
|
||||
Name[nn]=Muserørsler
|
||||
@ -34,7 +34,7 @@ Comment[es]=Implementa la navegación en páginas web mediante gestos de ratón
|
||||
Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein
|
||||
Comment[fr]=Prise en charge de la navigation Internet à l'aide de mouvements de la souris
|
||||
Comment[gl]=Permite navegar por páxinas web con acenos co rato
|
||||
Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gerak-gerik mouse
|
||||
Comment[id]=Menyediakan dukungan untuk menavigasi dalam halaman web dengan gestur mouse
|
||||
Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse
|
||||
Comment[nl]=Biedt ondersteuning voor navigeren in webpagina's door muisgebaren
|
||||
Comment[nn]=Gjev støtte for muserørsler for nettsidenavigering
|
||||
|
Loading…
Reference in New Issue
Block a user