1
0
mirror of https://invent.kde.org/network/krfb synced 2024-06-28 22:14:41 +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:
l10n daemon script 2024-02-09 01:13:54 +00:00
parent f4e97af144
commit a41a003304
3 changed files with 5 additions and 2 deletions

View File

@ -37,7 +37,7 @@ Comment[ka]=სამუშაო მაგიდის გაზიარებ
Comment[kk]=Үстелді ортақтастыру
Comment[km]=ការ​ចែក​រំលែក​ផ្ទែ​តុ
Comment[ko]=데스크톱 공유
Comment[lt]=Dalinimasis darbalaukiu
Comment[lt]=Darbalaukio bendrinimas
Comment[lv]=Darbvirsmas koplietošana
Comment[mk]=Делење на работната површина
Comment[ml]=പണിയിടം പങ്കുവെക്കല്‍

View File

@ -96,6 +96,7 @@ GenericName[ia]=Compartir de scriptorio (VNC)
GenericName[it]=Condivisione del desktop (VNC)
GenericName[ka]= (VNC).
GenericName[ko]= (VNC)
GenericName[lt]=Darbalaukio bendrinimas (VNC)
GenericName[nl]=Bureaublad delen (VNC)
GenericName[nn]=Skrivebordsdeling (VNC)
GenericName[pl]=Współdzielenie pulpitu (VNC)
@ -148,7 +149,7 @@ Comment[ka]=სამუშაო მაგიდის გაზიარებ
Comment[kk]=Үстелді ортақтастыру
Comment[km]=
Comment[ko]=
Comment[lt]=Dalinimasis darbalaukiu
Comment[lt]=Darbalaukio bendrinimas
Comment[lv]=Darbvirsmas koplietošana
Comment[mk]=Делење на работната површина
Comment[ml]=ിി

View File

@ -22,6 +22,7 @@ Name[ia]=Virtual Monitor de KRFB
Name[it]=Monitor virtuale di KRFB
Name[ka]=KRFB-
Name[ko]=KRFBs
Name[lt]=KRFBs virtualus monitorius
Name[nl]=Virtuele monitor van KRFB
Name[nn]=KRFBs virtuell skjerm
Name[pl]=Monitor wirtualny KRFB
@ -55,6 +56,7 @@ Comment[ia]=Monitor Virtual Remote
Comment[it]=Monitor virtuale remoto
Comment[ka]=
Comment[ko]=
Comment[lt]=Nuotolinis virtualus monitorius
Comment[nl]=Virtual Monitor op afstand
Comment[nn]=Virtuell skjerm for ekstern ressurs
Comment[pl]=Zdalny monitor wirtualny