Commit 09ae2498 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 a5f03dc7
......@@ -21,6 +21,7 @@ Name[ga]=Réamhshocrú
Name[gl]=Predeterminado
Name[hne]=डिफाल्ट
Name[hu]=Alapértelmezés
Name[id]=Default
Name[it]=Predefinito
Name[ja]=標準
Name[kk]=Әдетті
......@@ -74,6 +75,7 @@ Description[fr]=Thème par défaut pour Kigo de KDE 4
Description[ga]=Téama réamhshocraithe Kigo le haghaidh KDE4
Description[gl]=Tema predeterminado de Kigo para KDE 4
Description[hu]=Alapértelmezett Kigo-téma a KDE 4-hez
Description[id]=Tema Default Kigo untuk KDE 4
Description[is]=Sjálfgefið KDE 4 þema fyrir Kigo
Description[it]=Il tema predefinito di Kigo per KDE4
Description[kk]=Kigo-ның KDE 4-тегі нақышы
......
......@@ -15,6 +15,7 @@ Name[fr]=Uni
Name[ga]=Simplí
Name[gl]=Simple
Name[hu]=Egyszerű
Name[id]=Plain
Name[it]=Semplice
Name[kk]=Жәй
Name[km]=ធម្មតា
......@@ -58,6 +59,7 @@ Description[fr]=Thème Kigo uni inspiré du thème par défaut de Arturo Silva
Description[ga]=Téama simplí Kigo bunaithe ar an téama réamhshocraithe, le Arturo Silva
Description[gl]=Tema Kigo sinxelo baseado no tema predeterminado de Arturo Silva
Description[hu]=Egyszerű Kigo-téma Arturo Silva alapértelmezett témáján alapulva
Description[id]=Tema Kigo Plain berdasarkan pada tema Default oleh Arturo Silva
Description[it]=Semplice tema per Kigo basato su quello predefinito (Arturo Silva)
Description[kk]=Kigo-ның Artturo Silvia әдеттінің негізінде келтірген жәй нақышы
Description[km]=ស្បែក Kigo ធម្មតា​ដែល​មាន​មូលដ្ឋាន​លើ​ស្បែក​លំនាំដើម​ដោយ Arturo Silva
......
......@@ -25,6 +25,7 @@ Name[ga]=Kigo
Name[gl]=Kigo
Name[hr]=Kigo
Name[hu]=Kigo
Name[id]=Kigo
Name[is]=Kigo
Name[it]=Kigo
Name[kk]=Kigo
......@@ -69,6 +70,7 @@ GenericName[fr]=Jeu de plateau de Go
GenericName[ga]=Cluiche Cláir Go
GenericName[gl]=Xogo de taboleiro «Go»
GenericName[hu]=Go játék
GenericName[id]=Permainan Papan Go
GenericName[is]=GO borðleikur
GenericName[it]=Gioco del Go
GenericName[kk]="Го" тақта ойыны
......
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