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-reb-27
l10n daemon script 3 years ago
parent a1190c3d8b
commit ee353ddff0
  1. 2
      kdecoration/config/kcm_breezedecoration.json
  2. 2
      kstyle/config/breezestyleconfig.json
  3. 2
      wallpapers/Next/metadata.json

@ -8,6 +8,7 @@
"Description[es]": "Modificar el aspecto de las decoraciones de ventanas",
"Description[eu]": "Leiho apainduren itxura aldatzea",
"Description[fr]": "Modifier l'apparence des décorations de fenêtres",
"Description[it]": "Modifica l'aspetto delle decorazioni delle finestre",
"Description[ko]": "창 장식의 모양을 수정합니다",
"Description[nl]": "Wijzig het uiterlijk van vensterdecoraties",
"Description[pl]": "Zmień wygląd okien",
@ -28,6 +29,7 @@
"Name[es]": "Decoración de ventanas Brisa",
"Name[eu]": "Breeze leihoen apaindura",
"Name[fr]": "Décoration de fenêtre pour Breeze",
"Name[it]": "Decorazione delle finestre di Brezza",
"Name[ko]": "Breeze 창 장식",
"Name[nl]": "Breeze vensterdecoratie",
"Name[pl]": "Wygląd okien Bryzy",

@ -8,6 +8,7 @@
"Description[es]": "Modificar el aspecto de los widgets",
"Description[eu]": "Trepeten itxura aldatzea",
"Description[fr]": "Modifier l'apparence des composants graphiques",
"Description[it]": "Modifica l'aspetto degli oggetti",
"Description[ko]": "위젯의 모양 수정",
"Description[nl]": "Wijzig het uiterlijk van widgets",
"Description[pl]": "Zmień wygląd interfejsu",
@ -28,6 +29,7 @@
"Name[es]": "Estilo de widgets Brisa",
"Name[eu]": "Breeze trepeten estiloa",
"Name[fr]": "Style des composants graphiques de Breeze",
"Name[it]": "Stile degli oggetti di Brezza",
"Name[ko]": "Breeze 위젯 스타일",
"Name[nl]": "Breeze widgetstijl",
"Name[pl]": "Wygląd interfejsu Bryzy",

@ -11,6 +11,7 @@
"Name[es]": "ruvkr",
"Name[eu]": "ruvkr",
"Name[fr]": "ruvkr",
"Name[it]": "ruvkr",
"Name[nl]": "ruvkr",
"Name[pl]": "ruvkr",
"Name[pt]": "ruvkr",
@ -30,6 +31,7 @@
"Name[es]": "Kay",
"Name[eu]": "Kay",
"Name[fr]": "Kay",
"Name[it]": "Kay",
"Name[nl]": "Kay",
"Name[pl]": "Kay",
"Name[pt]": "Kay",

Loading…
Cancel
Save