Merge remote-tracking branch 'origin/master'

2 files changed, 81 insertions, 75 deletions

diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ca.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ca.ts
index c201ab3b..cf1aaf99 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ca.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ca.ts
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ca">
 <context>
     <name>ColorDialog</name>
     <message>
-        <location filename="../ColorDialog.ui" line="14"/>
+        <location filename="../ColorDialog.ui" line="14"></location>
         <source>Customize Colors</source>
         <translation>Personalització dels colors</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="24"/>
+        <location filename="../ColorDialog.ui" line="24"></location>
         <source>Item Type</source>
-        <translation>Tipus d&apos;ítem</translation>
+        <translation>Tipus d'ítem</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="29"/>
+        <location filename="../ColorDialog.ui" line="29"></location>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="34"/>
+        <location filename="../ColorDialog.ui" line="34"></location>
         <source>Sample</source>
         <translation>Exemple</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="44"/>
-        <location filename="../ColorDialog.cpp" line="55"/>
+        <location filename="../ColorDialog.ui" line="44"></location>
+        <location filename="../ColorDialog.cpp" line="55"></location>
         <source>Select Color</source>
         <translation>Seleccioneu un color</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="64"/>
+        <location filename="../ColorDialog.ui" line="64"></location>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../ColorDialog.ui" line="71"/>
+        <location filename="../ColorDialog.ui" line="71"></location>
         <source>Apply</source>
         <translation>Aplica</translation>
     </message>
@@ -43,252 +43,258 @@
 <context>
     <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="14"/>
+        <location filename="../MainUI.ui" line="14"></location>
         <source>MainWindow</source>
         <translation>Finestra principal</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="46"/>
+        <location filename="../MainUI.ui" line="46"></location>
         <source>Tab 1</source>
         <translation>Pestanya 1</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="81"/>
+        <location filename="../MainUI.ui" line="81"></location>
         <source>Find the previous match</source>
         <translation>Cerca la coincidència anterior</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="84"/>
-        <location filename="../MainUI.ui" line="97"/>
-        <location filename="../MainUI.ui" line="148"/>
-        <location filename="../MainUI.ui" line="161"/>
-        <location filename="../MainUI.ui" line="173"/>
+        <location filename="../MainUI.ui" line="84"></location>
+        <location filename="../MainUI.ui" line="97"></location>
+        <location filename="../MainUI.ui" line="148"></location>
+        <location filename="../MainUI.ui" line="161"></location>
+        <location filename="../MainUI.ui" line="173"></location>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="183"/>
+        <location filename="../MainUI.ui" line="183"></location>
         <source>Find:</source>
         <translation>Cerca:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="94"/>
+        <location filename="../MainUI.ui" line="94"></location>
         <source>Find the next match</source>
         <translation>Cerca la coincidència següent</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="104"/>
+        <location filename="../MainUI.ui" line="104"></location>
         <source>Replace:</source>
         <translation>Reemplaça:</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="123"/>
+        <location filename="../MainUI.ui" line="123"></location>
         <source>Match case</source>
         <translation>Coincidència de majúscules i minúscules</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="145"/>
+        <location filename="../MainUI.ui" line="145"></location>
         <source>Replace next match</source>
         <translation>Reemplaça la coincidència següent</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="158"/>
+        <location filename="../MainUI.ui" line="158"></location>
         <source>Replace all matches (to end of document)</source>
         <translation>Reemplaça totes les coincidències (fins al final del document)</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="170"/>
+        <location filename="../MainUI.ui" line="170"></location>
         <source>Hide the find/replace options</source>
-        <translation type="unfinished"></translation>
+        <translation>Amaga les opcions de cerca / reemplaça</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="208"/>
+        <location filename="../MainUI.ui" line="208"></location>
         <source>File</source>
         <translation>Fitxer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="221"/>
+        <location filename="../MainUI.ui" line="221"></location>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="225"/>
+        <location filename="../MainUI.ui" line="225"></location>
         <source>Syntax Highlighting</source>
         <translation>Realçament de la sintaxi</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="238"/>
+        <location filename="../MainUI.ui" line="238"></location>
         <source>Edit</source>
         <translation>Edita</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="253"/>
+        <location filename="../MainUI.ui" line="253"></location>
         <source>toolBar</source>
-        <translation>Barra d&apos;eines</translation>
+        <translation>Barra d'eines</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="279"/>
+        <location filename="../MainUI.ui" line="279"></location>
         <source>Show Line Numbers</source>
         <translation>Mostra els números de les línies</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="284"/>
+        <location filename="../MainUI.ui" line="284"></location>
         <source>None</source>
         <translation>Cap</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="289"/>
-        <location filename="../MainUI.cpp" line="147"/>
+        <location filename="../MainUI.ui" line="289"></location>
+        <location filename="../MainUI.cpp" line="147"></location>
         <source>New File</source>
         <translation>Fitxer nou</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="292"/>
+        <location filename="../MainUI.ui" line="292"></location>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="300"/>
+        <location filename="../MainUI.ui" line="300"></location>
         <source>Open File</source>
         <translation>Obre el fitxer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="303"/>
+        <location filename="../MainUI.ui" line="303"></location>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="311"/>
+        <location filename="../MainUI.ui" line="311"></location>
         <source>Save File</source>
         <translation>Desa el fitxer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="314"/>
+        <location filename="../MainUI.ui" line="314"></location>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="322"/>
+        <location filename="../MainUI.ui" line="322"></location>
         <source>Save File As</source>
         <translation>Desa el fitxer com a...</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="327"/>
+        <location filename="../MainUI.ui" line="327"></location>
         <source>Close</source>
         <translation>Tanca</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="330"/>
+        <location filename="../MainUI.ui" line="330"></location>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="338"/>
+        <location filename="../MainUI.ui" line="338"></location>
         <source>Close File</source>
         <translation>Tanca el fitxer</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="341"/>
+        <location filename="../MainUI.ui" line="341"></location>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="349"/>
+        <location filename="../MainUI.ui" line="349"></location>
         <source>Customize Colors</source>
         <translation>Personalització dels colors</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="360"/>
+        <location filename="../MainUI.ui" line="360"></location>
         <source>Wrap Lines</source>
         <translation>Ajusta les línies</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="365"/>
+        <location filename="../MainUI.ui" line="365"></location>
         <source>Find</source>
         <translation>Cerca</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="368"/>
+        <location filename="../MainUI.ui" line="368"></location>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="376"/>
+        <location filename="../MainUI.ui" line="376"></location>
         <source>Replace</source>
         <translation>Reemplaça</translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="379"/>
+        <location filename="../MainUI.ui" line="379"></location>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="40"/>
+        <location filename="../MainUI.cpp" line="40"></location>
         <source>Text Editor</source>
         <translation>Editor de text</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="154"/>
+        <location filename="../MainUI.cpp" line="154"></location>
         <source>Open File(s)</source>
         <translation>Obre fitxers</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="154"/>
+        <location filename="../MainUI.cpp" line="154"></location>
         <source>Text Files (*)</source>
         <translation>Fitxers de text (*)</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="283"/>
-        <location filename="../MainUI.cpp" line="380"/>
+        <location filename="../MainUI.cpp" line="283"></location>
+        <location filename="../MainUI.cpp" line="380"></location>
         <source>Lose Unsaved Changes?</source>
-        <translation type="unfinished"></translation>
+        <translation>Es perden els canvis no desats?</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="283"/>
+        <location filename="../MainUI.cpp" line="283"></location>
         <source>This file has unsaved changes.
 Do you want to close it anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Aquest fitxer té canvis no desats.
+El voleu tancar tanmateix?
+
+%1</translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="380"/>
+        <location filename="../MainUI.cpp" line="380"></location>
         <source>There are unsaved changes.
 Do you want to close the editor anyway?
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Hi ha canvis no desats.
+Voleu tancar l'editor tanmateix?
+
+%1</translation>
     </message>
 </context>
 <context>
     <name>PlainTextEditor</name>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="94"/>
+        <location filename="../PlainTextEditor.cpp" line="94"></location>
         <source>Save File</source>
         <translation>Desa el fitxer</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="94"/>
+        <location filename="../PlainTextEditor.cpp" line="94"></location>
         <source>Text File (*)</source>
         <translation>Fitxer de text (*)</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="289"/>
+        <location filename="../PlainTextEditor.cpp" line="289"></location>
         <source>Row Number: %1, Column Number: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de fila: %1. Número de columna: %2</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="298"/>
+        <location filename="../PlainTextEditor.cpp" line="298"></location>
         <source>The following file has been changed by some other utility. Do you want to re-load it?</source>
         <translation>El fitxer següent ha estat canviat per alguna altra utilitat. El voleu tornar a carregar?</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="300"/>
+        <location filename="../PlainTextEditor.cpp" line="300"></location>
         <source>(Note: You will lose all currently-unsaved changes)</source>
         <translation>(Nota: perdreu tots els canvis que no estiguin desats ara mateix.)</translation>
     </message>
     <message>
-        <location filename="../PlainTextEditor.cpp" line="304"/>
+        <location filename="../PlainTextEditor.cpp" line="304"></location>
         <source>File Modified</source>
         <translation>Fitxer modificat</translation>
     </message>
diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_el.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_el.ts
index aa7eeff7..0418afb4 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_el.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_el.ts
@@ -45,7 +45,7 @@
     <message>
         <location filename="../MainUI.ui" line="14"></location>
         <source>MainWindow</source>
-        <translation type="unfinished">Κύριο Παράθυρο</translation>
+        <translation type="unfinished">ΚύριοΠαράθυρο</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="46"></location>
@@ -69,7 +69,7 @@
     <message>
         <location filename="../MainUI.ui" line="183"></location>
         <source>Find:</source>
-        <translation>Βρές:</translation>
+        <translation>Βρείτε:</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="94"></location>
@@ -79,7 +79,7 @@
     <message>
         <location filename="../MainUI.ui" line="104"></location>
         <source>Replace:</source>
-        <translation>Αντικατέστησε:</translation>
+        <translation>Αντικαταστήστε:</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="123"></location>
@@ -94,7 +94,7 @@
     <message>
         <location filename="../MainUI.ui" line="158"></location>
         <source>Replace all matches (to end of document)</source>
-        <translation>Αντικατέστησε όλες τις ταυτίσεις (στο τέλος του εγγράφου)</translation>
+        <translation>Αντικαταστήστε όλες τις ταυτίσεις (στο τέλος του εγγράφου)</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="170"></location>
@@ -129,7 +129,7 @@
     <message>
         <location filename="../MainUI.ui" line="279"></location>
         <source>Show Line Numbers</source>
-        <translation>Εμφάνισε Αριθμούς Γραμμών</translation>
+        <translation>Εμφανίστε Αριθμούς Γραμμών</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="284"></location>
@@ -170,7 +170,7 @@
     <message>
         <location filename="../MainUI.ui" line="322"></location>
         <source>Save File As</source>
-        <translation>Αποθήκευση Αρχείου ως</translation>
+        <translation>Αποθήκευση Αρχείου Ως</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="327"></location>