Commit 12e46750 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 28fafa92
......@@ -15,6 +15,7 @@ Name[fr]=Anciens égyptiens
Name[ga]=Ancient Egyptians
Name[gl]=Antigos exipcios
Name[hu]=Ókori Egyiptom
Name[id]=Mesir Kuno
Name[is]=Fornegypskt
Name[it]=Antichi egizi
Name[kk]=Көне мысыршылар
......@@ -59,6 +60,7 @@ Comment[fr]=Un jeu de cartes dans le style de l'ancienne Égypte.
Comment[ga]=Deic cártaí ón tSean-Éigipt.
Comment[gl]=Unha baralla do antigo Exipto.
Comment[hu]=Ókori Egyiptomos kártyacsomag.
Comment[id]=Sebuah dek kartu Mesir kuno.
Comment[it]=Un dorso per carte egizio
Comment[kk]=Нақышы Мысырша ойын карталар
Comment[km]=ហ៊ូ​បៀ​អេហ្ស៊ីប​បុរាណ ។
......
......@@ -23,6 +23,7 @@ Name[gl]=Dondorf
Name[he]=Dondorf
Name[hr]=Dondorf
Name[hu]=Dondorf
Name[id]=Dondorf
Name[is]=Dondorf
Name[it]=Dondorf
Name[kk]=Дондорф
......
......@@ -14,6 +14,7 @@ Name[fr]=Future et simple
Name[ga]=Future Simple
Name[gl]=Futuro simple
Name[hu]=Egyszerű jövő
Name[id]=Future Simple
Name[it]=Futuro semplice
Name[kk]=Қарапайым болашақты
Name[km]=អនាគតធម្មតា
......
......@@ -16,6 +16,7 @@ Name[fr]=Paris
Name[ga]=Paris
Name[gl]=París
Name[hu]=Párizs
Name[id]=Paris
Name[it]=Parigi
Name[kk]=Париж
Name[km]=ប៉ារីស​
......
......@@ -15,6 +15,7 @@ Name[ga]=Jolly Royal
Name[gl]=Jolly Royal
Name[hr]=Jolly Royal
Name[hu]=Jolly Royal
Name[id]=Jolly Royal
Name[it]=Jolly Royal
Name[kk]=Шаттанған патшалық
Name[km]=Jolly Royal
......@@ -58,6 +59,7 @@ Comment[fr]=Un thème épuré et facile proposant une touche royale particulièr
Comment[ga]=Stíl ghlan éasca le blas fíor-ríoga.
Comment[gl]=Un estilo limpo e sinxelo cun toque de distinción.
Comment[hu]=Egyszerű, tiszta stílus némi uralkodói beütéssel.
Comment[id]=Sebuah gaya bersih dan mudah dengan sentuhan khas kerajaan.
Comment[it]=Uno stile semplice e pulito con un tocco regale che lo distingue.
Comment[kk]=Анық я қарапайым шын патшалық стилі.
Comment[km]=រចនាប័ទ្ម​ស្អាត​ និង​ងាយ​ស្រួល​ប្រើ​​ដែល​មាន​បែប​បទ​​ប៉ះ​ពាល់​ប្លែក​ពិសេស​ ។
......
......@@ -26,6 +26,7 @@ Name[he]=Konqi
Name[hne]=कान्क्वी
Name[hr]=Konqi
Name[hu]=Konqi
Name[id]=Konqi
Name[is]=Konqi
Name[it]=Konqui
Name[ja]=Konqi
......
......@@ -15,6 +15,7 @@ Name[fr]=Ornemental Nicu
Name[ga]=Nicu Ornamental
Name[gl]=Nicu Ornamental
Name[hu]=Nicu díszes
Name[id]=Hiasan Nicu
Name[it]=Ornamentale Nicu
Name[kk]=Nicu өрнегі
Name[km]=Nicu Ornamental
......
......@@ -14,6 +14,7 @@ Name[fr]=Nicu blanc
Name[ga]=Nicu White
Name[gl]=Nicu en branco
Name[hu]=Nicu White
Name[id]=Putih Nicu
Name[it]=Bianco Nicu
Name[kk]=Ақ Nicu
Name[km]=Nicu ពណ៌​ស
......
......@@ -15,6 +15,7 @@ Name[fr]=Oxygen Air
Name[ga]=Oxygen Air
Name[gl]=Oxygen Air
Name[hu]=Oxigén levegő
Name[id]=Udara Oxygen
Name[it]=Aria Oxygen
Name[kk]=Oxygen Air
Name[km]=ខ្យល់​អុកស៊ីសែន
......
......@@ -15,6 +15,7 @@ Name[fr]=Oxygen blanc
Name[ga]=Oxygen White
Name[gl]=Oxygen branco
Name[hu]=Oxigén (fehér)
Name[id]=Putih Oxygen
Name[it]=Oxygen bianco
Name[kk]=Oxygen ақ
Name[km]=អុកស៊ីសែន​ ស
......
......@@ -19,6 +19,7 @@ Name[ga]=Oxygen
Name[gl]=Oxygen
Name[hne]=आक्सीजन
Name[hu]=Oxygen
Name[id]=Oxygen
Name[it]=Oxygen
Name[ja]=Oxygen
Name[kk]=Oxygen
......
......@@ -18,6 +18,7 @@ Name[ga]=Penguins
Name[gl]=Pingüíns
Name[hr]=Penguins
Name[hu]=Pingvinek
Name[id]=Pinguin
Name[it]=Pinguini
Name[ja]=ペンギン
Name[kk]=Пингвиндер
......
......@@ -17,6 +17,7 @@ Name[fr]=Standard
Name[ga]=Caighdeánach
Name[gl]=Estándar
Name[hu]=Standard
Name[id]=Standar
Name[it]=Standard
Name[ja]=標準
Name[kk]=Стандартты
......@@ -76,6 +77,7 @@ Comment[he]=ערכת הקלפים הסטנדרטית של KDE\nרישיון GPL
Comment[hne]=मानक केडीई तास सेट\nजीपीएल अनुग्यापत्र
Comment[hr]=Standardni KDE komplet karata\nGPL licenca
Comment[hu]=Standard KDE kártyacsomag\n(GPL licencű)
Comment[id]=Set kartu standar KDE\lisensi nGPL
Comment[is]=Venjulegi KDE spilastokkurinn\nGPL leyfi
Comment[it]=Insieme di carte standard di KDE\nLicenza GPL
Comment[ja]=KDE の標準カードセット\nGPL ライセンス
......
......@@ -15,6 +15,7 @@ Name[fr]=Tigullio International
Name[ga]=Tigullio Idirnáisiúnta
Name[gl]=Tigullio International
Name[hu]=Tigullio International
Name[id]=Internasional Tigullio
Name[is]=Tigullio alþjóðlegt
Name[it]=Tigullio internazionale
Name[kk]=Tigullio халықаралық
......
......@@ -25,6 +25,7 @@ Name[he]=XSkat צרפתי
Name[hne]=एक्सस्कात फ्रेंच
Name[hr]=Francuski XSkat
Name[hu]=FRancia XSkat
Name[id]=XSkat Prancis
Name[is]=XSkat á frönsku
Name[it]=XSkat francese
Name[ja]=XSkat フランス語
......
......@@ -25,6 +25,7 @@ Name[he]=XSkat גרמני
Name[hne]=एक्सस्कात जर्मन
Name[hr]=Njemački XSkat
Name[hu]=Német XSkat
Name[id]=XSkat Jerman
Name[is]=XSkat á þýsku
Name[it]=XSkat tedesco
Name[ja]=XSkat ドイツ語
......
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