commit 2e168a68f7ae60dcd8ccd830493d157d7baaf021 Author: Translation commit bot translation@torproject.org Date: Thu Nov 14 15:26:51 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 17 +---------------- contents+bn.po | 17 +---------------- contents+ca.po | 17 +---------------- contents+cs.po | 17 +---------------- contents+da.po | 17 +---------------- contents+de.po | 17 +---------------- contents+el.po | 17 +---------------- contents+es-AR.po | 17 +---------------- contents+es.po | 22 +++------------------- contents+fa.po | 17 +---------------- contents+fo.po | 17 +---------------- contents+fr.po | 21 +++------------------ contents+ga.po | 17 +---------------- contents+gu.po | 17 +---------------- contents+he.po | 17 +---------------- contents+hi.po | 17 +---------------- contents+hu.po | 17 +---------------- contents+id.po | 17 +---------------- contents+is.po | 17 +---------------- contents+it.po | 17 +---------------- contents+ja.po | 17 +---------------- contents+ka.po | 17 +---------------- contents+ko.po | 17 +---------------- contents+mk.po | 17 +---------------- contents+ml.po | 17 +---------------- contents+my.po | 17 +---------------- contents+nb.po | 17 +---------------- contents+nl.po | 17 +---------------- contents+pl.po | 17 +---------------- contents+pt-BR.po | 17 +---------------- contents+pt-PT.po | 17 +---------------- contents+ro.po | 17 +---------------- contents+ru.po | 21 +++------------------ contents+sr.po | 17 +---------------- contents+sv.po | 17 +---------------- contents+sw.po | 17 +---------------- contents+th.po | 17 +---------------- contents+tr.po | 17 +---------------- contents+uk.po | 17 +---------------- contents+zh-CN.po | 19 ++----------------- contents+zh-TW.po | 21 +++------------------ contents.pot | 17 +---------------- 42 files changed, 51 insertions(+), 682 deletions(-)
diff --git a/contents+ar.po b/contents+ar.po index 4ea050a79..1bc859b82 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)%5Cn" @@ -1219,16 +1219,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1251,11 +1241,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+bn.po b/contents+bn.po index 878e7e86a..5b9957062 100644 --- a/contents+bn.po +++ b/contents+bn.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Bengali (https://www.transifex.com/otf/teams/1519/bn/)%5Cn" @@ -1264,16 +1264,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1299,11 +1289,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ca.po b/contents+ca.po index e5b461cd4..01f298044 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)%5Cn" @@ -1383,16 +1383,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1418,11 +1408,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+cs.po b/contents+cs.po index 7b8f5fefe..e90d70910 100644 --- a/contents+cs.po +++ b/contents+cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Michal Stanke mstanke@mozilla.cz, 2019\n" "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)%5Cn" @@ -1237,16 +1237,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1269,11 +1259,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+da.po b/contents+da.po index 31470cc84..3d4ee955e 100644 --- a/contents+da.po +++ b/contents+da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: scootergrisen, 2019\n" "Language-Team: Danish (https://www.transifex.com/otf/teams/1519/da/)%5Cn" @@ -1213,16 +1213,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1245,11 +1235,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+de.po b/contents+de.po index 61dc451ff..758245abe 100644 --- a/contents+de.po +++ b/contents+de.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)%5Cn" @@ -1324,16 +1324,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1359,11 +1349,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+el.po b/contents+el.po index 233fb8fa2..75d803347 100644 --- a/contents+el.po +++ b/contents+el.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Greek (https://www.transifex.com/otf/teams/1519/el/)%5Cn" @@ -1253,16 +1253,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1285,11 +1275,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+es-AR.po b/contents+es-AR.po index 470d3cba6..109dba6bc 100644 --- a/contents+es-AR.po +++ b/contents+es-AR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Zuhualime Akoochimoya, 2019\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)%5Cn" @@ -1233,16 +1233,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1265,11 +1255,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+es.po b/contents+es.po index ffc43ec4d..4b2691b43 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2,16 +2,16 @@ # Zuhualime Akoochimoya, 2019 # strel, 2019 # David Figuera dfb@fastmail.com, 2019 +# erinm, 2019 # eulalio barbero espinosa eulaliob@gmail.com, 2019 # Nicolas Sera-Leyva nseraleyva@internews.org, 2019 -# erinm, 2019 # Emma Peel, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)%5Cn" @@ -1460,16 +1460,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1495,11 +1485,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." @@ -9069,8 +9054,7 @@ msgid "" "to contact them." msgstr "" "Si deseas charlar con alguien en concreto, comienza la frase con su apodo, " -"así esa persona recibirá una notificación de que alguien intenta entablar un" -" dialogo con el/ella." +"así esa persona recibirá una notificación de que alguien intenta hablarle."
#: https//support.torproject.org/get-in-touch/irc-help/ #: (content/get-in-touch/irc-help/contents+en.lrquestion.description) diff --git a/contents+fa.po b/contents+fa.po index e4890d754..b2da18771 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Reza Ghasemi, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)%5Cn" @@ -1247,16 +1247,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1279,11 +1269,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+fo.po b/contents+fo.po index 7b4d08a65..aa8d76d14 100644 --- a/contents+fo.po +++ b/contents+fo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Faroese (https://www.transifex.com/otf/teams/1519/fo/)%5Cn" @@ -1227,16 +1227,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1259,11 +1249,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+fr.po b/contents+fr.po index eabff73fc..f4018bd3d 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,19 +2,19 @@ # Curtis Baltimore curtisbaltimore@protonmail.com, 2019 # David Georges, 2019 # N W, 2019 +# erinm, 2019 # Emma Peel, 2019 # PoorPockets McNewHold poorpocketsmcnewhold@protonmail.ch, 2019 # AO ao@localizationlab.org, 2019 # Adam Lynn adam@opentechfund.org, 2019 -# erinm, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Adam Lynn adam@opentechfund.org, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)%5Cn" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1322,16 +1322,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1354,11 +1344,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ga.po b/contents+ga.po index 8c61ccde6..191b38012 100644 --- a/contents+ga.po +++ b/contents+ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Irish (https://www.transifex.com/otf/teams/1519/ga/)%5Cn" @@ -1229,16 +1229,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1261,11 +1251,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+gu.po b/contents+gu.po index e33f5231b..16f309291 100644 --- a/contents+gu.po +++ b/contents+gu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Gujarati (https://www.transifex.com/otf/teams/1519/gu/)%5Cn" @@ -1215,16 +1215,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1247,11 +1237,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+he.po b/contents+he.po index 5a7554ff2..b9c32c5dc 100644 --- a/contents+he.po +++ b/contents+he.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: ION, 2019\n" "Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)%5Cn" @@ -1218,16 +1218,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1250,11 +1240,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+hi.po b/contents+hi.po index 23bb069a6..786f01b50 100644 --- a/contents+hi.po +++ b/contents+hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)%5Cn" @@ -1213,16 +1213,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1245,11 +1235,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+hu.po b/contents+hu.po index 1dd93ba13..00a1d706b 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: vargaviktor viktor.varga@gmail.com, 2019\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)%5Cn" @@ -1225,16 +1225,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1257,11 +1247,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+id.po b/contents+id.po index c60afea6d..94328ace6 100644 --- a/contents+id.po +++ b/contents+id.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)%5Cn" @@ -1248,16 +1248,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1283,11 +1273,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+is.po b/contents+is.po index d309fbc30..2758953c9 100644 --- a/contents+is.po +++ b/contents+is.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Sveinn í Felli sv1@fellsnet.is, 2019\n" "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)%5Cn" @@ -1261,16 +1261,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1293,11 +1283,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+it.po b/contents+it.po index 8eef9f9e3..1543ee49d 100644 --- a/contents+it.po +++ b/contents+it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)%5Cn" @@ -1463,16 +1463,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr "#### Soluzione alternativa (utilizzando una chiave pubblica)"
@@ -1502,11 +1492,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ja.po b/contents+ja.po index 5c912973b..7939d0183 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: ue zaeco, 2019\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)%5Cn" @@ -1218,16 +1218,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1250,11 +1240,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ka.po b/contents+ka.po index 8c7d4ab82..43ddec061 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Georgianization, 2019\n" "Language-Team: Georgian (https://www.transifex.com/otf/teams/1519/ka/)%5Cn" @@ -1457,16 +1457,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr "#### დროებითი გამოსავალი (საჯარო გასაღებით)"
@@ -1497,11 +1487,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ko.po b/contents+ko.po index c1b18c456..89e6c34a7 100644 --- a/contents+ko.po +++ b/contents+ko.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Johnny Cho popeye92@gmail.com, 2019\n" "Language-Team: Korean (https://www.transifex.com/otf/teams/1519/ko/)%5Cn" @@ -1218,16 +1218,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1250,11 +1240,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+mk.po b/contents+mk.po index 3bcbf6957..f2265cb55 100644 --- a/contents+mk.po +++ b/contents+mk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Liljana Ackovska liljanagjurova@gmail.com, 2019\n" "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)%5Cn" @@ -1217,16 +1217,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1249,11 +1239,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ml.po b/contents+ml.po index a8954d3aa..0b2486f8c 100644 --- a/contents+ml.po +++ b/contents+ml.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Malayalam (https://www.transifex.com/otf/teams/1519/ml/)%5Cn" @@ -1473,16 +1473,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr "#### Workaround (ഒരു പൊതു കീ ഉപയോഗിച്ച്)"
@@ -1512,11 +1502,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+my.po b/contents+my.po index 5046dac7a..9d6f7c8ee 100644 --- a/contents+my.po +++ b/contents+my.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Burmese (https://www.transifex.com/otf/teams/1519/my/)%5Cn" @@ -1213,16 +1213,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1245,11 +1235,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+nb.po b/contents+nb.po index deb095737..4305d614e 100644 --- a/contents+nb.po +++ b/contents+nb.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: 490cdfb601cecc09e36402222ad5913c, 2019\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/otf/teams/1519/nb/)%5Cn" @@ -1228,16 +1228,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1260,11 +1250,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+nl.po b/contents+nl.po index 86e18e8cc..ae658ff88 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Meteor 0id, 2019\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)%5Cn" @@ -1229,16 +1229,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1261,11 +1251,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+pl.po b/contents+pl.po index e68562b87..24a7b0451 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Michał Nowak nowak1michal@gmail.com, 2019\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)%5Cn" @@ -1275,16 +1275,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1307,11 +1297,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+pt-BR.po b/contents+pt-BR.po index aaffc2913..19a69e765 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: m tk, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)%5Cn" @@ -1413,16 +1413,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1445,11 +1435,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+pt-PT.po b/contents+pt-PT.po index 13e760f1b..04205e9a9 100644 --- a/contents+pt-PT.po +++ b/contents+pt-PT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Rui Melo viper5000pt@gmail.com, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/otf/teams/1519/pt_PT/)%5Cn" @@ -1270,16 +1270,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1302,11 +1292,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ro.po b/contents+ro.po index d93a7dd0c..05df309a0 100644 --- a/contents+ro.po +++ b/contents+ro.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: eduard pintilie eduard.pintilie@gmail.com, 2019\n" "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)%5Cn" @@ -1258,16 +1258,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1290,11 +1280,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+ru.po b/contents+ru.po index 34077080c..ec2f02d54 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -9,18 +9,18 @@ # Vitaliy Grishenko, 2019 # Evgeny Malyshev evgeny.malyshev.sss@gmail.com, 2019 # Andrey Kostrikov yavinav@gmail.com, 2019 +# erinm, 2019 # solokot solokot@gmail.com, 2019 # Sergey Smirnov cj75300@gmail.com, 2019 # Мария Романенко mary.romanenko@gmail.com, 2019 -# erinm, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Мария Романенко mary.romanenko@gmail.com, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)%5Cn" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1258,16 +1258,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1290,11 +1280,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+sr.po b/contents+sr.po index d44ad6ead..5c501ba44 100644 --- a/contents+sr.po +++ b/contents+sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Aleksa Ristić, 2019\n" "Language-Team: Serbian (https://www.transifex.com/otf/teams/1519/sr/)%5Cn" @@ -1218,16 +1218,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1250,11 +1240,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+sv.po b/contents+sv.po index 9d62654fd..a5bcfccc7 100644 --- a/contents+sv.po +++ b/contents+sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Jonatan Nyberg, 2019\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)%5Cn" @@ -1218,16 +1218,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1250,11 +1240,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+sw.po b/contents+sw.po index a0e73489b..477fdaa51 100644 --- a/contents+sw.po +++ b/contents+sw.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Swahili (https://www.transifex.com/otf/teams/1519/sw/)%5Cn" @@ -1213,16 +1213,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1245,11 +1235,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+th.po b/contents+th.po index 05de22d6c..abe2b0b86 100644 --- a/contents+th.po +++ b/contents+th.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: DN DN deen6@protonmail.com, 2019\n" "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)%5Cn" @@ -1221,16 +1221,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1253,11 +1243,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+tr.po b/contents+tr.po index 6fdfcaee7..f915ae9b9 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)%5Cn" @@ -1468,16 +1468,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr "#### Çözüm (herkese açık bir anahtar kullanarak)"
@@ -1507,11 +1497,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+uk.po b/contents+uk.po index 126a982d5..8d3cd8823 100644 --- a/contents+uk.po +++ b/contents+uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: nobik nobikik9@gmail.com, 2019\n" "Language-Team: Ukrainian (https://www.transifex.com/otf/teams/1519/uk/)%5Cn" @@ -1219,16 +1219,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1251,11 +1241,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f4c7da678..d239589c6 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -7,17 +7,17 @@ # AngelFalse, 2019 # MD Rights psychi2009@gmail.com, 2019 # Cloud P heige.pcloud@outlook.com, 2019 +# erinm, 2019 # ff98sha, 2019 # YFdyh000 yfdyh000@gmail.com, 2019 # shenzhui007 12231252@bjtu.edu.cn, 2019 -# erinm, 2019 # Emma Peel, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" "Last-Translator: Emma Peel, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)%5Cn" @@ -1264,16 +1264,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1299,11 +1289,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents+zh-TW.po b/contents+zh-TW.po index 3f90b38c8..b613bb851 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -1,18 +1,18 @@ # Translators: # Emma Peel, 2019 +# erinm, 2019 # 孟邦 王, 2019 # Bryce Tsao tsaodingtw@gmail.com, 2019 # 男孩不壞, 2019 # ian chou ertiach@hotmail.com, 2019 -# erinm, 2019 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: ian chou ertiach@hotmail.com, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)%5Cn" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1216,16 +1216,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr ""
@@ -1248,11 +1238,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr "" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)." diff --git a/contents.pot b/contents.pot index 28c74eaaa..a9d01d9b9 100644 --- a/contents.pot +++ b/contents.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-14 13:20+CET\n" +"POT-Creation-Date: 2019-11-14 16:04+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME EMAIL@ADDRESS\n" "Language-Team: en LL@li.org\n" @@ -1441,16 +1441,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "<<<<<<< HEAD" -msgstr "<<<<<<< HEAD" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid "=======" -msgstr "=======" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### Workaround (using a public key)" msgstr "#### Workaround (using a public key)"
@@ -1480,11 +1470,6 @@ msgstr ""
#: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) -msgid ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" -msgstr ">>>>>>> 4c7b199efc403f7f73b9ae06733568f8945eb6ae" - -#: https//support.torproject.org/tbb/how-to-verify-signature/ -#: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "" "You may also want to [learn more about " "GnuPG](https://www.gnupg.org/documentation/)."