Commit ef99b018 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 51b606a1
......@@ -7,6 +7,7 @@ X-DocPath=kmag/index.html
Terminal=false
Name=KMag
Name[ar]=مكبَر كي
Name[ast]=KMag
Name[be]=KMag
Name[bg]=KMag
Name[br]=KMag
......@@ -74,6 +75,7 @@ Name[zh_CN]=放大镜
Name[zh_TW]=K-放大鏡
GenericName=Screen Magnifier
GenericName[ar]=مكبَر الشاشة
GenericName[ast]=Lente pa la pantalla
GenericName[be]=Экранная лупа
GenericName[bg]=Лупа за екрана
GenericName[bs]=Uveličavač ekrana
......@@ -144,6 +146,7 @@ GenericName[x-test]=xxScreen Magnifierxx
GenericName[zh_CN]=屏幕放大镜
GenericName[zh_TW]=螢幕放大鏡
Comment=A screen magnification tool
Comment[ast]=Una ferramienta p'aumentar la pantalla
Comment[ca]=Una eina d'ampliació de la pantalla
Comment[ca@valencia]=Una eina d'ampliació de la pantalla
Comment[cs]=Nástroj pro zvětšení obrazovky
......
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