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"
10 years ago · 1f76c005e9
parent 75e318f907
commit 1f76c005e9
3 changed files with 3 additions and 3 deletions
--- a/kcmkwin/kwindecoration/kwindecoration.desktop
+++ b/kcmkwin/kwindecoration/kwindecoration.desktop
@ -51,7 +51,7 @@ Name[nds]=Finstern opfladusen
 Name[nl]=Vensterdecoraties
 Name[nn]=Vindaugspynt
 Name[pa]=ਵਿੰਡੋ ਸਜਾਵਟ
-Name[pl]=Wystrój okien
+Name[pl]=Wygląd okien
 Name[pt]=Decorações das Janelas
 Name[pt_BR]=Decorações da janela
 Name[ro]=Decorații fereastră
--- a/plugins/kdecorations/aurorae/src/kwindecoration.desktop
+++ b/plugins/kdecorations/aurorae/src/kwindecoration.desktop
@ -35,7 +35,7 @@ Comment[nds]=KWin-Finsterdekoratschoon
 Comment[nl]=KWin vensterdecoratie
 Comment[nn]=KWin vindaugsdekorasjon
 Comment[pa]=ਕੇਵਿੰਨ ਵਿੰਡੋ ਸਜਾਵਟ
-Comment[pl]=Wystrój okien KWin
+Comment[pl]=Wygląd okien KWin
 Comment[pt]=Decoração das Janelas do KWin
 Comment[pt_BR]=Decorações de janelas do KWin
 Comment[ro]=Decorații de fereastră KWin
--- a/scripts/enforcedeco/metadata.desktop
+++ b/scripts/enforcedeco/metadata.desktop
@ -25,7 +25,7 @@ Name[nb]=Påtvinger vinduspynt på GTK+-vindu
 Name[nds]=Verdwingt dat Opfladusen ok vun GTK+-Finstern
 Name[nl]=Dwingt vensterdecoraties af op GTK+ venster
 Name[nn]=Tvingar vindagspynt på GTK+-vindauge
-Name[pl]=Wymusza wystrój okien na oknach GTK+
+Name[pl]=Wymusza wygląd okien na oknach GTK+
 Name[pt]=Forçar as Decorações das Janelas nas janelas em GTK+
 Name[pt_BR]=Forçar as decorações das janelas em janelas GTK+
 Name[ru]=Применение выбранного оформления к окнам GTK+