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"
5 years ago · 6e8054afcd
parent b70e821ad2
commit 6e8054afcd
7 changed files with 12 additions and 6 deletions
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@ -166,7 +166,7 @@ Name[pt_BR]=Breeze Dark
 Name[ro]=Briză, întunecat
 Name[ru]=Breeze, тёмный вариант
 Name[sk]=Tmavý vánok
-Name[sl]=Sapica (temna)
+Name[sl]=Sapica temna
 Name[sr]=Поветарац тамни
 Name[sr@ijekavian]=Поветарац тамни
 Name[sr@ijekavianlatin]=Povetarac tamni
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -76,7 +76,7 @@ Comment[pt_BR]=Breeze pelo KDE VDG
 Comment[ro]=Briză, de KDE VDG
 Comment[ru]=Breeze от KDE VDG
 Comment[sk]=Vánok od KDE VDG
-Comment[sl]=Sapica s strani KDE Visual Design Group
+Comment[sl]=Sapica s strani KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[tg]=Насим аз KDE VDG
 Comment[uk]=Breeze, автори — KDE VDG
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -76,7 +76,7 @@ Comment[pt_BR]=Breeze pelo KDE VDG
 Comment[ro]=Briză, de KDE VDG
 Comment[ru]=Breeze от KDE VDG
 Comment[sk]=Vánok od KDE VDG
-Comment[sl]=Sapica s strani KDE Visual Design Group
+Comment[sl]=Sapica s strani KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
 Comment[tg]=Насим аз KDE VDG
 Comment[uk]=Breeze, автори — KDE VDG
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -66,7 +66,7 @@ Comment[pt_BR]=Breeze Light pelo KDE VDG
 Comment[ro]=Briză, luminos, de KDE VDG
 Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sk]=Svetlý vánok od KDE VDG
-Comment[sl]=Sapica lahka s strani KDE Visual Design Group
+Comment[sl]=Sapica lahka s strani KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[tg]=Насими сабук аз KDE VDG
 Comment[uk]=Світла Breeze, автори — KDE VDG
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -66,7 +66,7 @@ Comment[pt_BR]=Breeze Light pelo KDE VDG
 Comment[ro]=Briză, luminos, de KDE VDG
 Comment[ru]=Светлый вариант Breeze от KDE VDG
 Comment[sk]=Svetlý vánok od KDE VDG
-Comment[sl]=Sapica lahka s strani KDE Visual Design Group
+Comment[sl]=Sapica lahka s strani KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
 Comment[tg]=Насими сабук аз KDE VDG
 Comment[uk]=Світла Breeze, автори — KDE VDG
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -70,7 +70,7 @@ Name[pt_BR]=Breeze Dark
 Name[ro]=Briză, întunecat
 Name[ru]=Breeze, тёмный вариант
 Name[sk]=Tmavý vánok
-Name[sl]=Sapica (temna)
+Name[sl]=Sapica temna
 Name[sr]=Поветарац тамни
 Name[sr@ijekavian]=Поветарац тамни
 Name[sr@ijekavianlatin]=Povetarac tamni
--- a/lookandfeel.twilight/metadata.desktop
+++ b/lookandfeel.twilight/metadata.desktop
@ -1,17 +1,23 @@
 [Desktop Entry]
 Comment=Breeze Twilight by the KDE VDG
 Comment[ca]=Brisa crepuscular, creat pel VDG del KDE
+Comment[es]=Brisa crepúsculo por KDE VDG
 Comment[et]=Breeze videvik KDE VDG-lt
+Comment[it]=Brezza crepuscolo a cura del VDG di KDE
 Comment[nl]=Breeze Twilight door de KDE VDG
 Comment[pt]=Brisa da Madrugada da VDG do KDE
+Comment[sl]=Sapica ob mraku s strani KDE VDG
 Comment[sv]=Breeze skymning av KDE:s visuella designgrupp
 Comment[uk]=Сутінкова Breeze, автори — KDE VDG
 Comment[x-test]=xxBreeze Twilight by the KDE VDGxx
 Name=Breeze Twilight
 Name[ca]=Brisa crepuscular
+Name[es]=Brisa crepúsculo
 Name[et]=Breeze videvik
+Name[it]=Brezza crepuscolo
 Name[nl]=Breeze Twilight
 Name[pt]=Brisa da Madrugada
+Name[sl]=Sapica ob mraku
 Name[sv]=Breeze skymning
 Name[uk]=Сутінкова Breeze
 Name[x-test]=xxBreeze Twilightxx