[Pkg-privacy-commits] [onioncircuits] 21/39: Merge remote-tracking branch 'origin/master' into feature/11210-review-user-strings

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

sascha-guest pushed a commit to branch master
in repository onioncircuits.

commit c23aa0408490c0100c1e9bb532da99165fd66482
Merge: 3de7ae3 64d3e7a
Author: sajolida <sajolida at pimienta.org>
Date:   Thu Apr 14 16:39:50 2016 +0000

    Merge remote-tracking branch 'origin/master' into feature/11210-review-user-strings
    
    Conflicts:
    	onioncircuits

 HACKING              | 26 ++++++++++++++
 README               |  8 +++++
 onioncircuits        | 96 +++++++++++++++++++++++++++++++++++++++-------------
 po/fr.po             | 43 ++++++++++++-----------
 po/onioncircuits.pot |  2 +-
 5 files changed, 131 insertions(+), 44 deletions(-)

diff --cc onioncircuits
index 62a1aca,c702e72..7aedcae
--- a/onioncircuits
+++ b/onioncircuits
@@@ -135,14 -142,19 +139,19 @@@ class OnionCircuitsWindow(Gtk.Applicati
          # Circuit details
          self._path = Gtk.ListBox()
          self._path.set_selection_mode(Gtk.SelectionMode.NONE)
-         placeholder = Gtk.Label(_("Click on a circuit for more detail about its Tor relays."))
-         placeholder.show()
-         self._path.set_placeholder(placeholder)
-         self._path.set_property('margin', 6)
-         self._path.set_property('expand', True)
-         self._path.set_property('halign', Gtk.Align.FILL)
-         self._path.set_property('valign', Gtk.Align.FILL)
-         grid.attach(self._path, 1, 1, 1, 1)
 -        self._placeholder = Gtk.Label(_("Click on a path to get details"))
++        self._placeholder = Gtk.Label(_("Click on a circuit for more detail about its Tor relays."))
+         self._path.set_placeholder(self._placeholder)
+ 
+         scrolledwindow_path = Gtk.ScrolledWindow()
+         scrolledwindow_path.add(self._path)
+         scrolledwindow_path.set_property('margin', 6)
+         scrolledwindow_path.set_property('expand', True)
+         scrolledwindow_path.set_property('halign', Gtk.Align.FILL)
+         scrolledwindow_path.set_property('valign', Gtk.Align.FILL)
+         scrolledwindow_path.set_policy(
+                 hscrollbar_policy=Gtk.PolicyType.AUTOMATIC,
+                 vscrollbar_policy=Gtk.PolicyType.AUTOMATIC)
+         grid.attach(scrolledwindow_path, 1, 1, 1, 1)
  
          self.show_all()
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncircuits.git