[gnome-subtitles] Updating to release 1.2

[Pedro Daniel da Rocha Melo e Castro <pcastro src gnome org>]

commit 5b5d2295b32639c7a28f7e00f520c8dde68620e3
Author: Pedro Castro <pedro gnomesubtitles org>
Date:   Sun Aug 21 01:27:32 2011 +0100

    Updating to release 1.2

 NEWS         |  172 ++++++++++++++++++++++++++++++++++++++++------------------
 configure.ac |    2 +-
 2 files changed, 121 insertions(+), 53 deletions(-)
---
diff --git a/NEWS b/NEWS
index b88e3ef..cba1e9d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,74 @@
 Gnome Subtitles
 ===============
 
+1.2 (21/08/11)
+==============
+
+- Support for merging and splitting subtitle lines
+- Allow to view character counts in the subtitle list and editing area
+- Allow to apply a reaction delay when timing start/end on video playblack
+- Video slow and fast motion options
+- New shortcuts for quick timings change:
+  * Increase/decrease subtitle start time: Ctrl+Plus/Minus (on the numpad)
+  * Increase/decrease subtitle end time: Alt+Plus/Minus (on the numpad)
+  * Shift subtitles: Shift+Plus/Minus (on the numpad)
+- Automatically seek the video when subtitle times are changed, with an option
+  to rewind it some milliseconds
+- Added support for the Fab Subtitler subtitle format
+- Allow to insert a new subtitle at the current video position, applying
+  a reaction delay if set
+- Other changes:
+  * Translation filenames are now based on the original filename plus language
+  * Added support for buggy SubRip files that use dots instead of commas
+  * Fixed bug with the subtitle overlay not being updated on times change
+  * Detect when selecting a video file as the subtitle file
+  * Updated preferences dialog with different structure and more options
+  * Fixed special characters (<,>,&,etc) not being shown in the subtitle list
+
+Bug fixes:
+- Slow and Fast Motion Option (#453469)
+- Filenames for new translations (#607227)
+- Video file extensions (#607228)
+- Opening large files (#607229)
+- File close sensitivity (#620776)
+- Shift selected lines with Keyboard shortcuts (#621145)
+- Makefile - copy libs to build dir (#621943)
+- Show the total number of characters while editing subtitles (#625485)
+- Support for FAB files (#634230)
+- Remove extension from icon in .desktop file (#636766)
+- Do not build modules as shared libraries (#636767)
+- Crash when inserting new subtitle with no subtitles selected (#638238)
+- Apply a Reaction Delay when timing subtitle start/end (#638484)
+- Add support for opening buggy SubRip files (#642674)
+- Insert subtitle at video position (#648461)
+- Merge and split lines (#651958)
+
+Contributors:
+- Arx Cruz, Keith Madill, MichaÅ Sawicz, Pawel Brzeski
+
+Translations:
+- Joan Duran (ca)
+- Marek ÄernockÃ, Petr Kovar (cs)
+- Joe Hansen, Kenneth Nielsen (da)
+- Mario BlÃttermann (de)
+- Daniel Mustieles, Francisco Serrador, Jorge GonzÃlez (es)
+- Bruno Brouard (fr)
+- Marcos Lans (gl)
+- Yaron Shahrabani (he)
+- Gabor Kelemen (hu)
+- Claudio Arseni (it)
+- AntÃnio Lima (pt)
+- Djavan Fagundes, Krix ApolinÃrio, Marco de Freitas (pt_BR)
+- Yuri Myasoedov (ru)
+- Andrej ÅnidarÅiÄ, Matej UrbanÄiÄ (sl)
+- ÄorÄe VasiljeviÄ (sr)
+- Daniel Nylander (sv)
+- Yinghua Wang (zh_CN)
+
+Additional thanks:
+- A. Bhattacharya, A. Dagistanli, D. Leuenberger, Eva C., J. Hogue, V. Untz, P. DrÄg, W. Lemberg, Z. Kozak
+
+
 1.1 (31/10/10)
 ==============
 
@@ -18,6 +86,21 @@ Gnome Subtitles
 - Fixed a bug drag-and-dropping files with spaces in their path
 - Use ISO-8859-1 as the fallback and default encoding in the File Open list
 
+Bug fixes:
+- Automatically select subtitles on video playback (#453220)
+- Quick subtitle timing during playback (#547984)
+- Periodically backup subtitle files (#565360)
+- Subtitle loop (#601195)
+- Seek Subtitle->Time; Time->Subtitle with kb shortcut; Follow subs. (#605402)
+- Bug in help (#612400)
+- Untranslated strings (#619364)
+- Crash when shifting selected subtitles (#620027)
+- Synchronize timings for all subtitles (#622248)
+- Crash when searching backwards (#628427)
+
+Contributors:
+- Arx Cruz, Valmir Sena
+
 Translations:
 - Carles Ferrando, Joan Duran (ca valencia)
 - Lucas Lommer, Marek ÄernockÃ, Petr Kovar (cs)
@@ -35,21 +118,6 @@ Translations:
 - Baris Cicek, Serkan YÄlmaz (tr)
 - Aron Xu (zh_CN)
 
-Bug fixes:
-- Automatically select subtitles on video playback (#453220)
-- Quick subtitle timing during playback (#547984)
-- Periodically backup subtitle files (#565360)
-- Subtitle loop (#601195)
-- Seek Subtitle->Time; Time->Subtitle with kb shortcut; Follow subs. (#605402)
-- Bug in help (#612400)
-- Untranslated strings (#619364)
-- Crash when shifting selected subtitles (#620027)
-- Synchronize timings for all subtitles (#622248)
-- Crash when searching backwards (#628427)
-
-Contributors:
-- Arx Cruz, Valmir Sena
-
 Additional thanks:
 - A. G. Luz, Carlos Troncoso, Daniel, Gabor Kelemen, Marcin Zajaczkowski
 
@@ -76,20 +144,6 @@ Additional thanks:
 - Fixed use of LDADD when building
 - Use libtool to produce shared libraries
 
-Translations:
-- Alexander Shopov, Svetoslav Stefanov (bg)
-- Marek ÄernockÃ, Petr Kovar, Rinu (cs)
-- Joe Hansen (da)
-- Mario BlÃttermann (de)
-- Jorge GonzÃlez (es)
-- AntÃn MÃixome, Lois (gl)
-- Mark Krapivner (he)
-- Claudio Arseni (it)
-- Piotr DrÄg (pl)
-- AntÃnio Lima (pt)
-- Andrej ÅnidarÅiÄ, Matej UrbanÄiÄ (sl)
-- Daniel Nylander (sv)
-
 Bug fixes:
 - Set defaultsubtitle format, character coding and newline type in
   preferences (#504656)
@@ -106,6 +160,20 @@ Bug fixes:
 Contributors:
 - Arx Cruz, Ildar Mulyukov, Peter Alfredsen
 
+Translations:
+- Alexander Shopov, Svetoslav Stefanov (bg)
+- Marek ÄernockÃ, Petr Kovar, Rinu (cs)
+- Joe Hansen (da)
+- Mario BlÃttermann (de)
+- Jorge GonzÃlez (es)
+- AntÃn MÃixome, Lois (gl)
+- Mark Krapivner (he)
+- Claudio Arseni (it)
+- Piotr DrÄg (pl)
+- AntÃnio Lima (pt)
+- Andrej ÅnidarÅiÄ, Matej UrbanÄiÄ (sl)
+- Daniel Nylander (sv)
+
 Additional thanks:
 - A. Luz, Federico, Frederico Camara, ÎÎÎÎÎÎÎ ÎÎÎÎÎÎÎÎÎÎ, Yann Basly
 
@@ -119,16 +187,16 @@ Additional thanks:
   * Opening a video with Frames mode selected
   * Opening the Preferences dialog
 
-Translations:
-- Joan Duran (ca)
-- Jorge GonzÃlez (es)
-
 Bug fixes:
 - Subtitling of audio files (#584795)
 - GS crashes when opening subtitles together with a movie (#587097)
 - GS crashes on Edit->Preferences (#587100)
 
-Thanks:
+Translations:
+- Joan Duran (ca)
+- Jorge GonzÃlez (es)
+
+Additional thanks:
 - Marcin Zajaczkowski, Yannick Warnier
 
 0.9 (21/06/09)
@@ -171,24 +239,6 @@ Thanks:
   * Requires gtk, gtk-sharp, glade-sharp and gconf-sharp 2.12 or higher
   * No longer requires gnome-sharp nor sublib
 
-Translations:
-- Djihed Afifi (ar)
-- Joan Duran (ca)
-- Kamil Paral, Lucas Lommer, Petr Kovar, Rinu (cs)
-- Joe Hansen, Kristian KjÃrgaard (da)
-- Felix Braun, Mario BlÃttermann (de)
-- Gabriel Ruiz, Jorge GonzÃlez (es)
-- Ilkka Tuohela (fi)
-- Luca Ferretti, Simone Oberti (it)
-- Kjartan Maraas (nb)
-- Yannig Marchegay (oc)
-- Piotr DrÄg (pl)
-- AntÃnio Lima (pt)
-- CÃsar Veiga, FÃbio Nogueira, Henrique P Machado, Leonardo Ferreira
-  Fontenelle (pt_BR)
-- Nickolay V. Shmyrev (ru)
-- Daniel Nylander (sv)
-
 Bug fixes:
 - The file with a movie is not always automatically selected (#417975)
 - Improvements to selection types in timings dialogs (#430737)
@@ -207,6 +257,24 @@ Bug fixes:
 Contributors:
 - Arx Cruz, Lucas Lommer
 
+Translations:
+- Djihed Afifi (ar)
+- Joan Duran (ca)
+- Kamil Paral, Lucas Lommer, Petr Kovar, Rinu (cs)
+- Joe Hansen, Kristian KjÃrgaard (da)
+- Felix Braun, Mario BlÃttermann (de)
+- Gabriel Ruiz, Jorge GonzÃlez (es)
+- Ilkka Tuohela (fi)
+- Luca Ferretti, Simone Oberti (it)
+- Kjartan Maraas (nb)
+- Yannig Marchegay (oc)
+- Piotr DrÄg (pl)
+- AntÃnio Lima (pt)
+- CÃsar Veiga, FÃbio Nogueira, Henrique P Machado, Leonardo Ferreira
+  Fontenelle (pt_BR)
+- Nickolay V. Shmyrev (ru)
+- Daniel Nylander (sv)
+
 Additional thanks:
 - Adam Dixon, Julian Sikorski, Luciano A. Ferrer, Marcin Zajaczkowski,
   Satoshi Tanabe
diff --git a/configure.ac b/configure.ac
index 816aa4a..cc68439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.58)
-AC_INIT(gnome-subtitles, 1.1, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
+AC_INIT(gnome-subtitles, 1.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-subtitles)
 
 GNOME_COMMON_INIT