Commit c1b66a71 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 71c93ff6
Pipeline #166756 skipped
......@@ -29,7 +29,7 @@
"Description[tr]": "Bir balık gözlü lense benzeyen bir ekran büyüteci",
"Description[uk]": "Екранна лупа, яка робить вигляд стільниці схожим на зображення, отримане з ефектом «риб’ячого ока»",
"Description[x-test]": "xxA screen magnifier that looks like a fisheye lensxx",
"Description[zh_CN]": "放大显示鼠标指针附近的一块圆形的屏幕内容,效果类似鱼眼镜头",
"Description[zh_CN]": "放大显示鼠标光标附近的一块圆形的屏幕内容,效果类似鱼眼镜头",
"EnabledByDefault": false,
"Id": "lookingglass",
"License": "GPL",
......
......@@ -29,7 +29,7 @@
"Description[tr]": "Fare imlecinin yakınındaki ekran bölümünü büyüt",
"Description[uk]": "Збільшення частини екрана поруч з вказівником миші",
"Description[x-test]": "xxMagnify the section of the screen that is near the mouse cursorxx",
"Description[zh_CN]": "放大显示鼠标指针附近的一块方形区域的屏幕内容",
"Description[zh_CN]": "放大显示鼠标光标附近的一块方形区域的屏幕内容",
"EnabledByDefault": false,
"Id": "magnifier",
"License": "GPL",
......
......@@ -29,7 +29,7 @@
"Description[tr]": "Masaüstünde çizgiler çizmenize izin verir.",
"Description[uk]": "Можливість малювання ліній на стільниці",
"Description[x-test]": "xxAllows you to draw lines on the desktopxx",
"Description[zh_CN]": "用鼠标指针直接在屏幕上画出线条",
"Description[zh_CN]": "用鼠标光标直接在屏幕上画出线条",
"EnabledByDefault": false,
"Id": "mousemark",
"License": "GPL",
......
Supports Markdown
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