mirror of
https://invent.kde.org/network/krfb
synced 2024-07-08 20:15:53 +00: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:
parent
9b26c11c2f
commit
384cfdcbed
|
@ -11,6 +11,7 @@ Name[el]=Εικονική οθόνη του KRFB
|
|||
Name[es]=Monitor virtual de KRFB
|
||||
Name[fr]=Moniteur virtuel « Krfb »
|
||||
Name[ia]=Virtual Monitor de KRFB
|
||||
Name[it]=Monitor virtuale di KRFB
|
||||
Name[ko]=KRFBs 가상 모니터
|
||||
Name[nl]=Virtuele monitor van KRFB
|
||||
Name[pl]=Monitor wirtualny KRFB
|
||||
|
@ -27,6 +28,7 @@ Comment[el]=Απομακρυσμένη εικονική οθόνη
|
|||
Comment[es]=Monitor virtual remoto
|
||||
Comment[fr]=Moniteur virtuel distant
|
||||
Comment[ia]=Monitor Virtual Remote
|
||||
Comment[it]=Monitor virtuale remoto
|
||||
Comment[ko]=원격 가상 모니터
|
||||
Comment[nl]=Virtual Monitor op afstand
|
||||
Comment[pl]=Zdalny monitor wirtualny
|
||||
|
|
Loading…
Reference in New Issue
Block a user