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"
wilder-5.17
l10n daemon script 7 years ago
parent c177a7f699
commit 3657f49534
  1. 2
      colors/BreezeDark.colors
  2. 8
      colors/BreezeHighContrast.colors
  3. 8
      colors/BreezeLight.colors
  4. 2
      lookandfeel.dark/metadata.desktop

@ -143,7 +143,7 @@ Name[sr@ijekavianlatin]=Povetarac tamni
Name[sr@latin]=Povetarac tamni
Name[sv]=Breeze mörk
Name[tr]=Koyu Esinti
Name[uk]=Breeze Dark
Name[uk]=Темна Breeze
Name[x-test]=xxBreeze Darkxx
Name[zh_CN]=暗色微风
Name[zh_TW]=Breeze Dark

@ -105,6 +105,14 @@ ForegroundVisited=127,140,141
[General]
ColorScheme=Breeze High Conttrast
Name=Breeze High Contrast
Name[ca]=Brisa de contrast alt
Name[ca@valencia]=Brisa de contrast alt
Name[de]=Breeze Hoher Kontrast
Name[nl]=Breeze met hoog contrast
Name[pt]=Brisa de Alto Contraste
Name[uk]=Висококонтрастна Breeze
Name[x-test]=xxBreeze High Contrastxx
Name[zh_TW]=Breeze 高對比
shadeSortColumn=true
[KDE]

@ -105,6 +105,14 @@ ForegroundVisited=61,174,230
[General]
ColorScheme=Breeze Light
Name=Breeze Light
Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[de]=Breeze Hell
Name[nl]=Breeze Light
Name[pt]=Brisa Clara
Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx
Name[zh_TW]=Breeze Light
shadeSortColumn=true
[KDE]

@ -76,7 +76,7 @@ Name[sr@ijekavianlatin]=Povetarac tamni
Name[sr@latin]=Povetarac tamni
Name[sv]=Breeze mörk
Name[tr]=Koyu Esinti
Name[uk]=Breeze Dark
Name[uk]=Темна Breeze
Name[x-test]=xxBreeze Darkxx
Name[zh_CN]=暗色微风
Name[zh_TW]=Breeze Dark

Loading…
Cancel
Save