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
2022-07-06 01:45:10 +00:00
parent 00725ca11b
commit d1d085008a
2 changed files with 3 additions and 0 deletions

View File

@@ -96,6 +96,7 @@ GenericName[pl]=Współdzielenie pulpitu (VNC)
GenericName[pt]=Partilha do Ecrã (VNC)
GenericName[pt_BR]=Compartilhamento de ambiente de trabalho (VNC)
GenericName[ro]=Partajare birou (VNC)
GenericName[ru]=Совместный доступ к рабочему столу (VNC)
GenericName[sk]=Zdieľanie pracovnej plochy (VNC)
GenericName[sl]=Souporaba namizja (VNC)
GenericName[sv]=Skrivbordsdelning (VNC)

View File

@@ -21,6 +21,7 @@ Name[pl]=Monitor wirtualny KRFB
Name[pt]=Monitor Virtual do KRFB
Name[pt_BR]=Monitor virtual do KRFB
Name[ro]=Monitor virtual KRFB
Name[ru]=Виртуальный монитор KRFB
Name[sk]=Virtuálny monitor KRFB
Name[sl]=Navidezni monitor KRFB
Name[sv]=Krfb:s virtuella bildskärm
@@ -45,6 +46,7 @@ Comment[pl]=Zdalny monitor wirtualny
Comment[pt]=Monitor Virtual Remoto
Comment[pt_BR]=Monitor virtual remoto
Comment[ro]=Monitor virtual distant
Comment[ru]=Удалённый виртуальный монитор
Comment[sk]=Vzdialený virtuálny monitor
Comment[sl]=Oddaljeni navidezni monitor
Comment[sv]=Virtuell fjärrbildskärm