2 commits - plugins/calendar plugins/kolab_activesync plugins/kolab_addressbook plugins/kolab_auth plugins/kolab_delegation plugins/kolab_folders plugins/owncloud plugins/tasklist .tx/config

Thomas Brüderli bruederli at kolabsys.com
Wed Mar 13 10:45:47 CET 2013


 .tx/config                                           |    2 
 plugins/calendar/localization/en.inc                 |  230 -------------------
 plugins/kolab_activesync/localization/en.inc         |   33 --
 plugins/kolab_addressbook/localization/en.inc        |   47 ---
 plugins/kolab_auth/localization/en.inc               |    5 
 plugins/kolab_delegation/localization/en.inc         |   30 --
 plugins/kolab_folders/localization/en.inc            |   26 --
 plugins/owncloud/localization/en.inc                 |    6 
 plugins/tasklist/localization/de_CH.inc              |    2 
 plugins/tasklist/localization/de_DE.inc              |   97 ++++----
 plugins/tasklist/localization/en.inc                 |   68 -----
 plugins/tasklist/localization/en_US.inc              |    2 
 plugins/tasklist/skins/larry/templates/mainview.html |   10 
 plugins/tasklist/skins/larry/templates/taskedit.html |   12 
 14 files changed, 63 insertions(+), 507 deletions(-)

New commits:
commit 080a60c7cc36b47a246e254794e5e3951e2d1d87
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 13 10:45:29 2013 +0100

    Cleanup Transifex localization files. en => en_US

diff --git a/.tx/config b/.tx/config
index 54caf13..e3eee2e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = de: de_DE, es: es_ES, fr: fr_FR, ja: ja_JP, nl: nl_NL
+lang_map = en: en_US, de: de_DE, es: es_ES, fr: fr_FR, ja: ja_JP, nl: nl_NL
 type = PHP_ALT_ARRAY
 
 [kolab.calendar]
diff --git a/plugins/calendar/localization/en.inc b/plugins/calendar/localization/en.inc
deleted file mode 100644
index 6cc76d7..0000000
--- a/plugins/calendar/localization/en.inc
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-$labels = array();
-
-// preferences
-$labels['default_view'] = 'Default view';
-$labels['time_format'] = 'Time format';
-$labels['timeslots'] = 'Timeslots per hour';
-$labels['first_day'] = 'First weekday';
-$labels['first_hour'] = 'First hour to show';
-$labels['workinghours'] = 'Working hours';
-$labels['add_category'] = 'Add category';
-$labels['remove_category'] = 'Remove category';
-$labels['defaultcalendar'] = 'Create new events in';
-$labels['eventcoloring'] = 'Event coloring';
-$labels['coloringmode0'] = 'According to calendar';
-$labels['coloringmode1'] = 'According to category';
-$labels['coloringmode2'] = 'Calendar for outline, category for content';
-$labels['coloringmode3'] = 'Category for outline, calendar for content';
-
-// calendar
-$labels['calendar'] = 'Calendar';
-$labels['calendars'] = 'Calendars';
-$labels['category'] = 'Category';
-$labels['categories'] = 'Categories';
-$labels['createcalendar'] = 'Create new calendar';
-$labels['editcalendar'] = 'Edit calendar properties';
-$labels['name'] = 'Name';
-$labels['color'] = 'Color';
-$labels['day'] = 'Day';
-$labels['week'] = 'Week';
-$labels['month'] = 'Month';
-$labels['agenda'] = 'Agenda';
-$labels['new'] = 'New';
-$labels['new_event'] = 'New event';
-$labels['edit_event'] = 'Edit event';
-$labels['edit'] = 'Edit';
-$labels['save'] = 'Save';
-$labels['remove'] = 'Remove';
-$labels['cancel'] = 'Cancel';
-$labels['select'] = 'Select';
-$labels['print'] = 'Print';
-$labels['printtitle'] = 'Print calendars';
-$labels['title'] = 'Summary';
-$labels['description'] = 'Description';
-$labels['all-day'] = 'all-day';
-$labels['export'] = 'Export';
-$labels['exporttitle'] = 'Export to iCalendar';
-$labels['location'] = 'Location';
-$labels['date'] = 'Date';
-$labels['start'] = 'Start';
-$labels['end'] = 'End';
-$labels['selectdate'] = 'Choose date';
-$labels['freebusy'] = 'Show me as';
-$labels['free'] = 'Free';
-$labels['busy'] = 'Busy';
-$labels['outofoffice'] = 'Out of Office';
-$labels['tentative'] = 'Tentative';
-$labels['priority'] = 'Priority';
-$labels['sensitivity'] = 'Privacy';
-$labels['public'] = 'public';
-$labels['private'] = 'private';
-$labels['confidential'] = 'confidential';
-$labels['alarms'] = 'Reminder';
-$labels['generated'] = 'generated at';
-$labels['printdescriptions'] = 'Print descriptions';
-$labels['parentcalendar'] = 'Insert inside';
-$labels['searchearlierdates'] = '« Search for earlier events';
-$labels['searchlaterdates'] = 'Search for later events »';
-$labels['andnmore'] = '$nr more...';
-$labels['togglerole'] = 'Click to toggle role';
-$labels['createfrommail'] = 'Save as event';
-$labels['importevents'] = 'Import events';
-$labels['importrange'] = 'Events from';
-$labels['onemonthback'] = '1 month back';
-$labels['nmonthsback'] = '$nr months back';
-$labels['showurl'] = 'Show calendar URL';
-$labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
-
-// agenda view
-$labels['listrange'] = 'Range to display:';
-$labels['listsections'] = 'Divide into:';
-$labels['smartsections'] = 'Smart sections';
-$labels['until'] = 'until';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['thisweek'] = 'This week';
-$labels['nextweek'] = 'Next week';
-$labels['thismonth'] = 'This month';
-$labels['nextmonth'] = 'Next month';
-$labels['weekofyear'] = 'Week';
-$labels['pastevents'] = 'Past';
-$labels['futureevents'] = 'Future';
-
-// alarm/reminder settings
-$labels['showalarms'] = 'Show alarms';
-$labels['defaultalarmtype'] = 'Default reminder setting';
-$labels['defaultalarmoffset'] = 'Default reminder time';
-
-// attendees
-$labels['attendee'] = 'Participant';
-$labels['role'] = 'Role';
-$labels['availability'] = 'Avail.';
-$labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Add participant';
-$labels['roleorganizer'] = 'Organizer';
-$labels['rolerequired'] = 'Required';
-$labels['roleoptional'] = 'Optional';
-$labels['roleresource'] = 'Resource';
-$labels['availfree'] = 'Free';
-$labels['availbusy'] = 'Busy';
-$labels['availunknown'] = 'Unknown';
-$labels['availtentative'] = 'Tentative';
-$labels['availoutofoffice'] = 'Out of Office';
-$labels['scheduletime'] = 'Find availability';
-$labels['sendinvitations'] = 'Send invitations';
-$labels['sendnotifications'] = 'Notify participants about modifications';
-$labels['sendcancellation'] = 'Notify participants about event cancellation';
-$labels['onlyworkinghours'] = 'Find availability within my working hours';
-$labels['reqallattendees'] = 'Required/all participants';
-$labels['prevslot'] = 'Previous Slot';
-$labels['nextslot'] = 'Next Slot';
-$labels['noslotfound'] = 'Unable to find a free time slot';
-$labels['invitationsubject'] = 'You\'ve been invited to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
-$labels['invitationattendlinks'] = "In case your email client doesn't support iTip requests you can use the following link to either accept or decline this invitation:\n\$url";
-$labels['eventupdatesubject'] = '"$title" has been updated';
-$labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with the updated event details which you can import to your calendar application.";
-$labels['eventcancelsubject'] = '"$title" has been canceled';
-$labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details.";
-
-// invitation handling
-$labels['itipinvitation'] = 'Invitation to';
-$labels['itipupdate'] = 'Update of';
-$labels['itipcancellation'] = 'Cancelled:';
-$labels['itipreply'] = 'Reply to';
-$labels['itipaccepted'] = 'Accept';
-$labels['itiptentative'] = 'Maybe';
-$labels['itipdeclined'] = 'Decline';
-$labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
-$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
-$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
-$labels['itipmailbodyaccepted'] = "\$sender has accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender has declined the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
-$labels['itipdeclineevent'] = 'Do you want to decline your invitation to this event?';
-$labels['importtocalendar'] = 'Save to my calendar';
-$labels['removefromcalendar'] = 'Remove from my calendar';
-$labels['updateattendeestatus'] = 'Update the participant\'s status';
-$labels['acceptinvitation'] = 'Do you accept this invitation?';
-$labels['youhaveaccepted'] = 'You have accepted this invitation';
-$labels['youhavetentative'] = 'You have tentatively accepted this invitation';
-$labels['youhavedeclined'] = 'You have declined this invitation';
-$labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
-$labels['eventcancelled'] = 'The event has been cancelled';
-$labels['saveincalendar'] = 'save in';
-
-// event dialog tabs
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattendees'] = 'Participants';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-// messages
-$labels['deleteventconfirm'] = 'Do you really want to delete this event?';
-$labels['deletecalendarconfirm'] = 'Do you really want to delete this calendar with all its events?';
-$labels['savingdata'] = 'Saving data...';
-$labels['errorsaving'] = 'Failed to save changes.';
-$labels['operationfailed'] = 'The requested operation failed.';
-$labels['invalideventdates'] = 'Invalid dates entered! Please check your input.';
-$labels['invalidcalendarproperties'] = 'Invalid calendar properties! Please set a valid name.';
-$labels['searchnoresults'] = 'No events found in the selected calendars.';
-$labels['successremoval'] = 'The event has been deleted successfully.';
-$labels['successrestore'] = 'The event has been restored successfully.';
-$labels['errornotifying'] = 'Failed to send notifications to event participants';
-$labels['errorimportingevent'] = 'Failed to import the event';
-$labels['newerversionexists'] = 'A newer version of this event already exists! Aborted.';
-$labels['nowritecalendarfound'] = 'No calendar found to save the event';
-$labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
-$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
-$labels['itipsendsuccess'] = 'Invitation sent to participants.';
-$labels['itipresponseerror'] = 'Failed to send the response to this event invitation';
-$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
-$labels['sentresponseto'] = 'Successfully sent invitation response to $mailto';
-$labels['localchangeswarning'] = 'You are about to make changes that will only be reflected on your personal calendar';
-$labels['importsuccess'] = 'Successfully imported $nr events';
-$labels['importnone'] = 'No events found to be imported';
-$labels['importerror'] = 'An error occured while importing';
-$labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
-
-// recurrence form
-$labels['repeat'] = 'Repeat';
-$labels['frequency'] = 'Repeat';
-$labels['never'] = 'never';
-$labels['daily'] = 'daily';
-$labels['weekly'] = 'weekly';
-$labels['monthly'] = 'monthly';
-$labels['yearly'] = 'annually';
-$labels['every'] = 'Every';
-$labels['days'] = 'day(s)';
-$labels['weeks'] = 'week(s)';
-$labels['months'] = 'month(s)';
-$labels['years'] = 'year(s) in:';
-$labels['bydays'] = 'On';
-$labels['untildate'] = 'the';
-$labels['each'] = 'Each';
-$labels['onevery'] = 'On every';
-$labels['onsamedate'] = 'On the same date';
-$labels['forever'] = 'forever';
-$labels['recurrencend'] = 'until';
-$labels['forntimes'] = 'for $nr time(s)';
-$labels['first'] = 'first';
-$labels['second'] = 'second';
-$labels['third'] = 'third';
-$labels['fourth'] = 'fourth';
-$labels['last'] = 'last';
-$labels['dayofmonth'] = 'Day of month';
-
-$labels['changeeventconfirm'] = 'Change event';
-$labels['removeeventconfirm'] = 'Remove event';
-$labels['changerecurringeventwarning'] = 'This is a recurring event. Would you like to edit the current event only, this and all future occurences, all occurences or save it as a new event?';
-$labels['removerecurringeventwarning'] = 'This is a recurring event. Would you like to remove the current event only, this and all future occurences or all occurences of this event?';
-$labels['currentevent'] = 'Current';
-$labels['futurevents'] = 'Future';
-$labels['allevents'] = 'All';
-$labels['saveasnew'] = 'Save as new';
-
-?>
diff --git a/plugins/kolab_activesync/localization/en.inc b/plugins/kolab_activesync/localization/en.inc
deleted file mode 100644
index 2399b13..0000000
--- a/plugins/kolab_activesync/localization/en.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configration';
-$labels['folderstosync'] = 'Folders to synchronize';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['configuration'] = 'Configuration';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Z_push#Clients">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
-$labels['savingdata'] = 'Saving data...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-$labels['devicenotfound'] = 'Unable to read device configuration';
-
-?>
diff --git a/plugins/kolab_addressbook/localization/en.inc b/plugins/kolab_addressbook/localization/en.inc
deleted file mode 100644
index a66426f..0000000
--- a/plugins/kolab_addressbook/localization/en.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-$labels = array();
-$labels['initials'] = 'Initials';
-$labels['profession'] = 'Profession';
-$labels['officelocation'] = 'Office location';
-$labels['children'] = 'Children';
-$labels['pgppublickey'] = 'PGP public key';
-$labels['pkcs7publickey'] = 'S/MIME public key';
-$labels['freebusyurl'] = 'Free-busy URL';
-$labels['typebusiness'] = 'Business';
-$labels['typebusinessfax'] = 'Business Fax';
-$labels['typecompany'] = 'Company';
-$labels['typeprimary'] = 'Primary';
-$labels['typetelex'] = 'Telex';
-$labels['typeradio'] = 'Radio';
-$labels['typeisdn'] = 'ISDN';
-$labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
-$labels['settings'] = 'Settings';
-
-$labels['bookcreate'] = 'Create address book';
-$labels['bookedit'] = 'Edit address book';
-$labels['bookdelete'] = 'Delete address book';
-$labels['bookproperties'] = 'Address book properties';
-$labels['bookname'] = 'Book name';
-$labels['parentbook'] = 'Superior book';
-
-$labels['addressbookprio'] = 'Address book(s) selection/behaviour';
-$labels['personalfirst'] = 'Personal address book(s) first';
-$labels['globalfirst'] = 'Global address book(s) first';
-$labels['personalonly'] = 'Personal address book(s) only';
-$labels['globalonly'] = 'Global address book(s) only';
-
-$messages['bookdeleteconfirm']  = 'Do you really want to delete the selected address book and all contacts in it?';
-$messages['bookdeleting'] = 'Deleting address book...';
-$messages['booksaving'] = 'Saving address book...';
-$messages['bookdeleted'] = 'Address book deleted successfully.';
-$messages['bookupdated'] = 'Address book updated successfully.';
-$messages['bookcreated'] = 'Address book created successfully.';
-$messages['bookdeleteerror'] = 'An error occured while deleting address book.';
-$messages['bookupdateerror'] = 'An error occured while updating address book.';
-$messages['bookcreateerror'] = 'An error occured while creating address book.';
-$messages['nobooknamewarning'] = 'Please, enter address book name.';
-$messages['noemailnamewarning'] = 'Please, enter email address or contact name.';
-
-?>
diff --git a/plugins/kolab_auth/localization/en.inc b/plugins/kolab_auth/localization/en.inc
deleted file mode 100644
index e1adb3f..0000000
--- a/plugins/kolab_auth/localization/en.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$labels['loginas'] = 'Login As';
-
-?>
diff --git a/plugins/kolab_delegation/localization/en.inc b/plugins/kolab_delegation/localization/en.inc
deleted file mode 100644
index c445f7f..0000000
--- a/plugins/kolab_delegation/localization/en.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-$labels = array();
-
-$labels['tabtitle'] = 'Delegation';
-$labels['delegates'] = 'Delegates';
-$labels['delegate'] = 'Delegate';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['yes'] = 'Yes';
-$labels['no'] = 'No';
-
-$labels['adddelegate'] = 'Add delegate';
-$labels['deletedelegate'] = 'Delete delegate';
-
-$labels['savingdata'] = 'Saving data...';
-$labels['delegatedeleteconfirm'] = 'Do you really want to delete this delegate?';
-$labels['delegateremoveacl'] = 'remove access rights on folders assigned to this user';
-$labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'The delegate was successfully removed.';
-$labels['deleteerror'] = 'Could not remove delegate.';
-$labels['updatesuccess'] = 'The delegate was successfully updated.';
-$labels['updateerror'] = 'Could not update delegate.';
-$labels['createsuccess'] = 'The delegate was successfully added.';
-$labels['createerror'] = 'Could not add delegate.';
-
-?>
diff --git a/plugins/kolab_folders/localization/en.inc b/plugins/kolab_folders/localization/en.inc
deleted file mode 100644
index 856f59d..0000000
--- a/plugins/kolab_folders/localization/en.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-$labels = array();
-
-$labels['folderctype'] = 'Content type';
-$labels['foldertypemail'] = 'Mail';
-$labels['foldertypeevent'] = 'Calendar'; // Events?
-$labels['foldertypejournal'] = 'Journal';
-$labels['foldertypetask'] = 'Tasks';
-$labels['foldertypenote'] = 'Notes';
-$labels['foldertypecontact'] = 'Contacts';
-$labels['foldertypeconfiguration'] = 'Configuration';
-$labels['foldertypefile'] = 'Files';
-$labels['foldertypefreebusy'] = 'Free-Busy';
-
-$labels['default'] = 'Default';
-$labels['inbox'] = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sentitems'] = 'Sent';
-$labels['outbox'] = 'Outbox';
-$labels['wastebasket'] = 'Trash';
-$labels['junkemail'] = 'Junk';
-
-$messages['defaultfolderexists'] = 'There is already default folder of specified type';
-
-?>
diff --git a/plugins/owncloud/localization/en.inc b/plugins/owncloud/localization/en.inc
deleted file mode 100644
index f5cb8fb..0000000
--- a/plugins/owncloud/localization/en.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$labels = array();
-$labels['owncloud'] = 'Files';
-
-?>
diff --git a/plugins/tasklist/localization/en.inc b/plugins/tasklist/localization/en.inc
deleted file mode 100644
index 7d5415a..0000000
--- a/plugins/tasklist/localization/en.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-$labels = array();
-$labels['navtitle'] = 'Tasks';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
-$labels['tags'] = 'Tags';
-
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
-$labels['delete'] = 'Delete';
-$labels['title'] = 'Title';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
-$labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
-
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
-
-$labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
-$labels['save'] = 'Save';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
-
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
-
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
-$labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
-
-// date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
-
-// mesages
-$labels['savingdata'] = 'Saving data...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';


commit 142b536b8d0414b118c056f44dbf506f98678579
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 13 10:43:48 2013 +0100

    Better name and placement of the due date field (#1692); copied de_CH localization to de_DE

diff --git a/plugins/tasklist/localization/de_CH.inc b/plugins/tasklist/localization/de_CH.inc
index 4fbb976..4a6b326 100644
--- a/plugins/tasklist/localization/de_CH.inc
+++ b/plugins/tasklist/localization/de_CH.inc
@@ -15,7 +15,7 @@ $labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
-$labels['datetime'] = 'Datum/Zeit';
+$labels['datetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['alarms'] = 'Erinnerung';
 
diff --git a/plugins/tasklist/localization/de_DE.inc b/plugins/tasklist/localization/de_DE.inc
index e8c0ada..1cbd2c0 100644
--- a/plugins/tasklist/localization/de_DE.inc
+++ b/plugins/tasklist/localization/de_DE.inc
@@ -2,67 +2,68 @@
 
 $labels = array();
 $labels['navtitle'] = 'Aufgaben';
-$labels['lists'] = 'Tasklists';
-$labels['list'] = 'Tasklist';
+$labels['lists'] = 'Aufgabenlisten';
+$labels['list'] = 'Liste';
 $labels['tags'] = 'Tags';
 
-$labels['newtask'] = 'New Task';
-$labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
-$labels['createfrommail'] = 'Save as task';
-$labels['mark'] = 'Mark';
-$labels['unmark'] = 'Unmark';
-$labels['edit'] = 'Edit';
+$labels['newtask'] = 'Neue Aufgabe';
+$labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
+$labels['createfrommail'] = 'Als Aufgabe speichern';
+$labels['mark'] = 'Markieren';
+$labels['unmark'] = 'Markierung aufheben';
+$labels['edit'] = 'Bearbeiten';
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
-$labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
-$labels['start'] = 'Start';
-$labels['alarms'] = 'Reminder';
+$labels['description'] = 'Beschreibung';
+$labels['datetime'] = 'Fällig';
+$labels['start'] = 'Beginn';
+$labels['alarms'] = 'Erinnerung';
 
-$labels['all'] = 'All';
-$labels['flagged'] = 'Flagged';
-$labels['complete'] = 'Complete';
-$labels['overdue'] = 'Overdue';
-$labels['today'] = 'Today';
-$labels['tomorrow'] = 'Tomorrow';
-$labels['next7days'] = 'Next 7 days';
-$labels['later'] = 'Later';
-$labels['nodate'] = 'no date';
-$labels['removetag'] = 'Remove';
+$labels['all'] = 'Alle';
+$labels['flagged'] = 'Markiert';
+$labels['complete'] = 'Erledigt';
+$labels['overdue'] = 'Überfällig';
+$labels['today'] = 'Heute';
+$labels['tomorrow'] = 'Morgen';
+$labels['next7days'] = 'Nächste 7 Tage';
+$labels['later'] = 'Später';
+$labels['nodate'] = 'kein Datum';
+$labels['removetag'] = 'Löschen';
 
 $labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'New Task';
-$labels['edittask'] = 'Edit Task';
+$labels['newtask'] = 'Neue Aufgabe';
+$labels['edittask'] = 'Aufgabe bearbeiten';
 $labels['save'] = 'Speichern';
-$labels['cancel'] = 'Cancel';
-$labels['addsubtask'] = 'Add subtask';
-$labels['deletetask'] = 'Delete task';
-$labels['deletethisonly'] = 'Delete this task only';
-$labels['deletewithchilds'] = 'Delete with all subtasks';
+$labels['cancel'] = 'Abbrechen';
+$labels['addsubtask'] = 'Neue Teilaufgabe';
+$labels['deletetask'] = 'Aufgabe löschen';
+$labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
+$labels['deletewithchilds'] = 'Mit allen Teilaufhaben löschen';
 
-$labels['tabsummary'] = 'Summary';
-$labels['tabrecurrence'] = 'Recurrence';
-$labels['tabattachments'] = 'Attachments';
-$labels['tabsharing'] = 'Sharing';
 
-$labels['editlist'] = 'Edit list';
-$labels['createlist'] = 'Add list';
-$labels['listactions'] = 'List options...';
+$labels['tabsummary'] = 'Ãœbersicht';
+$labels['tabrecurrence'] = 'Wiederholung';
+$labels['tabattachments'] = 'Anhänge';
+$labels['tabsharing'] = 'Freigabe';
+
+$labels['editlist'] = 'Liste bearbeiten';
+$labels['createlist'] = 'Neue Liste';
+$labels['listactions'] = 'Listenoptionen...';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show alarms';
-$labels['import'] = 'Import';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
+$labels['import'] = 'Importieren';
 
 // date words
-$labels['on'] = 'on';
-$labels['at'] = 'at';
-$labels['this'] = 'this';
-$labels['next'] = 'next';
+$labels['on'] = 'am';
+$labels['at'] = 'um';
+$labels['this'] = 'diesen';
+$labels['next'] = 'nächsten';
 
 // mesages
 $labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['errorsaving'] = 'Failed to save data.';
-$labels['notasksfound'] = 'No tasks found for the given criteria';
-$labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
-$labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
-$labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
-$labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
+$labels['errorsaving'] = 'Fehler beim Speichern.';
+$labels['notasksfound'] = 'Für die aktuellen Kriterien wurden keine Aufgaben gefunden.';
+$labels['invalidstartduedates'] = 'Beginn der Aufgabe darf nicht größer als das Enddatum sein.';
+$labels['deletetasktconfirm'] = 'Möchten Sie diese Aufgabe wirklich löschen?';
+$labels['deleteparenttasktconfirm'] = 'Möchten Sie diese Aufgabe inklusive aller Teilaufgaben wirklich löschen?';
+$labels['deletelistconfirm'] = 'Möchten Sie diese Liste mit allen Aufgaben wirklich löschen?';
diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index 7d5415a..8a31be3 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -15,7 +15,7 @@ $labels['edit'] = 'Edit';
 $labels['delete'] = 'Delete';
 $labels['title'] = 'Title';
 $labels['description'] = 'Description';
-$labels['datetime'] = 'Date/Time';
+$labels['datetime'] = 'Due';
 $labels['start'] = 'Start';
 $labels['alarms'] = 'Reminder';
 
diff --git a/plugins/tasklist/skins/larry/templates/mainview.html b/plugins/tasklist/skins/larry/templates/mainview.html
index 085034a..83d39bd 100644
--- a/plugins/tasklist/skins/larry/templates/mainview.html
+++ b/plugins/tasklist/skins/larry/templates/mainview.html
@@ -103,16 +103,16 @@
 		<label><roundcube:label name="tasklist.tags" /></label>
 		<span class="task-text"></span>
 	</div>
-	<div id="task-date" class="form-section">
-		<label><roundcube:label name="tasklist.datetime" /></label>
-		<span class="task-text"></span>
-		<span id="task-time"></span>
-	</div>
 	<div id="task-start" class="form-section">
 		<label><roundcube:label name="tasklist.start" /></label>
 		<span class="task-text"></span>
 		<span id="task-starttime"></span>
 	</div>
+	<div id="task-date" class="form-section">
+		<label><roundcube:label name="tasklist.datetime" /></label>
+		<span class="task-text"></span>
+		<span id="task-time"></span>
+	</div>
 	<div id="task-alarm" class="form-section">
 		<label><roundcube:label name="tasklist.alarms" /></label>
 		<span class="task-text"></span>
diff --git a/plugins/tasklist/skins/larry/templates/taskedit.html b/plugins/tasklist/skins/larry/templates/taskedit.html
index f67d20a..1c9aa4e 100644
--- a/plugins/tasklist/skins/larry/templates/taskedit.html
+++ b/plugins/tasklist/skins/larry/templates/taskedit.html
@@ -20,17 +20,17 @@
 				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="3" />
 			</div>
 			<div class="form-section">
-				<label for="taskedit-date"><roundcube:label name="tasklist.datetime" /></label>
-				<input type="text" name="date" size="10" id="taskedit-date" tabindex="20" />  
-				<input type="text" name="time" size="6" id="taskedit-time" tabindex="21" />
-				<a href="#nodate" style="margin-left:1em" class="edit-nodate" rel="#taskedit-date,#taskedit-time"><roundcube:label name="tasklist.nodate" /></a>
-			</div>
-			<div class="form-section">
 				<label for="taskedit-startdate"><roundcube:label name="tasklist.start" /></label>
 				<input type="text" name="startdate" size="10" id="taskedit-startdate" tabindex="23" />  
 				<input type="text" name="starttime" size="6" id="taskedit-starttime" tabindex="24" />
 				<a href="#nodate" style="margin-left:1em" class="edit-nodate" rel="#taskedit-startdate,#taskedit-starttime"><roundcube:label name="tasklist.nodate" /></a>
 			</div>
+			<div class="form-section">
+				<label for="taskedit-date"><roundcube:label name="tasklist.datetime" /></label>
+				<input type="text" name="date" size="10" id="taskedit-date" tabindex="20" />  
+				<input type="text" name="time" size="6" id="taskedit-time" tabindex="21" />
+				<a href="#nodate" style="margin-left:1em" class="edit-nodate" rel="#taskedit-date,#taskedit-time"><roundcube:label name="tasklist.nodate" /></a>
+			</div>
 			<div class="form-section" id="taskedit-alarms">
 				<label for="taskedit-alarm"><roundcube:label name="tasklist.alarms" /></label>
 				<roundcube:object name="plugin.alarm_select" />





More information about the commits mailing list