commit 52a010ab376bae8fd244327bc4c19affa7adeb89 Author: Translation commit bot translation@torproject.org Date: Thu Nov 14 15:27:00 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=support-portal_compl... --- contents.pot | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
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/)."