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.24
l10n daemon script 4 years ago
parent 244fdf477c
commit 0aa8fbec61
  1. 1
      colors/BreezeClassic.colors
  2. 2
      colors/BreezeDark.colors
  3. 2
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  4. 2
      cursors/Breeze_Snow/src/index.theme
  5. 1
      wallpapers/Next/metadata.desktop

@ -108,6 +108,7 @@ Name=Breeze Classic
Name[az]=Breeze klassik
Name[ca]=Brisa clàssica
Name[cs]=Breeze Classic
Name[de]=Breeze Klassisch
Name[el]=Breeze κλασικό
Name[es]=Brisa clásico
Name[eu]=Breeze klasikoa

@ -140,7 +140,7 @@ Name[ca]=Brisa fosca
Name[ca@valencia]=Brisa fosca
Name[cs]=Breeze Tmavé
Name[da]=Breeze Dark
Name[de]=Breeze-Dunkel
Name[de]=Breeze Dunkel
Name[el]=Breeze σκούρο
Name[en_GB]=Breeze Dark
Name[es]=Brisa oscuro

@ -46,7 +46,7 @@ Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[ca@valencia]=Brisa clara per al VDG de KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[da]=Breeze Light af KDE's visuelle designgruppe
Comment[de]=Breeze-Hell von der KDE VDG
Comment[de]=Breeze Hell von der KDE VDG
Comment[el]=Breeze φωτεινό από το KDE VDG
Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG

@ -46,7 +46,7 @@ Comment[ca]=Brisa clara, creat pel VDG del KDE
Comment[ca@valencia]=Brisa clara per al VDG de KDE
Comment[cs]=Breeze Light od KDE VDG
Comment[da]=Breeze Light af KDE's visuelle designgruppe
Comment[de]=Breeze-Hell von der KDE VDG
Comment[de]=Breeze Hell von der KDE VDG
Comment[el]=Breeze φωτεινό από το KDE VDG
Comment[en_GB]=Breeze Light by the KDE VDG
Comment[es]=Brisa claro por KDE VDG

@ -4,6 +4,7 @@ Name[az]=Patak
Name[ca]=Patak
Name[cs]=Patak
Name[da]=Patak
Name[de]=Patak
Name[el]=Patak
Name[es]=Patak
Name[eu]=Patak

Loading…
Cancel
Save