Commit fee125e6 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 2c406977
......@@ -13,6 +13,9 @@ X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[es]=Estilo de Plasma
Name[fr]=Style Plasma
Name[it]=Stile di Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
......@@ -22,6 +25,9 @@ Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma style
Comment[az]=Plasma üslubunu seçin
Comment[ca]=Trieu l'estil del Plasma
Comment[es]=Escoger el estilo de Plasma
Comment[fr]=Sélectionner le style de Plasma
Comment[it]=Scegli lo stile di Plasma
Comment[nl]=Plasma-stijl kiezen
Comment[pt]=Escolher o estilo do Plasma
Comment[pt_BR]=Escolha o estilo do Plasma
......@@ -31,6 +37,9 @@ Comment[x-test]=xxChoose Plasma stylexx
X-KDE-Keywords=Desktop Theme,Plasma Theme
X-KDE-Keywords[az]=İş Masası mövzusu, Plasma Mövzusu, Desktop Theme,Plasma Theme
X-KDE-Keywords[ca]=Tema d'escriptori,Tema del Plasma
X-KDE-Keywords[es]=Tema de escritorio,Tema de Plasma
X-KDE-Keywords[fr]=Thème de de bureau, thème Plasma
X-KDE-Keywords[it]=Tema del desktop,tema di Plasma
X-KDE-Keywords[nl]=Bureaubladthema,Plasma-thema
X-KDE-Keywords[pt]=Tema do Ecrã,Tema do Plasma
X-KDE-Keywords[pt_BR]=Tema da área de trabalho,tema do Plasma
......
......@@ -2,6 +2,9 @@
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[es]=Estilo de Plasma
Name[fr]=Style Plasma
Name[it]=Stile di Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
......@@ -11,6 +14,9 @@ Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma theme
Comment[az]=Plasma mövzusunu seçin
Comment[ca]=Trieu el tema del Plasma
Comment[es]=Escoger un tema de Plasma
Comment[fr]=Sélectionner un thème Plasma
Comment[it]=Scegli il tema di Plasma
Comment[nl]=Plasma-thema kiezen
Comment[pt]=Escolher o tema do Plasma
Comment[pt_BR]=Escolha o tema do Plasma
......
......@@ -2,6 +2,9 @@
Name=Plasma Styles
Name[az]=Plasma Üslubu
Name[ca]=Estils del Plasma
Name[es]=Estilos de Plasma
Name[fr]=Styles Plasma
Name[it]=Stili di Plasma
Name[nl]=Plasma-stijlen
Name[pt]=Estilos do Plasma
Name[pt_BR]=Estilos do Plasma
......
......@@ -2,6 +2,9 @@
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[es]=Iconos
Name[fr]=Icônes
Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
......
......@@ -14,6 +14,9 @@ X-KDE-Weight=60
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[es]=Iconos
Name[fr]=Icônes
Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
......@@ -24,6 +27,9 @@ Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[az]=İkon mövzusunu seçin
Comment[ca]=Trieu el tema d'icones
Comment[es]=Escoger un tema de iconos
Comment[fr]=Sélectionner un thème d'icônes
Comment[it]=Scegli il tema di icone
Comment[nl]=Pictogramthema kiezen
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
......@@ -34,6 +40,9 @@ Comment[x-test]=xxChoose icon themexx
X-KDE-Keywords=icons,effects,size,hicolor,locolor
X-KDE-Keywords[az]=ikonlar,effektlər,tünd rənglər,açıq rənglər,icons,effects,size,hicolor,locolor
X-KDE-Keywords[ca]=icones,efectes,mida,color alt,color baix
X-KDE-Keywords[es]=iconos,efectos,tamaño,hicolor,locolor
X-KDE-Keywords[fr]=icônes, effets, taille, couleurs-16 bits, couleurs-8 bits
X-KDE-Keywords[it]=icone,effetti,dimensione,molti colori,pochi colori
X-KDE-Keywords[nl]=pictoogrammen,effecten,grootte,hi-kleur,lo-kleur
X-KDE-Keywords[pt]=ícones,efeitos,tamanho,muitas cores,poucas cores
X-KDE-Keywords[pt_BR]=ícones,efeitos,tamanho,muitas cores,poucas cores,hicolor
......
......@@ -2,6 +2,9 @@
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[es]=Iconos
Name[fr]=Icônes
Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
......@@ -11,6 +14,9 @@ Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[az]=İkon mövzusunu seçin
Comment[ca]=Trieu el tema d'icones
Comment[es]=Escoger un tema de iconos
Comment[fr]=Sélectionner un thème d'icônes
Comment[it]=Scegli il tema di icone
Comment[nl]=Pictogramthema kiezen
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment