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"
9 years ago · 5134933cd9
parent 7f270efe9c
commit 5134933cd9
3 changed files with 3 additions and 0 deletions
--- a/wallpapers/color/metadata.desktop
+++ b/wallpapers/color/metadata.desktop
@ -58,6 +58,7 @@ Comment[eu]=Kolore bakarreko horma-papera
 Comment[it]=Sfondo con colore semplice
 Comment[nl]=Vlakke kleur achtergrond
 Comment[pa]=ਇੱਕ ਰੰਗ ਦਾ ਵਾਲਪੇਪਰ
+Comment[pl]=Tapeta zwykłego koloru
 Comment[pt]=Papel de parede de cor simples
 Comment[sk]=Tapeta obyčajná farba
 Comment[sr]=Проста боја као тапет
--- a/wallpapers/image/imagepackage/metadata.desktop
+++ b/wallpapers/image/imagepackage/metadata.desktop
@ -87,6 +87,7 @@ Comment[es]=Visor de imágenes para el fondo del escritorio
 Comment[eu]=Irudientzako horma-paper ikuspegia
 Comment[it]=Vista delle immagini di sfondo
 Comment[nl]=Achtergrondweergave voor afbeeldingen
+Comment[pl]=Widok tapety dla obrazów
 Comment[pt]=Área de imagens do Papel de Parede
 Comment[sk]=Pohľad tapety pre obrázky
 Comment[sr]=Тапетни приказ за слике
--- a/wallpapers/image/slideshowpackage/metadata.desktop
+++ b/wallpapers/image/slideshowpackage/metadata.desktop
@ -86,6 +86,7 @@ Comment[eu]=Filmina erakusketa horma-papera
 Comment[it]=Sfondo con presentazione
 Comment[nl]=Achtergrond met diavoorstelling
 Comment[pa]=ਸਲਾਈਡ-ਸ਼ੋ ਵਾਲਪੇਪਰ
+Comment[pl]=Tapeta pokazu slajdów
 Comment[pt]=Papel de parede da apresentação
 Comment[sk]=Tapeta prezentácia
 Comment[sr]=Слајд‑шоу као тапет