Commit d093ba57 authored by Script Kiddy's avatar Script Kiddy

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 33742e4f
......@@ -23,6 +23,7 @@ Name[sv]=Sidorad
Name[tr]=Yan Çubuk Görünümü
Name[uk]=Бічна панель
Name[x-test]=xxSidebar Viewxx
Name[zh_TW]=側邊欄檢視
Comment=Categorized sidebar style
Comment[ca]=Estil de barra lateral categoritzat
Comment[ca@valencia]=Estil de barra lateral categoritzat
......@@ -47,6 +48,7 @@ Comment[sv]=Kategoriserad sidoradstil
Comment[tr]=Sınıflandırılmış yan çubuk biçimi
Comment[uk]=Категоризований стиль бічної панелі
Comment[x-test]=xxCategorized sidebar stylexx
Comment[zh_TW]=已分類的側邊欄樣式
Icon=view-sidetree
Encoding=UTF-8
Keywords=
......
......@@ -85,6 +85,7 @@ Name[sv]=Sidorad
Name[tr]=Yan Çubuk Görünümü
Name[uk]=Бічна панель
Name[x-test]=xxSidebar Viewxx
Name[zh_TW]=側邊欄檢視
Comment=Categorized sidebar style
Comment[ca]=Estil de barra lateral categoritzat
Comment[ca@valencia]=Estil de barra lateral categoritzat
......@@ -109,3 +110,4 @@ Comment[sv]=Kategoriserad sidoradstil
Comment[tr]=Sınıflandırılmış yan çubuk biçimi
Comment[uk]=Категоризований стиль бічної панелі
Comment[x-test]=xxCategorized sidebar stylexx
Comment[zh_TW]=已分類的側邊欄樣式
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