FCL/sf/app/commonemail: comparison emailuis/nmailui/translations/mail.ts

equal deleted inserted replaced

-:bf7eb7911fc5
+:997a02608b3a
 <message numerus="no" id="txt_mail_viewer_no_subject">
 <comment>text for subject field if there is no subject in the mail message in Mail viewer. In the same field on the previous row the date and time of the message are displayed.</comment>
 <source>(No Subject)</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dblist_3_val</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_viewer_opt_delete">
 <comment>Options menu item in mail viewer: Shows &quot;Delete mail&quot; confirmation query</comment>
 <source>Delete</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_mail_connection_error">
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_subhead_outbox">
+<comment>Text for indicating the current folder in mail list view. Component is simple label</comment>
+<source>Outbox</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
+<extra-loc-positionid>subhead</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_menu_remove_all">
 <comment>Item specific menu item for removing all attachments from the highlighted mail in mail editor</comment>
 <source>Remove all</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_to">
 <comment>Original message header data in the editor. Followed by the name/mail address of the recipient of the message.</comment>
 <source>To:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_you_can_not_send_more_than_l1_kb">
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_save_message_to_drafts">
-<comment>Dialog that is shown if the editor if the user tries to go back without sending the message.</comment>
+<comment>Dialog that is shown if the editor if the user tries to go back without sending the message. Drafts refers to the name of the folder where unsent messages are saved.</comment>
 <source>Do you want to save this message to drafts?</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_add_priority_sub_normal">
 <comment>Suboption for option &quot;Add priority&quot; to set mail as normal priority</comment>
 <source>Normal</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>opt_1_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_button_attach">
 <comment>toolbar button for inserting attachments to the mail. Opens toolbar extension</comment>
 <source>Attach</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>button</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_photo">
-<comment>Attach toolbar extension item in the viewer, opens images fetch for selecting image. Allows the user to attach an image to the message.</comment>
+<comment>Attach toolbar extension item in the editor, opens images fetch for selecting image. Allows the user to attach an image to the message. Note! The text is Image in the visio file but it is not consistent with other apps so it has been decided to change.</comment>
 <source>Photo</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_no_mailboxes_defined">
 <message numerus="no" id="txt_mail_list_cc">
 <comment>Cc label in mail viewer</comment>
 <source>Cc:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_03</extra-loc-viewid>
+<extra-loc-viewid>mail_003</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_menu_mark_as_read">
 <comment>Item specific option for marking the highlighted mail as read</comment>
 <source>Mark as read</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_c</extra-loc-viewid>
+<extra-loc-viewid>mail_001_c</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_hide_cc_bcc">
 <comment>Options menu command for hiding cc and bcc fields in the editor</comment>
 <source>Hide cc / bcc</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_a</extra-loc-viewid>
+<extra-loc-viewid>mail_004_a</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_button_send">
 <comment>Toolbar button for sending the mail</comment>
 <source>Send</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>button</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_cannot_download_attachment_1">
 <message numerus="no" id="txt_mail_viewer_opt_reply_all">
 <comment>Options menu item in mail viewer: opens editor for replying to all</comment>
 <source>Reply all</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_viewer_opt_reply">
 <comment>Options menu item in mail viewer: opens editor for replying</comment>
 <source>Reply</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_shareui_send_as_mail">
-<comment>text for share ui component. By selecting this the selected content will be sent as mail</comment>
+<comment>text for share ui component. By selecting this the selected content will be sent as mail. For selecting content from another application to be sent as mail.</comment>
 <source>Send as new mail</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_popup_pri_graphic</extra-loc-layout_id>
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <message numerus="no" id="txt_mail_opt_add_priority_sub_high">
 <comment>Suboption for option &quot;Add priority&quot; to set mail as high priority.</comment>
 <source>High</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>opt_1_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dblist_no_messages">
 <comment>Empty list text for Mail list view. Displayed in the Mail list view if there are no mails.</comment>
 <source>(No messages)</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_dblist_val_no_subject</extra-loc-layout_id>
-<extra-loc-viewid>mail_01</extra-loc-viewid>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
 <extra-loc-positionid>dblist_2</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_importance_high">
 <comment>Original message header data in the editor. Level of importance for the message: High.</comment>
 <source>High</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_opt_settings">
 <comment>Options menu item for opening settings.</comment>
 <source>Settings</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_button_new_mail">
 <comment>Toolbar button for creating a new mail.</comment>
 <source>New</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_toolbar_tiny_2</extra-loc-layout_id>
-<extra-loc-viewid>mail_01</extra-loc-viewid>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
 <extra-loc-positionid>button</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_sending_failed">
 <comment>This is error note is shown if sending fails. %[]1 is replaced with the name of mail the sending of which failed.</comment>
 <source>Sending mail %[]1 failed. Try to send it again or press back to cancel</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_downloading_canceled">
 <comment>A notification shown to a user when download cannot be completed because of there is not enough disk space.</comment>
 <source>Not enough memory - downloading canceled</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
-<extra-loc-viewid>mail_02_a</extra-loc-viewid>
+<extra-loc-viewid>mail_002_a</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_1_deleted">
 <message numerus="no" id="txt_common_menu_delete">
 <comment>Item specific option for deleting the highlighted mail</comment>
 <source>Delete</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_c</extra-loc-viewid>
+<extra-loc-viewid>mail_001_c</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_subject">
 <comment>Original message header data in the editor. Followed by the subject of the message.</comment>
 <source>Subject:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
+<extra-loc-positionid>list</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_status_menu_sending">
+<comment>Secondary text for status menu item: indicates the sending progress is ongoing.</comment>
+<source>Sending in progress</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>
+<extra-loc-viewid>mail_001_d</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_l1_mb">
 <comment>the size of the attachment. Maximum number of digits replacing the parameter is 3. The file name truncates if needed. Displayed on the same row and after the name of the attachment.</comment>
 <source>(%L1 Mb)</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_shareui_sending_please_wait">
 <comment>Text for shared UI component wait note. Shown when the user has sent an email from shared UI.</comment>
 <source>Sending, please wait</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_invalid_mail_address_send">
 <comment>Note in editor when the user has typed incorrect mail address (e.g. without @-character). %[]1 is replaced with the name of the invalid mail address. Pressing yes sends the mail anyway</comment>
 <source>Invalid mail address: %[]1. Send anyway?</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_opt_change_folder">
+<comment>options menu item for changing the folder </comment>
+<source>Folders</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
+<extra-loc-positionid>opt_2</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_searching">
 <comment>Text for indicating that the search is ongoing in mail list view. Component is simple label</comment>
-<source>Seaching</source>
+<source>Searching</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
-<extra-loc-viewid>mail_08</extra-loc-viewid>
+<extra-loc-viewid>mail_008</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_subject">
-<comment>Subject label in mail editor</comment>
+<comment>Subject label in mail editor. Label for a field in message editor in which the user enters the subject of the message.</comment>
 <source>Subject:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_editor_to</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_from">
 <comment>From label in mail viewer </comment>
 <source>From:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_03</extra-loc-viewid>
+<extra-loc-viewid>mail_003</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_folder_sub_deleted">
 <comment>Submenu item for Options menus item Folder (txt_mail_opt_change_folder)</comment>
 <source>Deleted items</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt_2_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_importance_low">
 <comment>Original message header data in the editor. Level of importance for the message: Low.</comment>
 <source>Low</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_cc">
 <comment>Original message header data in the editor. Followed by the name(s)/mail address(es) of the receipients to whom a copy of the message is sent.</comment>
 <source>Cc:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_add_priority">
 <comment>Options menu item for selecting the priority of the mail, opens sub menu with options High and Low.</comment>
 <source>Add priority</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>opt_1</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_status_menu_new_mail">
 <comment>Secondary text for status menu item: indicates the there are new mail messages</comment>
 <source>New Mail</source>
 <translation variants="no" type="unfinished"></translation>
-<extra-loc-layout_id></extra-loc-layout_id>
+<extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_d</extra-loc-viewid>
+<extra-loc-viewid>mail_001_d</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_server_settings_incorrect">
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_loading_mail_content">
-<comment>Wait note shown until the mail content is loaded </comment>
+<comment>Wait note shown until the mail content is loaded. Dublicate. I need to check which one is used in implementation.</comment>
 <source>Loading mail content</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri3</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_attachments_should_be_smaller_than">
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_status_menu_unset">
+<comment>Primary text for status menu item: indicates that there are unsent messages in outbox. %[]1 is account name.</comment>
+<source>%[]1: Unsent</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_notifdialog_pri_medium_graphic</extra-loc-layout_id>
+<extra-loc-viewid>mail_001_d</extra-loc-viewid>
+<extra-loc-positionid>list</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_viewer_opt_forward">
 <comment>Options menu item in mail viewer: opens editor for forwarding</comment>
 <source>Forward</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_short_caption_mail">
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>grid</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_dialog_delete_message">
+<comment>This conifrmation is shown if the user presses &quot;Back&quot; in the editor. Selecting yes deletes the composed message. &quot;No&quot; returns to the editor.</comment>
+<source>Delete message?</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
+<extra-loc-positionid>dialog</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_dialog_invalid_mail_address">
 <comment>Note in editor when the user has typed incorrect mail address (e.g. without @-character). %[]1 is replaced with the name of the invalid mail address.</comment>
 <source>Invalid mail address: %[]1</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_new_video">
-<comment>Attach toolbar extension item in the viewer, opens camera for taking a new video</comment>
+<comment>Attach toolbar extension item in the editor, opens camera for taking a new video</comment>
 <source>New video</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_reply_subject_prefix">
 <comment>Text for subject field if the message is replyed.</comment>
 <source>Re:</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dblist_3_val</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_select_file">
-<comment>Title text in file picker view. File picker view is opened when the user selects &quot;Other&quot; option from attachment list.</comment>
+<comment>Title text in file picker view. File picker view is opened when the user selects &quot;Other&quot; option from attachment list. For attaching files to mail messages. Underneath a list of selectable files is displayed.</comment>
 <source>Select file</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>
-<extra-loc-viewid>mail_07</extra-loc-viewid>
+<extra-loc-viewid>mail_007</extra-loc-viewid>
 <extra-loc-positionid>dpophead</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_menu_open">
 <comment>Item specific option for opening the highlighted mail. </comment>
 <source>Open</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_c</extra-loc-viewid>
+<extra-loc-viewid>mail_001_c</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_title_control_panel">
 <comment>Name of the Mail application in control panel under applications. Opens mail settings. </comment>
 <source>Mail</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri_graphic</extra-loc-layout_id>
-<extra-loc-viewid>Mail</extra-loc-viewid>
+<extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
-<extra-loc-feature>Mail</extra-loc-feature>
+<extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dblist_no_messages_matched_your_search">
 <comment>A text shown in mail list view, if there are no matches to a search.</comment>
 <source>No messages matched your search. Try another search term. </source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_dblist_val_no_subject</extra-loc-layout_id>
-<extra-loc-viewid>mail_08</extra-loc-viewid>
+<extra-loc-viewid>mail_008</extra-loc-viewid>
 <extra-loc-positionid>dblist_4</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_list_sound">
+<comment>Attach toolbar extension item in the editor, opens music fetch for selecting sound file. Allows the user to attach a sound file to the message. Note! The text is Music in the visio file but it is not consistent with other apps so it has been decided to change.</comment>
+<source>Sound</source>
+<translation variants="yes" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
+<extra-loc-positionid>list</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_editor_to">
-<comment>Custom layout ID parent. To label in mail editor</comment>
+<comment>Custom layout ID parent. To label in mail editor. Label for a field in message editor in which the user enters the mail addresses of the main recipients  of the message.</comment>
 <source>To:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_editor_to</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_deleting_mailbox">
 <message numerus="no" id="txt_mail_editor_reply_importance">
 <comment>Original message header data in the editor. The user can select the level of importance for the message (High txt_mail_editor_reply_importance_high or Low txt_mail_editor_reply_importance_low).</comment>
 <source>Importance:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_to">
 <comment>To label in mail viewer</comment>
 <source>To:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_03</extra-loc-viewid>
+<extra-loc-viewid>mail_003</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_sent">
 <comment>Original message header data in the editor. Followed by the date when the message was sent.</comment>
 <source>Sent:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_dialog_account_disabled_due_to_security_i">
+<comment>Shown when the user tries to open the mailbox. </comment>
+<source>Account disabled due to security issues. Contact your system administrator.</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+<extra-loc-viewid>mail_dialog_7</extra-loc-viewid>
+<extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_unable_to_open_attachment_file_ty">
 <comment>Error note. If the user tries to open an attachment which cannot be viewed</comment>
 <message numerus="no" id="txt_mail_opt_send_and_receive_now">
 <comment>Options menu item for synchronize mail folders with the mail server content (sending and receiving mail)</comment>
 <source>Refresh</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_subhead_sent_items">
+<comment>Text for indicating the current folder in mail list view. Component is simple label</comment>
+<source>Sent items</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
+<extra-loc-positionid>subhead</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_add_priority_sub_low">
 <comment>Suboption for option &quot;Add priority&quot; to set mail as low priority</comment>
 <source>Low</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>opt_1_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dpophead_1_deleted">
 <comment>Confirmation note shown after the mailbox is deleted succesfully.</comment>
 <source>Mailbox deleted. </source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_notifdialog_pri2</extra-loc-layout_id>
-<extra-loc-viewid>mail_06</extra-loc-viewid>
+<extra-loc-viewid>mail_006</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_original_msg">
 <comment>Original message header data in the editor. Separates the original mail message from the edit area of the new message the user is typing.</comment>
 <source>---- Original message ----</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_common_menu_remove">
 <comment>Item specific menu item for removing the focused attachment in mail editor</comment>
 <source>Remove</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_delete_mail">
 <comment>Confirmation query after selecting delete in mail viewer</comment>
 <source>Delete mail?</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_select_contacts">
+<comment>Title text shown in status pane when contacts are fetched from Phonebook.</comment>
+<source>Select contacts</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_dialog_pri_heading</extra-loc-layout_id>
+<extra-loc-viewid>mail</extra-loc-viewid>
+<extra-loc-positionid>dpophead</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_no">
 <comment>Button for notes txt_mail_dialog_server_settings_incorrect and txt_mail_dialog_address_or_password_incorrect.</comment>
 <source>No</source>
-<translation variants="no" type="unfinished"></translation>
+<translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>
 <extra-loc-viewid>mail_dialog_14_15</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 <message numerus="no" id="txt_mail_dblist_val_no_subject">
 <comment>No subject text for mail iten in Mail list view. Displayed in the Mail list view under the name of the sender if there is no subject in the received mail. Custom layout ID parent.</comment>
 <source>(No Subject)</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_dblist_val_no_subject</extra-loc-layout_id>
-<extra-loc-viewid>mail_01</extra-loc-viewid>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
 <extra-loc-positionid>dblist_val</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_bcc">
-<comment>Bcc: label in mail editor</comment>
+<comment>Bcc: label in mail editor. Bcc = blind carbon copy. Label for a field in message editor in which the user enters the mail addresses of those recipients whose names s/he does not want to show to the rest of the recipients.</comment>
 <source>Bcc:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_editor_to</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_folder_sub_drafts">
 <comment>Submenu item for Options menus item Folder (txt_mail_opt_change_folder)</comment>
 <source>Drafts</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt_2_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_cc">
-<comment>Cc: label in mail editor</comment>
+<comment>Cc: label in mail editor. Cc = carbon copy. Label for a field in message editor in which the user enters the mail addresses of additional recipients  who are not the main recipients of the message.</comment>
 <source>Cc:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_editor_to</extra-loc-layout_id>
-<extra-loc-viewid>mail_04</extra-loc-viewid>
+<extra-loc-viewid>mail_004</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dpophead_loading_mail_content">
 <comment>Discreet pop-up shown in case the loading of mail content takes more than 2 seconds</comment>
 <source>Loading mail content</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_notifdialog_pri2_medium_graphic</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dpophead</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_folder_sub_inbox">
 <comment>Submenu item for Options menus item Folder (txt_mail_opt_change_folder)</comment>
 <source>Inbox </source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt_2_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_folder_sub_sent">
 <comment>Submenu item for Options menus item Folder (txt_mail_opt_change_folder)</comment>
 <source>Sent</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt_2_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_unable_to_add_attachment">
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_yes">
 <comment>Button for notes txt_mail_dialog_server_settings_incorrect and txt_mail_dialog_address_or_password_incorrect.</comment>
 <source>Yes</source>
-<translation variants="no" type="unfinished"></translation>
+<translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_softkey_2</extra-loc-layout_id>
 <extra-loc-viewid>mail_dialog_14_15</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_button_download_rest">
+<comment>Button that is shown if all the message content is not downloaded while message is opened.</comment>
+<source>Download rest</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id></extra-loc-layout_id>
+<extra-loc-viewid>mail_002_b</extra-loc-viewid>
+<extra-loc-positionid>button</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_folder_sub_outbox">
 <comment>Submenu item for Options menus item Folder (txt_mail_opt_change_folder)</comment>
 <source>Outbox</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec_add</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_a</extra-loc-viewid>
+<extra-loc-viewid>mail_001_a</extra-loc-viewid>
 <extra-loc-positionid>opt_2_sub</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_editor_reply_from">
 <comment>Original message header data in the editor. Followed by the name/mail address of the sender of the message.</comment>
 <source>From:</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>none</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_c</extra-loc-viewid>
+<extra-loc-viewid>mail_004_c</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_long_caption_mail">
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_dialog_mail_address_incorrect">
+<comment>The information dialog that is shown if the user&apos;s own mail address is incorrect and the user tries to sync or send mail.</comment>
+<source>Your mail address is incorrect. Check the mail address settings?</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+<extra-loc-viewid>mail</extra-loc-viewid>
+<extra-loc-positionid>dpopinfo</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_text_attachment">
-<comment>Text that is shown in POP mailboxes when there are attachments that are not downloaded yet.</comment>
+<comment>Text that is shown in POP mailboxes when there are attachments that are not downloaded yet. This text is preceded by an icon, therefore the lower-case initial letter.</comment>
 <source>attachment</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02_b</extra-loc-viewid>
+<extra-loc-viewid>mail_002_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_status_menu_waiting_to_send">
-<comment>Text for status menu item: indicates that there are unsent messages in outbox. %L1 is the number of unsent mails in that mailbox.</comment>
+<comment>Text for status menu item: indicates that there are unsent messages in outbox. %L1 is the number of unsent mails in that mailbox. L1% is usually less than 10 but can be also more.</comment>
 <source>Waiting to send (%L1)</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_notifdialog_sec_medium_graphic</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_d</extra-loc-viewid>
+<extra-loc-viewid>mail_001_d</extra-loc-viewid>
 <extra-loc-positionid>dblist_5_val</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_do_you_want_to_delete_mfe">
 <message numerus="no" id="txt_mail_title_mail">
 <comment>Title for Mail application</comment>
 <source>Mail</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_titlebar</extra-loc-layout_id>
-<extra-loc-viewid>mail_05</extra-loc-viewid>
+<extra-loc-viewid>mail_005</extra-loc-viewid>
 <extra-loc-positionid>title</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_opt_show_cc_bcc">
 <comment>Options menu command for showing cc and bcc fields in the editor</comment>
 <source>Show cc / bcc</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_a</extra-loc-viewid>
+<extra-loc-viewid>mail_004_a</extra-loc-viewid>
 <extra-loc-positionid>opt</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_sending_mail">
 <extra-loc-viewid>mail</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_mail_list_search_results">
+<message numerus="yes" id="txt_mail_list_search_results">
-<comment>Text for indicating the search results in mail list view. Component is simple label</comment>
+<comment>Text for indicating the search results in mail list view. Component is simple label. %Ln stands for the number of search results found in the search. The parameter can be even up to 9999.</comment>
-<source>%L1 results</source>
+<source>%Ln results</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
-<extra-loc-viewid>mail_08</extra-loc-viewid>
+<extra-loc-viewid>mail_008</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_menu_mark_as_unread">
 <comment>Item specific option for marking the highlighted mail as unread </comment>
 <source>Mark as unread</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_menu_sec</extra-loc-layout_id>
-<extra-loc-viewid>mail_01_c</extra-loc-viewid>
+<extra-loc-viewid>mail_001_c</extra-loc-viewid>
 <extra-loc-positionid>menu</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_other">
-<comment>Attach toolbar extension item in the viewer, opens file fetch for selecting any type of file</comment>
+<comment>Attach toolbar extension item in the editor, opens file fetch for selecting any type of file</comment>
 <source>Other</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_forward_subject_prefix">
 <comment>Text for subject field if the message is forwarded.</comment>
 <source>Fw:</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_02</extra-loc-viewid>
+<extra-loc-viewid>mail_002</extra-loc-viewid>
 <extra-loc-positionid>dblist_3_val</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
+<message numerus="no" id="txt_mail_subhead_drafts">
+<comment>Text for indicating the current folder in mail list view. Component is simple label</comment>
+<source>Drafts</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
+<extra-loc-positionid>subhead</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
 <message numerus="no" id="txt_mail_dialog_address_or_password_incorrect">
-<comment>Notification shown when the connection fails (e.g. when syncing) due to mail address or password. </comment>
+<comment>Notification shown when the connection fails (e.g. when syncing) due to username or password. </comment>
-<source>Mail address or password is incorrect. Do you want to check the settings?</source>
+<source>Username or password is incorrect. Do you want to check the settings?</source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
 <extra-loc-viewid>mail_dialog_15</extra-loc-viewid>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_mail_list_music">
+<message numerus="no" id="txt_mail_list_new_photo">
-<comment>Attach toolbar extension item in the viewer, opens music fetch for selecting music file. Allows the user to attach a music file to the message.</comment>
+<comment>Attach toolbar extension item in the editor, opens camera for taking a new photo</comment>
-<source>Music</source>
+<source>New photo</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
-<message numerus="no" id="txt_mail_list_new_photo">
+<message numerus="no" id="txt_mail_subhead_deleted_items">
-<comment>Attach toolbar extension item in the viewer, opens camera for taking a new photo</comment>
+<comment>Text for indicating the current folder in mail list view. Component is simple label</comment>
-<source>New photo</source>
+<source>Deleted items</source>
-<translation variants="yes" type="unfinished"></translation>
+<translation variants="no" type="unfinished"></translation>
-<extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
+<extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
-<extra-loc-positionid>list</extra-loc-positionid>
+<extra-loc-positionid>subhead</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_dialog_opening_mail_editor">
 <comment>Wait note for the case where opening an editor takes some time, this can happen when replying to or forwarding mail. </comment>
 <extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_list_video">
-<comment>Attach toolbar extension item in the viewer, opens video fetch for selecting video file. Allows the user to attach a video file to the message.</comment>
+<comment>Attach toolbar extension item in the editor, opens video fetch for selecting video file. Allows the user to attach a video file to the message.</comment>
 <source>Video</source>
 <translation variants="yes" type="unfinished"></translation>
 <extra-loc-layout_id>qtl_list_pri</extra-loc-layout_id>
-<extra-loc-viewid>mail_04_b</extra-loc-viewid>
+<extra-loc-viewid>mail_004_b</extra-loc-viewid>
 <extra-loc-positionid>list</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 <message numerus="no" id="txt_mail_subhead_inbox">
 <comment>Custom layout ID parent. Text for indicating the current folder in mail list view. Component is simple label</comment>
 <source>Inbox </source>
 <translation variants="no" type="unfinished"></translation>
 <extra-loc-layout_id>txt_mail_subhead_inbox</extra-loc-layout_id>
-<extra-loc-viewid>mail_01</extra-loc-viewid>
+<extra-loc-viewid>mail_001</extra-loc-viewid>
 <extra-loc-positionid>subhead</extra-loc-positionid>
+<extra-loc-feature>mail</extra-loc-feature>
+<extra-loc-blank>False</extra-loc-blank>
+</message>
+<message numerus="no" id="txt_mail_dialog_password_expired_new_security_cre">
+<comment>Shown when the user tries to open the mailbox if her password has expired.</comment>
+<source>Password expired. New security credentials must be created on your computer.</source>
+<translation variants="no" type="unfinished"></translation>
+<extra-loc-layout_id>qtl_dialog_pri5</extra-loc-layout_id>
+<extra-loc-viewid>mail_dialog_6</extra-loc-viewid>
+<extra-loc-positionid>dialog</extra-loc-positionid>
 <extra-loc-feature>mail</extra-loc-feature>
 <extra-loc-blank>False</extra-loc-blank>
 </message>
 </context>
 </TS>

changeset 54	997a02608b3a
parent 53	bf7eb7911fc5
child 59	16ed8d08d0b1