Merge lp:~jbicha/ubuntu/oneiric/gedit-plugins/gedit-plugins-3.1.2 into lp:ubuntu/oneiric/gedit-plugins

[Jeremy Bícha]

[Sebastien Bacher (seb128)]

Thank you for your work, some comments:
- the configure updated the libpeas requirement, you need to update the Build-Depends to match those
- isn't dh_python2 support to clean the pyc files itself?
- why do you need 2 dh_python2 calls?

Barry, you know dh_python2 could you comment on whether those are needed or not? I've not really used dh_python2 before and I'm not sure if my comments there make sense of if that's just me ignoring how the tool is used

[Jeremy Bícha (jbicha)]

I had trouble getting the .py plugins to install in the right place (without using an install file) and not also install the .pyo/.pyc files. Calling dh_python2 fixed it, but I'm curious to hear if Barry has a better solution.

[lp:~jbicha/ubuntu/oneiric/gedit-plugins/gedit-plugins-3.1.2]

45. By Jeremy Bícha on 2011-07-28

* New upstream release
* debian/control
  - Update Vcs-Bzr link
  - Switch to dh_python2
  - Bump libpeas build-depends version
* debian/rules
  - Switch to dh_python2
  - Delete .pyc files in clean rule
* debian/watch:
  - Watch for unstable release

[Barry Warsaw (barry)]

> I had trouble getting the .py plugins to install in the right place (without
> using an install file) and not also install the .pyo/.pyc files. Calling
> dh_python2 fixed it, but I'm curious to hear if Barry has a better solution.

So far as I know, currently you do have to call dh_python2 twice if you have a specific directory to operate on. I don't think that's ideally how dh_python2 should work, and we're having some discussions over on debian-python about improving that. But I think that's what's required today.

[lp:~jbicha/ubuntu/oneiric/gedit-plugins/gedit-plugins-3.1.2]

46. By Jeremy Bícha on 2011-07-28

dropped unneeded line to remove .pyc in debian/rules

47. By Jeremy Bícha on 2011-08-02

Added an extra space to python-dbus build-depends, from Debian svn

=== modified file 'ChangeLog'
--- ChangeLog	2011-07-22 20:45:45 +0000
+++ ChangeLog	2011-08-02 23:49:24 +0000
@@ -1,6 +1,6 @@
-commit 5c9656ced5bf6a991174294cdec2580a3fae9d5f
+commit e18cd9fafa3931431408975aaa858eae069b79b6
 Author: José Aliste <[e-mail]>
-Date:   2011-07-05
+Date:   2011-06-28
 
     synctex: call goto_line on an idle when doing sync_source on
     non-open file.
@@ -13,23 +13,40 @@
 
 M	plugins/synctex/synctex/synctex.py
 
-commit d2d3073b3c4fe4c48388579d1dbb6d5b7753c049
+commit b07ba6433011829ede2e0ac79c0b0fad10e17022
 Author: José Aliste <[e-mail]>
-Date:	2011-07-05
+Date:	2011-06-28
 
     synctex: remove hack to access the tab out of the view.
 
 M	plugins/synctex/synctex/synctex.py
 
-commit c8212000cfa2bcfff7860ebbe0defe0b161b3d11
+commit 60ebeb8df22c436ec5f573619807183b92abd030
 Author: José Aliste <[e-mail]>
-Date:	2011-07-05
+Date:	2011-06-28
 
     synctex: Fix SyncSource when a input_file is not already open.
 
 M	plugins/synctex/synctex/synctex.py
 
-commit 9d76251cd8bf10cf112a5ba22d969523d5be344a
+commit f1c746e712796639b43975fab5021ef723c7191e
+Author: Ignacio Casal Quinteiro <[e-mail]>
+Date:	2011-06-26
+
+    synctex: style fixes
+
+M	plugins/synctex/synctex/synctex.py
+
+commit 51a51ce8bcf5f064c99364b465557c1fdb1f32d6
+Author: Ignacio Casal Quinteiro <[e-mail]>
+Date:	2011-06-26
+
+    synctex: remove window helper
+
+M	plugins/synctex/synctex/__init__.py
+M	plugins/synctex/synctex/synctex.py
+
+commit 0f92f78aee92f305cddcfbe5d037001586b2836c
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-25
 
@@ -38,7 +55,7 @@
 M	plugins/multiedit/multiedit/documenthelper.py
 M	plugins/synctex/synctex/synctex.py
 
-commit 284a5263dfd65469b15a0e9f5dfde93a305e9ffd
+commit 703da3b95b26577601aacfd63de1c8c3174be704
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-19
 
@@ -46,7 +63,7 @@
 
 M	plugins/synctex/synctex/synctex.py
 
-commit fa82294c20af22b733e749e030fae26fdda00811
+commit 8385c4de6318ce5542461e54ad040235a314b5ad
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-19
 
@@ -54,17 +71,26 @@
 
 M	plugins/synctex/synctex/synctex.py
 
-commit f032f61e3e4f5f99714cca16d125303d49f58f90
+commit d91f371f2a8c8902ca4ac81361570f0588dee4f0
 Author: Ignacio Casal Quinteiro <[e-mail]>
-Date:	2011-06-17
+Date:	2011-06-13
 
-    Release 3.0.4
+    Release 3.1.1
 
 M	NEWS
 M	README
 M	configure.ac
 
-commit 21e77b7c66fc73f9e47a9d1dbf7158bd98e6aded
+commit 3244480a46f12111b45b293df3fed5682de21453
+Author: Ignacio Casal Quinteiro <[e-mail]>
+Date:	2011-06-13
+
+    Do not use Gtk[HV]Box in ui files.
+
+M	plugins/drawspaces/gedit-drawspaces-plugin.ui
+M	plugins/sessionsaver/sessionsaver.ui
+
+commit 8db0b6f0efc23c59dc59f9208657e337dda514ad
 Author: Garrett Regier <[e-mail]>
 Date:	2011-06-12
 
@@ -73,16 +99,7 @@
 M	plugins/taglist/gedit-taglist-plugin-panel.c
 M	plugins/taglist/gedit-taglist-plugin-panel.h
 
-commit 29a851e043646e20217b46e331f12a1db5a58fe1
-Author: Ignacio Casal Quinteiro <[e-mail]>
-Date:	2011-06-13
-
-    Do not use Gtk[HV]Box in ui files.
-
-M	plugins/drawspaces/gedit-drawspaces-plugin.ui
-M	plugins/sessionsaver/sessionsaver.ui
-
-commit 1f75d703cd96d4b45bb029cfbeb86f2655744c6c
+commit 98b3bce0ecf9deefa1edeff779dd8170192e9577
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-10
 
@@ -92,7 +109,7 @@
 M	plugins/sessionsaver/dialogs.py
 M	plugins/sessionsaver/store.py
 
-commit 51636d9443c6524f09487dc3fb975798070cd532
+commit fb1a554264c59384e22000eaff3e7bb3a6fda792
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-10
 
@@ -101,7 +118,7 @@
 M	plugins/sessionsaver/__init__.py
 M	plugins/sessionsaver/dialogs.py
 
-commit ebac68765d7e2530dca56975c1b485788325b2f5
+commit d0fac23ce883f3e9fcdbf73827165f81ba91c52a
 Author: Jesse van den Kieboom <[e-mail]>
 Date:	2011-06-07
 
@@ -109,7 +126,23 @@
 
 M	plugins/commander/modules/find/finder.py
 
-commit aa6dfae96f8f7cf96a66e42c77444346059397c7
+commit e0c5966031eec49a1dfa3b52e349b30fe71edc87
+Author: Yuri Myasoedov <[e-mail]>
+Date:	2011-06-03
+
+    Updated Russian translation
+
+M	po/ru.po
+
+commit 50dcd96bbd173530069be1db32ee870b101f26cb
+Author: Yuri Myasoedov <[e-mail]>
+Date:	2011-06-03
+
+    Updated Russian translation
+
+M	po/ru.po
+
+commit 881a839751db2914880de393d91f974b9b464f02
 Author: Ignacio Casal Quinteiro <[e-mail]>
 Date:	2011-06-02
 

=== modified file 'NEWS'
--- NEWS	2011-07-22 20:45:45 +0000
+++ NEWS	2011-08-02 23:49:24 +0000
@@ -1,18 +1,22 @@
 ====================
-gedit-plugins 3.0.5
-====================
-
-New features and fixes
-======================
-Misc bugfixes
-
-====================
-gedit-plugins 3.0.4
-====================
-
-New features and fixes
-======================
-Misc bugfixes
+gedit-plugins 3.1.2
+====================
+
+New features and fixes
+======================
+Misc bugfixes
+
+====================
+gedit-plugins 3.1.1
+====================
+
+New features and fixes
+======================
+Misc bugfixes
+
+New and updated translations
+============================
+- ru (Yuri Myasoedov)
 
 ====================
 gedit-plugins 3.0.3

=== modified file 'README'
--- README	2011-07-22 20:45:45 +0000
+++ README	2011-08-02 23:49:24 +0000
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is version 3.0.5 of gedit-plugins. gedit-plugins are a set of plugins
+This is version 3.1.2 of gedit-plugins. gedit-plugins are a set of plugins
 for gedit.
 
 Installation

=== modified file 'configure'
--- configure	2011-07-22 20:45:45 +0000
+++ configure	2011-08-02 23:49:24 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gedit-plugins 3.0.5.
+# Generated by GNU Autoconf 2.68 for gedit-plugins 3.1.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gedit>.
 #
@@ -571,8 +571,8 @@
 # Identity of this package.
 PACKAGE_NAME='gedit-plugins'
 PACKAGE_TARNAME='gedit-plugins'
-PACKAGE_VERSION='3.0.5'
-PACKAGE_STRING='gedit-plugins 3.0.5'
+PACKAGE_VERSION='3.1.2'
+PACKAGE_STRING='gedit-plugins 3.1.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gedit'
 PACKAGE_URL=''
 
@@ -1387,7 +1387,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gedit-plugins 3.0.5 to adapt to many kinds of systems.
+\`configure' configures gedit-plugins 3.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1457,7 +1457,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gedit-plugins 3.0.5:";;
+     short | recursive ) echo "Configuration of gedit-plugins 3.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1592,7 +1592,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gedit-plugins configure 3.0.5
+gedit-plugins configure 3.1.2
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1870,7 +1870,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gedit-plugins $as_me 3.0.5, which was
+It was created by gedit-plugins $as_me 3.1.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2784,7 +2784,7 @@
 
 # Define the identity of the package.
  PACKAGE='gedit-plugins'
- VERSION='3.0.5'
+ VERSION='3.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14283,8 +14283,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
@@ -14292,8 +14292,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 ") 2>&5
   ac_status=$?
@@ -14304,8 +14304,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 " 2>/dev/null`
 else
@@ -14323,8 +14323,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
@@ -14332,8 +14332,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 ") 2>&5
   ac_status=$?
@@ -14344,8 +14344,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 " 2>/dev/null`
 else
@@ -14372,8 +14372,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 " 2>&1`
         else
@@ -14382,8 +14382,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 " 2>&1`
         fi
@@ -14395,8 +14395,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 ) were not met:
 
@@ -15551,7 +15551,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gedit-plugins $as_me 3.0.5, which was
+This file was extended by gedit-plugins $as_me 3.1.2, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15617,7 +15617,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gedit-plugins config.status 3.0.5
+gedit-plugins config.status 3.1.2
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-07-22 20:45:45 +0000
+++ configure.ac	2011-08-02 23:49:24 +0000
@@ -3,8 +3,8 @@
 AC_PREREQ([2.63])
  
 m4_define(gedit_plugins_major_version,  3)
-m4_define(gedit_plugins_minor_version,  0)
-m4_define(gedit_plugins_micro_version,  5)
+m4_define(gedit_plugins_minor_version,  1)
+m4_define(gedit_plugins_micro_version,  2)
 m4_define(gedit_plugins_version, gedit_plugins_major_version.gedit_plugins_minor_version.gedit_plugins_micro_version)
 
 AC_INIT([gedit-plugins],
@@ -68,8 +68,8 @@
 	gio-2.0 >= 2.26.0
 	gtk+-3.0 >= 3.0.0
 	gtksourceview-3.0 >= 3.0.0
-	libpeas-1.0 >= 0.7.3
-	libpeas-gtk-1.0 >= 0.7.3
+	libpeas-1.0 >= 1.0.0
+	libpeas-gtk-1.0 >= 1.0.0
 	gedit >= 3.0.0
 ])
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-22 20:45:45 +0000
+++ debian/changelog	2011-08-02 23:49:24 +0000
@@ -1,3 +1,18 @@
+gedit-plugins (3.1.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release
+  * debian/control
+    - Update Vcs-Bzr link
+    - Switch to dh_python2
+    - Bump libpeas build-depends version
+  * debian/rules
+    - Switch to dh_python2
+    - Delete .pyc files in clean rule
+  * debian/watch:
+    - Watch for unstable release
+
+ -- Jeremy Bicha <[e-mail]>  Tue, 02 Aug 2011 19:46:01 -0400
+
 gedit-plugins (3.0.5-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-07-22 20:45:45 +0000
+++ debian/control	2011-08-02 23:49:24 +0000
@@ -1,25 +1,25 @@
 Source: gedit-plugins
 Section: gnome
 Priority: optional
-Maintainer: Loic Minier <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Loic Minier <[e-mail]>
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.11),
                libglib2.0-dev (>= 2.26.0),
                libgtk-3-dev (>= 3.0.0),
                libgtksourceview-3.0-dev (>= 3.0.0),
-               libpeas-dev (>= 0.7.3),
+               libpeas-dev (>= 1.0.0),
                gedit-dev (>= 3.0.0),
-               python,
-               python-support (>= 0.7.1),
-               python-dbus (>=0.83.1)
+               python (>= 2.6.6-3~),
+               python-dbus (>= 0.83.1)
 Standards-Version: 3.9.2
 Homepage: http://live.gnome.org/Gedit/Plugins
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gedit-plugins
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gedit-plugins
-XS-Python-Version: >= 2.3
+Vcs-Bzr: ubuntu:gedit-plugins
+Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
+X-Python-Version: >= 2.3
 
 Package: gedit-plugins
 Architecture: any
@@ -38,20 +38,20 @@
  gedit-plugins contain a set of plugins for gedit, GNOME's text editor.
  .
  The following plugins are included:
+  * Multi Edit: Edit document in multiple places at once
   * Code comment: Comment out or uncomment a selected block of code.
-  * Bracket Completion: Automatically adds closing brackets.
-  * Join/Split Lines: Join several lines or split long ones
+  * Smart Spaces: Forget you're not using tabulations.
   * Color Picker: Pick a color from a dialog and insert its hexadecimal representation.
+  * Embedded Terminal: Embed a terminal in the bottom pane.
+  * Text Size: Easily increase and decrease the text size
+  * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
   * Character Map: Insert special characters just by clicking on them.
-  * Session Saver: Save and restore your working sessions
   * Commander: Command line interface for advanced editing
-  * Multi Edit: Edit document in multiple places at once
+  * Join/Split Lines: Join several lines or split long ones
+  * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
   * Bookmarks: Easy document navigation with bookmarks
-  * Embedded Terminal: Embed a terminal in the bottom pane.
-  * SyncTeX: Synchronize between LaTeX and PDF with gedit and evince.
-  * Smart Spaces: Forget you're not using tabulations.
+  * Bracket Completion: Automatically adds closing brackets.
+  * Session Saver: Save and restore your working sessions
+  * Draw Spaces: Draw Spaces and Tabs
   * Word Completion: Word completion using the completion framework
-  * Text Size: Easily increase and decrease the text size
-  * Draw Spaces: Draw Spaces and Tabs
-  * Tag list: Provides a method to easily insert commonly used tags/strings into a document without having to type them.
  

=== modified file 'debian/control.in'
--- debian/control.in	2011-07-22 20:45:45 +0000
+++ debian/control.in	2011-08-02 23:49:24 +0000
@@ -1,9 +1,10 @@
 Source: gedit-plugins
 Section: gnome
 Priority: optional
-Maintainer: Loic Minier <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Loic Minier <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
                intltool (>= 0.40.0),
                gnome-pkg-tools (>= 0.11),
@@ -12,14 +13,13 @@
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 0.7.3),
                gedit-dev (>= 3.0.0),
-               python,
-               python-support (>= 0.7.1),
-               python-dbus (>=0.83.1)
+               python (>= 2.6.6-3~),
+               python-dbus (>= 0.83.1)
 Standards-Version: 3.9.2
 Homepage: http://live.gnome.org/Gedit/Plugins
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/gedit-plugins
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/gedit-plugins
-XS-Python-Version: >= 2.3
+Vcs-Bzr: ubuntu:gedit-plugins
+Vcs-Browser: https://code.launchpad.net/+branch/ubuntu/gedit-plugins
+X-Python-Version: >= 2.3
 
 Package: gedit-plugins
 Architecture: any

=== modified file 'debian/rules'
--- debian/rules	2011-06-02 19:15:39 +0000
+++ debian/rules	2011-08-02 23:49:24 +0000
@@ -9,6 +9,8 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --with-plugins=all --enable-python
 
+DEB_PYTHON2_MODULE_PACKAGES := gedit-plugins
+
 clean::
 	plugins_desc_script="/^ @PLUGINS_DESCRIPTION@\$$/ c \\$$(find . -iname \*.desktop.in.in | while read f; do cat $$f | awk -f debian/desktop2description.awk; done | sed 's/.*/  &\\/'; echo " ")"; \
 		sed \
@@ -17,6 +19,8 @@
 			debian/control.in > debian/control
 
 binary-install/gedit-plugins::
-	dh_pysupport -p$(cdbs_curpkg) /usr/share/gedit/plugins /usr/lib/gedit/plugins
+	dh_python2 -p$(cdbs_curpkg) /usr/lib/gedit/plugins
 	find debian/$(cdbs_curpkg) -name \*.la -exec rm -f {} \;
 
+binary-post-install/gedit-plugins::
+	dh_python2 -p$(cdbs_curpkg)

=== modified file 'debian/watch'
--- debian/watch	2011-07-22 20:45:45 +0000
+++ debian/watch	2011-08-02 23:49:24 +0000
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/gedit-plugins/([\d\.]+[02468])/gedit-plugins-([\d\.]+)\.tar\.bz2
+http://ftp.gnome.org/pub/gnome/sources/gedit-plugins/([\d\.]+)/gedit-plugins-([\d\.]+)\.tar\.bz2

=== modified file 'plugins/bookmarks/bookmarks.plugin.desktop.in'
--- plugins/bookmarks/bookmarks.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/bookmarks/bookmarks.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -6,4 +6,4 @@
 Authors=Jesse van den Kieboom <[e-mail]>
 Copyright=Copyright @ 2009 Jesse van den Kieboom
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/bracketcompletion/bracketcompletion.plugin.desktop.in'
--- plugins/bracketcompletion/bracketcompletion.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/bracketcompletion/bracketcompletion.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Steve Frécinaux <[e-mail]>
 Copyright=Copyright @ 2006 Steve Frécinaux
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/charmap/charmap.plugin.desktop.in'
--- plugins/charmap/charmap.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/charmap/charmap.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -8,4 +8,4 @@
 Authors=Steve Frécinaux <[e-mail]>\nIgnacio Casal Quinteiro <[e-mail]>
 Copyright=Copyright @ 2006 Steve Frécinaux
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/codecomment/codecomment.plugin.desktop.in'
--- plugins/codecomment/codecomment.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/codecomment/codecomment.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Alejandro Garcia <[e-mail]>\nMatthew Dugan <[e-mail]>
 Copyright=Copyright @ 2005-2006 Igalia, S.L.\nCopyright @ 2006 Matthew Dugan
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/colorpicker/colorpicker.plugin.desktop.in'
--- plugins/colorpicker/colorpicker.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/colorpicker/colorpicker.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -8,4 +8,4 @@
 Authors=Jesse van den Kieboom <[e-mail]>
 Copyright=Copyright @ 2006 Jesse van den Kieboom
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/commander/commander.plugin.desktop.in'
--- plugins/commander/commander.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/commander/commander.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Jesse van den Kieboom <[e-mail]>
 Copyright=Copyright © 2009 Jesse van den Kieboom
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/drawspaces/drawspaces.plugin.desktop.in'
--- plugins/drawspaces/drawspaces.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/drawspaces/drawspaces.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -6,4 +6,4 @@
 Authors=Paolo Borelli <[e-mail]>\nSteve Frécinaux <[e-mail]>\nIgnacio Casal Quinteiro <[e-mail]>
 Copyright=Copyright © 2006 Paolo Borelli\nCopyright © 2007 Steve Frécinaux\nCopyright © 2008 Ignacio Casal Quinteiro
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/gpdefs.py'
--- plugins/gpdefs.py	2011-07-22 20:45:45 +0000
+++ plugins/gpdefs.py	2011-08-02 23:49:24 +0000
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-VERSION = "3.0.5"
+VERSION = "3.1.2"
 PACKAGE = "gedit-plugins"
-PACKAGE_STRING = "gedit-plugins 3.0.5"
+PACKAGE_STRING = "gedit-plugins 3.1.2"
 GETTEXT_PACKAGE = "gedit-plugins"
 GP_LOCALEDIR = "/opt/gnome/share/locale"

=== modified file 'plugins/joinlines/joinlines.plugin.desktop.in'
--- plugins/joinlines/joinlines.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/joinlines/joinlines.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Steve Frécinaux <[e-mail]>\nAndré Homeyer
 Copyright=Copyright @ 2006-2007 Steve Frécinaux, André Homeyer
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/multiedit/multiedit.plugin.desktop.in'
--- plugins/multiedit/multiedit.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/multiedit/multiedit.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Jesse van den Kieboom <[e-mail]>
 Copyright=Copyright © 2009 Jesse van den Kieboom
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/sessionsaver/sessionsaver.plugin.desktop.in'
--- plugins/sessionsaver/sessionsaver.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/sessionsaver/sessionsaver.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Steve Frécinaux
 Copyright=Copyright © 2006 Steve Frécinaux
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/smartspaces/smartspaces.plugin.desktop.in'
--- plugins/smartspaces/smartspaces.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/smartspaces/smartspaces.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -8,4 +8,4 @@
 Authors=Steve Frécinaux <[e-mail]>
 Copyright=Copyright © 2006 Steve Frécinaux
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/synctex/synctex.plugin.desktop.in'
--- plugins/synctex/synctex.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/synctex/synctex.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -8,4 +8,4 @@
 Authors=José Aliste <[e-mail]>
 Copyright=Copyright © 2010 José Aliste
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/synctex/synctex/__init__.py'
--- plugins/synctex/synctex/__init__.py	2011-06-02 19:15:39 +0000
+++ plugins/synctex/synctex/__init__.py	2011-08-02 23:49:24 +0000
@@ -1,1 +1,1 @@
-from synctex import SynctexPlugin
+from synctex import SynctexWindowActivatable

=== modified file 'plugins/synctex/synctex/synctex.py'
--- plugins/synctex/synctex/synctex.py	2011-07-22 20:45:45 +0000
+++ plugins/synctex/synctex/synctex.py	2011-08-02 23:49:24 +0000
@@ -24,6 +24,7 @@
 import dbus.mainloop.glib
 import logging
 import gettext
+import os
 from gpdefs import *
 
 try:
@@ -47,7 +48,6 @@
 """
 
 VIEW_DATA_KEY = "SynctexPluginViewData"
-WINDOW_DATA_KEY = "SynctexPluginWindowData"
 
 _logger = logging.getLogger("SynctexPlugin")
 
@@ -57,6 +57,7 @@
             tag.set_property(prop, style.get_property(prop))
         else:
             tag.set_property(prop, None)
+
     def apply_style_prop_bool(tag, style, prop, whentrue, whenfalse):
         if style.get_property(prop + "-set"):
             prop_value = whentrue if style.get_property(prop) else whenfalse
@@ -73,9 +74,11 @@
 
 def parse_modeline(line):
     index = line.find("mainfile:")
+
     if line.startswith("%") and index > 0:
         # Parse the modeline.
         return line[index + len("mainfile:"):].strip()
+
     return None
 
 class SynctexViewHelper:
@@ -85,6 +88,7 @@
         self._plugin = plugin
         self._doc = view.get_buffer()
         self.window_proxy = None
+
         self._handlers = [
             self._doc.connect('saved', self.on_saved_or_loaded),
             self._doc.connect('loaded', self.on_saved_or_loaded)
@@ -102,6 +106,7 @@
     def on_button_release(self, view, event):
         modifier_mask = Gtk.accelerator_get_default_mod_mask()
         event_state = event.state & modifier_mask
+
         if event.button == 1 and event_state == Gdk.ModifierType.CONTROL_MASK:
             self.sync_view(event.time)
 
@@ -111,6 +116,7 @@
     def get_output_file(self):
         file_output = None
         line_count = self._doc.get_line_count()
+
         for i in range(min(3,line_count)) + range(max(0,line_count - 3), line_count):
             start = self._doc.get_iter_at_line(i)
             end = start.copy()
@@ -118,27 +124,31 @@
             file_output = parse_modeline(self._doc.get_text(start, end, False))
             if file_output is not None:
                 break
+
         return file_output
 
     def on_key_press(self, a, b):
         self._unhighlight()
+
     def on_cursor_moved(self, cur):
         self._unhighlight()
 
     def deactivate(self):
         self._unhighlight()
+
         for h in self._handlers:
             self._doc.disconnect(h)
+
         del self._highlight_tag
 
     def update_location(self):
-        import os
-
         gfile = self._doc.get_location()
+
         if gfile is None:
             return
+
         if self.gfile is None or gfile.get_uri() != self.gfile.get_uri():
-            SynctexPlugin.view_dict[gfile.get_uri()] = self
+            SynctexWindowActivatable.view_dict[gfile.get_uri()] = self
             self.gfile = gfile
 
         modeline_output_file = self.get_output_file()
@@ -151,6 +161,7 @@
         out_path = self.gfile.get_parent().get_child(filename).get_path()
         out_path = os.path.splitext(out_path)
         out_gfile = Gio.file_new_for_path(out_path[0] + ".pdf")
+
         if out_gfile.query_exists(None):
             self.out_gfile = out_gfile
         else:
@@ -162,6 +173,7 @@
         iter = self._doc.get_iter_at_mark(self._doc.get_insert())
         end_iter = iter.copy()
         end_iter.forward_to_line_end()
+
         self._doc.apply_tag(self._highlight_tag, iter, end_iter)
         self.last_iters = [iter, end_iter];
 
@@ -179,7 +191,7 @@
         self._window.present_with_time (time)
 
     def goto_line_after_load(self, a, line, time):
-        GObject.idle_add(lambda : self.goto_line(line, time))
+        GObject.idle_add (lambda : self.goto_line(line, time))
         self._doc.disconnect(self._goto_handler)
 
     def sync_view(self, time):
@@ -191,7 +203,7 @@
 
     def update_active(self):
         # Activate the plugin only if the doc is a LaTeX file.
-        lang = self._doc.get_language() 
+        lang = self._doc.get_language()
         self.active = (lang is not None and lang.get_id() == 'latex' and
                         self.out_gfile is not None)
 
@@ -206,7 +218,7 @@
 
             style = self._doc.get_style_scheme().get_style('search-match')
             apply_style(style, self._highlight_tag)
-            self._window.get_data(WINDOW_DATA_KEY)._action_group.set_sensitive(True)
+            self._plugin._action_group.set_sensitive(True)
             self.window_proxy = self._plugin.ref_evince_proxy(self.out_gfile, self._window)
 
         elif not self.active and self.window_proxy is not None:
@@ -216,73 +228,81 @@
             for handler in self._view_active_handlers:
                 self._view.disconnect(handler)
 
-            self._window.get_data(WINDOW_DATA_KEY)._action_group.set_sensitive(False)
+            self._plugin._action_group.set_sensitive(False)
             self._plugin.unref_evince_proxy(self.out_gfile)
             self.window_proxy = None
 
 
-class SynctexWindowHelper:
-    def __init__(self, plugin, window):
-        self._window = window
-        self._plugin = plugin
-
+class SynctexWindowActivatable(GObject.Object, Gedit.WindowActivatable):
+    __gtype_name__ = "SynctexWindowActivatable"
+
+    window = GObject.property(type=Gedit.Window)
+    view_dict = {}
+    _proxy_dict = {}
+
+    def __init__(self):
+        GObject.Object.__init__(self)
+
+    def do_activate(self):
         self._insert_menu()
 
-        for view in window.get_views():
-            self.add_helper(view, window)
+        for view in self.window.get_views():
+            self.add_helper(view, self.window)
 
         self.handlers = [
-            window.connect("tab-added", lambda w, t: self.add_helper(t.get_view(),w, t)),
-            window.connect("tab-removed", lambda w, t: self.remove_helper(t.get_view())),
-            window.connect("active-tab-changed", self.on_active_tab_changed)
+            self.window.connect("tab-added", lambda window, tab: self.add_helper(tab.get_view(), window)),
+            self.window.connect("tab-removed", lambda window, tab: self.remove_helper(tab.get_view())),
+            self.window.connect("active-tab-changed", self.on_active_tab_changed)
         ]
+
+    def do_deactivate(self):
+        for h in self.handlers:
+            self.window.disconnect(h)
+
+        for view in self.window.get_views():
+            self.remove_helper(view)
+
+        self._remove_menu()
+
     def on_active_tab_changed(self, window,  tab):
         view_helper = tab.get_view().get_data(VIEW_DATA_KEY)
+
         if view_helper is None:
             active = False
         else:
-            active = view_helper.active 
+            active = view_helper.active
+
         self._action_group.set_sensitive(active)
 
-
     def add_helper(self, view, window):
-        helper = SynctexViewHelper(view, window, self._plugin)
+        helper = SynctexViewHelper(view, window, self)
         location = view.get_buffer().get_location()
 
         if location is not None:
-            SynctexPlugin.view_dict[location.get_uri()] = helper
+            self.view_dict[location.get_uri()] = helper
         view.set_data (VIEW_DATA_KEY, helper)
 
     def remove_helper(self, view):
         helper = view.get_data(VIEW_DATA_KEY)
+
         if helper.gfile is not None:
-            del SynctexPlugin.view_dict[helper.gfile.get_uri()]
+            del self.view_dict[helper.gfile.get_uri()]
+
         helper.deactivate()
         view.set_data(VIEW_DATA_KEY, None)
 
-    def __del__(self):
-        self._window = None
-        self._plugin = None
-
-    def deactivate(self):
-        for h in self.handlers:
-            self._window.disconnect(h)
-        for view in self._window.get_views():
-            self.remove_helper(view)
-        self._remove_menu()
-
     def _remove_menu(self):
-        manager = self._window.get_ui_manager()
+        manager = self.window.get_ui_manager()
         manager.remove_ui(self._ui_id)
         manager.remove_action_group(self._action_group)
         manager.ensure_update()
 
     def _insert_menu(self):
         # Get the GtkUIManager
-        manager = self._window.get_ui_manager()
+        manager = self.window.get_ui_manager()
 
         # Create a new action group
-        self._action_group = Gtk.ActionGroup(name="SynctexPluginActions")
+        self._action_group = Gtk.ActionGroup(name="SynctexWindowActivatableActions")
         self._action_group.add_actions([("SynctexForwardSearch", None,
                                         _("Forward Search"), "<Ctrl><Alt>F",
                                         _("Forward Search"), self.forward_search_cb)])
@@ -294,58 +314,43 @@
         self._ui_id = manager.add_ui_from_string(ui_str)
 
     def forward_search_cb(self, action, what):
-        self._window.get_active_view().get_data(VIEW_DATA_KEY).sync_view(Gtk.get_current_event_time())
-
-class SynctexPlugin(GObject.Object, Gedit.WindowActivatable):
-    __gtype_name__ = "SynctexPlugin"
-
-    window = GObject.property(type=Gedit.Window)
-    view_dict = {}
-    _proxy_dict = {}
-
-    def __init__(self):
-        GObject.Object.__init__(self)
-
-    def do_activate(self):
-        window = self.window
-        helper = SynctexWindowHelper(self, window)
-        window.set_data(WINDOW_DATA_KEY, helper)
-
-    def do_deactivate(self):
-        window = self.window
-        window.get_data(WINDOW_DATA_KEY).deactivate()
-        window.set_data(WINDOW_DATA_KEY, None)
+        self.window.get_active_view().get_data(VIEW_DATA_KEY).sync_view(Gtk.get_current_event_time())
 
     def source_view_handler(self, out_gfile, uri_input, source_link, time):
 
-        if uri_input not in SynctexPlugin.view_dict:
-            window = SynctexPlugin._proxy_dict[out_gfile.get_uri()][2]
+        if uri_input not in self.view_dict:
+            window = self._proxy_dict[out_gfile.get_uri()][2]
+
             tab = window.create_tab_from_location(Gio.file_new_for_uri(uri_input),
                                                   None, source_link[0] - 1, 0, False, True)
+
             helper =  tab.get_view().get_data(VIEW_DATA_KEY)
             helper._goto_handler = tab.get_document().connect_object("loaded", 
-                                                SynctexViewHelper.goto_line_after_load, 
+                                                SynctexViewHelper.goto_line_after_load,
                                                 helper, source_link[0] - 1, time)
         else:
-            SynctexPlugin.view_dict[uri_input].goto_line(source_link[0] - 1, time)
+            self.view_dict[uri_input].goto_line(source_link[0] - 1, time)
 
     def ref_evince_proxy(self, gfile, window):
         uri = gfile.get_uri()
         proxy = None
-        if uri not in SynctexPlugin._proxy_dict:
+
+        if uri not in self._proxy_dict:
             proxy = EvinceWindowProxy (uri, True, _logger)
-            SynctexPlugin._proxy_dict[uri] = [1, proxy, window]
+            self._proxy_dict[uri] = [1, proxy, window]
             proxy.set_source_handler (lambda i, s, time: self.source_view_handler(gfile, i, s, time))
         else:
-            SynctexPlugin._proxy_dict[uri][0]+=1
-            proxy = SynctexPlugin._proxy_dict[uri][1]
+            self._proxy_dict[uri][0]+=1
+            proxy = self._proxy_dict[uri][1]
+
         return proxy
 
     def unref_evince_proxy(self, gfile):
         uri = gfile.get_uri()
-        if uri in SynctexPlugin._proxy_dict:
-            SynctexPlugin._proxy_dict[uri][0]-=1
-            if SynctexPlugin._proxy_dict[uri][0] == 0:
-                del SynctexPlugin._proxy_dict[uri]
+
+        if uri in self._proxy_dict:
+            self._proxy_dict[uri][0] -= 1
+            if self._proxy_dict[uri][0] == 0:
+                del self._proxy_dict[uri]
 
 # ex:ts=4:et:

=== modified file 'plugins/taglist/HTML.tags.gz'
Binary files plugins/taglist/HTML.tags.gz	2011-07-22 20:45:45 +0000 and plugins/taglist/HTML.tags.gz	2011-08-02 23:49:24 +0000 differ
=== modified file 'plugins/taglist/Latex.tags.gz'
Binary files plugins/taglist/Latex.tags.gz	2011-07-22 20:45:45 +0000 and plugins/taglist/Latex.tags.gz	2011-08-02 23:49:24 +0000 differ
=== modified file 'plugins/taglist/XSLT.tags.gz'
Binary files plugins/taglist/XSLT.tags.gz	2011-07-22 20:45:45 +0000 and plugins/taglist/XSLT.tags.gz	2011-08-02 23:49:24 +0000 differ
=== modified file 'plugins/taglist/XUL.tags.gz'
Binary files plugins/taglist/XUL.tags.gz	2011-07-22 20:45:45 +0000 and plugins/taglist/XUL.tags.gz	2011-08-02 23:49:24 +0000 differ
=== modified file 'plugins/taglist/taglist.plugin'
--- plugins/taglist/taglist.plugin	2011-07-22 20:45:45 +0000
+++ plugins/taglist/taglist.plugin	2011-08-02 23:49:24 +0000
@@ -134,4 +134,4 @@
 Authors=Paolo Maggi <[e-mail]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/taglist/taglist.plugin.desktop.in'
--- plugins/taglist/taglist.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/taglist/taglist.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -6,4 +6,4 @@
 Authors=Paolo Maggi <[e-mail]>
 Copyright=Copyright © 2002-2005 Paolo Maggi
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/terminal/terminal.plugin.desktop.in'
--- plugins/terminal/terminal.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/terminal/terminal.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -8,4 +8,4 @@
 Authors=Paolo Borelli
 Copyright=Copyright © 2005 Paolo Borelli
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/textsize/textsize.plugin.desktop.in'
--- plugins/textsize/textsize.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/textsize/textsize.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -7,4 +7,4 @@
 Authors=Konstantin Mikhaylov <[e-mail]>\nWouter Bolsterlee <[e-mail]>\nJesse van den Kieboom <[e-mail]>
 Copyright=Copyright © 2008 by the authors
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'plugins/wordcompletion/wordcompletion.plugin.desktop.in'
--- plugins/wordcompletion/wordcompletion.plugin.desktop.in	2011-07-22 20:45:45 +0000
+++ plugins/wordcompletion/wordcompletion.plugin.desktop.in	2011-08-02 23:49:24 +0000
@@ -6,4 +6,4 @@
 Authors=Jesse van den Kieboom <[e-mail]>\nIgnacio Casal Quinteiro <[e-mail]>
 Copyright=Copyright © 2009 Jesse van den Kieboom
 Website=http://www.gedit.org
-Version=3.0.5
+Version=3.1.2

=== modified file 'po/ru.po'
--- po/ru.po	2011-06-02 19:15:39 +0000
+++ po/ru.po	2011-08-02 23:49:24 +0000
@@ -16,16 +16,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 13:12+0100\n"
-"PO-Revision-Date: 2010-03-15 20:29+0300\n"
-"Last-Translator: Alexander Saprykin <[e-mail]>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gedit&keywords=I18N+L10N&component=Plugins\n"
+"POT-Creation-Date: 2011-06-02 09:04+0000\n"
+"PO-Revision-Date: 2011-06-03 17:51+0300\n"
+"Last-Translator: Yuri Myasoedov <[e-mail]>\n"
 "Language-Team: Russian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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: KBabel 1.11.4\n"
 
 #: ../plugins/bookmarks/bookmarks.plugin.desktop.in.in.h:1
@@ -34,175 +33,153 @@
 
 #: ../plugins/bookmarks/bookmarks.plugin.desktop.in.in.h:2
 msgid "Easy document navigation with bookmarks"
-msgstr ""
+msgstr "Простое перемещение по документу с помощью закладок"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:197
-#, fuzzy
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:199
 msgid "Toggle Bookmark"
-msgstr "Закладки"
+msgstr "Добавить/удалить закладку"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:198
-#, fuzzy
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:200
 msgid "Toggle bookmark status of the current line"
-msgstr "Показать или скрыть строку состояния текущего окна"
+msgstr "Добавить или удалить закладку в текущей строке"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:200
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:202
 msgid "Goto Next Bookmark"
-msgstr ""
+msgstr "Перейти к следующей закладке"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:201
-#, fuzzy
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:203
 msgid "Goto the next bookmark"
-msgstr "Перейти к следующему посещенному адресу"
+msgstr "Перейти к следующей закладке"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:203
-#, fuzzy
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:205
 msgid "Goto Previous Bookmark"
-msgstr "Перейти к предыдущему адресу"
+msgstr "Перейти к предыдущей закладке"
 
-#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:204
-#, fuzzy
+#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:206
 msgid "Goto the previous bookmark"
-msgstr "Показать предыдущую страницу"
+msgstr "Перейти к предыдущей закладке"
 
 #: ../plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Automatically adds closing brackets."
-msgstr "Кодировки, определяемые автоматически"
+msgstr "Автоматически добавляет закрывающуюся скобку."
 
 #: ../plugins/bracketcompletion/bracketcompletion.plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Bracket Completion"
-msgstr "Соответствие скобок"
+msgstr "Дополнение скобок"
 
 #: ../plugins/charmap/charmap.plugin.desktop.in.in.h:1
-#: ../plugins/charmap/gedit-charmap-plugin.c:337
-#, fuzzy
+#: ../plugins/charmap/charmap/__init__.py:51
 msgid "Character Map"
-msgstr "Символов (без пробелов)"
+msgstr "Карта символов"
 
 #: ../plugins/charmap/charmap.plugin.desktop.in.in.h:2
 msgid "Insert special characters just by clicking on them."
 msgstr "Вставка специальных символов по щелчку."
 
+#. ex:et:ts=4:
 #: ../plugins/codecomment/codecomment.plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Code comment"
-msgstr "Комментарий"
+msgstr "Комментирование кода"
 
 #: ../plugins/codecomment/codecomment.plugin.desktop.in.in.h:2
 msgid "Comment out or uncomment a selected block of code."
 msgstr "Комментирование или раскомментирование выбранного блока кода."
 
+#: ../plugins/codecomment/codecomment.py:88
+msgid "Co_mment Code"
+msgstr "_Комментировать код"
+
 #: ../plugins/codecomment/codecomment.py:90
-#, fuzzy
-msgid "Co_mment Code"
-msgstr "Комментарий"
-
-#: ../plugins/codecomment/codecomment.py:92
-#, fuzzy
 msgid "Comment the selected code"
-msgstr "Удалить выделенный текст"
+msgstr "Закомментировать выделенный код"
 
-#: ../plugins/codecomment/codecomment.py:96
+#: ../plugins/codecomment/codecomment.py:94
 msgid "U_ncomment Code"
 msgstr "Рас_комментировать код"
 
-#: ../plugins/codecomment/codecomment.py:98
-#, fuzzy
+#: ../plugins/codecomment/codecomment.py:96
 msgid "Uncomment the selected code"
-msgstr "Удалить выделенный текст"
+msgstr "Раскомментировать выделенный код"
 
 #. ex:ts=4:et:
 #: ../plugins/colorpicker/colorpicker.plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Color Picker"
-msgstr "Цветовая схема"
+msgstr "Выбор цвета"
 
 #: ../plugins/colorpicker/colorpicker.plugin.desktop.in.in.h:2
 msgid "Pick a color from a dialog and insert its hexadecimal representation."
 msgstr "Выбор цвета и вставка его шестнадцатиричного представления."
 
-#: ../plugins/colorpicker/colorpicker.py:77
+#: ../plugins/colorpicker/colorpicker.py:76
 msgid "Pick _Color..."
 msgstr "Вставить _цвет..."
 
-#: ../plugins/colorpicker/colorpicker.py:78
+#: ../plugins/colorpicker/colorpicker.py:77
 msgid "Pick a color from a dialog"
 msgstr "Выбрать цвет в диалоге"
 
-#: ../plugins/colorpicker/colorpicker.py:188
-#, fuzzy
+#: ../plugins/colorpicker/colorpicker.py:185
 msgid "Pick Color"
-msgstr "Цвет ссылки"
+msgstr "Выбрать цвет"
 
-#: ../plugins/colorpicker/colorpicker.py:195
+#: ../plugins/colorpicker/colorpicker.py:192
 msgid "_Insert"
 msgstr "Вст_авить символ"
 
 #. ex:ts=4:et:
 #: ../plugins/commander/commander.plugin.desktop.in.in.h:1
 msgid "Command line interface for advanced editing"
-msgstr ""
+msgstr "Интерфейс командной строки для редактирования"
 
 #: ../plugins/commander/commander.plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Commander"
-msgstr "Цвет _команд:"
+msgstr "Командный интерпретатор"
 
 #. ex:set ts=8 noet:
 #: ../plugins/drawspaces/drawspaces.plugin.desktop.in.in.h:1
 #: ../plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in.h:1
-#, fuzzy
 msgid "Draw Spaces"
-msgstr "Вставлять пробелы"
+msgstr "Отображение пробелов"
 
 #: ../plugins/drawspaces/drawspaces.plugin.desktop.in.in.h:2
 msgid "Draw Spaces and Tabs"
 msgstr "Показать пробелы и символы табуляции"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:1
-#, fuzzy
 msgid "Draw leading spaces"
-msgstr "Неразрывный пробел"
+msgstr "Отображение предшествующих пробелов"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:2
 msgid "Draw new lines"
 msgstr "Показать переводы строки"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:3
-#, fuzzy
 msgid "Draw non-breaking spaces"
-msgstr "Неразрывный пробел"
+msgstr "Отображение неразрывных пробелов"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:4
-#, fuzzy
 msgid "Draw spaces"
-msgstr "Вставлять пробелы"
+msgstr "Отображение пробелов"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:5
-#, fuzzy
 msgid "Draw spaces in text"
-msgstr "Вставлять пробелы"
+msgstr "Отображение пробелов в тексте"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:6
 msgid "Draw tabs"
 msgstr "Показать табуляцию"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.ui.h:7
-#, fuzzy
 msgid "Draw trailing spaces"
-msgstr "Удалить пробелы"
+msgstr "Отображение замыкающих пробелов"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.c:134
-#, fuzzy
 msgid "Show _White Space"
-msgstr "Показать следующую страницу"
+msgstr "_Показывать пробелы"
 
 #: ../plugins/drawspaces/gedit-drawspaces-plugin.c:135
-#, fuzzy
 msgid "Show spaces and tabs"
-msgstr "Вставлять про_белы вместо табуляций"
+msgstr "Показывать пробелы и отступы"
 
 #: ../plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in.h:2
 msgid "Enabled"
@@ -210,11 +187,11 @@
 
 #: ../plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in.h:3
 msgid "If TRUE drawing will be enabled."
-msgstr ""
+msgstr "Если установлено, отображение будет включено."
 
 #: ../plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml.in.in.h:4
 msgid "The type of spaces to be drawn."
-msgstr ""
+msgstr "Тип показываемых пробелов."
 
 #: ../plugins/joinlines/joinlines.plugin.desktop.in.in.h:1
 msgid "Join several lines or split long ones"
@@ -224,134 +201,122 @@
 msgid "Join/Split Lines"
 msgstr "Объединение/разбивка строк"
 
-#: ../plugins/joinlines/joinlines.py:56
-#, fuzzy
+#: ../plugins/joinlines/joinlines.py:74
 msgid "_Join Lines"
-msgstr "Строк"
+msgstr "_Объединить строки"
 
-#: ../plugins/joinlines/joinlines.py:57
-#, fuzzy
+#: ../plugins/joinlines/joinlines.py:75
 msgid "Join the selected lines"
-msgstr "Цвет выбранных ссылок"
+msgstr "Объединить выделенные строки"
 
-#: ../plugins/joinlines/joinlines.py:59
+#: ../plugins/joinlines/joinlines.py:77
 msgid "_Split Lines"
 msgstr "Ра_збить строки"
 
-#: ../plugins/joinlines/joinlines.py:60
-#, fuzzy
+#: ../plugins/joinlines/joinlines.py:78
 msgid "Split the selected lines"
-msgstr "Удалить выделенный текст"
+msgstr "Разбить выделенные строки"
 
 #. ex:ts=4:et:
 #: ../plugins/multiedit/multiedit.plugin.desktop.in.in.h:1
 msgid "Edit document in multiple places at once"
-msgstr ""
+msgstr "Правка документа одновременно в нескольких местах"
 
 #: ../plugins/multiedit/multiedit.plugin.desktop.in.in.h:2
 msgid "Multi Edit"
-msgstr ""
+msgstr "Мульти-правка"
 
 #: ../plugins/multiedit/multiedit/documenthelper.py:301
 msgid "Added edit point..."
-msgstr ""
+msgstr "Добавлена точка редактирования…"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:637
+#: ../plugins/multiedit/multiedit/documenthelper.py:643
 msgid "Column Mode..."
-msgstr ""
+msgstr "Режим столбцов…"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:759
+#: ../plugins/multiedit/multiedit/documenthelper.py:757
 msgid "Removed edit point..."
-msgstr ""
+msgstr "Удалена точка редактирования…"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:922
+#: ../plugins/multiedit/multiedit/documenthelper.py:925
 msgid "Cancelled column mode..."
-msgstr ""
+msgstr "Режим столбцов отменён…"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1260
+#: ../plugins/multiedit/multiedit/documenthelper.py:1297
 msgid "Enter column edit mode using selection"
-msgstr ""
+msgstr "Войти в режим редактирования столбцов с помощью выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1261
+#: ../plugins/multiedit/multiedit/documenthelper.py:1298
 msgid "Enter <b>smart</b> column edit mode using selection"
-msgstr ""
+msgstr "Войти в режим <b>умного</b> редактирования столбцов с помощью выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1262
+#: ../plugins/multiedit/multiedit/documenthelper.py:1299
 msgid "<b>Smart</b> column align mode using selection"
-msgstr ""
+msgstr "Режим <b>Умного</b> выравнивания столбцов с помощью выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1263
+#: ../plugins/multiedit/multiedit/documenthelper.py:1300
 msgid "<b>Smart</b> column align mode with additional space using selection"
-msgstr ""
+msgstr "Режим <b>Умного</b> выравнивания столбцов пробелами с помощью выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1265
+#: ../plugins/multiedit/multiedit/documenthelper.py:1302
 msgid "Toggle edit point"
-msgstr ""
+msgstr "Переключить точку редактирования"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1266
+#: ../plugins/multiedit/multiedit/documenthelper.py:1303
 msgid "Add edit point at beginning of line/selection"
-msgstr ""
+msgstr "Добавить точку редактирования в начале строки/выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1267
+#: ../plugins/multiedit/multiedit/documenthelper.py:1304
 msgid "Add edit point at end of line/selection"
-msgstr ""
+msgstr "Добавить точку редактирования в конце строки/выделения"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1268
+#: ../plugins/multiedit/multiedit/documenthelper.py:1305
 msgid "Align edit points"
-msgstr ""
+msgstr "Выравнять точки редактирования"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1269
+#: ../plugins/multiedit/multiedit/documenthelper.py:1306
 msgid "Align edit points with additional space"
-msgstr ""
+msgstr "Выравнять точки редактирования дополнительными пробелами"
 
-#: ../plugins/multiedit/multiedit/documenthelper.py:1305
-#: ../plugins/multiedit/multiedit/windowhelper.py:70
+#: ../plugins/multiedit/multiedit/documenthelper.py:1337
 msgid "Multi Edit Mode"
-msgstr ""
-
-#: ../plugins/multiedit/multiedit/windowhelper.py:70
-msgid "Start multi edit mode"
-msgstr ""
+msgstr "Режим мульти-редакторирования"
 
 #. ex:ts=4:et:
 #: ../plugins/textsize/textsize.plugin.desktop.in.in.h:1
 msgid "Easily increase and decrease the text size"
-msgstr ""
+msgstr "Простое увеличение и уменьшение размеров текста"
 
 #: ../plugins/textsize/textsize.plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Text Size"
-msgstr "Размер табуляции"
-
-#: ../plugins/sessionsaver/__init__.py:64
+msgstr "Размер текста"
+
+#: ../plugins/sessionsaver/__init__.py:84
+#, python-format
+msgid "Recover '%s' session"
+msgstr "Восстановить сеанс «%s»"
+
+#: ../plugins/sessionsaver/__init__.py:103
 msgid "Sa_ved sessions"
 msgstr "Сох_ранённые сеансы"
 
-#: ../plugins/sessionsaver/__init__.py:65
-#, fuzzy
+#: ../plugins/sessionsaver/__init__.py:105
 msgid "_Save current session"
-msgstr "Заменить выделенный текст"
+msgstr "_Сохранить текущий сеанс"
 
-#: ../plugins/sessionsaver/__init__.py:65
-#, fuzzy
+#: ../plugins/sessionsaver/__init__.py:106
 msgid "Save the current document list as a new session"
-msgstr "Переместить текущий документ в новое окно"
+msgstr "Сохранить список текущих документов как новый сеанс"
 
-#: ../plugins/sessionsaver/__init__.py:66
+#: ../plugins/sessionsaver/__init__.py:108
 msgid "_Manage saved sessions..."
 msgstr "_Управление сеансами..."
 
-#: ../plugins/sessionsaver/__init__.py:66
-#, fuzzy
+#: ../plugins/sessionsaver/__init__.py:109
 msgid "Open the saved session manager"
-msgstr "Открыть руководство gedit"
-
-#: ../plugins/sessionsaver/__init__.py:106
-#, python-format
-msgid "Recover '%s' session"
-msgstr "Восстановить сеанс «%s»"
-
-#: ../plugins/sessionsaver/dialogs.py:167
+msgstr "Открыть диспетчер сохранённых сеансов"
+
+#: ../plugins/sessionsaver/dialogs.py:173
 msgid "Session Name"
 msgstr "Имя сеанса"
 
@@ -381,56 +346,172 @@
 msgstr "Забудьте о том, что вы не пользуетесь табуляцией."
 
 #: ../plugins/smartspaces/smartspaces.plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Smart Spaces"
-msgstr "Вставлять пробелы"
+msgstr "«Умные» пробелы"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:1
+msgid "A Pango font name. Examples are \"Sans 12\" or \"Monospace Bold 14\"."
+msgstr "Название Pango-шрифта. Примеры: «Sans 12» или «Monospace Bold 14»."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:2
+msgid "Characters that are considered \"part of a word\""
+msgstr "Символы как часть слова"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:3
+msgid "Default color of terminal background"
+msgstr "Цвет фона по умолчанию для терминала"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:4
+msgid "Default color of terminal background, as a color specification (can be HTML-style hex digits, or a color name such as \"red\")."
+msgstr "Цвет фона по умолчанию для терминала, цвет можно указывать в HTML-стиле шестнадцатиричными цифрами или указать название цвета, например «red»."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:5
+msgid "Default color of text in the terminal"
+msgstr "Цвет текста по умолчанию для терминала"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:6
+msgid "Default color of text in the terminal, as a color specification (can be HTML-style hex digits, or a color name such as \"red\")."
+msgstr "Цвет текста по умолчанию для терминала, цвет можно указывать в HTML-стиле шестнадцатиричными цифрами или указать название цвета, например «red»."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:7
+#| msgid "Footnote"
+msgid "Font"
+msgstr "Шрифт"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:8
+msgid "If true, allow applications in the terminal to make text boldface."
+msgstr "Если установлено, разрешить приложениям в терминале делать текст полужирным."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:9
+msgid "If true, don't make a noise when applications send the escape sequence for the terminal bell."
+msgstr "Если установлено, не производить шума, когда приложения отправляют escape-последовательность для терминального гудка."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:10
+msgid "If true, pressing a key jumps the scrollbar to the bottom."
+msgstr "Если установлено, нажатие клавиш приводит к перемещению полосы прокрутки вниз."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:11
+msgid "If true, scrollback lines will never be discarded. The scrollback history is stored on disk temporarily, so this may cause the system to run out of disk space if there is a lot of output to the terminal."
+msgstr "Если установлено, строки прокрутки никогда не будут отбрасываться. История прокрутки временно сохраняется на диск, что может привести к дефициту свободного места на диске, если в терминале находится слишком длинный вывод."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:12
+msgid "If true, the terminal will use the desktop-global standard font if it's monospace (and the most similar font it can come up with otherwise)."
+msgstr "Если установлено, терминал будет использовать стандартный системный моноширный шрифт (если системный шрифт не моноширный, то будет использоваться наиболее подходящий шрифт)."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:13
+msgid "If true, the theme color scheme used for text entry boxes will be used for the terminal, instead of colors provided by the user."
+msgstr "Если установлено, цветовая схема оформления полей ввода текста будет использована для терминала вместо цветов, выбранных пользователем."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:14
+msgid "If true, whenever there's new output the terminal will scroll to the bottom."
+msgstr "Если установлено, каждый новый вывод в терминале будет прокручивать экран вниз."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:15
+msgid "Number of lines to keep in scrollback"
+msgstr "Количество строк в области прокрутки"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:16
+msgid "Number of scrollback lines to keep around. You can scroll back in the terminal by this number of lines; lines that don't fit in the scrollback are discarded. If scrollback-unlimited is true, this value is ignored."
+msgstr "Количество строк прокрутки. Вы можете прокручивать окно терминала на указанное количество строк; неуместившиеся строки будут отброшены. Если установлен ключ scrollback-unlimited, это значение будет проигнорировано."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:17
+msgid "Palette for terminal applications"
+msgstr "Палитра для приложений терминала"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:18
+msgid "Terminals have a 16-color palette that applications inside the terminal can use. This is that palette, in the form of a colon-separated list of color names. Color names should be in hex format e.g. \"#FF00FF\""
+msgstr "Терминалы используют 16-цветовую палитру, которую могут использовать приложения, запущенные в терминале. Палитра — список названий цветов, разделённых двоеточиями. Названия цветов записываются в hex-формате, например «#FF00FF»"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:19
+msgid "The cursor appearance"
+msgstr "Внешний вид курсора"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:20
+msgid "The possible values are \"block\" to use a block cursor, \"ibeam\" to use a vertical line cursor, or \"underline\" to use an underline cursor."
+msgstr "Допустимые значения: «block» — блочный курсор; «ibeam» — курсор в виде вертикальной линии; «underline» — курсор в виде подчёркивания."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:21
+msgid "The possible values are \"system\" to use the global cursor blinking settings, or \"on\" or \"off\" to set the mode explicitly."
+msgstr "Допустимые значения: «system» — системные параметры мигания курсора; «on» или «off» — непосредственная установка режима."
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:22
+#, fuzzy
+msgid "When selecting text by word, sequences of these characters are considered single words. Ranges can be given as \"A-Z\". Literal hyphen (not expressing a range) should be the first character given."
+msgstr "При выделении текста по словам, последовательности этих символов считаются отдельными словами. Диапазоны могут быть заданы как \"A-Z\". Литера дефис ()"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:23
+msgid "Whether an unlimited number of lines should be kept in scrollback"
+msgstr "Хранить ли неограниченное количество строк прокрутки"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:24
+msgid "Whether to allow bold text"
+msgstr "Разрешить ли полужирный текст"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:25
+msgid "Whether to blink the cursor"
+msgstr "Использовать ли мигающий курсор"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:26
+msgid "Whether to scroll to the bottom when a key is pressed"
+msgstr "Прокручивать ли экран вниз при нажатии на клавишу"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:27
+msgid "Whether to scroll to the bottom when there's new output"
+msgstr "Прокручивать ли экран вниз при поступлении нового вывода"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:28
+msgid "Whether to silence terminal bell"
+msgstr "Приглушать ли звуковые сигналы терминала"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:29
+msgid "Whether to use the colors from the theme for the terminal widget"
+msgstr "Использовать ли цвета из темы оформления для виджета терминала"
+
+#: ../plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml.in.in.h:30
+msgid "Whether to use the system font"
+msgstr "Использовать ли системный шрифт"
 
 #: ../plugins/terminal/terminal.plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Embed a terminal in the bottom pane."
-msgstr "Открыть терминал в каталоге документа"
+msgstr "Вставить терминал в нижнюю панель."
 
 #: ../plugins/terminal/terminal.plugin.desktop.in.in.h:2
-#, fuzzy
 msgid "Embedded Terminal"
-msgstr "Встроенные объект"
+msgstr "Встроенный терминал"
 
-#: ../plugins/terminal/terminal.py:307
+#: ../plugins/terminal/terminal.py:258
 msgid "Terminal"
 msgstr "Терминал"
 
-#: ../plugins/terminal/terminal.py:329
-#, fuzzy
+#: ../plugins/terminal/terminal.py:280
 msgid "C_hange Directory"
-msgstr "З_аменить на:"
+msgstr "_Сменить каталог"
 
-#: ../plugins/wordcompletion/gedit-word-completion-plugin.c:146
-#, fuzzy
+#: ../plugins/wordcompletion/gedit-word-completion-plugin.c:153
+#: ../plugins/wordcompletion/gedit-word-completion-plugin.c:200
 msgid "Document Words"
-msgstr "Тело документа"
+msgstr "Слова документа"
 
 #: ../plugins/wordcompletion/wordcompletion.plugin.desktop.in.in.h:1
-#, fuzzy
 msgid "Word Completion"
-msgstr "Соответствие скобок"
+msgstr "Дополнение слов"
 
 #: ../plugins/wordcompletion/wordcompletion.plugin.desktop.in.in.h:2
 msgid "Word completion using the completion framework"
-msgstr ""
+msgstr "Дополнение слов с помощью каркаса дополнений"
 
 #: ../plugins/synctex/synctex.plugin.desktop.in.in.h:1
 msgid "SyncTeX"
-msgstr ""
+msgstr "SyncTeX"
 
 #: ../plugins/synctex/synctex.plugin.desktop.in.in.h:2
 msgid "Synchronize between LaTeX and PDF with gedit and evince."
-msgstr ""
+msgstr "Синхронизация между LaTeX и PDF с помощью gedit и evince."
 
-#: ../plugins/synctex/synctex/synctex.py:280
-#: ../plugins/synctex/synctex/synctex.py:281
-#, fuzzy
+#: ../plugins/synctex/synctex/synctex.py:289
+#: ../plugins/synctex/synctex/synctex.py:290
 msgid "Forward Search"
-msgstr "Ссылка вперёд"
+msgstr "Прямой поиск"
 
 #: ../plugins/taglist/gedit-taglist-plugin.c:165
 #: ../plugins/taglist/gedit-taglist-plugin-panel.c:697
@@ -876,14 +957,12 @@
 msgstr "Версия HTML"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:118
-#, fuzzy
 msgid "HTML — Special Characters"
-msgstr "HTML - Специальные символы"
+msgstr "HTML — Специальные символы"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:119
-#, fuzzy
 msgid "HTML — Tags"
-msgstr "HTML - Теги"
+msgstr "HTML — Теги"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:120
 msgid "HTTP header name"
@@ -1523,24 +1602,20 @@
 msgstr "Описание таблицы"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:292
-#, fuzzy
 msgid "Target — Blank"
-msgstr "Цель - пусто"
+msgstr "Цель — пусто"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:293
-#, fuzzy
 msgid "Target — Parent"
-msgstr "Цель - родитель"
+msgstr "Цель — родитель"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:294
-#, fuzzy
 msgid "Target — Self"
-msgstr "Цель - текущий"
+msgstr "Цель — текущий"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:295
-#, fuzzy
 msgid "Target — Top"
-msgstr "Цель - верх"
+msgstr "Цель — верх"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:296
 msgid "Teletype or monospace text style"
@@ -1626,9 +1701,8 @@
 msgstr "Ширина"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:319
-#, fuzzy
 msgid "XHTML 1.0 — Tags"
-msgstr "XHTML 1.0 - Теги"
+msgstr "XHTML 1.0 — Теги"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:1
 msgid "Bibliography (cite)"
@@ -1771,9 +1845,8 @@
 msgstr "Элемент списка с меткой"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:37
-#, fuzzy
 msgid "Latex — Tags"
-msgstr "Latex - Теги"
+msgstr "Latex — Теги"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:38
 msgid "List description"
@@ -1924,31 +1997,24 @@
 msgstr "Неразрывный текст"
 
 #: ../plugins/taglist/taglist.plugin.desktop.in.in.h:1
-msgid ""
-"Provides a method to easily insert commonly used tags/strings into a "
-"document without having to type them."
-msgstr ""
-"Предоставляет простой способ вставки в документ часто используемых тегов или "
-"строк без необходимости набирать их вручную."
+msgid "Provides a method to easily insert commonly used tags/strings into a document without having to type them."
+msgstr "Предоставляет простой способ вставки в документ часто используемых тегов или строк без необходимости набирать их вручную."
 
 #: ../plugins/taglist/taglist.plugin.desktop.in.in.h:2
 msgid "Tag list"
 msgstr "Список тегов"
 
 #: ../plugins/taglist/XSLT.tags.xml.in.h:1
-#, fuzzy
 msgid "XSLT — Axes"
-msgstr "XSLT - Направления"
+msgstr "XSLT — Направления"
 
 #: ../plugins/taglist/XSLT.tags.xml.in.h:2
-#, fuzzy
 msgid "XSLT — Elements"
-msgstr "XSLT - Элементы"
+msgstr "XSLT — Элементы"
 
 #: ../plugins/taglist/XSLT.tags.xml.in.h:3
-#, fuzzy
 msgid "XSLT — Functions"
-msgstr "XSLT - Функции"
+msgstr "XSLT — Функции"
 
 #: ../plugins/taglist/XSLT.tags.xml.in.h:4
 msgid "ancestor"
@@ -2003,6 +2069,6 @@
 msgstr "текущий"
 
 #: ../plugins/taglist/XUL.tags.xml.in.h:1
-#, fuzzy
 msgid "XUL — Tags"
-msgstr "XUL - Теги"
+msgstr "XUL — Теги"
+