Merge lp://staging/~deejay1/groundcontrol/typo-fixes into lp://staging/groundcontrol

Proposed by Łukasz Jernaś
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~deejay1/groundcontrol/typo-fixes
Merge into: lp://staging/groundcontrol
Diff against target: 73 lines (+7/-7)
3 files modified
GroundControl/__init__.py (+2/-2)
GroundControl/branches.py (+1/-1)
nautilus-groundcontrol.py (+4/-4)
To merge this branch: bzr merge lp://staging/~deejay1/groundcontrol/typo-fixes
Reviewer Review Type Date Requested Status
Martin Owens Approve
Review via email: mp+19368@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Łukasz Jernaś (deejay1) wrote :

I've noticed some typos etc. which may were visible while trying to get to the root of the i18n issue :/

Revision history for this message
Martin Owens (doctormo) wrote :

Thanks for the keen eye, merged in and approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'GroundControl/__init__.py'
--- GroundControl/__init__.py 2010-02-12 16:11:05 +0000
+++ GroundControl/__init__.py 2010-02-15 22:10:27 +0000
@@ -15,7 +15,7 @@
15# along with this program. If not, see <http://www.gnu.org/licenses/>15# along with this program. If not, see <http://www.gnu.org/licenses/>
16#16#
17"""17"""
18Launchpad desktop intergration libraries for GroundControl18Launchpad desktop integration libraries for GroundControl
19"""19"""
2020
21import os21import os
@@ -42,7 +42,7 @@
42PO_DIR = os.path.join(BASE_DIR, 'po')42PO_DIR = os.path.join(BASE_DIR, 'po')
43DOC_DIR = os.path.join(BASE_DIR, 'doc')43DOC_DIR = os.path.join(BASE_DIR, 'doc')
4444
45# Globally deal with locallazation (i11n)45# Globally deal with localization (l10n)
46gettext.bindtextdomain(__appname__, PO_DIR)46gettext.bindtextdomain(__appname__, PO_DIR)
47locale.setlocale(locale.LC_ALL, '')47locale.setlocale(locale.LC_ALL, '')
48gettext.textdomain(__appname__)48gettext.textdomain(__appname__)
4949
=== modified file 'GroundControl/branches.py'
--- GroundControl/branches.py 2010-02-14 00:15:21 +0000
+++ GroundControl/branches.py 2010-02-15 22:10:27 +0000
@@ -15,7 +15,7 @@
15# along with this program. If not, see <http://www.gnu.org/licenses/>15# along with this program. If not, see <http://www.gnu.org/licenses/>
16#16#
17"""17"""
18Small app for selecting launchpad branches18Small app for selecting Launchpad branches
19"""19"""
2020
21# Import standard python libs21# Import standard python libs
2222
=== modified file 'nautilus-groundcontrol.py'
--- nautilus-groundcontrol.py 2010-02-15 18:30:35 +0000
+++ nautilus-groundcontrol.py 2010-02-15 22:10:27 +0000
@@ -15,7 +15,7 @@
15# along with this program. If not, see <http://www.gnu.org/licenses/>15# along with this program. If not, see <http://www.gnu.org/licenses/>
16#16#
17"""17"""
18This is a simple extension for nautilus to allow project intergration.18This is a simple extension for nautilus to allow project integration.
19"""19"""
2020
21import os21import os
@@ -74,7 +74,7 @@
7474
75 @property75 @property
76 def status(self):76 def status(self):
77 """Get the status of the launchpad configuration"""77 """Get the status of the Launchpad configuration"""
78 return os.path.exists(DEFAULT_CRED % PROJECT_NAME)78 return os.path.exists(DEFAULT_CRED % PROJECT_NAME)
7979
80 def get_widget(self, url, window):80 def get_widget(self, url, window):
@@ -214,7 +214,7 @@
214 path = os.path.join(self._path, bug.project_id)214 path = os.path.join(self._path, bug.project_id)
215 if os.path.exists(path):215 if os.path.exists(path):
216 # Load project without touching bug.project because that216 # Load project without touching bug.project because that
217 # Would take more time to load the object and it's attr.217 # would take more time to load the object and it's attr.
218 project = Project(path)218 project = Project(path)
219 else:219 else:
220 # Error because this shouldn't happen220 # Error because this shouldn't happen
@@ -553,7 +553,7 @@
553 button.show()553 button.show()
554554
555 def show_help(self, widget=None):555 def show_help(self, widget=None):
556 """Show a simple icon buttont hat when clicked shows help"""556 """Show a simple icon button that shows help when clicked"""
557 if HelpApp.is_help(self._mode_id):557 if HelpApp.is_help(self._mode_id):
558 HelpApp(self._mode_id, parent=self._bar._window, start_loop=True)558 HelpApp(self._mode_id, parent=self._bar._window, start_loop=True)
559559

Subscribers

People subscribed via source and target branches