From d5ab56bb9dd3ccbef508711b748df6965771b604 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 14 Mar 2026 01:38:33 +0000 Subject: [PATCH] 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" --- krfb/org.kde.krfb.desktop | 1 + krfb/org.kde.krfb.virtualmonitor.desktop.cmake | 2 ++ 2 files changed, 3 insertions(+) diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop index ccedd1e3..1e85536c 100755 --- a/krfb/org.kde.krfb.desktop +++ b/krfb/org.kde.krfb.desktop @@ -96,6 +96,7 @@ GenericName[gl]=Compartir o escritorio (VNC) GenericName[he]=שיתוף שולחנות עבודה (VNC) GenericName[hu]=Munkaasztal-megosztás (VNC) GenericName[ia]=Compartir de scriptorio (VNC) +GenericName[is]=Skjáborðsmiðlun (VNC) GenericName[it]=Condivisione del desktop (VNC) GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC). GenericName[ko]=데스크톱 공유(VNC) diff --git a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake index 0ad6dbb3..41899b9e 100644 --- a/krfb/org.kde.krfb.virtualmonitor.desktop.cmake +++ b/krfb/org.kde.krfb.virtualmonitor.desktop.cmake @@ -21,6 +21,7 @@ Name[gl]=Monitor virtual de KRFB Name[he]=הצג הווירטואלי של KRFB Name[hu]=KRFB virtuális monitor Name[ia]=Virtual Monitor de KRFB +Name[is]=KRFB-sýndarskjár Name[it]=Monitor virtuale di KRFB Name[ka]=KRFB-ის ვირტუალური ეკრანი Name[ko]=KRFBs 가상 모니터 @@ -58,6 +59,7 @@ Comment[gl]=Monitor virtual remoto Comment[he]=צג וירטואלי מרוחק Comment[hu]=Távoli virtuális monitor Comment[ia]=Monitor Virtual Remote +Comment[is]=Fjartengdur sýndarskjár Comment[it]=Monitor virtuale remoto Comment[ka]=დაშორებული ვირტუალური ეკრანი Comment[ko]=원격 가상 모니터