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-pre-rebase
l10n daemon script 11 years ago
parent 6195ee0b0a
commit 3ecd69c96a
  1. 1
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  2. 1
      cursors/Breeze_Snow/src/index.theme
  3. 2
      icons-dark/index.theme
  4. 1
      icons/index.theme

@ -2,7 +2,6 @@
Name=Breeze Snow
Name[ca]=Brisa neu
Name[cs]=Breeze sníh
Name[da]=Breeze Snow
Name[de]=Breeze-Schnee
Name[el]=Χιόνι Breeze
Name[en_GB]=Breeze Snow

@ -2,7 +2,6 @@
Name=Breeze Snow
Name[ca]=Brisa neu
Name[cs]=Breeze sníh
Name[da]=Breeze Snow
Name[de]=Breeze-Schnee
Name[el]=Χιόνι Breeze
Name[en_GB]=Breeze Snow

@ -4,7 +4,6 @@ Name[ar]=نسيم داكن
Name[bs]=Breeze tamna
Name[ca]=Brisa fosca
Name[cs]=Breeze Tmavé
Name[da]=Breeze Dark
Name[de]=Breeze-Dunkel
Name[el]=Σκοτεινό Breeze
Name[en_GB]=Breeze Dark
@ -38,7 +37,6 @@ Comment[ar]=سمة أيقونات نسيم لمخطّطات الألوان ال
Comment[bs]=Breeze tema ikona za tamne šeme boja razvijena od strane KDE grupe za vizuelni dizajn
Comment[ca]=Tema d'icones Brisa amb un esquema de color fosc pel Grup de disseny visual del KDE
Comment[cs]=Motiv ikon Breeze pro tmavá barevná schémata od KDE Visual Design Group
Comment[da]=Breeze ikontema til mørke farvetemaer af KDE's visuelle designgruppe
Comment[de]=Breeze-Symboldesign für dunkles Farbschema der KDE Visual Design Group
Comment[el]=Θέμα εικονιδίων Breeze για σκοτεινά χρωματικά σχέδια από το KDE Visual Design Group
Comment[en_GB]=Breeze icon theme for dark colour schemes by the KDE Visual Design Group

@ -41,7 +41,6 @@ Comment=Default Plasma 5 Theme
Comment[ar]=سمة بلازما 5 الافتراضيّة
Comment[ca]=Tema del Plasma 5 per defecte
Comment[cs]=Výchozí motiv Plasma 5
Comment[da]=Standard Plasma 5-tema
Comment[de]=Standard-Arbeitsflächendesign für Plasma 5
Comment[el]=Προκαθορισμένο θέμα Plasma 5
Comment[en_GB]=Default Plasma 5 Theme

Loading…
Cancel
Save