Merge lp:~jflaker/scratch/BugFix1376573 into lp:~elementary-apps/scratch/scratch

Proposed by Jeffrey Flaker
Status: Merged
Approved by: Cody Garver
Approved revision: 1391
Merged at revision: 1391
Proposed branch: lp:~jflaker/scratch/BugFix1376573
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 11 lines (+1/-1)
1 file modified
src/Scratch.vala (+1/-1)
To merge this branch: bzr merge lp:~jflaker/scratch/BugFix1376573
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
Danielle Foré Pending
Review via email: mp+237200@code.launchpad.net

This proposal supersedes a proposal from 2014-10-05.

Commit message

Fixed typo in "Current working directory"

Description of the change

fixed mis-spelling. "directoy" should be "directory"

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote : Posted in a previous version of this proposal

OP, you've proposed merging into the wrong branch. Please repropose against lp:scratch

review: Disapprove
Revision history for this message
Jeffrey Flaker (jflaker) wrote :

Proposal fixed. Thanks

Revision history for this message
Cody Garver (codygarver) wrote :

It looks like you manually updated the po files, cmake handles that for us so please revert

bzr revert -r 1389 po/

review: Needs Fixing
lp:~jflaker/scratch/BugFix1376573 updated
1391. By Jeffrey Flaker

Backed out changes to po/

Revision history for this message
Jeffrey Flaker (jflaker) wrote :

Thanks! Still getting the hang of this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Scratch.vala'
2--- src/Scratch.vala 2014-08-30 13:54:17 +0000
3+++ src/Scratch.vala 2014-10-10 00:40:55 +0000
4@@ -223,7 +223,7 @@
5 { "new-window", 'n', 0, OptionArg.NONE, out create_new_window, N_("New Window"), null },
6 { "version", 'v', 0, OptionArg.NONE, out print_version, N_("Print version info and exit"), null },
7 { "set", 's', 0, OptionArg.STRING, ref _app_cmd_name, N_("Set of plugins"), "" },
8- { "cwd", 'c', 0, OptionArg.STRING, ref _cwd, N_("Current working directoy"), "" },
9+ { "cwd", 'c', 0, OptionArg.STRING, ref _cwd, N_("Current working directory"), "" },
10 { null }
11 };
12

Subscribers

People subscribed via source and target branches