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"
icc-effect-5.17.5
l10n daemon script 2018-11-14 06:08:44 +01:00
parent 2fb2fb9a44
commit e6cf2e3efe
1 changed files with 1 additions and 0 deletions

View File

@ -37,6 +37,7 @@ Comment[id]=Buat jendela menskala besar atau kecil secara mulus ketika ia ditamp
Comment[nl]=Laat vensters vloeiend kleiner en groter schalen als ze worden getoond of verborgen
Comment[nn]=Skaler vindauge jamt inn og ut når dei vert viste eller gøymde
Comment[pt]=Fazer com que as janelas apareçam/desapareçam suavemente quando aparecem ou ficam escondidas
Comment[pt_BR]=Faz com que as janelas aumentem ou reduzam o seu tamanho de forma suave ao serem exibidas ou ocultadas
Comment[sv]=Gör att fönster mjukt skalas in eller ut när de visas eller döljs
Comment[uk]=Плавне масштабування вікон при появі або приховуванні
Comment[x-test]=xxMake windows smoothly scale in and out when they are shown or hiddenxx