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
2023-08-01 03:21:13 +00:00
parent f3781422a0
commit e8dff0cc74

View File

@@ -21,6 +21,7 @@ Name[it]=Monitor virtuale di KRFB
Name[ka]=KRFB-
Name[ko]=KRFBs
Name[nl]=Virtuele monitor van KRFB
Name[nn]=KRFBs virtuell skjerm
Name[pl]=Monitor wirtualny KRFB
Name[pt]=Monitor Virtual do KRFB
Name[pt_BR]=Monitor virtual do KRFB
@@ -50,6 +51,7 @@ Comment[it]=Monitor virtuale remoto
Comment[ka]=
Comment[ko]=
Comment[nl]=Virtual Monitor op afstand
Comment[nn]=Virtuell skjerm for ekstern ressurs
Comment[pl]=Zdalny monitor wirtualny
Comment[pt]=Monitor Virtual Remoto
Comment[pt_BR]=Monitor virtual remoto