Commit 395e1026 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 c4c52bdd
......@@ -106,6 +106,7 @@ Name[zh_TW]=顏色
Comment=Choose color scheme
Comment[ca]=Trieu l'esquema de colors
Comment[ca@valencia]=Trieu l'esquema de colors
Comment[cs]=Vyberte barevné schéma
Comment[de]=Farbschema auswählen
Comment[en_GB]=Choose colour scheme
Comment[es]=Escoger un esquema de color
......
......@@ -93,6 +93,7 @@ Name[zh_TW]=顏色
Comment=Choose color scheme
Comment[ca]=Trieu l'esquema de colors
Comment[ca@valencia]=Trieu l'esquema de colors
Comment[cs]=Vyberte barevné schéma
Comment[de]=Farbschema auswählen
Comment[en_GB]=Choose colour scheme
Comment[es]=Escoger un esquema de color
......
......@@ -12,6 +12,7 @@ X-DocPath=kcontrol/desktopthemedetails/index.html
Name=Plasma Style
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
Name[de]=Plasma-Stil
Name[en_GB]=Plasma Style
Name[es]=Estilo de Plasma
......@@ -32,6 +33,7 @@ Name[zh_CN]=Plasma 样式
Name[zh_TW]=Plasma 樣式
Comment=Choose Plasma style
Comment[ca]=Trieu l'estil del Plasma
Comment[cs]=Zvolte styl Plasma
Comment[de]=Plasma-Stil auswählen
Comment[en_GB]=Choose Plasma style
Comment[es]=Escoger el estilo de Plasma
......@@ -52,6 +54,7 @@ Comment[zh_CN]=选择 Plasma 样式
Comment[zh_TW]=選擇 Plasma 樣式
X-KDE-Keywords=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[de]=Arbeitsflächen-Design, Plasma-Design
X-KDE-Keywords[en_GB]=Desktop Theme,Plasma Theme
X-KDE-Keywords[es]=Tema de escritorio,Tema de Plasma
......
[Desktop Entry]
Name=Plasma Style
Name[ca]=Estil del Plasma
Name[cs]=Styl Plasma
Name[de]=Plasma-Stil
Name[en_GB]=Plasma Style
Name[es]=Estilo de Plasma
......@@ -22,6 +23,7 @@ Name[zh_TW]=Plasma 樣式
Comment=Choose Plasma theme
Comment[ca]=Trieu el tema del Plasma
Comment[ca@valencia]=Trieu el tema del Plasma
Comment[cs]=Zvolte motiv Plasma
Comment[de]=Plasma-Design auswählen
Comment[en_GB]=Choose Plasma theme
Comment[es]=Escoger un tema de Plasma
......
[KNewStuff3]
Name=Plasma Styles
Name[ca]=Estils del Plasma
Name[cs]=Styly Plasma
Name[de]=Plasma-Stile
Name[en_GB]=Plasma Styles
Name[es]=Estilos de Plasma
......
......@@ -106,6 +106,7 @@ Name[zh_TW]=圖示
Comment=Choose icon theme
Comment[ca]=Trieu el tema d'icones
Comment[ca@valencia]=Trieu el tema d'icones
Comment[cs]=Vyberte motiv ikon
Comment[de]=Symbol-Design auswählen
Comment[en_GB]=Choose icon theme
Comment[es]=Escoger un tema de iconos
......
......@@ -93,6 +93,7 @@ Name[zh_TW]=圖示
Comment=Choose icon theme
Comment[ca]=Trieu el tema d'icones
Comment[ca@valencia]=Trieu el tema d'icones
Comment[cs]=Vyberte motiv ikon
Comment[de]=Symbol-Design auswählen
Comment[en_GB]=Choose icon theme
Comment[es]=Escoger un tema de iconos
......
......@@ -43,6 +43,7 @@ Name[zh_TW]=應用程式樣式
Comment=Configure application style and behavior
Comment[ca]=Configura l'estil i el comportament de les aplicacions
Comment[ca@valencia]=Configura l'estil i el comportament de les aplicacions
Comment[cs]=Nastavení stylu a chování oken
Comment[de]=Stil und Verhalten der Anwendungen einrichten
Comment[en_GB]=Configure application style and behaviour
Comment[es]=Configurar el estilo y el comportamiento de la aplicación
......
......@@ -10,6 +10,7 @@ X-KDE-Weight=40
X-DocPath=kcontrol/workspaceoptions/index.html
Name=General Behavior
Name[ca]=Comportament general
Name[cs]=Obecné chování
Name[de]=Allgemeines Verhalten
Name[en_GB]=General Behaviour
Name[es]=Comportamiento general
......
[Desktop Entry]
Name=General Behavior
Name[ca]=Comportament general
Name[cs]=Obecné chování
Name[de]=Allgemeines Verhalten
Name[en_GB]=General Behaviour
Name[es]=Comportamiento general
......
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