syncfront/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:31:16 -07:00
Code Issues Packages Projects Releases Wiki 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-09-05 09:09:34 +02:00
parent 28fbf6c89c
commit 7a42bd3b65
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framebuffers/pipewire/krfb_framebuffer_pw.json
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[en_GB]": "PipeWire based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en PipeWire para KRfb.",
@@ -31,6 +32,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[en_GB]": "PipeWire Framebuffer for KRfb",
"Name[es]": "Framebuffer de PipeWire para KRfb",

1
krfb/krfb-events.desktop
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[en_GB]=Event plugins for KRfb
Comment[es]=Complementos de eventos para KRfb

1
krfb/krfb-events.json
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[en_GB]": "Events plugins for KRfb",
"Description[es]": "Complementos de eventos para KRfb",