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:
@@ -380,7 +380,7 @@ Name[kk]=Қосылымдан жабылды
|
||||
Name[km]=បានបិទការតភ្ជាប់
|
||||
Name[ko]=연결이 닫힘
|
||||
Name[lt]=Ryšys baigtas
|
||||
Name[lv]=Savienojums slēgts
|
||||
Name[lv]=Savienojums ir slēgts
|
||||
Name[mai]=संबंधन बन्न भ' गेल
|
||||
Name[ml]=ബന്ധം അടച്ചു
|
||||
Name[mr]=जुळवणी बंद केली
|
||||
@@ -448,7 +448,7 @@ Comment[kk]=Қосылым жабылды
|
||||
Comment[km]=បានបិទការតភ្ជាប់
|
||||
Comment[ko]=연결이 닫힘
|
||||
Comment[lt]=Ryšys baigtas
|
||||
Comment[lv]=Savienojums tika slēgts
|
||||
Comment[lv]=Savienojums ir slēgts
|
||||
Comment[mk]=Поврзувањето е затворено
|
||||
Comment[ml]=ബന്ധം അടച്ചു
|
||||
Comment[mr]=जुळवणी बंद केली
|
||||
|
||||
@@ -100,6 +100,7 @@ GenericName[it]=Condivisione del desktop (VNC)
|
||||
GenericName[ka]=სამუშაო მაგიდის გაზიარება(VNC).
|
||||
GenericName[ko]=데스크톱 공유(VNC)
|
||||
GenericName[lt]=Darbalaukio bendrinimas (VNC)
|
||||
GenericName[lv]=Darbvirsmas koplietošana (VNC)
|
||||
GenericName[nl]=Bureaublad delen (VNC)
|
||||
GenericName[nn]=Skrivebordsdeling (VNC)
|
||||
GenericName[pl]=Współdzielenie pulpitu (VNC)
|
||||
|
||||
@@ -25,6 +25,7 @@ Name[it]=Monitor virtuale di KRFB
|
||||
Name[ka]=KRFB-ის ვირტუალური ეკრანი
|
||||
Name[ko]=KRFBs 가상 모니터
|
||||
Name[lt]=KRFBs virtualus monitorius
|
||||
Name[lv]=KRFB virtuālais monitors
|
||||
Name[nl]=Virtuele monitor van KRFB
|
||||
Name[nn]=KRFBs virtuell skjerm
|
||||
Name[pl]=Monitor wirtualny KRFB
|
||||
@@ -61,6 +62,7 @@ Comment[it]=Monitor virtuale remoto
|
||||
Comment[ka]=დაშორებული ვირტუალური ეკრანი
|
||||
Comment[ko]=원격 가상 모니터
|
||||
Comment[lt]=Nuotolinis virtualus monitorius
|
||||
Comment[lv]=Attālais virtuālais monitors
|
||||
Comment[nl]=Virtual Monitor op afstand
|
||||
Comment[nn]=Virtuell skjerm for ekstern ressurs
|
||||
Comment[pl]=Zdalny monitor wirtualny
|
||||
|
||||
Reference in New Issue
Block a user