1
0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07: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:
l10n daemon script
2019-07-31 05:17:18 +02:00
parent b0712e1874
commit a360e5c8ae
10 changed files with 20 additions and 6 deletions

View File

@@ -6,6 +6,7 @@ Comment[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per
Comment[en_GB]=X11 XFakeInput based event handler for KRfb
Comment[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb
Comment[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
Comment[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
Comment[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
Comment[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
Comment[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러
@@ -24,6 +25,7 @@ Name[ca@valencia]=Gestor d'esdeveniments basat en el XFakeInput de l'X11 per al
Name[en_GB]=X11 XFakeInput based event handler for KRfb
Name[es]=Gestor de eventos basado en XFakeInput de X11 para KRfb
Name[eu]=KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea
Name[fi]=KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä
Name[gl]=Xestor de eventos para KRfb baseado no XFakeInput de X11
Name[it]=Gestore eventi basato su XFakeInput di X11 per KRfb
Name[ko]=X11 XFakeInput 기반 KRfb 이벤트 핸들러

View File

@@ -7,6 +7,7 @@
"Description[en_GB]": "X11 XFakeInput based event handler for KRfb",
"Description[es]": "Gestor de eventos basado en XFakeInput de X11 para KRfb",
"Description[eu]": "KRfb-rako «X11 XFakeInput»en oinarritutako gertaera maneiatzailea",
"Description[fi]": "KRfb:n X11 XFakeInput -pohjainen tapahtumakäsittelijä",
"Description[gl]": "Xestor de eventos para KRfb baseado no XFakeInput de X11",
"Description[it]": "Gestore eventi basato su XFakeInput di X11 per KRfb",
"Description[ko]": "X11 XFakeInput 기반 KRfb 이벤트 핸들러",
@@ -28,6 +29,7 @@
"Name[en_GB]": "X11 Event handler for KRfb",
"Name[es]": "Gestor de eventos de X11 para KRfb",
"Name[eu]": "KRfb-rako X11 gertaera maneiatzailea",
"Name[fi]": "KRfb:n X11-tapahtumakäsittelijä",
"Name[gl]": "Xestor de eventos de X11 para KRfb",
"Name[it]": "Gestore eventi X11 per KRfb",
"Name[ko]": "KRfb X11 이벤트 핸들러",

View File

@@ -6,6 +6,7 @@ Comment[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per a
Comment[en_GB]=Xdg-desktop-portal based event handler for KRfb
Comment[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb
Comment[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
Comment[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
Comment[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
Comment[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
Comment[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러
@@ -24,6 +25,7 @@ Name[ca@valencia]=Gestor d'esdeveniments basat en el Xdg-desktop-portal per al K
Name[en_GB]=Xdg-desktop-portal based event handler for KRfb
Name[es]=Gestor de eventos basado en Xdg-desktop-portal para KRfb
Name[eu]=KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea
Name[fi]=KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä
Name[gl]=Xestor de eventos para KRfb baseado en Xdg-desktop-portal
Name[it]=Gestore eventi basato su xdg-desktop-portal per KRfb
Name[ko]=Xdg-desktop-portal 기반 KRfb 이벤트 핸들러

View File

@@ -7,6 +7,7 @@
"Description[en_GB]": "Xdg-desktop-portal based event handler for KRfb",
"Description[es]": "Gestor de eventos basado en Xdg-desktop-portal para KRfb",
"Description[eu]": "KRfb-rako «xdg-desktop-portal»en oinarritutako maneiatzailea",
"Description[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
"Description[gl]": "Xestor de eventos para KRfb baseado en Xdg-desktop-portal",
"Description[it]": "Gestore eventi basato su xdg-desktop-portal per KRfb",
"Description[ko]": "Xdg-desktop-portal 기반 KRfb 이벤트 핸들러",
@@ -28,6 +29,7 @@
"Name[en_GB]": "Xdg-desktop-portal Event handler for KRfb",
"Name[es]": "Gestor de eventos de Xdg-desktop-portal para KRfb",
"Name[eu]": "KRfb-rako «xdg-desktop-portal» gertaera maneiatzailea",
"Name[fi]": "KRfb:n XDG-desktop-portal-pohjainen tapahtumakäsittelijä",
"Name[gl]": "Xestor de eventos de Xdg-desktop-portal para KRfb",
"Name[it]": "Gestore eventi xdg-desktop-portal per KRfb",
"Name[ko]": "KRfb Xdg-desktop-portal 이벤트 핸들러",

View File

@@ -4,9 +4,11 @@
"Description": "PipeWire based Framebuffer for KRfb.",
"Description[ca@valencia]": "«Framebuffer» basat en el PipeWire per al KRfb.",
"Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.",
"Description[de]": "PipeWire-basierter Framebuffer für KRfb.",
"Description[en_GB]": "PipeWire based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en PipeWire para KRfb.",
"Description[eu]": "KRfb-rako «PipeWire»n oinarritutako «Framebuffer».",
"Description[fi]": "KRfb:n PipeWire-pohjainen kehyspuskuri.",
"Description[gl]": "Búfer de fotograma para KRfb baseado en PipeWire.",
"Description[it]": "Framebuffer basato su PipeWire per KRfb.",
"Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.",
@@ -26,9 +28,11 @@
"Name": "PipeWire Framebuffer for KRfb",
"Name[ca@valencia]": "«Framebuffer» del PipeWire per al KRfb",
"Name[ca]": "«Framebuffer» del PipeWire per al KRfb",
"Name[de]": "PipeWire-Framebuffer für KRfb",
"Name[en_GB]": "PipeWire Framebuffer for KRfb",
"Name[es]": "Framebuffer de PipeWire para KRfb",
"Name[eu]": "KRfb-rako «PipeWire Framebuffer»",
"Name[fi]": "KRfb:n PipeWire-kehyspuskuri",
"Name[gl]": "Búfer de fotograma de PipeWire para KRfb",
"Name[it]": "Framebuffer PipeWire per KRfb",
"Name[ko]": "KRfb용 PipeWire 프레임버퍼",

View File

@@ -5,13 +5,13 @@
"Description[ca]": "«Framebuffer» basat en les Qt per al KRfb.",
"Description[cs]": "Framebuffer založený na Qt pro KRfb.",
"Description[da]": "Qt-baseret framebuffer til KRfb.",
"Description[de]": "Qt-basierter Framebuffer für KRfb",
"Description[de]": "Qt-basierter Framebuffer für KRfb.",
"Description[el]": "Μνήμη ανανέωσης βίντεο με βάση τhn Qt για το KRfb.",
"Description[en_GB]": "Qt based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en Qt para KRfb.",
"Description[et]": "KRfb Qt põhine kaadripuhver",
"Description[eu]": "KRfb-rako Qt-n oinarritutako «Framebuffer».",
"Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle",
"Description[fi]": "KRfb:n Qt-pohjainen kehyspuskuri.",
"Description[fr]": "Tampon d'images utilisant Qt pour KRfb.",
"Description[gl]": "Framebuffer baseado en Qt para KRfb.",
"Description[ia]": "Framebuffer basate sur Qt per KRfb",
@@ -50,7 +50,7 @@
"Name[es]": "Framebuffer de Qt para KRfb",
"Name[et]": "KRfb Qt kaadripuhver",
"Name[eu]": "KRfb-rako Qt «Framebuffer»",
"Name[fi]": "QT-kehyspuskuri KRfb:lle",
"Name[fi]": "KRfb:n Qt-kehyspuskuri",
"Name[fr]": "Tampon d'images Qt pour KRfb",
"Name[gl]": "Framebuffer de Qt para KRfb",
"Name[ia]": "Framebuffer Qt per KRfb",

View File

@@ -11,7 +11,7 @@
"Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.",
"Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver",
"Description[eu]": "KRfb-rako «X11 XDamage/XShm»en oinarritutako «Framebuffer».",
"Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.",
"Description[fi]": "KRfb:n X11 XDamage/XShm -pohjainen kehyspuskuri.",
"Description[fr]": "Tampon d'images utilisant XDamage/XShm de X11 pour KRfb.",
"Description[gl]": "Framebuffer baseado en X11 XDamage/Xshm para XRfb.",
"Description[ia]": "Framebuffer basate sur X11 XDamage/XShm per KRfb.",
@@ -50,7 +50,7 @@
"Name[es]": "Framebuffer X11 para KRfb",
"Name[et]": "KRfb X11 kaadripuhver",
"Name[eu]": "KRfb-rako «X11 Framebuffer»",
"Name[fi]": "X11-kehyspuskuri KRfb:lle",
"Name[fi]": "KRfb:n X11-kehyspuskuri",
"Name[fr]": "Tampon d'images X11 pour KRfb",
"Name[gl]": "Framebuffer de X11 para KRfb",
"Name[ia]": "Framebuffer X11 per KRfb",

View File

@@ -9,6 +9,7 @@ Comment[de]=Ereignis-Module für KRfb
Comment[en_GB]=Event plugins for KRfb
Comment[es]=Complementos de eventos para KRfb
Comment[eu]=KRfb-rako gertaeren pluginak
Comment[fi]=KRfb:n tapahtumaliitännäinen
Comment[fr]=Modules externes d'événements pour Krfb
Comment[gl]=Complementos de eventos para KRfb
Comment[it]=Estensioni degli eventi per KRfb

View File

@@ -7,6 +7,7 @@
"Description[en_GB]": "Events plugins for KRfb",
"Description[es]": "Complementos de eventos para KRfb",
"Description[eu]": "KRfb-rako gertaeren pluginak",
"Description[fi]": "KRfb:n tapahtumaliitännäinen",
"Description[gl]": "Complementos de eventos para KRfb",
"Description[it]": "Estensioni degli eventi per KRfb",
"Description[ko]": "KRfb 이벤트 플러그인",

View File

@@ -11,7 +11,7 @@
"Description[es]": "Complementos de framebuffer para KRfb",
"Description[et]": "KRfb kaadripuhvri pluginad",
"Description[eu]": "KRfb-rako «Frame Buffer» pluginak",
"Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb",
"Description[fi]": "KRfb:n kehyspuskuriliitännäinen",
"Description[fr]": "Modules de tampons d'image pour KRfb",
"Description[gl]": "Complemento de búfer de fotograma para KRfb",
"Description[ia]": "Plug-ins de Frame Buffer per KRfb",