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-10-31 04:20:56 +00:00
parent 176a18047f
commit f683346120

View File

@ -159,7 +159,7 @@ Comment[mr]=डिस्क वापर माहिती बघा
Comment[nb]=Vis informasjon om bruk av diskplass
Comment[nds]=Wiest Informatschonen över den Bruuk vun de Fastplaat
Comment[nl]=Informatie over schijfgebruik bekijken
Comment[nn]=Vis informasjon om diskbruk
Comment[nn]=Visualiser informasjon om diskbruk
Comment[pa]=ਿ
Comment[pl]=Zobacz informacje o wykorzystaniu dysku
Comment[pt]=Ver a informação de utilização do disco