Merge remote-tracking branch 'upstream/master'

Author: gsemet

AUTHORS

@@ -1,7 +1,5 @@
-Lincoln de Sousa <[email protected]>
-Pierre-Yves Chibon (pingou) <[email protected]>
-Aleksandar Krsteski (SnapShot) <[email protected]>
-
-Contributors:
-Max Ulidtko <[email protected]>
-Gabriel Falcão <[email protected]>
+Max Ulidtko <[email protected]>, 2010-2013
+Pierre-Yves Chibon (pingou) <[email protected]>, 2007-2013
+Aleksandar Krsteski (SnapShot) <[email protected]>, 2010-2013
+Lincoln de Sousa <[email protected]>, 2007-2013
+Gabriel Falcão <[email protected]>, 2007

NEWS

@@ -1,3 +1,14 @@
+changes since 0.4.4:
+  - Custom tab titles are no longer overriden by VTE ones (rgaudin)
+  - Absent notifications daemon is no longer fatal
+  - Fix for <Ctrl>key hotkeys being recorded as <Primary>key (Ian MacLeod)
+  - Font resizing using <Ctrl>+ and <Ctrl>- (Eiichi Sato)
+  - D-Bus and commandline interface improvements
+  - L10n:
+    * Norwegian Bokmål po file renamed to nb_NO.po (Bjørn Lie)
+    * Added translations: Croatian, Czech, Dutch, Galician, Indonesian, Ukrainian.
+    * Updated translations: Catalan, French, German, Hungarian, Spanish, Swedish.
+
 changes since 0.4.3:
 
   - New icon for both guake and guake-prefs

README

@@ -9,14 +9,11 @@ environment. Its style of window is based on an fps games, and one of
 its goals is be easy to reach.
 
 Guake is written mostly in python and has a little piece in C (global
-hotkey stuff). The code is placed in the src directory. Files and
-images are in the data directory. If you're looking for translation
-stuff, you should take a look at the po directory.
-
+hotkeys stuff). The code is placed in the src directory. Files and
+images are in the data directory. Translation stuff is in the po directory.
 
 Features? Bugs? Information?
-Feel free to consult our website at:
-http://guake.org/
+Visit http://guake.org/
 
 
 LICENSE
@@ -62,14 +59,12 @@ sudo apt-get build-dep guake
 INSTALLATION
 ~~~~~~~~~~~~
 We are using an autotools based installation, so if you got the source
-of guake from a release file, please do the following::
+of guake from a release tarball, please do the following:
 
-    $ gunzip -c guake-x.x.x.tar.gz | tar x
+    $ tar -xzvf guake-x.x.x.tar.gz
     $ cd guake-x.x.x
     $ ./configure && make
-    $ su
-    (give the root password here!)
-    # make install
+    $ sudo make install
 
 If you receive a message asking you if you have installed
 guake.schemas properly when launching guake, it means that your

TODO

@@ -1,5 +1,4 @@
-# Copyright (C) 2007-2012 Lincoln de Sousa <[email protected]>
-# Copyright (C) 2007 Gabriel Falcão <[email protected]>
+# Copyright (C) 2007-2013 Guake authors
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -16,7 +15,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-AC_INIT([guake], [0.4.4], [http://guake.org/])
+AC_INIT([guake], [0.4.5], [http://guake.org/])
 
 AC_CONFIG_HEADERS([config.h])
 
@@ -41,7 +40,7 @@ PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
 AC_SUBST([PYTHON_LIBS])
 AC_SUBST([PYTHON_CFLAGS])
 
-dnl gtk dependencie
+dnl gtk dependency
 GTK_REQUIRED=2.10.0
 PKG_CHECK_MODULES([DEPENDENCIES], [
     gtk+-2.0 >= $GTK_REQUIRED
@@ -81,7 +80,7 @@ AM_GCONF_SOURCE_2
 
 dnl Internationalization
 GETTEXT_PACKAGE=guake
-ALL_LINGUAS="pt_BR ja es ru pl no de it fa hu el zh_CN fr"
+ALL_LINGUAS="ca cs_CZ de el es fa fr gl hr hu id it ja nb_NO nl pa pl pt_BR ru sv tr uk_UA zh_CN"
 
 AC_SUBST([GETTEXT_PACKAGE])
 AC_SUBST([ALL_LINGUAS])

configure.ac

@@ -1,6 +1,5 @@
 <gconfschemafile>
     <schemalist>
-
         <schema>
             <key>/schemas/apps/guake/general/default_shell</key>
             <applyto>/apps/guake/general/default_shell</applyto>
@@ -28,7 +27,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/use_trayicon</key>
             <applyto>/apps/guake/general/use_trayicon</applyto>
             <owner>guake</owner>
@@ -40,7 +39,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/use_popup</key>
             <applyto>/apps/guake/general/use_popup</applyto>
             <owner>guake</owner>
@@ -53,7 +52,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/prompt_on_quit</key>
             <applyto>/apps/guake/general/prompt_on_quit</applyto>
             <owner>guake</owner>
@@ -117,7 +116,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/window_width</key>
             <applyto>/apps/guake/general/window_width</applyto>
             <owner>guake</owner>
@@ -130,7 +129,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/window_height</key>
             <applyto>/apps/guake/general/window_height</applyto>
             <owner>guake</owner>
@@ -143,18 +142,18 @@
             </locale>
         </schema>
 
-	<schema>
-	    <key>/schemas/apps/guake/general/window_halignment</key>
-	    <applyto>/apps/guake/general/window_halignment</applyto>
-	    <owner>guake</owner>
-	    <type>int</type>
-	    <default>0</default>
-	    <locale name="C">
-	    <short>Window horizontal alignment.</short>
-	    <long>Place Guake at:
-	          0: center, 1: left, 2: right</long>
-	    </locale>
-	</schema>
+        <schema>
+            <key>/schemas/apps/guake/general/window_halignment</key>
+            <applyto>/apps/guake/general/window_halignment</applyto>
+            <owner>guake</owner>
+            <type>int</type>
+            <default>0</default>
+            <locale name="C">
+            <short>Window horizontal alignment.</short>
+            <long>Place Guake at:
+                  0: center, 1: left, 2: right</long>
+            </locale>
+        </schema>
 
         <schema>
             <key>/schemas/apps/guake/general/use_scrollbar</key>
@@ -220,7 +219,7 @@
             </locale>
         </schema>
 
-	<schema>
+        <schema>
             <key>/schemas/apps/guake/general/use_vte_titles</key>
             <applyto>/apps/guake/general/use_vte_titles</applyto>
             <owner>guake</owner>
@@ -414,6 +413,42 @@
             </locale>
         </schema>
 
+        <schema>
+            <key>/schemas/apps/guake/keybindings/local/zoom_in</key>
+            <applyto>/apps/guake/keybindings/local/zoom_in</applyto>
+            <owner>guake</owner>
+            <type>string</type>
+            <default>&lt;Control&gt;plus</default>
+            <locale name="C">
+                <short>Zoom in.</short>
+                <long>Increase the font size of the terminals.</long>
+            </locale>
+        </schema>
+
+        <schema>
+            <key>/schemas/apps/guake/keybindings/local/zoom_in_alt</key>
+            <applyto>/apps/guake/keybindings/local/zoom_in_alt</applyto>
+            <owner>guake</owner>
+            <type>string</type>
+            <default>&lt;Control&gt;equal</default>
+            <locale name="C">
+                <short>Zoom in (alternative)</short>
+                <long>Additional shortcut for zooming in.</long>
+            </locale>
+        </schema>
+
+        <schema>
+            <key>/schemas/apps/guake/keybindings/local/zoom_out</key>
+            <applyto>/apps/guake/keybindings/local/zoom_out</applyto>
+            <owner>guake</owner>
+            <type>string</type>
+            <default>&lt;Control&gt;minus</default>
+            <locale name="C">
+                <short>Zoom out.</short>
+                <long>Decrease the font size of the terminals.</long>
+            </locale>
+        </schema>
+
         <schema>
             <key>/schemas/apps/guake/keybindings/local/clipboard_copy</key>
             <applyto>/apps/guake/keybindings/local/clipboard_copy</applyto>

data/guake.schemas

@@ -1,3 +1,12 @@
+2013-09-22  Maxim Ivanov <[email protected]>
+
+	* Renamed no.po -> nb_NO.po. Thanks to Bjørn Lie (zaitor).
+	* Added translations: Croatian, Czech, Dutch, Galician, Indonesian, Ukrainian.
+	* Updated translations: Catalan, French, German, Hungarian, Spanish,
+	Swedish.
+
+	Thanks to all the teams at Transifex; you guys rock!
+
 2009-10-04  Lincoln de Sousa  <[email protected]>
 
 	* hu.po: Added. Thanks to Kruxer.

po/ChangeLog

@@ -8,3 +8,4 @@ src/dbusiface.py
 src/guake
 src/prefs.py
 src/common.py
+src/notifier.py