diff --git a/aegisub/po/aegisub.pot b/aegisub/po/aegisub.pot
index 24dbd61434f4911192f8419bb81ef2fbb556bdf9..b663bdb1132767620fe0edfcdc0831379008dc5c 100644
--- a/aegisub/po/aegisub.pot
+++ b/aegisub/po/aegisub.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Aegisub 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 17:02-0700\n"
+"POT-Creation-Date: 2012-09-16 18:52-0700\n"
 "PO-Revision-Date: 2005-2012-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -122,7 +122,7 @@ msgstr ""
 msgid "sel "
 msgstr ""
 
-#: ../src/dialog_shift_times.cpp:103 ../src/command/time.cpp:155
+#: ../src/dialog_shift_times.cpp:103 ../src/command/time.cpp:156
 msgid "Shift Times"
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "Load from history"
 msgstr ""
 
-#: ../src/dialog_shift_times.cpp:383
+#: ../src/dialog_shift_times.cpp:384
 msgid "shifting"
 msgstr ""
 
@@ -1456,24 +1456,24 @@ msgstr ""
 msgid "Redo %s"
 msgstr ""
 
-#: ../src/command/edit.cpp:408
+#: ../src/command/edit.cpp:407
 msgid "Undoes last action"
 msgstr ""
 
-#: ../src/command/edit.cpp:413
+#: ../src/command/edit.cpp:412
 msgid "Nothing to &undo"
 msgstr ""
 
-#: ../src/command/edit.cpp:414
+#: ../src/command/edit.cpp:413
 #, c-format
 msgid "&Undo %s"
 msgstr ""
 
-#: ../src/command/edit.cpp:418
+#: ../src/command/edit.cpp:417
 msgid "Nothing to undo"
 msgstr ""
 
-#: ../src/command/edit.cpp:419
+#: ../src/command/edit.cpp:418
 #, c-format
 msgid "Undo %s"
 msgstr ""
@@ -1855,8 +1855,8 @@ msgstr ""
 
 #: ../src/command/tool.cpp:275 ../src/command/grid.cpp:59
 #: ../src/command/grid.cpp:60 ../src/command/grid.cpp:71
-#: ../src/command/grid.cpp:72 ../src/command/time.cpp:363
-#: ../src/command/time.cpp:364
+#: ../src/command/grid.cpp:72 ../src/command/time.cpp:364
+#: ../src/command/time.cpp:365
 msgid "Next Line"
 msgstr ""
 
@@ -1869,8 +1869,8 @@ msgid "&Previous Line"
 msgstr ""
 
 #: ../src/command/tool.cpp:287 ../src/command/grid.cpp:95
-#: ../src/command/grid.cpp:96 ../src/command/time.cpp:375
-#: ../src/command/time.cpp:376
+#: ../src/command/grid.cpp:96 ../src/command/time.cpp:376
+#: ../src/command/time.cpp:377
 msgid "Previous Line"
 msgstr ""
 
@@ -2317,134 +2317,134 @@ msgstr ""
 msgid "Shift selection so that the active line starts at current frame"
 msgstr ""
 
-#: ../src/command/time.cpp:146
+#: ../src/command/time.cpp:147
 msgid "shift to frame"
 msgstr ""
 
-#: ../src/command/time.cpp:154
+#: ../src/command/time.cpp:155
 msgid "S&hift Times..."
 msgstr ""
 
-#: ../src/command/time.cpp:156
+#: ../src/command/time.cpp:157
 msgid "Shift subtitles by time or frames"
 msgstr ""
 
-#: ../src/command/time.cpp:178 ../src/audio_timing_dialogue.cpp:556
+#: ../src/command/time.cpp:179 ../src/audio_timing_dialogue.cpp:556
 #: ../src/audio_timing_dialogue.cpp:562
 msgid "timing"
 msgstr ""
 
-#: ../src/command/time.cpp:184
+#: ../src/command/time.cpp:185
 msgid "Snap &End to Video"
 msgstr ""
 
-#: ../src/command/time.cpp:185
+#: ../src/command/time.cpp:186
 msgid "Snap End to Video"
 msgstr ""
 
-#: ../src/command/time.cpp:186
+#: ../src/command/time.cpp:187
 msgid "Set end of selected subtitles to current video frame"
 msgstr ""
 
-#: ../src/command/time.cpp:196
+#: ../src/command/time.cpp:197
 msgid "Snap to S&cene"
 msgstr ""
 
-#: ../src/command/time.cpp:197
+#: ../src/command/time.cpp:198
 msgid "Snap to Scene"
 msgstr ""
 
-#: ../src/command/time.cpp:198
+#: ../src/command/time.cpp:199
 msgid ""
 "Set start and end of subtitles to the keyframes around current video frame"
 msgstr ""
 
-#: ../src/command/time.cpp:243
+#: ../src/command/time.cpp:244
 msgid "snap to scene"
 msgstr ""
 
-#: ../src/command/time.cpp:249 ../src/command/time.cpp:250
-#: ../src/command/time.cpp:251
+#: ../src/command/time.cpp:250 ../src/command/time.cpp:251
+#: ../src/command/time.cpp:252
 msgid "Add lead in and out"
 msgstr ""
 
-#: ../src/command/time.cpp:262 ../src/command/time.cpp:263
-#: ../src/command/time.cpp:264
+#: ../src/command/time.cpp:263 ../src/command/time.cpp:264
+#: ../src/command/time.cpp:265
 msgid "Add lead in"
 msgstr ""
 
-#: ../src/command/time.cpp:273 ../src/command/time.cpp:274
-#: ../src/command/time.cpp:275
+#: ../src/command/time.cpp:274 ../src/command/time.cpp:275
+#: ../src/command/time.cpp:276
 msgid "Add lead out"
 msgstr ""
 
-#: ../src/command/time.cpp:284 ../src/command/time.cpp:285
+#: ../src/command/time.cpp:285 ../src/command/time.cpp:286
 msgid "Increase length"
 msgstr ""
 
-#: ../src/command/time.cpp:286
+#: ../src/command/time.cpp:287
 msgid "Increase the length of the current timing unit"
 msgstr ""
 
-#: ../src/command/time.cpp:295 ../src/command/time.cpp:296
+#: ../src/command/time.cpp:296 ../src/command/time.cpp:297
 msgid "Increase length and shift"
 msgstr ""
 
-#: ../src/command/time.cpp:297
+#: ../src/command/time.cpp:298
 msgid ""
 "Increase the length of the current timing unit and shift the following items"
 msgstr ""
 
-#: ../src/command/time.cpp:306 ../src/command/time.cpp:307
+#: ../src/command/time.cpp:307 ../src/command/time.cpp:308
 msgid "Decrease length"
 msgstr ""
 
-#: ../src/command/time.cpp:308
+#: ../src/command/time.cpp:309
 msgid "Decrease the length of the current timing unit"
 msgstr ""
 
-#: ../src/command/time.cpp:317 ../src/command/time.cpp:318
+#: ../src/command/time.cpp:318 ../src/command/time.cpp:319
 msgid "Decrease length and shift"
 msgstr ""
 
-#: ../src/command/time.cpp:319
+#: ../src/command/time.cpp:320
 msgid ""
 "Decrease the length of the current timing unit and shift the following items"
 msgstr ""
 
-#: ../src/command/time.cpp:328 ../src/command/time.cpp:329
+#: ../src/command/time.cpp:329 ../src/command/time.cpp:330
 msgid "Shift start time forward"
 msgstr ""
 
-#: ../src/command/time.cpp:330
+#: ../src/command/time.cpp:331
 msgid "Shift the start time of the current timing unit forward"
 msgstr ""
 
-#: ../src/command/time.cpp:339 ../src/command/time.cpp:340
+#: ../src/command/time.cpp:340 ../src/command/time.cpp:341
 msgid "Shift start time backward"
 msgstr ""
 
-#: ../src/command/time.cpp:341
+#: ../src/command/time.cpp:342
 msgid "Shift the start time of the current timing unit backward"
 msgstr ""
 
-#: ../src/command/time.cpp:351
+#: ../src/command/time.cpp:352
 msgid "Snap &Start to Video"
 msgstr ""
 
-#: ../src/command/time.cpp:352
+#: ../src/command/time.cpp:353
 msgid "Snap Start to Video"
 msgstr ""
 
-#: ../src/command/time.cpp:353
+#: ../src/command/time.cpp:354
 msgid "Set start of selected subtitles to current video frame"
 msgstr ""
 
-#: ../src/command/time.cpp:365
+#: ../src/command/time.cpp:366
 msgid "Next line or syllable"
 msgstr ""
 
-#: ../src/command/time.cpp:377
+#: ../src/command/time.cpp:378
 msgid "Previous line or syllable"
 msgstr ""
 
@@ -2839,6 +2839,10 @@ msgstr ""
 msgid "Opens a keyframe list file"
 msgstr ""
 
+#: ../src/command/keyframe.cpp:87
+msgid "Open keyframes file"
+msgstr ""
+
 #: ../src/command/keyframe.cpp:104
 msgid "Save Keyframes..."
 msgstr ""
@@ -2851,6 +2855,10 @@ msgstr ""
 msgid "Saves the current keyframe list"
 msgstr ""
 
+#: ../src/command/keyframe.cpp:115
+msgid "Save keyframes file"
+msgstr ""
+
 #: ../src/dialog_selected_choices.cpp:48 ../src/dialog_export.cpp:84
 msgid "Select &None"
 msgstr ""
@@ -3150,43 +3158,43 @@ msgid ""
 "folder is entered, a default name will be used."
 msgstr ""
 
-#: ../src/frame_main.cpp:215
+#: ../src/frame_main.cpp:299
 msgid ""
 "Do you want Aegisub to check for updates whenever it starts? You can still "
 "do it manually via the Help menu."
 msgstr ""
 
-#: ../src/frame_main.cpp:215
+#: ../src/frame_main.cpp:299
 msgid "Check for updates?"
 msgstr ""
 
-#: ../src/frame_main.cpp:373
+#: ../src/frame_main.cpp:459
 #, c-format
 msgid "Do you want to save changes to %s?"
 msgstr ""
 
-#: ../src/frame_main.cpp:373
+#: ../src/frame_main.cpp:459
 msgid "Unsaved changes"
 msgstr ""
 
-#: ../src/frame_main.cpp:628
+#: ../src/frame_main.cpp:654
 #, c-format
 msgid "File backup saved as \"%s\"."
 msgstr ""
 
-#: ../src/frame_main.cpp:680
+#: ../src/frame_main.cpp:706
 msgid "Do you want to load/unload the associated files?"
 msgstr ""
 
-#: ../src/frame_main.cpp:680
+#: ../src/frame_main.cpp:706
 msgid "(Un)Load files?"
 msgstr ""
 
-#: ../src/frame_main.cpp:741
+#: ../src/frame_main.cpp:771
 msgid "Untitled"
 msgstr ""
 
-#: ../src/frame_main.cpp:743
+#: ../src/frame_main.cpp:773
 msgid "untitled"
 msgstr ""
 
@@ -4020,7 +4028,7 @@ msgid "&Accept Line"
 msgstr ""
 
 #: ../src/dialog_kara_timing_copy.cpp:672 ../src/dialog_automation.cpp:81
-#: ../src/dialog_attachments.cpp:88 ../src/dialog_version_check.cpp:503
+#: ../src/dialog_attachments.cpp:88 ../src/dialog_version_check.cpp:522
 msgid "&Close"
 msgstr ""
 
@@ -4072,7 +4080,7 @@ msgstr ""
 msgid "T&ext"
 msgstr ""
 
-#: ../src/main.cpp:325
+#: ../src/main.cpp:323
 #, c-format
 msgid ""
 "Oops, Aegisub has crashed!\n"
@@ -4084,7 +4092,7 @@ msgid ""
 "Aegisub will now close."
 msgstr ""
 
-#: ../src/main.cpp:350 ../src/main.cpp:359
+#: ../src/main.cpp:348 ../src/main.cpp:357
 msgid "Program error"
 msgstr ""
 
@@ -5320,7 +5328,7 @@ msgstr ""
 msgid "Update script?"
 msgstr ""
 
-#: ../src/audio_provider.cpp:158
+#: ../src/audio_provider.cpp:204
 msgid "Load audio"
 msgstr ""
 
@@ -5571,11 +5579,11 @@ msgstr ""
 msgid "x"
 msgstr ""
 
-#: ../src/dialog_resample.cpp:256
+#: ../src/dialog_resample.cpp:259
 msgid "resolution resampling"
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:189
+#: ../src/dialog_version_check.cpp:193
 #, c-format
 msgid ""
 "There was an error checking for updates to Aegisub:\n"
@@ -5585,44 +5593,44 @@ msgid ""
 "temporary server problem on our end."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:193
+#: ../src/dialog_version_check.cpp:197
 msgid "An unknown error occurred while checking for updates to Aegisub."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:361 ../src/dialog_version_check.cpp:384
+#: ../src/dialog_version_check.cpp:380 ../src/dialog_version_check.cpp:403
 msgid "Could not connect to updates server."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:363 ../src/dialog_version_check.cpp:388
+#: ../src/dialog_version_check.cpp:382 ../src/dialog_version_check.cpp:407
 msgid "Could not download from updates server."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:391
+#: ../src/dialog_version_check.cpp:410
 #, c-format
 msgid "HTTP request failed, got HTTP response %d."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:469
+#: ../src/dialog_version_check.cpp:488
 msgid "Version Checker"
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:496
+#: ../src/dialog_version_check.cpp:515
 msgid "&Auto Check for Updates"
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:501
+#: ../src/dialog_version_check.cpp:520
 msgid "Remind me again in a &week"
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:551
+#: ../src/dialog_version_check.cpp:570
 msgid "An update to Aegisub was found."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:555
+#: ../src/dialog_version_check.cpp:574
 msgid "Several possible updates to Aegisub were found."
 msgstr ""
 
-#: ../src/dialog_version_check.cpp:559
+#: ../src/dialog_version_check.cpp:578
 msgid "There are no updates to Aegisub."
 msgstr ""
 
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index 6ae3ad0bb4b0ca9efe8da012795adc8af6b284fd..e8864e1f6514290bc97e38c902f0d90d7d0602c3 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -84,7 +84,7 @@ struct keyframe_open : public Command {
 	void operator()(agi::Context *c) {
 		wxString path = lagi_wxString(OPT_GET("Path/Last/Keyframes")->GetString());
 		wxString filename = wxFileSelector(
-			"Select the keyframes file to open",
+			_("Open keyframes file"),
 			path,
 			""
 			,".txt",
@@ -112,7 +112,7 @@ struct keyframe_save : public Command {
 
 	void operator()(agi::Context *c) {
 		wxString path = lagi_wxString(OPT_GET("Path/Last/Keyframes")->GetString());
-		wxString filename = wxFileSelector("Select the Keyframes file to open",path,"","*.key.txt","Text files (*.txt)|*.txt",wxFD_OVERWRITE_PROMPT | wxFD_SAVE);
+		wxString filename = wxFileSelector(_("Save keyframes file"),path,"","*.key.txt","Text files (*.txt)|*.txt",wxFD_OVERWRITE_PROMPT | wxFD_SAVE);
 		if (filename.empty()) return;
 		OPT_SET("Path/Last/Keyframes")->SetString(STD_STR(wxFileName(filename).GetPath()));
 		c->videoController->SaveKeyframes(filename);