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"
7 years ago · 6a7483ae5e
parent 9a68cbd9b1
commit 6a7483ae5e
3 changed files with 3 additions and 3 deletions
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@ -52,7 +52,7 @@ Name[nn]=Ton inn og ut
 Name[pa]=ਫਿੱਕਾ
 Name[pl]=Zanikanie/wyłanianie
 Name[pt]=Desvanecer
-Name[pt_BR]=Fade
+Name[pt_BR]=Desvanecer
 Name[ro]=Decolorare
 Name[ru]=Растворение
 Name[se]=Rievdat šearratvuođa
--- a/effects/fadingpopups/package/metadata.desktop
+++ b/effects/fadingpopups/package/metadata.desktop
@ -12,7 +12,7 @@ Name[nl]=Vervagende pop-ups
 Name[nn]=Inn- og uttoning av sprettoppvindauge
 Name[pl]=Zanikające okna wysuwne
 Name[pt]=Mensagens Desvanecentes
-Name[pt_BR]=Mensagens do fade
+Name[pt_BR]=Desvanecer mensagens
 Name[ru]=Растворяющиеся всплывающие окна
 Name[sk]=Miznúce vyskakovacie okná
 Name[sv]=Borttonande meddelanderutor
--- a/kcmkwin/kwincompositing/kcmkwineffects.desktop
+++ b/kcmkwin/kwincompositing/kcmkwineffects.desktop
@ -88,7 +88,7 @@ Comment[nn]=Skrivebordseffektar
 Comment[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
 Comment[pl]=Efekty pulpitu
 Comment[pt]=Efeitos do Ecrã
-Comment[pt_BR]=Efeitos da Área de Trabalho
+Comment[pt_BR]=Efeitos da área de trabalho
 Comment[ro]=Efecte de birou
 Comment[ru]=Настройка эффектов рабочего стола
 Comment[sk]=Efekty plochy