dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16244
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-07-25 19:08:40 +0200
message:
  Translation, removed line breaks
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-07-25 15:15:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-07-25 17:08:40 +0000
@@ -867,32 +867,18 @@
 
 email_restore_subject=User account restore confirmation
 email_restore_1_1st_paragraph=Someone, probably you, have asked us to restore your user account at
-email_restore_1_2nd_paragraph=You have been sent two emails, where this is the first one. Please follow the \
-                                 link below. In the next step you will be asked to enter a code which has been \
-                                 sent to you in the other email.
-email_restore_1_3rd_paragraph=You must complete the restore process within 1 hour. If you take no action, your \
-                                account will not be restored. If you did not request this restore, please disregard \
-                                this message.
+email_restore_1_2nd_paragraph=You have been sent two emails, where this is the first one. Please follow the link below. In the next step you will be asked to enter a code which has been sent to you in the other email.
+email_restore_1_3rd_paragraph=You must complete the restore process within 1 hour. If you take no action, your account will not be restored. If you did not request this restore, please disregard this message.
 email_restore_2_1st_paragraph=Someone, probably you, have asked us to restore your user account at
-email_restore_2_2nd_paragraph=You have been sent two emails, where this is the second one. Please read the \
-                                 first email and follow the instructions. Please use the code below to complete \
-                                 the new account form.
-email_restore_2_3rd_paragraph=You must complete the restore process within 1 hour. If you take no action, your \
-                              account will not be restored. If you did not request this restore, please disregard \
-                              this message.
+email_restore_2_2nd_paragraph=You have been sent two emails, where this is the second one. Please read the first email and follow the instructions. Please use the code below to complete the new account form.
+email_restore_2_3rd_paragraph=You must complete the restore process within 1 hour. If you take no action, your account will not be restored. If you did not request this restore, please disregard this message.
 
 #-- Invite emails -------------------------------------------------------------#
 
 email_invite_subject=Create user account invitation
 email_invite_1_1st_paragraph=This is an invitation to create a user account on the DHIS 2 system at
-email_invite_1_2nd_paragraph=You have been sent two emails, where this is the first one. Please follow the \
-                                link below. In the next step you will be asked to enter a code which has been \
-                                sent to you in the other email.
-email_invite_1_3rd_paragraph=You must respond to this invitation within 3 months. If you take no action, \
-                               the invitation will expire at that time.
+email_invite_1_2nd_paragraph=You have been sent two emails, where this is the first one. Please follow the link below. In the next step you will be asked to enter a code which has been sent to you in the other email.
+email_invite_1_3rd_paragraph=You must respond to this invitation within 3 months. If you take no action, the invitation will expire at that time.
 email_invite_2_1st_paragraph=This is an invitation to create a user account on the DHIS 2 system at
-email_invite_2_2nd_paragraph=You have been sent two emails, where this is the second one. Please read the \
-                                first email and follow the instructions. Please use the code below to complete \
-                                the new account form.
-email_invite_2_3rd_paragraph=You must respond to this invitation within 3 months. If you take no action, \
-                               the invitation will expire at that time.
+email_invite_2_2nd_paragraph=You have been sent two emails, where this is the second one. Please read the first email and follow the instructions. Please use the code below to complete the new account form.
+email_invite_2_3rd_paragraph=You must respond to this invitation within 3 months. If you take no action, the invitation will expire at that time.