README-en.md edited online with Bitbucket

README-en.md

@@ -4,6 +4,8 @@
 ![main2.png](images/main2.png)
 ![main3.png](images/main3.png)
 
+[Verano 2016 - Ive]
+
 Commonly, when solving a problem, there are one or more steps that depend on whether certain conditions are met. Computer programs are built to solve problems, so they should have a structure that allows them to make decisions. In C++ the decision instructions (or conditionals) are structured using  `if`, `else`, `else if` or `switch`. Relational expressions and logical operators are common when handling decision structures. In today's laboratory experience you will practice the use of some of these structures by completing the design of an application that determines the strength of a password.
 
 ## Objectives:
@@ -26,7 +28,7 @@ Before you get to the laboratory you should have:
 
 3. Studied the concepts and instructions for this laboratory session.
 
-4. Taken the Pre-Lab quiz in Moodle.
+4. Taken the Pre-Lab quiz available in Moodle.
 
 ---
 
@@ -193,7 +195,7 @@ The following are additional details and examples of the criteria for **subtract
 
 ## Laboratory session:
 
-In this laboratory session you will practice the use of mathematical expressions and conditional structures to compute the score for the strength of a password combining the points for the individual criteria.
+In this laboratory experience you will practice the use of mathematical expressions and conditional structures to compute the score for the strength of a password combining the points for the individual criteria.
 
 Your task is to complete the design of the application to measure the strength of a password. When done, you will obtain a simplified version of the application in http://www.passwordmeter.com/. Since there isn't an official system to measure passwords, the formulas created by "passwordmeter" will be used to evaluate the general strength of a given password. The application will allow users to enter a password and calculate its strength using a series of rules.
 
@@ -204,7 +206,7 @@ Once the application is complete, it will show a window where, as the password c
 
 
 
-### Exercise 1: Familiarize yourself with the pre-defined functions
+### Exercise 1 - Familiarize yourself with the pre-defined functions
 
 The first step in this laboratory experience is to familiarize yourself with the functions that are pre-defined in the code.  You will call these functions as part of your own code to compute the score of the various password strength criteria.
 
@@ -219,7 +221,7 @@ The first step in this laboratory experience is to familiarize yourself with the
   * `psfunctions.h` : contains the prototypes for the functions defined in `psfunctions.cpp`.
 
 
-### Exercise 2: Understand the functions to update the user's graphical interface.
+### Exercise 2 - Understand the functions to update the user's graphical interface.
 
 In the laboratory exercise you will write code to calculate the score associated to each one of the criteria in the tables for adding and subtracting points shown above. These scores should be updated in the user's graphical interface that is shown in Figure 1.
 
@@ -295,7 +297,7 @@ There are predefined functions that update the graphical interface. For the appl
 
 
 
-### Exercise 3: Compute the score for the criteria and the total score for the password
+### Exercise 3 - Compute the score for the criteria and the total score for the password
 
 The code that we're providing you contains the functions that compute the count for the majority of the criteria and whose names reflect what they do and what the function returns. For example, `countUppercase`, return the number of characters that are uppercase letters.
 
@@ -353,7 +355,7 @@ The provided code already invokes the `strengthDisplay` function with the streng
 
 ## Deliverables
 
-Use "Deliverables" in Moodle to upload the `readpassword.cpp` file that contains the code with the computation for the score of the individual criteria, the final score, the function calls to update the graphical interface, the password's classification and the display functions. Remember to use good programming techniques, include the name of the programmers involved, and to document your program.
+Use "Deliverable" in Moodle to upload the `readpassword.cpp` file that contains the code with the computation for the score of the individual criteria, the final score, the function calls to update the graphical interface, the password's classification and the display functions. Remember to use good programming techniques, include the name of the programmers involved, and to document your program.