mirror of
https://github.com/KDE/krfb
synced 2026-07-01 07:31:16 -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:
@@ -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)
|
||||
|
||||
@@ -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]=원격 가상 모니터
|
||||
|
||||
Reference in New Issue
Block a user