Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2019-04-08 05:48:04 +02:00
parent 1ca4a6791b
commit ae495bcc60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/MouseGestures/metadata.desktop
View File

@ -10,7 +10,7 @@ Name[es]=Gestos de ratón
Name[fi]=Hiirieleet Name[fi]=Hiirieleet
Name[fr]=Mouvements de souris Name[fr]=Mouvements de souris
Name[gl]=Xestos do rato Name[gl]=Xestos do rato
Name[id]=Gerak-gerik Mouse Name[id]=Gestur Mouse
Name[it]=Gesti del mouse Name[it]=Gesti del mouse
Name[nl]=Muisgebaren Name[nl]=Muisgebaren
Name[nn]=Muserørsler 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[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein
Comment[fr]=Prise en charge de la navigation Internet à l'aide de mouvements de la souris 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[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[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[nl]=Biedt ondersteuning voor navigeren in webpagina's door muisgebaren
Comment[nn]=Gjev støtte for muserørsler for nettsidenavigering Comment[nn]=Gjev støtte for muserørsler for nettsidenavigering