1
0
mirror of https://invent.kde.org/network/krfb synced 2024-07-05 09:28:35 +00: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-09-05 05:19:48 +02:00
parent 853eeaa050
commit 7190908aa3
3 changed files with 4 additions and 0 deletions

View File

@ -4,6 +4,7 @@
"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[cs]": "Framebuffer založený na Pipe pro KRfb.",
"Description[de]": "PipeWire-basierter Framebuffer für KRfb.",
"Description[el]": "Μνήμη ανανέωσης με βάση το pipewire για το KRfb.",
"Description[en_GB]": "PipeWire based Framebuffer for KRfb.",
@ -32,6 +33,7 @@
"Name": "PipeWire Framebuffer for KRfb",
"Name[ca@valencia]": "«Framebuffer» del PipeWire per al KRfb",
"Name[ca]": "«Framebuffer» del PipeWire per al KRfb",
"Name[cs]": "PipeWire Framebuffer pro KRfb",
"Name[de]": "PipeWire-Framebuffer für KRfb",
"Name[el]": "Μνήμη ανανέωσης pipewire για το KRfb",
"Name[en_GB]": "PipeWire Framebuffer for KRfb",

View File

@ -5,6 +5,7 @@ X-KDE-ServiceType=krfb/events
Comment=Event plugins for KRfb
Comment[ca]=Connectors d'esdeveniments per al KRfb.
Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb.
Comment[cs]=Moduly událostí pro KRfb
Comment[de]=Ereignis-Module für KRfb
Comment[el]=Πρόσθετα γεγονότων για το KRfb
Comment[en_GB]=Event plugins for KRfb

View File

@ -3,6 +3,7 @@
"Description": "Events plugins for KRfb",
"Description[ca@valencia]": "Connectors d'esdeveniments per al KRfb.",
"Description[ca]": "Connectors d'esdeveniments per al KRfb.",
"Description[cs]": "Moduly událostí pro KRfb",
"Description[de]": "Ereignis-Module für KRfb",
"Description[el]": "Πρόσθετα γεγονότων για το KRfb",
"Description[en_GB]": "Events plugins for KRfb",