From 528ce87dc49f72cc15aef362081366a39ade7fdd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 13 Jul 2020 09:00:08 +0200 Subject: [PATCH] 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" --- .../differentiate/differentiateassistant.json | 2 +- .../importpackage/importpackageassistant.json | 2 +- src/assistants/integrate/integrateassistant.json | 2 +- .../creatematrix/creatematrixassistant.json | 2 +- .../eigenvalues/eigenvaluesassistant.json | 2 +- .../eigenvectors/eigenvectorsassistant.json | 2 +- .../invertmatrix/invertmatrixassistant.json | 2 +- src/assistants/plot2d/plot2dassistant.json | 2 +- src/assistants/plot3d/plot3dassistant.json | 2 +- src/assistants/runscript/runscriptassistant.json | 2 +- src/assistants/solve/solveassistant.json | 2 +- src/backends/python/pythonbackend.json | 4 +++- .../plotassistant/qalculateplotassistant.json | 2 +- .../filebrowserpanel/filebrowserpanelplugin.json | 14 -------------- src/panelplugins/helppanel/helppanelplugin.json | 2 +- .../variablemgr/variablemanagerplugin.json | 2 +- 16 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/assistants/differentiate/differentiateassistant.json b/src/assistants/differentiate/differentiateassistant.json index 2d28cd29..2df4310a 100644 --- a/src/assistants/differentiate/differentiateassistant.json +++ b/src/assistants/differentiate/differentiateassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify calculating derivatives of expressions", - "Description[ca@valencia]": "Un diàleg assistent per simplificar els càlculs de derivades d'expressions", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar els càlculs de derivades d'expressions", "Description[ca]": "Un diàleg assistent per a simplificar els càlculs de derivades d'expressions", "Description[cs]": "Pomocný dialog pro zjednodušení derivace výrazů", "Description[de]": "Ein Assistent, um die Berechnung von Ableitungen von Ausdrücken zu vereinfachen", diff --git a/src/assistants/importpackage/importpackageassistant.json b/src/assistants/importpackage/importpackageassistant.json index 21a9d2a5..5f68a760 100644 --- a/src/assistants/importpackage/importpackageassistant.json +++ b/src/assistants/importpackage/importpackageassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to import a specific package (or library or module) to Cantor workspace", - "Description[ca@valencia]": "Un diàleg d'assistència per importar un paquet específic (o biblioteca o mòdul) a l'espai de treball del Cantor", + "Description[ca@valencia]": "Un diàleg d'assistència per a importar un paquet específic (o biblioteca o mòdul) a l'espai de treball del Cantor", "Description[ca]": "Un diàleg d'assistència per a importar un paquet específic (o biblioteca o mòdul) a l'espai de treball del Cantor", "Description[de]": "Ein Assistent, um ein angegebenes Paket, Bibliothek oder Modul in den Arbeitsbereich von Cantor zu importieren", "Description[el]": "Βοηθητικός διάλογος για την εισαγωγή πακέτου (ή βιβλιοθήκης ή αρθρώματος) στο χώρο εργασίας Cantor", diff --git a/src/assistants/integrate/integrateassistant.json b/src/assistants/integrate/integrateassistant.json index 1987debe..14f38ae2 100644 --- a/src/assistants/integrate/integrateassistant.json +++ b/src/assistants/integrate/integrateassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify calculation of integrals", - "Description[ca@valencia]": "Un diàleg assistent per simplificar els càlculs d'integrals", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar els càlculs d'integrals", "Description[ca]": "Un diàleg assistent per a simplificar els càlculs d'integrals", "Description[cs]": "Pomocný dialog pro zjednodušení výpočtu integrálů", "Description[de]": "Ein Assistent, um die Berechnung von Integralen zu vereinfachen", diff --git a/src/assistants/linearalgebra/creatematrix/creatematrixassistant.json b/src/assistants/linearalgebra/creatematrix/creatematrixassistant.json index 4d176d5f..a40cc19a 100644 --- a/src/assistants/linearalgebra/creatematrix/creatematrixassistant.json +++ b/src/assistants/linearalgebra/creatematrix/creatematrixassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify entering of matrices", - "Description[ca@valencia]": "Un diàleg assistent per simplificar la introducció de matrius", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar la introducció de matrius", "Description[ca]": "Un diàleg assistent per a simplificar la introducció de matrius", "Description[cs]": "Pomocný dialog pro zjednodušení zadávání matic", "Description[de]": "Ein Assistent, um die Eingabe von Matrizen zu vereinfachen", diff --git a/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.json b/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.json index cc6723d9..cb5cb65d 100644 --- a/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.json +++ b/src/assistants/linearalgebra/eigenvalues/eigenvaluesassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify calculating of Eigenvalues", - "Description[ca@valencia]": "Un diàleg assistent per simplificar el càlcul d'autovalors", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar el càlcul d'autovalors", "Description[ca]": "Un diàleg assistent per a simplificar el càlcul d'autovalors", "Description[cs]": "Pomocný dialog pro zjednodušení výpočtu vlastních čísel", "Description[de]": "Ein Assistent, um das Berechnen von „Eigen“-Werten zu vereinfachen.", diff --git a/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.json b/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.json index 54902539..963aa328 100644 --- a/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.json +++ b/src/assistants/linearalgebra/eigenvectors/eigenvectorsassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify calculating of EigenVectors", - "Description[ca@valencia]": "Un diàleg assistent per simplificar el càlcul d'autovectors", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar el càlcul d'autovectors", "Description[ca]": "Un diàleg assistent per a simplificar el càlcul d'autovectors", "Description[cs]": "Pomocný dialog pro zjednodušení výpočtu vlastních vektorů", "Description[de]": "Ein Assistent, um das Berechnen von „Eigen“-Vektoren zu vereinfachen.", diff --git a/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.json b/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.json index e9d37b33..a73b6f0b 100644 --- a/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.json +++ b/src/assistants/linearalgebra/invertmatrix/invertmatrixassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify inverting of matrices", - "Description[ca@valencia]": "Un diàleg assistent per simplificar la inversió de matrius", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar la inversió de matrius", "Description[ca]": "Un diàleg assistent per a simplificar la inversió de matrius", "Description[cs]": "Pomocný dialog pro zjednodušení invertování matice", "Description[de]": "Ein Assistent, um das Invertieren von Matrizen zu vereinfachen", diff --git a/src/assistants/plot2d/plot2dassistant.json b/src/assistants/plot2d/plot2dassistant.json index afe9330d..45df1785 100644 --- a/src/assistants/plot2d/plot2dassistant.json +++ b/src/assistants/plot2d/plot2dassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify plotting of 2D functions", - "Description[ca@valencia]": "Un diàleg assistent per simplificar la representació gràfica de funcions 2D", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar la representació gràfica de funcions en 2D", "Description[ca]": "Un diàleg assistent per a simplificar la representació gràfica de funcions en 2D", "Description[cs]": "Pomocný dialog pro zjednodušení vytvoření grafu dvourozměrných funkcí", "Description[de]": "Ein Assistent, um das Zeichnen von 2D-Funktionen zu vereinfachen", diff --git a/src/assistants/plot3d/plot3dassistant.json b/src/assistants/plot3d/plot3dassistant.json index 1022b32e..191bbea1 100644 --- a/src/assistants/plot3d/plot3dassistant.json +++ b/src/assistants/plot3d/plot3dassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify plotting of 3D functions", - "Description[ca@valencia]": "Un diàleg assistent per simplificar la representació gràfica de funcions 3D", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar la representació gràfica de funcions en 3D", "Description[ca]": "Un diàleg assistent per a simplificar la representació gràfica de funcions en 3D", "Description[cs]": "Pomocný dialog pro zjednodušení vytvoření grafu trojrozměrných funkcí", "Description[de]": "Ein Assistent, um das Zeichnen von 3D-Funktionen zu vereinfachen", diff --git a/src/assistants/runscript/runscriptassistant.json b/src/assistants/runscript/runscriptassistant.json index d27261b5..918ca39e 100644 --- a/src/assistants/runscript/runscriptassistant.json +++ b/src/assistants/runscript/runscriptassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant for running an external Script file", - "Description[ca@valencia]": "Un assistent per executar un fitxer de script extern", + "Description[ca@valencia]": "Un assistent per a executar un fitxer de script extern", "Description[ca]": "Un assistent per a executar un fitxer de script extern", "Description[cs]": "Pomocník pro spouštění externího skriptu", "Description[de]": "Ein Assistent zum Ausführen externer Skriptdateien", diff --git a/src/assistants/solve/solveassistant.json b/src/assistants/solve/solveassistant.json index 1c1e0ab3..2452d7c0 100644 --- a/src/assistants/solve/solveassistant.json +++ b/src/assistants/solve/solveassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant dialog to simplify solving of equations", - "Description[ca@valencia]": "Un diàleg assistent per simplificar la resolució d'equacions", + "Description[ca@valencia]": "Un diàleg assistent per a simplificar la resolució d'equacions", "Description[ca]": "Un diàleg assistent per a simplificar la resolució d'equacions", "Description[cs]": "Pomocný dialog pro zjednodušení řešení rovnic", "Description[de]": "Ein Assistent, um das Lösen von Gleichungen zu vereinfachen", diff --git a/src/backends/python/pythonbackend.json b/src/backends/python/pythonbackend.json index 7045d0dc..55215496 100644 --- a/src/backends/python/pythonbackend.json +++ b/src/backends/python/pythonbackend.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "Backend for Python Scientific Programming", - "Description[ca@valencia]": "Dorsal per a la programació científica Python", + "Description[ca@valencia]": "Dorsal per a la programació científica en Python", "Description[ca]": "Dorsal per a la programació científica en Python", "Description[el]": "Σύστημα υποστήριξης για το Python Scientific Programming", "Description[en_GB]": "Backend for Python Scientific Programming", @@ -14,6 +14,7 @@ "Description[nn]": "Motor for Pythons «Scientific Programming»", "Description[pt]": "Infra-Estrutura de Programação Científica com Python", "Description[pt_BR]": "Infraestrutura de programação científica Python", + "Description[sk]": "Backend pre vedecké programovanie v Python-e", "Description[sl]": "Zaledje za znanstveno programersko okolje Python", "Description[sv]": "Bakgrundsprogram för Python vetenskaplig programmeringsmiljö", "Description[uk]": "Модуль наукового програмування мовою Python", @@ -35,6 +36,7 @@ "Name[nn]": "Python", "Name[pt]": "Python", "Name[pt_BR]": "Python", + "Name[sk]": "Python", "Name[sl]": "Python", "Name[sv]": "Python", "Name[uk]": "Python", diff --git a/src/backends/qalculate/plotassistant/qalculateplotassistant.json b/src/backends/qalculate/plotassistant/qalculateplotassistant.json index 28984fb7..d909b1eb 100644 --- a/src/backends/qalculate/plotassistant/qalculateplotassistant.json +++ b/src/backends/qalculate/plotassistant/qalculateplotassistant.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "An Assistant for plotting with the Qalculate backend.", - "Description[ca@valencia]": "Un assistent per fer gràfiques amb el dorsal del Qalculate.", + "Description[ca@valencia]": "Un assistent per a fer gràfiques amb el dorsal del Qalculate.", "Description[ca]": "Un assistent per a fer gràfiques amb el dorsal del Qalculate.", "Description[cs]": "Asistent pro grafy s podpůrnou vrstvou Qualculate.", "Description[de]": "Ein Assistent für das Plotten mit dem Qalculate-Modul.", diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json index 06adf203..8b5baee4 100644 --- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json +++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.json @@ -2,24 +2,10 @@ "KPlugin": { "Dependencies": [], "Description": "A panel for working with files inside Cantor", - "Description[ca]": "Un plafó per a treballar amb fitxers dins del Cantor", - "Description[fr]": "Un panneau pour travailler avec les fichiers à l'intérieur de Cantor", - "Description[nl]": "Een paneel in Cantor voor het werken met bestanden", - "Description[pt]": "Um painel para lidar com ficheiros dentro do Cantor", - "Description[sv]": "En panel för att arbeta med filer inne i Cantor", - "Description[uk]": "Панель для роботи з файлами у вікні Cantor", - "Description[x-test]": "xxA panel for working with files inside Cantorxx", "Icon": "", "Id": "FileBrowserPanel", "License": "GPL", "Name": "File Browser", - "Name[ca]": "Navegador de fitxers", - "Name[fr]": "Navigateur de fichiers", - "Name[nl]": "Bestanden bladeren", - "Name[pt]": "Gestor de Ficheiros", - "Name[sv]": "Filbläddrare", - "Name[uk]": "Навігація файлами", - "Name[x-test]": "xxFile Browserxx", "ServiceTypes": [ "Cantor/PanelPlugin" ] diff --git a/src/panelplugins/helppanel/helppanelplugin.json b/src/panelplugins/helppanel/helppanelplugin.json index abecd900..42da8473 100644 --- a/src/panelplugins/helppanel/helppanelplugin.json +++ b/src/panelplugins/helppanel/helppanelplugin.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "A panel to display help", - "Description[ca@valencia]": "Un plafó per mostrar les pàgines d'ajuda", + "Description[ca@valencia]": "Un plafó per a mostrar les pàgines d'ajuda", "Description[ca]": "Un plafó per a mostrar les pàgines d'ajuda", "Description[cs]": "Panel pro zobrazení nápovědy", "Description[de]": "Eine Kontrollleiste zur Anzeige der Hilfe", diff --git a/src/panelplugins/variablemgr/variablemanagerplugin.json b/src/panelplugins/variablemgr/variablemanagerplugin.json index b756e2c0..fd21ee2f 100644 --- a/src/panelplugins/variablemgr/variablemanagerplugin.json +++ b/src/panelplugins/variablemgr/variablemanagerplugin.json @@ -2,7 +2,7 @@ "KPlugin": { "Dependencies": [], "Description": "A panel to manage the variables of a session", - "Description[ca@valencia]": "Un plafó per gestionar les variables d'una sessió", + "Description[ca@valencia]": "Un plafó per a gestionar les variables d'una sessió", "Description[ca]": "Un plafó per a gestionar les variables d'una sessió", "Description[cs]": "Panel pro správu proměnných sezení", "Description[de]": "Eine Leiste, um Sitzungsvariablen zu verwalten", -- GitLab