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
2024-10-30 01:23:40 +00:00
parent cece62bf4e
commit 6073f25525
3 changed files with 5 additions and 2 deletions

View File

@@ -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]=जुळवणी बंद केली

View File

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

View File

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