Commit 119782cd 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 4e2d7da3
......@@ -26,7 +26,6 @@ Name[ru]=GCompris
Name[sk]=GCompris
Name[sv]=GCompris
Name[uk]=GCompris
Name[x-test]=xxGComprisxx
Name[zh_CN]=GCompris
GenericName=Educational Game for Children
GenericName[ca]=Joc educatiu per a infants
......@@ -43,7 +42,6 @@ GenericName[pt]=Jogo Educativo para Crianças
GenericName[pt_BR]=Jogo educacional para crianças
GenericName[sv]=Pedagogiskt spel för barn
GenericName[uk]=Освітня гра для дітей
GenericName[x-test]=xxEducational Game for Childrenxx
Comment=Multi-Activity Educational game for children 2 to 10
Comment[ar]=لعبة تعليميّة متعدّدة الأنشطة للأطفال من سنتين إلى ١٠ سنوات
Comment[br]=C'hoari kelennadel gant oberezhioù a bep seurt evit ar vugale etre 2 ha 10 vloaz
......@@ -78,7 +76,6 @@ Comment[sl]=Izobraževalna igra z več dejavnostmi za otroke med drugim in deset
Comment[sv]=Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år
Comment[tr]=2-10 yaş arası çocuklar için Çoklu Etkileşimli Eğitici oyun
Comment[uk]=Набір освітніх ігор для дітей від 2 до 10 років
Comment[x-test]=xxMulti-Activity Educational game for children 2 to 10xx
Comment[zh_CN]=为 2 到 10 岁儿童准备的多功能教育游戏
Comment[zh_TW]=為 2-10 歲孩子設計的教育遊戲
Exec=gcompris-qt
......
......@@ -33,7 +33,6 @@ Name[sl]=Izobraževalna igra GCompris
Name[sv]=GCompris pedagogiskt spel
Name[tr]=GCompris Eğitici Oyun
Name[uk]=Освітня гра GCompris
Name[x-test]=xxGCompris Educational Gamexx
Name[zh_CN]=GCompris 教育游戏
Name[zh_TW]=GCompris 教育遊戲
GenericName=Educational game
......@@ -71,7 +70,6 @@ GenericName[sl]=Izobraževalna igra
GenericName[sv]=Pedagogiskt spel
GenericName[tr]=Eğitici oyun
GenericName[uk]=Освітня гра
GenericName[x-test]=xxEducational gamexx
GenericName[zh_CN]=教育游戏
GenericName[zh_TW]=教育遊戲
Comment=Multi-Activity Educational game for children 2 to 10
......@@ -108,7 +106,6 @@ Comment[sl]=Izobraževalna igra z več dejavnostmi za otroke med drugim in deset
Comment[sv]=Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år
Comment[tr]=2-10 yaş arası çocuklar için Çoklu Etkileşimli Eğitici oyun
Comment[uk]=Набір освітніх ігор для дітей від 2 до 10 років
Comment[x-test]=xxMulti-Activity Educational game for children 2 to 10xx
Comment[zh_CN]=为 2 到 10 岁儿童准备的多功能教育游戏
Comment[zh_TW]=為 2-10 歲孩子設計的教育遊戲
Exec=harbour-gcompris-qt
......
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