Merge branch 'master' of github.com:roundcube/roundcubemail

4 files changed, 160 insertions, 8 deletions

diff --git a/program/localization/en_US/csv2vcard.inc b/program/localization/en_US/csv2vcard.inc
new file mode 100644
index 000000000..caf192aea
--- /dev/null
+++ b/program/localization/en_US/csv2vcard.inc
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/en_US/csv2vcard.inc                                          |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+// This is a list of CSV column names specified in CSV file header
+// These must be original texts used in Outlook/Thunderbird exported csv files
+// Encoding UTF-8
+
+$map = array();
+
+// MS Outlook 2010
+$map['anniversary'] = "Anniversary";
+$map['assistants_name'] = "Assistant's Name";
+$map['assistants_phone'] = "Assistant's Phone";
+$map['birthday'] = "Birthday";
+$map['business_city'] = "Business City";
+$map['business_countryregion'] = "Business Country/Region";
+$map['business_fax'] = "Business Fax";
+$map['business_phone'] = "Business Phone";
+$map['business_phone_2'] = "Business Phone 2";
+$map['business_postal_code'] = "Business Postal Code";
+$map['business_state'] = "Business State";
+$map['business_street'] = "Business Street";
+$map['car_phone'] = "Car Phone";
+$map['categories'] = "Categories";
+$map['company'] = "Company";
+$map['department'] = "Department";
+$map['email_address'] = "E-mail Address";
+$map['first_name'] = "First Name";
+$map['gender'] = "Gender";
+$map['home_city'] = "Home City";
+$map['home_countryregion'] = "Home Country/Region";
+$map['home_fax'] = "Home Fax";
+$map['home_phone'] = "Home Phone";
+$map['home_phone_2'] = "Home Phone 2";
+$map['home_postal_code'] = "Home Postal Code";
+$map['home_state'] = "Home State";
+$map['home_street'] = "Home Street";
+$map['job_title'] = "Job Title";
+$map['last_name'] = "Last Name";
+$map['managers_name'] = "Manager's Name";
+$map['middle_name'] = "Middle Name";
+$map['mobile_phone'] = "Mobile Phone";
+$map['notes'] = "Notes";
+$map['other_city'] = "Other City";
+$map['other_countryregion'] = "Other Country/Region";
+$map['other_fax'] = "Other Fax";
+$map['other_phone'] = "Other Phone";
+$map['other_postal_code'] = "Other Postal Code";
+$map['other_state'] = "Other State";
+$map['other_street'] = "Other Street";
+$map['pager'] = "Pager";
+$map['primary_phone'] = "Primary Phone";
+$map['spouse'] = "Spouse";
+$map['suffix'] = "Suffix";
+$map['title'] = "Title";
+$map['web_page'] = "Web Page";
+
+// Thunderbird
+$map['birth_day'] = "Birth Day";
+$map['birth_month'] = "Birth Month";
+$map['birth_year'] = "Birth Year";
+$map['display_name'] = "Display Name";
+$map['fax_number'] = "Fax Number";
+$map['home_address'] = "Home Address";
+$map['home_country'] = "Home Country";
+$map['home_zipcode'] = "Home ZipCode";
+$map['mobile_number'] = "Mobile Number";
+$map['nickname'] = "Nickname";
+$map['organization'] = "Organization";
+$map['pager_number'] = "Pager Namber";
+$map['primary_email'] = "Primary Email";
+$map['secondary_email'] = "Secondary Email";
+$map['web_page_1'] = "Web Page 1";
+$map['web_page_2'] = "Web Page 2";
+$map['work_phone'] = "Work Phone";
+$map['work_address'] = "Work Address";
+$map['work_country'] = "Work Country";
+$map['work_zipcode'] = "Work ZipCode";
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 2b1397f02..4dbe9f9a1 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -354,7 +354,7 @@ $labels['importcontacts'] = 'Import contacts';
 $labels['importfromfile'] = 'Import from file:';
 $labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Replace the entire address book';
-$labels['importtext'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> data format.';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Done';
 
 // settings
@@ -414,7 +414,7 @@ $labels['always'] = 'always';
 $labels['showinlineimages'] = 'Display attached images below the message';
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minute(s)';
-$labels['keepalive']  = 'Check for new messages on';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
 $labels['never']  = 'never';
 $labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index cabc9998b..a00eff8a4 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -1,12 +1,11 @@
 <?php
 
 /*
-
  +-----------------------------------------------------------------------+
  | language/en_US/messages.inc                                           |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -15,9 +14,6 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
-
- @version $Id$
-
 */
 
 $messages = array();
@@ -37,6 +33,7 @@ $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
 $messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
 $messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Uploading files...';
@@ -124,7 +121,7 @@ $messages['contactaddedtogroup'] = 'Successfully added the contacts to this grou
 $messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
 $messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Importing, please wait...';
-$messages['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
 $messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Operation not permitted!';
diff --git a/program/localization/pl_PL/csv2vcard.inc b/program/localization/pl_PL/csv2vcard.inc
new file mode 100644
index 000000000..ceb995517
--- /dev/null
+++ b/program/localization/pl_PL/csv2vcard.inc
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | language/pl_PL/csv2vcard.inc                                          |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+// This is a list of CSV column names specified in CSV file header
+// These must be original texts used in Outlook/Thunderbird exported csv files
+// Encoding UTF-8
+
+$map = array();
+
+// MS Outlook 2010
+$map['anniversary'] = "Rocznica";
+$map['assistants_name'] = "Asystent";
+$map['assistants_phone'] = "Telefon asystenta";
+$map['birthday'] = "Urodziny";
+$map['business_city'] = "Miasto (biuro)";
+$map['business_countryregion'] = "Kraj/region (biuro)";
+$map['business_fax'] = "Faks służbowy";
+$map['business_phone'] = "Telefon służbowy";
+$map['business_phone_2'] = "Telefon służbowy 2";
+$map['business_postal_code'] = "Kod pocztowy (biuro)";
+$map['business_state'] = "Województwo (biuro)";
+$map['business_street'] = "Ulica (biuro)";
+$map['categories'] = "Kategorie";
+$map['company'] = "Firma";
+$map['department'] = "Oddział";
+$map['email_address'] = "Adres e-mail";
+$map['first_name'] = "Imię";
+$map['gender'] = "Płeć";
+$map['home_city'] = "Miasto (dom)";
+$map['home_countryregion'] = "Kraj/region (dom)";
+$map['home_fax'] = "Faks domowy";
+$map['home_phone'] = "Telefon domowy";
+$map['home_phone_2'] = "Home Phone 2";
+$map['home_postal_code'] = "Kod pocztowy (dom)";
+$map['home_state'] = "Województwo (dom)";
+$map['home_street'] = "Ulica (dom)";
+$map['job_title'] = "Stanowisko";
+$map['last_name'] = "Nazwisko";
+$map['managers_name'] = "Menadżer";
+$map['middle_name'] = "Drugie imię";
+$map['mobile_phone'] = "Telefon komórkowy";
+$map['notes'] = "Notatki";
+$map['pager'] = "Pager";
+$map['primary_phone'] = "Telefon główny";
+$map['title'] = "Tytuł";
+$map['web_page'] = "Osobista strona sieci Web";
+$map['nickname'] = "Przydomek";