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
2026-03-14 01:38:33 +00:00
parent 475b8b58a1
commit d5ab56bb9d
2 changed files with 3 additions and 0 deletions

View File

@@ -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)

View File

@@ -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]=