1141971 - [Privacy Controls] fix remaining words

Status: RESOLVED FIXED

(Firefox OS Graveyard :: Gaia::Settings, defect)

Description

[[e-mail]]

Some wording indicates 'privacy panel' should all be 'privacy controls'

http://transvision.mozfr.org/?recherche=privacy+panel&repo=gaia&sourcelocale=en-US&locale=en-US&search_type=strings

Comment 1

[[e-mail]]

YuWen would like to fix this issue. It's a pretty simple bug so the main effort would be to familiar with the contribution process.

Please take a look on
https://leanpub.com/gaiafromabove/read#leanpub-auto-chapter-2---get-in-touch-with-gaia

Which supposedly provide the integrated guide from getting source code, how code is organized, and where to modify the string for localization (hint 2.7.3)

If anything not that clear to you, feel free to ask question on IRC moznet > #mozilla-taiwan or just ask in this thread.

Comment 2

[Yu-wen Pwu]

Pull Request #28877
https://github.com/mozilla-b2g/gaia/pull/28877

Comment 3

[[e-mail]]

Thanks for providing your first pull request(PR)!

I've check the PR and find some nits that can be improved. Please check them on github. Once you done the change, please squish your commits into single commit so we can have more clear commit log while the PR is merged.

(Here is the reference about how to squich commit http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)

To properly get the commit reviewed, please use 'Add an attachment' and paste your Pull Request on file field. Then set review flag to Marta ([e-mail]), who is the module owner of Privacy Controls.

Comment 4

[GitHub Autolander Bot]

Attachment: [gaia] yuwen41200:master > mozilla-b2g:master

Comment 5

[Yu-wen Pwu]

(In reply to Fred Lin [:gasolin] from comment #3)
> I've check the PR and find some nits that can be improved. Please check them
> on github. Once you done the change, please squish your commits into single
> commit so we can have more clear commit log while the PR is merged.
Since the commit history contains commits from upstream, and the PR is undergoing tests, I wonder if it is appropriate to squish all commits together now.

Comment 6

[[e-mail]]

Ooh I did not make the instruction clear. You should not use `git pull` to update your pull request. The best way to keep your commits above recent Gaia changes is use command:

```
$ git remote update
$ git rebase upstream/master`
```

Sorry I've not mention that. Could you open another pull request to provide your patch with single commit?

Comment 7

[[e-mail]]

Comment on attachment 8577868 [details] [review]
[gaia] yuwen41200:master > mozilla-b2g:master

According to above comment, its better to wait for a clean PR for review.

Comment 8

[Yu-wen Pwu]

Thanks! I have pushed the squashed commit.
Now the PR should be correct.
https://github.com/mozilla-b2g/gaia/pull/28877

Comment 9

[[e-mail]]

Thanks for your effort. Looks good to me.
It's time to set the flag for review!

Comment 10

[[e-mail]]

Yu-wen, Congrets for your first review+!

merged to master https://github.com/mozilla-b2g/gaia/commit/f66682c9e9d291c41f349ea4481830c5a8935329
thanks!