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 9 years ago
parent 4aeebe0f00
commit ef471a0a26
  1. 1
      cursors/Breeze/Breeze/index.theme
  2. 1
      cursors/Breeze/src/index.theme
  3. 1
      cursors/Breeze_Snow/Breeze_Snow/index.theme
  4. 1
      cursors/Breeze_Snow/src/index.theme
  5. 2
      kdecoration/config/breezedecorationconfig.desktop
  6. 2
      kstyle/config/breezestyleconfig.desktop

@ -60,6 +60,7 @@ Comment[fr]=Thème Plasma de curseur
Comment[gl]=Tema do cursor de Plasma de KDE Comment[gl]=Tema do cursor de Plasma de KDE
Comment[he]=ערכת סמלים של KDE Plasma Comment[he]=ערכת סמלים של KDE Plasma
Comment[hu]=KDE plazma kurzortéma Comment[hu]=KDE plazma kurzortéma
Comment[ia]=Thema de cursor de Plasma de KDE
Comment[it]=Tema di puntatori di KDE Plasma Comment[it]=Tema di puntatori di KDE Plasma
Comment[ko]=KDE Plasma 커서 테마 Comment[ko]=KDE Plasma 커서 테마
Comment[lt]=KDE Plasma žymeklių apipavidalinimas Comment[lt]=KDE Plasma žymeklių apipavidalinimas

@ -60,6 +60,7 @@ Comment[fr]=Thème Plasma de curseur
Comment[gl]=Tema do cursor de Plasma de KDE Comment[gl]=Tema do cursor de Plasma de KDE
Comment[he]=ערכת סמלים של KDE Plasma Comment[he]=ערכת סמלים של KDE Plasma
Comment[hu]=KDE plazma kurzortéma Comment[hu]=KDE plazma kurzortéma
Comment[ia]=Thema de cursor de Plasma de KDE
Comment[it]=Tema di puntatori di KDE Plasma Comment[it]=Tema di puntatori di KDE Plasma
Comment[ko]=KDE Plasma 커서 테마 Comment[ko]=KDE Plasma 커서 테마
Comment[lt]=KDE Plasma žymeklių apipavidalinimas Comment[lt]=KDE Plasma žymeklių apipavidalinimas

@ -58,6 +58,7 @@ Comment[fr]=Thème Plasma de curseur
Comment[gl]=Tema do cursor de Plasma de KDE Comment[gl]=Tema do cursor de Plasma de KDE
Comment[he]=ערכת סמלים של KDE Plasma Comment[he]=ערכת סמלים של KDE Plasma
Comment[hu]=KDE plazma kurzortéma Comment[hu]=KDE plazma kurzortéma
Comment[ia]=Thema de cursor de Plasma de KDE
Comment[it]=Tema di puntatori di KDE Plasma Comment[it]=Tema di puntatori di KDE Plasma
Comment[ko]=KDE Plasma 커서 테마 Comment[ko]=KDE Plasma 커서 테마
Comment[lt]=KDE Plasma žymeklių apipavidalinimas Comment[lt]=KDE Plasma žymeklių apipavidalinimas

@ -58,6 +58,7 @@ Comment[fr]=Thème Plasma de curseur
Comment[gl]=Tema do cursor de Plasma de KDE Comment[gl]=Tema do cursor de Plasma de KDE
Comment[he]=ערכת סמלים של KDE Plasma Comment[he]=ערכת סמלים של KDE Plasma
Comment[hu]=KDE plazma kurzortéma Comment[hu]=KDE plazma kurzortéma
Comment[ia]=Thema de cursor de Plasma de KDE
Comment[it]=Tema di puntatori di KDE Plasma Comment[it]=Tema di puntatori di KDE Plasma
Comment[ko]=KDE Plasma 커서 테마 Comment[ko]=KDE Plasma 커서 테마
Comment[lt]=KDE Plasma žymeklių apipavidalinimas Comment[lt]=KDE Plasma žymeklių apipavidalinimas

@ -17,6 +17,7 @@ Name[el]=Διακοσμήσεις παραθύρου Breeze
Name[es]=Decoración de ventanas Brisa Name[es]=Decoración de ventanas Brisa
Name[eu]=Breeze leihoen apaindura Name[eu]=Breeze leihoen apaindura
Name[fr]=Décoration de fenêtre Brise Name[fr]=Décoration de fenêtre Brise
Name[ia]=Decoration de fenestra Breeze
Name[it]=Decorazione delle finestre di Brezza Name[it]=Decorazione delle finestre di Brezza
Name[nl]=Breeze vensterdecoratie Name[nl]=Breeze vensterdecoratie
Name[pl]=Wygląd okien Bryzy Name[pl]=Wygląd okien Bryzy
@ -88,6 +89,7 @@ X-KDE-Keywords[fr]=breeze,décoration
X-KDE-Keywords[gl]=breeze,decoración X-KDE-Keywords[gl]=breeze,decoración
X-KDE-Keywords[he]=breeze,decoration,מסגרת X-KDE-Keywords[he]=breeze,decoration,מסגרת
X-KDE-Keywords[hu]=breeze,dekoráció X-KDE-Keywords[hu]=breeze,dekoráció
X-KDE-Keywords[ia]=breeze,decoration
X-KDE-Keywords[it]=brezza,decorazione X-KDE-Keywords[it]=brezza,decorazione
X-KDE-Keywords[ko]=breeze,decoration,장식 X-KDE-Keywords[ko]=breeze,decoration,장식
X-KDE-Keywords[lt]=breeze,kekoracija X-KDE-Keywords[lt]=breeze,kekoracija

@ -17,6 +17,7 @@ Name[el]=Στιλ γραφικών συστατικών Breeze
Name[es]=Estilo de elementos gráficos Brisa Name[es]=Estilo de elementos gráficos Brisa
Name[eu]=Breeze trepeten estiloa Name[eu]=Breeze trepeten estiloa
Name[fr]=Style de composant graphique Brise Name[fr]=Style de composant graphique Brise
Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze
Name[it]=Stile degli oggetti di Brezza Name[it]=Stile degli oggetti di Brezza
Name[nl]=Breeze widgetstijl Name[nl]=Breeze widgetstijl
Name[pl]=Wygląd interfejsu Bryzy Name[pl]=Wygląd interfejsu Bryzy
@ -89,6 +90,7 @@ X-KDE-Keywords[fr]=brise,composant graphique, style
X-KDE-Keywords[gl]=breeze,trebello,trebello,estilo X-KDE-Keywords[gl]=breeze,trebello,trebello,estilo
X-KDE-Keywords[he]=breeze,widget,style,עיצוב,יישומון X-KDE-Keywords[he]=breeze,widget,style,עיצוב,יישומון
X-KDE-Keywords[hu]=breeze,elem,stílus X-KDE-Keywords[hu]=breeze,elem,stílus
X-KDE-Keywords[ia]=breeze,widget,style
X-KDE-Keywords[it]=brezza,oggetto,stile X-KDE-Keywords[it]=brezza,oggetto,stile
X-KDE-Keywords[ko]=breeze,widget,style,위젯,스타일 X-KDE-Keywords[ko]=breeze,widget,style,위젯,스타일
X-KDE-Keywords[lt]=breeze,valdiklis,stilius X-KDE-Keywords[lt]=breeze,valdiklis,stilius

Loading…
Cancel
Save