Merge lp:~mabkenar/ubuntu-system-settings/typo-fix into lp:ubuntu-system-settings

[Masoud Abkenar]

typo fix in wifi settings

Using certificates is recommend as it increases security. (recommend -> recommended)

[Jonas G. Drange (jonas-drange)]

Thanks, Masoud!

review: Approve

[Masoud Abkenar (mabkenar)]

You're welcome :) This is just for me to figure out how the process works before I send my real patch that I've been working on.

It seems I still don't understand the process though. Why isn't this already merged after your approval? (Below this page it says "Unmerged revisions" and also in trunk the file hasn't changed.) How should it be merged? Am I expected to do something?

[Jonas G. Drange (jonas-drange)]

> You're welcome :) This is just for me to figure out how the process works
> before I send my real patch that I've been working on.

Excellent, awesome that you want to contribute.

> It seems I still don't understand the process though. Why isn't this already
> merged after your approval? (Below this page it says "Unmerged revisions" and
> also in trunk the file hasn't changed.)

Correct. Code is very rarely pushed to trunk/master by a person. Before that happens, quality assurance must take place. After the merge proposal (MP) has been reviewed, the merging process is handed off to the bileto tool. You can find your MP here: https://bileto.ubuntu.com/#/ticket/2329

> How should it be merged?

It is merged by some robot after the following has happened:

0. The code is built in a silo (ppa).
1. Lander testing and approval (me in this case, jgdx)
2. Automated signoff. This is where automated tests are run for every project that depends (in some way) on Ubuntu System Settings. Unity8 is one of these and has a large test suite.
3. QA signoff. QA has tested the test plan and signed off.
4. Code is merged to trunk, code is built and copied to the final destination (archive and/or ppa).

> Am I expected to do something?

Not really, but contributions can be made to anyone of these steps if you please.

Thanks again.

[Masoud Abkenar (mabkenar)]

Thanks for your detailed explanation, I really appreciate it.

I guess this commit will break translations, since it changes the source string that other locales are translating against. But I don't know how can I fix this problem. If you know where to start, please let me know, and I would be glad to start working on it.

[Jonas G. Drange (jonas-drange)]

On 11 January 2017 at 15:03, Masoud Abkenar <email address hidden> wrote:

> I guess this commit will break translations, since it changes the source
> string that other locales are translating against.
>

​Said robot will automatically generate the .pot file for this project, so
you don't have to worry about that. The translation itself can be done in
the "translation" tab.​

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2016-08-17 11:26:03 +0000
+++ plugins/wifi/OtherNetwork.qml	2017-01-10 12:47:04 +0000
@@ -491,7 +491,7 @@
 
         Label {
             id: cacertHintLabel
-            text : i18n.tr("Using certificates is recommend as it increases security.")
+            text : i18n.tr("Using certificates is recommended as it increases security.")
             wrapMode: Text.WordWrap
             opacity: 0.5
             objectName: "cacertHintLabel"