Commit 9bca129b 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 a8940d44
......@@ -13,6 +13,7 @@ X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
Name[es]=Estilo de Plasma
Name[eu]=Plasmaren estiloa
Name[fr]=Style Plasma
......@@ -20,12 +21,15 @@ Name[it]=Stile di Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
Name[sk]=Plasma štýl
Name[sl]=Plasmin slog
Name[sv]=Plasmastil
Name[uk]=Стиль Плазми
Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma style
Comment[az]=Plasma üslubunu seçin
Comment[ca]=Trieu l'estil del Plasma
Comment[cs]=Zvolte styl Plasma
Comment[es]=Escoger el estilo de Plasma
Comment[eu]=Aukeratu Plasmaren estiloa
Comment[fr]=Sélectionner le style de Plasma
......@@ -33,12 +37,15 @@ 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
Comment[sk]=Vybrať Plasma štýl
Comment[sl]=Izberite Plasmin slog
Comment[sv]=Välj Plasmastil
Comment[uk]=Вибір стилю Плазми
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[cs]=Motiv plochy, motiv Plasma
X-KDE-Keywords[es]=Tema de escritorio,Tema de Plasma
X-KDE-Keywords[eu]=Mahaigaineko gaia,Plasmaren gaia
X-KDE-Keywords[fr]=Thème de de bureau, thème Plasma
......@@ -46,6 +53,8 @@ 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
X-KDE-Keywords[sk]=Téma plochy, Plasma téma
X-KDE-Keywords[sl]=Tema namizja, tema Plasme
X-KDE-Keywords[sv]=Skrivbordstema,Plasmatema
X-KDE-Keywords[uk]=Desktop Theme,Plasma Theme,тема,стільниця,плазма
X-KDE-Keywords[x-test]=xxDesktop Themexx,xxPlasma Themexx
......@@ -2,6 +2,7 @@
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
Name[es]=Estilo de Plasma
Name[eu]=Plasmaren estiloa
Name[fr]=Style Plasma
......@@ -9,12 +10,15 @@ Name[it]=Stile di Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
Name[sk]=Plasma štýl
Name[sl]=Plasmin slog
Name[sv]=Plasmastil
Name[uk]=Стиль Плазми
Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma theme
Comment[az]=Plasma mövzusunu seçin
Comment[ca]=Trieu el tema del Plasma
Comment[cs]=Zvolte motiv Plasma
Comment[es]=Escoger un tema de Plasma
Comment[eu]=Aukeratu Plasmaren gaia
Comment[fr]=Sélectionner un thème Plasma
......@@ -22,6 +26,8 @@ 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
Comment[sk]=Vybrať Plasma tému
Comment[sl]=Izberite temo Plasme
Comment[sv]=Välj Plasmatema
Comment[uk]=Вибір теми Плазми
Comment[x-test]=xxChoose Plasma themexx
......
......@@ -2,6 +2,7 @@
Name=Plasma Styles
Name[az]=Plasma Üslubu
Name[ca]=Estils del Plasma
Name[cs]=Styly Plasma
Name[es]=Estilos de Plasma
Name[eu]=Plasmaren estiloak
Name[fr]=Styles Plasma
......@@ -9,6 +10,8 @@ Name[it]=Stili di Plasma
Name[nl]=Plasma-stijlen
Name[pt]=Estilos do Plasma
Name[pt_BR]=Estilos do Plasma
Name[sk]=Plasma štýly
Name[sl]=Slogi Plasme
Name[sv]=Plasmastilar
Name[uk]=Стилі Плазми
Name[x-test]=xxPlasma Stylesxx
......
......@@ -2,6 +2,7 @@
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
Name[es]=Iconos
Name[eu]=Ikonoak
Name[fr]=Icônes
......@@ -9,6 +10,8 @@ Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[sk]=Ikony
Name[sl]=Ikone
Name[sv]=Ikoner
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
......
......@@ -14,6 +14,7 @@ X-KDE-Weight=60
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
Name[es]=Iconos
Name[eu]=Ikonoak
Name[fr]=Icônes
......@@ -21,6 +22,8 @@ Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[sk]=Ikony
Name[sl]=Ikone
Name[sv]=Ikoner
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
......@@ -28,6 +31,7 @@ Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[az]=İkon mövzusunu seçin
Comment[ca]=Trieu el tema d'icones
Comment[cs]=Vyberte motiv ikon
Comment[es]=Escoger un tema de iconos
Comment[eu]=Aukeratu ikono-gaia
Comment[fr]=Sélectionner un thème d'icônes
......@@ -35,6 +39,8 @@ 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
Comment[sk]=Vybrať veľkosť ikon
Comment[sl]=Izberite temo ikon
Comment[sv]=Välj ikontema
Comment[uk]=Вибір теми піктограм
Comment[x-test]=xxChoose icon themexx
......@@ -42,6 +48,7 @@ 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[cs]=ikony,efekty,velikost,hicolor,locolor
X-KDE-Keywords[es]=iconos,efectos,tamaño,hicolor,locolor
X-KDE-Keywords[eu]=ikonoak,efektuak,neurria,sakonera handiko kolorea,sakonera txikiko kolorea
X-KDE-Keywords[fr]=icônes, effets, taille, couleurs-16 bits, couleurs-8 bits
......@@ -49,6 +56,8 @@ 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
X-KDE-Keywords[sk]=ikony,efekty,veľkosť,hicolor,locolor
X-KDE-Keywords[sl]=ikone,učinki,velikost,barva
X-KDE-Keywords[sv]=ikoner,effekter,storlek,hicolor,locolor
X-KDE-Keywords[uk]=icons,effects,size,hicolor,locolor,піктограми,значки,іконки,ефект,ефекти,розмір,колір
X-KDE-Keywords[x-test]=xxiconsxx,xxeffectsxx,xxsizexx,xxhicolorxx,xxlocolorxx
......
......@@ -2,6 +2,7 @@
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[cs]=Ikony
Name[es]=Iconos
Name[eu]=Ikonoak
Name[fr]=Icônes
......@@ -9,12 +10,15 @@ Name[it]=Icone
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[sk]=Ikony
Name[sl]=Ikone
Name[sv]=Ikoner
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[az]=İkon mövzusunu seçin
Comment[ca]=Trieu el tema d'icones
Comment[cs]=Vyberte motiv ikon
Comment[es]=Escoger un tema de iconos
Comment[eu]=Aukeratu ikono-gaia
Comment[fr]=Sélectionner un thème d'icônes
......@@ -22,6 +26,8 @@ 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
Comment[sk]=Vybrať veľkosť ikon
Comment[sl]=Izberite temo ikon
Comment[sv]=Välj ikontema
Comment[uk]=Вибір теми піктограм
Comment[x-test]=xxChoose icon themexx
......
......@@ -2,6 +2,7 @@
Name=Recent Files
Name[az]=Sonuncu fayllar
Name[ca]=Fitxers recents
Name[cs]=Nedávné soubory
Name[es]=Archivos recientes
Name[eu]=Azken aldiko fitxategiak
Name[fi]=Viimeisimmät tiedostot
......@@ -10,6 +11,7 @@ Name[it]=File recenti
Name[nl]=Recente bestanden
Name[pt]=Ficheiros Recentes
Name[pt_BR]=Arquivos recentes
Name[sk]=Nedávne súbory
Name[sl]=Zadnje datoteke
Name[sv]=Senaste filer
Name[uk]=Нещодавні файли
......
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