Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -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-05-28 05:19:21 +02:00
parent e018e1a7c5
commit 3f471e6fd1
7 changed files with 12 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

@@ -6,6 +6,7 @@
"Description[ca]": "«Framebuffer» basat en el PipeWire per al KRfb.",
"Description[en_GB]": "PipeWire based Framebuffer for KRfb.",
"Description[es]": "Framebuffer basado en PipeWire para KRfb.",
"Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.",
"Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.",
"Description[sv]": "Rambuffert för Krfb baserad på PipeWire",
"Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.",
@@ -18,6 +19,7 @@
"Name[ca]": "«Framebuffer» del PipeWire per al KRfb",
"Name[en_GB]": "PipeWire Framebuffer for KRfb",
"Name[es]": "Framebuffer de PipeWire para KRfb",
"Name[nl]": "PipeWire-framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do PipeWire para o KRfb",
"Name[sv]": "PipeWire-rambuffert för Krfb",
"Name[uk]": "Буфер кадрів PipeWire для KRfb",