boklm pushed to branch main at The Tor Project / Applications / torbrowser-launcher

Commits:

8 changed files:

Changes:

  • LICENSE
    1 1 
     Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    2 
    +Copyright (c) 2024 Tor Project
    2 3
    3 4 
     Permission is hereby granted, free of charge, to any person
    4 5 
     obtaining a copy of this software and associated documentation

  • setup.py
    ... ... @@ -2,7 +2,8 @@
    2 2 
     Tor Browser Launcher
    3 3 
     https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
    4 4
    5 
    -Copyright (c) 2013-2017 Micah Lee <micah@micahflee.com>
    5 
    +Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    6 
    +Copyright (c) 2024 Tor Project
    6 7
    7 8 
     Permission is hereby granted, free of charge, to any person
    8 9 
     obtaining a copy of this software and associated documentation
    ... ... @@ -100,6 +101,8 @@ setup(
    100 101 
         version=version,
    101 102 
         author="Micah Lee",
    102 103 
         author_email="micah@micahflee.com",
    104 
    +    maintainer="Nicolas Vigier",
    105 
    +    maintainer_email="boklm@torproject.org",
    103 106 
         url="https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/",
    104 107 
         platforms=["GNU/Linux"],
    105 108 
         license="MIT",

  • share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml
    1 1 
     <?xml version="1.0" encoding="UTF-8"?>
    2 
    -<!-- Copyright 2014 Micah Lee <micah@micahflee.com> -->
    2 
    +<!-- Copyright 2014-2023 Micah Lee <micah@micahflee.com> -->
    3 
    +<!-- Copyright 2024 Tor Project -->
    3 4 
     <component type="desktop-application">
    4 5 
      <id>org.torproject.torbrowser-launcher</id>
    5 6 
      <launchable type="desktop-id">torbrowser.desktop</launchable>
    ... ... @@ -27,7 +28,7 @@
    27 28 
       </screenshot>
    28 29 
      </screenshots>
    29 30 
      <url type="homepage">https://gitlab.torproject.org/tpo/applications/torbrowser-launcher</url>
    30 
    - <update_contact>micah@micahflee.com</update_contact>
    31 
    + <update_contact>boklm@torproject.org</update_contact>
    31 32 
      <content_rating type="oars-1.1"/>
    32 33 
      <releases>
    33 34 
       <release version="0.3.6" date="2022-12-13"/>

  • torbrowser-launcher
    ... ... @@ -3,7 +3,8 @@
    3 3 
     Tor Browser Launcher
    4 4 
     https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
    5 5
    6 
    -Copyright (c) 2013-2017 Micah Lee <micah@micahflee.com>
    6 
    +Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    7 
    +Copyright (c) 2024 Tor Project
    7 8
    8 9 
     Permission is hereby granted, free of charge, to any person
    9 10 
     obtaining a copy of this software and associated documentation

  • torbrowser_launcher.pot
    ... ... @@ -8,7 +8,7 @@ msgid ""
    8 8 
     msgstr ""
    9 9 
     "Project-Id-Version: PACKAGE VERSION\n"
    10 10 
     "Report-Msgid-Bugs-To: \n"
    11 
    -"POT-Creation-Date: 2018-03-23 15:47-0700\n"
    11 
    +"POT-Creation-Date: 2024-01-09 17:04+0100\n"
    12 12 
     "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    13 13 
     "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    14 14 
     "Language-Team: LANGUAGE <LL@li.org>\n"
    ... ... @@ -17,153 +17,154 @@ msgstr ""
    17 17 
     "Content-Type: text/plain; charset=CHARSET\n"
    18 18 
     "Content-Transfer-Encoding: 8bit\n"
    19 19
    20 
    -#: __init__.py:65 launcher.py:470
    20 
    +#: __init__.py:76 launcher.py:520
    21 21 
     msgid "Tor Browser Launcher"
    22 22 
     msgstr ""
    23 23
    24 
    -#: __init__.py:66
    25 
    -msgid "By Micah Lee, licensed under MIT"
    24 
    +#: __init__.py:77
    25 
    +msgid "By Micah Lee & Tor Project, licensed under MIT"
    26 26 
     msgstr ""
    27 27
    28 
    -#: __init__.py:67
    28 
    +#: __init__.py:78
    29 29 
     #, python-brace-format
    30 30 
     msgid "version {0}"
    31 31 
     msgstr ""
    32 32
    33 
    -#: common.py:100
    33 
    +#: common.py:90
    34 34 
     #, python-brace-format
    35 35 
     msgid "Error creating {0}"
    36 36 
     msgstr ""
    37 37
    38 
    -#: common.py:102 common.py:180
    38 
    +#: common.py:187
    39 39 
     #, python-brace-format
    40 
    -msgid "{0} is not writable"
    40 
    +msgid "Renamed {0} to {1}"
    41 41 
     msgstr ""
    42 42
    43 
    -#: common.py:177
    43 
    +#: common.py:201
    44 44 
     #, python-brace-format
    45 45 
     msgid "Cannot create directory {0}"
    46 46 
     msgstr ""
    47 47
    48 
    -#: common.py:187
    48 
    +#: common.py:204
    49 
    +#, python-brace-format
    50 
    +msgid "{0} is not writable"
    51 
    +msgstr ""
    52 
    +
    53 
    +#: common.py:211
    49 54 
     msgid "Creating GnuPG homedir"
    50 55 
     msgstr ""
    51 56
    52 
    -#: common.py:254
    57 
    +#: common.py:302
    53 58 
     #, python-format
    54 59 
     msgid "Could not import key with fingerprint: %s."
    55 60 
     msgstr ""
    56 61
    57 
    -#: common.py:259
    62 
    +#: common.py:309
    58 63 
     msgid "Not all keys were imported successfully!"
    59 64 
     msgstr ""
    60 65
    61 
    -#: launcher.py:83
    66 
    +#: launcher.py:87
    62 67 
     msgid "Downloading Tor Browser for the first time."
    63 68 
     msgstr ""
    64 69
    65 
    -#: launcher.py:85
    70 
    +#: launcher.py:90
    66 71 
     msgid ""
    67 72 
     "Your version of Tor Browser is out-of-date. Downloading the newest version."
    68 73 
     msgstr ""
    69 74
    70 
    -#: launcher.py:100
    75 
    +#: launcher.py:111
    71 76 
     msgid "Downloading over Tor"
    72 77 
     msgstr ""
    73 78
    74 
    -#: launcher.py:111
    79 
    +#: launcher.py:122
    75 80 
     msgid "Tor Browser"
    76 81 
     msgstr ""
    77 82
    78 
    -#: launcher.py:128
    83 
    +#: launcher.py:141
    79 84 
     msgid "Start"
    80 85 
     msgstr ""
    81 86
    82 
    -#: launcher.py:174
    87 
    +#: launcher.py:191
    83 88 
     msgid "Yes"
    84 89 
     msgstr ""
    85 90
    86 
    -#: launcher.py:178
    91 
    +#: launcher.py:195
    87 92 
     msgid "Exit"
    88 93 
     msgstr ""
    89 94
    90 
    -#: launcher.py:192 settings.py:136
    95 
    +#: launcher.py:209 settings.py:136
    91 96 
     msgid "Cancel"
    92 97 
     msgstr ""
    93 98
    94 
    -#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
    95 
    -#: launcher.py:281
    99 
    +#: launcher.py:246 launcher.py:267 launcher.py:276 launcher.py:315
    100 
    +#: launcher.py:318
    96 101 
     msgid "Downloading"
    97 102 
     msgstr ""
    98 103
    99 
    -#: launcher.py:238
    104 
    +#: launcher.py:257
    100 105 
     msgid "Latest version: {}"
    101 106 
     msgstr ""
    102 107
    103 
    -#: launcher.py:241
    108 
    +#: launcher.py:261
    104 109 
     msgid "Error detecting Tor Browser version."
    105 110 
     msgstr ""
    106 111
    107 
    -#: launcher.py:256 launcher.py:357
    112 
    +#: launcher.py:291 launcher.py:389
    108 113 
     msgid "Verifying Signature"
    109 114 
     msgstr ""
    110 115
    111 
    -#: launcher.py:260
    116 
    +#: launcher.py:295
    112 117 
     msgid "Extracting"
    113 118 
     msgstr ""
    114 119
    115 
    -#: launcher.py:264
    120 
    +#: launcher.py:299
    116 121 
     msgid "Running"
    117 122 
     msgstr ""
    118 123
    119 
    -#: launcher.py:268
    124 
    +#: launcher.py:303
    120 125 
     msgid "Starting download over again"
    121 126 
     msgstr ""
    122 127
    123 
    -#: launcher.py:279 launcher.py:295
    128 
    +#: launcher.py:315 launcher.py:334
    124 129 
     msgid "(over Tor)"
    125 130 
     msgstr ""
    126 131
    127 
    -#: launcher.py:293
    132 
    +#: launcher.py:330
    128 133 
     msgid "Downloaded"
    129 134 
     msgstr ""
    130 135
    131 
    -#: launcher.py:393
    136 
    +#: launcher.py:431
    132 137 
     msgid "Installing"
    133 138 
     msgstr ""
    134 139
    135 
    -#: launcher.py:401
    140 
    +#: launcher.py:440
    136 141 
     #, python-brace-format
    137 142 
     msgid "Tor Browser Launcher doesn't understand the file format of {0}"
    138 143 
     msgstr ""
    139 144
    140 
    -#: launcher.py:427
    145 
    +#: launcher.py:471
    141 146 
     msgid ""
    142 147 
     "The version of Tor Browser you have installed is earlier than it should be, "
    143 148 
     "which could be a sign of an attack!"
    144 149 
     msgstr ""
    145 150
    146 
    -#: launcher.py:446
    151 
    +#: launcher.py:488
    147 152 
     msgid "Downloading Tor Browser over again."
    148 153 
     msgstr ""
    149 154
    150 
    -#: launcher.py:516 launcher.py:525 launcher.py:533
    155 
    +#: launcher.py:561 launcher.py:569
    151 156 
     msgid "Download Error:"
    152 157 
     msgstr ""
    153 158
    154 
    -#: launcher.py:517
    159 
    +#: launcher.py:563
    155 160 
     msgid "You are currently using a non-default mirror"
    156 161 
     msgstr ""
    157 162
    158 
    -#: launcher.py:518
    163 
    +#: launcher.py:565
    159 164 
     msgid "Would you like to switch back to the default?"
    160 165 
     msgstr ""
    161 166
    162 
    -#: launcher.py:527
    163 
    -msgid "Would you like to try the English version of Tor Browser instead?"
    164 
    -msgstr ""
    165 
    -
    166 
    -#: launcher.py:548
    167 
    +#: launcher.py:585
    167 168 
     #, python-brace-format
    168 169 
     msgid ""
    169 170 
     "Invalid SSL certificate for:\n"
    ... ... @@ -172,11 +173,11 @@ msgid ""
    172 173 
     "You may be under attack."
    173 174 
     msgstr ""
    174 175
    175 
    -#: launcher.py:550
    176 
    +#: launcher.py:588
    176 177 
     msgid "Try the download again using Tor?"
    177 178 
     msgstr ""
    178 179
    179 
    -#: launcher.py:559
    180 
    +#: launcher.py:598
    180 181 
     #, python-brace-format
    181 182 
     msgid ""
    182 183 
     "Error starting download:\n"
    ... ... @@ -187,7 +188,7 @@ msgid ""
    187 188 
     "running?"
    188 189 
     msgstr ""
    189 190
    190 
    -#: launcher.py:563
    191 
    +#: launcher.py:604
    191 192 
     #, python-brace-format
    192 193 
     msgid ""
    193 194 
     "Error starting download:\n"
    ... ... @@ -197,42 +198,38 @@ msgid ""
    197 198 
     "Are you connected to the internet?"
    198 199 
     msgstr ""
    199 200
    200 
    -#: settings.py:46
    201 
    +#: settings.py:48
    201 202 
     msgid "Tor Browser Launcher Settings"
    202 203 
     msgstr ""
    203 204
    204 
    -#: settings.py:50
    205 
    +#: settings.py:52
    205 206 
     msgid "Download over system Tor"
    206 207 
     msgstr ""
    207 208
    208 
    -#: settings.py:57
    209 
    -msgid "Force downloading English version of Tor Browser"
    210 
    -msgstr ""
    211 
    -
    212 
    -#: settings.py:66
    209 
    +#: settings.py:59
    213 210 
     msgid "Tor server"
    214 211 
     msgstr ""
    215 212
    216 
    -#: settings.py:82
    213 
    +#: settings.py:74
    217 214 
     msgid "Status: Installed"
    218 215 
     msgstr ""
    219 216
    220 
    -#: settings.py:84
    217 
    +#: settings.py:76
    221 218 
     msgid "Status: Not Installed"
    222 219 
     msgstr ""
    223 220
    224 
    -#: settings.py:87
    221 
    +#: settings.py:79
    225 222 
     msgid "Install Tor Browser"
    226 223 
     msgstr ""
    227 224
    228 
    -#: settings.py:92
    225 
    +#: settings.py:86
    229 226 
     msgid "Reinstall Tor Browser"
    230 227 
     msgstr ""
    231 228
    232 
    -#: settings.py:115
    229 
    +#: settings.py:111
    233 230 
     msgid "Mirror"
    234 231 
     msgstr ""
    235 232
    236 
    -#: settings.py:131
    233 
    +#: settings.py:129
    237 234 
     msgid "Save && Exit"
    238 235 
     msgstr ""

  • torbrowser_launcher/__init__.py
    ... ... @@ -2,7 +2,8 @@
    2 2 
     Tor Browser Launcher
    3 3 
     https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
    4 4
    5 
    -Copyright (c) 2013-2021 Micah Lee <micah@micahflee.com>
    5 
    +Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    6 
    +Copyright (c) 2024 Tor Project
    6 7
    7 8 
     Permission is hereby granted, free of charge, to any person
    8 9 
     obtaining a copy of this software and associated documentation
    ... ... @@ -73,7 +74,7 @@ def main():
    73 74 
             tor_browser_launcher_version = buf.read().strip()
    74 75
    75 76 
         print(_("Tor Browser Launcher"))
    76 
    -    print(_("By Micah Lee, licensed under MIT"))
    77 
    +    print(_("By Micah Lee & Tor Project, licensed under MIT"))
    77 78 
         print(_("version {0}").format(tor_browser_launcher_version))
    78 79 
         print("https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/")
    79 80

  • torbrowser_launcher/launcher.py
    ... ... @@ -2,7 +2,8 @@
    2 2 
     Tor Browser Launcher
    3 3 
     https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
    4 4
    5 
    -Copyright (c) 2013-2021 Micah Lee <micah@micahflee.com>
    5 
    +Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    6 
    +Copyright (c) 2024 Tor Project
    6 7
    7 8 
     Permission is hereby granted, free of charge, to any person
    8 9 
     obtaining a copy of this software and associated documentation

  • torbrowser_launcher/settings.py
    ... ... @@ -2,7 +2,8 @@
    2 2 
     Tor Browser Launcher
    3 3 
     https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
    4 4
    5 
    -Copyright (c) 2013-2021 Micah Lee <micah@micahflee.com>
    5 
    +Copyright (c) 2013-2023 Micah Lee <micah@micahflee.com>
    6 
    +Copyright (c) 2024 Tor Project
    6 7
    7 8 
     Permission is hereby granted, free of charge, to any person
    8 9 
     obtaining a copy of this software and associated documentation

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help