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 · 985845b44c
parent 36f4e41bbf
commit 985845b44c
6 changed files with 8 additions and 3 deletions
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -120,7 +120,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -53,6 +53,7 @@ Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
+Comment[ru]=Breeze от KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[uk]=Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze by the KDE VDGxx
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -53,6 +53,7 @@ Comment[nl]=Breeze door de KDE VDG
 Comment[nn]=Breeze frå KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 Comment[pt_BR]=Breeze pelo KDE VDG
+Comment[ru]=Breeze от KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[uk]=Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze by the KDE VDGxx
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -15,7 +15,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
@ -32,6 +32,7 @@ Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
+Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[uk]=Світла Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Light by the KDE VDGxx
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -15,7 +15,7 @@ Name[nn]=Breeze lys
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
-Name[ru]=Breeze
+Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sv]=Breeze Light
 Name[uk]=Світла Breeze
@ -32,6 +32,7 @@ Comment[nl]=Breeze Light door de KDE VDG
 Comment[nn]=Breeze Light frå KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 Comment[pt_BR]=Breeze Light pelo KDE VDG
+Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[uk]=Світла Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Light by the KDE VDGxx
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -9,6 +9,7 @@ Comment[nl]=Breeze Dark door de KDE VDG
 Comment[nn]=Breeze Dark frå KDE VDG
 Comment[pt]=Brisa Escuro da VDG do KDE
 Comment[pt_BR]=Breeze Dark pelo KDE VDG
+Comment[ru]=Тёмный вариант Breeze от KDE VDG
 Comment[sv]=Breeze mörk av KDE:s visuella designgrupp
 Comment[uk]=Темна Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Dark by the KDE VDGxx