Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit d9cff5dd 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 c73a103b
......@@ -61,6 +61,7 @@ Name[tr]=KmPlotPart
Name[ug]=KmPlotPart
Name[uk]=KmPlotPart
Name[vi]=Phần Đồ thị K
Name[x-test]=xxKmPlotPartxx
Name[zh_CN]=KmPlot 组件
Name[zh_TW]=KmPlotPart
MimeType=application/x-kmplot;
......
......@@ -69,6 +69,7 @@ Comment[ug]=فۇنكسىيىنىڭ گرافىكىنى سىزغۇ
Comment[uk]=Побудова графіків функцій
Comment[vi]=Vẽ đồ thị Hàm số
Comment[xh]=Umzobi Womsebenzi
Comment[x-test]=xxFunction Plotterxx
Comment[zh_CN]=函数绘图程序
Comment[zh_TW]=函數繪圖程式
Terminal=false
......@@ -137,6 +138,7 @@ Name[ug]=KmPlot
Name[uk]=KmPlot
Name[vi]=Đồ thị K
Name[xh]=KmPlot
Name[x-test]=xxKmPlotxx
Name[zh_CN]=KmPlot
Name[zh_TW]=數學_KmPlot
Categories=Qt;KDE;Education;Math;
......@@ -200,6 +202,7 @@ GenericName[tr]=Matematiksel Fonksiyon Çizici
GenericName[ug]=ماتېماتىكىلىق فۇنكسىيىلەرنىڭ گرافىكىنى سىزغۇ
GenericName[uk]=Графобудівник математичних функцій
GenericName[vi]=Vẽ đồ thị Hàm số Toán học
GenericName[x-test]=xxMathematical Function Plotterxx
GenericName[zh_CN]=数学函数绘图器
GenericName[zh_TW]=函數繪圖程式
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