Jitsi link integration

2024-07-22 10:50:22 +02:00
204 changed files with 825 additions and 1673 deletions
@@ -2,122 +2,6 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

-## [5.11.0](https://github.com/Alinto/sogo/compare/SOGo-5.10.0...SOGo-5.11.0) (2024-08-07)
-
-
-### Features
-
-* **core:** Add MySQL/MariaDB SSL connection support ([0168ca5](https://github.com/Alinto/sogo/commit/0168ca56b2e5f51ac98be2a78ddfcea4a688b74f))
-* **core:** Update to ckeditor 5 ([0cfaa77](https://github.com/Alinto/sogo/commit/0cfaa7740af509389e43c395649ea82a3fb432be) [e92fb8f](https://github.com/Alinto/sogo/commit/e92fb8f52d615b72a6945760aecdf95039e1cbf2) [b7a7114](https://github.com/Alinto/sogo/commit/b7a71140f2b3eefb494a3acc151fe556ce1d3ce4) [a9e02d9](https://github.com/Alinto/sogo/commit/a9e02d94a26cd30c9e56196a1ec24ddec0c4db9c) [98e00d0](https://github.com/Alinto/sogo/commit/98e00d09a3e31b388592e2d1068d89bc57ff1d99) [2b23ff3](https://github.com/Alinto/sogo/commit/2b23ff3eb8dac6acc570b1aaa6e0baff72dd17ea) [65ab696](https://github.com/Alinto/sogo/commit/65ab6962d870baeba7cb4b3c1b66eb6447174e1b) [dd965ba](https://github.com/Alinto/sogo/commit/dd965baae110176c6144ccd64cbade3ef757966a))
-* **mail:** Improve mail search (advanced search) ([ed95166](https://github.com/Alinto/sogo/commit/ed951667ec610b8ad48a49a606b6b1c33c60914d) [f621d97](https://github.com/Alinto/sogo/commit/f621d972893c94977cda432efe3dcc837ec8bf58) [0cbcad9](https://github.com/Alinto/sogo/commit/0cbcad9d91cd52afcfd14034786457a106013182) [9eb8039](https://github.com/Alinto/sogo/commit/9eb80396988bd7c8ac3a1f44dbc48147ced20750))
-
-
-### Enhancements
-
-* **calendar:** Add option to disable email appointmoint notifications when using caldav ([2637434](https://github.com/Alinto/sogo/commit/2637434436c19157ce6255fb071dcb99cf57ad89))
-* **mail:** Add 'View raw message' mail contextual option. This option open message in a popup without HTML mail CSS content modification. ([6ac8525](https://github.com/Alinto/sogo/commit/6ac8525bfe161409c0565e3dca1e9e92f87c1c08))
-* **mail:** Add location in email ics representation template ([591d283](https://github.com/Alinto/sogo/commit/591d2834252441a9593f27012f7b148d38b9a511))
-* **mail:** add options to not add X-Foward header in mail ([96331ca](https://github.com/Alinto/sogo/commit/96331cac905ee7b6dc1adfda083dcefffe0f8795))
-* **ytnef:** add possibility to add event to calendar from winmail.dat ([f609c31](https://github.com/Alinto/sogo/commit/f609c31a324683dd4c210284f672618cfffb9908))
-* **calendar:** Optimization of date computation when handle attendees. Report of 77b2d9f8. ([53d77f3](https://github.com/Alinto/sogo/commit/53d77f3105c2d7f6aa2be1cac691dd19a4754df8))
-
-
-### Bug Fixes
-
-* **addressbook:** Removed SOGoGlobalAddressBookFirstEntries (use listRequiresDot instead) and move SOGoGlobalAddressBookFirstEntriesCount to globalAddressBookFirstEntriesCount in source scope. This fixed the broken listRequiresDot in 5.10 ([4dba56f](https://github.com/Alinto/sogo/commit/4dba56f70dbda81822b3fd26e1420c367c1b7298))
-* **attachment:** properly download openxmlformats in attachments ([2e2e36e](https://github.com/Alinto/sogo/commit/2e2e36e0a2b759d5d734bdefc274f127937e9b89))
-* **calendar(js):** escape CSS selector names ([5c94461](https://github.com/Alinto/sogo/commit/5c944617d0efdc03a72a677e9f60922cb3ab90bd))
-* **calendar(js):** prevent duplicate event creation in case of an event conflict ([f04c73d](https://github.com/Alinto/sogo/commit/f04c73d495dfce6e93d33ceb0964f1ee6aeb51a5))
-* **calendar:** Fix all day recurring event displayed on 2 days when a DST change occurs at the endDate ([980b5e2](https://github.com/Alinto/sogo/commit/980b5e28dd0c4cfd42619c64872bb08674d64765))
-* **calendar:** Fix assertion when is_cycle is set but without c_cycleinfo ([d404667](https://github.com/Alinto/sogo/commit/d4046673eebf21180f494e516a39a7b04243f669) [49e9988](https://github.com/Alinto/sogo/commit/49e9988b82b206ae751feb10979f5e0859d2ec77) [d9ee884](https://github.com/Alinto/sogo/commit/d9ee88445997a21623b33129fe28466042229696))
-* **calendar:** fix crash when using a 2*16bits chars at the 75th char of ics file ([31c0473](https://github.com/Alinto/sogo/commit/31c0473c48238de2288e5a5c0c8295fc67710d32))
-* **calendar:** fix disabled change view buttons ([910effd](https://github.com/Alinto/sogo/commit/910effd664e24a3fc5343145f24a2e2d9cf58027))
-* **calendar:** Fix empty recurence list when creating event from mail ([2756176](https://github.com/Alinto/sogo/commit/27561765038358243a628853b47b20c2db256dc2))
-* **calendar:** Fix issue on template introduced in commit [#275617650](https://bugs.sogo.nu/view.php?id=275617650) ([eee160e](https://github.com/Alinto/sogo/commit/eee160e5bf60b2e59b96adabae805d61c5d85292))
-* **calendar:** Fix issue when doubleclick creates an event of 2 days after creating an event > 1 days ([7b23342](https://github.com/Alinto/sogo/commit/7b233422f5790147dd2522261c3b79dac85bfd6c))
-* **calendar:** Fix issue where a calendar's subscribed user can give acl to another user ([ae01ed0](https://github.com/Alinto/sogo/commit/ae01ed077dcca8d3c3778cde6645075dada9b92d) [cb55413](https://github.com/Alinto/sogo/commit/cb55413e91ac0f10b649abaaeaa5fdab141f0958) [0fafda5](https://github.com/Alinto/sogo/commit/0fafda55d633401c1eeadcbfafd9ae251234787a))
-* **calendar:** Fix NSData returned instead of NSString on c_cycleinfo depending on database issue. CLoses [#5940](https://bugs.sogo.nu/view.php?id=5940). ([5215aa4](https://github.com/Alinto/sogo/commit/5215aa4f4114acc09bc923542e4fe23fa2779d3b))
-* **calendar:** Memory optimization on _appendCycleException ([45fd999](https://github.com/Alinto/sogo/commit/45fd999010a80ee39c7fa26f96c1460ddf0d3af9))
-* **calendar:** resource was busy even if they have delegated ([880eb89](https://github.com/Alinto/sogo/commit/880eb897191c906d141afafe628d66f9a5025640) [5830053](https://github.com/Alinto/sogo/commit/58300530260469594f40db7ee3b67e34ba60d1ce))
-* **chore:** Remove check on -p option to sogo-ealarms-notify as the SMTP Master account has been implemented ([f96eb4d](https://github.com/Alinto/sogo/commit/f96eb4d3ca32a916ecc63221d022014f736cd94b))
-* **contacts:** can now reset contacts categories more than once ([526aa28](https://github.com/Alinto/sogo/commit/526aa281d9a92e9fd29046b8a1551aea16c58772))
-* **core:** Add disableSubgroups option in SOGoUserSources LDAP settings to avoid infinite recursive loop when using a group name with the same name as a member. Fixes [#5913](https://bugs.sogo.nu/view.php?id=5913) ([fd9b8dc](https://github.com/Alinto/sogo/commit/fd9b8dcfcd07217e7456a67c2e69f13fca743874))
-* **core:** Add timer to avoid spamming onEditorChanged for CKEditor 5. Fixes [#5944](https://bugs.sogo.nu/view.php?id=5944). ([bc804ae](https://github.com/Alinto/sogo/commit/bc804ae823a8a61e6cb02495759f75a104c77753) [2f4c125](https://github.com/Alinto/sogo/commit/2f4c125bdd9b5eebbba41e2204e2fc9c93a3eebd))
-* **core:** Clean html parasite code to avoid ckeditor hangs. Fixes [#5944](https://bugs.sogo.nu/view.php?id=5944). ([127df39](https://github.com/Alinto/sogo/commit/127df3968998c96d5349f7368adba1e5e371ed4c))
-* **core:** Fix int overflow on vms and rss computation ([4b343f7](https://github.com/Alinto/sogo/commit/4b343f707016f2b45fbd71c6c2f039b50a076f30))
-* **core:** Improve error logging on url encryption ([b8a6d57](https://github.com/Alinto/sogo/commit/b8a6d576e19828ffddf6c8e3c3353efd03836b2e))
-* **core:** Notify sgCkeditor component when clicking the send button to update content. Fixes [#5952](https://bugs.sogo.nu/view.php?id=5952). ([c2d9050](https://github.com/Alinto/sogo/commit/c2d9050539c13f843f2a7395b0b9a24a4b8db3f3))
-* **core:** On some emails print, first page is blank. Closes [#5602](https://bugs.sogo.nu/view.php?id=5602). ([e39c104](https://github.com/Alinto/sogo/commit/e39c1044364d68df49ea6142072928d0b0e4c1eb))
-* **doc:** Fix typo with SOGoURLEncryptionEnabled in documentation ([a06331e](https://github.com/Alinto/sogo/commit/a06331eb86aad8ec9a30f30df55aa4282a78654c))
-* **event:** fix rdate timezones ([e4cb0a3](https://github.com/Alinto/sogo/commit/e4cb0a35ef34b496d8b7e0d6e2e10fe0844e37f8))
-* **event:** resource was considered busy for an event he has delegated ([adf1117](https://github.com/Alinto/sogo/commit/adf111704642126272301ab7961603fb0b787c9e))
-* **event:** user was considered busy for an event he has delegated ([815a87d](https://github.com/Alinto/sogo/commit/815a87de0b8bc8e8a7431b8a7b3aedc66d4dde2a))
-* **languages:** somme "array" strings were using the wrong comma delimiter ([7c0699b](https://github.com/Alinto/sogo/commit/7c0699b96ff1539011e04a1d60f8f4c7334e79b1))
-* **mail:** Add encoding fallback when there are ISO char in file name. Fixes [#5388](https://bugs.sogo.nu/view.php?id=5388). ([e6ff9a4](https://github.com/Alinto/sogo/commit/e6ff9a408d94d2817ce0d9b9f078811e19ea4a39))
-* **mail:** Fix advanced search no select/action on results. Fixes [#5978](https://bugs.sogo.nu/view.php?id=5978) ([1a47fdb](https://github.com/Alinto/sogo/commit/1a47fdb7d62242001c770ac28df84bf8c999c179))
-* **mail:** Fix errors while spamming arrow keys on mail list. The transition was not finished ([049a569](https://github.com/Alinto/sogo/commit/049a569d7faff5f3a507671d17bc0da309ec14ac))
-* **mail:** Fix Exception when using delegated identities. Closes [#5951](https://bugs.sogo.nu/view.php?id=5951) ([f8c354c](https://github.com/Alinto/sogo/commit/f8c354c302b34b1676764a869481f8a6160f6120))
-* **mail:** Fix invalid content when forwarding a text/plain mail. Fixes [#5983](https://bugs.sogo.nu/view.php?id=5983). ([ef88039](https://github.com/Alinto/sogo/commit/ef88039a4a3d590de09cf75da5668db9d6fd29f0) [43388ac](https://github.com/Alinto/sogo/commit/43388ac42c99a6fc47cc4191291f81d45faf9a8d))
-* **mail:** Fix not called draft expunge function when sending mail. ([7ec7a7d](https://github.com/Alinto/sogo/commit/7ec7a7d6aead1a7aee025324e2ae64696b2d087c))
-* **mail:** Fix template issues with Galician and Basque ([19ee54f](https://github.com/Alinto/sogo/commit/19ee54fe055bc6a45bae6e5f71dcdb60bad766fd))
-* **mail:** Fix ukrainian encoding issue. Fixes [#5702](https://bugs.sogo.nu/view.php?id=5702). ([776a798](https://github.com/Alinto/sogo/commit/776a798e173e6bacc29c8ab3d32bddabd383da55))
-* **mail:** Fix unsupported koi-u encoding ([5710c4d](https://github.com/Alinto/sogo/commit/5710c4d97e2fbcf3ff0b187f1100892d8efcacb2))
-* **mail:** Remove some css when generating UIxMailPartHTMLViewer. Sometimes, the mail contains SOGo mail template in the content, and broke mail display. ([863280d](https://github.com/Alinto/sogo/commit/863280d6ac54783a7fe6a8ce3fcdd8c3a4c4e4ff))
-* **mail:** Removed bracket display when inline text or inline html ([06ea167](https://github.com/Alinto/sogo/commit/06ea167ee58c65f54cf4474927d977513d380b3b))
-* **mail:** Restore scroll position when refreshing emails ([9d71be9](https://github.com/Alinto/sogo/commit/9d71be9c45eb9b9af0cb62be99a440ea7652248b))
-* **mail:** Update len value as data is modified in loop. This fixes the issue on sanitizedContentUsingVoidTags whenthere are meta html tags in mail content. ([99da6e0](https://github.com/Alinto/sogo/commit/99da6e0f81a99f94e453ece7fe0761fcf1186fb6))
-* **mail:** When the signature is empty, the -- seperator appears. ([58db9c9](https://github.com/Alinto/sogo/commit/58db9c980eb518dc726e908307988b98cf7a4d84))
-* **preferences:** Can not save preferences when there is a constraint on mail ([990f1e8](https://github.com/Alinto/sogo/commit/990f1e8e8fda67537a3a4ed3a067011e3b81e7dd))
-* **ui:** Fix invalid display when creating new appointment / mail on mobile. Initialize isFullscreen to  if screen is in portrait. Fixes [#5970](https://bugs.sogo.nu/view.php?id=5970). ([314b39d](https://github.com/Alinto/sogo/commit/314b39dd1c65e321920fdc095915c2954a53b944))
-* **vulnerability:** prevent cross-site scripting when previewing attachments ([2e37e59](https://github.com/Alinto/sogo/commit/2e37e59ed140d4aee0ff2fba579ca5f83f2c5920))
-
-
-### Localization
-
-* **ar:** Update Arabic translations ([1aa59dc](https://github.com/Alinto/sogo/commit/1aa59dcd7e5755873ac0a68c770ecb33efe50077))
-* **bg_BG:** Update Bulgarian translations ([be6a69a](https://github.com/Alinto/sogo/commit/be6a69a4d600da2ac3bccd00d10b185871295c2a))
-* **bs_BA:** Update Bosnian translations ([0b530f9](https://github.com/Alinto/sogo/commit/0b530f9e36a996f9910432b5410ce14e0c74a979))
-* **calendar:** Change Email Attendees to Email Attendees (internal users ([eb63e6d](https://github.com/Alinto/sogo/commit/eb63e6d047c4f3967b83f17c6457d353acf2d9ae))
-* **ca:** Update Catalan translations ([ca0b001](https://github.com/Alinto/sogo/commit/ca0b00107a65b2cd5b78d084d8591a99d6055d07))
-* **cs:** Update Czech translations ([5ee1904](https://github.com/Alinto/sogo/commit/5ee190468e7616e2fb05a90fd146dbb0a76ccb6a))
-* **cy:** Update Welsh translations ([fad8c21](https://github.com/Alinto/sogo/commit/fad8c21473bdb975826a37f728f7da76a21afd6f))
-* **da_DK:** Update Danish translations ([bcb2410](https://github.com/Alinto/sogo/commit/bcb2410b1224981f0fec618f2e073197d2539666))
-* **de:** Update German translations ([37f2b1d](https://github.com/Alinto/sogo/commit/37f2b1dc5c630ea58ad356c568d706bb81747cb7))
-* **es_AR:** Update SpanishArgentina translations ([94d32c4](https://github.com/Alinto/sogo/commit/94d32c419c525067415c8ff9c2aa44fd00c361ed))
-* **es_ES:** Update SpanishSpain translations ([6e11cdf](https://github.com/Alinto/sogo/commit/6e11cdf2893727ae77625cad1d0be4cd0e60e1bd))
-* **eu:** Update Basque translations ([55563d2](https://github.com/Alinto/sogo/commit/55563d21132c43841fe009ea93e71bae5058a37c))
-* **fi:** Update Finnish translations ([ed3e790](https://github.com/Alinto/sogo/commit/ed3e790b47f60b2b2548888c23eeb1945c7d8156))
-* **gl:** Update Galician translations ([6b6dc6b](https://github.com/Alinto/sogo/commit/6b6dc6b3b845357b2d9986abe3b84e91484f7c58))
-* **he:** Update Hebrew translations ([8bf1a77](https://github.com/Alinto/sogo/commit/8bf1a77efc12eeaf41b4f6d32aec6eddfe5f4f5c))
-* **hr_HR:** Update Croatian translations ([fa23124](https://github.com/Alinto/sogo/commit/fa2312470adff5026c1d8b75c3e32109b55e51a4))
-* **hu:** Update Hungarian translations ([b82fa1d](https://github.com/Alinto/sogo/commit/b82fa1d0771b082d07e3c654e41a3ef82888e525))
-* **id_ID:** Update Indonesian translations ([de289d9](https://github.com/Alinto/sogo/commit/de289d9b4cd7b0ed6050183acb020c8e1c4054ca))
-* **is:** Update Icelandic translations ([2fabfdf](https://github.com/Alinto/sogo/commit/2fabfdfb9f78df085531a4525707311004d6c4ed))
-* **it:** Update Italian translations ([227b92b](https://github.com/Alinto/sogo/commit/227b92b7434ded7f54affe9aad629b08a3e2badf))
-* **ja:** Update Japanese translations ([0c2c9d7](https://github.com/Alinto/sogo/commit/0c2c9d7682a9ca66ac4d3778ae0efc907f525aa8))
-* **kk:** Update Kazakh translations ([c4b58a6](https://github.com/Alinto/sogo/commit/c4b58a6ae75110482801b4aa2141b564b8943476))
-* **lt:** Update Lithuanian translations ([a84ab76](https://github.com/Alinto/sogo/commit/a84ab7655d05aec16c0d247d13f6da3b46a95221))
-* **lv:** Update Latvian translations ([88c9074](https://github.com/Alinto/sogo/commit/88c9074aeab8759d841ea79db2245520fe998543))
-* **mk_MK:** Update Macedonian translations ([5bb0253](https://github.com/Alinto/sogo/commit/5bb025323f63b93b984707ffa507d900846f6ec5))
-* **nb_NO:** Update NorwegianBokmal translations ([943e96f](https://github.com/Alinto/sogo/commit/943e96f459cc5a8fd93ec8da36f064f251d30dc2))
-* **nl:** Update Dutch translations ([85c1cc7](https://github.com/Alinto/sogo/commit/85c1cc7fa3f3e21b6a158cd51c3e640e94f0e81e))
-* **nn_NO:** Update NorwegianNynorsk translations ([65f29f2](https://github.com/Alinto/sogo/commit/65f29f21dc2d957e3bcabdedb8873e71f65461ee))
-* **pl:** Update Polish translations ([84c0fb4](https://github.com/Alinto/sogo/commit/84c0fb496d5727ccb4248b96b36d57a620ef440a))
-* **pt_BR:** Update BrazilianPortuguese translations ([af630f0](https://github.com/Alinto/sogo/commit/af630f033d3cc1188019e1f3cfe0ebb852f3560f))
-* **pt:** Update Portuguese translations ([9a0e03b](https://github.com/Alinto/sogo/commit/9a0e03bf9afdf049bcce0045411400931c6ce9f1))
-* **ro_RO:** Update Romanian translations ([b889064](https://github.com/Alinto/sogo/commit/b889064dbc7e137298ef8e70538f6a7196477596))
-* **ru:** Update Russian translations ([33df476](https://github.com/Alinto/sogo/commit/33df476db55890fcae1c40bd29e9e81017c86e72))
-* **sk:** Update Slovak translations ([7b7cfdb](https://github.com/Alinto/sogo/commit/7b7cfdb499766867430e49376185105cfbf2ab4f))
-* **sl_SI:** Update Slovenian translations ([68b17a5](https://github.com/Alinto/sogo/commit/68b17a5c4a6a2e015d32dc79c7b33d348be1a5f2))
-* **sr_ME@latin:** Update Montenegrin translations ([8d4597d](https://github.com/Alinto/sogo/commit/8d4597d3610928191313986490eafb44f3077ca5))
-* **sr@latin:** Update SerbianLatin translations ([a4f0397](https://github.com/Alinto/sogo/commit/a4f03978cfc815d3a337d94d5a46bbe10166306a))
-* **sr:** Update Serbian translations ([7de9dc8](https://github.com/Alinto/sogo/commit/7de9dc8f9ba3e62d082d91f4305c5be6c9d2a7c6))
-* **sv:** Update Swedish translations ([dd1a660](https://github.com/Alinto/sogo/commit/dd1a6607fe3ed9e65991d349588179acb7f2eb6c))
-* **tr_TR:** Update TurkishTurkey translations ([56012c6](https://github.com/Alinto/sogo/commit/56012c65e191937b5132c091f6366b6b24546a5f))
-* **uk:** Update Ukrainian translations ([6537d96](https://github.com/Alinto/sogo/commit/6537d961e13604ae373e787664f6fa91f9912ab5))
-* **zh_CN:** Update ChineseChina translations ([0e5657e](https://github.com/Alinto/sogo/commit/0e5657e635012cd2568e30060741e7114ef1a591))
-* **zh_TW:** Update ChineseTaiwan translations ([1136c18](https://github.com/Alinto/sogo/commit/1136c182885d716dc2613d58f59a58fdcf8d8168))
-
 ## [5.10.0](https://github.com/Alinto/sogo/compare/SOGo-5.9.1...SOGo-5.10.0) (2024-02-20)


@@ -12,9 +12,9 @@ vtodo_class2 = "(Skrytý úkol)";
 "The event \"%{Summary}\" was created" = "Událost \"%{Summary}\" byla vytvořena";
 "The event \"%{Summary}\" was deleted" = "Událost \"%{Summary}\" byla smazána";
 "The event \"%{Summary}\" was updated" = "Událost \"%{Summary}\" byla upravena";
-"The task \"%{Summary}\" was created" = "Úkol \"%{Summary}\" byl vytvořen";
-"The task \"%{Summary}\" was deleted" = "Úkol \"%{Summary}\" byl smazán";
-"The task \"%{Summary}\" was updated" = "Úkol \"%{Summary}\" byl upraven";
+"The task \"%{Summary}\" was created" = "The task \"%{Summary}\" was created";
+"The task \"%{Summary}\" was deleted" = "The task \"%{Summary}\" was deleted";
+"The task \"%{Summary}\" was updated" = "The task \"%{Summary}\" was updated";
 "The following attendees(s) were notified" = "Následující účastníci byli upozorněni";
 "The following attendees(s) were added" = "Následující účastníci byli přidáni";
 "The following attendees(s) were removed" = "Následující účastníci byli odebráni";
@@ -12,9 +12,9 @@ vtodo_class2 = "(Zaupno opravilo)";
 "The event \"%{Summary}\" was created" = "Dogodek \"%{Summary}\" je bil ustvarjen";
 "The event \"%{Summary}\" was deleted" = "Dogodek \"%{Summary}\" je bil izbrisan";
 "The event \"%{Summary}\" was updated" = "Dogodek \"%{Summary}\" je bil posodobljen";
-"The task \"%{Summary}\" was created" = "Opravilo \"%{Summary}\" je bilo ustvarjeno";
-"The task \"%{Summary}\" was deleted" = "Opravilo \"%{Summary}\" je bilo izbrisano";
-"The task \"%{Summary}\" was updated" = "Opravilo \"%{Summary}\" je bilo posodobljeno";
+"The task \"%{Summary}\" was created" = "The task \"%{Summary}\" was created";
+"The task \"%{Summary}\" was deleted" = "The task \"%{Summary}\" was deleted";
+"The task \"%{Summary}\" was updated" = "The task \"%{Summary}\" was updated";
 "The following attendees(s) were notified" = "Naslednji udeleženci so bili obveščeni";
 "The following attendees(s) were added" = "Naslednji udeleženci so bili dodani";
 "The following attendees(s) were removed" = "Naslednji udeleženci so bili odstranjeni";
@@ -454,22 +454,19 @@ static NSString *inboxFolderName = @"INBOX";
 //
 - (NSString *) _folderType: (NSString *) folderName
                     flags: (NSMutableArray *) flags
-                     folderTypes: (NSDictionary *) folderTypes
 {
  static NSDictionary *metadata = nil;
-  static NSDictionary *folderTypeDict = nil;
-  NSString *folderType, *key, *rights, *flag;
-  NSEnumerator *flagEnum;
+  NSString *folderType, *key, *rights;
  SOGoUserDefaults *ud;

  if (!metadata)
-  {
-    ud = [[context activeUser] userDefaults];
-    metadata = [[[self imap4Connection] allFoldersMetadataForURL: [self imap4URL]
-                                           onlySubscribedFolders: [ud mailShowSubscribedFoldersOnly]]
-                  objectForKey: @"list"];
-    [metadata retain];
-  }
+    {
+      ud = [[context activeUser] userDefaults];
+      metadata = [[[self imap4Connection] allFoldersMetadataForURL: [self imap4URL]
+                                             onlySubscribedFolders: [ud mailShowSubscribedFoldersOnly]]
+                   objectForKey: @"list"];
+      [metadata retain];
+    }

  key = [NSString stringWithFormat: @"/%@", folderName];
  [flags addObjectsFromArray: [metadata objectForKey: key]];
@@ -477,32 +474,44 @@ static NSString *inboxFolderName = @"INBOX";
  // RFC6154 (https://tools.ietf.org/html/rfc6154) describes special uses for IMAP mailboxes.
  // We do honor them, as long as your SOGo{Drafts,Trash,Sent,Junk}FolderName are properly configured
  // See http://wiki.dovecot.org/MailboxSettings for a Dovecot example.
-  if((folderType = [folderTypes objectForKey: folderName]))
-    return folderType;
-  
-  flagEnum = [flags objectEnumerator];
-  while((flag = [flagEnum nextObject]))
-  {
-    if([flag isEqualToString: inboxFolderName] || [flag isEqualToString: otherUsersFolderName] || [flag isEqualToString: sharedFoldersName])
-      continue;
-    if((folderType = [folderTypes objectForKey: flag]))
-      return folderType;
-  }
-
-  folderType = @"folder";
-  if (([sharedFoldersName length] && [folderName hasPrefix: sharedFoldersName]) ||
-      ([otherUsersFolderName length] && [folderName hasPrefix: otherUsersFolderName]))
-  {
-    rights = [[self imap4Connection] myRightsForMailboxAtURL: [NSURL URLWithString: folderName]];
-    if (![rights isKindOfClass: [NSException class]] &&
-        ([rights rangeOfString: @"r"].location == NSNotFound))
+  if ([folderName isEqualToString: inboxFolderName])
+    folderType = @"inbox";
+  else if ([flags containsObject: [self draftsFolderNameInContext: context]] ||
+           [folderName isEqualToString: [self draftsFolderNameInContext: context]])
+    folderType = @"draft";
+  else if ([flags containsObject: [self sentFolderNameInContext: context]] ||
+           [folderName isEqualToString: [self sentFolderNameInContext: context]])
+    folderType = @"sent";
+  else if ([flags containsObject: [self trashFolderNameInContext: context]] ||
+           [folderName isEqualToString: [self trashFolderNameInContext: context]])
+    folderType = @"trash";
+  else if ([flags containsObject: [self junkFolderNameInContext: context]] ||
+           [folderName isEqualToString: [self junkFolderNameInContext: context]])
+    folderType = @"junk";
+  else if ([flags containsObject: [self templatesFolderNameInContext: context]] ||
+           [folderName isEqualToString: [self templatesFolderNameInContext: context]])
+    folderType = @"templates";
+  else if ([folderName isEqualToString: otherUsersFolderName])
+    folderType = @"otherUsers";
+  else if ([folderName isEqualToString: sharedFoldersName])
+    folderType = @"shared";
+  else
    {
-      [flags addObjectUniquely: @"noselect"];
-      if ([rights rangeOfString: @"i"].location != NSNotFound)
-        // No read but insert = dropbox
-        folderType = @"dropbox";
+      folderType = @"folder";
+      if (([sharedFoldersName length] && [folderName hasPrefix: sharedFoldersName]) ||
+          ([otherUsersFolderName length] && [folderName hasPrefix: otherUsersFolderName]))
+        {
+          rights = [[self imap4Connection] myRightsForMailboxAtURL: [NSURL URLWithString: folderName]];
+          if (![rights isKindOfClass: [NSException class]] &&
+              ([rights rangeOfString: @"r"].location == NSNotFound))
+            {
+              [flags addObjectUniquely: @"noselect"];
+              if ([rights rangeOfString: @"i"].location != NSNotFound)
+                // No read but insert = dropbox
+                folderType = @"dropbox";
+            }
+        }
    }
-  }

  return folderType;
 }
@@ -512,7 +521,6 @@ static NSString *inboxFolderName = @"INBOX";
 //
 - (NSMutableDictionary *) _insertFolder: (NSString *) folderPath
                            foldersList: (NSMutableArray *) theFolders
-                            folderTypes: (NSDictionary *) folderTypes
 {
  NSArray *pathComponents;
  NSMutableArray *folders, *flags;
@@ -533,99 +541,103 @@ static NSString *inboxFolderName = @"INBOX";
  // The variable folderPath is something like '/INBOX/Junk' so pathComponents becomes ('/', 'INBOX', 'Junk').
  // That's why we always ignore the first element
  for (i = 1; i < count; i++)
-  {
-    last = ((count - i) == 1);
-    folder = nil;
-    if ([currentPath length])
-      currentPath = [NSString stringWithFormat: @"%@/%@", currentPath, [pathComponents objectAtIndex: i]];
-    else
-      currentPath = [pathComponents objectAtIndex: i];
-
-    // Search for the current path in the children of the parent folder.
-    // For the first iteration, take the parent folder passed as argument.
-    if (parentFolder)
-      folders = [parentFolder objectForKey: @"children"];
-    else
-      folders = theFolders;
-
-    for (j = 0; j < [folders count]; j++)
    {
-      currentFolder = [folders objectAtIndex: j];
-      if ([currentPath isEqualToString: [currentFolder objectForKey: @"path"]])
-      {
-        folder = currentFolder;
-        // Make sure all branches are ready to receive children
-        if (!last && ![folder objectForKey: @"children"])
-            [folder setObject: [NSMutableArray array] forKey: @"children"];
-        break;
-      }
-    }
-
-    // Check if the current folder is the "Other users" folder (shared mailboxes)
-    currentFolderName = [[pathComponents objectAtIndex: i] stringByDecodingImap4FolderName];
-    if (otherUsersFolderName && [currentFolderName caseInsensitiveCompare: otherUsersFolderName] == NSOrderedSame)
-	    isOtherUsersFolder = YES;
-    else
-	    isOtherUsersFolder = NO;
-
-    if (folder == nil)
-    {
-      // Folder was not found; create it and add it to the folders list
-      if (parentIsOtherUsersFolder)
-      {
-        // Parent folder is the "Other users" folder; translate the user's mailbox name
-        // to the full name of the person
-        userManager = [SOGoUserManager sharedUserManager];
-        if ((fullName = [userManager getCNForUID: currentFolderName]) && [fullName length])
-          currentFolderName = fullName;
-        else if ((fullName = [userManager getEmailForUID: currentFolderName]) && [fullName length])
-          currentFolderName = fullName;
-      }
-      else if (isOtherUsersFolder)
-        currentFolderName = [self labelForKey: @"OtherUsersFolderName"];
-      else if (sharedFoldersName && [currentFolderName caseInsensitiveCompare: sharedFoldersName] == NSOrderedSame)
-        currentFolderName = [self labelForKey: @"SharedFoldersName"];
-
-      flags = [NSMutableArray array];
-
-      if (last)
-      {
-        folderType = [self _folderType: currentPath flags: flags folderTypes: folderTypes];
-      }
+      last = ((count - i) == 1);
+      folder = nil;
+      if ([currentPath length])
+        currentPath = [NSString stringWithFormat: @"%@/%@", currentPath, [pathComponents objectAtIndex: i]];
      else
-      {
-        folderType = @"additional";
-        [flags addObject: @"noselect"];
-      }
+        currentPath = [pathComponents objectAtIndex: i];

-	    if ([subscribedFolders objectForKey: folderPath])
-	      isSubscribed = YES;
-	    else
-	      isSubscribed = NO;
-
-      folder = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                        currentPath, @"path",
-                                        folderType, @"type",
-                                        currentFolderName, @"name",
-                                        [NSMutableArray array], @"children",
-                                        flags, @"flags",
-                                        [NSNumber numberWithBool: isSubscribed], @"subscribed",
-                                        nil];
-
-      if (sieveFolderUTF8Encoding)
-        sievePath = [currentPath stringByDecodingImap4FolderName];
+      // Search for the current path in the children of the parent folder.
+      // For the first iteration, take the parent folder passed as argument.
+      if (parentFolder)
+	folders = [parentFolder objectForKey: @"children"];
      else
-        sievePath = currentPath;
-      [folder setObject: sievePath forKey: @"sievePath"];
+	folders = theFolders;

-      // Either add this new folder to its parent or the list of root folders
-      [folders addObject: folder];
+      for (j = 0; j < [folders count]; j++)
+        {
+          currentFolder = [folders objectAtIndex: j];
+          if ([currentPath isEqualToString: [currentFolder objectForKey: @"path"]])
+            {
+              folder = currentFolder;
+              // Make sure all branches are ready to receive children
+              if (!last && ![folder objectForKey: @"children"])
+                  [folder setObject: [NSMutableArray array] forKey: @"children"];
+
+	      break;
+            }
+        }
+
+      // Check if the current folder is the "Other users" folder (shared mailboxes)
+      currentFolderName = [[pathComponents objectAtIndex: i] stringByDecodingImap4FolderName];
+      if (otherUsersFolderName
+          && [currentFolderName caseInsensitiveCompare: otherUsersFolderName] == NSOrderedSame)
+	isOtherUsersFolder = YES;
+      else
+	isOtherUsersFolder = NO;
+
+      if (folder == nil)
+        {
+          // Folder was not found; create it and add it to the folders list
+          if (parentIsOtherUsersFolder)
+            {
+              // Parent folder is the "Other users" folder; translate the user's mailbox name
+              // to the full name of the person
+              userManager = [SOGoUserManager sharedUserManager];
+              if ((fullName = [userManager getCNForUID: currentFolderName]) && [fullName length])
+                currentFolderName = fullName;
+	      else if ((fullName = [userManager getEmailForUID: currentFolderName]) && [fullName length])
+		currentFolderName = fullName;
+            }
+          else if (isOtherUsersFolder)
+	    currentFolderName = [self labelForKey: @"OtherUsersFolderName"];
+          else if (sharedFoldersName
+                   && [currentFolderName caseInsensitiveCompare: sharedFoldersName] == NSOrderedSame)
+	    currentFolderName = [self labelForKey: @"SharedFoldersName"];
+
+          flags = [NSMutableArray array];
+
+          if (last)
+            {
+              folderType = [self _folderType: currentPath
+                                       flags: flags];
+            }
+          else
+            {
+              folderType = @"additional";
+              [flags addObject: @"noselect"];
+            }
+
+	  if ([subscribedFolders objectForKey: folderPath])
+	    isSubscribed = YES;
+	  else
+	    isSubscribed = NO;
+
+          folder = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                                          currentPath, @"path",
+                                          folderType, @"type",
+                                          currentFolderName, @"name",
+                                          [NSMutableArray array], @"children",
+					  flags, @"flags",
+					  [NSNumber numberWithBool: isSubscribed], @"subscribed",
+					  nil];
+
+          if (sieveFolderUTF8Encoding)
+            sievePath = [currentPath stringByDecodingImap4FolderName];
+          else
+            sievePath = currentPath;
+          [folder setObject: sievePath forKey: @"sievePath"];
+
+          // Either add this new folder to its parent or the list of root folders
+          [folders addObject: folder];
+        }
+
+      parentFolder = folder;
+      parentIsOtherUsersFolder = isOtherUsersFolder;
    }

-    parentFolder = folder;
-    parentIsOtherUsersFolder = isOtherUsersFolder;
-  }
-
  return parentFolder;
 }

@@ -639,25 +651,11 @@ static NSString *inboxFolderName = @"INBOX";
  NSEnumerator *rawFolders;
  NSAutoreleasePool *pool;
  NSArray *allFolderPaths;
-  NSMutableDictionary *folderTypes;

  allFolderPaths = [self allFolderPaths: theListingMode];
  rawFolders = [allFolderPaths objectEnumerator];
  folders = [NSMutableArray array];

-  folderTypes = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                      @"inbox", inboxFolderName,
-                                      @"draft", [self draftsFolderNameInContext: context],
-                                      @"sent",  [self sentFolderNameInContext: context],
-                                      @"trash", [self trashFolderNameInContext: context],
-                                      @"junk",  [self junkFolderNameInContext: context],
-                                      @"templates",  [self templatesFolderNameInContext: context],
-                                      nil];
-  if(otherUsersFolderName && [otherUsersFolderName length] > 0)
-    [folderTypes setObject: @"otherUsers" forKey: otherUsersFolderName];
-  if(sharedFoldersName && [sharedFoldersName length] > 0)
-    [folderTypes setObject: @"shared" forKey: sharedFoldersName];
-
  while ((currentFolder = [rawFolders nextObject]))
    {
      // Using a local pool to avoid using too many file descriptors. This could
@@ -668,8 +666,7 @@ static NSString *inboxFolderName = @"INBOX";

      // Insert folder into folders tree
      [self _insertFolder: currentFolder
-              foldersList: folders
-              folderTypes: folderTypes];
+              foldersList: folders];

      [pool release];
    }
@@ -1122,10 +1119,11 @@ static NSString *inboxFolderName = @"INBOX";
  folderName = [[account objectForKey: @"specialMailboxes"]
                 objectForKey: purpose];
  if (!folderName && accountIdx > 0)
-  {
-    account = [accounts objectAtIndex: 0];
-    folderName = [[account objectForKey: @"specialMailboxes"] objectForKey: purpose];
-  }
+    {
+      account = [accounts objectAtIndex: 0];
+      folderName = [[account objectForKey: @"specialMailboxes"]
+                     objectForKey: purpose];
+    }

  return folderName;
 }
@@ -1,5 +1,5 @@
 "OtherUsersFolderName"   = "Otros usuarios";
 "SharedFoldersName" = "Carpetas compartidas";

-"Report: Marked messages as junk" = "Informe: Mensajes marcados como spam";
-"Report: Marked messages as not junk" = "Informe: Mensajes marcados como no spam";
+"Report: Marked messages as junk" = "Report: Marked messages as junk";
+"Report: Marked messages as not junk" = "Report: Marked messages as not junk";
@@ -1119,7 +1119,7 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc";
        tmpIdentities = [NSMutableArray array];
        for (identity in identities) {
          tmpIdentity = [NSMutableDictionary dictionaryWithDictionary: identity];
-          if ([tmpIdentity objectForKey: @"signature"] && [[tmpIdentity objectForKey: @"signature"] length] > 0) {
+          if ([tmpIdentity objectForKey: @"signature"] ) {
            // Add raw html embed class
            if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound
                && [[[self userDefaults] mailComposeMessageType] isEqualToString: @"html"]
@@ -25,7 +25,7 @@
 "No resource" = "Nenhum recurso";
 "Any Authenticated User" = "Qualquer Usuário Autenticado";
 "Public Access" = "Acesso Público";
-"Save" = "Salvar";
-"Clear" = "Limpar";
-"Message of the day" = "Mensagem do dia";
-"Message of the day has been saved" = "A mensagem do dia foi salva";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Není zdroj";
 "Any Authenticated User" = "Každý ověřený uživatel";
 "Public Access" = "Veřejný přístup";
-"Save" = "Uložit";
-"Clear" = "Vymazat";
-"Message of the day" = "Zpráva dne";
-"Message of the day has been saved" = "Zpráva dne byla uložena";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Ingen ressource";
 "Any Authenticated User" = "Enhver godkendt bruger";
 "Public Access" = "Offentlig adgang";
-"Save" = "Gem";
-"Clear" = "Ryd";
-"Message of the day" = "Dagens besked";
-"Message of the day has been saved" = "Dagens besked er blevet gemt";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Sen recurso";
 "Any Authenticated User" = "Calquera usuario autenticado";
 "Public Access" = "Acceso público";
-"Save" = "Gardar";
-"Clear" = "Borrar";
-"Message of the day" = "Mensaxe do día";
-"Message of the day has been saved" = "A mensaxe do día foi gardado";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Ingen ressurs";
 "Any Authenticated User" = "Enhver autentisert bruker";
 "Public Access" = "Offentlig tilgang";
-"Save" = "Lagre";
-"Clear" = "Tøm";
-"Message of the day" = "Dagens melding";
-"Message of the day has been saved" = "Dagens melding er lagret";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -25,7 +25,7 @@
 "No resource" = "Ni virov";
 "Any Authenticated User" = "Vsak prijavljen uporabnik";
 "Public Access" = "Javni dostop";
-"Save" = "Shrani";
-"Clear" = "Počisti";
-"Message of the day" = "Sporočilo dneva";
-"Message of the day has been saved" = "Sporočilo dneva je bilo shranjeno";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -10,7 +10,7 @@
 /* Modules descriptions */
 "ACLs_description" = "<p>El módulo administrativo de ACL (Listas de Control de Acceso por su siglas inglés) permite cambiar los ACLs de las Agendas y Libreta de Direcciones de cada usuario.</p><p>Para modificar los ACLs de las carpetas de un usuario, teclea el nombre de usuario en el campo de búsqueda arriba de la ventana y haz un doble-click sobre la carpeta deseada.</p>";
 "Name or Email" = "Nombre o Correo";
-"ACLs saved" = "LCAs guardadas";
+"ACLs saved" = "ACLs saved";
 /* Rights module: initial search message */
 "Start a search to edit the rights" = "Iniciar una búsqueda para modificar los derechos";
 /* Rights module: Empty search result */
@@ -25,7 +25,7 @@
 "No resource" = "No recursos";
 "Any Authenticated User" = "Cualquier Usuario Autenticado ";
 "Public Access" = "Acceso publico";
-"Save" = "Guardar";
-"Clear" = "Borrar";
-"Message of the day" = "Mensaje del día";
-"Message of the day has been saved" = "Se ha guardado el mensaje del día";
+"Save" = "Save";
+"Clear" = "Clear";
+"Message of the day" = "Message of the day";
+"Message of the day has been saved" = "Message of the day has been saved";
@@ -41,22 +41,22 @@
     = "Potenciálně kdokoliv v Internetu bude mít přístup k vašemu adresáři \"%{0}\", i když není uživatelem tohoto systému. Jsou tyto informace vhodné pro veřejný Internet?";
 "Give Access" = "Umožnit přístup";
 "Keep Private" = "Ponechat soukromým";
-"Expand" = "Rozbalit";
-"Reduce" = "Sbalit";
+"Expand" = "Expand";
+"Reduce" = "Reduce";

 /* tooltip */
-"Refresh" = "Obnovit";
+"Refresh" = "Refresh";

 /* generic.js */
 "Unable to subscribe to that folder!"
-        = "Nelze se přihlásit k odběru této složky!";
+        = "Není možné se přihlásit k odebírání této složky!";
 "You cannot subscribe to a folder that you own!"
        = "Nemůžete se přihlásit k odebírání své vlastní složky!";
 "Unable to unsubscribe from that folder!"
-        = "Nelze se odhlásit z odběru této složky!";
+        = "Není možné se odhlásit z odebírání této složky!";
 "You cannot unsubscribe from a folder that you own!"
        = "Nemůžete se odhlásit z odebírání své vlastní složky!";
-"Unable to rename that folder!" = "Nelze přejmenovat tuto složku!";
+"Unable to rename that folder!" = "Není možné tuto složku přejmenovat!";
 "You have already subscribed to that folder!"
        = "Tuto složku již odebíráte!";
 "The user rights cannot be edited for this object!"
@@ -109,7 +109,7 @@
 "Personal" = "Osobní";
 "To Do" = "Třeba udělat";
 "Later" = "Později";
-"Forwarded" = "Přeposláno";
+"Forwarded" = "Forwarded";
 "Return Receipt Sent" = "Odesláno potvrzení o přečtení";
 "a2_Sunday" = "Ne";
 "a2_Monday" = "Po";
@@ -128,15 +128,15 @@
 "S/MIME Certificate" = "S/MIME Certifikát";
 "Subject Name" = "Jméno Subjektu";
 "Issuer" = "Vydavatel";
-"streetAddress" = "Ulice";
-"stateOrProvinceName" = "Oblast";
-"localityName" = "Umístění";
+"streetAddress" = "Street";
+"stateOrProvinceName" = "State or Province";
+"localityName" = "Locality";
 "countryName" = "Země";
 "organizationName" = "Organizace";
 "organizationalUnitName" = "Organizační jednotka";
 "commonName" = "Obecné Jméno";
-"surname" = "Příjmení";
-"givenName" = "Jméno";
+"surname" = "Surname";
+"givenName" = "Given Name";
 "emailAddress" = "E-mail";


@@ -227,9 +227,9 @@
 "Move forward" = "Posun vpřed";

 /* Password Recovery */
-"passwordRecovery_Disabled" = "Zakázáno";
-"passwordRecovery_SecretQuestion" = "Tajná otázka";
-"passwordRecovery_SecretQuestion1" = "Jaké je jméno Vašeho prvního mazlíčka?";
-"passwordRecovery_SecretQuestion2" = "Jaké bylo Vaše první auto?";
-"passwordRecovery_SecretQuestion3" = "Jaký je Váš oblíbený film?";
-"passwordRecovery_SecondaryEmail" = "Sekundární e-mail";
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";
@@ -45,7 +45,7 @@
 "Reduce" = "Skrči";

 /* tooltip */
-"Refresh" = "Osveži";
+"Refresh" = "Refresh";

 /* generic.js */
 "Unable to subscribe to that folder!"
@@ -109,7 +109,7 @@
 "Personal" = "Osebno";
 "To Do" = "Opravilo";
 "Later" = "Pozneje";
-"Forwarded" = "Posreduj";
+"Forwarded" = "Forwarded";
 "Return Receipt Sent" = "Povratnica poslana";
 "a2_Sunday" = "Ne";
 "a2_Monday" = "Po";
@@ -227,9 +227,9 @@
 "Move forward" = "Naprej";

 /* Password Recovery */
-"passwordRecovery_Disabled" = "Deaktiviraj";
-"passwordRecovery_SecretQuestion" = "Varnostno vprašanje";
-"passwordRecovery_SecretQuestion1" = "Kako je bilo ime tvoji prvi domači živali?";
-"passwordRecovery_SecretQuestion2" = "Kateri je bi tvoj prvi avto?";
-"passwordRecovery_SecretQuestion3" = "Kateri je tvoj najljubši film?";
-"passwordRecovery_SecondaryEmail" = "Rezervni elekronski naslov";
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";
@@ -41,11 +41,11 @@
     = "Potencialmente cualquier usuario de Internet tendrá acceso a su libreta de dirección \"%{0}\", también si no tiene una cuenta en este sistema. ¿Es esta información adecuada para todo el Internet publico?";
 "Give Access" = "Permite Acceso";
 "Keep Private" = "Mantiene Privado";
-"Expand" = "Ampliar";
-"Reduce" = "Reducir";
+"Expand" = "Expand";
+"Reduce" = "Reduce";

 /* tooltip */
-"Refresh" = "Actualizar";
+"Refresh" = "Refresh";

 /* generic.js */
 "Unable to subscribe to that folder!"
@@ -83,10 +83,10 @@

 /* generic messages */
 "Error" = "Error";
-"Success" = "Éxito";
+"Success" = "Success";

 /* confirmation dialog box */
-"Confirmation" = "Confirmación";
+"Confirmation" = "Confirmation";

 /* alarms */
 "Reminder" = "Recordatorio";
@@ -109,8 +109,8 @@
 "Personal" = "Personal";
 "To Do" = "Por hacer";
 "Later" = "Más tarde";
-"Forwarded" = "Reenviado";
-"Return Receipt Sent" = "Envío de acuse de recibo";
+"Forwarded" = "Forwarded";
+"Return Receipt Sent" = "Return Receipt Sent";
 "a2_Sunday" = "Do";
 "a2_Monday" = "Lu";
 "a2_Tuesday" = "Ma";
@@ -125,19 +125,19 @@
 "You cannot (un)subscribe to a folder that you own!" = "No es posible suscribirse a una carpeta que le pertenece.";

 /* SMIME Certificate field */
-"S/MIME Certificate" = "Certificado S/MIME";
-"Subject Name" = "Titular";
-"Issuer" = "Remitente";
-"streetAddress" = "Dirección";
-"stateOrProvinceName" = "Estado/Provincia";
-"localityName" = "Localidad";
-"countryName" = "País";
-"organizationName" = "Organización";
-"organizationalUnitName" = "Departamento/ Sección";
-"commonName" = "Dominio";
-"surname" = "Apellido";
-"givenName" = "Nombre";
-"emailAddress" = "Correo electrónico";
+"S/MIME Certificate" = "S/MIME Certificate";
+"Subject Name" = "Subject Name";
+"Issuer" = "Issuer";
+"streetAddress" = "Street";
+"stateOrProvinceName" = "State or Province";
+"localityName" = "Locality";
+"countryName" = "Country";
+"organizationName" = "Organization";
+"organizationalUnitName" = "Organizational Unit";
+"commonName" = "Common Name";
+"surname" = "Surname";
+"givenName" = "Given Name";
+"emailAddress" = "Email Address";


 /* Authentication username */
@@ -156,18 +156,18 @@
 "File size upload limit reached" = "Alcanzado el tamaño máximo del archivo";

 /* Generic server error */
-"An error occured, please try again." = "Se ha producido un error, inténtelo de nuevo.";
+"An error occured, please try again." = "An error occured, please try again.";

 /* Open datepicker */
-"Open Calendar" = "Abrir calendario";
+"Open Calendar" = "Open Calendar";

 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "Cambiar la visibilidad";

-"Keyboard Shortcuts" = "Atajos del teclado";
+"Keyboard Shortcuts" = "Keyboard Shortcuts";

 /* Aria label for avatar button to select and unselect an item */
-"Toggle item" = "Activar elemento";
+"Toggle item" = "Toggle item";

 /* Toggle multiple items at the same time (hotkeys cheatsheet) */
 "Toggle range of items" = "Cambiar el rango de elementos";
@@ -179,7 +179,7 @@
 "key_space" = "space";

 /* Delete key */
-"key_delete" = "borrar";
+"key_delete" = "delete";

 /* Shift and space key */
 "key_shift+space" = "Mayúsculas + espacio";
@@ -227,9 +227,9 @@
 "Move forward" = "Avanzar";

 /* Password Recovery */
-"passwordRecovery_Disabled" = "Desactivado";
-"passwordRecovery_SecretQuestion" = "Pregunta secreta";
-"passwordRecovery_SecretQuestion1" = "¿Cuál es el nombre de su primera mascota?";
-"passwordRecovery_SecretQuestion2" = "¿Cuál fue su primer coche?";
-"passwordRecovery_SecretQuestion3" = "¿Cuál es su película favorita?";
-"passwordRecovery_SecondaryEmail" = "Email secundario";
+"passwordRecovery_Disabled" = "Disabled";
+"passwordRecovery_SecretQuestion" = "Secret question";
+"passwordRecovery_SecretQuestion1" = "What is the name of your first pet ?";
+"passwordRecovery_SecretQuestion2" = "What was your first car ?";
+"passwordRecovery_SecretQuestion3" = "What is your favorite movie ?";
+"passwordRecovery_SecondaryEmail" = "Secondary E-mail";
@@ -193,7 +193,7 @@
 "Work" = "Zaměstnání";
 "Mobile" = "Mobilní telefon";
 "Pager" = "Pager";
-"Download iOS - MacOS configuration profile" = "Stáhnout konfiguraci pro iOS - MacOS";
+"Download iOS - MacOS configuration profile" = "Download iOS - MacOS configuration profile";

 /* categories */
 "contacts_category_labels" = "Kolega, Konkurent, Zákazník, Přítel, Rodina, Obchodní partner, Dodavatel, Tisk, VIP";
@@ -241,7 +241,7 @@
 "You cannot subscribe to a folder that you own!"
 = "Nemůžete se přihlásit k odebírání vlastní složky! ";
 "Unable to subscribe to that folder!"
-= "Nelze se přihlásit k odběru této složky.";
+= "Nemůžete se přihlásit k odebírání této složky!";

 /* security */
 "Security" = "Zabezpečení";
@@ -27,9 +27,9 @@
 "OfficePhone" = "Teléfono oficina";
 "Organization" = "Organización";
 "Work Phone" = "Teléfono trabajo";
-"Cell" = "Celda";
+"Cell" = "Cell";
 "Pager" = "Busca";
-"Pref" = "Prefs";
+"Pref" = "Pref";
 "Phone" = "Teléfono";
 "Phones" = "Teléfonos";
 "Postal" = "Código Postal";
@@ -49,88 +49,88 @@
 "Blind Carbon Copy (Bcc)" = "Con Copia Oculta (Bcc)";

 /* Search scope: name fields */
-"name" = "Nombre";
+"name" = "Name";

 /* Search scope: name fields */
-"c_cn" = "Nombre";
+"c_cn" = "Name";

 /* Search scope: secondary email field */
-"mozillanickname" = "Correo secundario";
+"mozillanickname" = "Secondary email";

 /* Search scope: screen name field */
-"nsaimid" = "Nombre en pantalla";
+"nsaimid" = "Screen name";

 /* Search scope: mail fields */
-"mail" = "Correo";
+"mail" = "Mail";

 /* Search scope: mail fields */
-"c_mail" = "Correo";
+"c_mail" = "Mail";

 /* Search scope: telephone field */
-"telephonenumber" = "Teléfono";
+"telephonenumber" = "Telephone";

 /* Search scope: telephone field */
-"homephone" = "Teléfono";
+"homephone" = "Telephone";

 /* Search scope: mobile field */
-"mobile" = "Móvil";
+"mobile" = "Mobile";

 /* Search scope: fax field */
 "facsimiletelephonenumber" = "Fax";

 /* Search scope: pager field */
-"pager" = "Localizador";
+"pager" = "Pager";

 /* Search scope: categories field */
-"c_categories" = "Categorias";
+"c_categories" = "Categories";

 /* Search scope: categories field */
-"vcardcategories" = "Categorias";
+"vcardcategories" = "Categories";

 /* Search scope: title field */
-"title" = "Cargo";
+"title" = "Title";

 /* Search scope: organization field */
-"c_o" = "Organización";
+"c_o" = "Organization";

 /* Search scope: organization field */
-"o" = "Organización";
+"o" = "Organization";

 /* Search scope: department field */
-"ou" = "Departamento";
+"ou" = "Department";

 /* Search scope: city field */
-"l" = "Ciudad";
+"l" = "City";

 /* Search scope: country field */
-"c" = "País";
+"c" = "Country";

 /* Search scope: home address field */
-"mozillahomestreet" = "Domicilio particular";
+"mozillahomestreet" = "Home Address";

 /* Search scope: state/province field */
-"st" = "Estado/Provincia";
+"st" = "State/Province";

 /* Search scope: home state/province field */
-"mozillahomestate" = "Provincia Natal";
+"mozillahomestate" = "Home State/Province";

 /* Search scope: zip/postal code field */
-"postalCode" = "Código Postal";
+"postalCode" = "Zip/Postal Code";

 /* Search scope: home zip/postal code field */
-"mozillahomepostalcode" = "Código Postal";
+"mozillahomepostalcode" = "Zip/Postal Code";

 /* Search scope: home country field */
-"mozillahomecountryname" = "País Natal";
+"mozillahomecountryname" = "Home Country";

 /* Search scope: home web page field */
-"mozillahomeurl" = "Pagina de inicio";
+"mozillahomeurl" = "Home page";

 /* Search scope: work web page field */
-"mozillaworkurl" = "Página web";
+"mozillaworkurl" = "Web page";

 /* Search scope: note field */
-"description" = "Nota";
+"description" = "Note";

 /* Subheader of empty addressbook */
 "No contact" = "No contacto";
@@ -193,7 +193,7 @@
 "Work" = "Trabajo";
 "Mobile" = "Móvil";
 "Pager" = "Busca";
-"Download iOS - MacOS configuration profile" = "Descargar el perfil de configuración iOS - macOS";
+"Download iOS - MacOS configuration profile" = "Download iOS - MacOS configuration profile";

 /* categories */
 "contacts_category_labels" = "Colega, Competidor, Cliente, Amigo, Familia, Socio, Proveedor, Prensa, VIP";
@@ -222,7 +222,7 @@
 "New Addressbook..." = "Crear libreta de direcciones...";
 "Subscribe to an Addressbook..." = "Suscribir a una libreta de direcciones...";
 "Remove the selected Addressbook" = "Borrar libreta de direcciones seleccionada";
-"Subscribe to a shared contact" = "Suscribirse a una libreta de direcciones compartida";
+"Subscribe to a shared contact" = "Subscribe to a shared addressbook";
 "Search User" = "Buscar usuarios";
 "Name of the Address Book" = "Nombre de la libreta de direcciones";
 "Are you sure you want to delete the selected address book?"
@@ -244,10 +244,10 @@
 = "No puede suscribirse a esta carpeta.";

 /* security */
-"Security" = "Seguridad";
-"Uninstall" = "Desinstalar";
-"Error reading the card certificate." = "Error al leer el certificado de la tarjeta.";
-"No certificate associated to card." = "No hay un certificado asociado a la tarjeta.";
+"Security" = "Security";
+"Uninstall" = "Uninstall";
+"Error reading the card certificate." = "Error reading the card certificate.";
+"No certificate associated to card." = "No certificate associated to card.";

 /* acls */
 "Access rights to" = "Derechos de accesos a";
@@ -351,7 +351,7 @@
 "Synchronization" = "Sincronización";
 "Synchronize" = "Sincroniza";
 "Sucessfully subscribed to address book" = "Suscripción a la libreta de direcciones con éxito";
-"A similar card already exists. Would you like to save it anyway?" = "Ya existe una tarjeta similar. ¿Quiere guardarla de todos modos?";
+"A similar card already exists. Would you like to save it anyway?" = "A similar card already exists. Would you like to save it anyway?";

 /* Aria label for scope of search on contacts */
 "Search scope" = "Ámbito de búsqueda";
@@ -47,4 +47,3 @@ reply_info = "هذا هو الرد على دعوة الحدث التي قمت ب
 "OK" = "OK";
 "Comment" = "Comment";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Zuk egindako gonbidapen bati erantzuna da hau.";
 "OK" = "OK";
 "Comment" = "Comment";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ovo je odgovor na event koji ste vi kreirali.";
 "OK" = "OK";
 "Comment" = "Komentar";
 "Description" = "Opis";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Esta é uma resposta de um convite feito por você.";
 "OK" = "OK";
 "Comment" = "Comentário:";
 "Description" = "Descrição";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Това е в отговор на покана за събити
 "OK" = "ДА";
 "Comment" = "Коментар";
 "Description" = "Описание";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Aquesta és la resposta a una invitació d'esdeveniment que heu fe
 "OK" = "D'acord";
 "Comment" = "Comentari:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "这事你邀请信的答复。";
 "OK" = "OK";
 "Comment" = "评论";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "這是您發起的事件的出席回覆。";
 "OK" = "OK";
 "Comment" = "備註";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "To je odgovor na poziv događaja napravljeno sa Vaše strane.";
 "OK" = "OK";
 "Comment" = "Komentar";
 "Description" = "Description";
-"Location" = "Location";
@@ -46,5 +46,4 @@ reply_info = "Toto je odpověď na pozvánku k událost, kterou jste vytvořili
 "Cancel" = "Storno";
 "OK" = "OK";
 "Comment" = "Komentář:";
-"Description" = "Popis";
-"Location" = "Location";
+"Description" = "Description";
@@ -47,4 +47,3 @@ reply_info = "Dette er et svar på en begivenhed inviteret af dig.";
 "OK" = "OK";
 "Comment" = "Kommentar";
 "Description" = "Beskrivelse";
-"Location" = "Sted";
@@ -47,4 +47,3 @@ reply_info = "Dit is een antwoord op een door u verstuurde uitnodiging.";
 "OK" = "OK";
 "Comment" = "Commentaar:";
 "Description" = "Omschrijving";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Tämä on vastaus tapahtumakutsuusi.";
 "OK" = "OK";
 "Comment" = "Kommentti:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Esta é a resposta a un convite de evento feito por Vde.";
 "OK" = "OK";
 "Comment" = "Comentario:";
 "Description" = "Descrición";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Dies ist eine Antwort auf eine Termineinladung von Ihnen.";
 "OK" = "OK";
 "Comment" = "Kommentar:";
 "Description" = "Beschreibung";
-"Location" = "Ort";
@@ -47,4 +47,3 @@ reply_info = "זו תגובה להזמנה לאירוע שנוצרה על ידכ
 "OK" = "אוקיי";
 "Comment" = "תגובה";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ez egy válasz az ön által kiküldött meghívásra.";
 "OK" = "OK";
 "Comment" = "Megjegyzés:";
 "Description" = "Leírás";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Þetta er svar við boði á viðburð sem þú hefur gert.";
 "OK" = "OK";
 "Comment" = "Comment";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ini adalah balasan untuk undangan acara yang anda lakukan.";
 "OK" = "OK";
 "Comment" = "Komentar";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Questa è una risposta ad un invito ad un evento richiesto da te."
 "OK" = "OK";
 "Comment" = "Commento";
 "Description" = "Descrizione";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "これはイベントの招待への返信です。";
 "OK" = "OK";
 "Comment" = "コメント";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Бұл сіздің іс-шараға шақыруыңызға ж
 "OK" = "ОК";
 "Comment" = "Түсіндірме:";
 "Description" = "Сипаттама";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Šī ir atbilde uz uzaicinājumu piedalīties pasākumā.";
 "OK" = "OK";
 "Comment" = "Komentārs";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Šis atsakymas į susitikimo kvietimą yra jūsų baigtas.";
 "OK" = "Gerai";
 "Comment" = "Komentaras:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ова е одговор на покана за настан кр
 "OK" = "Во ред";
 "Comment" = "Коментар:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ovaj odgovor na pozivnicu za događaj je vaš.";
 "OK" = "U redu";
 "Comment" = "Komentar";
 "Description" = "Opis";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Dette er et svar på en invitasjon sendt av deg.";
 "OK" = "OK";
 "Comment" = "Kommentar";
 "Description" = "Beskrivelse";
-"Location" = "Lokasjon";
@@ -47,4 +47,3 @@ reply_info = "Du har fått et svar angående en begivenhet invitert av deg.";
 "OK" = "OK";
 "Comment" = "Comment";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "To jest odpowiedź do utworzonego przez ciebie wydarzenia";
 "OK" = "OK";
 "Comment" = "Komentarz";
 "Description" = "Opis";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Esta é uma resposta para um convite de um evento feito por si.";
 "OK" = "OK";
 "Comment" = "Comentário:";
 "Description" = "Descrição";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Acesta este un răspuns la un eveniment creat de dumneavoastră.";
 "OK" = "OK";
 "Comment" = "Comentariu";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Это ответ на Ваше приглашение на мер
 "OK" = "ОК";
 "Comment" = "Комментарий:";
 "Description" = "Описание";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Овај одговор на позивницу за догађа
 "OK" = "У реду";
 "Comment" = "Коментар";
 "Description" = "Опис";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Ovaj odgovor na pozivnicu za događaj je vaš.";
 "OK" = "U redu";
 "Comment" = "Komentar";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Toto je odpoveď na vašu pozvánku na udalosť.";
 "OK" = "OK";
 "Comment" = "Komentár:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "To je odgovor na tvoje povabilo na dogodek.";
 "OK" = "V redu";
 "Comment" = "Komentar:";
 "Description" = "Opis";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Esta es la respuesta a una invitación a un evento que usted ha or
 "OK" = "OK";
 "Comment" = "Comentario:";
 "Description" = "Description";
-"Location" = "Location";
@@ -46,5 +46,4 @@ reply_info = "Esta es la respuesta a una invitación de evento hecha por Ud.";
 "Cancel" = "Cancelar";
 "OK" = "OK";
 "Comment" = "Comentario:";
-"Description" = "Descripción";
-"Location" = "Location";
+"Description" = "Description";
@@ -47,4 +47,3 @@ reply_info = "Du har fått ett svar till en händelse inbjuden av dig.";
 "OK" = "OK";
 "Comment" = "Kommentar:";
 "Description" = "Description";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Yapmış olduğunuz etkinlik davetinin yanıtıdır.";
 "OK" = "Tamam";
 "Comment" = "Yorum";
 "Description" = "Açıklama";
-"Location" = "Location";
@@ -278,9 +278,6 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
  unichar *sanitizedChars, *start, *currentChar;
  BOOL inComment;

-  if (rawContent)
-    return;
-
  /**
   * Sanitize style
   *   - remove control characters
@@ -344,11 +341,10 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
            }
        }
    }
-  if (!inComment && currentChar > start) {
-    if (*currentChar == '}' && *currentChar++ == '\000') currentChar++; // Add offset
+  if (!inComment && currentChar > start)
    [sanitizedStyle appendString: [NSString stringWithCharacters: start
                                               length: (currentChar - start)]];
-  }
+
  /**
   * Parse sanitized style
   *   - remove at-rule definitions
@@ -388,7 +384,8 @@ static NSString *_sanitizeHtmlForDisplay(NSString *content)
                    (*(currentChar-7) == 'p' || *(currentChar-7) == 'P') &&
                    (*(currentChar-8) == 'm' || *(currentChar-8) == 'M') &&
                    (*(currentChar-9) == 'i' || *(currentChar-9) == 'I') &&
-                    *(currentChar-10) == '!'))
+                    *(currentChar-10) == '!')
+                    && !rawContent)
                {
                  length = (currentChar - start);
                  [declaration appendFormat: @"%@ !important;",
@@ -47,4 +47,3 @@ reply_info = "Це відповідь на Ваше запрошення взя
 "OK" = "OK";
 "Comment" = "Коментар:";
 "Description" = "Опис";
-"Location" = "Location";
@@ -47,4 +47,3 @@ reply_info = "Dyma ymateb i wahoddiad i ddigwyddiad a wnaed gennych chi.";
 "OK" = "Iawn";
 "Comment" = "Sylw";
 "Description" = "Description";
-"Location" = "Location";
@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "يتم إرسال هذا البريد من شبكة غير آمن!";
 "Address Book" = "دفتر العناوين";
 "Search For" = "البحث عن";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "الكل";
@@ -256,7 +239,6 @@
 "Save As..." = "حفظ باسم ...";
 "Print Preview" = "معاينة قبل الطباعة";
 "View Message Source" = "عرض مصدر الرسالة";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convert To Event";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Mezu hau sare ez-seguru bat erabiliz hari zara bidaltzen!";
 "Address Book" = "Address Book";
 "Search For" = "Bilatu hau";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "denak";
@@ -256,7 +239,6 @@
 "Save As..." = "Gorde honela...";
 "Print Preview" = "Inprimatzeko aurrebista";
 "View Message Source" = "Ikusi mezuaren iturburua";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convert To Event";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "E-mail je poslat sa nesigurne lokacije!";
 "Address Book" = "Imenik";
 "Search For" = "Pretražiti";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "sve";
@@ -256,7 +239,6 @@
 "Save As..." = "Sačuvati Kao...";
 "Print Preview" = "Pregledati prije Printanja";
 "View Message Source" = "Pregledatiti Izvor Poruke";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Konvertovati u Event/Događaj";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Este email está sendo enviado por uma rede não segura!";
 "Address Book" = "Catálogo";
 "Search For" = "Pesquisar Por";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "todos";
@@ -256,7 +239,6 @@
 "Save As..." = "Salvar Como...";
 "Print Preview" = "Visualizar Impressão";
 "View Message Source" = "Ver Código-Fonte da Mensagem";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Converter para Evento";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Този имейл е изпратен от незащитен мрежа!";
 "Address Book" = "Списък контакти";
 "Search For" = "Търсене за";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "всички";
@@ -256,7 +239,6 @@
 "Save As..." = "Запис като ...";
 "Print Preview" = "Преглед печат";
 "View Message Source" = "Преглед на изходния код на съобщението";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Превърни в събитие";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Aquest missatge s'envia des d'una xarxa no segura.";
 "Address Book" = "Llibreta d'adreces";
 "Search For" = "Cercar";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "tot";
@@ -256,7 +239,6 @@
 "Save As..." = "Desar com a...";
 "Print Preview" = "Vista preliminar";
 "View Message Source" = "Veure format original del missatge";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Converteix a esdeveniment";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "这个邮件发自不安全的网络！";
 "Address Book" = "通讯录";
 "Search For" = "搜索";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "全部";
@@ -256,7 +239,6 @@
 "Save As..." = "另存...";
 "Print Preview" = "打印预览";
 "View Message Source" = "查看邮件原文";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "转换成事件";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "這封郵件是來自不安全的網段!";
 "Address Book" = "通訊錄";
 "Search For" = "搜尋";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "全部";
@@ -256,7 +239,6 @@
 "Save As..." = "儲存為...";
 "Print Preview" = "預覽列印";
 "View Message Source" = "檢視信件原始檔";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "轉換成事件";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Ova je poruka poslana iz nesigurne mreže!";
 "Address Book" = "Imenik";
 "Search For" = "Pretraži";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "sve";
@@ -256,7 +239,6 @@
 "Save As..." = "Spremi kao...";
 "Print Preview" = "Pregled prije ispisa";
 "View Message Source" = "Pogledaj izvor poruke";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Preinači u događaj";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -3,7 +3,7 @@
 /* Icon's label */
 "Create"      = "Vytvořit";
 "Empty Trash" = "Vyprázdnit koš";
-"Empty Junk Folder" = "Vyprázdnit nevyžádanou poštu";
+"Empty Junk Folder" = "Empty Junk Folder";
 "Delete"      = "Smazat";
 "Expunge"     = "Vyškrtnout";
 "Forward"     = "Přeposlat";
@@ -79,7 +79,7 @@
 "Folder compacted" = "Údržba složky byla provedena";

 /* Empty Junk Folder success message */
-"Junk folder emptied" = "Nevyžádaná pošta promazána";
+"Junk folder emptied" = "Junk folder emptied";

 /* Empty Trash success message */
 "Trash emptied" = "Koš vyprázdněn";
@@ -88,7 +88,7 @@
 "Access rights to" = "Přístupová práva k";
 "For user" = "Pro uživatele";
 "Any Authenticated User" = "Všichni ověření uživatelé";
-"View this folder" = "Zobrazit tuto složku";
+"View this folder" = "View this folder";
 "Read mails from this folder" = "Číst maily v této složce";
 "Mark mails read and unread" = "Označit maily jako přečtené a nepřečtené";
 "Modify the flags of the mails in this folder" = "Upravit mailové štítky v této složce";
@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Tento mail je odesílán z nezabezpečené sítě!";
 "Address Book" = "Adresář";
 "Search For" = "Hledat";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "všechny";
@@ -190,13 +173,13 @@
 "Untitled" = "Bez názvu";

 /* Filter option in messages list */
-"Show unread messages only" = "Zobrazit pouze nepřečtené";
+"Show unread messages only" = "Show unread messages only";

 /* Filter option in messages list */
-"Show flagged messages only" = "Zobrazit pouze oštítkované zprávy";
+"Show flagged messages only" = "Show flagged messages only";

 /* Aria label for icon of labels */
-"Filtered by label" = "Filtr dle štítku";
+"Filtered by label" = "Filtered by label";

 /* Tree */
 "SentFolderName"   = "Odeslaná pošta";
@@ -204,7 +187,7 @@
 "InboxFolderName"  = "Doručená pošta";
 "DraftsFolderName" = "Koncepty";
 "JunkFolderName" = "Nevyžádaná pošta";
-"TemplatesFolderName" = "Šablony";
+"TemplatesFolderName" = "Templates";
 "SieveFolderName"  = "Filtry";
 "Folders"          = "Složky"; /* title line */

@@ -256,7 +239,6 @@
 "Save As..." = "Uložit jako...";
 "Print Preview" = "Náhled tisku";
 "View Message Source" = "Zobrazit zdroj zprávy";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Převést na událost";
@@ -322,7 +304,7 @@
 "Message is signed" = "Zpráva je podepsána";

 /* Valid S/MIME signature but common name not found */
-"Message is signed but the certificate doesn't match the sender email address" = "Tato zpráva je podepsaná, ale certifikát se neshoduje s e-mailem odesílatele";
+"Message is signed but the certificate doesn't match the sender email address" = "Message is signed but the certificate doesn't match the sender email address";

 /* Unknown error while validating message signature */
 "Digital signature is not valid" = "Elektronický podpis není validní";
@@ -362,7 +344,7 @@
 "Quota" = "Kvóta:";
 "quotasFormat" = "%{0}% využito z %{1} MB";
 "messageQuotasFormat" = "%{0}% z %{1} zpráv";
-"Unable to move/delete folder." = "Nelze přesunout/smazat složku.";
+"Unable to move/delete folder." = "Složku není možné přesunout/smazat.";

 /* Alternative operation when folder cannot be deleted */
 "The mailbox could not be moved to the trash folder. Would you like to delete it immediately?"
@@ -409,10 +391,10 @@
 "Error while saving the draft" = "Při uložení konceptu došlo k chybě";

 /* Error when emptying trash */
-"Unable to empty the trash folder." = "Nelze vyprázdnit koš.";
+"Unable to empty the trash folder." = "Unable to empty the trash folder.";

 /* Error when emptying junk folder */
-"Unable to empty the junk folder." = "Nelze vyprázdnit nevyžádanou poštu.";
+"Unable to empty the junk folder." = "Unable to empty the junk folder.";

 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Při přenosu souboru \"%{0}\" došlo k chybě:";
@@ -428,9 +410,9 @@
 "cannot send message: (smtp) all recipients discarded" = "Zprávu nelze odeslat: adresy všech příjemců jsou neplatné.";
 "cannot send message (smtp) - recipients discarded" = "Zprávu nelze odeslat: následující adresy jsou neplatné";
 "cannot send message: (smtp) error when connecting" = "Zprávu nelze odeslat: při spojení se SMTP serverem došlo k chybě.";
-"cannot sign email without certificate" = "Tato zpráva nemůže být podepsaná, neboť k účtu není přiřazen žádný certifikát";
-"cannot sign message because the certificate can't be read" = "Tato zpráva nemůže být podepsaná, neboť přiřazený certifikát není možné načíst";
-"cannot sign message because the certificate doesn't include the specified sender address" = "Tato zpráva nemůže být podepsaná, neboť e-mail odesílatele není obsažen v certifikátu účtu";
+"cannot sign email without certificate" = "The message can't be signed because there's no certificate associated to the mail account.";
+"cannot sign message because the certificate can't be read" = "The message can't be signed becasue the certificate associated to the mail account can't be read.";
+"cannot sign message because the certificate doesn't include the specified sender address" = "The message can't be signed because the sender address is not included in the certificate associated to the mail account.";

 /* Contacts list in mail editor */
 "Email" = "E-mail";
@@ -451,7 +433,7 @@
 "Set as Trash" = "Nastavit jako Koš";

 /* Set the folder as the one holding the Templates */
-"Set as Templates" = "Nastavit jako Šablony";
+"Set as Templates" = "Set as Templates";

 /* Set the folder as the one holding Junk mails */
 "Set as Junk" = "Nastavit jako Nevyžádaná pošta";
@@ -463,7 +445,7 @@
 "Copy messages" = "Kopírovat zprávy";
 "More messages options" = "Další možnosti zpráv";
 "Flag" = "Oštítkovat";
-"Unflag" = "Odstranit štítek";
+"Unflag" = "Unflag";
 "Mark as Unread" = "Označit jako nepřečtené";
 "Mark as Read" = "Označit jako přečtené";
 "Closing Window ..." = "Zavření okna ...";
@@ -477,10 +459,10 @@
 "Your email has been sent" = "Vaše zpráva byla odeslána";
 "Folder compacted" = "Údržba složky byla provedena";

-"More Options" = "Více nastavení";
+"More Options" = "More Options";

-"New draft" = "Nový koncept";
-"Create new draft with this template" = "Vytvořit nový koncept z této šablony";
+"New draft" = "New draft";
+"Create new draft with this template" = "Create new draft with this template";

 /* Advanced search */
 "Enter Subject" = "Zadejte předmět";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Denne besked bliver sendt fra et usikkert netværk!";
 "Address Book" = "Adressebog";
 "Search For" = "Søg efter";
-"Contains" = "Indeholder";
-"Does not contains" = "Indeholder ikke";
-"Advanced search" = "Avanceret søgning";
-"Anytime" = "Når som helst";
-"Last 7 days" = "Sidste 7 dage";
-"Last 30 days" = "Sidste 30 dage";
-"Last 6 month" = "Sidste 6 måneder";
-"Before" = "Før";
-"After" = "Efter";
-"Between" = "Mellem";
-"and" = "og";
-"With attachments" = "Med vedhæftede filer";
-"In favorites" = "I favoritter";
-"Unseen only" = "Kun uset";
-"Show more" = "Vis mere";
-"Reset" = "Nulstil";
-"Message size" = "Besked størrelse";

 /* Popup "show" */
 "all"     = "alle";
@@ -256,7 +239,6 @@
 "Save As..." = "Gem som ...";
 "Print Preview" = "Se udskrift";
 "View Message Source" = "Se beskedens kilde";
-"View raw message" = "Se rå besked";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Konvertér til begivenhed";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Deze e-mail wordt verzonden vanaf een onveilig netwerk!";
 "Address Book" = "Adresboek";
 "Search For" = "Zoek naar";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "alle";
@@ -256,7 +239,6 @@
 "Save As..." = "Opslaan als...";
 "Print Preview" = "Afdrukvoorbeeld";
 "View Message Source" = "Bron bekijken";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Omzetten naar afspraak";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Tätä viestiä lähetetään turvattomasta verkosta!";
 "Address Book" = "Osoitekirja";
 "Search For" = "Etsi";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "kaikki";
@@ -256,7 +239,6 @@
 "Save As..." = "Tallenna nimellä...";
 "Print Preview" = "Esikatselu";
 "View Message Source" = "Näytä viestin lähdekoodi";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Muunna tapahtumaksi";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Esta mensaxe é enviada dende unha rede non segura.";
 "Address Book" = "Caderno de enderezos";
 "Search For" = "Buscar";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "todo";
@@ -256,7 +239,6 @@
 "Save As..." = "Gardar como...";
 "Print Preview" = "Vista preliminar";
 "View Message Source" = "Ver formato orixinal da mensaxe";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Converter como evento";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Diese E-Mail wurde von einem unsicheren Netzwerk gesendet!";
 "Address Book" = "Adressbuch";
 "Search For" = "Suche nach";
-"Contains" = "Enthält";
-"Does not contains" = "Enthält nicht";
-"Advanced search" = "Erweiterte Suche";
-"Anytime" = "Jederzeit";
-"Last 7 days" = "Die letzten 7 Tage";
-"Last 30 days" = "Die letzten 30 Tage";
-"Last 6 month" = "Die letzten 6 Monate";
-"Before" = "Vor";
-"After" = "Nach";
-"Between" = "Zwischen";
-"and" = "und";
-"With attachments" = "Mit Anhängen";
-"In favorites" = "In Favoriten";
-"Unseen only" = "Nur Ungesehene";
-"Show more" = "Mehr Anzeigen";
-"Reset" = "Zurücksetzen";
-"Message size" = "Nachrichtengröße";

 /* Popup "show" */
 "all"     = "Alle";
@@ -256,7 +239,6 @@
 "Save As..." = "Speichern unter...";
 "Print Preview" = "Druckvorschau";
 "View Message Source" = "Nachrichten-Quelltext";
-"View raw message" = "Quelltext anzeigen";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "In Termin umwandeln";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "מייל זה נשלח מרשת לא מאובטחת!";
 "Address Book" = "אנשי קשר";
 "Search For" = "חפש את";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "כולם";
@@ -256,7 +239,6 @@
 "Save As..." = "שמור בשם...";
 "Print Preview" = "תצוגת הדפסה";
 "View Message Source" = "צפה במקור הודעה";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "המר לארוע";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "A levelet nem biztonságos hálózatból készül elküldeni!";
 "Address Book" = "Címjegyzék";
 "Search For" = "Keresés";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "összes";
@@ -256,7 +239,6 @@
 "Save As..." = "Mentés másként...";
 "Print Preview" = "Nyomtatási kép";
 "View Message Source" = "Üzenet forrása";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Eseménnyé alakít";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Þessi póstur er sendur frá óöruggu netkerfi!";
 "Address Book" = "Address Book";
 "Search For" = "Search For";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "öll";
@@ -256,7 +239,6 @@
 "Save As..." = "Vista sem...";
 "Print Preview" = "Prentskoðun";
 "View Message Source" = "Skoða kóðann í skilaboðunum";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convert To Event";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Pesan ini sedang dikirim dari sebuah jaringan yang tidak aman";
 "Address Book" = "Buku Alamat";
 "Search For" = "Pencarian untuk";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "Semua";
@@ -256,7 +239,6 @@
 "Save As..." = "Simpan Sebagai";
 "Print Preview" = "Tinjauan cetak";
 "View Message Source" = "Tinjau sumber pesan";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Mengkonversi ke acara";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Questa email è stata inviata da una rete non sicura !";
 "Address Book" = "Rubrica";
 "Search For" = "Cerca Per";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "tutti";
@@ -256,7 +239,6 @@
 "Save As..." = "Salva Come...";
 "Print Preview" = "Anteprima di stampa";
 "View Message Source" = "Visualizza Sorgente Messaggio";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Converti In Evento";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "s";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "このメールは保護されていないネットワークから送信されています。";
 "Address Book" = "アドレス帳";
 "Search For" = "検索";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "すべて";
@@ -256,7 +239,6 @@
 "Save As..." = "名前を付けて保存...";
 "Print Preview" = "印刷プレビュー";
 "View Message Source" = "メッセージのソースを表示";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "予定に変換";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Бұл пошта қауіпті желіден жіберілді!";
 "Address Book" = "Байланыс кітапшасы";
 "Search For" = "Не іздеу керек?";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "барлығы";
@@ -256,7 +239,6 @@
 "Save As..." = "...ретінде сақтау";
 "Print Preview" = "Алдын ала қарап, басып шығару";
 "View Message Source" = "Бастапқы мәтінді қарау";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Оқиғаға айналдыру";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Šis e-pasta ziņojums tiek sūtīts no nedroša tīkla!";
 "Address Book" = "Adrešu grāmata";
 "Search For" = "Meklēt";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "visi";
@@ -256,7 +239,6 @@
 "Save As..." = "Saglabāt kā...";
 "Print Preview" = "Drukas priekšskatījums";
 "View Message Source" = "Skatīt ziņojuma avotu";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Pārvērst par notikumu";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Šis laiškas yra išsiųstas iš nepatiko tinklo!";
 "Address Book" = "Adresų knyga";
 "Search For" = "Ieškoti";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "visi";
@@ -256,7 +239,6 @@
 "Save As..." = "Išsaugoti kaip...";
 "Print Preview" = "Spausdinimo peržiūra";
 "View Message Source" = "Peržiūrėti pranešimo šaltinį";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Konvertuoti į įvykį";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Оваа порака е испратена од небезбедна мрежа!";
 "Address Book" = "Адресар";
 "Search For" = "Барај го";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "сите";
@@ -256,7 +239,6 @@
 "Save As..." = "Сними како...";
 "Print Preview" = "Преглед пред печатење";
 "View Message Source" = "Види ја изворно пораката";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Конвертирај во настан";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "ј";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Ova poruka je poslata sa nesigurne mreže!";
 "Address Book" = "Adresar";
 "Search For" = "Pretraži";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "sve";
@@ -256,7 +239,6 @@
 "Save As..." = "Sačuvaj kao...";
 "Print Preview" = "Pregled prije štampanja";
 "View Message Source" = "Pogledaj izvorni kod poruke";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Pretvori u događaj";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Denne e-posten sendes fra en usikker nettverksforbindelse!";
 "Address Book" = "Adressebok";
 "Search For" = "Søk etter";
-"Contains" = "Inneholder";
-"Does not contains" = "Inneholder ikke";
-"Advanced search" = "Avansert søk";
-"Anytime" = "Når som helst";
-"Last 7 days" = "Siste 7 dager";
-"Last 30 days" = "Siste 30 dager";
-"Last 6 month" = "Siste 6 måneder";
-"Before" = "Før";
-"After" = "Etter";
-"Between" = "Mellom";
-"and" = "og";
-"With attachments" = "Med vedlegg";
-"In favorites" = "I favoritter";
-"Unseen only" = "Kun usett";
-"Show more" = "Vis mer";
-"Reset" = "Tilbakestill";
-"Message size" = "Meldingsstørrelse";

 /* Popup "show" */
 "all"     = "alle";
@@ -256,7 +239,6 @@
 "Save As..." = "Lagre som...";
 "Print Preview" = "Forhåndsvisning";
 "View Message Source" = "Vis meldingskilde";
-"View raw message" = "Vis opprinnelig melding";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Konverter til hendelse";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Denne e-posten sendes fra en usikker nettverksforbindelse!";
 "Address Book" = "Address Book";
 "Search For" = "Search For";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "alle";
@@ -256,7 +239,6 @@
 "Save As..." = "Lagre som...";
 "Print Preview" = "Forhåndsvisning";
 "View Message Source" = "Vis meldingskilde";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convert To Event";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Ta wiadomość jest wysyłana z niezabezpieczonej sieci!";
 "Address Book" = "Książka adresowa";
 "Search For" = "Szukaj";
-"Contains" = "Zawiera";
-"Does not contains" = "Nie zawiera";
-"Advanced search" = "Wyszukiwanie zaawansowane";
-"Anytime" = "Kiedykolwiek";
-"Last 7 days" = "Ostatnie 7 dni";
-"Last 30 days" = "Ostatnie 30 dni";
-"Last 6 month" = "Ostatnie 6 miesięcy";
-"Before" = "Przed";
-"After" = "Po";
-"Between" = "Pomiędzy";
-"and" = "a";
-"With attachments" = "Z załącznikami";
-"In favorites" = "W ulubionych";
-"Unseen only" = "Tylko nieczytane";
-"Show more" = "Pokaż więcej";
-"Reset" = "Wyczyść";
-"Message size" = "Rozmiar wiadomości";

 /* Popup "show" */
 "all"     = "wszystkie";
@@ -256,7 +239,6 @@
 "Save As..." = "Zapisz jako";
 "Print Preview" = "Podgląd wydruku";
 "View Message Source" = "Pokaż źródło wiadomości";
-"View raw message" = "Pokaż źródło wiadomości";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Zamień na zdarzenie";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Este email está a ser enviado por uma rede não segura!";
 "Address Book" = "Livro de Endereços";
 "Search For" = "Procurar Por";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "todos";
@@ -256,7 +239,6 @@
 "Save As..." = "Guardar Como...";
 "Print Preview" = "Pré-visualizar Impressão";
 "View Message Source" = "Ver Código-Fonte da Mensagem";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Converter para Evento";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Acest mesaj este trimis dintr-o rețea nesigură!";
 "Address Book" = "Contacte";
 "Search For" = "Caută";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "tot";
@@ -256,7 +239,6 @@
 "Save As..." = "Salvare ca...";
 "Print Preview" = "Previzualizare Pentru Imprimare";
 "View Message Source" = "Vizualizarea Sursei Mesajului";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Transformați în Eveniment";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Это письмо было отправлено из небезопасной сети!";
 "Address Book" = "Адресная книга";
 "Search For" = "Что искать";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "все";
@@ -256,7 +239,6 @@
 "Save As..." = "Сохранить как...";
 "Print Preview" = "Печатать с предпросмотром";
 "View Message Source" = "Просмотр исходного текста";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Преобразовать в Событие";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Ова порука је послата са несигурне мреже!";
 "Address Book" = "Адресар";
 "Search For" = "Претражи";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "све";
@@ -256,7 +239,6 @@
 "Save As..." = "Сачувај као...";
 "Print Preview" = "Преглед пре штампања";
 "View Message Source" = "Погледај извнорни код поруке";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Претвори у догађај";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Ova poruka je poslata sa nesigurne mreže!";
 "Address Book" = "Adresar";
 "Search For" = "Pretraži";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "sve";
@@ -256,7 +239,6 @@
 "Save As..." = "Sačuvaj kao...";
 "Print Preview" = "Pregled pre štampanja";
 "View Message Source" = "Pogledaj izvnorni kod poruke";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Pretvori u događaj";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Táto správa bude odoslaná z nezabezpečenej siete!";
 "Address Book" = "Adresár";
 "Search For" = "Hľadať v";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "všetko";
@@ -256,7 +239,6 @@
 "Save As..." = "Uložiť ako...";
 "Print Preview" = "Náhľad pred tlačou";
 "View Message Source" = "Ukázať zdroj správy";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Zmeniť na udalosť";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "To sporočilo je bilo poslano iz ne varnega omrežja!";
 "Address Book" = "Imenik";
 "Search For" = "Išči za";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "vse";
@@ -256,7 +239,6 @@
 "Save As..." = "Shrani kot...";
 "Print Preview" = "Tiskaj predogled";
 "View Message Source" = "Poglej izvorno sporočilo";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Spremeni v dogodek";
@@ -274,7 +256,7 @@
 "Download all attachments" = "Prenesi vse priloge";

 /* Filename prefix when downloading all attachments as a zip archive */
-"attachments" = "priloge";
+"attachments" = "priloga";

 "Print..." = "Tiskaj...";
 "Delete Message" = "Briši sporočilo";
@@ -405,7 +387,7 @@
 "Please specify a subject." = "Prosimo, navedite zadevo.";
 "error_missingsubject" = "Sporočilo nima zadeve. Si prepričan, da ga želiš poslati?";
 "error_missingrecipients" = "Prosim določi vsaj enega prejemnika.";
-"Send Anyway" = "Vseeno pošlji";
+"Send Anyway" = "Pošlji vseeno";
 "Error while saving the draft" = "Napaka pri shranjevanju osnutka";

 /* Error when emptying trash */
@@ -463,7 +445,7 @@
 "Copy messages" = "Kopiraj sporočila";
 "More messages options" = "Več možnosti sporočil";
 "Flag" = "Zastavica";
-"Unflag" = "Odstrani zastavico";
+"Unflag" = "Unflag";
 "Mark as Unread" = "Označi kot neprebrano";
 "Mark as Read" = "Označi kot prebrano";
 "Closing Window ..." = "Zapiram okno...";
@@ -477,7 +459,7 @@
 "Your email has been sent" = "Vaša pošta je bila poslana";
 "Folder compacted" = "Mapa je stisnjena";

-"More Options" = "Več možnosti";
+"More Options" = "More Options";

 "New draft" = "Nov osnutek";
 "Create new draft with this template" = "Ustvarite nov osnutek s to predlogo";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Este mensaje esta siendo enviado desde una red no segura.";
 "Address Book" = "Libreta de direcciones";
 "Search For" = "Buscar";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "todo";
@@ -256,7 +239,6 @@
 "Save As..." = "Guardar como...";
 "Print Preview" = "Vista preliminar";
 "View Message Source" = "Ver formato original del mensaje";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convertir a evento";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -3,7 +3,7 @@
 /* Icon's label */
 "Create"      = "Crear";
 "Empty Trash" = "Vaciar papelera";
-"Empty Junk Folder" = "Vaciar la carpeta de spam";
+"Empty Junk Folder" = "Empty Junk Folder";
 "Delete"      = "Borrar";
 "Expunge"     = "Compactar";
 "Forward"     = "Reenviar";
@@ -79,7 +79,7 @@
 "Folder compacted" = "Carpeta compactada";

 /* Empty Junk Folder success message */
-"Junk folder emptied" = "Vaciado de la carpeta de spam";
+"Junk folder emptied" = "Junk folder emptied";

 /* Empty Trash success message */
 "Trash emptied" = "Basura vaciada";
@@ -88,7 +88,7 @@
 "Access rights to" = "Derechos de acceso a";
 "For user" = "Para usuario";
 "Any Authenticated User" = "Cualquier usuario autentificado";
-"View this folder" = "Ver esta carpeta";
+"View this folder" = "View this folder";
 "Read mails from this folder" = "Leer corrreo de esta carpeta";
 "Mark mails read and unread" = "Marcar correos como leídos y no leídos";
 "Modify the flags of the mails in this folder" = "Modificar los indicadores de los correos en esta carpeta";
@@ -127,7 +127,7 @@
 "Edit Draft..." = "Modificar borrador...";
 "Load Images" = "Cargar Imágenes";
 "Return Receipt" = "Acuse de Recibo";
-"Choose which identity to send this message from" = "Elija la identidad con la que desea enviar el mensaje";
+"Choose which identity to send this message from" = "Choose which identity to send this message from";
 "The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "El remitente de este mensaje ha pedido ser avisado cuando el mensaje ha sido leído. ¿Quiere notificar al remitente?";
 "Return Receipt (displayed) - %@"= "Acuse de Recibo (mostrado) - %@";
 "This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "Este es un Acuse de Recibo del correo enviado a %@.\n\nNota: Este acuse de recibo sólo acredita que el mensaje se mostró en el ordenador del destinatario. No hay garantía de que el destinatario haya leído o comprendido el contenido del mensaje.";
@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Este mendaje es enviado desde una red no segura.";
 "Address Book" = "Libreta de direcciones";
 "Search For" = "Buscar";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "todo";
@@ -190,13 +173,13 @@
 "Untitled" = "Sin título";

 /* Filter option in messages list */
-"Show unread messages only" = "Mostrar sólo los mensajes no leídos";
+"Show unread messages only" = "Show unread messages only";

 /* Filter option in messages list */
-"Show flagged messages only" = "Mostrar sólo mensajes marcados";
+"Show flagged messages only" = "Show flagged messages only";

 /* Aria label for icon of labels */
-"Filtered by label" = "Filtrados por etiqueta";
+"Filtered by label" = "Filtered by label";

 /* Tree */
 "SentFolderName"   = "Enviados";
@@ -204,7 +187,7 @@
 "InboxFolderName"  = "Bandeja de entrada";
 "DraftsFolderName" = "Borradores";
 "JunkFolderName" = "Spam";
-"TemplatesFolderName" = "Plantillas";
+"TemplatesFolderName" = "Templates";
 "SieveFolderName"  = "Filtros";
 "Folders"          = "Carpetas"; /* title line */

@@ -213,7 +196,7 @@

 /* Address Popup menu */
 "Add to Address Book..." = "Añadir a una libreta de direcciones...";
-"Successfully created card" = "Tarjeta creada con éxito";
+"Successfully created card" = "Successfully created card";
 "Compose Mail To" = "Crear mensaje para";
 "Create Filter From Message..." = "Create filtro a partir del mensaje...";

@@ -256,7 +239,6 @@
 "Save As..." = "Guardar como...";
 "Print Preview" = "Vista preliminar";
 "View Message Source" = "Ver formato original del mensaje";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Convertir como evento";
@@ -265,10 +247,10 @@
 "Convert To Task" = "Convertir como tarea";

 /* Message view "more" menu: download message as an eml file */
-"Download message" = "Descargar mensaje";
+"Download message" = "Download message";

 /* Message view "more" menu: download message as a zip archive */
-"Download message (zip)" = "Descargar mensaje (zip)";
+"Download message (zip)" = "Download message (zip)";

 /* Message view "more" menu: download all attachments as a zip archive */
 "Download all attachments" = "Descargar todos los archivos adjuntos";
@@ -292,10 +274,10 @@
 "selected" = "seleccionado";

 /* Date formatting from one time to another time */
-"to_time" = "para";
+"to_time" = "to";

 /* Date formatting from one day to another day */
-"to_date" = "para";
+"to_date" = "to";

 /* Encrypted message notification */
 "This message is encrypted" = "Este mensaje está encriptado";
@@ -316,16 +298,16 @@
 "No certificate associated to account." = "El certificado no está asociado a ninguna cuenta.";

 /* Invalid S/MIME signature */
-"Digital signature is not valid" = "Firma digital no válida";
+"Digital signature is not valid" = "Digital signature is not valid";

 /* Valid S/MIME signature */
-"Message is signed" = "Mensaje firmado";
+"Message is signed" = "Message is signed";

 /* Valid S/MIME signature but common name not found */
-"Message is signed but the certificate doesn't match the sender email address" = "El mensaje está firmado pero el certificado no coincide con la dirección de correo electrónico del remitente";
+"Message is signed but the certificate doesn't match the sender email address" = "Message is signed but the certificate doesn't match the sender email address";

 /* Unknown error while validating message signature */
-"Digital signature is not valid" = "Firma digital no válida";
+"Digital signature is not valid" = "Digital signature is not valid";

 "This Folder" = "Esta carpeta";

@@ -361,7 +343,7 @@
 "Operation failed" = "Operación fallida";
 "Quota" = "Cuota";
 "quotasFormat" = "%{0}% de %{1} MB usados";
-"messageQuotasFormat" = "%{0}% de %{1} msgs";
+"messageQuotasFormat" = "%{0}% of %{1} msgs";
 "Unable to move/delete folder." = "No se puede mover/borrar la carpeta";

 /* Alternative operation when folder cannot be deleted */
@@ -409,10 +391,10 @@
 "Error while saving the draft" = "Error al guardar el borrador";

 /* Error when emptying trash */
-"Unable to empty the trash folder." = "No se puede vaciar la papelera.";
+"Unable to empty the trash folder." = "Unable to empty the trash folder.";

 /* Error when emptying junk folder */
-"Unable to empty the junk folder." = "No se puede vaciar la carpeta de spam.";
+"Unable to empty the junk folder." = "Unable to empty the junk folder.";

 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Error al cargar el fichero \"%{0}\":";
@@ -428,9 +410,9 @@
 "cannot send message: (smtp) all recipients discarded" = "No se puede enviar el mensaje: (smtp) todos los destinatarios han sido descartados";
 "cannot send message (smtp) - recipients discarded" = "No se puede enviar el mensaje: (smtp) destinatarios descartados";
 "cannot send message: (smtp) error when connecting" = "No se puede enviar el mensaje: (smtp) error de conexión";
-"cannot sign email without certificate" = "El mensaje no se puede firmar porque no hay ningún certificado asociado a la cuenta de correo.";
-"cannot sign message because the certificate can't be read" = "El mensaje no puede ser firmado porque el certificado asociado a la cuenta de correo no se puede leer.";
-"cannot sign message because the certificate doesn't include the specified sender address" = "El mensaje no se puede firmar porque la dirección del remitente no está incluida en el certificado asociado a la cuenta de correo.";
+"cannot sign email without certificate" = "The message can't be signed because there's no certificate associated to the mail account.";
+"cannot sign message because the certificate can't be read" = "The message can't be signed becasue the certificate associated to the mail account can't be read.";
+"cannot sign message because the certificate doesn't include the specified sender address" = "The message can't be signed because the sender address is not included in the certificate associated to the mail account.";

 /* Contacts list in mail editor */
 "Email" = "Correo";
@@ -451,7 +433,7 @@
 "Set as Trash" = "Marcar como borrado";

 /* Set the folder as the one holding the Templates */
-"Set as Templates" = "Establecer como Plantillas";
+"Set as Templates" = "Set as Templates";

 /* Set the folder as the one holding Junk mails */
 "Set as Junk" = "Marcar como Spam";
@@ -463,7 +445,7 @@
 "Copy messages" = "Copiar mensajes";
 "More messages options" = "Mas opciones de mensajes";
 "Flag" = "Añadir estrella";
-"Unflag" = "Desmarcar";
+"Unflag" = "Unflag";
 "Mark as Unread" = "Marcar como no leído";
 "Mark as Read" = "Marca como leído";
 "Closing Window ..." = "Cerrando ventana...";
@@ -477,19 +459,19 @@
 "Your email has been sent" = "El email ha sido enviado";
 "Folder compacted" = "Carpeta compactada";

-"More Options" = "Más opciones";
+"More Options" = "More Options";

-"New draft" = "Nuevo borrador";
-"Create new draft with this template" = "Crear un nuevo borrador con esta plantilla";
+"New draft" = "New draft";
+"Create new draft with this template" = "Create new draft with this template";

 /* Advanced search */
-"Enter Subject" = "Introducir asunto";
-"Enter From" = "Introducir De";
-"Enter To" = "Introducir Para";
-"Enter Cc" = "Introducir Cc";
-"Enter Body" = "Introducir texto";
-"match" = "coincide";
-"does not match" = "no coincide";
+"Enter Subject" = "Enter Subject";
+"Enter From" = "Enter From";
+"Enter To" = "Enter To";
+"Enter Cc" = "Enter Cc";
+"Enter Body" = "Enter Body";
+"match" = "match";
+"does not match" = "does not match";

 /* Aria label for scope of search on messages */
 "Search scope" = "Ámbito de búsqueda";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";

@@ -143,23 +143,6 @@
 "This mail is being sent from an unsecure network!" = "Meddelandet skickas över en osäker nätverksförbindelse!";
 "Address Book" = "Adressbok";
 "Search For" = "Sök efter";
-"Contains" = "Contains";
-"Does not contains" = "Does not contains";
-"Advanced search" = "Advanced search";
-"Anytime" = "Anytime";
-"Last 7 days" = "Last 7 days";
-"Last 30 days" = "Last 30 days";
-"Last 6 month" = "Last 6 month";
-"Before" = "Before";
-"After" = "After";
-"Between" = "Between";
-"and" = "and";
-"With attachments" = "With attachments";
-"In favorites" = "In favorites";
-"Unseen only" = "Unseen only";
-"Show more" = "Show more";
-"Reset" = "Reset";
-"Message size" = "Message size";

 /* Popup "show" */
 "all"     = "alla";
@@ -256,7 +239,6 @@
 "Save As..." = "Spara som...";
 "Print Preview" = "Förhandsgranska";
 "View Message Source" = "Visa meddelandets källkod";
-"View raw message" = "View raw message";

 /* Message view "more" menu: create an event from message */
 "Convert To Event" = "Konvertera till händelse";
@@ -503,6 +485,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";

+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";