Commit 9e945a34 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 14e447a0
......@@ -2,7 +2,6 @@
Type=Service
Name=Dr. Geo Info
Name[af]=Dr. Geo inligting
Name[ast]=Información de Dr. Geo
Name[be]=Звесткі Dr. Geo
Name[bg]=Dr. Geo Info
Name[bn]=ড. জিও সংক্রান্ত তথ্য
......
......@@ -2,7 +2,6 @@
Type=Service
Name=Kig Info
Name[af]=Kig inligting
Name[ast]=Información de Kig
Name[be]=Звесткі Kig
Name[bg]=Kig Info
Name[bn]=কিগ সংক্রান্ত তথ্য
......
[Desktop Entry]
Name=KigPart
Name[af]=KigPart
Name[ast]=KigPart
Name[be]=KigPart
Name[bg]=KigPart
Name[bn]=কিগপার্ট
......
......@@ -68,7 +68,6 @@ Name[zh_CN]=Kig
Name[zh_TW]=數學_Kig
GenericName=Interactive Geometry
GenericName[af]=Interaktiewe Meetkunde
GenericName[ast]=Xeometría interactiva
GenericName[be]=Інтэрактыўная геаметрыя
GenericName[bg]=Интерактивна геометрия
GenericName[bn]=ইন্টারঅ্যাকটিভ জ্যামিতি
......@@ -132,7 +131,6 @@ GenericName[x-test]=xxInteractive Geometryxx
GenericName[zh_CN]=交互几何
GenericName[zh_TW]=交互式幾何作圖
Comment=Explore Geometric Constructions
Comment[ast]=Esplora construcciones xeométriques
Comment[be]=Вывучэнне геаметрычных фігур
Comment[bg]=Геометрични конструкции
Comment[bn]=জ্যামিতি ছবি আঁকা চর্চা করুন
......
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