Merge branch 'master' of http://github.com/trueos/lumina

2 files changed, 16 insertions, 16 deletions

diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ca.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ca.ts
index d9ed8f18..d80086c9 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ca.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ca.ts
@@ -34,7 +34,7 @@
     <message>
         <location filename="../MainUI.ui" line="138"/>
         <source>Resize</source>
-        <translation>Canvia&apos;n la mida</translation>
+        <translation>Canvia'n la mida</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="20"/>
@@ -94,7 +94,7 @@
     <message>
         <location filename="../MainUI.ui" line="433"/>
         <source>Select Area</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecciona l'àrea</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="445"/>
@@ -109,7 +109,7 @@
     <message>
         <location filename="../MainUI.ui" line="499"/>
         <source>toolBar</source>
-        <translation>Barra d&apos;eines</translation>
+        <translation>Barra d'eines</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="526"/>
@@ -129,7 +129,7 @@
     <message>
         <location filename="../MainUI.ui" line="559"/>
         <source>Close Application</source>
-        <translation>Tanca l&apos;aplicació</translation>
+        <translation>Tanca l'aplicació</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="562"/>
@@ -164,12 +164,12 @@
     <message>
         <location filename="../MainUI.cpp" line="96"/>
         <source>Could not save screenshot</source>
-        <translation>No s&apos;ha pogut desar la captura.</translation>
+        <translation>No s'ha pogut desar la captura.</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="96"/>
         <source>The screenshot could not be saved. Please check directory permissions or pick a different directory</source>
-        <translation>No s&apos;ha pogut desar la captura. Si us plau, comproveu els permisos del directori o trieu-ne un altre.</translation>
+        <translation>No s'ha pogut desar la captura. Si us plau, comproveu els permisos del directori o trieu-ne un altre.</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="113"/>
@@ -184,7 +184,7 @@
     <message>
         <location filename="../MainUI.cpp" line="316"/>
         <source>The current screenshot has not been saved yet. Do you want to save or discard your changes?</source>
-        <translation>La captura actual encara no s&apos;ha desat. Voleu desar o descartar els canvis?</translation>
+        <translation>La captura actual encara no s'ha desat. Voleu desar o descartar els canvis?</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="543"/>
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 535cce27..5791c608 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
@@ -11,7 +11,7 @@
     <message>
         <location filename="../ColorDialog.ui" line="24"/>
         <source>Item Type</source>
-        <translation>Tipus d&apos;ítem</translation>
+        <translation>Tipus d'ítem</translation>
     </message>
     <message>
         <location filename="../ColorDialog.ui" line="29"/>
@@ -45,7 +45,7 @@
     <message>
         <location filename="../DnDTabBar.h" line="43"/>
         <source>Detach Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Separa la pestanya</translation>
     </message>
 </context>
 <context>
@@ -122,7 +122,7 @@
     <message>
         <location filename="../MainUI.ui" line="220"/>
         <source>Tabs Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubicació de les pestanyes</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="237"/>
@@ -132,7 +132,7 @@
     <message>
         <location filename="../MainUI.ui" line="252"/>
         <source>toolBar</source>
-        <translation>Barra d&apos;eines</translation>
+        <translation>Barra d'eines</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="278"/>
@@ -244,22 +244,22 @@
     <message>
         <location filename="../MainUI.ui" line="409"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>A dalt</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="417"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>A baix</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="425"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>A l'esquerra</translation>
     </message>
     <message>
         <location filename="../MainUI.ui" line="433"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>A la dreta</translation>
     </message>
     <message>
         <location filename="../MainUI.cpp" line="61"/>
@@ -302,7 +302,7 @@ Do you want to close the editor anyway?
 
 %1</source>
         <translation>Hi ha canvis no desats.
-Voleu tancar l&apos;editor tanmateix?
+Voleu tancar l'editor tanmateix?
 
 %1</translation>
     </message>