summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-03-16 20:25:28 +0000
committerintrigeri <intrigeri@boum.org>2018-03-16 20:25:28 +0000
commit40537d9bdc21431af9f7e3c1014e16edeef11078 (patch)
treee6fefd9272919e16f170db5c63ef4383d30283ed
parentd4526936575047936240edc0258931e52b6c8b6a (diff)
parente70fe76d0a70920231bbd5d6dffc54f0fc67a31b (diff)
Merge branch 'stable' into devel
-rw-r--r--po/ca.po11
-rw-r--r--po/es.po6
2 files changed, 7 insertions, 10 deletions
diff --git a/po/ca.po b/po/ca.po
index f5298b4..66c8167 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,14 +10,15 @@
# Guillem Arias Fauste <inactive+Mr_SpeedArt@transifex.com>, 2016
# Humbert <humbert.costas@gmail.com>, 2014
# laia_, 2014-2016
+# Miquel Bosch <m.bosch.sau@gmail.com>, 2018
# Vte A.F <viarfer3@inf.upv.es>, 2017
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-04 13:43+0000\n"
-"Last-Translator: Ecron <ecron_89@hotmail.com>\n"
+"PO-Revision-Date: 2018-03-13 11:53+0000\n"
+"Last-Translator: Miquel Bosch <m.bosch.sau@gmail.com>\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/"
"ca/)\n"
"Language: ca\n"
@@ -249,7 +250,6 @@ msgstr ""
"MAC "
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
-#, fuzzy
msgid "Lock Screen"
msgstr "Bloca la pantalla"
@@ -260,12 +260,11 @@ msgstr "Cancel·la"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
msgid "Screen Locker"
-msgstr ""
+msgstr "Bloqueig de la pantalla"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
-#, fuzzy
msgid "Set up a password to unlock the screen."
-msgstr "Establiu una contrasenya per a desblocar la pantalla"
+msgstr "Establiu una contrasenya per a desblocar la pantalla."
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135
msgid "Password"
diff --git a/po/es.po b/po/es.po
index 151847a..f794d6f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-03-03 15:47+0000\n"
+"PO-Revision-Date: 2018-03-13 18:29+0000\n"
"Last-Translator: Emma Peel\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/"
"es/)\n"
@@ -248,7 +248,6 @@ msgstr ""
"Quizás prefieras reiniciar Tails y deshabilitar el MAC spoofing."
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109
-#, fuzzy
msgid "Lock Screen"
msgstr "Bloquear pantalla"
@@ -259,10 +258,9 @@ msgstr "Cancelar"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124
msgid "Screen Locker"
-msgstr ""
+msgstr "Bloqueo de pantalla"
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130
-#, fuzzy
msgid "Set up a password to unlock the screen."
msgstr "Establece una contraseña para desbloquear la pantalla"