Commit c5bdfa2f 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 97395167
......@@ -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
......
......@@ -103,6 +103,7 @@ ForegroundVisited=150,111,232
Name=Oxygen Cold
Name[ca]=Oxygen Cold
Name[ca@valencia]=Oxygen Cold
Name[cs]=Oxygen Cold
Name[da]=Oxygen Cold
Name[de]=Oxygen-Kalt
Name[en_GB]=Oxygen Cold
......
......@@ -89,6 +89,7 @@ ForegroundVisited=100,74,155
Name=Steel
Name[ca]=Steel
Name[ca@valencia]=Steel
Name[cs]=Ocel
Name[da]=Steel
Name[de]=Stahl
Name[en_GB]=Steel
......
......@@ -88,6 +88,7 @@ ForegroundVisited=64,128,255
Name=Wonton Soup
Name[ca]=Wonton Soup
Name[ca@valencia]=Wonton Soup
Name[cs]=Polévka Wonton
Name[da]=Wonton Soup
Name[de]=Wonton-Suppe
Name[en_GB]=Wonton Soup
......
......@@ -90,6 +90,7 @@ ForegroundVisited=88,0,176
Name=Zion
Name[ca]=Zion
Name[ca@valencia]=Zion
Name[cs]=Zion
Name[da]=Zion
Name[de]=Zion
Name[en_GB]=Zion
......
......@@ -41,6 +41,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
......
......@@ -30,6 +30,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
......
......@@ -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
......
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