(trunk-1588/1589)

BIG update to translations, due to additions and changes. Unfortunately Launchpad
translations don't work with gettext fuzzy matches, so I'm afraid there's a lot
of rework for translators.

* Add a few new translatable strings
* Update the list of files to scan with additionas and deletions
* Update the template (pot) and country (po) files
* Fix the preferences window to be translated (LP:#1245806) (accidentally added earlier in gtk3 rev 1565, just noting here)
* Update tab close button icon to match lighter gnome-terminal one (accidentally added earlier in gtk3 rev 1565, just noting here)

po/POTFILES.in

@@ -18,12 +18,16 @@ terminatorlib/factory.py
 terminatorlib/freebsd.py
 terminatorlib/__init__.py
 terminatorlib/keybindings.py
+terminatorlib/layoutlauncher.glade
+terminatorlib/layoutlauncher.py
 terminatorlib/notebook.py
 terminatorlib/optionparse.py
 terminatorlib/paned.py
 terminatorlib/plugin.py
 terminatorlib/plugins/activitywatch.py
 terminatorlib/plugins/custom_commands.py
+terminatorlib/plugins/logger.py
+terminatorlib/plugins/maven.py
 terminatorlib/plugins/terminalshot.py
 terminatorlib/plugins/testplugin.py
 terminatorlib/plugins/url_handlers.py
@@ -34,10 +38,6 @@ terminatorlib/signalman.py
 terminatorlib/terminal_popup_menu.py
 terminatorlib/terminal.py
 terminatorlib/terminator.py
-terminatorlib/tests/__init__.py
-terminatorlib/tests/testborg.py
-terminatorlib/tests/test_doctests.py
-terminatorlib/tests/testsignalman.py
 terminatorlib/titlebar.py
 terminatorlib/translation.py
 terminatorlib/util.py

po/update_all_po.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+# Update translation files
+for po_file in `ls *.po`; do
+  msgmerge -N -U ${po_file} terminator.pot
+done

terminatorlib/plugins/custom_commands.py

@@ -64,7 +64,7 @@ class CustomCommandsMenu(plugin.MenuItem):
         submenu = Gtk.Menu()
         item.set_submenu(submenu)
 
-        menuitem = Gtk.MenuItem(_('Preferences'))
+        menuitem = Gtk.MenuItem(_('_Preferences'))
         menuitem.connect("activate", self.configure)
         submenu.append(menuitem)
 

terminatorlib/plugins/logger.py

@@ -63,7 +63,7 @@ class Logger(plugin.MenuItem):
         
     def start_logger(self, _widget, Terminal):
         """ Handle menu item callback by saving text to a file"""
-        savedialog = Gtk.FileChooserDialog(title="Save Log File As",
+        savedialog = Gtk.FileChooserDialog(title=_("Save Log File As"),
                                            action=self.dialog_action,
                                            buttons=self.dialog_buttons)
         savedialog.set_do_overwrite_confirmation(True)

terminatorlib/plugins/terminalshot.py

@@ -34,7 +34,7 @@ class TerminalShot(plugin.MenuItem):
         # Grab a pixbuf of the terminal
         orig_pixbuf = widget_pixbuf(terminal)
 
-        savedialog = Gtk.FileChooserDialog(title="Save image",
+        savedialog = Gtk.FileChooserDialog(title=_("Save image"),
                                            action=self.dialog_action,
                                            buttons=self.dialog_buttons)
         savedialog.set_do_overwrite_confirmation(True)

terminatorlib/preferences.glade

@@ -410,7 +410,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Behaviour&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Behavior&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                       <packing>
@@ -1196,7 +1196,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Font colour:</property>
+                                        <property name="label" translatable="yes">Font color:</property>
                                       </object>
                                       <packing>
                                         <property name="top_attach">1</property>
@@ -1674,7 +1674,7 @@
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
                                             <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Colour:</property>
+                                            <property name="label" translatable="yes">Color:</property>
                                           </object>
                                           <packing>
                                             <property name="top_attach">1</property>
@@ -3893,7 +3893,7 @@
                             <property name="yalign">0</property>
                             <property name="label" translatable="yes">The goal of this project is to produce a useful tool for arranging terminals. It is inspired by programs such as gnome-multi-term, quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports).
 
-Much of the behaviour of Terminator is based on GNOME Terminal, and we are adding more features from that as time goes by, but we also want to extend out in different directions with useful features for sysadmins and other users. If you have any suggestions, please file wishlist bugs! (see left for the Development link)</property>
+Much of the behavior of Terminator is based on GNOME Terminal, and we are adding more features from that as time goes by, but we also want to extend out in different directions with useful features for sysadmins and other users. If you have any suggestions, please file wishlist bugs! (see left for the Development link)</property>
                             <property name="wrap">True</property>
                             <property name="width_chars">55</property>
                           </object>

terminatorlib/prefseditor.py

@@ -81,75 +81,75 @@ class PrefsEditor:
                 'solarized': '#073642:#dc322f:#859900:#b58900:\
 #268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:\
 #839496:#6c71c4:#93a1a1:#fdf6e3'}
-    keybindingnames = { 'zoom_in'          : 'Increase font size',
+    keybindingnames = { 'zoom_in'          : _('Increase font size'),
-                        'zoom_out'         : 'Decrease font size',
+                        'zoom_out'         : _('Decrease font size'),
-                        'zoom_normal'      : 'Restore original font size',
+                        'zoom_normal'      : _('Restore original font size'),
-                        'new_tab'          : 'Create a new tab',
+                        'new_tab'          : _('Create a new tab'),
-                        'cycle_next'       : 'Focus the next terminal',
+                        'cycle_next'       : _('Focus the next terminal'),
-                        'cycle_prev'       : 'Focus the previous terminal',
+                        'cycle_prev'       : _('Focus the previous terminal'),
-                        'go_next'          : 'Focus the next terminal',
+                        'go_next'          : _('Focus the next terminal'),
-                        'go_prev'          : 'Focus the previous terminal',
+                        'go_prev'          : _('Focus the previous terminal'),
-                        'go_up'            : 'Focus the terminal above',
+                        'go_up'            : _('Focus the terminal above'),
-                        'go_down'          : 'Focus the terminal below',
+                        'go_down'          : _('Focus the terminal below'),
-                        'go_left'          : 'Focus the terminal left',
+                        'go_left'          : _('Focus the terminal left'),
-                        'go_right'         : 'Focus the terminal right',
+                        'go_right'         : _('Focus the terminal right'),
-                        'rotate_cw'        : 'Rotate terminals clockwise',
+                        'rotate_cw'        : _('Rotate terminals clockwise'),
-                        'rotate_ccw'        : 'Rotate terminals counter-clockwise',
+                        'rotate_ccw'       : _('Rotate terminals counter-clockwise'),
-                        'split_horiz'      : 'Split horizontally',
+                        'split_horiz'      : _('Split horizontally'),
-                        'split_vert'       : 'Split vertically',
+                        'split_vert'       : _('Split vertically'),
-                        'close_term'       : 'Close terminal',
+                        'close_term'       : _('Close terminal'),
-                        'copy'             : 'Copy selected text',
+                        'copy'             : _('Copy selected text'),
-                        'paste'            : 'Paste clipboard',
+                        'paste'            : _('Paste clipboard'),
-                        'toggle_scrollbar' : 'Show/Hide the scrollbar',
+                        'toggle_scrollbar' : _('Show/Hide the scrollbar'),
-                        'search'           : 'Search terminal scrollback',
+                        'search'           : _('Search terminal scrollback'),
-                        'page_up'          : 'Scroll upwards one page',
+                        'page_up'          : _('Scroll upwards one page'),
-                        'page_down'        : 'Scroll downwards one page',
+                        'page_down'        : _('Scroll downwards one page'),
-                        'page_up_half'     : 'Scroll upwards half a page',
+                        'page_up_half'     : _('Scroll upwards half a page'),
-                        'page_down_half'   : 'Scroll downwards half a page',
+                        'page_down_half'   : _('Scroll downwards half a page'),
-                        'line_up'          : 'Scroll upwards one line',
+                        'line_up'          : _('Scroll upwards one line'),
-                        'line_down'        : 'Scroll downwards one line',
+                        'line_down'        : _('Scroll downwards one line'),
-                        'close_window'     : 'Close window',
+                        'close_window'     : _('Close window'),
-                        'resize_up'        : 'Resize the terminal up',
+                        'resize_up'        : _('Resize the terminal up'),
-                        'resize_down'      : 'Resize the terminal down',
+                        'resize_down'      : _('Resize the terminal down'),
-                        'resize_left'      : 'Resize the terminal left',
+                        'resize_left'      : _('Resize the terminal left'),
-                        'resize_right'     : 'Resize the terminal right',
+                        'resize_right'     : _('Resize the terminal right'),
-                        'move_tab_right'   : 'Move the tab right',
+                        'move_tab_right'   : _('Move the tab right'),
-                        'move_tab_left'    : 'Move the tab left',
+                        'move_tab_left'    : _('Move the tab left'),
-                        'toggle_zoom'      : 'Maximise terminal',
+                        'toggle_zoom'      : _('Maximise terminal'),
-                        'scaled_zoom'      : 'Zoom terminal',
+                        'scaled_zoom'      : _('Zoom terminal'),
-                        'next_tab'         : 'Switch to the next tab',
+                        'next_tab'         : _('Switch to the next tab'),
-                        'prev_tab'         : 'Switch to the previous tab',
+                        'prev_tab'         : _('Switch to the previous tab'),
-                        'switch_to_tab_1'  : 'Switch to the first tab',
+                        'switch_to_tab_1'  : _('Switch to the first tab'),
-                        'switch_to_tab_2'  : 'Switch to the second tab',
+                        'switch_to_tab_2'  : _('Switch to the second tab'),
-                        'switch_to_tab_3'  : 'Switch to the third tab',
+                        'switch_to_tab_3'  : _('Switch to the third tab'),
-                        'switch_to_tab_4'  : 'Switch to the fourth tab',
+                        'switch_to_tab_4'  : _('Switch to the fourth tab'),
-                        'switch_to_tab_5'  : 'Switch to the fifth tab',
+                        'switch_to_tab_5'  : _('Switch to the fifth tab'),
-                        'switch_to_tab_6'  : 'Switch to the sixth tab',
+                        'switch_to_tab_6'  : _('Switch to the sixth tab'),
-                        'switch_to_tab_7'  : 'Switch to the seventh tab',
+                        'switch_to_tab_7'  : _('Switch to the seventh tab'),
-                        'switch_to_tab_8'  : 'Switch to the eighth tab',
+                        'switch_to_tab_8'  : _('Switch to the eighth tab'),
-                        'switch_to_tab_9'  : 'Switch to the ninth tab',
+                        'switch_to_tab_9'  : _('Switch to the ninth tab'),
-                        'switch_to_tab_10' : 'Switch to the tenth tab',
+                        'switch_to_tab_10' : _('Switch to the tenth tab'),
-                        'full_screen'      : 'Toggle fullscreen',
+                        'full_screen'      : _('Toggle fullscreen'),
-                        'reset'            : 'Reset the terminal',
+                        'reset'            : _('Reset the terminal'),
-                        'reset_clear'      : 'Reset and clear the terminal',
+                        'reset_clear'      : _('Reset and clear the terminal'),
-                        'hide_window'      : 'Toggle window visibility',
+                        'hide_window'      : _('Toggle window visibility'),
-                        'group_all'        : 'Group all terminals',
+                        'group_all'        : _('Group all terminals'),
-                        'group_all_toggle' : 'Group/Ungroup all terminals',
+                        'group_all_toggle' : _('Group/Ungroup all terminals'),
-                        'ungroup_all'      : 'Ungroup all terminals',
+                        'ungroup_all'      : _('Ungroup all terminals'),
-                        'group_tab'        : 'Group terminals in tab',
+                        'group_tab'        : _('Group terminals in tab'),
-                        'group_tab_toggle' : 'Group/Ungroup terminals in tab',
+                        'group_tab_toggle' : _('Group/Ungroup terminals in tab'),
-                        'ungroup_tab'      : 'Ungroup terminals in tab',
+                        'ungroup_tab'      : _('Ungroup terminals in tab'),
-                        'new_window'       : 'Create a new window',
+                        'new_window'       : _('Create a new window'),
-                        'new_terminator'   : 'Spawn a new Terminator process',
+                        'new_terminator'   : _('Spawn a new Terminator process'),
-                        'broadcast_off'    : 'Don\'t broadcast key presses',
+                        'broadcast_off'    : _('Don\'t broadcast key presses'),
-                        'broadcast_group'  : 'Broadcast key presses to group',
+                        'broadcast_group'  : _('Broadcast key presses to group'),
-                        'broadcast_all'    : 'Broadcast key events to all',
+                        'broadcast_all'    : _('Broadcast key events to all'),
-                        'insert_number'    : 'Insert terminal number',
+                        'insert_number'    : _('Insert terminal number'),
-                        'insert_padded'    : 'Insert zero padded terminal number',
+                        'insert_padded'    : _('Insert padded terminal number'),
-                        'edit_window_title': 'Edit window title',
+                        'edit_window_title': _('Edit window title'),
-                        'layout_launcher'  : 'Open layout launcher window',
+                        'layout_launcher'  : _('Open layout launcher window'),
-                        'next_profile'     : 'Switch to next profile',
+                        'next_profile'     : _('Switch to next profile'),
-                        'previous_profile' : 'Switch to previous profile'
+                        'previous_profile' : _('Switch to previous profile')
             }
 
     def __init__ (self, term):