Commit c101b7a9 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 2e71f752
......@@ -11,17 +11,29 @@ X-KDE-Weight=20
X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
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[nl]=Plasma-stijl kiezen
Comment[pt]=Escolher o estilo do Plasma
Comment[pt_BR]=Escolha o estilo do Plasma
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[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[sv]=Skrivbordstema,Plasmatema
X-KDE-Keywords[uk]=Desktop Theme,Plasma Theme,тема,стільниця,плазма
X-KDE-Keywords[x-test]=xxDesktop Themexx,xxPlasma Themexx
[Desktop Entry]
Name=Plasma Style
Name[az]=Plasma Üslubu
Name[ca]=Estil del Plasma
Name[nl]=Plasma-stijl
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
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[nl]=Plasma-thema kiezen
Comment[pt]=Escolher o tema do Plasma
Comment[pt_BR]=Escolha o tema do Plasma
Comment[sv]=Välj Plasmatema
Comment[uk]=Вибір теми Плазми
Comment[x-test]=xxChoose Plasma themexx
Icon=preferences-desktop-theme
......
[KNewStuff3]
Name=Plasma Styles
Name[az]=Plasma Üslubu
Name[ca]=Estils del Plasma
Name[nl]=Plasma-stijlen
Name[pt]=Estilos do Plasma
Name[pt_BR]=Estilos do Plasma
Name[sv]=Plasmastilar
Name[uk]=Стилі Плазми
Name[x-test]=xxPlasma Stylesxx
......
[KNewStuff3]
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[sv]=Ikoner
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
......
......@@ -12,20 +12,32 @@ X-KDE-System-Settings-Parent-Category=appearance
X-KDE-Weight=60
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
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[nl]=Pictogramthema kiezen
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
Comment[sv]=Välj ikontema
Comment[uk]=Вибір теми піктограм
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[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[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
......
[Desktop Entry]
Name=Icons
Name[az]=Nişanlar
Name[ca]=Icones
Name[nl]=Pictogrammen
Name[pt]=Ícones
Name[pt_BR]=Ícones
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[nl]=Pictogramthema kiezen
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
Comment[sv]=Välj ikontema
Comment[uk]=Вибір теми піктограм
Comment[x-test]=xxChoose icon themexx
......
......@@ -37,6 +37,38 @@ Name[x-test]=xxLanguagexx
Name[zh_CN]=语言
Name[zh_TW]=語言
Comment=Change workspace and application languages
Comment[ast]=Camuda les llingües de la estaya de trabayu y les aplicaciones
Comment[az]=İş mühitinin və tətbiqlərin dillərini dəyişmək
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[da]=Skift sprog for skrivebordet og programmer
Comment[de]=Sprache für den Arbeitsbereich und die Anwendungen ändern
Comment[en_GB]=Change workspace and application languages
Comment[es]=Cambiar los idiomas del espacio de trabajo y de las aplicaciones
Comment[et]=Töötsooni ja rakenduste keele muutmine
Comment[eu]=Aldatu languneko eta aplikazioko hizkuntzak
Comment[fi]=Vaihda työtilan ja sovellusten kieltä
Comment[fr]=Changer la langue de l'espace de travail et des applications
Comment[gl]=Cambiar os idiomas do espazo de traballo e das aplicacións
Comment[hu]=A munkaterület és az alkalmazások nyelvének beállításai
Comment[id]=Ubah bahasa aplikasi dan ruangkerja
Comment[it]=Cambia la lingua dello spazio di lavoro e dell'applicazione
Comment[ko]=작업 공간과 프로그램 언어 변경
Comment[lt]=Keisti darbo srities ir programų kalbas
Comment[nl]=Werkruimte en talen van toepassingen wijzigen
Comment[nn]=Endra språk for arbeidsflate og program
Comment[pa]=ਵਰਕਸਪੇਸ ਅਤੇ ਐਪਲੀਕੇਸ਼ਨ ਭਾਸ਼ਾਵਾਂ ਬਦਲੋ
Comment[pl]=Zmień język przestrzeni pracy i aplikacji
Comment[pt]=Mudar as línguas da área de trabalho e da aplicação
Comment[pt_BR]=Altera os idiomas do espaço de trabalho e aplicativos
Comment[ru]=Изменение языка приложений и рабочего среды
Comment[sk]=Zmeniť jazyky pracovného priestoru a aplikácií
Comment[sl]=Spremeni jezik delovnega prostora in programov
Comment[sv]=Ändra arbetsområde och programspråk
Comment[uk]=Зміна мови перекладу робочого простору і програм
Comment[x-test]=xxChange workspace and application languagesxx
Comment[zh_CN]=更改工作空间和应用程序语言
Comment[zh_TW]=變更工作區及應用程式的語言
Icon=preferences-desktop-locale
Type=Service
......
[Desktop Entry]
Name=Recent Files
Name[az]=Sonuncu fayllar
Name[ca]=Fitxers recents
Name[es]=Archivos recientes
Name[fi]=Viimeisimmät tiedostot
......
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