Commit c0ff85b2 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 cf23ff78
......@@ -42,7 +42,6 @@ Name[te]=కె అల్జీబ్రా మొబైలు
Name[tr]=KAlgebra Mobil
Name[ug]=كۆچمە ئۈسكۈنىلەر ئۈچۈن KAlgebra
Name[uk]=Мобільна KAlgebra
Name[x-test]=xxKAlgebra Mobilexx
Name[zh_CN]=KAlgebra 移动
Name[zh_TW]=KAlgebra 行動版
GenericName=Pocket Graph Calculator
......@@ -87,7 +86,6 @@ GenericName[sv]=Grafminiräknare
GenericName[te]=జేబులొ పట్టే రేఖాచిత్రం గనన యంత్రము
GenericName[tr]=Cep Grafik Hesap Makinesi
GenericName[uk]=Кишеньковий графічний калькулятор
GenericName[x-test]=xxPocket Graph Calculatorxx
GenericName[zh_CN]=口袋图形计算器
GenericName[zh_TW]=行動版圖形計算器
Comment=Pocket Math Expression Solver and Plotter
......@@ -130,7 +128,6 @@ Comment[sv]=Lösning och uppritning av matematiska uttryck i fickformat
Comment[tr]=Cep Matematiksel İfade Çözücü ve Çizici
Comment[ug]=كۆچمە ئۈسكۈنىلەر ئۈچۈن ماتېماتىكىلىق ئىپادىلەرنى يېشىش ۋە سىزىش قورالى
Comment[uk]=Кишеньковий розв’язувач математичних рівнянь та графопобудовник
Comment[x-test]=xxPocket Math Expression Solver and Plotterxx
Comment[zh_CN]=口袋数学式解决与绘图工具
Comment[zh_TW]=行動版數學解題與繪圖
Exec=kalgebramobile %u
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -55,7 +54,6 @@
"Name[sl]": "O KAlgebri",
"Name[sv]": "Om Kalgebra",
"Name[uk]": "Про KAlgebra",
"Name[x-test]": "xxAbout KAlgebraxx",
"Name[zh_CN]": "关于 KAlgebra",
"Name[zh_TW]": "關於 KAlgebra"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -54,7 +53,6 @@
"Description[sl]": "Znanstveno računalo",
"Description[sv]": "Vetenskaplig räknare",
"Description[uk]": "Інженерний калькулятор",
"Description[x-test]": "xxScientific calculatorxx",
"Description[zh_CN]": "科学计算器",
"Description[zh_TW]": "科學計算機",
"Icon": "utilities-terminal",
......@@ -81,7 +79,6 @@
"Name[sl]": "Računalo",
"Name[sv]": "Räknare",
"Name[uk]": "Калькулятор",
"Name[x-test]": "xxCalculatorxx",
"Name[zh_CN]": "计算器",
"Name[zh_TW]": "計算機"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Artur Puzio",
"Name[sv]": "Artur Puzio",
"Name[uk]": "Artur Puzio",
"Name[x-test]": "xxArtur Puzioxx",
"Name[zh_CN]": "Artur Puzio",
"Name[zh_TW]": "Artur Puzio",
"e-mail": "cytadela8@op.pl"
......@@ -54,7 +53,6 @@
"Description[sl]": "Seznam funkcij, ki so na voljo",
"Description[sv]": "Lista över tillgängliga funktioner",
"Description[uk]": "Список доступних функцій",
"Description[x-test]": "xxList of available functionsxx",
"Description[zh_CN]": "可用函数列表",
"Description[zh_TW]": "列出可使用的函數",
"Icon": "documentation",
......@@ -81,7 +79,6 @@
"Name[sl]": "Slovar",
"Name[sv]": "Ordlista",
"Name[uk]": "Словник",
"Name[x-test]": "xxDictionaryxx",
"Name[zh_CN]": "词典",
"Name[zh_TW]": "字典"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -52,7 +51,6 @@
"Description[sl]": "Nariše katerikoli želeni 2D graf",
"Description[sv]": "Ritar vilken tvådimensionell graf som helst",
"Description[uk]": "Креслить будь-який потрібний вам двовимірний графік",
"Description[x-test]": "xxDraws any 2D graph you wantxx",
"Description[zh_CN]": "绘制想要的二维图",
"Description[zh_TW]": "繪製任何您想要的 2D 圖形",
"Icon": "draw-bezier-curves",
......@@ -78,7 +76,6 @@
"Name[sl]": "Graf 2D",
"Name[sv]": "Tvådimensionella grafer",
"Name[uk]": "Двовимірний графік",
"Name[x-test]": "xxGraph 2Dxx",
"Name[zh_CN]": "二维图",
"Name[zh_TW]": "2D 圖形"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -52,7 +51,6 @@
"Description[sl]": "Nariše katerikoli želeni 3D graf",
"Description[sv]": "Ritar vilken tredimensionell graf som helst",
"Description[uk]": "Креслить будь-який потрібний вам просторовий графік",
"Description[x-test]": "xxDraws any 3D graph you wantxx",
"Description[zh_CN]": "绘制想要的三维图",
"Description[zh_TW]": "繪製任何您想要的 3D 圖形",
"Icon": "adjustrgb",
......@@ -78,7 +76,6 @@
"Name[sl]": "Graf 3D",
"Name[sv]": "Tredimensionella grafer",
"Name[uk]": "Просторовий графік",
"Name[x-test]": "xxGraph 3Dxx",
"Name[zh_CN]": "三维图",
"Name[zh_TW]": "3D 圖形"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -53,7 +52,6 @@
"Description[sl]": "Enostavna tvorba tabel vrednosti",
"Description[sv]": "Enkelt skapade värdetabeller",
"Description[uk]": "Просте створення таблиць значень",
"Description[x-test]": "xxEasily create value tablesxx",
"Description[zh_CN]": "方便地创建数值表",
"Description[zh_TW]": "輕鬆建立數值表格",
"Icon": "kspread",
......@@ -80,7 +78,6 @@
"Name[sl]": "Tabele vrednosti",
"Name[sv]": "Värdetabeller",
"Name[uk]": "Таблиці значень",
"Name[x-test]": "xxValue Tablesxx",
"Name[zh_CN]": "数值表",
"Name[zh_TW]": "數值表格"
},
......
......@@ -26,7 +26,6 @@
"Name[sl]": "Aleix Pol Gonzalez",
"Name[sv]": "Aleix Pol Gonzalez",
"Name[uk]": "Aleix Pol Gonzalez",
"Name[x-test]": "xxAleix Pol Gonzalezxx",
"Name[zh_CN]": "Aleix Pol Gonzalez",
"Name[zh_TW]": "Aleix Pol Gonzalez"
}
......@@ -53,7 +52,6 @@
"Description[sl]": "Prikaže shranjene vrednosti",
"Description[sv]": "Visar de lagrade värdena",
"Description[uk]": "Показує збережені значення",
"Description[x-test]": "xxDisplays the stored valuesxx",
"Description[zh_CN]": "显示存储的值",
"Description[zh_TW]": "顯示儲存的數值",
"Icon": "document-properties",
......@@ -80,7 +78,6 @@
"Name[sl]": "Spremenljivke",
"Name[sv]": "Variabler",
"Name[uk]": "Змінні",
"Name[x-test]": "xxVariablesxx",
"Name[zh_CN]": "变量",
"Name[zh_TW]": "變數"
},
......
......@@ -54,7 +54,6 @@ Name[te]=కె అల్జీబ్రా
Name[tr]=KAlgebra
Name[ug]=KAlgebra
Name[uk]=KАлгебра
Name[x-test]=xxKAlgebraxx
Name[zh_CN]=KAlgebra
Name[zh_TW]=數學_KAlgebra
Icon=kalgebra
......@@ -108,7 +107,6 @@ Comment[te]=గనన యంత్రము
Comment[tr]=Bir Hesap Makinesi
Comment[ug]=ھېسابلىغۇچ
Comment[uk]=Калькулятор
Comment[x-test]=xxA Calculatorxx
Comment[zh_CN]=一个计算器
Comment[zh_TW]=計算器
Type=Service
......
......@@ -39,7 +39,6 @@ Name[sv]=Tvådimensionella diagram
Name[te]=2D ప్లాట్
Name[tr]=2D Çizimler
Name[uk]=Плоскі графіки
Name[x-test]=xx2D Plotsxx
Name[zh_CN]=二维绘图
Name[zh_TW]=2D 繪圖
Comment=Put the weirdest plots on your desktop!
......@@ -77,7 +76,6 @@ Comment[sl]=Na namizje postavite čudaške grafe!
Comment[sv]=Rita riktigt konstiga diagram på skrivbordet.
Comment[tr]=Masaüstünüzde en tuhaf çizimleri koyun!
Comment[uk]=Розташуйте на вашій стільниці найвигадливіше креслення!
Comment[x-test]=xxPut the weirdest plots on your desktop!xx
Comment[zh_CN]=在您的桌面上放上奇怪的图表!
Comment[zh_TW]=在您的桌面上放最詭異的繪圖!
Icon=kalgebra
......
......@@ -54,7 +54,6 @@ Name[te]=కె అల్జీబ్రా
Name[tr]=KAlgebra
Name[ug]=KAlgebra
Name[uk]=KАлгебра
Name[x-test]=xxKAlgebraxx
Name[zh_CN]=KAlgebra
Name[zh_TW]=數學_KAlgebra
GenericName=Graph Calculator
......@@ -108,7 +107,6 @@ GenericName[sv]=Grafräknare
GenericName[te]=రేఖాచిత్ర గనన యంత్రము
GenericName[tr]=Grafik Hesap Makinesi
GenericName[uk]=Графічний калькулятор
GenericName[x-test]=xxGraph Calculatorxx
GenericName[zh_CN]=图形计算器
GenericName[zh_TW]=圖形計算器
Comment=Math Expression Solver and Plotter
......@@ -161,7 +159,6 @@ Comment[sv]=Lösning och uppritning av matematiska uttryck
Comment[tr]=Matematiksel İfade Çözücü ve Çizici
Comment[ug]=ماتېماتىكىلىق ئىپادىلەرنى يېشىش ۋە سىزىش قورالى
Comment[uk]=Розв’язувач математичних виразів та графопобудовник
Comment[x-test]=xxMath Expression Solver and Plotterxx
Comment[zh_CN]=解数学式与绘图的工具
Comment[zh_TW]=數學解題與繪圖
Exec=kalgebra %u
......
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