[gnome-subtitles] Updated Serbian translation

[MiloÅ PopoviÄ <mpopovic src gnome org>]

commit 2699d1c24add24515bb2cb372002d4aa713cfed0
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Wed Aug 31 15:00:42 2011 +0200

    Updated Serbian translation

 po/sr.po       |  452 ++++++++++++++++++++++++++++++++++----------------------
 po/sr latin po |  452 ++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 550 insertions(+), 354 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 51040ce..3d923e0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,21 +2,24 @@
 # Copyright &copy; 2011, ÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ.
 # This file is distributed under the same license as the Gnome Subtitles package.
 # ÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ <theranchcowboy googlemail com>, 2011.
-#
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-subtitles master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "subtitles&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-08 23:31+0000\n"
-"PO-Revision-Date: 2011-03-26 00:30+0200\n"
-"Last-Translator: ÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ <theranchcowboy googlemail com>\n"
-"Language-Team: SÐrbian <gnom prevod org>\n"
+"POT-Creation-Date: 2011-07-29 18:47+0000\n"
+"PO-Revision-Date: 2011-07-21 10:39+0200\n"
+"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
+"Language-Team: gnom prevod org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../src/Glade/AboutDialog.glade.h:1
 msgid "About Gnome Subtitles"
@@ -153,7 +156,7 @@ msgstr "ÐÐ ÐÐÐÐÑ:"
 
 #: ../src/Glade/HeadersDialog.glade.h:9
 msgid "Collisions:"
-msgstr "ÐÑÐÐÑÐ:"
+msgstr "ÐÑÐÐÐÐ:"
 
 #: ../src/Glade/HeadersDialog.glade.h:10
 msgid "Comment:"
@@ -281,7 +284,7 @@ msgstr "<b>ÐÑÐÐÐ</b>"
 
 #: ../src/Glade/MainWindow.glade.h:3
 msgid "At _Video Position"
-msgstr ""
+msgstr "ÐÐ ÐÐÐÐÐÐÑÑ _ÐÐÐÐÐ"
 
 #: ../src/Glade/MainWindow.glade.h:4
 msgid "Auto Select Subtitle"
@@ -293,22 +296,22 @@ msgstr "ÐÑÐÑÐÑÐ"
 
 #. This is the duration of a subtitle.
 #: ../src/Glade/MainWindow.glade.h:7
-msgid "During:"
-msgstr "Ð ÑÐÐÑ"
+msgid "Duration:"
+msgstr "ÐÑÐÑÐÑÐ:"
+
+#. This is the end time/frame of a subtitle.
+#: ../src/Glade/MainWindow.glade.h:9
+msgid "End:"
+msgstr "Kraj:"
 
-#: ../src/Glade/MainWindow.glade.h:8
+#: ../src/Glade/MainWindow.glade.h:10
 msgid "Find Ne_xt"
 msgstr "ÐÑÐÐÐÑÐ _ÑÐÐÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:9
+#: ../src/Glade/MainWindow.glade.h:11
 msgid "Find Pre_vious"
 msgstr "ÐÑÐÐÐÑÐ _ÐÑÐÑÑÐÐÐÐ"
 
-#. This is the start time/frame of a subtitle.
-#: ../src/Glade/MainWindow.glade.h:11
-msgid "From:"
-msgstr "ÐÐ:"
-
 #: ../src/Glade/MainWindow.glade.h:12
 msgid "Insert"
 msgstr "ÐÐÐÑÐ"
@@ -358,198 +361,210 @@ msgid "Set Subtitle St_art"
 msgstr "ÐÐÑÑÐÐÐ _ÐÐÑÐÑÐÐ ÑÐÑÐÐ"
 
 #: ../src/Glade/MainWindow.glade.h:25
-#, fuzzy
-#| msgid "Set Text Language"
 msgid "Set T_ext Language"
-msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐÐ ÑÐÐÑÑÐ"
+msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐÐ _ÑÐÐÑÑÐ"
 
 #: ../src/Glade/MainWindow.glade.h:26
-#, fuzzy
-#| msgid "Set Translation Language"
 msgid "Set Translati_on Language"
-msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐÐ _ÐÑÐÐÐÐÐ"
 
 #: ../src/Glade/MainWindow.glade.h:27
 msgid "Sh_ift"
 msgstr "Ð_ÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:28
-msgid "T_imings"
-msgstr "ÐÑÐÐÐÐÑÐÐ _ÑÑÐÐÐÑÐÐÐÑÑ"
+#. This is the start time/frame of a subtitle.
+#: ../src/Glade/MainWindow.glade.h:29
+msgid "Start:"
+msgstr "ÐÐÑÐÑÐÐ:"
 
-#. This is the end time/frame of a subtitle.
 #: ../src/Glade/MainWindow.glade.h:30
-msgid "To:"
-msgstr "Ð:"
+msgid "T_imings"
+msgstr "ÐÑÐÐÐÐÑÐÐ _ÑÑÐÐÐÑÐÐÐÑÑ"
 
 #: ../src/Glade/MainWindow.glade.h:31
-#, fuzzy
-#| msgid "Save Translation As"
+msgid ""
+"Tip: use Ctrl+Plus/Minus and Alt+Plus/Minus (on the numpad) to adjust start "
+"and end timings.\n"
+"Shift+Plus/Minus (on the numpad) shifts timings."
+msgstr ""
+"ÐÐÐÐÑ: ÐÐÑÐÑÑÐÑÐ ÐÑÑÐ Ð +/- ÐÐÐ ÐÐÑ Ð +/- (ÐÐ ÐÑÐÐÑÐÑÐÐÐ ÐÐÐÑÐÑ) ÐÐ ÐÐÐÐÑÐÑÐ "
+"ÐÐÑÐÑÐÐ Ð ÐÑÐÑ ÐÑÐÐÐÐÑÐÐÐ ÑÑÐÐÐÑÐÐÐÑÐ.\n"
+"ÐÐÑÑ Ð +/- (ÐÐ ÐÑÐÐÑÐÑÐÐÐ ÐÐÐÑÐÑ) ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÑÐÐ ÑÑÐÐÐÑÐÐÐÑÐ."
+
+#: ../src/Glade/MainWindow.glade.h:33
 msgid "Translate Translatio_n â Text"
-msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ ÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÐÐÐ â ÐÐÐÑÑ"
 
-#: ../src/Glade/MainWindow.glade.h:32
+#: ../src/Glade/MainWindow.glade.h:34
 msgid "Translate _Text â Translation"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÑÑ â ÐÑÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:33
+#: ../src/Glade/MainWindow.glade.h:35
 msgid "Translatio_n"
 msgstr "Ð_ÑÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:34
+#: ../src/Glade/MainWindow.glade.h:36
 msgid "Vide_o"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:35
+#: ../src/Glade/MainWindow.glade.h:37
 msgid "Video _Subtitles"
 msgstr "_ÐÐÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:36
+#: ../src/Glade/MainWindow.glade.h:38
 msgid "_Adjust"
 msgstr "_ÐÐÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:37
+#: ../src/Glade/MainWindow.glade.h:39
 msgid "_After"
 msgstr "ÐÐ_ÑÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:38
+#: ../src/Glade/MainWindow.glade.h:40
 msgid "_Autocheck Spelling"
-msgstr "ÐÑÐ_ÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐ_ÐÐÑÐ ÐÑÐÐÐÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:39
+#: ../src/Glade/MainWindow.glade.h:41
 msgid "_Before"
 msgstr "Ð_ÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:40
+#: ../src/Glade/MainWindow.glade.h:42
 msgid "_Bold"
 msgstr "ÐÐ_ÐÐÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:41
+#: ../src/Glade/MainWindow.glade.h:43
 msgid "_Close"
 msgstr "_ÐÐÑÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:42
+#: ../src/Glade/MainWindow.glade.h:44
 msgid "_Contents"
 msgstr "_ÐÐÐÑÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:43
+#: ../src/Glade/MainWindow.glade.h:45
 msgid "_Delete Subtitles"
 msgstr "_ÐÐÑÐÑÐ ÑÐÑÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:44
+#: ../src/Glade/MainWindow.glade.h:46
 msgid "_Edit"
 msgstr "_ÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:45
+#: ../src/Glade/MainWindow.glade.h:47
 msgid "_File"
 msgstr "_ÐÐÑÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:46
+#: ../src/Glade/MainWindow.glade.h:48
 msgid "_Format"
 msgstr "_ÐÐÑÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:47
+#: ../src/Glade/MainWindow.glade.h:49
 msgid "_Forward"
 msgstr "_ÐÑÐÐÐÑÐÑ ÑÐÐÐÑÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:48
+#: ../src/Glade/MainWindow.glade.h:50
 msgid "_Frames"
 msgstr "_ÐÐÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:49
+#: ../src/Glade/MainWindow.glade.h:51
 msgid "_Headers"
 msgstr "_ÐÐÐÐÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:50
+#: ../src/Glade/MainWindow.glade.h:52
 msgid "_Help"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:51
+#: ../src/Glade/MainWindow.glade.h:53
 msgid "_Input Frame Rate"
 msgstr "ÐÐÐÑÐ _ÐÑÐÑ ÐÐÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:52
+#: ../src/Glade/MainWindow.glade.h:54
 msgid "_Insert Subtitle"
 msgstr "ÐÐÐÑÐ _ÑÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:53
+#: ../src/Glade/MainWindow.glade.h:55
 msgid "_Italic"
 msgstr "_ÐÑÐÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:54
+#: ../src/Glade/MainWindow.glade.h:56
 msgid "_Keyboard Shortcuts"
 msgstr "ÐÑÐÑÐÑÐ ÐÐ _ÑÐÑÑÐÑÑÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:55
+#: ../src/Glade/MainWindow.glade.h:57
 msgid "_Line Lengths"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐ _ÐÐÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:56
+#: ../src/Glade/MainWindow.glade.h:58
 msgid "_Loop Selection"
 msgstr "_ÐÑÑÐ ÐÐÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:57
+#: ../src/Glade/MainWindow.glade.h:59
+msgid "_Merge"
+msgstr "_ÐÑÐÐÐÑÐ"
+
+#: ../src/Glade/MainWindow.glade.h:60
 msgid "_New"
 msgstr "_ÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:58
+#: ../src/Glade/MainWindow.glade.h:61
 msgid "_Open"
 msgstr "_ÐÑÐÐÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:59
+#: ../src/Glade/MainWindow.glade.h:62
 msgid "_Play / Pause"
-msgstr "_ÐÐÐÑÐÐÑÐÑÑ/ÐÐÑÐÐÑÐÑ"
+msgstr "_ÐÑÑÑÐ / ÐÐÑÐÐÑÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:60 ../src/Glade/SearchDialog.glade.h:7
+#: ../src/Glade/MainWindow.glade.h:63 ../src/Glade/SearchDialog.glade.h:7
 msgid "_Replace"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:61
+#: ../src/Glade/MainWindow.glade.h:64
 msgid "_Save"
 msgstr "_ÐÐÑÑÐÐÑ"
 
-#: ../src/Glade/MainWindow.glade.h:62
+#: ../src/Glade/MainWindow.glade.h:65
 msgid "_Search"
 msgstr "_ÐÑÐÑÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:63
+#: ../src/Glade/MainWindow.glade.h:66
 msgid "_Seek to..."
-msgstr "_ÐÑÐÐÐÑÐÑ ÐÐâ"
+msgstr "_ÐÑÐÐÐÑÐÑ ÐÐ..."
 
-#: ../src/Glade/MainWindow.glade.h:64
+#: ../src/Glade/MainWindow.glade.h:67
+msgid "_Split"
+msgstr "_ÐÐÐÐÐÐ"
+
+#: ../src/Glade/MainWindow.glade.h:68
 #: ../src/Glade/TimingsSynchronizeDialog.glade.h:6
 msgid "_Synchronize"
 msgstr "_ÐÑÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:65
+#: ../src/Glade/MainWindow.glade.h:69
 msgid "_Text"
 msgstr "_ÐÐÐÑÑ"
 
-#: ../src/Glade/MainWindow.glade.h:66
+#: ../src/Glade/MainWindow.glade.h:70
 msgid "_Times"
 msgstr "_ÐÑÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:67
+#: ../src/Glade/MainWindow.glade.h:71
 msgid "_Tools"
 msgstr "_ÐÐÐÑÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:68
+#: ../src/Glade/MainWindow.glade.h:72
 msgid "_Translation"
 msgstr "_ÐÑÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:69
+#: ../src/Glade/MainWindow.glade.h:73
 msgid "_Underline"
 msgstr "ÐÐ_ÐÐÑÑÐ"
 
-#: ../src/Glade/MainWindow.glade.h:70
+#: ../src/Glade/MainWindow.glade.h:74
 msgid "_Video"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:71
+#: ../src/Glade/MainWindow.glade.h:75
 msgid "_Video Frame Rate"
 msgstr "ÐÑÐÑ _ÐÐÐÑÐÐÐ"
 
-#: ../src/Glade/MainWindow.glade.h:72
+#: ../src/Glade/MainWindow.glade.h:76
 msgid "_View"
 msgstr "_ÐÑÐÐÐÐ"
 
@@ -558,11 +573,11 @@ msgid "<b>Backup</b>"
 msgstr "<b>ÐÐÐÐÑÐÐ</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:2
-msgid "<b>File Open</b>"
+msgid "<b>File Open Dialog</b>"
 msgstr "<b>ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:3
-msgid "<b>File Save As</b>"
+msgid "<b>File Save As Dialog</b>"
 msgstr "<b>ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:4
@@ -570,61 +585,99 @@ msgid "<b>Reaction Delay</b>"
 msgstr "<b>ÐÐÑÑÐÑÐ ÑÐÐÐÑÐÑÐ</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:5
-msgid "<b>Translation</b>"
-msgstr "<b>ÐÑÐÐÐÐ</b>"
+msgid "<b>Subtitle Splitting</b>"
+msgstr "<b>ÐÐÐÐÐÐ ÑÐÑÐÐ</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:6
+msgid "<b>Translation File Saving</b>"
+msgstr "<b>ÐÑÐÐÑÐ ÐÑÐÐÐÐÐ</b>"
+
+#: ../src/Glade/PreferencesDialog.glade.h:7
+msgid "<b>Video Seeking</b>"
+msgstr "<b>ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ</b>"
+
+#: ../src/Glade/PreferencesDialog.glade.h:8
 msgid "Automatically choose the _video file to open"
 msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐ _ÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐ ÐÑÐÐÑÐÑÐ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:7
+#: ../src/Glade/PreferencesDialog.glade.h:9
+msgid ""
+"Automatically seek the video to the first subtitle when changing timings"
+msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÑÐÐÐÑÐÑ ÐÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:10
 msgid "Ch_aracter coding to use:"
 msgstr "_ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:8
+#: ../src/Glade/PreferencesDialog.glade.h:11
 msgid "Character c_oding to use:"
 msgstr "ÐÐÐÐÐ _ÑÐÑÐÐÑÐÐ:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:9
+#: ../src/Glade/PreferencesDialog.glade.h:12
 msgid "Create a _backup copy of files every"
 msgstr "ÐÐÐÑÐÐÐ _ÑÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÐÑ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:10
+#: ../src/Glade/PreferencesDialog.glade.h:13
+msgid "Editing"
+msgstr "ÐÑÐÑÑÑÐÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:14
+msgid "Files"
+msgstr "ÐÐÑÐÑÐÐÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:15
 msgid "If auto detection _fails, use:"
-msgstr "ÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ, ÐÐÑÐÑÑÐ:"
+msgstr "ÐÐÐ ÐÑÐÐÑÐÐ ÑÐÐ _ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ, ÐÐÑÐÑÑÐ:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:11
+#: ../src/Glade/PreferencesDialog.glade.h:16
+msgid "Leave"
+msgstr "ÐÐÐÑÑÑÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:17
 msgid "Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:12
+#: ../src/Glade/PreferencesDialog.glade.h:18
+msgid "Seek"
+msgstr "ÐÑÐÐÐÑÐÑ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:19
 msgid "Subtract"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:13
+#: ../src/Glade/PreferencesDialog.glade.h:20
 msgid "When saving subtitles, also save their _translation"
 msgstr "ÐÑÐ ÑÑÐÐÑÑ ÑÐÑÐÐ ÑÐÑÑÐÐÑ Ð _ÐÑÐÐÐÐ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:14
+#: ../src/Glade/PreferencesDialog.glade.h:21
 msgid "_Newline type to use:"
 msgstr "_ÐÑÑÑÐ ÐÐÐÐÐ ÑÐÐÐ:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:15
+#: ../src/Glade/PreferencesDialog.glade.h:22
 msgid "_Reset to defaults"
-msgstr "ÐÑÐÑÐ ÐÐ _ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐ ÐÐ _ÐÑÐÐÐÐÐ"
 
-#: ../src/Glade/PreferencesDialog.glade.h:16
+#: ../src/Glade/PreferencesDialog.glade.h:23
 msgid "_Subtitle format to use:"
 msgstr "_ÐÐÑÐÐÑ ÑÐÑÐÐ:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:17
-msgid "milliseconds when setting subtitle start/end on playback"
-msgstr "ÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐ ÐÐÑÑÐÐÑÐÑÑ ÐÐÑÐÑÐÐ/ÐÑÐÑÐ ÑÐÑÐÐ"
-
-#: ../src/Glade/PreferencesDialog.glade.h:18
+#: ../src/Glade/PreferencesDialog.glade.h:24
 msgid "minutes"
 msgstr "ÐÐÐÑÑÐ"
 
+#: ../src/Glade/PreferencesDialog.glade.h:25
+msgid "ms before the actual start to help review new timings"
+msgstr ""
+"ÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐ ÑÑÐÐÑÐÐÐ ÐÐÑÐÑÐÐ ÐÐ ÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:26
+msgid "ms between subtitles when splitting"
+msgstr "ÐÐÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÑ ÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../src/Glade/PreferencesDialog.glade.h:27
+msgid "ms when setting subtitle start/end on playback"
+msgstr "ÐÐÐÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐ/ÐÑÐÑÐ ÑÐÑÐÐ ÐÑÐ ÐÑÑÑÐÑÑ"
+
 #: ../src/Glade/SearchDialog.glade.h:1
 #: ../src/GnomeSubtitles/Dialog/SearchDialog.cs:107
 msgid "Replace"
@@ -648,7 +701,7 @@ msgstr "ÐÑÐÐÐ ÐÐÑÐÑÑÐÑÐ _ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ"
 
 #: ../src/Glade/SearchDialog.glade.h:6
 msgid "_Match case"
-msgstr "_ÐÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑ Ð ÐÐÐÐÐÐÑ ÑÐÐÐÐ"
+msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
 #: ../src/Glade/SearchDialog.glade.h:8
 msgid "_Search for:"
@@ -707,29 +760,37 @@ msgstr "ÐÐÑÐÑÐÐ ÐÐÐÐÑ:"
 msgid "<b>Frames</b>"
 msgstr "<b>ÐÐÐÑÐÐÐ</b>"
 
+#: ../src/Glade/TimingsShiftDialog.glade.h:3
+msgid ""
+"<small><i>Tip: use Shift+Plus/Minus (on the numpad)\n"
+"to shift timings from the main window.</i></small>"
+msgstr ""
+"<small><i>ÐÐÐÐÑ: ÐÐÑÐÑÑÐÑÐ ÐÐÑÑ Ð +/- (ÐÐ ÐÑÐÐÑÐÑÐÐÐ ÐÐÐÑÐÑ)\n"
+"ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ.</i></small>"
+
 #. This means to apply the shift command from the selected subtitle to the first subtitle.
-#: ../src/Glade/TimingsShiftDialog.glade.h:4
+#: ../src/Glade/TimingsShiftDialog.glade.h:6
 msgid "From _first subtitle to selection"
 msgstr "ÐÐ _ÐÑÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ"
 
 #. This means to apply the shift command from the selected subtitle to the last subtitle.
-#: ../src/Glade/TimingsShiftDialog.glade.h:6
+#: ../src/Glade/TimingsShiftDialog.glade.h:8
 msgid "From selection to _last subtitle"
 msgstr "ÐÐ _ÐÐÐÐÑÐÐÐÐ ÑÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:7
+#: ../src/Glade/TimingsShiftDialog.glade.h:9
 msgid "Shift Timings"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:8
+#: ../src/Glade/TimingsShiftDialog.glade.h:10
 msgid "_All subtitles"
 msgstr "_ÐÐÐ ÑÐÑÐÐÐÐ"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:9
+#: ../src/Glade/TimingsShiftDialog.glade.h:11
 msgid "_Selected subtitles"
 msgstr "_ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐ"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:10
+#: ../src/Glade/TimingsShiftDialog.glade.h:12
 msgid "_Shift"
 msgstr "_ÐÐÐÐÐÐ"
 
@@ -783,35 +844,35 @@ msgstr "ÐÐÑÐÑÐ ÐÑÐÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:56
 msgid "Toggling Bold"
-msgstr "ÐÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÑÐÐÐÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:67
 msgid "Toggling Italic"
-msgstr "ÐÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:78
 msgid "Toggling Underline"
-msgstr "ÐÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÐÐÐ"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:65
-msgid "Editing From"
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐ"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:74
+msgid "Editing Start"
+msgstr "ÐÐÑÐÑÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:89
-msgid "Editing To"
-msgstr "ÐÑÐÑÐÐÐÑÐ Ñ"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:98
+msgid "Editing End"
+msgstr "ÐÑÐÑ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:111
-msgid "Editing During"
-msgstr "ÐÑÐÑÐÐÐÑÐ Ñ ÑÐÐÑ"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:120
+msgid "Editing Duration"
+msgstr "ÐÑÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/CommandManager.cs:71
-#: ../src/GnomeSubtitles/Ui/Menus.cs:603
+#: ../src/GnomeSubtitles/Ui/Menus.cs:601
 msgid "Undo"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/CommandManager.cs:80
-#: ../src/GnomeSubtitles/Ui/Menus.cs:613
+#: ../src/GnomeSubtitles/Ui/Menus.cs:611
 msgid "Redo"
 msgstr "ÐÐÐÐÐÐ"
 
@@ -833,6 +894,10 @@ msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ"
 msgid "Inserting Subtitle"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÐÐ"
 
+#: ../src/GnomeSubtitles/Core/Command/MergeSubtitlesCommand.cs:30
+msgid "Merging subtitles"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÑÐÐÐÐ"
+
 #: ../src/GnomeSubtitles/Core/Command/ReplaceAllCommand.cs:32
 msgid "Replacing All"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐ"
@@ -841,6 +906,10 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐ"
 msgid "Shifting timings"
 msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐÐÐ"
 
+#: ../src/GnomeSubtitles/Core/Command/SplitSubtitlesCommand.cs:30
+msgid "Splitting subtitles"
+msgstr "ÐÐÐÐÐÐ ÑÐÑÐÐÐÐ"
+
 #: ../src/GnomeSubtitles/Core/Command/SynchronizeTimingsCommand.cs:30
 msgid "Synchronizing timings"
 msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ"
@@ -848,16 +917,12 @@ msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ"
 #. initially, it's the former text replaced by translation
 #. direction of translation
 #: ../src/GnomeSubtitles/Core/Command/TranslatorCommand.cs:36
-#, fuzzy
-#| msgid "Translation"
 msgid "Translating"
 msgstr "ÐÑÐÐÐÐ"
 
 #: ../src/GnomeSubtitles/Core/Command/TranslatorCommand.cs:100
-#, fuzzy
-#| msgid "Could not save the file"
 msgid "Could not translate the chosen subtitle."
-msgstr "ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÑÐ."
 
 #: ../src/GnomeSubtitles/Core/Command/VideoSetSubtitleTimingCommand.cs:26
 msgid "Setting Subtitle Start"
@@ -1034,11 +1099,11 @@ msgstr "ÐÐÑÐÑÐÐÐÑÐÐ"
 msgid "Current Locale"
 msgstr "ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÑ"
 
-#: ../src/GnomeSubtitles/Core/EventHandlers.cs:382
+#: ../src/GnomeSubtitles/Core/EventHandlers.cs:397
 msgid "The Gnome Subtitles Manual could not be found."
 msgstr "ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÐÐ ÑÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
 
-#: ../src/GnomeSubtitles/Core/EventHandlers.cs:382
+#: ../src/GnomeSubtitles/Core/EventHandlers.cs:397
 msgid "Please verify that your installation has been completed successfully."
 msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÑÐ ÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐ ÐÑÐÐÑÐÐ."
 
@@ -1064,7 +1129,7 @@ msgid "None"
 msgstr "ÐÐÑÑÐ"
 
 #: ../src/GnomeSubtitles/Dialog/FileOpenDialog.cs:247
-#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:58
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:74
 msgid "All Files"
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
@@ -1076,17 +1141,26 @@ msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÑÐÐ"
 msgid "Open Translation File"
 msgstr "ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÑ ÐÑÐÐÐÐÐ"
 
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:85
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:117
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:135
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:150
-msgid "Remember Last Used"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÐ"
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:102
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:134
+msgid "Remember the last used encoding"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:134
+msgid "Keep the encoding used on file open"
+msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:152
+msgid "Keep the format used on file open"
+msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÑÐÐÐ ÑÐÑÐÐÑ ÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:117
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:135
-msgid "Keep Existing"
-msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÑÐÑÐ"
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:152
+msgid "Remember the last used format"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÑÐÐÑ"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:167
+msgid "Remember the last used type"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÑÐÑÑÐÐÑ ÐÑÑÑÑ"
 
 #: ../src/GnomeSubtitles/Dialog/SearchDialog.cs:111
 msgid "Find"
@@ -1113,16 +1187,16 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐ _ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑ ÑÐÑÐÐ
 msgid "Save Translation As"
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ ÐÐÐ"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsAdjustDialog.cs:68
+#: ../src/GnomeSubtitles/Dialog/TimingsAdjustDialog.cs:67
 msgid "Start Time:"
 msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÐ:"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:80
+#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:81
 #: ../src/GnomeSubtitles/Ui/VideoPreview/VideoPosition.cs:195
 msgid "Time"
 msgstr "ÐÑÐÐÐ"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:80
+#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:81
 msgid "Frames"
 msgstr "ÐÐÐÑÐÐÐ"
 
@@ -1145,7 +1219,7 @@ msgid ""
 "Add sync points by selecting subtitles and adjusting the video to their "
 "correct position. At least 2 points are needed."
 msgstr ""
-"ÐÐÐÐÑÑÐ ÑÐÑÐÐ ÑÑÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÑÐÑÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐÑ ÑÐÑÐÐÐ "
+"ÐÐÐÐÑÑÐ ÑÐÑÐÐ ÑÑÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐÑÐÐÐÐ Ð ÐÐÑÑÐÐÑÐÑÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐÐ Ñ ÑÐÑÐÐÐ "
 "ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ. ÐÐÑÑÐÐÐÐ ÑÑ ÐÐÐ ÑÐÑÐÐ."
 
 #: ../src/GnomeSubtitles/Dialog/TimingsSynchronizeDialog.cs:108
@@ -1153,7 +1227,7 @@ msgid ""
 "Add 1 more sync point to start synchronizing. Adding more points will "
 "improve accuracy."
 msgstr ""
-"ÐÐÐÐÑÑÐ ÑÐÑ ÑÐÐÐÑ ÑÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐÑÐ. ÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÐÐÐÐÐÑÑÐÑÐ "
+"ÐÐÐÐÑÑÐ ÑÐÑ ÑÐÐÐÑ ÑÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐÑÐ. ÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ "
 "ÐÑÐÑÐÐÐÐÑÑ."
 
 #: ../src/GnomeSubtitles/Dialog/TimingsSynchronizeDialog.cs:111
@@ -1178,12 +1252,13 @@ msgstr "ÐÑÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÐÐ. ÐÐÐÐÐÑÐ ÑÐÑÐÐÐ
 msgid ""
 "An unknown error has occured. Please report a bug and include this error "
 "name:"
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÐÐÐ ÑÐ, ÐÐÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐ:"
+msgstr ""
+"ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ. ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ ÐÐÑÐÐÐÐ Ñ ÑÐÐÐÐ ÐÐÐÐÐÐÐ:"
 
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileOpenErrorDialog.cs:29
 msgid "Could not open the file"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileOpenErrorDialog.cs:30
 msgid "Open another file"
@@ -1196,11 +1271,11 @@ msgstr "ÐÑÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ."
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:32
 msgid "Could not save the file"
-msgstr "ÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:33
 msgid "Save to another file"
-msgstr "ÐÐÑÑÐÐÑ ÐÐ ÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑ Ñ ÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:59
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:41
@@ -1225,13 +1300,13 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ."
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:32
 msgid "If you don't save, all your changes will be permanently lost."
-msgstr "ÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ, ÑÐÐ ÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ, ÑÐÐ ÐÐÐÐÐÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ."
 
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:88
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before creating new subtitles?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÑÐÑÐÑ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:89
 msgid "Create without Saving"
@@ -1240,18 +1315,18 @@ msgstr "ÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐÐÑÐ"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:108
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before creating new subtitles?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÑÐÐÐÐÑ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:115
 #, csharp-format
 msgid ""
 "Save the changes to translation \"{0}\" before creating a new translation?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÑÐÐÐÐÑ â{0}â ÐÑÐ ÑÑÐÐÑÐÑÐ ÐÐÐÐÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:125
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before opening?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÐÑÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÑÐÑÐÑ â{0}â ÐÑÐ ÐÑÐÐÑÐÑÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:126
 msgid "Open without Saving"
@@ -1260,12 +1335,12 @@ msgstr "ÐÑÐÐÑÐ ÐÐÐ ÑÑÐÐÑÐ"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:145
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before opening?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÐÑÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÑÐÐÐÐÑ â{0}â ÐÑÐ ÐÑÐÐÑÐÑÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:154
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before closing?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÐÐÑÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÑÐÑÐÑ â{0}â ÐÑÐ ÐÐÑÐÐÑÐÑÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:155
 msgid "Close without Saving"
@@ -1274,20 +1349,20 @@ msgstr "ÐÐÑÐÐÑÐ ÐÐÐ ÑÑÐÐÑÐ"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:173
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before closing?"
-msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ â{0}â ÐÑÐ ÐÐÑÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ Ñ ÐÑÐÐÐÐÑ â{0}â ÐÑÐ ÐÐÑÐÐÑÐÑÐ?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:37
 msgid ""
 "Unable to detect the subtitle format. Please check that the file type is "
 "supported."
 msgstr ""
-"ÐÐÑÐÐÑ ÑÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐÐÐ."
+"ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÐÐÑ ÑÐÑÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐÐÐ."
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:39
 msgid ""
 "The encoding used is not supported by your system. Please choose another "
 "encoding."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ."
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ. ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÑÑÐÐ."
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:45
 msgid "You do not have the permissions necessary to open the file."
@@ -1297,18 +1372,26 @@ msgstr "ÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐ
 msgid "The file could not be found."
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ."
 
+#: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:51
+msgid "The file appears to be too large for a text-based subtitle file."
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÑÐÐÐÑ ÐÐÑÐÑÐÐÑ ÑÐÑÐÐ."
+
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/VideoErrorDialog.cs:29
 msgid "Could not play the file"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÑÑÐÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:64
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:58
 msgid "All Video Files"
 msgstr "ÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:66
+msgid "All Audio Files"
+msgstr "ÐÐÐ ÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
+
 #: ../src/GnomeSubtitles/Execution/BugReporter.cs:31
 msgid "Could not open Bug Buddy, the bug reporting tool."
-msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐÑÑ, ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐ."
 
 #: ../src/GnomeSubtitles/Execution/BugReporter.cs:32
 msgid "Bug information has been printed to the console."
@@ -1316,7 +1399,7 @@ msgstr "ÐÐÐÐÑÐ Ð ÐÑÐÑÑÐ ÑÑ ÐÐÑÑÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ
 
 #: ../src/GnomeSubtitles/Ui/Component/EncodingComboBox.cs:176
 msgid "Add or Remove..."
-msgstr "ÐÐÐÐÑ ÐÐÐ ÑÐÐÐÐÐâ"
+msgstr "ÐÐÐÐÑ ÐÐÐ ÑÐÐÐÐÐ..."
 
 #: ../src/GnomeSubtitles/Ui/Component/EncodingComboBox.cs:184
 msgid "Auto Detected"
@@ -1334,15 +1417,15 @@ msgstr "ÐÐÐÐÐ"
 #. To translators: OVR and INS correspond to the Overwrite and Insert text editing modes.
 #: ../src/GnomeSubtitles/Ui/Status.cs:43
 msgid "OVR"
-msgstr "OVR"
+msgstr "ÐÐÐ"
 
 #: ../src/GnomeSubtitles/Ui/Status.cs:43
 msgid "INS"
-msgstr "INS"
+msgstr "ÐÐÐ"
 
 #. To translators: Trans corresponds to Translation (used here to denote whether text or translation is being edited).
 #: ../src/GnomeSubtitles/Ui/Status.cs:58
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:251
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:266
 msgid "Text"
 msgstr "ÐÐÐÑÑ"
 
@@ -1353,7 +1436,7 @@ msgstr "ÐÑÐÐÐÐ"
 #. To translators: Ln corresponds to Line
 #: ../src/GnomeSubtitles/Ui/Status.cs:60
 msgid "Ln"
-msgstr "ÐÐÐÐÑÐ"
+msgstr "ÐÐÐ"
 
 #. To translators: Col corresponds to Column
 #: ../src/GnomeSubtitles/Ui/Status.cs:62
@@ -1365,26 +1448,41 @@ msgid "Frame"
 msgstr "ÐÐÐÐÑ"
 
 #. Number column
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:239
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:254
 msgid "No."
 msgstr "ÐÑÐÑ"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:243
-msgid "From"
-msgstr "ÐÐ"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:258
+msgid "Start"
+msgstr "ÐÐÑÐÑÐÐ"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:244
-msgid "To"
-msgstr "Ð"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:259
+msgid "End"
+msgstr "Kraj"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:245
-msgid "During"
-msgstr "Ð ÑÐÐÑ"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:260
+msgid "Duration"
+msgstr "ÐÑÐÑÐÑÐ"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:256
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:271
 msgid "Translation"
 msgstr "ÐÑÐÐÐÐ"
 
+#~ msgid "From:"
+#~ msgstr "ÐÐ:"
+
+#~ msgid "To:"
+#~ msgstr "Ð:"
+
+#~ msgid "Keep Existing"
+#~ msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÑÐÑÐ"
+
+#~ msgid "From"
+#~ msgstr "ÐÐ"
+
+#~ msgid "To"
+#~ msgstr "Ð"
+
 #~ msgid "Set Translatio_n Language"
 #~ msgstr "ÐÐÑÑÐÐÐ _ÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
diff --git a/po/sr latin po b/po/sr latin po
index 2f39814..7a0d5c6 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -2,21 +2,24 @@
 # Copyright &copy; 2011, ÄorÄe VasiljeviÄ.
 # This file is distributed under the same license as the Gnome Subtitles package.
 # ÄorÄe VasiljeviÄ <theranchcowboy googlemail com>, 2011.
-#
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-subtitles master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "subtitles&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-05-08 23:31+0000\n"
-"PO-Revision-Date: 2011-03-26 00:30+0200\n"
-"Last-Translator: ÄorÄe VasiljeviÄ <theranchcowboy googlemail com>\n"
-"Language-Team: Serbian <gnom prevod org>\n"
+"POT-Creation-Date: 2011-07-29 18:47+0000\n"
+"PO-Revision-Date: 2011-07-21 10:39+0200\n"
+"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
+"Language-Team: gnom prevod org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../src/Glade/AboutDialog.glade.h:1
 msgid "About Gnome Subtitles"
@@ -153,7 +156,7 @@ msgstr "CD zapis:"
 
 #: ../src/Glade/HeadersDialog.glade.h:9
 msgid "Collisions:"
-msgstr "Sudari:"
+msgstr "Sukobi:"
 
 #: ../src/Glade/HeadersDialog.glade.h:10
 msgid "Comment:"
@@ -281,7 +284,7 @@ msgstr "<b>Vreme</b>"
 
 #: ../src/Glade/MainWindow.glade.h:3
 msgid "At _Video Position"
-msgstr ""
+msgstr "Na poloÅaju _videa"
 
 #: ../src/Glade/MainWindow.glade.h:4
 msgid "Auto Select Subtitle"
@@ -293,22 +296,22 @@ msgstr "Brisanje"
 
 #. This is the duration of a subtitle.
 #: ../src/Glade/MainWindow.glade.h:7
-msgid "During:"
-msgstr "U toku"
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#. This is the end time/frame of a subtitle.
+#: ../src/Glade/MainWindow.glade.h:9
+msgid "End:"
+msgstr "Kraj:"
 
-#: ../src/Glade/MainWindow.glade.h:8
+#: ../src/Glade/MainWindow.glade.h:10
 msgid "Find Ne_xt"
 msgstr "PronaÄi _sledeÄe"
 
-#: ../src/Glade/MainWindow.glade.h:9
+#: ../src/Glade/MainWindow.glade.h:11
 msgid "Find Pre_vious"
 msgstr "PronaÄi _prethodno"
 
-#. This is the start time/frame of a subtitle.
-#: ../src/Glade/MainWindow.glade.h:11
-msgid "From:"
-msgstr "Iz:"
-
 #: ../src/Glade/MainWindow.glade.h:12
 msgid "Insert"
 msgstr "Ubaci"
@@ -358,198 +361,210 @@ msgid "Set Subtitle St_art"
 msgstr "Postavi _poÄetak titla"
 
 #: ../src/Glade/MainWindow.glade.h:25
-#, fuzzy
-#| msgid "Set Text Language"
 msgid "Set T_ext Language"
-msgstr "Postavi jezik teksta"
+msgstr "Postavi jezik _teksta"
 
 #: ../src/Glade/MainWindow.glade.h:26
-#, fuzzy
-#| msgid "Set Translation Language"
 msgid "Set Translati_on Language"
-msgstr "Postavi jezik prevoda"
+msgstr "Postavi jezik _prevoda"
 
 #: ../src/Glade/MainWindow.glade.h:27
 msgid "Sh_ift"
 msgstr "P_odeli"
 
-#: ../src/Glade/MainWindow.glade.h:28
-msgid "T_imings"
-msgstr "Vremenska _usklaÄenost"
+#. This is the start time/frame of a subtitle.
+#: ../src/Glade/MainWindow.glade.h:29
+msgid "Start:"
+msgstr "PoÄetak:"
 
-#. This is the end time/frame of a subtitle.
 #: ../src/Glade/MainWindow.glade.h:30
-msgid "To:"
-msgstr "U:"
+msgid "T_imings"
+msgstr "Vremenska _usklaÄenost"
 
 #: ../src/Glade/MainWindow.glade.h:31
-#, fuzzy
-#| msgid "Save Translation As"
+msgid ""
+"Tip: use Ctrl+Plus/Minus and Alt+Plus/Minus (on the numpad) to adjust start "
+"and end timings.\n"
+"Shift+Plus/Minus (on the numpad) shifts timings."
+msgstr ""
+"Savet: koristite Ctrl i +/- ili Alt i +/- (na numeriÄkom odeljku) da podesite "
+"poÄetak i kraj vremenskog usklaÄivanja.\n"
+"Åift i +/- (na numeriÄkom odeljku) prebacuje vremensko usklaÄivanje."
+
+#: ../src/Glade/MainWindow.glade.h:33
 msgid "Translate Translatio_n â Text"
-msgstr "SaÄuvaj prevod kao"
+msgstr "Prevedi _Prevod â Tekst"
 
-#: ../src/Glade/MainWindow.glade.h:32
+#: ../src/Glade/MainWindow.glade.h:34
 msgid "Translate _Text â Translation"
-msgstr ""
+msgstr "Prevedi _Tekst â Prevod"
 
-#: ../src/Glade/MainWindow.glade.h:33
+#: ../src/Glade/MainWindow.glade.h:35
 msgid "Translatio_n"
 msgstr "P_revod"
 
-#: ../src/Glade/MainWindow.glade.h:34
+#: ../src/Glade/MainWindow.glade.h:36
 msgid "Vide_o"
 msgstr "_Video"
 
-#: ../src/Glade/MainWindow.glade.h:35
+#: ../src/Glade/MainWindow.glade.h:37
 msgid "Video _Subtitles"
 msgstr "_Titlovi video snimka"
 
-#: ../src/Glade/MainWindow.glade.h:36
+#: ../src/Glade/MainWindow.glade.h:38
 msgid "_Adjust"
 msgstr "_Podesi"
 
-#: ../src/Glade/MainWindow.glade.h:37
+#: ../src/Glade/MainWindow.glade.h:39
 msgid "_After"
 msgstr "Po_sle"
 
-#: ../src/Glade/MainWindow.glade.h:38
+#: ../src/Glade/MainWindow.glade.h:40
 msgid "_Autocheck Spelling"
-msgstr "Pro_vera pravopisa"
+msgstr "Pro_veri pravopis"
 
-#: ../src/Glade/MainWindow.glade.h:39
+#: ../src/Glade/MainWindow.glade.h:41
 msgid "_Before"
 msgstr "P_re"
 
-#: ../src/Glade/MainWindow.glade.h:40
+#: ../src/Glade/MainWindow.glade.h:42
 msgid "_Bold"
 msgstr "Po_debljano"
 
-#: ../src/Glade/MainWindow.glade.h:41
+#: ../src/Glade/MainWindow.glade.h:43
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/Glade/MainWindow.glade.h:42
+#: ../src/Glade/MainWindow.glade.h:44
 msgid "_Contents"
 msgstr "_SadrÅaj"
 
-#: ../src/Glade/MainWindow.glade.h:43
+#: ../src/Glade/MainWindow.glade.h:45
 msgid "_Delete Subtitles"
 msgstr "_ObriÅi titlove"
 
-#: ../src/Glade/MainWindow.glade.h:44
+#: ../src/Glade/MainWindow.glade.h:46
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/Glade/MainWindow.glade.h:45
+#: ../src/Glade/MainWindow.glade.h:47
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/Glade/MainWindow.glade.h:46
+#: ../src/Glade/MainWindow.glade.h:48
 msgid "_Format"
 msgstr "_Format"
 
-#: ../src/Glade/MainWindow.glade.h:47
+#: ../src/Glade/MainWindow.glade.h:49
 msgid "_Forward"
 msgstr "_Premotaj unapred"
 
-#: ../src/Glade/MainWindow.glade.h:48
+#: ../src/Glade/MainWindow.glade.h:50
 msgid "_Frames"
 msgstr "_Kadrovi"
 
-#: ../src/Glade/MainWindow.glade.h:49
+#: ../src/Glade/MainWindow.glade.h:51
 msgid "_Headers"
 msgstr "_Zaglavlja"
 
-#: ../src/Glade/MainWindow.glade.h:50
+#: ../src/Glade/MainWindow.glade.h:52
 msgid "_Help"
 msgstr "_PomoÄ"
 
-#: ../src/Glade/MainWindow.glade.h:51
+#: ../src/Glade/MainWindow.glade.h:53
 msgid "_Input Frame Rate"
 msgstr "Unesi _broj kadrova"
 
-#: ../src/Glade/MainWindow.glade.h:52
+#: ../src/Glade/MainWindow.glade.h:54
 msgid "_Insert Subtitle"
 msgstr "Unesi _titl"
 
-#: ../src/Glade/MainWindow.glade.h:53
+#: ../src/Glade/MainWindow.glade.h:55
 msgid "_Italic"
 msgstr "_IskoÅeno"
 
-#: ../src/Glade/MainWindow.glade.h:54
+#: ../src/Glade/MainWindow.glade.h:56
 msgid "_Keyboard Shortcuts"
 msgstr "PreÄice na _tastaturi"
 
-#: ../src/Glade/MainWindow.glade.h:55
+#: ../src/Glade/MainWindow.glade.h:57
 msgid "_Line Lengths"
-msgstr "DuÅina linija"
+msgstr "DuÅina _linija"
 
-#: ../src/Glade/MainWindow.glade.h:56
+#: ../src/Glade/MainWindow.glade.h:58
 msgid "_Loop Selection"
 msgstr "_Vrti izbor"
 
-#: ../src/Glade/MainWindow.glade.h:57
+#: ../src/Glade/MainWindow.glade.h:59
+msgid "_Merge"
+msgstr "_Pripoji"
+
+#: ../src/Glade/MainWindow.glade.h:60
 msgid "_New"
 msgstr "_Novo"
 
-#: ../src/Glade/MainWindow.glade.h:58
+#: ../src/Glade/MainWindow.glade.h:61
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/Glade/MainWindow.glade.h:59
+#: ../src/Glade/MainWindow.glade.h:62
 msgid "_Play / Pause"
-msgstr "_Reprodukuj/pauziraj"
+msgstr "_Pusti / pauziraj"
 
-#: ../src/Glade/MainWindow.glade.h:60 ../src/Glade/SearchDialog.glade.h:7
+#: ../src/Glade/MainWindow.glade.h:63 ../src/Glade/SearchDialog.glade.h:7
 msgid "_Replace"
 msgstr "_Zameni"
 
-#: ../src/Glade/MainWindow.glade.h:61
+#: ../src/Glade/MainWindow.glade.h:64
 msgid "_Save"
 msgstr "_SaÄuvaj"
 
-#: ../src/Glade/MainWindow.glade.h:62
+#: ../src/Glade/MainWindow.glade.h:65
 msgid "_Search"
 msgstr "_PretraÅi"
 
-#: ../src/Glade/MainWindow.glade.h:63
+#: ../src/Glade/MainWindow.glade.h:66
 msgid "_Seek to..."
-msgstr "_Premotaj doâ"
+msgstr "_Premotaj do..."
 
-#: ../src/Glade/MainWindow.glade.h:64
+#: ../src/Glade/MainWindow.glade.h:67
+msgid "_Split"
+msgstr "_Podeli"
+
+#: ../src/Glade/MainWindow.glade.h:68
 #: ../src/Glade/TimingsSynchronizeDialog.glade.h:6
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../src/Glade/MainWindow.glade.h:65
+#: ../src/Glade/MainWindow.glade.h:69
 msgid "_Text"
 msgstr "_Tekst"
 
-#: ../src/Glade/MainWindow.glade.h:66
+#: ../src/Glade/MainWindow.glade.h:70
 msgid "_Times"
 msgstr "_Vremena"
 
-#: ../src/Glade/MainWindow.glade.h:67
+#: ../src/Glade/MainWindow.glade.h:71
 msgid "_Tools"
 msgstr "_Alatke"
 
-#: ../src/Glade/MainWindow.glade.h:68
+#: ../src/Glade/MainWindow.glade.h:72
 msgid "_Translation"
 msgstr "_Prevod"
 
-#: ../src/Glade/MainWindow.glade.h:69
+#: ../src/Glade/MainWindow.glade.h:73
 msgid "_Underline"
 msgstr "Po_dvuci"
 
-#: ../src/Glade/MainWindow.glade.h:70
+#: ../src/Glade/MainWindow.glade.h:74
 msgid "_Video"
 msgstr "_Video"
 
-#: ../src/Glade/MainWindow.glade.h:71
+#: ../src/Glade/MainWindow.glade.h:75
 msgid "_Video Frame Rate"
 msgstr "Broj _kadrova"
 
-#: ../src/Glade/MainWindow.glade.h:72
+#: ../src/Glade/MainWindow.glade.h:76
 msgid "_View"
 msgstr "_Prikaz"
 
@@ -558,11 +573,11 @@ msgid "<b>Backup</b>"
 msgstr "<b>Rezerva</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:2
-msgid "<b>File Open</b>"
+msgid "<b>File Open Dialog</b>"
 msgstr "<b>Otvaranje datoteke</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:3
-msgid "<b>File Save As</b>"
+msgid "<b>File Save As Dialog</b>"
 msgstr "<b>Äuvanje datoteke</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:4
@@ -570,61 +585,99 @@ msgid "<b>Reaction Delay</b>"
 msgstr "<b>KaÅnjenje reakcije</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:5
-msgid "<b>Translation</b>"
-msgstr "<b>Prevod</b>"
+msgid "<b>Subtitle Splitting</b>"
+msgstr "<b>Podela titla</b>"
 
 #: ../src/Glade/PreferencesDialog.glade.h:6
+msgid "<b>Translation File Saving</b>"
+msgstr "<b>Äuvanje prevoda</b>"
+
+#: ../src/Glade/PreferencesDialog.glade.h:7
+msgid "<b>Video Seeking</b>"
+msgstr "<b>Premotavanje videa</b>"
+
+#: ../src/Glade/PreferencesDialog.glade.h:8
 msgid "Automatically choose the _video file to open"
 msgstr "Samostalno izaberi _video datoteku za otvaranje"
 
-#: ../src/Glade/PreferencesDialog.glade.h:7
+#: ../src/Glade/PreferencesDialog.glade.h:9
+msgid ""
+"Automatically seek the video to the first subtitle when changing timings"
+msgstr "Samostalno premotaj video na prvi prevod prilikom promene vremena"
+
+#: ../src/Glade/PreferencesDialog.glade.h:10
 msgid "Ch_aracter coding to use:"
 msgstr "_Kodni raspored:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:8
+#: ../src/Glade/PreferencesDialog.glade.h:11
 msgid "Character c_oding to use:"
 msgstr "Kodni _raspored:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:9
+#: ../src/Glade/PreferencesDialog.glade.h:12
 msgid "Create a _backup copy of files every"
 msgstr "Napravi _rezervni primerak datoteka svakih"
 
-#: ../src/Glade/PreferencesDialog.glade.h:10
+#: ../src/Glade/PreferencesDialog.glade.h:13
+msgid "Editing"
+msgstr "UreÄujem"
+
+#: ../src/Glade/PreferencesDialog.glade.h:14
+msgid "Files"
+msgstr "Datoteke"
+
+#: ../src/Glade/PreferencesDialog.glade.h:15
 msgid "If auto detection _fails, use:"
-msgstr "Ako program ne prepozna kodni raspored, koristi:"
+msgstr "Ako program sam _ne prepozna kodni raspored, koristi:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:11
+#: ../src/Glade/PreferencesDialog.glade.h:16
+msgid "Leave"
+msgstr "Napusti"
+
+#: ../src/Glade/PreferencesDialog.glade.h:17
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../src/Glade/PreferencesDialog.glade.h:12
+#: ../src/Glade/PreferencesDialog.glade.h:18
+msgid "Seek"
+msgstr "Premotaj"
+
+#: ../src/Glade/PreferencesDialog.glade.h:19
 msgid "Subtract"
 msgstr "Oduzmi"
 
-#: ../src/Glade/PreferencesDialog.glade.h:13
+#: ../src/Glade/PreferencesDialog.glade.h:20
 msgid "When saving subtitles, also save their _translation"
 msgstr "Pri Äuvanju titla saÄuvaj i _prevod"
 
-#: ../src/Glade/PreferencesDialog.glade.h:14
+#: ../src/Glade/PreferencesDialog.glade.h:21
 msgid "_Newline type to use:"
 msgstr "_Vrsta novog reda:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:15
+#: ../src/Glade/PreferencesDialog.glade.h:22
 msgid "_Reset to defaults"
-msgstr "Vrati na _podrazumevano"
+msgstr "Vrati na _osnovno"
 
-#: ../src/Glade/PreferencesDialog.glade.h:16
+#: ../src/Glade/PreferencesDialog.glade.h:23
 msgid "_Subtitle format to use:"
 msgstr "_Format titla:"
 
-#: ../src/Glade/PreferencesDialog.glade.h:17
-msgid "milliseconds when setting subtitle start/end on playback"
-msgstr "milisekundi pri postavljanju poÄetka/kraja titla"
-
-#: ../src/Glade/PreferencesDialog.glade.h:18
+#: ../src/Glade/PreferencesDialog.glade.h:24
 msgid "minutes"
 msgstr "minuta"
 
+#: ../src/Glade/PreferencesDialog.glade.h:25
+msgid "ms before the actual start to help review new timings"
+msgstr ""
+"milisekundi pre stvarnog poÄetka da bi bilo moguÄe pregledati novo vreme"
+
+#: ../src/Glade/PreferencesDialog.glade.h:26
+msgid "ms between subtitles when splitting"
+msgstr "milisekundi izmeÄu titlova prilikom podele"
+
+#: ../src/Glade/PreferencesDialog.glade.h:27
+msgid "ms when setting subtitle start/end on playback"
+msgstr "milisekundi prilikom postavljanja poÄetka/kraja titla pri puÅtanju"
+
 #: ../src/Glade/SearchDialog.glade.h:1
 #: ../src/GnomeSubtitles/Dialog/SearchDialog.cs:107
 msgid "Replace"
@@ -648,7 +701,7 @@ msgstr "TraÅi koristeÄi _regularni izraz"
 
 #: ../src/Glade/SearchDialog.glade.h:6
 msgid "_Match case"
-msgstr "_Podudaranje malih i velikih slova"
+msgstr "_Uporedi veliÄinu slova"
 
 #: ../src/Glade/SearchDialog.glade.h:8
 msgid "_Search for:"
@@ -707,29 +760,37 @@ msgstr "PoÄetni kadar:"
 msgid "<b>Frames</b>"
 msgstr "<b>Kadrovi</b>"
 
+#: ../src/Glade/TimingsShiftDialog.glade.h:3
+msgid ""
+"<small><i>Tip: use Shift+Plus/Minus (on the numpad)\n"
+"to shift timings from the main window.</i></small>"
+msgstr ""
+"<small><i>Savet: koristite Åift i +/- (na numeriÄkom odeljku)\n"
+"da promenite vremena u glavnom prozoru.</i></small>"
+
 #. This means to apply the shift command from the selected subtitle to the first subtitle.
-#: ../src/Glade/TimingsShiftDialog.glade.h:4
+#: ../src/Glade/TimingsShiftDialog.glade.h:6
 msgid "From _first subtitle to selection"
 msgstr "Od _prvog titla do izabranog"
 
 #. This means to apply the shift command from the selected subtitle to the last subtitle.
-#: ../src/Glade/TimingsShiftDialog.glade.h:6
+#: ../src/Glade/TimingsShiftDialog.glade.h:8
 msgid "From selection to _last subtitle"
 msgstr "Od _izabranog titla do poslednjeg"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:7
+#: ../src/Glade/TimingsShiftDialog.glade.h:9
 msgid "Shift Timings"
 msgstr "Podeli vremena"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:8
+#: ../src/Glade/TimingsShiftDialog.glade.h:10
 msgid "_All subtitles"
 msgstr "_Svi titlovi"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:9
+#: ../src/Glade/TimingsShiftDialog.glade.h:11
 msgid "_Selected subtitles"
 msgstr "_Izabrani titlovi"
 
-#: ../src/Glade/TimingsShiftDialog.glade.h:10
+#: ../src/Glade/TimingsShiftDialog.glade.h:12
 msgid "_Shift"
 msgstr "_Podeli"
 
@@ -783,35 +844,35 @@ msgstr "Menjanje broja kadrova video snimka"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:56
 msgid "Toggling Bold"
-msgstr "ZadrÅavanje na podebljanom"
+msgstr "Prebacivanje podebljanog"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:67
 msgid "Toggling Italic"
-msgstr "ZadrÅavanje na iskoÅenom"
+msgstr "Prebacivanje iskoÅenog"
 
 #: ../src/GnomeSubtitles/Core/Command/ChangeStyleCommand.cs:78
 msgid "Toggling Underline"
-msgstr "ZadrÅavanje na podvuÄenom"
+msgstr "Prebacivanje podvuÄenog"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:65
-msgid "Editing From"
-msgstr "UreÄivanje iz"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:74
+msgid "Editing Start"
+msgstr "PoÄetak ureÄivanja"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:89
-msgid "Editing To"
-msgstr "UreÄivanje u"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:98
+msgid "Editing End"
+msgstr "Kraj ureÄivanja"
 
-#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:111
-msgid "Editing During"
-msgstr "UreÄivanje u toku"
+#: ../src/GnomeSubtitles/Core/Command/ChangeTimingCommand.cs:120
+msgid "Editing Duration"
+msgstr "Trajanje ureÄivanja"
 
 #: ../src/GnomeSubtitles/Core/Command/CommandManager.cs:71
-#: ../src/GnomeSubtitles/Ui/Menus.cs:603
+#: ../src/GnomeSubtitles/Ui/Menus.cs:601
 msgid "Undo"
 msgstr "Opozovi"
 
 #: ../src/GnomeSubtitles/Core/Command/CommandManager.cs:80
-#: ../src/GnomeSubtitles/Ui/Menus.cs:613
+#: ../src/GnomeSubtitles/Ui/Menus.cs:611
 msgid "Redo"
 msgstr "Ponovi"
 
@@ -833,6 +894,10 @@ msgstr "UreÄivanje prevoda"
 msgid "Inserting Subtitle"
 msgstr "Ubacivanje titla"
 
+#: ../src/GnomeSubtitles/Core/Command/MergeSubtitlesCommand.cs:30
+msgid "Merging subtitles"
+msgstr "Stapanje titlova"
+
 #: ../src/GnomeSubtitles/Core/Command/ReplaceAllCommand.cs:32
 msgid "Replacing All"
 msgstr "Zamenjivanje svega"
@@ -841,6 +906,10 @@ msgstr "Zamenjivanje svega"
 msgid "Shifting timings"
 msgstr "Deljenje vremena"
 
+#: ../src/GnomeSubtitles/Core/Command/SplitSubtitlesCommand.cs:30
+msgid "Splitting subtitles"
+msgstr "Podela titlova"
+
 #: ../src/GnomeSubtitles/Core/Command/SynchronizeTimingsCommand.cs:30
 msgid "Synchronizing timings"
 msgstr "UsklaÄivanje vremena"
@@ -848,16 +917,12 @@ msgstr "UsklaÄivanje vremena"
 #. initially, it's the former text replaced by translation
 #. direction of translation
 #: ../src/GnomeSubtitles/Core/Command/TranslatorCommand.cs:36
-#, fuzzy
-#| msgid "Translation"
 msgid "Translating"
 msgstr "Prevod"
 
 #: ../src/GnomeSubtitles/Core/Command/TranslatorCommand.cs:100
-#, fuzzy
-#| msgid "Could not save the file"
 msgid "Could not translate the chosen subtitle."
-msgstr "Äuvanje datoteke nije uspelo"
+msgstr "Ne mogu da preveden izabrani titl."
 
 #: ../src/GnomeSubtitles/Core/Command/VideoSetSubtitleTimingCommand.cs:26
 msgid "Setting Subtitle Start"
@@ -1034,11 +1099,11 @@ msgstr "Vijetnamski"
 msgid "Current Locale"
 msgstr "TekuÄi lokalitet"
 
-#: ../src/GnomeSubtitles/Core/EventHandlers.cs:382
+#: ../src/GnomeSubtitles/Core/EventHandlers.cs:397
 msgid "The Gnome Subtitles Manual could not be found."
 msgstr "PriruÄnik za Gnom titlove nije pronaÄen."
 
-#: ../src/GnomeSubtitles/Core/EventHandlers.cs:382
+#: ../src/GnomeSubtitles/Core/EventHandlers.cs:397
 msgid "Please verify that your installation has been completed successfully."
 msgstr "Proverite da li ste uspeÅno instalirali program."
 
@@ -1064,7 +1129,7 @@ msgid "None"
 msgstr "NiÅta"
 
 #: ../src/GnomeSubtitles/Dialog/FileOpenDialog.cs:247
-#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:58
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:74
 msgid "All Files"
 msgstr "Sve datoteke"
 
@@ -1076,17 +1141,26 @@ msgstr "Sve datoteke titla"
 msgid "Open Translation File"
 msgstr "Otvori datoteku prevoda"
 
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:85
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:117
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:135
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:150
-msgid "Remember Last Used"
-msgstr "Zapamti poslednje koriÅÄeno"
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:102
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:134
+msgid "Remember the last used encoding"
+msgstr "Zapamti poslednje koriÅÄeno kodiranje"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:134
+msgid "Keep the encoding used on file open"
+msgstr "ZadrÅi koriÅÄeno kodiranje prilikom otvaranja datoteke"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:152
+msgid "Keep the format used on file open"
+msgstr "ZadrÅi koriÅÄeni format prilikom otvaranja datoteke"
 
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:117
-#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:135
-msgid "Keep Existing"
-msgstr "ZadrÅi postojeÄe"
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:152
+msgid "Remember the last used format"
+msgstr "Zapamti poslednji koriÅÄeni format"
+
+#: ../src/GnomeSubtitles/Dialog/PreferencesDialog.cs:167
+msgid "Remember the last used type"
+msgstr "Zapamti poslednju koriÅÄenu vrstu"
 
 #: ../src/GnomeSubtitles/Dialog/SearchDialog.cs:111
 msgid "Find"
@@ -1113,16 +1187,16 @@ msgstr "Izaberite jezik _prevoda tekuÄih titlova."
 msgid "Save Translation As"
 msgstr "SaÄuvaj prevod kao"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsAdjustDialog.cs:68
+#: ../src/GnomeSubtitles/Dialog/TimingsAdjustDialog.cs:67
 msgid "Start Time:"
 msgstr "PoÄetno vreme:"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:80
+#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:81
 #: ../src/GnomeSubtitles/Ui/VideoPreview/VideoPosition.cs:195
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:80
+#: ../src/GnomeSubtitles/Dialog/TimingsShiftDialog.cs:81
 msgid "Frames"
 msgstr "Kadrovi"
 
@@ -1145,7 +1219,7 @@ msgid ""
 "Add sync points by selecting subtitles and adjusting the video to their "
 "correct position. At least 2 points are needed."
 msgstr ""
-"Dodajte taÄke usklaÄenja izborom titlova i postavljanjem video snimkau njihove "
+"Dodajte taÄke usklaÄenja izborom titlova i postavljanjem video snimaka u njihove "
 "pravilne poloÅaje. Potrebne su dve taÄke."
 
 #: ../src/GnomeSubtitles/Dialog/TimingsSynchronizeDialog.cs:108
@@ -1153,7 +1227,7 @@ msgid ""
 "Add 1 more sync point to start synchronizing. Adding more points will "
 "improve accuracy."
 msgstr ""
-"Dodajte joÅ jednu taÄku za poÄetak usklaÄenja. Ovaj postupak ÄepoboljÅati "
+"Dodajte joÅ jednu taÄku za poÄetak usklaÄenja. Ovaj postupak Äe poboljÅati "
 "preciznost."
 
 #: ../src/GnomeSubtitles/Dialog/TimingsSynchronizeDialog.cs:111
@@ -1178,12 +1252,13 @@ msgstr "UsklaÄivanje je spremno. SledeÄi titlovi neÄe biti usklaÄeni:{0} i {
 msgid ""
 "An unknown error has occured. Please report a bug and include this error "
 "name:"
-msgstr "DoÅlo je do nepoznate greÅke. Prijavite nam je, zajedno s nazivom:"
+msgstr ""
+"DoÅlo je do nepoznate greÅke. Prijavite greÅku zajedno s njenim nazivom:"
 
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileOpenErrorDialog.cs:29
 msgid "Could not open the file"
-msgstr "Otvaranje datoteke nije uspelo"
+msgstr "Ne mogu da otvorim datoteku"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileOpenErrorDialog.cs:30
 msgid "Open another file"
@@ -1196,11 +1271,11 @@ msgstr "Putanja datoteke nije ispravna."
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:32
 msgid "Could not save the file"
-msgstr "Äuvanje datoteke nije uspelo"
+msgstr "Ne mogu da saÄuvam datoteku"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:33
 msgid "Save to another file"
-msgstr "SaÄuvaj na drugu datoteku"
+msgstr "SaÄuvaj u drugu datoteku"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/FileSaveErrorDialog.cs:59
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:41
@@ -1225,13 +1300,13 @@ msgstr "Navedena datoteka je neispravna."
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:32
 msgid "If you don't save, all your changes will be permanently lost."
-msgstr "Ako ne saÄuvate, sve izmene Äe biti izgubljene."
+msgstr "Ako ne saÄuvate, sve izmene Äe biti trajno izgubljene."
 
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:88
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before creating new subtitles?"
-msgstr "SaÄuvati izmene za â{0}â pre stvaranja novog titla?"
+msgstr "Da saÄuvam izmene u titlu â{0}â pre stvaranja novog?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:89
 msgid "Create without Saving"
@@ -1240,18 +1315,18 @@ msgstr "Napravi bez Äuvanja"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:108
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before creating new subtitles?"
-msgstr "SaÄuvati izmene za â{0}â pre stvaranja novog titla?"
+msgstr "Da saÄuvam izmene u prevodu â{0}â pre stvaranja novog titla?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:115
 #, csharp-format
 msgid ""
 "Save the changes to translation \"{0}\" before creating a new translation?"
-msgstr "SaÄuvati izmene za â{0}â pre stvaranja novog prevoda?"
+msgstr "Da saÄuvam izmene u prevodu â{0}â pre stvaranja novog?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:125
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before opening?"
-msgstr "SaÄuvati izmene za â{0}â pre otvaranja?"
+msgstr "Da saÄuvam izmene u titlu â{0}â pre otvaranja?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:126
 msgid "Open without Saving"
@@ -1260,12 +1335,12 @@ msgstr "Otvori bez Äuvanja"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:145
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before opening?"
-msgstr "SaÄuvati izmene za â{0}â pre otvaranja?"
+msgstr "Da saÄuvam izmene u prevodu â{0}â pre otvaranja?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:154
 #, csharp-format
 msgid "Save the changes to subtitles \"{0}\" before closing?"
-msgstr "SaÄuvati izmene za â{0}â pre zatvaranja?"
+msgstr "Da saÄuvam izmene u titlu â{0}â pre zatvaranja?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:155
 msgid "Close without Saving"
@@ -1274,20 +1349,20 @@ msgstr "Zatvori bez Äuvanja"
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SaveConfirmationDialog.cs:173
 #, csharp-format
 msgid "Save the changes to translation \"{0}\" before closing?"
-msgstr "SaÄuvati izmene za â{0}â pre zatvaranja?"
+msgstr "Da saÄuvam izmene u prevodu â{0}â pre zatvaranja?"
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:37
 msgid ""
 "Unable to detect the subtitle format. Please check that the file type is "
 "supported."
 msgstr ""
-"Format titla nije pronaÄen. Proverite da li je vrsta datoteke podrÅana."
+"Ne mogu da odredim format titla. Proverite da li je vrsta datoteke podrÅana."
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:39
 msgid ""
 "The encoding used is not supported by your system. Please choose another "
 "encoding."
-msgstr "Izabrani kodni raspored nije podrÅan. Izaberite drugi."
+msgstr "Izabrani kodni raspored nije podrÅan. Izaberite neki drugi."
 
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:45
 msgid "You do not have the permissions necessary to open the file."
@@ -1297,18 +1372,26 @@ msgstr "Nemate potrebne dozvole da otvorite datoteku."
 msgid "The file could not be found."
 msgstr "Datoteka nije pronaÄena."
 
+#: ../src/GnomeSubtitles/Dialog/Unmanaged/SubtitleFileOpenErrorDialog.cs:51
+msgid "The file appears to be too large for a text-based subtitle file."
+msgstr "Datoteka izgleda da je prevelika za tekstualnu datoteku titla."
+
 #. Strings
 #: ../src/GnomeSubtitles/Dialog/Unmanaged/VideoErrorDialog.cs:29
 msgid "Could not play the file"
-msgstr "Reprodukovanje nije uspelo."
+msgstr "Ne mogu da pustim datoteku"
 
-#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:64
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:58
 msgid "All Video Files"
 msgstr "Sve video datoteke"
 
+#: ../src/GnomeSubtitles/Dialog/VideoOpenDialog.cs:66
+msgid "All Audio Files"
+msgstr "Sve audio datoteke"
+
 #: ../src/GnomeSubtitles/Execution/BugReporter.cs:31
 msgid "Could not open Bug Buddy, the bug reporting tool."
-msgstr "Otvaranje programa za prijavljivanje greÅaka nije uspelo."
+msgstr "Ne mogu da otvorim BubaÅdaju, programa za prijavljivanje greÅaka."
 
 #: ../src/GnomeSubtitles/Execution/BugReporter.cs:32
 msgid "Bug information has been printed to the console."
@@ -1316,7 +1399,7 @@ msgstr "Podaci o greÅci su odÅtampani u konzoli."
 
 #: ../src/GnomeSubtitles/Ui/Component/EncodingComboBox.cs:176
 msgid "Add or Remove..."
-msgstr "Dodaj ili ukloniâ"
+msgstr "Dodaj ili ukloni..."
 
 #: ../src/GnomeSubtitles/Ui/Component/EncodingComboBox.cs:184
 msgid "Auto Detected"
@@ -1334,15 +1417,15 @@ msgstr "Video"
 #. To translators: OVR and INS correspond to the Overwrite and Insert text editing modes.
 #: ../src/GnomeSubtitles/Ui/Status.cs:43
 msgid "OVR"
-msgstr "OVR"
+msgstr "PRP"
 
 #: ../src/GnomeSubtitles/Ui/Status.cs:43
 msgid "INS"
-msgstr "INS"
+msgstr "UBC"
 
 #. To translators: Trans corresponds to Translation (used here to denote whether text or translation is being edited).
 #: ../src/GnomeSubtitles/Ui/Status.cs:58
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:251
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:266
 msgid "Text"
 msgstr "Tekst"
 
@@ -1353,7 +1436,7 @@ msgstr "Prevod"
 #. To translators: Ln corresponds to Line
 #: ../src/GnomeSubtitles/Ui/Status.cs:60
 msgid "Ln"
-msgstr "Linija"
+msgstr "Red"
 
 #. To translators: Col corresponds to Column
 #: ../src/GnomeSubtitles/Ui/Status.cs:62
@@ -1365,26 +1448,41 @@ msgid "Frame"
 msgstr "Kadar"
 
 #. Number column
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:239
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:254
 msgid "No."
 msgstr "Broj"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:243
-msgid "From"
-msgstr "Iz"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:258
+msgid "Start"
+msgstr "PoÄetak"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:244
-msgid "To"
-msgstr "U"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:259
+msgid "End"
+msgstr "Kraj"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:245
-msgid "During"
-msgstr "U toku"
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:260
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:256
+#: ../src/GnomeSubtitles/Ui/View/SubtitleView.cs:271
 msgid "Translation"
 msgstr "Prevod"
 
+#~ msgid "From:"
+#~ msgstr "Iz:"
+
+#~ msgid "To:"
+#~ msgstr "U:"
+
+#~ msgid "Keep Existing"
+#~ msgstr "ZadrÅi postojeÄe"
+
+#~ msgid "From"
+#~ msgstr "Iz"
+
+#~ msgid "To"
+#~ msgstr "U"
+
 #~ msgid "Set Translatio_n Language"
 #~ msgstr "Postavi _jezik prevoda"