Commit 473b0244 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 864609da
[KGameTheme]
Name=Default
Name[ast]=Por defeutu
Name[be]=Прадвызначаны
Name[br]=Dre ziouer
Name[bs]=Podrazumijevani
......@@ -60,7 +59,6 @@ Name[x-test]=xxDefaultxx
Name[zh_CN]=默认
Name[zh_TW]=預設
Description=Kigo Default theme for KDE 4
Description[ast]=El tema por defeutu de Kigo pa KDE 4
Description[bs]=Kigo podrazumjevana tema za KDE 4
Description[ca]=Tema predeterminat del Kigo per al KDE 4
Description[ca@valencia]=Tema predeterminat del Kigo per al KDE 4
......
[KGameTheme]
Name=Plain
Name[ast]=Planu
Name[bs]=Obični
Name[ca]=Normal
Name[ca@valencia]=Normal
......
......@@ -8,7 +8,6 @@ MimeType=application/x-go-sgf;
X-DBUS-ServiceName=org.kde.kigo
Name=Kigo
Name[ast]=Kigo
Name[bs]=Kigo
Name[ca]=Kigo
Name[ca@valencia]=Kigo
......@@ -56,7 +55,6 @@ Name[zh_CN]=Kigo
Name[zh_TW]=Kigo
GenericName=Go Board Game
GenericName[ast]=Xuegu de mesa Go
GenericName[bs]=Igraj igru na ploči
GenericName[ca]=Joc de taula Go
GenericName[ca@valencia]=Joc de taula Go
......
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