Commit e295f438 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 7596b44c
......@@ -51,6 +51,7 @@ Comment[th]=โปรแกรมแก้ไข Image Map ภาษา HTML
Comment[tr]=Bir HTML resimharitası düzenleyicisi
Comment[ug]=HTML imagemap تەھرىرلىگۈچ
Comment[uk]=Редактор imagemap HTML
Comment[x-test]=xxAn HTML imagemap editorxx
Comment[zh_CN]=HTML 图像映射编辑器
Comment[zh_HK]=一個 HTML 影像地圖的編輯器
Comment[zh_TW]=一個 HTML 影像地圖的編輯器
......@@ -104,6 +105,7 @@ Name[th]=KImageMapEditor
Name[tr]=KImageMapEditor
Name[ug]=KImageMapEditor
Name[uk]=KImageMapEditor
Name[x-test]=xxKImageMapEditorxx
Name[zh_CN]=KImageMapEditor
Name[zh_HK]=KImageMapEditor
Name[zh_TW]=KImageMapEditor
......@@ -54,6 +54,7 @@ Name[th]=KImageMapEditor
Name[tr]=KImageMapEditor
Name[ug]=KImageMapEditor
Name[uk]=KImageMapEditor
Name[x-test]=xxKImageMapEditorxx
Name[zh_CN]=KImageMapEditor
Name[zh_HK]=KImageMapEditor
Name[zh_TW]=KImageMapEditor
......@@ -104,6 +105,7 @@ GenericName[th]=โปรแกรมแก้ไข Image Map
GenericName[tr]=HTML Resim Haritası Düzenleyicisi
GenericName[ug]=HTML رەسىم خەرىتىسى تەھرىرلىگۈچ
GenericName[uk]=Редактор карт зображень HTML
GenericName[x-test]=xxHTML Image Map Editorxx
GenericName[zh_CN]=HTML 图像映射编辑器
GenericName[zh_HK]=HTML 影像地圖編輯器
GenericName[zh_TW]=HTML 影像地圖編輯器
......
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