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 · c08283ac6c
parent da80b05235
commit c08283ac6c
5 changed files with 5 additions and 0 deletions
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -54,6 +54,7 @@ Comment[id]=Breeze oleh KDE VDG
 Comment[it]=Brezza a cura del VDG di KDE
 Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
+Comment[pl]=Bryza autorstwa KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
 Comment[ru]=Breeze от KDE VDG
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -54,6 +54,7 @@ Comment[id]=Breeze oleh KDE VDG
 Comment[it]=Brezza a cura del VDG di KDE
 Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
+Comment[pl]=Bryza autorstwa KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
 Comment[ru]=Breeze от KDE VDG
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -33,6 +33,7 @@ Comment[id]=Breeze Light oleh KDE VDG
 Comment[it]=Brezza chiaro a cura del VDG di KDE
 Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
+Comment[pl]=Lekka Bryza autorstwa KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
 Comment[ru]=Светлый вариант Breeze от KDE VDG
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -33,6 +33,7 @@ Comment[id]=Breeze Light oleh KDE VDG
 Comment[it]=Brezza chiaro a cura del VDG di KDE
 Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
+Comment[pl]=Lekka Bryza autorstwa KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
 Comment[ru]=Светлый вариант Breeze от KDE VDG
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -10,6 +10,7 @@ Comment[id]=Breeze Dark oleh KDE VDG
 Comment[it]=Brezza scuro a cura del VDG di KDE
 Comment[nl]=Breeze Dark door de KDE VDG
 Comment[nn]=Breeze Dark frå KDE VDG
+Comment[pl]=Ciemna bryza autorstwa KDE VDG
 Comment[pt]=Brisa Escuro da VDG do KDE
 Comment[pt_BR]=Breeze Dark pelo KDE VDG
 Comment[ru]=Тёмный вариант Breeze от KDE VDG