Commit 43190a9a 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 b61a60e0
......@@ -19,6 +19,7 @@ Name[ga]=Dubh agus Dearg
Name[gl]=Negro e vermello
Name[hne]=काला अउ लाल
Name[hu]=Fekete-vörös
Name[id]=Hitam dan Merah
Name[it]=Rosso e nero
Name[ja]=黒と赤
Name[kk]=Қара мен қызыл
......
......@@ -18,6 +18,7 @@ Name[ga]=True Reflection
Name[gl]=Reflexos auténticos
Name[hne]=सही परावर्तन
Name[hu]=Valós fényvisszaverődés
Name[id]=Pembelokan yang Benar
Name[it]=Veri riflessi
Name[ja]=黒と赤の反射
Name[kk]=Шын шағылу
......
......@@ -19,6 +19,7 @@ Name[ga]=Buí agus Dearg
Name[gl]=Amarelo e vermello
Name[hne]=पीला अउ लाल
Name[hu]=Sárga-vörös
Name[id]=Kuning dan Merah
Name[it]=Giallo e rosso
Name[ja]=黄色と赤
Name[kk]=Сары мен қызыл
......
......@@ -17,6 +17,7 @@ Name[ga]=Frithchaitheamh Buí agus Dearg
Name[gl]=Amarelo con reflexos vermellos
Name[hne]=पीला अउ लाल परावर्तन
Name[hu]=Sárga-vörös visszaverődés
Name[id]=Pembelokan Kuning dan Merah
Name[it]=Riflessi gialli e rossi
Name[ja]=黄色と赤の反射
Name[kk]=Сары мен қызылдың шағылуы
......
......@@ -18,6 +18,7 @@ Name[ga]=KFourInLine
Name[gl]=KFourInLine
Name[hne]=केफोरइनलाइन
Name[hu]=Színes vonalak
Name[id]=KFourInLine
Name[it]=KFourInLine
Name[ja]=KFourInLine
Name[kk]=KFourInLine
......@@ -70,6 +71,7 @@ GenericName[ga]=Cluiche Cláir ceithre-cinn-as-a-chéile
GenericName[gl]=Xogo de taboleiro «Catro en liña»
GenericName[hne]=बोर्ड मं एक लकीर मं चार वाले खेल
GenericName[hu]=Táblás játék
GenericName[id]=Permainan Papan Empat-dalam-sebaris
GenericName[it]=Quattro-in-fila, gioco da tavolo
GenericName[ja]=四目並べ
GenericName[kk]="Төртеуін - қатарға" ойны
......@@ -111,6 +113,7 @@ Comment[es]=Juego clásico basado en turnos
Comment[fi]=Perinteinen vuoroperustainen peli
Comment[fr]=Jeu au tour par tour classique
Comment[gl]=Xogo clásico por quendas.
Comment[id]=Permainan berdasarkan giliran yang klasik
Comment[it]=Classico gioco a turni
Comment[ko]=고전 턴제 게임
Comment[nl]=Klassiek beurtelings spel
......
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