Commit 1f61f09d 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 b1ee38d2
......@@ -11,5 +11,17 @@ X-KDE-Weight=20
X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
Name[uk]=Стиль Плазми
Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma style
Comment[pt]=Escolher o estilo do Plasma
Comment[pt_BR]=Escolha o estilo do Plasma
Comment[uk]=Вибір стилю Плазми
Comment[x-test]=xxChoose Plasma stylexx
X-KDE-Keywords=Desktop Theme,Plasma Theme
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[uk]=Desktop Theme,Plasma Theme,тема,стільниця,плазма
X-KDE-Keywords[x-test]=xxDesktop Themexx,xxPlasma Themexx
[Desktop Entry]
Name=Plasma Style
Name[pt]=Estilo do Plasma
Name[pt_BR]=Estilo do Plasma
Name[uk]=Стиль Плазми
Name[x-test]=xxPlasma Stylexx
Comment=Choose Plasma theme
Comment[pt]=Escolher o tema do Plasma
Comment[pt_BR]=Escolha o tema do Plasma
Comment[uk]=Вибір теми Плазми
Comment[x-test]=xxChoose Plasma themexx
Icon=preferences-desktop-theme
Keywords=
Type=Service
......
[KNewStuff3]
Name=Plasma Styles
Name[pt]=Estilos do Plasma
Name[pt_BR]=Estilos do Plasma
Name[uk]=Стилі Плазми
Name[x-test]=xxPlasma Stylesxx
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=Plasma Theme
......
[KNewStuff3]
Name=Icons
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
Categories=KDE Icon Theme
......
......@@ -12,9 +12,21 @@ X-KDE-System-Settings-Parent-Category=appearance
X-KDE-Weight=60
Name=Icons
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
Comment[uk]=Вибір теми піктограм
Comment[x-test]=xxChoose icon themexx
X-KDE-Keywords=icons,effects,size,hicolor,locolor
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[uk]=icons,effects,size,hicolor,locolor,піктограми,значки,іконки,ефект,ефекти,розмір,колір
X-KDE-Keywords[x-test]=xxiconsxx,xxeffectsxx,xxsizexx,xxhicolorxx,xxlocolorxx
Categories=Qt;KDE;X-KDE-settings-looknfeel;
[Desktop Entry]
Name=Icons
Name[pt]=Ícones
Name[pt_BR]=Ícones
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
Comment=Choose icon theme
Comment[pt]=Escolher o tema de ícones
Comment[pt_BR]=Escolha o tema de ícones
Comment[uk]=Вибір теми піктограм
Comment[x-test]=xxChoose icon themexx
Icon=preferences-desktop-icons
Type=Service
......
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