diff --git a/src/accessible_output2/lib/nvdaControllerClient64.dll b/src/accessible_output2/lib/nvdaControllerClient64.dll
new file mode 100644
index 00000000..6b4fff78
Binary files /dev/null and b/src/accessible_output2/lib/nvdaControllerClient64.dll differ
diff --git a/src/accessible_output2/outputs/base.py b/src/accessible_output2/outputs/base.py
index b94db979..2847f2f9 100644
--- a/src/accessible_output2/outputs/base.py
+++ b/src/accessible_output2/outputs/base.py
@@ -43,5 +43,5 @@ class Output(object):
  def speak(self, **optiont):
   return False
 
- def braille(self, **options):
+ def braille(self, *args, **options):
   return False
diff --git a/src/application.py b/src/application.py
index b6add630..4a465b7d 100644
--- a/src/application.py
+++ b/src/application.py
@@ -5,7 +5,7 @@ if snapshot == False:
  version = "0.80"
  update_url = 'http://twblue.es/updates/twblue_ngen.json'
 else:
- version = "10.95"
+ version = "10.96"
  update_url = 'http://twblue.es/updates/snapshots_ngen.json'
 author = u"Manuel Cortéz"
 authorEmail = "manuel@manuelcortez.net"
diff --git a/src/keys/lib/api_keys32.dll b/src/keys/lib/api_keys32.dll
index 0a174d4a..616a1399 100644
Binary files a/src/keys/lib/api_keys32.dll and b/src/keys/lib/api_keys32.dll differ
diff --git a/src/keys/lib/api_keys64.dll b/src/keys/lib/api_keys64.dll
index eba1fede..4b2fa853 100644
Binary files a/src/keys/lib/api_keys64.dll and b/src/keys/lib/api_keys64.dll differ
diff --git a/src/long_tweets/twishort.py b/src/long_tweets/twishort.py
index b42eb42f..d26dc394 100644
--- a/src/long_tweets/twishort.py
+++ b/src/long_tweets/twishort.py
@@ -43,4 +43,5 @@ def create_tweet(user_token, user_secret, text, media=0):
  "text": text.encode("utf-8"),
  "media": media}
  response = requests.post("http://twblue.es/twishort.php", data=data)
+# print response.json()
  return response.json()["text_to_tweet"]
\ No newline at end of file
diff --git a/tools/twblue-documentation.pot b/tools/twblue-documentation.pot
index 32fbb8cd..262b07ac 100644
--- a/tools/twblue-documentation.pot
+++ b/tools/twblue-documentation.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-29 09:37+Hora de verano central (México)\n"
+"POT-Creation-Date: 2015-11-06 08:10+Hora estándar central (México)\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/tools/twblue.pot b/tools/twblue.pot
index 63225348..2ca6df49 100644
--- a/tools/twblue.pot
+++ b/tools/twblue.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-09-29 09:37+Hora de verano central (México)\n"
+"POT-Creation-Date: 2015-11-06 08:10+Hora estándar central (México)\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,171 +15,171 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: ../src\controller\buffersController.py:89
+#: ../src\controller\buffersController.py:91
 msgid "This action is not supported for this buffer"
 msgstr ""
 
-#: ../src\controller\buffersController.py:128
-#: ../src\controller\buffersController.py:983 ../src\wxUI\buffers\base.py:24
+#: ../src\controller\buffersController.py:130
+#: ../src\controller\buffersController.py:1000 ../src\wxUI\buffers\base.py:24
 #: ../src\wxUI\buffers\events.py:14 ../src\wxUI\buffers\trends.py:17
 #: ../src\wxUI\dialogs\message.py:251 ../src\wxUI\sysTrayIcon.py:33
 msgid "Tweet"
 msgstr ""
 
-#: ../src\controller\buffersController.py:129
-#: ../src\controller\buffersController.py:984
+#: ../src\controller\buffersController.py:131
+#: ../src\controller\buffersController.py:1001
 msgid "Write the tweet here"
 msgstr ""
 
-#: ../src\controller\buffersController.py:313
-#: ../src\controller\buffersController.py:774
+#: ../src\controller\buffersController.py:319
+#: ../src\controller\buffersController.py:782
 msgid "%s items retrieved"
 msgstr ""
 
-#: ../src\controller\buffersController.py:333
+#: ../src\controller\buffersController.py:339
 msgid "This buffer is not a timeline; it can't be deleted."
 msgstr ""
 
-#: ../src\controller\buffersController.py:449
+#: ../src\controller\buffersController.py:455
 msgid "Reply to %s"
 msgstr ""
 
-#: ../src\controller\buffersController.py:449
+#: ../src\controller\buffersController.py:455
 #: ../src\keystrokeEditor\constants.py:11 ../src\wxUI\buffers\base.py:26
 msgid "Reply"
 msgstr ""
 
-#: ../src\controller\buffersController.py:476
+#: ../src\controller\buffersController.py:482
 msgid "Direct message to %s"
 msgstr ""
 
-#: ../src\controller\buffersController.py:476
+#: ../src\controller\buffersController.py:482
 #: ../src\controller\mainController.py:1143
 msgid "New direct message"
 msgstr ""
 
-#: ../src\controller\buffersController.py:497
+#: ../src\controller\buffersController.py:503
 msgid "Add your comment to the tweet"
 msgstr ""
 
-#: ../src\controller\buffersController.py:497
+#: ../src\controller\buffersController.py:503
 #: ../src\keystrokeEditor\constants.py:12 ../src\wxUI\buffers\base.py:25
 #: ../src\wxUI\commonMessageDialogs.py:9 ../src\wxUI\dialogs\message.py:126
 msgid "Retweet"
 msgstr ""
 
-#: ../src\controller\buffersController.py:568
+#: ../src\controller\buffersController.py:574
 msgid "Opening URL..."
 msgstr ""
 
-#: ../src\controller\buffersController.py:603
+#: ../src\controller\buffersController.py:609
 msgid "User details"
 msgstr ""
 
-#: ../src\controller\buffersController.py:672
+#: ../src\controller\buffersController.py:678
 msgid "Empty"
 msgstr ""
 
-#: ../src\controller\buffersController.py:733
+#: ../src\controller\buffersController.py:739
 msgid "Mention to %s"
 msgstr ""
 
-#: ../src\controller\buffersController.py:733 ../src\wxUI\buffers\people.py:15
+#: ../src\controller\buffersController.py:739 ../src\wxUI\buffers\people.py:15
 msgid "Mention"
 msgstr ""
 
-#: ../src\controller\mainController.py:256
+#: ../src\controller\mainController.py:257
 msgid "Ready"
 msgstr ""
 
-#: ../src\controller\mainController.py:288
+#: ../src\controller\mainController.py:289
 msgid "Home"
 msgstr ""
 
-#: ../src\controller\mainController.py:292
+#: ../src\controller\mainController.py:293
 msgid "Mentions"
 msgstr ""
 
-#: ../src\controller\mainController.py:296
+#: ../src\controller\mainController.py:297
 msgid "Direct messages"
 msgstr ""
 
-#: ../src\controller\mainController.py:300
+#: ../src\controller\mainController.py:301
 msgid "Sent direct messages"
 msgstr ""
 
-#: ../src\controller\mainController.py:304
+#: ../src\controller\mainController.py:305
 msgid "Sent tweets"
 msgstr ""
 
-#: ../src\controller\mainController.py:309
-#: ../src\controller\mainController.py:1266
+#: ../src\controller\mainController.py:310
+#: ../src\controller\mainController.py:1277
 #: ../src\wxUI\dialogs\userSelection.py:20
-msgid "Favourites"
+msgid "Likes"
 msgstr ""
 
-#: ../src\controller\mainController.py:313
-#: ../src\controller\mainController.py:1271
+#: ../src\controller\mainController.py:314
+#: ../src\controller\mainController.py:1282
 msgid "Followers"
 msgstr ""
 
-#: ../src\controller\mainController.py:317
-#: ../src\controller\mainController.py:1276
+#: ../src\controller\mainController.py:318
+#: ../src\controller\mainController.py:1287
 msgid "Friends"
 msgstr ""
 
-#: ../src\controller\mainController.py:321
-#: ../src\controller\mainController.py:1281
+#: ../src\controller\mainController.py:322
+#: ../src\controller\mainController.py:1292
 msgid "Blocked users"
 msgstr ""
 
-#: ../src\controller\mainController.py:325
-#: ../src\controller\mainController.py:1286
+#: ../src\controller\mainController.py:326
+#: ../src\controller\mainController.py:1297
 msgid "Muted users"
 msgstr ""
 
-#: ../src\controller\mainController.py:329
-#: ../src\controller\mainController.py:1291
+#: ../src\controller\mainController.py:330
+#: ../src\controller\mainController.py:1302
 msgid "Events"
 msgstr ""
 
-#: ../src\controller\mainController.py:332
+#: ../src\controller\mainController.py:333
 msgid "Timelines"
 msgstr ""
 
-#: ../src\controller\mainController.py:336
+#: ../src\controller\mainController.py:337
 #: ../src\controller\mainController.py:774
 msgid "Timeline for {}"
 msgstr ""
 
-#: ../src\controller\mainController.py:339
-msgid "Favourites timelines"
+#: ../src\controller\mainController.py:340
+msgid "Likes timelines"
 msgstr ""
 
-#: ../src\controller\mainController.py:343
+#: ../src\controller\mainController.py:344
 #: ../src\controller\mainController.py:789
-msgid "Favourites timeline for {}"
+msgid "Likes for {}"
 msgstr ""
 
-#: ../src\controller\mainController.py:348 ../src\wxUI\dialogs\lists.py:12
+#: ../src\controller\mainController.py:349 ../src\wxUI\dialogs\lists.py:12
 msgid "Lists"
 msgstr ""
 
-#: ../src\controller\mainController.py:353
-#: ../src\controller\mainController.py:1302
+#: ../src\controller\mainController.py:354
+#: ../src\controller\mainController.py:1313
 msgid "List for {}"
 msgstr ""
 
-#: ../src\controller\mainController.py:356
+#: ../src\controller\mainController.py:357
 msgid "Searches"
 msgstr ""
 
-#: ../src\controller\mainController.py:360
+#: ../src\controller\mainController.py:361
 #: ../src\controller\mainController.py:422
 msgid "Search for {}"
 msgstr ""
 
-#: ../src\controller\mainController.py:370
+#: ../src\controller\mainController.py:371
 #: ../src\controller\mainController.py:835
 msgid "Trending topics for %s"
 msgstr ""
@@ -259,35 +259,35 @@ msgstr ""
 msgid "One tweet from %s"
 msgstr ""
 
-#: ../src\controller\mainController.py:1296
+#: ../src\controller\mainController.py:1307
 msgid "This list is already opened"
 msgstr ""
 
-#: ../src\controller\mainController.py:1355
+#: ../src\controller\mainController.py:1366
 msgid "The auto-reading of new tweets is enabled for this buffer"
 msgstr ""
 
-#: ../src\controller\mainController.py:1358
+#: ../src\controller\mainController.py:1369
 msgid "The auto-reading of new tweets is disabled for this buffer"
 msgstr ""
 
-#: ../src\controller\mainController.py:1364
+#: ../src\controller\mainController.py:1375
 msgid "Session mute on"
 msgstr ""
 
-#: ../src\controller\mainController.py:1367
+#: ../src\controller\mainController.py:1378
 msgid "Session mute off"
 msgstr ""
 
-#: ../src\controller\mainController.py:1374
+#: ../src\controller\mainController.py:1385
 msgid "Buffer mute on"
 msgstr ""
 
-#: ../src\controller\mainController.py:1377
+#: ../src\controller\mainController.py:1388
 msgid "Buffer mute off"
 msgstr ""
 
-#: ../src\controller\mainController.py:1390
+#: ../src\controller\mainController.py:1401
 msgid "Copied"
 msgstr ""
 
@@ -420,7 +420,7 @@ msgid ""
 msgstr ""
 
 #: ../src\controller\user.py:98
-msgid "Favourites: %s"
+msgid "Likes: %s"
 msgstr ""
 
 #: ../src\controller\userActionsController.py:75
@@ -592,11 +592,11 @@ msgid "Error."
 msgstr ""
 
 #: ../src\extra\SoundsTutorial\soundsTutorial_constants.py:10
-msgid "Tweet favourited."
+msgid "Tweet liked."
 msgstr ""
 
 #: ../src\extra\SoundsTutorial\soundsTutorial_constants.py:11
-msgid "Favourites buffer updated."
+msgid "Likes buffer updated."
 msgstr ""
 
 #: ../src\extra\SoundsTutorial\soundsTutorial_constants.py:12
@@ -803,371 +803,375 @@ msgstr ""
 msgid "{0}'s database of users has been updated."
 msgstr ""
 
-#: ../src\extra\translator\translator.py:9
+#: ../src\extra\translator\translator.py:124
+msgid "unavailable"
+msgstr ""
+
+#: ../src\extra\translator\translator.py:153
 msgid "Afrikaans"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:10
+#: ../src\extra\translator\translator.py:154
 msgid "Albanian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:11
+#: ../src\extra\translator\translator.py:155
 msgid "Amharic"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:12
+#: ../src\extra\translator\translator.py:156
 msgid "Arabic"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:13
+#: ../src\extra\translator\translator.py:157
 msgid "Armenian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:14
+#: ../src\extra\translator\translator.py:158
 msgid "Azerbaijani"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:15
+#: ../src\extra\translator\translator.py:159
 msgid "Basque"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:16
+#: ../src\extra\translator\translator.py:160
 msgid "Belarusian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:17
+#: ../src\extra\translator\translator.py:161
 msgid "Bengali"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:18
+#: ../src\extra\translator\translator.py:162
 msgid "Bihari"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:19
+#: ../src\extra\translator\translator.py:163
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:20
+#: ../src\extra\translator\translator.py:164
 msgid "Burmese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:21
+#: ../src\extra\translator\translator.py:165
 msgid "Catalan"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:22
+#: ../src\extra\translator\translator.py:166
 msgid "Cherokee"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:23
+#: ../src\extra\translator\translator.py:167
 msgid "Chinese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:24
+#: ../src\extra\translator\translator.py:168
 msgid "Chinese_simplified"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:25
+#: ../src\extra\translator\translator.py:169
 msgid "Chinese_traditional"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:26
+#: ../src\extra\translator\translator.py:170
 msgid "Croatian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:27
+#: ../src\extra\translator\translator.py:171
 msgid "Czech"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:28
+#: ../src\extra\translator\translator.py:172
 msgid "Danish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:29
+#: ../src\extra\translator\translator.py:173
 msgid "Dhivehi"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:30
+#: ../src\extra\translator\translator.py:174
 msgid "Dutch"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:31
+#: ../src\extra\translator\translator.py:175
 msgid "English"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:32
+#: ../src\extra\translator\translator.py:176
 msgid "Esperanto"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:33
+#: ../src\extra\translator\translator.py:177
 msgid "Estonian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:34
+#: ../src\extra\translator\translator.py:178
 msgid "Filipino"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:35
+#: ../src\extra\translator\translator.py:179
 msgid "Finnish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:36
+#: ../src\extra\translator\translator.py:180
 msgid "French"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:37
+#: ../src\extra\translator\translator.py:181
 msgid "Galician"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:38
+#: ../src\extra\translator\translator.py:182
 msgid "Georgian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:39
+#: ../src\extra\translator\translator.py:183
 msgid "German"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:40
+#: ../src\extra\translator\translator.py:184
 msgid "Greek"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:41
+#: ../src\extra\translator\translator.py:185
 msgid "Guarani"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:42
+#: ../src\extra\translator\translator.py:186
 msgid "Gujarati"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:43
+#: ../src\extra\translator\translator.py:187
 msgid "Hebrew"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:44
+#: ../src\extra\translator\translator.py:188
 msgid "Hindi"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:45
+#: ../src\extra\translator\translator.py:189
 msgid "Hungarian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:46
+#: ../src\extra\translator\translator.py:190
 msgid "Icelandic"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:47
+#: ../src\extra\translator\translator.py:191
 msgid "Indonesian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:48
+#: ../src\extra\translator\translator.py:192
 msgid "Inuktitut"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:49
+#: ../src\extra\translator\translator.py:193
 msgid "Irish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:50
+#: ../src\extra\translator\translator.py:194
 msgid "Italian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:51
+#: ../src\extra\translator\translator.py:195
 msgid "Japanese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:52
+#: ../src\extra\translator\translator.py:196
 msgid "Kannada"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:53
+#: ../src\extra\translator\translator.py:197
 msgid "Kazakh"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:54
+#: ../src\extra\translator\translator.py:198
 msgid "Khmer"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:55
+#: ../src\extra\translator\translator.py:199
 msgid "Korean"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:56
+#: ../src\extra\translator\translator.py:200
 msgid "Kurdish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:57
+#: ../src\extra\translator\translator.py:201
 msgid "Kyrgyz"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:58
+#: ../src\extra\translator\translator.py:202
 msgid "Laothian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:59
+#: ../src\extra\translator\translator.py:203
 msgid "Latvian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:60
+#: ../src\extra\translator\translator.py:204
 msgid "Lithuanian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:61
+#: ../src\extra\translator\translator.py:205
 msgid "Macedonian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:62
+#: ../src\extra\translator\translator.py:206
 msgid "Malay"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:63
+#: ../src\extra\translator\translator.py:207
 msgid "Malayalam"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:64
+#: ../src\extra\translator\translator.py:208
 msgid "Maltese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:65
+#: ../src\extra\translator\translator.py:209
 msgid "Marathi"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:66
+#: ../src\extra\translator\translator.py:210
 msgid "Mongolian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:67
+#: ../src\extra\translator\translator.py:211
 msgid "Nepali"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:68
+#: ../src\extra\translator\translator.py:212
 msgid "Norwegian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:69
+#: ../src\extra\translator\translator.py:213
 msgid "Oriya"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:70
+#: ../src\extra\translator\translator.py:214
 msgid "Pashto"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:71
+#: ../src\extra\translator\translator.py:215
 msgid "Persian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:72
+#: ../src\extra\translator\translator.py:216
 msgid "Polish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:73
+#: ../src\extra\translator\translator.py:217
 msgid "Portuguese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:74
+#: ../src\extra\translator\translator.py:218
 msgid "Punjabi"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:75
+#: ../src\extra\translator\translator.py:219
 msgid "Romanian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:76
+#: ../src\extra\translator\translator.py:220
 msgid "Russian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:77
+#: ../src\extra\translator\translator.py:221
 msgid "Sanskrit"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:78
+#: ../src\extra\translator\translator.py:222
 msgid "Serbian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:79
+#: ../src\extra\translator\translator.py:223
 msgid "Sindhi"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:80
+#: ../src\extra\translator\translator.py:224
 msgid "Sinhalese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:81
+#: ../src\extra\translator\translator.py:225
 msgid "Slovak"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:82
+#: ../src\extra\translator\translator.py:226
 msgid "Slovenian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:83
+#: ../src\extra\translator\translator.py:227
 msgid "Spanish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:84
+#: ../src\extra\translator\translator.py:228
 msgid "Swahili"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:85
+#: ../src\extra\translator\translator.py:229
 msgid "Swedish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:86
+#: ../src\extra\translator\translator.py:230
 msgid "Tajik"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:87
+#: ../src\extra\translator\translator.py:231
 msgid "Tamil"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:88
+#: ../src\extra\translator\translator.py:232
 msgid "Tagalog"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:89
+#: ../src\extra\translator\translator.py:233
 msgid "Telugu"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:90
+#: ../src\extra\translator\translator.py:234
 msgid "Thai"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:91
+#: ../src\extra\translator\translator.py:235
 msgid "Tibetan"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:92
+#: ../src\extra\translator\translator.py:236
 msgid "Turkish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:93
+#: ../src\extra\translator\translator.py:237
 msgid "Ukrainian"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:94
+#: ../src\extra\translator\translator.py:238
 msgid "Urdu"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:95
+#: ../src\extra\translator\translator.py:239
 msgid "Uzbek"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:96
+#: ../src\extra\translator\translator.py:240
 msgid "Uighur"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:97
+#: ../src\extra\translator\translator.py:241
 msgid "Vietnamese"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:98
+#: ../src\extra\translator\translator.py:242
 msgid "Welsh"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:99
+#: ../src\extra\translator\translator.py:243
 msgid "Yiddish"
 msgstr ""
 
-#: ../src\extra\translator\translator.py:106
+#: ../src\extra\translator\translator.py:250
 msgid "autodetect"
 msgstr ""
 
@@ -1340,11 +1344,11 @@ msgid "Send direct message"
 msgstr ""
 
 #: ../src\keystrokeEditor\constants.py:14
-msgid "Mark as favourite"
+msgid "Like a tweet"
 msgstr ""
 
 #: ../src\keystrokeEditor\constants.py:15
-msgid "Remove from favourites"
+msgid "Unlike a tweet"
 msgstr ""
 
 #: ../src\keystrokeEditor\constants.py:16
@@ -1479,6 +1483,22 @@ msgstr ""
 msgid "View conversation"
 msgstr ""
 
+#: ../src\keystrokeEditor\constants.py:49
+msgid "Check and download updates"
+msgstr ""
+
+#: ../src\keystrokeEditor\constants.py:50
+msgid "Opens the list manager, which allows you to create, edit, delete and open lists in buffers."
+msgstr ""
+
+#: ../src\keystrokeEditor\constants.py:51
+msgid "Opens the global settings dialogue"
+msgstr ""
+
+#: ../src\keystrokeEditor\constants.py:52
+msgid "Opens the account settings dialogue"
+msgstr ""
+
 #: ../src\keystrokeEditor\wx_ui.py:8
 msgid "Keystroke editor"
 msgstr ""
@@ -1562,11 +1582,11 @@ msgstr ""
 msgid "User default"
 msgstr ""
 
-#: ../src\sessionmanager\session.py:188
+#: ../src\sessionmanager\session.py:189
 msgid "%s failed.  Reason: %s"
 msgstr ""
 
-#: ../src\sessionmanager\session.py:194
+#: ../src\sessionmanager\session.py:195
 msgid "%s succeeded."
 msgstr ""
 
@@ -1622,7 +1642,7 @@ msgstr ""
 msgid "Do you really want to delete this account?"
 msgstr ""
 
-#: ../src\sound.py:153
+#: ../src\sound.py:136
 msgid "Stopped."
 msgstr ""
 
@@ -1668,19 +1688,19 @@ msgid "You've unfollowed %s (@%s)"
 msgstr ""
 
 #: ../src\twitter\compose.py:126
-msgid "You've added to favourites: %s, %s"
+msgid "You've liked: %s, %s"
 msgstr ""
 
 #: ../src\twitter\compose.py:128
-msgid "%s(@%s) has marked as favourite: %s"
+msgid "%s(@%s) has liked: %s"
 msgstr ""
 
 #: ../src\twitter\compose.py:130
-msgid "You've removed from favourites: %s, %s"
+msgid "You've unliked: %s, %s"
 msgstr ""
 
 #: ../src\twitter\compose.py:131
-msgid "%s(@%s) has removed from favourites: %s"
+msgid "%s(@%s) has unliked: %s"
 msgstr ""
 
 #: ../src\twitter\compose.py:133
@@ -1946,7 +1966,7 @@ msgid "Warning"
 msgstr ""
 
 #: ../src\wxUI\commonMessageDialogs.py:50
-msgid "This is a protected user account, you need to follow this user to view their tweets or favorites."
+msgid "This is a protected user account, you need to follow this user to view their tweets or likes."
 msgstr ""
 
 #: ../src\wxUI\commonMessageDialogs.py:53
@@ -2336,7 +2356,7 @@ msgid "Retweets: "
 msgstr ""
 
 #: ../src\wxUI\dialogs\message.py:268
-msgid "Favourites: "
+msgid "Likes: "
 msgstr ""
 
 #: ../src\wxUI\dialogs\message.py:318
@@ -2464,11 +2484,11 @@ msgid "Re&ply"
 msgstr ""
 
 #: ../src\wxUI\menus.py:11 ../src\wxUI\view.py:30
-msgid "Add to &favourites"
+msgid "&Like"
 msgstr ""
 
 #: ../src\wxUI\menus.py:13 ../src\wxUI\view.py:31
-msgid "Remove from favo&urites"
+msgid "&Unlike"
 msgstr ""
 
 #: ../src\wxUI\menus.py:15 ../src\wxUI\menus.py:33 ../src\wxUI\menus.py:49
@@ -2618,7 +2638,7 @@ msgid "R&emove from list"
 msgstr ""
 
 #: ../src\wxUI\view.py:46
-msgid "V&iew favourites"
+msgid "V&iew likes"
 msgstr ""
 
 #: ../src\wxUI\view.py:50