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-18 05:22:56 +02:00
parent a4c4dd29a5
commit 8e51ddfb45
5 changed files with 10 additions and 0 deletions

View File

@@ -11,6 +11,7 @@
"Description[ko]": "KRfb용 PipeWire 기반 프레임버퍼입니다.",
"Description[nl]": "Op PipeWire gebaseerd framebuffer voor KRfb.",
"Description[pt]": "'Framebuffer' baseado no PipeWire para o KRfb.",
"Description[pt_BR]": "Framebuffer baseado no PipeWire para o KRfb.",
"Description[ru]": "Буфер кадров для KRfb на базе Framebuffer",
"Description[sv]": "Rambuffert för Krfb baserad på PipeWire",
"Description[uk]": "Буфер кадрів на основі PipeWire для KRfb.",
@@ -29,6 +30,7 @@
"Name[ko]": "KRfb용 PipeWire 프레임버퍼",
"Name[nl]": "PipeWire-framebuffer voor KRfb",
"Name[pt]": "'Framebuffer' do PipeWire para o KRfb",
"Name[pt_BR]": "Framebuffer PipeWire para o KRfb",
"Name[ru]": "Буфер кадров PipeWire для KRfb",
"Name[sv]": "PipeWire-rambuffert för Krfb",
"Name[uk]": "Буфер кадрів PipeWire для KRfb",