Ground Control

Merge lp://staging/~deejay1/groundcontrol/fix-missing_string into lp://staging/groundcontrol

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

Marked a missing string for translation and updated the POT file

Revision history for this message
Łukasz Jernaś (deejay1) wrote :

Oh and as a sidenote, GC still crashes for me and ~/groundcontrol.log say NULL (zero, nada, nothing). Any hints? (I can arrange for a ssh/vnc session if you like, just drop me a note/xmpp on my email)

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

If you can revert the pot file, I'll merge it in. The problem is that if you look at the diff you'll see massive numbers of changes, but not very many string changes (only about 4 real changes) but the diff is huge because of all the line number changes.

I'll regenerate the pot file soon, don't worry. I'm waiting for a threshold of about 10 new strings during this rapid phase of development.

review: Needs Fixing
lp://staging/~deejay1/groundcontrol/fix-missing_string updated
178. By Łukasz Jernaś

Reverted pot file from commit.

Revision history for this message
Łukasz Jernaś (deejay1) wrote :

Done

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

Merged in, thanks so much for keeping everything translatable.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GroundControl/branches.py'
2--- GroundControl/branches.py 2010-02-06 21:35:32 +0000
3+++ GroundControl/branches.py 2010-02-07 16:04:13 +0000
4@@ -127,7 +127,7 @@
5 old = label.get_text()
6 if "*" not in old:
7 label.set_markup(
8- "<span foreground='red'>*Required* %s</span>" % old)
9+ _("<span foreground='red'>*Required* %s</span>") % old)
10 else:
11 logging.debug("This should never happen.")
12

Subscribers

People subscribed via source and target branches