wilderjds
/
breeze
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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.19
l10n daemon script 6 years ago
parent 5288ce6cc6
commit 88ea6f1027
6 changed files with 9 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      colors/BreezeDark.colors
  2. 2
      colors/BreezeLight.colors
  3. 4
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  4. 4
      cursors/Breeze_Snow/src/index.theme
  5. 4
      lookandfeel.dark/metadata.desktop
  6. 1
      wallpapers/Next/metadata.desktop

2
colors/BreezeDark.colors
Unescape View File

@ -117,7 +117,7 @@ Name[en_GB]=Breeze Dark
Name[es]=Brisa oscuro Name[es]=Brisa oscuro
Name[et]=Breeze tume Name[et]=Breeze tume
Name[eu]=Breeze iluna Name[eu]=Breeze iluna
Name[fi]=Breeze Dark Name[fi]=Tumma Breeze
Name[fr]=Brise sombre Name[fr]=Brise sombre
Name[gl]=Breeze Dark Name[gl]=Breeze Dark
Name[he]=Breeze Dark Name[he]=Breeze Dark

2
colors/BreezeLight.colors
Unescape View File

@ -114,7 +114,7 @@ Name[en_GB]=Breeze Light
Name[es]=Brisa claro Name[es]=Brisa claro
Name[et]=Breeze hele Name[et]=Breeze hele
Name[eu]=Breeze argia Name[eu]=Breeze argia
Name[fi]=Breeze Light Name[fi]=Vaalea Breeze
Name[fr]=Brise clair Name[fr]=Brise clair
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[hu]=Breeze Light Name[hu]=Breeze Light

4
cursors/Breeze_Snow/Breeze_Snow/index.theme
Unescape View File

@ -9,7 +9,7 @@ Name[en_GB]=Breeze Light
Name[es]=Brisa claro Name[es]=Brisa claro
Name[et]=Breeze hele Name[et]=Breeze hele
Name[eu]=Breeze argia Name[eu]=Breeze argia
Name[fi]=Breeze Light Name[fi]=Vaalea Breeze
Name[fr]=Brise clair Name[fr]=Brise clair
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[hu]=Breeze Light Name[hu]=Breeze Light
@ -43,7 +43,7 @@ Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG Comment[es]=Brisa claro por KDE VDG
Comment[et]=Breeze hele KDE VDG-lt Comment[et]=Breeze hele KDE VDG-lt
Comment[eu]=Breeze argia, KDE VDGk egina Comment[eu]=Breeze argia, KDE VDGk egina
Comment[fi]=Breeze Light KDE VDG:ltä Comment[fi]=Vaalea Breeze KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG Comment[gl]=Breeze claro de KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től Comment[hu]=Breeze Light a KDE VDG-től

4
cursors/Breeze_Snow/src/index.theme
Unescape View File

@ -9,7 +9,7 @@ Name[en_GB]=Breeze Light
Name[es]=Brisa claro Name[es]=Brisa claro
Name[et]=Breeze hele Name[et]=Breeze hele
Name[eu]=Breeze argia Name[eu]=Breeze argia
Name[fi]=Breeze Light Name[fi]=Vaalea Breeze
Name[fr]=Brise clair Name[fr]=Brise clair
Name[gl]=Breeze claro Name[gl]=Breeze claro
Name[hu]=Breeze Light Name[hu]=Breeze Light
@ -43,7 +43,7 @@ Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG Comment[es]=Brisa claro por KDE VDG
Comment[et]=Breeze hele KDE VDG-lt Comment[et]=Breeze hele KDE VDG-lt
Comment[eu]=Breeze argia, KDE VDGk egina Comment[eu]=Breeze argia, KDE VDGk egina
Comment[fi]=Breeze Light KDE VDG:ltä Comment[fi]=Vaalea Breeze KDE VDG:ltä
Comment[fr]=Brise Light par KDE VDG Comment[fr]=Brise Light par KDE VDG
Comment[gl]=Breeze claro de KDE VDG Comment[gl]=Breeze claro de KDE VDG
Comment[hu]=Breeze Light a KDE VDG-től Comment[hu]=Breeze Light a KDE VDG-től

4
lookandfeel.dark/metadata.desktop
Unescape View File

@ -9,7 +9,7 @@ Comment[en_GB]=Breeze Dark by the KDE VDG
Comment[es]=Brisa oscuro por KDE VDG Comment[es]=Brisa oscuro por KDE VDG
Comment[et]=Breeze tume KDE VDG-lt Comment[et]=Breeze tume KDE VDG-lt
Comment[eu]=Breeze iluna, KDE VDGk egina Comment[eu]=Breeze iluna, KDE VDGk egina
Comment[fi]=Breeze Dark KDE VDG:ltä Comment[fi]=Tumma Breeze KDE VDG:ltä
Comment[fr]=Breeze sombre, par KDE VDG Comment[fr]=Breeze sombre, par KDE VDG
Comment[gl]=Breeze escuro de KDE VDG Comment[gl]=Breeze escuro de KDE VDG
Comment[hu]=Breeze Dark a KDE VDG-től Comment[hu]=Breeze Dark a KDE VDG-től
@ -46,7 +46,7 @@ Name[en_GB]=Breeze Dark
Name[es]=Brisa oscuro Name[es]=Brisa oscuro
Name[et]=Breeze tume Name[et]=Breeze tume
Name[eu]=Breeze iluna Name[eu]=Breeze iluna
Name[fi]=Breeze Dark Name[fi]=Tumma Breeze
Name[fr]=Brise sombre Name[fr]=Brise sombre
Name[gl]=Breeze Dark Name[gl]=Breeze Dark
Name[he]=Breeze Dark Name[he]=Breeze Dark

1
wallpapers/Next/metadata.desktop
Unescape View File

@ -6,6 +6,7 @@ Name[en_GB]=Flow
Name[es]=Fujo Name[es]=Fujo
Name[et]=Flow Name[et]=Flow
Name[eu]=Flow Name[eu]=Flow
Name[fi]=Flow
Name[fr]=Flux Name[fr]=Flux
Name[it]=Flusso Name[it]=Flusso
Name[ko]=흐름 Name[ko]=흐름

Write Preview
Loading…
Cancel
Save