diff --git a/.tx/config b/.tx/config index b0d1ec3f6..9a5f5d566 100644 --- a/.tx/config +++ b/.tx/config @@ -25,8 +25,10 @@ trans.pl = UI/MailerUI/Polish.lproj/Localizable.strings trans.pt_BR = UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/MailerUI/Russian.lproj/Localizable.strings trans.sk = UI/MailerUI/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/MailerUI/Slovenian.lproj/Localizable.strings trans.sv = UI/MailerUI/Swedish.lproj/Localizable.strings trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-preferencesui] source_file = UI/PreferencesUI/English.lproj/Localizable.strings @@ -52,8 +54,10 @@ trans.pl = UI/PreferencesUI/Polish.lproj/Localizable.strings trans.pt_BR = UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/PreferencesUI/Russian.lproj/Localizable.strings trans.sk = UI/PreferencesUI/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/PreferencesUI/Slovenian.lproj/Localizable.strings trans.sv = UI/PreferencesUI/Swedish.lproj/Localizable.strings trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-scheduler] source_file = UI/Scheduler/English.lproj/Localizable.strings @@ -79,8 +83,10 @@ trans.pl = UI/Scheduler/Polish.lproj/Localizable.strings trans.pt_BR = UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/Scheduler/Russian.lproj/Localizable.strings trans.sk = UI/Scheduler/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/Scheduler/Slovenian.lproj/Localizable.strings trans.sv = UI/Scheduler/Swedish.lproj/Localizable.strings trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-contacts] source_file = UI/Contacts/English.lproj/Localizable.strings @@ -106,8 +112,10 @@ trans.pl = UI/Contacts/Polish.lproj/Localizable.strings trans.pt_BR = UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/Contacts/Russian.lproj/Localizable.strings trans.sk = UI/Contacts/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/Contacts/Slovenian.lproj/Localizable.strings trans.sv = UI/Contacts/Swedish.lproj/Localizable.strings trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-mainui] source_file = UI/MainUI/English.lproj/Localizable.strings @@ -133,8 +141,10 @@ trans.pl = UI/MainUI/Polish.lproj/Localizable.strings trans.pt_BR = UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/MainUI/Russian.lproj/Localizable.strings trans.sk = UI/MainUI/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/MainUI/Slovenian.lproj/Localizable.strings trans.sv = UI/MainUI/Swedish.lproj/Localizable.strings trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-common] source_file = UI/Common/English.lproj/Localizable.strings @@ -160,8 +170,10 @@ trans.pl = UI/Common/Polish.lproj/Localizable.strings trans.pt_BR = UI/Common/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/Common/Russian.lproj/Localizable.strings trans.sk = UI/Common/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/Common/Slovenian.lproj/Localizable.strings trans.sv = UI/Common/Swedish.lproj/Localizable.strings trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-administrationui] source_file = UI/AdministrationUI/English.lproj/Localizable.strings @@ -187,8 +199,10 @@ trans.pl = UI/AdministrationUI/Polish.lproj/Localizable.strings trans.pt_BR = UI/AdministrationUI/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/AdministrationUI/Russian.lproj/Localizable.strings trans.sk = UI/AdministrationUI/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/AdministrationUI/Slovenian.lproj/Localizable.strings trans.sv = UI/AdministrationUI/Swedish.lproj/Localizable.strings trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings [sogo.soobjects-appointments] source_file = SoObjects/Appointments/English.lproj/Localizable.strings @@ -214,8 +228,10 @@ trans.pl = SoObjects/Appointments/Polish.lproj/Localizable.strings trans.pt_BR = SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings trans.ru = SoObjects/Appointments/Russian.lproj/Localizable.strings trans.sk = SoObjects/Appointments/Slovak.lproj/Localizable.strings +trans.sl_SI = SoObjects/Appointments/Slovenian.lproj/Localizable.strings trans.sv = SoObjects/Appointments/Swedish.lproj/Localizable.strings trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings [sogo.soobjects-contacts] source_file = SoObjects/Contacts/English.lproj/Localizable.strings @@ -241,8 +257,10 @@ trans.pl = SoObjects/Contacts/Polish.lproj/Localizable.strings trans.pt_BR = SoObjects/Contacts/BrazilianPortuguese.lproj/Localizable.strings trans.ru = SoObjects/Contacts/Russian.lproj/Localizable.strings trans.sk = SoObjects/Contacts/Slovak.lproj/Localizable.strings +trans.sl_SI = SoObjects/Contacts/Slovenian.lproj/Localizable.strings trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings +trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings [sogo.soobjects-mailer] source_file = SoObjects/Mailer/English.lproj/Localizable.strings @@ -268,8 +286,10 @@ trans.pl = SoObjects/Mailer/Polish.lproj/Localizable.strings trans.pt_BR = SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings trans.ru = SoObjects/Mailer/Russian.lproj/Localizable.strings trans.sk = SoObjects/Mailer/Slovak.lproj/Localizable.strings +trans.sl_SI = SoObjects/Mailer/Slovenian.lproj/Localizable.strings trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings +trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings [sogo.ui-mailpartviewers] source_file = UI/MailPartViewers/English.lproj/Localizable.strings @@ -295,5 +315,7 @@ trans.pl = UI/MailPartViewers/Polish.lproj/Localizable.strings trans.pt_BR = UI/MailPartViewers/BrazilianPortuguese.lproj/Localizable.strings trans.ru = UI/MailPartViewers/Russian.lproj/Localizable.strings trans.sk = UI/MailPartViewers/Slovak.lproj/Localizable.strings +trans.sl_SI = UI/MailPartViewers/Slovenian.lproj/Localizable.strings trans.sv = UI/MailPartViewers/Swedish.lproj/Localizable.strings trans.uk = UI/MailPartViewers/Ukrainian.lproj/Localizable.strings +trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m index 47ec81990..c43afa6b8 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m +++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m @@ -133,6 +133,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; [[o properties] addEntriesFromDictionary: values]; [o save]; @@ -159,7 +160,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSString *nameInCache; if (theFolderType == ActiveSyncMailFolder) - nameInCache= [[[theCollection mailAccountFolder] imapFolderGUIDs] objectForKey: [theCollection nameInContainer]]; + nameInCache = [imapFolderGUIDS objectForKey: [theCollection nameInContainer]]; else { NSString *component_name; @@ -170,7 +171,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. else component_name = @"vtodo"; - nameInCache= [NSString stringWithFormat: @"%@/%@", component_name, [theCollection nameInContainer]]; + nameInCache = [NSString stringWithFormat: @"%@/%@", component_name, [theCollection nameInContainer]]; } return nameInCache; @@ -283,7 +284,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. serverId = [NSString stringWithFormat: @"%@.ics", [theCollection globallyUniqueObjectId]]; sogoObject = [[SOGoTaskObject alloc] initWithName: serverId inContainer: theCollection]; - o = [sogoObject component: YES secure: NO]; + o = [sogoObject component: YES secure: NO]; } break; case ActiveSyncMailFolder: @@ -311,10 +312,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. syncCache = [folderMetadata objectForKey: @"SyncCache"]; dateCache = [folderMetadata objectForKey: @"DateCache"]; - - [syncCache setObject: [folderMetadata objectForKey: @"SyncKey"] forKey: serverId]; + + [syncCache setObject: [NSString stringWithFormat:@"%f", [[sogoObject lastModified] timeIntervalSince1970]] forKey: serverId]; [dateCache setObject: [NSCalendarDate date] forKey: serverId]; - + [self _setFolderMetadata: folderMetadata forKey: [self _getNameInCache: theCollection withType: theFolderType]]; } } @@ -365,6 +366,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSString *serverId; NSArray *changes; id aChange, o, sogoObject; + NSMutableDictionary *folderMetadata, *syncCache; int i; @@ -372,6 +374,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. if ([changes count]) { + folderMetadata = [self _folderMetadataForKey: [self _getNameInCache: theCollection withType: theFolderType]]; + syncCache = [folderMetadata objectForKey: @"SyncCache"]; + for (i = 0; i < [changes count]; i++) { aChange = [changes objectAtIndex: i]; @@ -398,6 +403,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. o = [sogoObject vCard]; [o takeActiveSyncValues: allChanges inContext: context]; [sogoObject saveComponent: o]; + + [syncCache setObject: [NSString stringWithFormat:@"%f", [[sogoObject lastModified] timeIntervalSince1970]] forKey: serverId]; + } break; case ActiveSyncEventFolder: @@ -406,15 +414,30 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. o = [sogoObject component: NO secure: NO]; [o takeActiveSyncValues: allChanges inContext: context]; [sogoObject saveComponent: o]; + + [syncCache setObject: [NSString stringWithFormat:@"%f", [[sogoObject lastModified] timeIntervalSince1970]] forKey: serverId]; + } break; case ActiveSyncMailFolder: default: { + NSDictionary *result; + NSString *modseq; + [sogoObject takeActiveSyncValues: allChanges inContext: context]; + + result = [sogoObject fetchParts: [NSArray arrayWithObject: @"MODSEQ"]]; + modseq = [[[result objectForKey: @"RawResponse"] objectForKey: @"fetch"] objectForKey: @"modseq"]; + + if (modseq) + [syncCache setObject: modseq forKey: serverId]; } } + [self _setFolderMetadata: folderMetadata forKey: [self _getNameInCache: theCollection withType: theFolderType]]; + + [theBuffer appendString: @""]; [theBuffer appendFormat: @"%@", serverId]; [theBuffer appendFormat: @"%d", 1]; @@ -487,7 +510,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. if (![sogoObject isKindOfClass: [NSException class]]) { // FIXME: handle errors here - if (deletesAsMoves) + if (deletesAsMoves && theFolderType == ActiveSyncMailFolder) [(SOGoMailFolder *)[sogoObject container] deleteUIDs: [NSArray arrayWithObjects: serverId, nil] useTrashFolder: &useTrash inContext: context]; else [sogoObject delete]; @@ -651,7 +674,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSDictionary *component; NSArray *allComponents; - BOOL updated; + BOOL updated, initialLoadInProgress; int deleted, return_count; if (theFolderType == ActiveSyncContactFolder) @@ -661,8 +684,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. else component_name = @"vtodo"; - allComponents = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType]; - allComponents = [allComponents sortedArrayUsingDescriptors: [NSArray arrayWithObjects: [[NSSortDescriptor alloc] initWithKey: @"c_lastmodified" ascending:YES], nil]]; + initialLoadInProgress = NO; + + if ([theSyncKey isEqualToString: @"-1"]) + [folderMetadata setObject: davCollectionTagToStore forKey: @"InitialLoadSequence"]; + + if ([folderMetadata objectForKey: @"InitialLoadSequence"]) + { + if ([theSyncKey intValue] < [[folderMetadata objectForKey: @"InitialLoadSequence"] intValue]) + initialLoadInProgress = YES; + else + [folderMetadata removeObjectForKey: @"InitialLoadSequence"]; + } + + allComponents = [theCollection syncTokenFieldsWithProperties: nil + matchingSyncToken: theSyncKey + fromDate: theFilterType + initialLoad: initialLoadInProgress]; + allComponents = [allComponents sortedArrayUsingDescriptors: [NSArray arrayWithObject: [[[NSSortDescriptor alloc] initWithKey: @"c_lastmodified" ascending: YES] autorelease]]]; // Check for the WindowSize @@ -825,12 +864,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSMutableArray *allCacheObjects, *sortedBySequence; SOGoMailObject *mailObject; - NSArray *allMessages; + NSArray *allMessages, *a; - int j, k, return_count; - BOOL found_in_cache; + int j, k, return_count, highestmodseq; + BOOL found_in_cache, initialLoadInProgress; - allMessages = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType]; + initialLoadInProgress = NO; + + if ([theSyncKey isEqualToString: @"-1"]) + { + highestmodseq = 0; + + a = [[theCollection davCollectionTag] componentsSeparatedByString: @"-"]; + [folderMetadata setObject: [a objectAtIndex: 1] forKey: @"InitialLoadSequence"]; + } + else + { + a = [theSyncKey componentsSeparatedByString: @"-"]; + highestmodseq = [[a objectAtIndex: 1] intValue]; + } + + if ([folderMetadata objectForKey: @"InitialLoadSequence"]) + { + if (highestmodseq < [[folderMetadata objectForKey: @"InitialLoadSequence"] intValue]) + initialLoadInProgress = YES; + else + [folderMetadata removeObjectForKey: @"InitialLoadSequence"]; + } + + allMessages = [theCollection syncTokenFieldsWithProperties: nil matchingSyncToken: theSyncKey fromDate: theFilterType initialLoad: initialLoadInProgress]; max = [allMessages count]; allCacheObjects = [NSMutableArray array]; @@ -889,7 +951,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. NSString *lastSequence; more_available = YES; - lastSequence = ([[aCacheObject sequence] isEqual: [NSNull null]] ? @"1" : [aCacheObject sequence]); + lastSequence = ([[aCacheObject sequence] isEqual: [NSNull null]] ? [NSString stringWithFormat:@"%d", highestmodseq] : [aCacheObject sequence]); *theLastServerKey = [[NSString alloc] initWithFormat: @"%@-%@", [aCacheObject uid], lastSequence]; //NSLog(@"Reached windowSize - lastUID will be: %@", *theLastServerKey); DESTROY(pool); @@ -910,6 +972,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [syncCache removeObjectForKey: [aCacheObject uid]]; [dateCache removeObjectForKey: [aCacheObject uid]]; + + return_count++; } else { @@ -919,17 +983,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. inContext: context acquire: 0]; - [s appendString: @""]; - [s appendFormat: @"%@", [aCacheObject uid]]; - [s appendString: @""]; - [s appendString: [mailObject activeSyncRepresentationInContext: context]]; - [s appendString: @""]; - [s appendString: @""]; - + if (![[aCacheObject sequence] isEqual: [syncCache objectForKey: [aCacheObject uid]]]) + { + [s appendString: @""]; + [s appendFormat: @"%@", [aCacheObject uid]]; + [s appendString: @""]; + [s appendString: [mailObject activeSyncRepresentationInContext: context]]; + [s appendString: @""]; + [s appendString: @""]; + + return_count++; + } + [syncCache setObject: [aCacheObject sequence] forKey: [aCacheObject uid]]; } - - return_count++; } else { @@ -1204,22 +1271,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [context setObject: bodyPreferenceType forKey: @"BodyPreferenceType"]; - // We generate the commands, if any, for the response. We might also have - // generated some in processSyncCommand:inResponse: as we could have - // received a Fetch command - if (getChanges && !first_sync) - { - [self processSyncGetChanges: theDocumentElement - inCollection: collection - withWindowSize: windowSize - withMaxSyncResponseSize: theMaxSyncResponseSize - withSyncKey: syncKey - withFolderType: folderType - withFilterType: [NSCalendarDate dateFromFilterType: [[(id)[theDocumentElement getElementsByTagName: @"FilterType"] lastObject] textValue]] - inBuffer: changeBuffer - lastServerKey: &lastServerKey]; - } - // // We process the commands from the request // @@ -1237,12 +1288,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. inBuffer: s processed: &processed]; - // Windows phons don't empty Responses tags - such as: . - // We onnly generate this tag when the command has generated a response. + // Windows phones don't like empty Responses tags - such as: . + // We only generate this tag when there is a response if (processed && [s length]) [commandsBuffer appendFormat: @"%@", s]; } - + + + // We generate the commands, if any, for the response. We might also have + // generated some in processSyncCommand:inResponse: as we could have + // received a Fetch command + if (getChanges && !first_sync) + { + [self processSyncGetChanges: theDocumentElement + inCollection: collection + withWindowSize: windowSize + withMaxSyncResponseSize: theMaxSyncResponseSize + withSyncKey: syncKey + withFolderType: folderType + withFilterType: [NSCalendarDate dateFromFilterType: [[(id)[theDocumentElement getElementsByTagName: @"FilterType"] lastObject] textValue]] + inBuffer: changeBuffer + lastServerKey: &lastServerKey]; + } + folderMetadata = [self _folderMetadataForKey: [self _getNameInCache: collection withType: folderType]]; // If we got any changes or if we have applied any commands @@ -1267,7 +1335,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { // Make sure that client is updated with the right syncKey. - This keeps vtodo's and vevent's syncKey in sync. syncKeyInCache = [folderMetadata objectForKey: @"SyncKey"]; - if (syncKeyInCache && !([davCollectionTag isEqualToString:syncKeyInCache]) && ![davCollectionTag isEqualToString: @"-1"]) + if (syncKeyInCache && !([davCollectionTag isEqualToString:syncKeyInCache]) && !first_sync) { davCollectionTag = syncKeyInCache; *changeDetected = YES; diff --git a/ActiveSync/SOGoActiveSyncDispatcher.h b/ActiveSync/SOGoActiveSyncDispatcher.h index d72073ad1..affe9e5b9 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.h +++ b/ActiveSync/SOGoActiveSyncDispatcher.h @@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @interface SOGoActiveSyncDispatcher : NSObject { NSURL *folderTableURL; + NSDictionary *imapFolderGUIDS; id context; } diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index b107b94f0..7fd80aab2 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -151,12 +151,14 @@ static BOOL debugOn = NO; debugOn = [[SOGoSystemDefaults sharedSystemDefaults] easDebugEnabled]; folderTableURL = nil; + imapFolderGUIDS = nil; return self; } - (void) dealloc { RELEASE(folderTableURL); + RELEASE(imapFolderGUIDS); [super dealloc]; } @@ -229,23 +231,27 @@ static BOOL debugOn = NO; SOGoMailAccounts *accountsFolder; SOGoMailAccount *accountFolder; SOGoUserFolder *userFolder; - NSDictionary *imapGUIDs; - userFolder = [[context activeUser] homeFolderInContext: context]; - accountsFolder = [userFolder lookupName: @"Mail" inContext: context acquire: NO]; - accountFolder = [accountsFolder lookupName: @"0" inContext: context acquire: NO]; - - // Get the GUID of the IMAP folder - imapGUIDs = [accountFolder imapFolderGUIDs]; - - //return [[imapGUIDs allKeysForObject: theIdToTranslate] objectAtIndex: 0]; - return [[[imapGUIDs allKeysForObject: [NSString stringWithFormat: @"folder%@", theIdToTranslate]] objectAtIndex: 0] substringFromIndex: 6] ; + if (!imapFolderGUIDS) + { + userFolder = [[context activeUser] homeFolderInContext: context]; + accountsFolder = [userFolder lookupName: @"Mail" inContext: context acquire: NO]; + accountFolder = [accountsFolder lookupName: @"0" inContext: context acquire: NO]; + + // Get the GUID of the IMAP folder + imapFolderGUIDS = [accountFolder imapFolderGUIDs]; + [imapFolderGUIDS retain]; + + } + + return [[[imapFolderGUIDS allKeysForObject: [NSString stringWithFormat: @"folder%@", theIdToTranslate]] objectAtIndex: 0] substringFromIndex: 6] ; } return theIdToTranslate; } + // // // @@ -699,7 +705,7 @@ static BOOL debugOn = NO; SOGoMailAccount *accountFolder; NSMutableString *s, *commands; SOGoUserFolder *userFolder; - NSMutableArray *folders; + NSMutableArray *folders, *processedFolders; SoSecurityManager *sm; SOGoCacheGCSObject *o; id currentFolder; @@ -719,6 +725,8 @@ static BOOL debugOn = NO; command_count = 0; commands = [NSMutableString string]; + processedFolders = [NSMutableArray array]; + [s appendString: @""]; [s appendString: @""]; @@ -727,7 +735,7 @@ static BOOL debugOn = NO; first_sync = YES; syncKey = @"1"; } - else if (![syncKey isEqualToString: [metadata objectForKey: @"FolderSyncKey"]]) + else if (![metadata objectForKey: @"FolderSyncKey"]) { // Synchronization key mismatch or invalid synchronization key //NSLog(@"FolderSync syncKey mismatch %@ <> %@", syncKey, metadata); @@ -862,7 +870,13 @@ static BOOL debugOn = NO; serverId = [NSString stringWithFormat: @"mail/%@", [[imapGUIDs objectForKey: nameInCache] substringFromIndex: 6]]; name = [folderMetadata objectForKey: @"displayName"]; - + + // avoid duplicate folders if folder is returned by different imap namespaces + if ([processedFolders indexOfObject: serverId] == NSNotFound) + [processedFolders addObject: serverId]; + else + continue; + if ([name hasPrefix: @"/"]) name = [name substringFromIndex: 1]; @@ -874,7 +888,10 @@ static BOOL debugOn = NO; if ([folderMetadata objectForKey: @"parent"]) { - parentId = [NSString stringWithFormat: @"mail/%@", [[imapGUIDs objectForKey: [NSString stringWithFormat: @"folder%@", [[folderMetadata objectForKey: @"parent"] substringFromIndex: 1]]] substringFromIndex: 6]]; + // make sure that parent of main-folders is always 0 + if (type == 12) + parentId = [NSString stringWithFormat: @"mail/%@", [[imapGUIDs objectForKey: [NSString stringWithFormat: @"folder%@", [[folderMetadata objectForKey: @"parent"] substringFromIndex: 1]]] substringFromIndex: 6]]; + name = [[name pathComponents] lastObject]; } @@ -927,6 +944,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; [o save]; command_count++; @@ -1012,6 +1030,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; } [o save]; @@ -1035,6 +1054,7 @@ static BOOL debugOn = NO; [[o properties] removeObjectForKey: @"MoreAvailable"]; [[o properties] removeObjectForKey: @"BodyPreferenceType"]; [[o properties] removeObjectForKey: @"SuccessfulMoveItemsOps"]; + [[o properties] removeObjectForKey: @"InitialLoadSequence"]; } [o save]; @@ -1193,7 +1213,7 @@ static BOOL debugOn = NO; filter = [NSCalendarDate dateFromFilterType: [[(id)[[allCollections objectAtIndex: j] getElementsByTagName: @"FilterType"] lastObject] textValue]]; syncKey = [[(id)[[allCollections objectAtIndex: j] getElementsByTagName: @"SyncKey"] lastObject] textValue]; - allMessages = [currentCollection syncTokenFieldsWithProperties: nil matchingSyncToken: syncKey fromDate: filter]; + allMessages = [currentCollection syncTokenFieldsWithProperties: nil matchingSyncToken: syncKey fromDate: filter initialLoad: NO]; count = [allMessages count]; @@ -2565,7 +2585,7 @@ static BOOL debugOn = NO; NGMimeFileData *fdata; NSException *error; NSArray *attachmentKeys; - NSMutableArray *attachments; + NSMutableArray *attachments, *references; id body, bodyFromSmartForward, htmlPart, textPart; NSString *fullName, *email, *charset, *s; @@ -2604,7 +2624,30 @@ static BOOL debugOn = NO; [map setObject: email forKey: @"from"]; if ([mailObject messageId]) - [map setObject: [mailObject messageId] forKey: @"in-reply-to"]; + { + [map setObject: [mailObject messageId] forKey: @"in-reply-to"]; + + references = [[[[[mailObject mailHeaders] objectForKey: @"references"] componentsSeparatedByString: @" "] mutableCopy] autorelease]; + + // If there is no References: header, initialize it with In-Reply-To. + if ([mailObject inReplyTo] && ![references count]) + references = [NSMutableArray arrayWithObject: [mailObject inReplyTo]]; + + if ([references count] > 0) + { + // If there are more than ten identifiers listed, we eliminate the second one. + if ([references count] >= 10) + [references removeObjectAtIndex: 1]; + + [references addObject: [mailObject messageId]]; + + [map setObject: [references componentsJoinedByString:@" "] forKey: @"references"]; + } + else + { + [map setObject: [mailObject messageId] forKey: @"references"]; + } + } messageToSend = [[[NGMimeMessage alloc] initWithHeader: map] autorelease]; body = [[[NGMimeMultipartBody alloc] initWithPart: messageToSend] autorelease]; @@ -2874,7 +2917,7 @@ static BOOL debugOn = NO; activeUser = [context activeUser]; if (![activeUser canAccessModule: @"ActiveSync"]) { - [theResponse setStatus: 403]; + [(WOResponse *)theResponse setStatus: 403]; [self logWithFormat: @"EAS - Forbidden access for user %@", [activeUser loginInDomain]]; return nil; } diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m index 164abb6db..6b2e1b03a 100644 --- a/ActiveSync/SOGoMailObject+ActiveSync.m +++ b/ActiveSync/SOGoMailObject+ActiveSync.m @@ -77,6 +77,41 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #import +unsigned char strToChar(char a, char b) { + char encoder[3] = {'\0','\0','\0'}; + encoder[0] = a; + encoder[1] = b; + return (char) strtol(encoder,NULL,16); +} + +@interface NSString (NSStringExtensions) +- (NSData *) decodeFromHexidecimal; +@end + +@implementation NSString (NSStringExtensions) + +- (NSData *) decodeFromHexidecimal; +{ + const char * bytes = [self cStringUsingEncoding: NSUTF8StringEncoding]; + NSUInteger length = strlen(bytes); + unsigned char * r = (unsigned char *) malloc(length / 2 + 1); + unsigned char * index = r; + + while ((*bytes) && (*(bytes +1))) { + *index = strToChar(*bytes, *(bytes +1)); + index++; + bytes+=2; + } + *index = '\0'; + + NSData * result = [NSData dataWithBytes: r length: length / 2]; + free(r); + + return result; +} + +@end + typedef struct { uint32_t dwLowDateTime; uint32_t dwHighDateTime; @@ -91,7 +126,7 @@ struct GlobalObjectId { FILETIME CreationTime; uint8_t X[8]; uint32_t Size; - uint8_t* Data; + uint8_t Data[0]; }; @implementation SOGoMailObject (ActiveSync) @@ -118,39 +153,40 @@ struct GlobalObjectId { // // The GlobalObjId is documented here: http://msdn.microsoft.com/en-us/library/ee160198(v=EXCHG.80).aspx // + - (NSData *) _computeGlobalObjectIdFromEvent: (iCalEvent *) event { NSData *binPrefix, *globalObjectId, *uidAsASCII; NSString *prefix, *uid; - - struct GlobalObjectId newGlobalId; + struct GlobalObjectId *newGlobalId; const char *bytes; - + + uid = [event uid]; + uidAsASCII = [uid decodeFromHexidecimal]; + newGlobalId = (struct GlobalObjectId*)calloc(sizeof(uint8_t), sizeof(struct GlobalObjectId) + 0x0c + [uidAsASCII length]); + prefix = @"040000008200e00074c5b7101a82e008"; // dataPrefix is "vCal-Uid %x01 %x00 %x00 %x00" uint8_t dataPrefix[] = { 0x76, 0x43, 0x61, 0x6c, 0x2d, 0x55, 0x69, 0x64, 0x01, 0x00, 0x00, 0x00 }; - uid = [event uid]; binPrefix = [prefix convertHexStringToBytes]; - [binPrefix getBytes: &newGlobalId.ByteArrayID]; - [self _setInstanceDate: &newGlobalId + [binPrefix getBytes: &newGlobalId->ByteArrayID]; + [self _setInstanceDate: newGlobalId fromDate: [event recurrenceId]]; - uidAsASCII = [uid dataUsingEncoding: NSASCIIStringEncoding]; bytes = [uidAsASCII bytes]; // 0x0c is the size of our dataPrefix - newGlobalId.Size = 0x0c + [uidAsASCII length]; - newGlobalId.Data = malloc(newGlobalId.Size * sizeof(uint8_t)); - memcpy(newGlobalId.Data, dataPrefix, 0x0c); - memcpy(newGlobalId.Data + 0x0c, bytes, newGlobalId.Size - 0x0c); + newGlobalId->Size = 0x0c + [uidAsASCII length]; + memcpy(newGlobalId->Data, dataPrefix, 0x0c); + memcpy(newGlobalId->Data + 0x0c, bytes, newGlobalId->Size - 0x0c); - globalObjectId = [[NSData alloc] initWithBytes: &newGlobalId length: 40 + newGlobalId.Size*sizeof(uint8_t)]; - free(newGlobalId.Data); - + globalObjectId = [[NSData alloc] initWithBytes: newGlobalId length: 40 + newGlobalId->Size*sizeof(uint8_t)]; + free(newGlobalId); return [globalObjectId autorelease]; } + // // For debugging purposes... // @@ -514,6 +550,28 @@ struct GlobalObjectId { return d; } + +- (NSString *) _getNormalizedSubject +{ + NSString *subject; + NSUInteger colIdx; + NSString *stringValue; + + subject = [[self subject] decodedHeader]; + + colIdx = [subject rangeOfString: @":" options:NSBackwardsSearch].location; + if (colIdx != NSNotFound && colIdx + 1 < [subject length]) + stringValue = [[subject substringFromIndex: colIdx + 1] stringByTrimmingLeadSpaces]; + else + stringValue = subject; + + if (!stringValue) + stringValue = @""; + + return stringValue; +} + + // // // @@ -627,7 +685,7 @@ struct GlobalObjectId { if (value) { [s appendFormat: @"%@", [value activeSyncRepresentationInContext: context]]; - [s appendFormat: @"%@", [value activeSyncRepresentationInContext: context]]; + [s appendFormat: @"%@", [[self _getNormalizedSubject] activeSyncRepresentationInContext: context]]; } // DateReceived @@ -1013,7 +1071,13 @@ struct GlobalObjectId { if ([[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.0"] || [[[context request] headerForKey: @"MS-ASProtocolVersion"] isEqualToString: @"14.1"]) { - if ([self inReplyTo]) + NSString *reference; + + reference = [[[[self mailHeaders] objectForKey: @"references"] componentsSeparatedByString: @" "] objectAtIndex: 0]; + + if ([reference length] > 0) + [s appendFormat: @"%@", [[reference dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]]; + else if ([self inReplyTo]) [s appendFormat: @"%@", [[[self inReplyTo] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]]; else if ([self messageId]) [s appendFormat: @"%@", [[[self messageId] dataUsingEncoding: NSUTF8StringEncoding] activeSyncRepresentationInContext: context]]; diff --git a/ChangeLog b/ChangeLog index 305a9ad4f..f8bf36f28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,2116 @@ +commit 38c9a229c0f389b4a1354fd697fa41bd555802e2 +Author: Ludovic Marcotte +Date: Wed Sep 16 13:44:59 2015 -0400 + + Update for the release + +M Documentation/docinfo.xml +M Documentation/includes/global-attributes.asciidoc + +commit e75ec09445efebd22414071230e943917d92d79d +Author: Francis Lachapelle +Date: Wed Sep 16 13:31:48 2015 -0400 + + Update NEWS file + +M NEWS + +commit 58d03eedc3e2a3864fabe8014b0b4216074c2ddb +Author: Francis Lachapelle +Date: Wed Sep 16 13:29:37 2015 -0400 + + Update CKEditor to version 4.5.3 + +M UI/WebServerResources/ckeditor/LICENSE.md +M UI/WebServerResources/ckeditor/build-config.js +M UI/WebServerResources/ckeditor/ckeditor.js +M UI/WebServerResources/ckeditor/lang/sv.js +A UI/WebServerResources/ckeditor/lang/zh-cn.js +M UI/WebServerResources/ckeditor/plugins/clipboard/dialogs/paste.js +M UI/WebServerResources/ckeditor/plugins/image/images/noimage.png +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js +M UI/WebServerResources/ckeditor/skins/moono/readme.md + +commit 98ad8f1c0b3ae919bd32f5ef310923d1d30bcb97 +Author: Francis Lachapelle +Date: Wed Sep 16 11:52:46 2015 -0400 + + Update NEWS file + +M NEWS + +commit 37b817cd68560c0487217fac3e2e28e30caf00ec +Author: Francis Lachapelle +Date: Wed Sep 16 11:43:22 2015 -0400 + + Fix options availability in Contacts module cont'd + +M UI/WebServerResources/ContactsUI.js + +commit 9fd8f3edefd195daf40f3f8de130a8cc5a63c4ce +Author: Francis Lachapelle +Date: Wed Sep 16 11:38:25 2015 -0400 + + Add verbose output to "sogo-tool remove" command + +M Tools/SOGoToolRemove.m + +commit ce11aca2bde45b9e0e0186e7e73ab02fbfa1df06 +Author: Ludovic Marcotte +Date: Wed Sep 16 09:44:29 2015 -0400 + + (fix) update the doc regarding the temporarily dropping rhel/old debian/ubuntu support + +M Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc + +commit 861057f22f0b842f7eed16ef6ecd43cd889295f5 +Author: Francis Lachapelle +Date: Wed Sep 16 09:38:52 2015 -0400 + + Fix options availability in Contacts module + + A user can edit/delete a card from a system addressbook if included in + the "modifiers". Enable the delete/move options of the contextual menu + in this case. + Fixes #3342 + +M UI/Contacts/UIxContactFoldersView.m +M UI/Templates/ContactsUI/UIxContactFoldersView.wox + +commit b910501afa8106a3585e50aae931bccb359b5272 +Author: Francis Lachapelle +Date: Tue Sep 15 15:59:31 2015 -0400 + + Fix localization of calendar categories + + Fixes #3295 + +M NEWS +M SoObjects/SOGo/SOGoDefaults.plist +M UI/PreferencesUI/UIxPreferences.m + +commit 6bccd2eea036114177c59fcfa943f63c067a63d9 +Author: Ludovic Marcotte +Date: Mon Sep 14 11:06:18 2015 -0400 + + (fix) improve spec file regarding disabling OC build + +M packaging/rhel/sogo.spec + +commit 652ae763d4ed3021ccfab9a4efcaa1a2232cd84e +Author: Ludovic Marcotte +Date: Mon Sep 14 10:55:50 2015 -0400 + + (fix) Start/end shifting by 1 hour due to timezone change on last Sunday of October 2015 (#3344) + +M NEWS +M SOPE/NGCards/iCalTimeZonePeriod.m + +commit 42f10e19295276cf5e9e017845928d5e5fb64a94 +Author: Ludovic Marcotte +Date: Thu Sep 10 20:07:42 2015 -0400 + + (fix) safe-guard against not-yet-created calendar of local users + +M SoObjects/Appointments/SOGoAppointmentFolder.m + +commit 03b706e1d8fa4d0907db426c2c97565e6c7da0ff +Author: Ludovic Marcotte +Date: Thu Sep 10 19:44:45 2015 -0400 + + (fix) disable oc builds on el6 for now + +M packaging/rhel/sogo.spec + +commit 2be556299ee29d77bbe92061509b20365db151dc +Author: Ludovic Marcotte +Date: Thu Sep 10 19:10:50 2015 -0400 + + (fix) slight modification for fix #3293 + +M SoObjects/SOGo/SOGoGCSFolder.m + +commit b075a306c6c67d6f75d8353d507abb9f1fee78fa +Author: Enrique J. Hernández Blasco +Date: Thu Sep 10 17:26:41 2015 +0200 + + oc-task: Save tasks from Outlook + + It was not working because we try to save as component the + full calendar and its parent was nil. We have to save the calendar + itself to save the task in the personal calendar. + +M OpenChange/MAPIStoreTasksMessage.m + +commit 36d8fa12d39a78c0538e9ac071be1b288a49051b +Author: Juan Vallés +Date: Thu Sep 10 10:24:50 2015 +0200 + + Improve first character check in CSS identifiers + + A CSS identifier can't start with a digit, so when a folder name does, + a '_' character is appended at the beginning of its CSS identifier. + + The check for this first character used the `isdigit()` function, which + takes a `char` argument, while `[self objectAtIndex: 0]` returns a + `unichar`, i.e. a 16-bit unsigned integer. This caused some non-digit + characters to pass this check (e.g. Chinese characters), ending up with + an underscore at the beginning of the folder name. + +M SoObjects/SOGo/NSString+Utilities.m + +commit 07092828fec4f561602318573eb18b5f1a584eb4 +Author: Ludovic Marcotte +Date: Wed Sep 9 10:20:31 2015 -0400 + + (fix) improved EAS speed during initial syncing of large mailboxes (#3293) + +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M ActiveSync/SOGoActiveSyncDispatcher.m +M NEWS +M SoObjects/Mailer/SOGoMailFolder.h +M SoObjects/Mailer/SOGoMailFolder.m +M SoObjects/SOGo/SOGoGCSFolder.h +M SoObjects/SOGo/SOGoGCSFolder.m + +commit 7c0ba7b72b1ae24e0135e6053de0f50ba1532729 +Author: Ludovic Marcotte +Date: Wed Sep 9 10:12:32 2015 -0400 + + (fix) avoid too-many LIST commands over EAS (#3294) + +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M ActiveSync/SOGoActiveSyncDispatcher.h +M ActiveSync/SOGoActiveSyncDispatcher.m +M NEWS + +commit 750a629df877e2a76081b09f51a2ad3368412f4c +Author: Ludovic Marcotte +Date: Wed Sep 9 08:24:59 2015 -0400 + + Updated NEWS file regarding PR#102 + +M NEWS + +commit 1fdb44b0a7c2b8f4d9011633b7888be23b47af51 +Author: Javier Amor García +Date: Tue Sep 8 15:37:33 2015 +0200 + + Fix some compilation warnings + + The warnings were introduced in the fix for attachment with used + the filename extended parameter. + + Also removed trailing whitespaces. + +M OpenChange/MAPIStoreMailAttachment.m +M OpenChange/MAPIStoreMailMessage.m + +commit 6280e4ded620658c80b56de91a3733084ff08d14 +Author: Enrique J. Hernández Blasco +Date: Fri Sep 4 16:16:00 2015 +0200 + + oc: Implement setReadFlag for MAPIStoreDBMessage + + This is an utility for testing as I don't see any added value + for real scenario but according to [MS-OXCMSG] all messages + can have PidTagMessageFlags. + +M OpenChange/MAPIStoreDBMessage.m + +commit f19074334cabf8b78b2818e0c0a3547e9a1b9b38 +Author: Enrique J. Hernández Blasco +Date: Fri Sep 4 16:15:05 2015 +0200 + + oc: Use enum mapistore_error as returned value for setReadFlag + +M OpenChange/MAPIStoreCalendarMessage.m +M OpenChange/MAPIStoreMailMessage.m +M OpenChange/MAPIStoreMessage.h +M OpenChange/MAPIStoreMessage.m +M OpenChange/MAPIStoreSOGo.m + +commit b702e40ebbc78302fa7f1e29c02e5bc5af9ecb83 +Author: Enrique J. Hernández Blasco +Date: Thu Sep 3 16:31:40 2015 +0200 + + oc: load versionsMessage on setting up + + versionsMessage object could have outdated version in a root folder + in the following case: + + * Download latest contents using FXBuffer + * versionsMessage is updated by synchroniseCache + * OpenMessage from last FXBuffer + * Setup versions message as root folder + * Get Predecessor Change List from that message + + We could just reload if needed the versions message if something + is missing but I don't know if that situation fixes more than this + one. + +M OpenChange/MAPIStoreGCSFolder.m +M OpenChange/MAPIStoreMailFolder.m + +commit cbc3e3e97dc9a56ac867894d9b7b131fb4de137b +Author: Javier Amor García +Date: Tue Aug 25 16:41:38 2015 +0200 + + Test for [NGMimeMessageGenerator generateDataForHeaderField:value:] + + The NGMimeMessageGenerator can be found in sope + +M Tests/Unit/GNUmakefile +M Tests/Unit/SOGoTest.h +A Tests/Unit/TestNGMimeMessageGenerator.m + +commit 361d5ea3a605c94344ceea1a2e34e91c416db837 +Author: Javier Amor García +Date: Sun Aug 30 14:13:05 2015 +0200 + + Added method [SOGoTest stringFromDiffBetween:and:] + +M Tests/Unit/SOGoTest.h +M Tests/Unit/SOGoTest.m + +commit 47859b76d62af1462dc9a8a9e67ed68780432798 +Author: Enrique J. Hernández Blasco +Date: Mon Aug 24 23:42:38 2015 +0200 + + oc-mail: Return right change key after saving a draft mail + + After saving a draft mail (this is done automatically by Outlook) + a GetProps call is done checking the PidTagChangeKey has been + updated properly. Without this patch, it returned MAPI_E_NOT_FOUND. + + With this patch, we addressed that problem and we have updated + the Predecessor Change List metadata for the draft mail with the + change key provided by the client to avoid conflicting messages + whenever it is possible. + +M OpenChange/MAPIStoreMailFolder.h +M OpenChange/MAPIStoreMailFolder.m +M OpenChange/MAPIStoreMailVolatileMessage.m +M OpenChange/MAPIStoreMessage.m + +commit 3a60b6e38edbff5edc0d2836745ef1da702f4237 +Author: Enrique J. Hernández Blasco +Date: Mon Aug 24 12:30:50 2015 +0200 + + oc-mail: Implement ChangeNumber >= restriction + + And warn when other operator than > or >= is used. + + This allows OpenChange to query for change numbers starting from + a given point. + +M OpenChange/MAPIStoreMailMessageTable.m + +commit ae3ac0a09a1ac8df5d2df477b9d5a8168f742069 +Author: Javier Amor García +Date: Wed Aug 19 18:56:15 2015 +0200 + + oc-mail: Support attachments with filename extended parameter + + The attachments which used a extended parameter for their filename + ('filename*=') where silently dropped. + This was because MAPIStore was only looking for no-extended filename + parameter. + The solution is using the 'filename' from the + SOGOExtension of the NSDictionary interface. + +M OpenChange/MAPIStoreMailAttachment.m +M OpenChange/MAPIStoreMailMessage.m + +commit 27a19ac95652172c3e706d57d1c948cf2ef8e7e9 +Author: Ludovic Marcotte +Date: Fri Aug 21 10:30:47 2015 -0400 + + (fix) Session fix when SOGoEnableDomainBasedUID is enabled but logins are domain-less + +M NEWS +M SoObjects/SOGo/SOGoUserManager.m +M UI/MainUI/SOGoRootPage.m + +commit 27b9b7bfa7a97635e0250a406eb4004078e3d571 +Author: Enrique J. Hernández Blasco +Date: Mon Aug 10 18:38:39 2015 +0200 + + oc-mail: Increase Change Number after modifying seen flag + + It is required when you are using SynchronizeImportReadStateChanges ROP + to update the MetaTagCnsetRead meta property. + + See [MS-OXCFXICS] Section 3.2.5.9.4.6 + + This could lead to sync issues. + +M OpenChange/MAPIStoreMailMessage.m + +commit 321672e2c3b5ed8468c5f530a7240a4f72945f7d +Author: Enrique J. Hernández Blasco +Date: Mon Jul 20 11:17:00 2015 +0200 + + oc: Update predecessor change list on saving + + There were cases where only the change key was updated (GCS) or + others were the change key was updated with wrong info. + + This changeset has as goal to update the predecessor change list + and, change key if required, on saving taking into account the latest information + given by the client in high level ROPs such as ImportMessageMove + or SetProperties, and merge it with information provided by the server + backend (IMAP server, SOGo DB) using `synchroniseCache`. + + For more details about `PidTagChangeKey` and `PidTagPredecessorChangeList` + property values check [MS-OXCFXICS] Section 2.2.1.2 + +M OpenChange/MAPIStoreDBMessage.m +M OpenChange/MAPIStoreFolder.m +M OpenChange/MAPIStoreGCSFolder.h +M OpenChange/MAPIStoreGCSFolder.m +M OpenChange/MAPIStoreGCSMessage.m +M OpenChange/MAPIStoreMailFolder.m +M OpenChange/NSData+MAPIStore.h +M OpenChange/NSData+MAPIStore.m + +commit 8d9b54815c5e35ccf46c8085a5f63c41f2e3c871 +Author: Enrique J. Hernández Blasco +Date: Sat Jul 18 08:56:59 2015 +0200 + + oc: Receive new predecessor change list parameter on move copy op + + This is to apply new API introduced by 85e2d7c commit in OpenChange + repository. + +M OpenChange/MAPIStoreFolder.h +M OpenChange/MAPIStoreFolder.m +M OpenChange/MAPIStoreMailFolder.m +M OpenChange/MAPIStoreSOGo.m + +commit 1dbfc183793b4c01357b95e8c3385ea2aec297a9 +Author: Enrique J. Hernández Blasco +Date: Sat Jul 18 08:47:55 2015 +0200 + + oc: Update to new XID structure definition + + From ede986f commit from OpenChange repository. + +M OpenChange/MAPIStoreGCSFolder.m +M OpenChange/MAPIStoreMailFolder.m +M OpenChange/NSData+MAPIStore.m + +commit 05b330e11b38da5f24669d42afc71c46a193a394 +Author: Ludovic Marcotte +Date: Mon Aug 3 11:06:30 2015 -0400 + + (fix) added changes from PR94 to avoid big merge conflicts + +M UI/MailerUI/Arabic.lproj/Localizable.strings +M UI/MailerUI/Basque.lproj/Localizable.strings +M UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MailerUI/Catalan.lproj/Localizable.strings +M UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MailerUI/Czech.lproj/Localizable.strings +M UI/MailerUI/Danish.lproj/Localizable.strings +M UI/MailerUI/Dutch.lproj/Localizable.strings +M UI/MailerUI/English.lproj/Localizable.strings +M UI/MailerUI/Finnish.lproj/Localizable.strings +M UI/MailerUI/French.lproj/Localizable.strings +M UI/MailerUI/German.lproj/Localizable.strings +M UI/MailerUI/Hungarian.lproj/Localizable.strings +M UI/MailerUI/Icelandic.lproj/Localizable.strings +M UI/MailerUI/Italian.lproj/Localizable.strings +M UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MailerUI/Polish.lproj/Localizable.strings +M UI/MailerUI/Russian.lproj/Localizable.strings +M UI/MailerUI/Slovak.lproj/Localizable.strings +M UI/MailerUI/Slovenian.lproj/Localizable.strings +M UI/MailerUI/SpanishArgentina.lproj/Localizable.strings +M UI/MailerUI/SpanishSpain.lproj/Localizable.strings +M UI/MailerUI/Swedish.lproj/Localizable.strings +M UI/MailerUI/Ukrainian.lproj/Localizable.strings +M UI/MailerUI/Welsh.lproj/Localizable.strings +M UI/PreferencesUI/Arabic.lproj/Localizable.strings +M UI/PreferencesUI/Basque.lproj/Localizable.strings +M UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/PreferencesUI/Catalan.lproj/Localizable.strings +M UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings +M UI/PreferencesUI/Czech.lproj/Localizable.strings +M UI/PreferencesUI/Danish.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/Finnish.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Icelandic.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/PreferencesUI/Polish.lproj/Localizable.strings +M UI/PreferencesUI/Russian.lproj/Localizable.strings +M UI/PreferencesUI/Slovak.lproj/Localizable.strings +M UI/PreferencesUI/Slovenian.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +M UI/PreferencesUI/Welsh.lproj/Localizable.strings +M UI/Templates/PreferencesUI/UIxPreferences.wox + +commit 307876e6c705f5cf307067b7d6faf81c90fb226a +Author: Luc Charland +Date: Mon Aug 3 10:24:15 2015 -0400 + + cleaned up a few comments + +M Scripts/verify_translations.py + +commit ac6b299988f27f20fc04970b1c1d77e9946cd4f2 +Author: Luc Charland +Date: Mon Aug 3 09:51:31 2015 -0400 + + removed double Name translation in 5 languages + +M UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings +M UI/Scheduler/Czech.lproj/Localizable.strings +M UI/Scheduler/Russian.lproj/Localizable.strings +M UI/Scheduler/Slovak.lproj/Localizable.strings +M UI/Scheduler/Ukrainian.lproj/Localizable.strings + +commit 234db671adfdfeb5fec04d0388616036d4f18ccc +Author: Ludovic Marcotte +Date: Mon Aug 3 10:12:40 2015 -0400 + + Removed merged in templates from v3 + +D UI/Templates/ContactsUI/UIxContactEditorTemplate.wox +D UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox +D UI/Templates/PreferencesUI/UIxAccountEditor.wox +D UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox +D UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox +D UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox +D UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox +D UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox + +commit 2d33b01f31c95004c8cb72ec7b01add95e0418eb +Author: Luc Charland +Date: Fri Jul 31 13:54:03 2015 -0400 + + Removing colons + + Conflicts: + + UI/Templates/ContactsUI/UIxContactEditorTemplate.wox + UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox + UI/Templates/MailerUI/UIxMailMainFrame.wox + UI/Templates/MainUI/SOGoRootPage.wox + UI/Templates/PreferencesUI/UIxAccountEditor.wox + UI/Templates/PreferencesUI/UIxPreferences.wox + UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox + UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox + UI/Templates/SchedulerUI/UIxCalMainView.wox + UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox + UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox + UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox + UI/WebServerResources/angular-material + +M Scripts/verify_translations.py +M SoObjects/Appointments/Arabic.lproj/Localizable.strings +M SoObjects/Appointments/Basque.lproj/Localizable.strings +M SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings +M SoObjects/Appointments/Catalan.lproj/Localizable.strings +M SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Appointments/Czech.lproj/Localizable.strings +M SoObjects/Appointments/Danish.lproj/Localizable.strings +M SoObjects/Appointments/Dutch.lproj/Localizable.strings +M SoObjects/Appointments/English.lproj/Localizable.strings +M SoObjects/Appointments/Finnish.lproj/Localizable.strings +M SoObjects/Appointments/French.lproj/Localizable.strings +M SoObjects/Appointments/German.lproj/Localizable.strings +M SoObjects/Appointments/Hungarian.lproj/Localizable.strings +M SoObjects/Appointments/Icelandic.lproj/Localizable.strings +M SoObjects/Appointments/Italian.lproj/Localizable.strings +M SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings +M SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings +M SoObjects/Appointments/Polish.lproj/Localizable.strings +M SoObjects/Appointments/Russian.lproj/Localizable.strings +M SoObjects/Appointments/Slovak.lproj/Localizable.strings +M SoObjects/Appointments/Slovenian.lproj/Localizable.strings +M SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings +M SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings +M SoObjects/Appointments/Swedish.lproj/Localizable.strings +M SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +M SoObjects/Appointments/Welsh.lproj/Localizable.strings +M UI/Contacts/Arabic.lproj/Localizable.strings +M UI/Contacts/Basque.lproj/Localizable.strings +M UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +M UI/Contacts/Catalan.lproj/Localizable.strings +M UI/Contacts/ChineseTaiwan.lproj/Localizable.strings +M UI/Contacts/Czech.lproj/Localizable.strings +M UI/Contacts/Danish.lproj/Localizable.strings +M UI/Contacts/Dutch.lproj/Localizable.strings +M UI/Contacts/English.lproj/Localizable.strings +M UI/Contacts/Finnish.lproj/Localizable.strings +M UI/Contacts/French.lproj/Localizable.strings +M UI/Contacts/German.lproj/Localizable.strings +M UI/Contacts/Hungarian.lproj/Localizable.strings +M UI/Contacts/Icelandic.lproj/Localizable.strings +M UI/Contacts/Italian.lproj/Localizable.strings +M UI/Contacts/NorwegianBokmal.lproj/Localizable.strings +M UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings +M UI/Contacts/Polish.lproj/Localizable.strings +M UI/Contacts/Russian.lproj/Localizable.strings +M UI/Contacts/Slovak.lproj/Localizable.strings +M UI/Contacts/Slovenian.lproj/Localizable.strings +M UI/Contacts/SpanishArgentina.lproj/Localizable.strings +M UI/Contacts/SpanishSpain.lproj/Localizable.strings +M UI/Contacts/Swedish.lproj/Localizable.strings +M UI/Contacts/Ukrainian.lproj/Localizable.strings +M UI/Contacts/Welsh.lproj/Localizable.strings +M UI/MailerUI/Arabic.lproj/Localizable.strings +M UI/MailerUI/Basque.lproj/Localizable.strings +M UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MailerUI/Catalan.lproj/Localizable.strings +M UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MailerUI/Czech.lproj/Localizable.strings +M UI/MailerUI/Danish.lproj/Localizable.strings +M UI/MailerUI/Dutch.lproj/Localizable.strings +M UI/MailerUI/English.lproj/Localizable.strings +M UI/MailerUI/Finnish.lproj/Localizable.strings +M UI/MailerUI/French.lproj/Localizable.strings +M UI/MailerUI/German.lproj/Localizable.strings +M UI/MailerUI/Hungarian.lproj/Localizable.strings +M UI/MailerUI/Icelandic.lproj/Localizable.strings +M UI/MailerUI/Italian.lproj/Localizable.strings +M UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MailerUI/Polish.lproj/Localizable.strings +M UI/MailerUI/Russian.lproj/Localizable.strings +M UI/MailerUI/Slovak.lproj/Localizable.strings +M UI/MailerUI/Slovenian.lproj/Localizable.strings +M UI/MailerUI/SpanishArgentina.lproj/Localizable.strings +M UI/MailerUI/SpanishSpain.lproj/Localizable.strings +M UI/MailerUI/Swedish.lproj/Localizable.strings +M UI/MailerUI/Ukrainian.lproj/Localizable.strings +M UI/MailerUI/Welsh.lproj/Localizable.strings +M UI/MainUI/Arabic.lproj/Localizable.strings +M UI/MainUI/Basque.lproj/Localizable.strings +M UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MainUI/Catalan.lproj/Localizable.strings +M UI/MainUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MainUI/Czech.lproj/Localizable.strings +M UI/MainUI/Danish.lproj/Localizable.strings +M UI/MainUI/Dutch.lproj/Localizable.strings +M UI/MainUI/English.lproj/Localizable.strings +M UI/MainUI/Finnish.lproj/Localizable.strings +M UI/MainUI/French.lproj/Localizable.strings +M UI/MainUI/German.lproj/Localizable.strings +M UI/MainUI/Hungarian.lproj/Localizable.strings +M UI/MainUI/Icelandic.lproj/Localizable.strings +M UI/MainUI/Italian.lproj/Localizable.strings +M UI/MainUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MainUI/Polish.lproj/Localizable.strings +M UI/MainUI/Russian.lproj/Localizable.strings +M UI/MainUI/Slovak.lproj/Localizable.strings +M UI/MainUI/Slovenian.lproj/Localizable.strings +M UI/MainUI/SpanishArgentina.lproj/Localizable.strings +M UI/MainUI/SpanishSpain.lproj/Localizable.strings +M UI/MainUI/Swedish.lproj/Localizable.strings +M UI/MainUI/Ukrainian.lproj/Localizable.strings +M UI/MainUI/Welsh.lproj/Localizable.strings +M UI/PreferencesUI/Arabic.lproj/Localizable.strings +M UI/PreferencesUI/Basque.lproj/Localizable.strings +M UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/PreferencesUI/Catalan.lproj/Localizable.strings +M UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings +M UI/PreferencesUI/Czech.lproj/Localizable.strings +M UI/PreferencesUI/Danish.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/Finnish.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Icelandic.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/PreferencesUI/Polish.lproj/Localizable.strings +M UI/PreferencesUI/Russian.lproj/Localizable.strings +M UI/PreferencesUI/Slovak.lproj/Localizable.strings +M UI/PreferencesUI/Slovenian.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +M UI/PreferencesUI/Welsh.lproj/Localizable.strings +M UI/Scheduler/Arabic.lproj/Localizable.strings +M UI/Scheduler/Basque.lproj/Localizable.strings +M UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +M UI/Scheduler/Catalan.lproj/Localizable.strings +M UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings +M UI/Scheduler/Czech.lproj/Localizable.strings +M UI/Scheduler/Danish.lproj/Localizable.strings +M UI/Scheduler/Dutch.lproj/Localizable.strings +M UI/Scheduler/English.lproj/Localizable.strings +M UI/Scheduler/Finnish.lproj/Localizable.strings +M UI/Scheduler/French.lproj/Localizable.strings +M UI/Scheduler/German.lproj/Localizable.strings +M UI/Scheduler/Hungarian.lproj/Localizable.strings +M UI/Scheduler/Icelandic.lproj/Localizable.strings +M UI/Scheduler/Italian.lproj/Localizable.strings +M UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings +M UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings +M UI/Scheduler/Polish.lproj/Localizable.strings +M UI/Scheduler/Russian.lproj/Localizable.strings +M UI/Scheduler/Slovak.lproj/Localizable.strings +M UI/Scheduler/Slovenian.lproj/Localizable.strings +M UI/Scheduler/SpanishArgentina.lproj/Localizable.strings +M UI/Scheduler/SpanishSpain.lproj/Localizable.strings +M UI/Scheduler/Swedish.lproj/Localizable.strings +M UI/Scheduler/Ukrainian.lproj/Localizable.strings +M UI/Scheduler/Welsh.lproj/Localizable.strings +M UI/Templates/Appointments/SOGoAptMailReceipt.wox +A UI/Templates/ContactsUI/UIxContactEditorTemplate.wox +A UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox +M UI/Templates/ContactsUI/UIxListEditor.wox +M UI/Templates/MailerUI/UIxMailSearch.wox +M UI/Templates/MainUI/SOGoRootPage.wox +A UI/Templates/PreferencesUI/UIxAccountEditor.wox +M UI/Templates/PreferencesUI/UIxPreferences.wox +M UI/Templates/SchedulerUI/UIxAppointmentEditor.wox +A UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox +A UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox +M UI/Templates/SchedulerUI/UIxCalFilterPanel.wox +M UI/Templates/SchedulerUI/UIxCalMainView.wox +M UI/Templates/SchedulerUI/UIxCalViewPrint.wox +A UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox +M UI/Templates/SchedulerUI/UIxComponentEditor.wox +M UI/Templates/SchedulerUI/UIxTaskEditor.wox +A UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox +A UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox + +commit 490354427dd75681ee80f8595784575f592e218d +Author: Luc Charland +Date: Thu Jul 30 10:37:36 2015 -0400 + + fixed Appointments path + +M Scripts/verify_translations.py + +commit 22ce38808a412dd9a8d12b30dd95c97e86ea72e9 +Author: Luc Charland +Date: Thu Jul 30 10:26:43 2015 -0400 + + cleaned up a few comments + +M Scripts/verify_translations.py + +commit 82aca2cfe560dc9ea6cd7c24555aecd367742368 +Author: Luc Charland +Date: Thu Jul 30 10:07:18 2015 -0400 + + added first draft of verify_translation + +A Scripts/verify_translations.py + +commit b17488ff25cdd95b1aa6fb06ac389c39e4aae0d9 +Author: Ludovic Marcotte +Date: Mon Aug 3 09:18:20 2015 -0400 + + Updated NEWS file regarding PR93 + +M NEWS + +commit 26bd1b30fac3c168d0ea33b9c2464ebd9a363b08 +Author: Julio García +Date: Mon Aug 3 09:48:06 2015 +0200 + + Revert "Merge pull request #164 from Zentyal/jgarcia/revert-merge-inverse" + + This reverts commit 1404dbdb8818d950bb74aa2b7fbee49ace70f1f5, reversing + changes made to 72cbd9a45f2becdd3c840356b028e9aca4feb4ee. + +M ActiveSync/NSData+ActiveSync.m +M ActiveSync/NSString+ActiveSync.m +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M ActiveSync/SOGoActiveSyncDispatcher.m +M ActiveSync/SOGoMailObject+ActiveSync.m +M ActiveSync/iCalEvent+ActiveSync.m +M Documentation/SOGoInstallationGuide.asciidoc +M NEWS +A Scripts/sogo-systemd.conf +D Scripts/sql-update-2.1.17_to_2.3.0-mysql.sh +D Scripts/sql-update-2.1.17_to_2.3.0.sh +A Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh +A Scripts/sql-update-2.2.17_to_2.3.0.sh +M SoObjects/Appointments/SOGoAppointmentFolder.m +M SoObjects/Appointments/SOGoAppointmentObject.m +M SoObjects/Appointments/iCalAlarm+SOGo.h +M SoObjects/Appointments/iCalAlarm+SOGo.m +M SoObjects/Mailer/SOGoMailObject.m +M SoObjects/SOGo/NSString+Utilities.h +M SoObjects/SOGo/NSString+Utilities.m +M SoObjects/SOGo/SOGoDefaults.plist +M SoObjects/SOGo/SOGoDomainDefaults.h +M SoObjects/SOGo/SOGoDomainDefaults.m +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserDefaults.m +M SoObjects/SOGo/SOGoUserManager.m +M Tools/SOGoToolBackup.m +M Tools/SOGoToolRestore.h +M Tools/SOGoToolRestore.m +M Tools/sogo-tool.m +M UI/Contacts/UIxContactEditor.m +M UI/Contacts/UIxContactView.m +M UI/Contacts/UIxListEditor.m +M UI/MainUI/SOGoUserHomePage.m +M UI/PreferencesUI/UIxPreferences.h +M UI/PreferencesUI/UIxPreferences.m +M UI/SOGoUI/UIxComponent.m +M UI/Templates/ContactsUI/UIxContactFoldersView.wox +M UI/Templates/UIxJSClose.wox +M UI/WebServerResources/ContactsUI.js +M UI/WebServerResources/JavascriptAPIExtensions.js +M UI/WebServerResources/SchedulerUI.js +M packaging/rhel/sogo.spec + +commit 2aba083147bc9b89d93fac1185c536baa44fcc65 +Author: Enrique J. Hernández Blasco +Date: Thu Jul 30 10:07:55 2015 +0200 + + oc: Update ChangeNumber after setting folder properties + + As required by operations like SynchronizationImportHierarchyChanges + a new change number must be generated when a change in a folder + is set. This affects to subfolders. + + See [MS-OXCFXICS] Section 3.2.5.9.4.3 for details. + +M OpenChange/MAPIStoreFolder.m + +commit 9414df26c52fc9086233ff0110949dd6c1bf0116 +Author: Jesús García Sáez +Date: Wed Jul 29 16:35:20 2015 +0200 + + getUIDForEmail works on multidomain: returns login + + This method is used everywhere to try to retrieve the login of the user + (and normally use the return value to [SOGoUser initwithLogin: ...]) + + In multidomain environments (with DomainLessLogin = false) there were + several paths (mostly in SOGoAppointmentObject.m) that were trying to + create SOGoUser objects with incorrect login: using only the uid part, + not full email. Then like domain based uid was enabled, these users + had DomainLessLogin set to true and further calls tried to authenticate + only with the uid part (and they should not). + + This affects to several methods in: + + * ActiveSync/SOGoActiveSyncDispatcher.m + * Appointments/SOGoAppointmentFolder.m + * Appointments/SOGoAppointmentObject.m + * Appointments/SOGoCalendarComponent.m + * SOGoSAML2Session.m + + Probably a few features related with calendars are now fixed or working + as intended in multidomain environments where the email is used as login + +M SoObjects/SOGo/SOGoUserManager.m + +commit 3dc8cc78eaa5e60297405a5848ae4e269fdbcd14 +Author: Jesús García Sáez +Date: Tue Jul 28 12:37:33 2015 +0200 + + Revert merge from inverse + + https://github.com/Zentyal/sogo/pull/150 + + Because the login on web with the use of outlook is broken after + including the DomainLessLogin feature + +M ActiveSync/NSData+ActiveSync.m +M ActiveSync/NSString+ActiveSync.m +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M ActiveSync/SOGoActiveSyncDispatcher.m +M ActiveSync/SOGoMailObject+ActiveSync.m +M ActiveSync/iCalEvent+ActiveSync.m +M Documentation/SOGoInstallationGuide.asciidoc +M NEWS +D Scripts/sogo-systemd.conf +A Scripts/sql-update-2.1.17_to_2.3.0-mysql.sh +A Scripts/sql-update-2.1.17_to_2.3.0.sh +D Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh +D Scripts/sql-update-2.2.17_to_2.3.0.sh +M SoObjects/Appointments/SOGoAppointmentFolder.m +M SoObjects/Appointments/SOGoAppointmentObject.m +M SoObjects/Appointments/iCalAlarm+SOGo.h +M SoObjects/Appointments/iCalAlarm+SOGo.m +M SoObjects/Mailer/SOGoMailObject.m +M SoObjects/SOGo/NSString+Utilities.h +M SoObjects/SOGo/NSString+Utilities.m +M SoObjects/SOGo/SOGoDefaults.plist +M SoObjects/SOGo/SOGoDomainDefaults.h +M SoObjects/SOGo/SOGoDomainDefaults.m +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserDefaults.m +M SoObjects/SOGo/SOGoUserManager.m +M Tools/SOGoToolBackup.m +M Tools/SOGoToolRestore.h +M Tools/SOGoToolRestore.m +M Tools/sogo-tool.m +M UI/Contacts/UIxContactEditor.m +M UI/Contacts/UIxContactView.m +M UI/Contacts/UIxListEditor.m +M UI/MainUI/SOGoUserHomePage.m +M UI/PreferencesUI/UIxPreferences.h +M UI/PreferencesUI/UIxPreferences.m +M UI/SOGoUI/UIxComponent.m +M UI/Templates/ContactsUI/UIxContactFoldersView.wox +M UI/Templates/UIxJSClose.wox +M UI/WebServerResources/ContactsUI.js +M UI/WebServerResources/JavascriptAPIExtensions.js +M UI/WebServerResources/SchedulerUI.js +M packaging/rhel/sogo.spec + +commit 10ac445f7cc7c1b361fee583696e7a16d4e2a29b +Author: Enrique J. Hernández Blasco +Date: Mon Jul 27 11:18:14 2015 +0200 + + oc-mail: Fallback to PidTagSubject unicode when creating new mail + + Some clients such as OpenChange client does not send the following + properties PidTagNormalizedSubject or PidTagSubjectPrefix as + suggested by [MS-OXCMAIL]. + +M OpenChange/MAPIStoreMailVolatileMessage.m + +commit c5b5a4243db989149590ea223878dda00d5c6833 +Author: Enrique J. Hernández Blasco +Date: Sat Jul 25 09:56:21 2015 +0200 + + oc: Fix compilation warning in MAPIStoreContext + +M OpenChange/MAPIStoreContext.m + +commit 304ffa2099ce7cd07f92b7ae31ae9dda6930eaa9 +Author: Ludovic Marcotte +Date: Fri Jul 24 11:19:57 2015 -0400 + + (fix) SOGoMaximumMessageSubmissionCount should be independant from SOGoMaximumRecipientCount + +M UI/MailerUI/UIxMailEditor.m + +commit e4ad255fc21a874d453fb69768c8e2f6a71b238a +Author: Francis Lachapelle +Date: Thu Jul 23 14:09:27 2015 -0400 + + (fix) chmod 644 UI/MainUI/Slovenian.lproj/Locale + +M UI/MainUI/Slovenian.lproj/Locale + +commit 390a853471cae5cc61e4632dc9b8c59c1e13aad3 +Author: Francis Lachapelle +Date: Thu Jul 23 14:04:09 2015 -0400 + + (fix) Display of whitelisted attendees in Firefox + + Fixes #3285 + +M NEWS +M UI/WebServerResources/UIxPreferences.js + +commit dd9b5e18b6dbc2e21df89208390abb4d0a75c955 +Author: Ludovic Marcotte +Date: Thu Jul 23 11:51:36 2015 -0400 + + Updates for the release + +M ChangeLog +M Documentation/docinfo.xml +M Documentation/includes/global-attributes.asciidoc +M NEWS +M Version + +commit 5c017c19fc34acfa3c49559d3f0ffaf15b47c371 +Author: Francis Lachapelle +Date: Thu Jul 23 11:49:07 2015 -0400 + + Update Spanish (Argentina) translation + +M UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings +M UI/MailerUI/SpanishArgentina.lproj/Localizable.strings + +commit dec152e8e57ccec8b2177f4e9ffb345ec7081cf4 +Author: Francis Lachapelle +Date: Thu Jul 23 11:47:53 2015 -0400 + + Update CKEditor to version 4.5.1 + +M NEWS +M UI/WebServerResources/ckeditor/LICENSE.md +M UI/WebServerResources/ckeditor/build-config.js +M UI/WebServerResources/ckeditor/ckeditor.js +M UI/WebServerResources/ckeditor/contents.css +M UI/WebServerResources/ckeditor/lang/ar.js +M UI/WebServerResources/ckeditor/lang/ca.js +M UI/WebServerResources/ckeditor/lang/cs.js +M UI/WebServerResources/ckeditor/lang/cy.js +M UI/WebServerResources/ckeditor/lang/da.js +M UI/WebServerResources/ckeditor/lang/de.js +M UI/WebServerResources/ckeditor/lang/en.js +M UI/WebServerResources/ckeditor/lang/es.js +A UI/WebServerResources/ckeditor/lang/eu.js +M UI/WebServerResources/ckeditor/lang/fi.js +M UI/WebServerResources/ckeditor/lang/fr.js +M UI/WebServerResources/ckeditor/lang/hu.js +M UI/WebServerResources/ckeditor/lang/is.js +M UI/WebServerResources/ckeditor/lang/it.js +M UI/WebServerResources/ckeditor/lang/nb.js +M UI/WebServerResources/ckeditor/lang/nl.js +M UI/WebServerResources/ckeditor/lang/no.js +M UI/WebServerResources/ckeditor/lang/pl.js +M UI/WebServerResources/ckeditor/lang/pt-br.js +M UI/WebServerResources/ckeditor/lang/ru.js +M UI/WebServerResources/ckeditor/lang/sk.js +A UI/WebServerResources/ckeditor/lang/sl.js +M UI/WebServerResources/ckeditor/lang/sv.js +M UI/WebServerResources/ckeditor/lang/uk.js +A UI/WebServerResources/ckeditor/lang/zh.js +M UI/WebServerResources/ckeditor/plugins/about/dialogs/about.js +M UI/WebServerResources/ckeditor/plugins/clipboard/dialogs/paste.js +M UI/WebServerResources/ckeditor/plugins/colordialog/dialogs/colordialog.js +M UI/WebServerResources/ckeditor/plugins/dialog/dialogDefinition.js +M UI/WebServerResources/ckeditor/plugins/div/dialogs/div.js +M UI/WebServerResources/ckeditor/plugins/icons.png +M UI/WebServerResources/ckeditor/plugins/icons_hidpi.png +M UI/WebServerResources/ckeditor/plugins/image/dialogs/image.js +M UI/WebServerResources/ckeditor/plugins/link/dialogs/anchor.js +M UI/WebServerResources/ckeditor/plugins/link/dialogs/link.js +M UI/WebServerResources/ckeditor/plugins/table/dialogs/table.js +M UI/WebServerResources/ckeditor/plugins/tabletools/dialogs/tableCell.js +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/ciframe.html +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.css +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js +M UI/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc_ie.js +M UI/WebServerResources/ckeditor/skins/moono/dialog.css +M UI/WebServerResources/ckeditor/skins/moono/dialog_ie.css +M UI/WebServerResources/ckeditor/skins/moono/dialog_ie7.css +M UI/WebServerResources/ckeditor/skins/moono/dialog_ie8.css +M UI/WebServerResources/ckeditor/skins/moono/dialog_iequirks.css +M UI/WebServerResources/ckeditor/skins/moono/editor.css +M UI/WebServerResources/ckeditor/skins/moono/editor_gecko.css +M UI/WebServerResources/ckeditor/skins/moono/editor_ie.css +M UI/WebServerResources/ckeditor/skins/moono/editor_ie7.css +M UI/WebServerResources/ckeditor/skins/moono/editor_ie8.css +M UI/WebServerResources/ckeditor/skins/moono/editor_iequirks.css +M UI/WebServerResources/ckeditor/skins/moono/icons.png +M UI/WebServerResources/ckeditor/skins/moono/icons_hidpi.png +A UI/WebServerResources/ckeditor/skins/moono/images/spinner.gif +M UI/WebServerResources/ckeditor/skins/moono/readme.md +M UI/WebServerResources/ckeditor/styles.js + +commit 4922e6004d52ae0ccf99ac4f141d6d6f6db41cbe +Author: Francis Lachapelle +Date: Thu Jul 23 11:13:26 2015 -0400 + + Add missing templates for Basque language + +A UI/Templates/SOGoACLBasqueAdditionAdvisory.wox +A UI/Templates/SOGoACLBasqueModificationAdvisory.wox +A UI/Templates/SOGoACLBasqueRemovalAdvisory.wox +A UI/Templates/SOGoFolderBasqueAdditionAdvisory.wox +A UI/Templates/SOGoFolderBasqueRemovalAdvisory.wox + +commit b91972d1dc178a66144d371f121e211d46b2f1a3 +Author: Francis Lachapelle +Date: Thu Jul 23 11:12:16 2015 -0400 + + Add missing template for Slovenian language + +A UI/Templates/SOGoACLSolvenianModificationAdvisory.wox + +commit 5c3cdda186dff8c39fb3a13de4b51d79efc23cc3 +Author: Francis Lachapelle +Date: Thu Jul 23 11:09:04 2015 -0400 + + Add Chinese (Taiwan) translation + +M .tx/config +M NEWS +A SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Appointments/GNUmakefile +A SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Contacts/GNUmakefile +A SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings +M SoObjects/Mailer/GNUmakefile +A SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html +A SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod +A SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.html +A SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.wod +M SoObjects/Mailer/SOGoMailForward.h +M SoObjects/Mailer/SOGoMailForward.m +M SoObjects/Mailer/SOGoMailReply.h +M SoObjects/Mailer/SOGoMailReply.m +M SoObjects/SOGo/SOGoDefaults.plist +M Tests/Integration/preferences.py +A UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings +M UI/AdministrationUI/GNUmakefile +A UI/Common/ChineseTaiwan.lproj/Localizable.strings +M UI/Common/GNUmakefile +A UI/Contacts/ChineseTaiwan.lproj/Localizable.strings +M UI/Contacts/GNUmakefile +A UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings +M UI/MailPartViewers/GNUmakefile +A UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MailerUI/GNUmakefile +M UI/MainUI/Arabic.lproj/Localizable.strings +M UI/MainUI/Basque.lproj/Localizable.strings +M UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MainUI/Catalan.lproj/Localizable.strings +A UI/MainUI/ChineseTaiwan.lproj/Locale +A UI/MainUI/ChineseTaiwan.lproj/Localizable.strings +M UI/MainUI/Czech.lproj/Localizable.strings +M UI/MainUI/Danish.lproj/Localizable.strings +M UI/MainUI/Dutch.lproj/Localizable.strings +M UI/MainUI/English.lproj/Localizable.strings +M UI/MainUI/Finnish.lproj/Localizable.strings +M UI/MainUI/French.lproj/Localizable.strings +M UI/MainUI/GNUmakefile +M UI/MainUI/German.lproj/Localizable.strings +M UI/MainUI/Hungarian.lproj/Localizable.strings +M UI/MainUI/Icelandic.lproj/Localizable.strings +M UI/MainUI/Italian.lproj/Localizable.strings +M UI/MainUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MainUI/Polish.lproj/Localizable.strings +M UI/MainUI/Russian.lproj/Localizable.strings +M UI/MainUI/Slovenian.lproj/Localizable.strings +M UI/MainUI/SpanishArgentina.lproj/Localizable.strings +M UI/MainUI/SpanishSpain.lproj/Localizable.strings +M UI/MainUI/Swedish.lproj/Localizable.strings +M UI/MainUI/Ukrainian.lproj/Localizable.strings +M UI/MainUI/Welsh.lproj/Localizable.strings +M UI/PreferencesUI/Arabic.lproj/Localizable.strings +M UI/PreferencesUI/Basque.lproj/Localizable.strings +M UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/PreferencesUI/Catalan.lproj/Localizable.strings +A UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings +M UI/PreferencesUI/Czech.lproj/Localizable.strings +M UI/PreferencesUI/Danish.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/Finnish.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings +M UI/PreferencesUI/GNUmakefile +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Hungarian.lproj/Localizable.strings +M UI/PreferencesUI/Icelandic.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/PreferencesUI/Polish.lproj/Localizable.strings +M UI/PreferencesUI/Russian.lproj/Localizable.strings +M UI/PreferencesUI/Slovak.lproj/Localizable.strings +M UI/PreferencesUI/Slovenian.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +M UI/PreferencesUI/Welsh.lproj/Localizable.strings +A UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings +M UI/Scheduler/GNUmakefile +A UI/Templates/SOGoACLChineseTaiwanAdditionAdvisory.wox +A UI/Templates/SOGoACLChineseTaiwanModificationAdvisory.wox +A UI/Templates/SOGoACLChineseTaiwanRemovalAdvisory.wox +A UI/Templates/SOGoFolderChineseTaiwanAdditionAdvisory.wox +A UI/Templates/SOGoFolderChineseTaiwanRemovalAdvisory.wox + +commit 4b19e64071a3c8173a63714c633e9a94b76fd7e5 +Author: Ludovic Marcotte +Date: Thu Jul 23 10:22:36 2015 -0400 + + (fix) fallback to utf-8/latin1 in rare decoding error cases - this is ugly + +M UI/MailPartViewers/UIxMailPartHTMLViewer.m + +commit b6dee056ca98131fb36abff11cf0850e7b8de921 +Author: Francis Lachapelle +Date: Thu Jul 23 08:46:08 2015 -0400 + + (fix) Return value of [iCalPerson+SOGo uidInDomain:] + +M SoObjects/Appointments/iCalPerson+SOGo.m + +commit 6830d6d930b1b07e1732e7108b11f78ce4e40f7c +Author: Francis Lachapelle +Date: Wed Jul 22 16:45:42 2015 -0400 + + Calendar module optimizations in multidomain setup + +M NEWS +M SoObjects/Appointments/SOGoAppointmentObject.m +M SoObjects/Appointments/iCalEntityObject+SOGo.m +M SoObjects/Appointments/iCalPerson+SOGo.h +M SoObjects/Appointments/iCalPerson+SOGo.m +M UI/Common/UIxAclEditor.m +M UI/Common/UIxUserRightsEditor.m +M UI/MailPartViewers/UIxMailPartICalActions.m +M UI/Scheduler/UIxAppointmentEditor.m + +commit 366ad44cd168b0e81f842a1edf65ca1e0e27f061 +Author: Francis Lachapelle +Date: Wed Jul 22 16:42:06 2015 -0400 + + Fix .wod files for English and Basque + +M SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.wod +M SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod + +commit 9430f40101036134eb9386f87472abe2727ae323 +Author: Francis Lachapelle +Date: Wed Jul 22 16:41:37 2015 -0400 + + Add Slovenian translation + +M .tx/config +M NEWS +M SoObjects/Appointments/GNUmakefile +A SoObjects/Appointments/Slovenian.lproj/Localizable.strings +M SoObjects/Contacts/GNUmakefile +A SoObjects/Contacts/Slovenian.lproj/Localizable.strings +M SoObjects/Mailer/GNUmakefile +M SoObjects/Mailer/SOGoMailForward.h +M SoObjects/Mailer/SOGoMailForward.m +M SoObjects/Mailer/SOGoMailReply.h +M SoObjects/Mailer/SOGoMailReply.m +A SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.html +A SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.wod +A SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.html +A SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.wod +A SoObjects/Mailer/Slovenian.lproj/Localizable.strings +M SoObjects/SOGo/SOGoDefaults.plist +M Tests/Integration/preferences.py +M UI/AdministrationUI/GNUmakefile +A UI/AdministrationUI/Slovenian.lproj/Localizable.strings +M UI/Common/GNUmakefile +A UI/Common/Slovenian.lproj/Localizable.strings +M UI/Contacts/GNUmakefile +A UI/Contacts/Slovenian.lproj/Localizable.strings +M UI/MailPartViewers/GNUmakefile +A UI/MailPartViewers/Slovenian.lproj/Localizable.strings +M UI/MailerUI/GNUmakefile +A UI/MailerUI/Slovenian.lproj/Localizable.strings +M UI/MainUI/Arabic.lproj/Localizable.strings +M UI/MainUI/Basque.lproj/Localizable.strings +M UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +M UI/MainUI/Catalan.lproj/Localizable.strings +M UI/MainUI/Czech.lproj/Localizable.strings +M UI/MainUI/Danish.lproj/Localizable.strings +M UI/MainUI/Dutch.lproj/Localizable.strings +M UI/MainUI/English.lproj/Localizable.strings +M UI/MainUI/Finnish.lproj/Localizable.strings +M UI/MainUI/French.lproj/Localizable.strings +M UI/MainUI/GNUmakefile +M UI/MainUI/German.lproj/Localizable.strings +M UI/MainUI/Hungarian.lproj/Localizable.strings +M UI/MainUI/Icelandic.lproj/Localizable.strings +M UI/MainUI/Italian.lproj/Localizable.strings +M UI/MainUI/NorwegianBokmal.lproj/Localizable.strings +M UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/MainUI/Polish.lproj/Localizable.strings +M UI/MainUI/Russian.lproj/Localizable.strings +M UI/MainUI/Slovak.lproj/Localizable.strings +A UI/MainUI/Slovenian.lproj/Locale +A UI/MainUI/Slovenian.lproj/Localizable.strings +M UI/MainUI/SpanishArgentina.lproj/Localizable.strings +M UI/MainUI/SpanishSpain.lproj/Localizable.strings +M UI/MainUI/Swedish.lproj/Localizable.strings +M UI/MainUI/Ukrainian.lproj/Localizable.strings +M UI/MainUI/Welsh.lproj/Localizable.strings +M UI/PreferencesUI/Arabic.lproj/Localizable.strings +M UI/PreferencesUI/Basque.lproj/Localizable.strings +M UI/PreferencesUI/Catalan.lproj/Localizable.strings +M UI/PreferencesUI/Czech.lproj/Localizable.strings +M UI/PreferencesUI/Dutch.lproj/Localizable.strings +M UI/PreferencesUI/English.lproj/Localizable.strings +M UI/PreferencesUI/Finnish.lproj/Localizable.strings +M UI/PreferencesUI/French.lproj/Localizable.strings +M UI/PreferencesUI/GNUmakefile +M UI/PreferencesUI/German.lproj/Localizable.strings +M UI/PreferencesUI/Icelandic.lproj/Localizable.strings +M UI/PreferencesUI/Italian.lproj/Localizable.strings +M UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +M UI/PreferencesUI/Russian.lproj/Localizable.strings +M UI/PreferencesUI/Slovak.lproj/Localizable.strings +A UI/PreferencesUI/Slovenian.lproj/Localizable.strings +M UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +M UI/PreferencesUI/Swedish.lproj/Localizable.strings +M UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +M UI/PreferencesUI/Welsh.lproj/Localizable.strings +M UI/Scheduler/GNUmakefile +A UI/Scheduler/Slovenian.lproj/Localizable.strings +A UI/Templates/SOGoACLSlovenianAdditionAdvisory.wox +A UI/Templates/SOGoACLSlovenianRemovalAdvisory.wox +A UI/Templates/SOGoFolderSlovenianAdditionAdvisory.wox +A UI/Templates/SOGoFolderSlovenianRemovalAdvisory.wox + +commit b7c2d8ae9509033a0cd13838324964193f9b11bf +Author: Ludovic Marcotte +Date: Wed Jul 22 14:49:09 2015 -0400 + + (fix) we now respect the cr/lf in event's description (#3228) + +M NEWS +M UI/WebServerResources/UIxCalViewPrint.js + +commit f03e7a66043342880ce8f8b019893a6a636694b2 +Author: Ludovic Marcotte +Date: Wed Jul 22 11:54:50 2015 -0400 + + (doc) ModuleConstraints for EAS + +M Documentation/SOGoInstallationGuide.asciidoc + +commit 4e7a3ce5fac99efd712168986016295e8e47629a +Author: Ludovic Marcotte +Date: Wed Jul 22 10:26:09 2015 -0400 + + (fix) fixed EAS conversation ID issues on BB10 (#3152) + +M ActiveSync/SOGoActiveSyncDispatcher.m +M ActiveSync/SOGoMailObject+ActiveSync.m +M NEWS + +commit 61c542cb959611e90b25565cbc20006ad76215a4 +Author: Ludovic Marcotte +Date: Wed Jul 22 10:12:47 2015 -0400 + + (fix) make sure ActiveSync is always usable with SQL-based auth sources + +M SoObjects/SOGo/SQLSource.m + +commit d2640e1501708fcf38f8887e26b14378aae73690 +Author: Ludovic Marcotte +Date: Wed Jul 22 09:59:36 2015 -0400 + + (fix) fixed computation of GlobalObjectId (#3235) + +M ActiveSync/SOGoMailObject+ActiveSync.m +M NEWS + +commit 20b91cc7bff3f5cafe0b77a7b3612332285f356f +Author: Ludovic Marcotte +Date: Wed Jul 22 09:46:06 2015 -0400 + + (fix) improved EAS email flagging handling (#3140) + +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M NEWS + +commit b05f7a5bebffd414a51c45b1776ff3f53b7d5f7a +Author: Ludovic Marcotte +Date: Wed Jul 22 09:25:29 2015 -0400 + + (fix) compilation warning + +M ActiveSync/SOGoActiveSyncDispatcher.m + +commit 3a61b7bae49dc750ab20001dbe9ce12de654d382 +Author: Ludovic Marcotte +Date: Wed Jul 22 09:15:34 2015 -0400 + + Android EAS Lollipop fixes (#3268 and #3269) + +M ActiveSync/SOGoActiveSyncDispatcher.m +M NEWS + +commit 7bde181d3f7d83895fbb727632fa8300300e5c51 +Author: Jesús García Sáez +Date: Tue Jul 21 19:45:03 2015 +0200 + + oc: check ret value get_new_folderID + + On [MAPIStoreContext idForObjectWithKey: key inFolderUrl: url] check the ret value + of mapistore_indexing_get_new_folderID. This should never happen (oh my...) but + if this happens it will be reported + +M OpenChange/MAPIStoreContext.m + +commit 1336a1d5a8c2751d88ba9fad17e2652494daa810 +Author: Jesús García Sáez +Date: Fri Apr 17 13:55:39 2015 +0200 + + oc: remove useless mapistore_indexing call + + [mapping registerURL ...] will insert the mappingId in indexing database + there is no need to call, again, mapistore_indexing_record_add_mid + +M OpenChange/MAPIStoreContext.m + +commit c9f2fe2f85ace90dca4065fc2f240962b83b201b +Author: Jesús García Sáez +Date: Tue Jul 14 17:44:17 2015 +0200 + + oc-folder: user context activation on rootFolders + + Several fixes related with userContext activation + +M OpenChange/MAPIStoreUserContext.m + +commit 10bc15d41d8a29e9c515f7b12145673cd7e39259 +Author: Jesús García Sáez +Date: Tue Jul 14 17:41:33 2015 +0200 + + oc-folder: activate user context when needed + + Before creating sogo objects + +M OpenChange/MAPIStoreContactsFolder.m +M OpenChange/MAPIStoreDBFolder.m +M OpenChange/MAPIStoreFolder.m +M OpenChange/MAPIStoreMailFolder.m +M OpenChange/MAPIStoreTasksFolder.m + +commit 393b6d51280b687a5283112b7a3305d8afa87265 +Author: Jesús García Sáez +Date: Tue Jul 14 17:19:55 2015 +0200 + + oc-folder: simplify lookupFolder method + + use activate and no need to set wocontext, it's already set properly + +M OpenChange/MAPIStoreFolder.m + +commit 68ae978b1392cfa5c77d67c14fb34b818beb68e4 +Author: Jesús García Sáez +Date: Tue Jul 14 17:17:51 2015 +0200 + + oc-mail: activate user context needed + + Before creating new sogo objects + +M OpenChange/MAPIStoreCalendarMessage.m +M OpenChange/MAPIStoreMailMessage.m +M OpenChange/MAPIStoreMailVolatileMessage.m + +commit f4e3b9804256339adef761d2490db7f02ee59727 +Author: Jesús García Sáez +Date: Tue Jul 14 17:08:39 2015 +0200 + + Nothing changed: format and hoarding code removed + +M OpenChange/MAPIStoreContext.m + +commit cfab18e1b845bf24ac896014bce4d61a46f44fde +Author: Jesús García Sáez +Date: Tue Jul 14 16:47:38 2015 +0200 + + oc: activate user context on initialization + +M OpenChange/MAPIStoreContext.m +M OpenChange/MAPIStoreGCSBaseContext.m +M OpenChange/MAPIStoreMailContext.m +M OpenChange/MAPIStoreUserContext.m + +commit 959b4e015da7531bb09ee90e07964de87114c91e +Author: Javier Amor García +Date: Mon Jul 20 14:56:29 2015 +0200 + + [SOgoMailFolder displayName] decodes IMAP4 + +M OpenChange/MAPIStoreMailFolder.m +M SoObjects/Mailer/SOGoMailFolder.m + +commit 7c6c78d13b890a086eb1a9bef92f947f4aaa073a +Author: Ludovic Marcotte +Date: Sun Jul 19 13:37:08 2015 -0400 + + Updated NEWS file regarding PR from Zentyal folks + +M NEWS + +commit 2ce85f6c5c17214019041ddd9f5713acdebdc5e1 +Author: Javier Amor García +Date: Fri Jul 17 15:46:33 2015 +0200 + + oc-mail: Added [MAPIStoreFolder getPidTagDisplayName:inMemCtx:] + + This getter is necessary to decode folder names + in utf7 encoding. + +M OpenChange/MAPIStoreMailFolder.m + +commit 7d2f96e96b2b5b242be021d8d2e6ce5fc8e38d5c +Author: Jesús García Sáez +Date: Tue Jul 14 16:31:28 2015 +0200 + + oc: use activate instead of activateWithUser + + 100% of the times the user is the one that MAPIStoreUserContext + already has, so no need to have it as an argument. + +M OpenChange/MAPIStoreCalendarFolder.m +M OpenChange/MAPIStoreCalendarMessage.m +M OpenChange/MAPIStoreContext.m +M OpenChange/MAPIStoreGCSBaseContext.m +M OpenChange/MAPIStoreMailContext.m +M OpenChange/MAPIStoreMailFolder.m + +commit 3bf7afdfb7b39b4062d181cde5f71b0e1d8d58f5 +Author: Jesús García Sáez +Date: Tue Jul 14 16:30:51 2015 +0200 + + oc: remove and disable userContext after each call + + This adds [MAPIStoreUserContext activate] method to use + it instead of activateWithUser. + + A cleanup operation is executed after each public function + so there won't be any conflicts with future calls. + + In practice, this will deactivate the current user context set on + MAPIApp, this means two things: (1) set nil as current user context + on MAPIApp and (2) remove woContext from current thread dictionary + +M OpenChange/MAPIApplication.h +M OpenChange/MAPIApplication.m +M OpenChange/MAPIStoreSOGo.m +M OpenChange/MAPIStoreUserContext.h +M OpenChange/MAPIStoreUserContext.m + +commit 503a70118f431dd0aa0d4ef733d36edaad8aeed0 +Author: Jesús García Sáez +Date: Tue Jul 14 13:15:01 2015 +0200 + + oc: remove tabs and unused code + +M OpenChange/MAPIStoreSOGo.m + +commit 928b6b596e7b5929f1b0c1d065827e73c557ed95 +Author: Jesús García Sáez +Date: Tue Jul 14 13:09:09 2015 +0200 + + oc: OC_DEBUG inside macros + + These macros are used before and after every performed + operation + +M OpenChange/MAPIStoreSOGo.m + +commit 936c38c43e8c39fa5ad2e00c66456493e2a4f032 +Author: Julio García +Date: Tue Jul 7 14:25:17 2015 +0200 + + Remove not needed block in SoObjects/SOGo/SOGoUserManager.m + +M SoObjects/SOGo/SOGoUserManager.m + +commit 62b16f4ef35202cbaf37a43f54e589bd051f902d +Author: Enrique J. Hernández Blasco +Date: Mon Jun 29 23:50:55 2015 +0200 + + oc: Check PidTagObjectType before dereferencing on ModifyRecipients + + This is crashing when the PidTagObjectType property is set for + some recipient and not for others. + + If the property is missing, then no object type for the recipient + is assumed. + +M OpenChange/MAPIStoreMessage.m + +commit b86b1afdb9a838cb4e13c99f44849652927058ec +Author: Ludovic Marcotte +Date: Mon Jun 29 13:49:41 2015 -0400 + + Fix for dfecce738187a57da17e4792d0daa5cc3fc147d2 + +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m + +commit dc2cc14d25857200aae9ac583532255e9ee031eb +Author: Julio García +Date: Fri Jun 26 09:35:47 2015 +0200 + + Revert "Revert "(fix) more fixes and clarifications on the mutli-domain settings"" + + This reverts commit 3dd8bddc0e0e5f8cab3507e36e37f643ea70bea6. + +M Documentation/SOGoInstallationGuide.asciidoc +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserManager.m + +commit 3f1a43cc13b223d94a987bbe2a7d00f2f3a7a2c4 +Author: Julio García +Date: Fri Jun 26 09:35:37 2015 +0200 + + Revert "Revert "(fix) more multi-domain fixes and cleanups"" + + This reverts commit 90e11d76f61dd8855f7c6ddb267feb39bf26bc52. + +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserManager.m + +commit 67d0d9586986337d5e73769df5e5484d47d6e182 +Author: Julio García +Date: Fri Jun 26 09:35:26 2015 +0200 + + Revert "Revert "Fixed mess regarding uid/realUID"" + + This reverts commit 96d88de564f36e45bf9d82258c1378b881532b7f. + +M SoObjects/SOGo/SOGoUser.m + +commit d16bf7c1a793396534fa6824dec5b0cf51395350 +Author: Francis Lachapelle +Date: Wed Jun 24 07:48:01 2015 -0400 + + (fix) Tasks list display in Calendar module + + Fixes #3267 + +M NEWS +M UI/WebServerResources/SchedulerUI.js + +commit b5270999070251be966fd226bf38b8f595982944 +Author: Francis Lachapelle +Date: Tue Jun 23 09:23:29 2015 -0400 + + (fix) Events list display in Calendar module + + Fixes #3261 + +M NEWS +M UI/WebServerResources/SchedulerUI.js + +commit 72aab7f83f03468a412c9f933059394829a45fa5 +Author: Javier Amor García +Date: Thu Jun 18 18:19:02 2015 +0200 + + ActiveSync: can be controlled by module constraint + + Added 'ActiveSync' module constraint. If constraint is not + honored the ActiveSync request returns a forbidden (403). + +M ActiveSync/SOGoActiveSyncDispatcher.m +M SoObjects/SOGo/LDAPSource.m +M SoObjects/SOGo/SOGoUserManager.m + +commit dfecce738187a57da17e4792d0daa5cc3fc147d2 +Author: Ludovic Marcotte +Date: Mon Jun 22 09:19:54 2015 -0400 + + (feat) added support for DeletesAsMoves over EAS + +M ActiveSync/SOGoActiveSyncDispatcher+Sync.m +M NEWS + +commit 82798ccb99b66c1a9d7da80e83c4fd40db63cb5c +Author: Francis Lachapelle +Date: Fri Jun 19 22:08:08 2015 -0400 + + Change signature of [iCalAlarm alarmForEvent:..] + + The first argument doesn't have to be a iCalRepeatableEntity; a simple + iCalEntity is enough. + +M SoObjects/Appointments/iCalAlarm+SOGo.h +M SoObjects/Appointments/iCalAlarm+SOGo.m + +commit 3809c002ede0c7aebe1cc0b846362418b87b2a48 +Author: Ludovic Marcotte +Date: Wed Jun 17 15:57:16 2015 -0400 + + Revert "(fix) ensure calendar objects have a (fake) filename" + + This reverts commit a145fdbb5366703c8eb564430a3d1ec8953e3275. + +M SoObjects/Mailer/SOGoMailObject.m + +commit d9b4abc2f1f6f959432f4501d0937a7019c123f2 +Author: Ludovic Marcotte +Date: Wed Jun 17 08:46:09 2015 -0400 + + (fix) improved memory usage + +M ActiveSync/NSString+ActiveSync.m + +commit 5ad36626406e55e82867351c9775a357748e2b28 +Author: Ludovic Marcotte +Date: Thu Jun 11 13:32:57 2015 -0400 + + (fix) fixed multi-domain support for sogo-tool backup/restore (#2600) + +M NEWS +M SoObjects/SOGo/SOGoUserManager.m +M Tools/SOGoToolBackup.m +M Tools/SOGoToolRestore.m +M Tools/sogo-tool.m + +commit 667e38ff0c42e6ed30f706ac3f25b2eea162e70a +Author: Francis Lachapelle +Date: Thu Jun 11 13:14:19 2015 -0400 + + (fix) Escaping of unexpected characters in emails + + Properly encode characters in DOM attributes. + + Fixes #3241 + +M UI/Contacts/UIxContactView.m + +commit 76196bf6f4f460fb93b7a791e2f58a6fb20c33f4 +Author: Francis Lachapelle +Date: Thu Jun 11 12:03:11 2015 -0400 + + (fix) Handling of cards with unexpected UID + + Fixes #3239 + Fixes #3245 + +M NEWS +M UI/Templates/ContactsUI/UIxContactFoldersView.wox +M UI/WebServerResources/ContactsUI.js + +commit 5435c2dd04cdc718952b08d4f8c1fdea21f5707b +Author: Francis Lachapelle +Date: Thu Jun 11 11:45:24 2015 -0400 + + (js) New method String.prototype.fromCSSIdentifier + +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit a70ea385722f364c01aa227351480d31684e040a +Author: Francis Lachapelle +Date: Thu Jun 11 11:44:17 2015 -0400 + + New method [NSString+Utilities asSafeJSString] + +M SoObjects/SOGo/NSString+Utilities.h +M SoObjects/SOGo/NSString+Utilities.m + +commit 5e66e8e299a08275be0ce517031f815169057aa9 +Author: Ludovic Marcotte +Date: Thu Jun 11 11:36:03 2015 -0400 + + (fix) improvement over previous commit to avoid double-bind + +M SoObjects/SOGo/SOGoUserManager.m + +commit 44af47f69e6dbaecd23adf250de8d149be9abb6a +Author: Ludovic Marcotte +Date: Wed Jun 10 20:09:40 2015 -0400 + + (fix) avoid method clash from categories that would lead to unexpected behaviors + +M ActiveSync/NSString+ActiveSync.m + +commit 54224637b685a913feb451be61dadddcb9242355 +Author: Ludovic Marcotte +Date: Wed Jun 10 20:06:00 2015 -0400 + + Revert "Revert "(fix) JavaScript syntax error in 'asCSSIdentifier'"" + + This reverts commit 662d06d24a5c8c5e364246359be500b5cc33db2c. + +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit d9896192f30d4f350c4678036f69da5698109b76 +Author: Ludovic Marcotte +Date: Wed Jun 10 20:05:40 2015 -0400 + + Revert "Revert "Improve creation of CSS identifier"" + + This reverts commit 7d018221ef753942711826b534f23f8e3bf7447e. + +M SoObjects/SOGo/NSString+Utilities.m +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit 85ad849189d1372459da5c5015eb0fae9f53cb77 +Author: Ludovic Marcotte +Date: Wed Jun 10 20:05:13 2015 -0400 + + Revert "Revert "Improved rationale"" + + This reverts commit 6994c029b8d1fe53840aedd3916c775f66465ebe. + +M SoObjects/SOGo/SOGoUserManager.m + +commit 2c5f598a23dbab988535812eb37f90a87101eb65 +Author: Ludovic Marcotte +Date: Wed Jun 10 20:04:51 2015 -0400 + + Revert "Revert "(fix) fixed multidomain issue where UID isn't part of the email address"" + + This reverts commit ac30c821658316e8daf35386b1ea0fed9a116234. + +M SoObjects/SOGo/SOGoUserManager.m + +commit ac30c821658316e8daf35386b1ea0fed9a116234 +Author: Ludovic Marcotte +Date: Wed Jun 10 19:11:26 2015 -0400 + + Revert "(fix) fixed multidomain issue where UID isn't part of the email address" + + This reverts commit 1f83ba9d507d9d1fca78f2d221aefe68a9e35cdf. + +M SoObjects/SOGo/SOGoUserManager.m + +commit 6994c029b8d1fe53840aedd3916c775f66465ebe +Author: Ludovic Marcotte +Date: Wed Jun 10 19:11:04 2015 -0400 + + Revert "Improved rationale" + + This reverts commit 977406de765f78d34f390da9319d2371f3a22632. + +M SoObjects/SOGo/SOGoUserManager.m + +commit 977406de765f78d34f390da9319d2371f3a22632 +Author: Ludovic Marcotte +Date: Wed Jun 10 16:31:30 2015 -0400 + + Improved rationale + +M SoObjects/SOGo/SOGoUserManager.m + +commit 7d018221ef753942711826b534f23f8e3bf7447e +Author: Ludovic Marcotte +Date: Wed Jun 10 16:31:15 2015 -0400 + + Revert "Improve creation of CSS identifier" + + This reverts commit e40a19cf8990136e55ba728b4626ca1877e064be. + +M SoObjects/SOGo/NSString+Utilities.m +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit 662d06d24a5c8c5e364246359be500b5cc33db2c +Author: Ludovic Marcotte +Date: Wed Jun 10 16:30:56 2015 -0400 + + Revert "(fix) JavaScript syntax error in 'asCSSIdentifier'" + + This reverts commit 9897cee77981274f86e68397eb231dee24b2b7ac. + +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit 9897cee77981274f86e68397eb231dee24b2b7ac +Author: Francis Lachapelle +Date: Wed Jun 10 15:43:00 2015 -0400 + + (fix) JavaScript syntax error in 'asCSSIdentifier' + +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit 1f83ba9d507d9d1fca78f2d221aefe68a9e35cdf +Author: Ludovic Marcotte +Date: Wed Jun 10 14:31:32 2015 -0400 + + (fix) fixed multidomain issue where UID isn't part of the email address + +M SoObjects/SOGo/SOGoUserManager.m + +commit e40a19cf8990136e55ba728b4626ca1877e064be +Author: Francis Lachapelle +Date: Wed Jun 10 14:00:29 2015 -0400 + + Improve creation of CSS identifier + + Now escaping (), [], {}, ", and ; + +M SoObjects/SOGo/NSString+Utilities.m +M UI/WebServerResources/JavascriptAPIExtensions.js + +commit 6bc471ad9a4dc35ec0789dd8efb73a6de5a6ea3f +Author: Ludovic Marcotte +Date: Wed Jun 10 10:58:59 2015 -0400 + + (fix) properly support big characters in EAS and fix encoding QP EAS error for Outlook (#3082) + +M ActiveSync/NSString+ActiveSync.m +M ActiveSync/SOGoMailObject+ActiveSync.m +M NEWS + +commit b1453e1d7e4dc180d33b782eee21f4a374b46938 +Author: Ludovic Marcotte +Date: Wed Jun 10 10:47:30 2015 -0400 + + (fix) fixed potential organizer highjacking when using EAS (#3131) + +M ActiveSync/iCalEvent+ActiveSync.m +M NEWS + +commit 88cab67f6d68c037be10bd02a31bd731af39907b +Author: Ludovic Marcotte +Date: Wed Jun 10 10:12:15 2015 -0400 + + (fix) properly escape folder after creation using EAS (#3237) + +M ActiveSync/SOGoActiveSyncDispatcher.m +M NEWS + +commit e1ecf797f5274b3a95ae6f55f68b5f72e137bb93 +Author: Francis Lachapelle +Date: Wed Jun 10 09:08:10 2015 -0400 + + Use double-quotes for setTimeout of UIxJSClose.wox + +M UI/Contacts/UIxContactEditor.m +M UI/Contacts/UIxListEditor.m +M UI/SOGoUI/UIxComponent.m +M UI/Templates/UIxJSClose.wox + +commit a56dbeb6a9e06777e4117e97a0e71b23a1558cc6 +Author: Ludovic Marcotte +Date: Tue Jun 9 20:30:22 2015 -0400 + + (fix) improved the handling of default calendar categories/colors (#3200) + +M Documentation/SOGoInstallationGuide.asciidoc +M NEWS +M SoObjects/SOGo/SOGoDefaults.plist +M SoObjects/SOGo/SOGoDomainDefaults.h +M SoObjects/SOGo/SOGoDomainDefaults.m +M SoObjects/SOGo/SOGoUserDefaults.m +M UI/PreferencesUI/UIxPreferences.h +M UI/PreferencesUI/UIxPreferences.m + +commit 76360958a2a82a67bee00590fd8c76b1fe5733e3 +Author: Ludovic Marcotte +Date: Tue Jun 9 13:38:10 2015 -0400 + + (fix) make sure PRODID is set to Inverse/SOGo when importing events + +M SoObjects/Appointments/SOGoAppointmentFolder.m + +commit aa623c5171f0171742dc13431605bed0f3eb8ad7 +Author: Ludovic Marcotte +Date: Tue Jun 9 09:46:38 2015 -0400 + + (fix) don't add the domain if already in the uid + +M UI/MainUI/SOGoUserHomePage.m + +commit b93cbeee26f332a07b295cbcf3699b023ebd7b1f +Author: Ludovic Marcotte +Date: Fri Jun 5 12:18:27 2015 -0400 + + (fix) fixed some rare cornercases in multidomain configurations + +M NEWS +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserManager.m + +commit f3c2d3ca090ad5bb17151fcecd7a2e889713e122 +Author: Ludovic Marcotte +Date: Thu Jun 4 14:02:50 2015 -0400 + + Slightly improvement to the text displayed to users + +M Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh +M Scripts/sql-update-2.2.17_to_2.3.0.sh + +commit 24edb2bce82cc44f27c4bb96726218805f038674 +Author: Ludovic Marcotte +Date: Thu Jun 4 13:46:50 2015 -0400 + + (fix) code improvemnent to previous commits + +M SoObjects/Appointments/SOGoAppointmentObject.m + +commit 05232526a7f84107f0379af0922898899ca33b0c +Author: Ludovic Marcotte +Date: Thu Jun 4 11:46:59 2015 -0400 + + (fix) small improvement over previous commit + +M SoObjects/Appointments/SOGoAppointmentObject.m + +commit 8c4cb64246d1f5cfa7511882c963f30318eed4d1 +Author: Ludovic Marcotte +Date: Thu Jun 4 11:39:54 2015 -0400 + + (fix) now always enforce the organizer's default identity in appointments + +M NEWS +M SoObjects/Appointments/SOGoAppointmentObject.m + +commit ccbaea69995aaf17b15e55312dd398636de9ead2 +Author: Ludovic Marcotte +Date: Tue Jun 2 13:05:37 2015 -0400 + + (fix) EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders + +M ActiveSync/SOGoActiveSyncDispatcher.m +M NEWS + +commit 75206f1f2cefa256f8fb324109f11fd132565706 +Author: Ludovic Marcotte +Date: Tue Jun 2 12:57:37 2015 -0400 + + (fix) improved EAS speed, especially when fetching big attachments + +M ActiveSync/NSData+ActiveSync.m +M NEWS + +commit 7540cc3e33ba47ec8ca56271db7ae22a2e3d8588 +Author: Javier Amor García +Date: Tue Mar 3 17:03:29 2015 +0100 + + oc: can use client data to get recipient address + + Before this change, the recipient address was only extracted from the sogo + user object. This made mail to groups undeliverable. + Now if we do not have mail addresses from user object, + we try to use parameters from the client call. + +M OpenChange/MAPIStoreMessage.m + +commit 18a0422367b442790d205c3bd5ed8b9ef8f4d9a0 +Author: Ludovic Marcotte +Date: Tue Jun 2 09:03:34 2015 -0400 + + (fix) wrong filename for chmod + +M packaging/rhel/sogo.spec + +commit 2f533f6dae241d28d0145abc9934dbde31317d91 +Author: Ludovic Marcotte +Date: Tue Jun 2 09:00:21 2015 -0400 + + (fix) create ${RPM_BUILD_ROOT}/etc/tmpfiles.d/ if not present (test) + +M packaging/rhel/sogo.spec + +commit 4df323eddb23ddc5703501711baf18e2311c3e6b +Author: Ludovic Marcotte +Date: Tue Jun 2 08:46:17 2015 -0400 + + (fix) fixed the target path and name + +M packaging/rhel/sogo.spec + +commit 9435a22905eca35b4976940f2cb366073f88649e +Author: Ludovic Marcotte +Date: Tue Jun 2 08:41:53 2015 -0400 + + (fix) added tmpfs systemd script + +A Scripts/sogo-systemd.conf +M packaging/rhel/sogo.spec + +commit 15bbfeda3abe564a140c1f02de6bbc8d4a3b3d9c +Author: Ludovic Marcotte +Date: Tue Jun 2 08:25:54 2015 -0400 + + (fix) renamed scripts 2.1.17 -> 2.2.17 + +D Scripts/sql-update-2.1.17_to_2.3.0-mysql.sh +D Scripts/sql-update-2.1.17_to_2.3.0.sh +A Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh +A Scripts/sql-update-2.2.17_to_2.3.0.sh + +commit d92b0341fbd5aa8f7b711a4cec9198dc34ca899c +Author: Jesús García Sáez +Date: Thu May 28 17:28:52 2015 +0200 + + sogo-tool restore works in multidomain environments + + c_uid is not unique globally when multidomain is enabled + +M Tools/SOGoToolRestore.m + +commit 5e84f2817f8ac3e24ad1a9d6c8085fe4d48c44cb +Author: Javier Amor García +Date: Wed May 27 16:41:22 2015 +0200 + + sogo-tool: Added create-folder command + +M Tools/GNUmakefile +A Tools/SOGoToolCreateFolder.m +A Tools/SOGoToolRestore.h +M Tools/SOGoToolRestore.m + +commit 96d88de564f36e45bf9d82258c1378b881532b7f +Author: Julio García +Date: Tue Jun 2 12:24:56 2015 +0200 + + Revert "Fixed mess regarding uid/realUID" + + This reverts commit 4f303f8aa26046ecae916c457839d84622b260bb. + +M SoObjects/SOGo/SOGoUser.m + +commit 90e11d76f61dd8855f7c6ddb267feb39bf26bc52 +Author: Julio García +Date: Tue Jun 2 12:24:44 2015 +0200 + + Revert "(fix) more multi-domain fixes and cleanups" + + This reverts commit ed42d1e26b047e9d074a46a1a60c13a65e2d39de. + +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserManager.m + +commit 3dd8bddc0e0e5f8cab3507e36e37f643ea70bea6 +Author: Julio García +Date: Tue Jun 2 12:24:32 2015 +0200 + + Revert "(fix) more fixes and clarifications on the mutli-domain settings" + + This reverts commit d07df554f3d43078dedd74cefe7a63049992c67f. + +M Documentation/SOGoInstallationGuide.asciidoc +M SoObjects/SOGo/SOGoUser.m +M SoObjects/SOGo/SOGoUserManager.m + +commit 617e6f6454439cde3a41126de35ed47e02815cec +Author: Francis Lachapelle +Date: Mon Jun 1 11:56:52 2015 -0400 + + Update NEWS file + +M NEWS + +commit f65076defdc21f487ee0db7574261a17e555a317 +Author: Francis Lachapelle +Date: Mon Jun 1 11:20:32 2015 -0400 + + Update NEWS file + +M NEWS + +commit 1ec53a063c72ba23f9b8481b49c5d987bd64d134 +Author: Juan Vallés +Date: Thu May 28 14:47:07 2015 +0200 + + oc-calendar: Improve check for appointment updates + + The UID was being used to check if the changes in an appointment had been made by + its organiser. In this case, the UID is the user name, without taking the domain into account. + The `owner` variable, however, is a full email address, so the comparison was never successful. This + caused the update notification mail not to be sent. + +M SoObjects/Appointments/SOGoAppointmentObject.m + +commit 289100beff160072d12afd74e8aaa4d116a0be03 +Author: Ludovic Marcotte +Date: Mon Jun 1 08:36:02 2015 -0400 + + Updated files for the 2.3 release + +M ChangeLog +M Documentation/docinfo.xml +M Documentation/includes/global-attributes.asciidoc +M NEWS +M Version + commit 7da6b0b822c302e3ec1e661fd05fc7c60dfabf82 Author: Ludovic Marcotte Date: Fri May 29 14:23:01 2015 -0400 @@ -30,6 +2143,16 @@ Date: Thu May 28 08:30:30 2015 -0400 M Documentation/SOGoInstallationGuide.asciidoc +commit 76f80c507cf0c3438346bc551458d5a7971d28fc +Author: Jesús García Sáez +Date: Thu May 28 12:35:18 2015 +0200 + + safe decoding of secured value + + This was crashing with invalid value (shorter than it should be or nil value) + +M SoObjects/SOGo/SOGoSession.m + commit 2fd0beeaca85e615d8af693f8bc3eb0b3828bd40 Author: Ludovic Marcotte Date: Wed May 27 15:52:44 2015 -0400 @@ -62,6 +2185,32 @@ Date: Tue May 26 22:50:28 2015 +0200 M Scripts/sogo-systemd-redhat +commit b04b66fd797b4333792554dcad9fee135e8da0a7 +Author: Enrique J. Hernández Blasco +Date: Tue May 26 21:42:57 2015 +0200 + + Use UTC offset to encode NSCalendarDate in BSON + + Using name abbreviation in Objective-C is discouraged + as it stated in the following link: + + https://developer.apple.com/library/prerelease/ios/documentation/Cocoa/Reference/Foundation/Classes/NSTimeZone_Class/index.html#//apple_ref/occ/clm/NSTimeZone/timeZoneWithAbbreviation: + + Indeed, the GNUStep library is generating the name + abbreviation using the system tzdata information + but parsing this data using GNUStep resources making + changes like this: + + http://mm.icann.org/pipermail/tz-announce/2014-August/000023.html + + Not working until GNUStep reaches these tzdata changes. + + Using the UTC offset we are losing the position in planet + Earth but it could be considered valid looking at other + bson implementations. + +M SoObjects/SOGo/BSONCodec.m + commit ce3d55d2cc9ddafe2e76c0200c3a1a9dd74266ef Author: Ludovic Marcotte Date: Tue May 26 11:08:30 2015 -0400 @@ -96,6 +2245,28 @@ M Documentation/SOGoInstallationGuide.asciidoc M SoObjects/SOGo/SOGoUser.m M SoObjects/SOGo/SOGoUserManager.m +commit 7dc333e79013cccc730284151acfe575a2e73af6 +Author: Jesús García Sáez +Date: Wed May 20 15:24:00 2015 +0200 + + Fix warning distinct Objective-C type + + failedCount is a NSDictionary *, not NSMutableDictionary * + +M SoObjects/SOGo/SOGoUserManager.m + +commit cc62576fef5e64fe2fce97937fc5e64fa574413b +Author: Jesús García Sáez +Date: Wed May 20 12:31:25 2015 +0200 + + Avoid cache entries with uid@domain@domain prefix + + Depend of the current workflow these paths are reached with + username as uid and sometimes as uid@domain. So in multidomain + environments only append @domain when needed. + +M SoObjects/SOGo/SOGoUserManager.m + commit 772c3b3115d596d28f2e86e0ee75328f583374f0 Author: Ludovic Marcotte Date: Mon May 25 10:43:42 2015 -0400 @@ -153,6 +2324,18 @@ Date: Fri May 22 13:47:48 2015 -0400 M SoObjects/SOGo/SOGoUserManager.m +commit 725dea5f6f6f1547cbf6f4e740683e424f3f8fb6 +Author: Javier Amor García +Date: Mon May 18 14:43:11 2015 +0200 + + Show 'complexity password' error instead of a generic error + + There is not discrimination between complexity and + length errors because LDAP does not + return different error codes for each case. + +M SoObjects/SOGo/LDAPSource.m + commit 1e0473f1e51bc1ae5e6b1a7e75a04f2849f6494b Author: Francis Lachapelle Date: Fri May 22 07:58:26 2015 -0400 @@ -223,6 +2406,43 @@ Date: Thu May 21 21:35:13 2015 -0400 M UI/WebServerResources/SOGoTimePicker.js +commit 76dd53b4619c833ade32a54b0cdcdd545a0d36e6 +Author: Jesús García Sáez +Date: Wed May 20 12:30:05 2015 +0200 + + Fix conflicts with externalLoginWithEmail + DomainBasedUid + + On multidomain environment (SOGoEnableDomainBasedUID) with email for imap + authentication (SOGoForceExternalLoginWithEmail) we need to use uid@domain + instead of just uid in method getEmailForUID + +M SoObjects/SOGo/SOGoUserManager.m + +commit 020c8959258928a1e99ec4dafb2e1dedf8eeb9b2 +Author: Jesús García Sáez +Date: Wed May 20 11:44:06 2015 +0200 + + Avoid uid+attributes entries on shared cache + + In multidomain environments this will produce that info@domain1.com + can read info@domain2.com emails when info@domain2.com log in after + info@domain1.com is already logged in. + + If multidomain is not enabled, this action is not needed because + uid+attributes has been already saved on shared cache + +M SoObjects/SOGo/SOGoUserManager.m + +commit f4963df50f9aca4ebf7dc49b54d6de5159eaa347 +Author: Ludovic Marcotte +Date: Tue May 19 13:48:59 2015 -0400 + + (fix) avoid appending the domain unconditionally when SOGoEnableDomainBasedUID is set to YES + +M SoObjects/SOGo/SOGoUserFolder.m +M SoObjects/SOGo/SOGoUserManager.m +M UI/MainUI/SOGoRootPage.m + commit e40be922048b284597fb6711da60ad89e155acee Author: Ludovic Marcotte Date: Thu May 21 08:48:45 2015 -0400 @@ -255,6 +2475,21 @@ Date: Wed May 20 13:51:16 2015 -0400 M UI/WebServerResources/AdministrationUI.js +commit 7160d94e91142412ab7a8252effbd3b8764ad70e +Author: Jesús García Sáez +Date: Wed May 20 18:32:44 2015 +0200 + + Set domain before fetching auth sources + + In multidomain environment right now we are trying to authenticate against + all sources defined in sogo.conf because the domain is not set at this point. + + In sogo.conf we have to specify the domain a source is useful for, so with this + patch instead of 'n' tries of authentication we will perform only 1 (in a scenario + where we have 1 source per domain, and we have 'n' domains). + +M SoObjects/SOGo/SOGoUserManager.m + commit 416711ea43af4fe1c7095111ef6beef5fb577432 Author: Ludovic Marcotte Date: Tue May 19 13:48:59 2015 -0400 diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index e337f6eb0..de828a6d7 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -1035,8 +1035,8 @@ repository |ModulesConstraints (optional) |Limits the access of any module through a constraint based on an LDAP -attribute; must be a dictionary with keys `Mail`, and/or `Calendar`, for -example: +attribute; must be a dictionary with keys `Mail`, and/or `Calendar`, +and/or `ActiveSync` for example: ---- ModulesConstraints = { diff --git a/Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc b/Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc index ac4679a07..3ad0aef2b 100644 --- a/Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc +++ b/Documentation/SOGoNativeOutlookConfigurationGuide.asciidoc @@ -233,6 +233,7 @@ Installation This section will guide you through the installation of the native Microsoft Outlook compatibility layer SOGo offers. +//// Red Hat Enterprise Linux v6 x86_64 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -316,7 +317,7 @@ from this guide. On Ubuntu 12.04, the Samba init scripts need to be modified to disable the upstart check. For more details, refer to: https://wiki.samba.org/index.php/Samba4/InitScript - +//// Debian 8 (Jessie) and Ubuntu 14.04 (Trusty Tahr) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -395,7 +396,7 @@ samba-tool user setexpiry administrator --noexpiry ---- You might consider changing the realm and domain used, to suit your -enviroment. +environment. You might also have to remove `/etc/samba/smb.conf` prior running this command. @@ -441,7 +442,7 @@ Your Samba 4 configuration file should look like this: OpenChange Configuration ~~~~~~~~~~~~~~~~~~~~~~~~ -OpenChange 2.2 stores its metadata in MySQL so you need to have it installed. +Since v2.2, OpenChange stores its metadata in MySQL so you need to have it installed. First, create the OpenChange MySQL user: @@ -512,9 +513,11 @@ mapistore:indexing_backend = mysql://openchange-user:openchange$123@localhost/op mapiproxy:openchangedb = mysql://openchange-user:openchange$123@localhost/openchange ---- +//// On RHEL, make sure SELinux is disabled: setenforce 0 +//// Next, you can start Samba using the usual command: @@ -545,9 +548,11 @@ This service runs as a WSGI application under apache (mod_wsgi). While HTTPS is not required to access this service, it is strongly recommended. +//// On RHEL-based distributions, the apache configuration required by these services can be found in `/etc/httpd/conf.d/ocsmanager.conf` and `/etc/httpd/conf.d/rpcproxy.conf`. +//// For Debian-based distributions, these files can be found in `/etc/apache2/conf.d/` or `/etc/apache2/conf-available`. @@ -563,8 +568,10 @@ The OCS Manager and RPC Proxy configuration module can be enabled using: a2enconf ocsmanager a2enconf rpcproxy +//// On RHEL-based distributions, make sure the `LoadModule` directive is uncommented in `/etc/httpd/conf.d/wsgi.conf`. +//// The _reqtimeout_ apache module is known to cause problems when using the default configuration shipped with Debian-based systems. On such @@ -580,10 +587,12 @@ To avoid this problem, use a much higher timeout or disable the module: a2dismod reqtimeout You should now restart the Apache service and make sure it will start on -boot. On RHEL-based distributions, do: +boot. +//// +On RHEL-based distributions, do: chkconfig httpd on && /etc/init.d/httpd restart - +//// On Debian-based distributions, do: update-rc.d apache2 defaults && /etc/init.d/apache2 restart @@ -813,7 +822,7 @@ the `openchange_user_cleanup` script distributed with SOGo. The script can be found in `/usr/share/doc/sogo/` (`/usr/share/sogo-VERSION/` on RHEL). To reset a user, run the script as root: -`python openchange_user_cleanup username`. See the usage output for additional options. +`openchange_user_cleanup username`. See the usage output for additional options. * The "Out of Office Assistant" will not currently work. This feature has not been implemented. * Creating folders below INBOX (when not normally permitted by the IMAP diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index 31fb97f96..7597faa1c 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ -Version 2.3.0 - June 2015 -for version 2.3.0 -2015-06-01 +Version 2.3.2 - September 2015 +for version 2.3.2 +2015-09-16 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc index e3c86ba46..41b170e4b 100644 --- a/Documentation/includes/global-attributes.asciidoc +++ b/Documentation/includes/global-attributes.asciidoc @@ -13,6 +13,6 @@ // TODO have the build system take care of this -:release_version: 2.3.0 +:release_version: 2.3.2 // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/NEWS b/NEWS index 080088c49..25ac09c6f 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,37 @@ -2.3.1 (2015-06-XX) +2.3.3 (2015-mm-dd) +------------------ + +New features + +Enhancements + +Bug fixes + +2.3.2 (2015-09-16) +------------------ + +Enhancements + - improved EAS speed and memory usage, avoiding many IMAP LIST commands (#3294) + - improved EAS speed during initial syncing of large mailboxes (#3293) + - updated CKEditor to version 4.5.3 + +Bug fixes + - fixed display of whitelisted attendees in Preferences window on Firefox (#3285) + - non-latin subfolder names are displayed correctly on Outlook (Zentyal) + - fixed several sync issues on environments with multiple users (Zentyal) + - folders from other users will no longer appear on your Outlook (Zentyal) + - use right auth in multidomain environments in contacts and calendar from Outlook (Zentyal) + - session fix when SOGoEnableDomainBasedUID is enabled but logins are domain-less + - less sync issues when setting read flag (Zentyal) + - attachments with non-latin filenames sent by Outlook are now received (Zentyal) + - support attachments from more mail clients (Zentyal) + - avoid conflicting message on saving a draft mail (Zentyal) + - less conflicting messages in Outlook while moving messages between folders (Zentyal) + - start/end shifting by 1 hour due to timezone change on last Sunday of October 2015 (#3344) + - fixed localization of calendar categories with empty profile (#3295) + - fixed options availability in contextual menu of Contacts module (#3342) + +2.3.1 (2015-07-23) ------------------ Enhancements @@ -6,6 +39,12 @@ Enhancements - now always enforce the organizer's default identity in appointments - improved the handling of default calendar categories/colors (#3200) - added support for DeletesAsMoves over EAS + - added create-folder subcommand to sogo-tool to create contact and calendar folders + - group mail addresses can be used as recipient in Outlook + - added 'ActiveSync' module constraints + - updated CKEditor to version 4.5.1 + - added Slovenian translation - thanks to Jens Riecken + - added Chinese (Taiwan) translation Bug fixes - EAS's GetItemEstimate/ItemOperations now support fetching mails and empty folders @@ -17,6 +56,12 @@ Bug fixes - fixed multi-domain support for sogo-tool backup/restore (#2600) - fixed data ordering in events list of Calendar module (#3261) - fixed data ordering in tasks list of Calendar module (#3267) + - Android EAS Lollipop fixes (#3268 and #3269) + - improved EAS email flagging handling (#3140) + - fixed computation of GlobalObjectId (#3235) + - fixed EAS conversation ID issues on BB10 (#3152) + - fixed CR/LF printing in event's description (#3228) + - optimized Calendar module in multidomain configurations 2.3.0 (2015-06-01) ------------------- diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m index 1326b329f..be0d53da3 100644 --- a/SOPE/NGCards/iCalTimeZonePeriod.m +++ b/SOPE/NGCards/iCalTimeZonePeriod.m @@ -161,8 +161,11 @@ minute: [tzStart minuteOfHour] second: 0 timeZone: [NSTimeZone timeZoneWithName: @"GMT"]]; - tmpDate = [tmpDate addYear: 0 month: ((pos > 0) ? 0 : 1) - day: 0 hour: 0 minute: 0 + tmpDate = [tmpDate addYear: 0 + month: ((pos > 0) ? 0 : 1) + day: 0 + hour: 0 + minute: 0 second: 0]; /* If the day of the time change is "-XSU", we need to determine whether the @@ -197,12 +200,41 @@ END:STANDARD END:VTIMEZONE - The time changes occure on a Sunday, but in March, the 1st is a Sunday itself and in November + The time changes occur on a Sunday, but in March, the 1st is a Sunday itself and in November the 1st is also a Sunday. If we don't decrement "pos" by one, tmpDate (which is set to March or November 1st because of "day: 1" will have 14 more days added for March and 7 more days added for November - which will effectively shift the time change by a whole week. + + In Europe/Berlin, we have a different use-case for November. In 2015, November 1st is a Sunday. + The time change in November must occur on October 25th but since tmpDate will be November 1st, + so a Sunday, dateDayOfWeek will be 0 and dayOfWeek will also be 0 we would decrement tmpDate by 14 days, + which is incorrect because it would shift the timezone change one week earlier. We take care about this + one with check if pos is greater or equal than 0 and if so, we don't decrement it. + + BEGIN:VCALENDAR + PRODID:-//Inverse inc.//NONSGML Olson 2014g//EN + VERSION:2.0 + BEGIN:VTIMEZONE + TZID:Europe/Berlin + X-LIC-LOCATION:Europe/Berlin + BEGIN:DAYLIGHT + TZOFFSETFROM:+0100 + TZOFFSETTO:+0200 + TZNAME:CEST + DTSTART:19700329T020000 + RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU + END:DAYLIGHT + BEGIN:STANDARD + TZOFFSETFROM:+0200 + TZOFFSETTO:+0100 + TZNAME:CET + DTSTART:19701025T030000 + RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU + END:STANDARD + END:VTIMEZONE + END:VCALENDAR */ - if (dayOfWeek == dateDayOfWeek) + if (dayOfWeek == dateDayOfWeek && pos >= 0) pos--; offset = (dayOfWeek - dateDayOfWeek) + (pos * 7); diff --git a/Scripts/verify_translations.py b/Scripts/verify_translations.py new file mode 100755 index 000000000..68cd29630 --- /dev/null +++ b/Scripts/verify_translations.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +import sys +import os +import re + +DEBUG=False + +dir_mappings = {"../UI/Templates":"../UI/Common", + "../UI/Templates/AdministrationUI":"../UI/AdministrationUI", + "../UI/Templates/Appointments":"../SoObjects/Appointments", + "../UI/Templates/ContactsUI":"../UI/Contacts", + "../UI/Templates/MailerUI":"../UI/MailerUI", + "../UI/Templates/MailPartViewers":"../UI/MailPartViewers", + "../UI/Templates/MainUI":"../UI/MainUI", + "../UI/Templates/PreferencesUI":"../UI/PreferencesUI", + "../UI/Templates/SchedulerUI":"../UI/Scheduler" + } + +def get_translations(path): + try: + transpath = dir_mappings.get(path, path) + transname = transpath + '/English.lproj/Localizable.strings' + transall = open(transname).read() + except: + transall = "" + return transall + + +def find_missing_translations(rootdir='.', extention='', recomp=None, greylist=()): + for path, dirs, files in os.walk(rootdir): + filelist = [f for f in files if f[(-1 * len(extention)):] == extention] + if filelist: + for filename in filelist: + if filename in greylist: + print "%s is greylisted -- SKIPPING" % filename + continue + pathname = path + '/' + filename + lines = open(pathname).read().split("\n") + values = [r.groups()[0] for r in [recomp.search(l) for l in lines] if r] + if values: + #- Get the current english translations for the path + transgood = get_translations(path) + if not transgood: + print "No translation file found for %s, skipping %s" % (path, pathname) + continue + notfound = list() + if DEBUG:print pathname + for value in values: + #- Try to find the value from the source file in the translation file + escaped_value = re.escape(value) + found = re.search('(%s|"%s")\s*=\s*"(.*?)";' % (escaped_value, escaped_value), transgood) + if found: + if DEBUG: print "\t", '[%s] FOUND -- "%s"' % found.groups() + else: + notfound.append("-->\t[%s] ==== Not Found ====" % value) + if notfound: + if not DEBUG:print pathname + print "\n".join(notfound) + + +def main(): + #- Only one option... + if len(sys.argv) > 1: + if sys.argv[1] == '-g': + global DEBUG + DEBUG = True + else: + print 'Usage:', sys.argv[0], '[-g]\n\t\t-g: debug will show matching also' + sys.exit(1) + + greylist = ('UIxFilterEditor.wox') + + #- Get only the label:value from all lines + recomp = re.compile(' label:[^=]*="(.*?)"') + find_missing_translations('../UI', 'wox', recomp, greylist) + + #- [self labelForKey: @"Issuer"] + recomp = re.compile('\[self labelForKey: @"(.*?)"\]') + find_missing_translations('../UI', 'm', recomp, ()) + +main() diff --git a/SoObjects/Appointments/Arabic.lproj/Localizable.strings b/SoObjects/Appointments/Arabic.lproj/Localizable.strings index 23754f510..e24c72e44 100644 --- a/SoObjects/Appointments/Arabic.lproj/Localizable.strings +++ b/SoObjects/Appointments/Arabic.lproj/Localizable.strings @@ -11,16 +11,16 @@ vtodo_class2 = "(مهمة سرية)"; "The event \"%{Summary}\" was created" = "أُنشِئ الحدث \"%{Summary}\""; "The event \"%{Summary}\" was deleted" = "حُذِفَ الحدث \"%{Summary}\""; "The event \"%{Summary}\" was updated" = "حُدِّث الحدث \"%{Summary}\""; -"The following attendees(s) were notified:" = "تم ابلاغ المدعو (المدعويين) الأتي أسماءهم:"; -"The following attendees(s) were added:" = "تم أضافة المدعو (المدعويين) الأتي أسماءهم:"; -"The following attendees(s) were removed:" = "تم مسح المدعو (المدعويين) الأتي أسماءهم:"; +"The following attendees(s) were notified" = "تم ابلاغ المدعو (المدعويين) الأتي أسماءهم"; +"The following attendees(s) were added" = "تم أضافة المدعو (المدعويين) الأتي أسماءهم"; +"The following attendees(s) were removed" = "تم مسح المدعو (المدعويين) الأتي أسماءهم"; /* IMIP messages */ -"calendar_label" = "التقويم:"; -"startDate_label" = "البداية:"; -"endDate_label" = "النهاية:"; +"calendar_label" = "التقويم"; +"startDate_label" = "البداية"; +"endDate_label" = "النهاية"; "due_label" = "تاريخ الاستحقاق:"; -"location_label" = "المكان:"; +"location_label" = "المكان"; "summary_label" = "الملخص:"; "comment_label" = "التعليق:"; diff --git a/SoObjects/Appointments/Basque.lproj/Localizable.strings b/SoObjects/Appointments/Basque.lproj/Localizable.strings index 316b6371f..a4574b684 100644 --- a/SoObjects/Appointments/Basque.lproj/Localizable.strings +++ b/SoObjects/Appointments/Basque.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Isilpeko egitekoa)"; "The event \"%{Summary}\" was created" = "\"%{Summary}\" ekitaldia sortu da"; "The event \"%{Summary}\" was deleted" = "\"%{Summary}\" ekitaldia ezabatu da"; "The event \"%{Summary}\" was updated" = "\"%{Summary}\" ekitaldia eguneratu da"; -"The following attendees(s) were notified:" = "Ondorengo partaidea(k) jakinarazi d(ir)a:"; -"The following attendees(s) were added:" = "Ondorengo partaidea(k) gehitu d(ir)a:"; -"The following attendees(s) were removed:" = "Ondorengo partaidea(k) ezabatu d(ir)a:"; +"The following attendees(s) were notified" = "Ondorengo partaidea(k) jakinarazi d(ir)a"; +"The following attendees(s) were added" = "Ondorengo partaidea(k) gehitu d(ir)a"; +"The following attendees(s) were removed" = "Ondorengo partaidea(k) ezabatu d(ir)a"; /* IMIP messages */ "calendar_label" = "Egutegia"; -"startDate_label" = "Hasi:"; -"endDate_label" = "Amaitu:"; +"startDate_label" = "Hasi"; +"endDate_label" = "Amaitu"; "due_label" = "Epemuga:"; -"location_label" = "Kokapena:"; +"location_label" = "Kokapena"; "summary_label" = "Laburpena:"; "comment_label" = "Iruzkina:"; diff --git a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings index 5fcb33090..78a77f482 100644 --- a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings +++ b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Tarefa Confidencial)"; "The event \"%{Summary}\" was created" = "O evento \"%{Summary}\" foi criado"; "The event \"%{Summary}\" was deleted" = "O evento \"%{Summary}\" foi removido"; "The event \"%{Summary}\" was updated" = "O evento \"%{Summary}\" foi atualizado"; -"The following attendees(s) were notified:" = "Estes participantes foram notificados:"; -"The following attendees(s) were added:" = "Estes participantes foram adicionados:"; -"The following attendees(s) were removed:" = "Estes participantes foram removidos:"; +"The following attendees(s) were notified" = "Estes participantes foram notificados"; +"The following attendees(s) were added" = "Estes participantes foram adicionados"; +"The following attendees(s) were removed" = "Estes participantes foram removidos"; /* IMIP messages */ -"calendar_label" = "Calendário:"; -"startDate_label" = "Início:"; -"endDate_label" = "Fim:"; +"calendar_label" = "Calendário"; +"startDate_label" = "Início"; +"endDate_label" = "Fim"; "due_label" = "Data de Vencimento:"; -"location_label" = "Local:"; +"location_label" = "Local"; "summary_label" = "Resumo:"; "comment_label" = "Comentário:"; diff --git a/SoObjects/Appointments/Catalan.lproj/Localizable.strings b/SoObjects/Appointments/Catalan.lproj/Localizable.strings index 33861d079..9dcf2ed29 100644 --- a/SoObjects/Appointments/Catalan.lproj/Localizable.strings +++ b/SoObjects/Appointments/Catalan.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Tasca confidencial)"; "The event \"%{Summary}\" was created" = "Es va crear l'esdeveniment \"%{Summary}\" "; "The event \"%{Summary}\" was deleted" = "Es va esborrar l'esdeveniment \"%{Summary}\" "; "The event \"%{Summary}\" was updated" = "Es va modificar l'esdeveniment \"%{Summary}\" "; -"The following attendees(s) were notified:" = "I va notificar als següents participants: "; -"The following attendees(s) were added:" = "Es van agregar els següents participants: "; -"The following attendees(s) were removed:" = "Heu suprimit els assistents següents:"; +"The following attendees(s) were notified" = "I va notificar als següents participants "; +"The following attendees(s) were added" = "Es van agregar els següents participants "; +"The following attendees(s) were removed" = "Heu suprimit els assistents següents"; /* IMIP messages */ -"calendar_label" = "Calendari:"; -"startDate_label" = "Inici:"; -"endDate_label" = "Final:"; +"calendar_label" = "Calendari"; +"startDate_label" = "Inici"; +"endDate_label" = "Final"; "due_label" = "Data límit:"; -"location_label" = "Lloc:"; +"location_label" = "Lloc"; "summary_label" = "Resum:"; "comment_label" = "Comentari:"; diff --git a/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings b/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..3c3e59b55 --- /dev/null +++ b/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,67 @@ +"Inviting the following persons is prohibited:" = "禁止邀請以下人士:"; +"Personal Calendar" = "個人行事曆"; +vevent_class0 = "(公開事件)"; +vevent_class1 = "(私人事件)"; +vevent_class2 = "(機密事件)"; + +vtodo_class0 = "(公開任務)"; +vtodo_class1 = "(私人任務)"; +vtodo_class2 = "(機密任務)"; + +/* Receipts */ +"The event \"%{Summary}\" was created" = "事件 \"%{Summary}\" 已建立"; +"The event \"%{Summary}\" was deleted" = "事件\"%{Summary}\" 已刪除"; +"The event \"%{Summary}\" was updated" = "事件\"%{Summary}\" 已異動"; +"The following attendees(s) were notified" = "已通知下列出席者"; +"The following attendees(s) were added" = "已增加下列出席者"; +"The following attendees(s) were removed" = "已移除下列出席者"; + +/* IMIP messages */ +"calendar_label" = "行事曆"; +"startDate_label" = "開始"; +"endDate_label" = "結束"; +"due_label" = "截止日期:"; +"location_label" = "地點"; +"summary_label" = "事件主題:"; +"comment_label" = "備註:"; + +/* Invitation */ +"Event Invitation: \"%{Summary}\"" = "邀請事件: \"%{Summary}\""; +"(sent by %{SentBy}) " = "(來自 %{SentBy})"; +"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} 邀請您參加 %{Summary}。\n\n起始日期: %{StartDate}\n結束日期: %{EndDate}\n備註說明: %{Description}"; +"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} 邀請您參加 %{Summary}。\n\n起始時間: %{StartDate} %{StartTime}\n結束時間: %{EndDate} %{EndTime}\n備註說明: %{Description}"; + +/* Deletion */ +"Event Cancelled: \"%{Summary}\"" = "取消事件 : \"%{Summary}\""; +"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" += "%{Organizer} %{SentByText} 己取消事件: %{Summary}。\n\n起始日期: %{StartDate}\n結束日期: %{EndDate}\n備註說明: %{Description}"; +"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" += "%{Organizer} %{SentByText} 己取消了事件: %{Summary}。\n\n起始時間: %{StartDate} %{StartTime}\n結束時間: %{EndDate} %{EndTime}\n備註說明: %{Description}"; + +/* Update */ +"The appointment \"%{Summary}\" for the %{OldStartDate} has changed" += " 安排於%{OldStartDate} 的事件 \"%{Summary}\" 已變更"; +"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed" += "安排於 %{OldStartDate} %{OldStartTime} 的事件 \"%{Summary}\" 已變更"; +"The following parameters have changed in the \"%{Summary}\" meeting:" += "已變更會議 \"%{Summary}\" 下列參數:"; +"Please accept or decline those changes." += "請接受或拒絶這些變更。"; + +/* Reply */ +"Accepted invitation: \"%{Summary}\"" = "接受邀請: \"%{Summary}\""; +"Declined invitation: \"%{Summary}\"" = "拒絶邀請: \"%{Summary}\""; +"Delegated invitation: \"%{Summary}\"" = "\"委派出席: \"%{Summary}\""; +"Not yet decided on invitation: \"%{Summary}\"" = "未處理的邀請: \"%{Summary}\""; +"%{Attendee} %{SentByText}has accepted your event invitation." += "\"%{Attendee} %{SentByText}已接受了您的邀請。"; +"%{Attendee} %{SentByText}has declined your event invitation." += "\"%{Attendee} %{SentByText}已拒絶了您的邀請。"; +"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}." += "\"%{Attendee} %{SentByText}已將您的邀請委任給%{Delegate}。"; +"%{Attendee} %{SentByText}has not yet decided upon your event invitation." += "%{Attendee} %{SentByText}還沒有決定是否接受您的邀請。"; + +/* Resources */ +"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "無法讀取資源: \"%{Cn} %{SystemEmail}\""; +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "\"%{Cn} %{SystemEmail}\" 的衝突事件己達上限 ( %{NumberOfSimultaneousBookings} )。衝突事件 \"%{EventTitle}\" 的起始日期為 %{StartDate}。"; diff --git a/SoObjects/Appointments/Czech.lproj/Localizable.strings b/SoObjects/Appointments/Czech.lproj/Localizable.strings index fde0f1775..720a2de98 100644 --- a/SoObjects/Appointments/Czech.lproj/Localizable.strings +++ b/SoObjects/Appointments/Czech.lproj/Localizable.strings @@ -12,16 +12,16 @@ 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 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:"; +"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"; /* IMIP messages */ -"calendar_label" = "Kalendář:"; -"startDate_label" = "Začátek:"; -"endDate_label" = "Konec:"; +"calendar_label" = "Kalendář"; +"startDate_label" = "Začátek"; +"endDate_label" = "Konec"; "due_label" = "Termín:"; -"location_label" = "Místo:"; +"location_label" = "Místo"; "summary_label" = "Název:"; "comment_label" = "Komentář:"; diff --git a/SoObjects/Appointments/Danish.lproj/Localizable.strings b/SoObjects/Appointments/Danish.lproj/Localizable.strings index 8718169b7..c7c8ed662 100644 --- a/SoObjects/Appointments/Danish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Danish.lproj/Localizable.strings @@ -11,16 +11,16 @@ vtodo_class2 = "(Hemmelig opgave)"; "The event \"%{Summary}\" was created" = "Begivenheden \"%{Summary}\" blev oprettet"; "The event \"%{Summary}\" was deleted" = "Begivenheden \"%{Summary}\" blev slettet"; "The event \"%{Summary}\" was updated" = "Begivenheden \"%{Summary}\" blev opdateret"; -"The following attendees(s) were notified:" = "Følgende deltager(e) blev underrettet:"; -"The following attendees(s) were added:" = "Følgende deltager(e) blev tilføjet:"; -"The following attendees(s) were removed:" = "Følgende deltager(e) blev fjernet:"; +"The following attendees(s) were notified" = "Følgende deltager(e) blev underrettet"; +"The following attendees(s) were added" = "Følgende deltager(e) blev tilføjet"; +"The following attendees(s) were removed" = "Følgende deltager(e) blev fjernet"; /* IMIP messages */ -"calendar_label" = "Kalender:"; -"startDate_label" = "Start:"; -"endDate_label" = "Slut:"; +"calendar_label" = "Kalender"; +"startDate_label" = "Start"; +"endDate_label" = "Slut"; "due_label" = "Forfaldsdato:"; -"location_label" = "Sted:"; +"location_label" = "Sted"; "summary_label" = "Resumé:"; "comment_label" = "Kommentér:"; diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings index f554e976e..1a422fa39 100644 --- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings +++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Vertrouwelijke taak)"; "The event \"%{Summary}\" was created" = "De gebeurtenis \"%{Summary}\" is aangemaakt"; "The event \"%{Summary}\" was deleted" = "De gebeurtenis \"%{Summary}\" is verwijderd"; "The event \"%{Summary}\" was updated" = "De gebeurtenis \"%{Summary}\" is gewijzigd"; -"The following attendees(s) were notified:" = "De volgende deelnemers zijn in kennis gesteld:"; -"The following attendees(s) were added:" = "De volgende deelnemers zijn toegevoegd:"; -"The following attendees(s) were removed:" = "De volgende deelnemers zijn verwijderd:"; +"The following attendees(s) were notified" = "De volgende deelnemers zijn in kennis gesteld"; +"The following attendees(s) were added" = "De volgende deelnemers zijn toegevoegd"; +"The following attendees(s) were removed" = "De volgende deelnemers zijn verwijderd"; /* IMIP messages */ -"calendar_label" = "Agenda:"; -"startDate_label" = "Start:"; -"endDate_label" = "Einde:"; +"calendar_label" = "Agenda"; +"startDate_label" = "Start"; +"endDate_label" = "Einde"; "due_label" = "Vervaldag:"; -"location_label" = "Locatie:"; +"location_label" = "Locatie"; "summary_label" = "Samenvatting:"; "comment_label" = "Commentaar:"; diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings index 45a038dfa..1ca687e1c 100644 --- a/SoObjects/Appointments/English.lproj/Localizable.strings +++ b/SoObjects/Appointments/English.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Confidential task)"; "The event \"%{Summary}\" was created" = "The event \"%{Summary}\" was created"; "The event \"%{Summary}\" was deleted" = "The event \"%{Summary}\" was deleted"; "The event \"%{Summary}\" was updated" = "The event \"%{Summary}\" was updated"; -"The following attendees(s) were notified:" = "The following attendee(s) were notified:"; -"The following attendees(s) were added:" = "The following attendee(s) were added:"; -"The following attendees(s) were removed:" = "The following attendee(s) were removed:"; +"The following attendees(s) were notified" = "The following attendee(s) were notified"; +"The following attendees(s) were added" = "The following attendee(s) were added"; +"The following attendees(s) were removed" = "The following attendee(s) were removed"; /* IMIP messages */ -"calendar_label" = "Calendar:"; -"startDate_label" = "Start:"; -"endDate_label" = "End:"; +"calendar_label" = "Calendar"; +"startDate_label" = "Start"; +"endDate_label" = "End"; "due_label" = "Due Date:"; -"location_label" = "Location:"; +"location_label" = "Location"; "summary_label" = "Summary:"; "comment_label" = "Comment:"; diff --git a/SoObjects/Appointments/Finnish.lproj/Localizable.strings b/SoObjects/Appointments/Finnish.lproj/Localizable.strings index 2574c7110..2aecd3b29 100644 --- a/SoObjects/Appointments/Finnish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Finnish.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)"; "The event \"%{Summary}\" was created" = "Tapahtuma \"%{Summary}\" luotiin"; "The event \"%{Summary}\" was deleted" = "Tapahtuma \"%{Summary}\" poistettiin"; "The event \"%{Summary}\" was updated" = "Tapahtuma \"%{Summary}\" päivitettiin"; -"The following attendees(s) were notified:" = "Seuraava(t) osallistuja(t) on informoitu:"; -"The following attendees(s) were added:" = "Seuraava(t) osalllistuja(t) on lisätty:"; -"The following attendees(s) were removed:" = "Seuraava(t) osalllistuja(t) poistettiin:"; +"The following attendees(s) were notified" = "Seuraava(t) osallistuja(t) on informoitu"; +"The following attendees(s) were added" = "Seuraava(t) osalllistuja(t) on lisätty"; +"The following attendees(s) were removed" = "Seuraava(t) osalllistuja(t) poistettiin"; /* IMIP messages */ -"calendar_label" = "Kalenteri:"; -"startDate_label" = "Alkaa:"; -"endDate_label" = "Päättyy:"; +"calendar_label" = "Kalenteri"; +"startDate_label" = "Alkaa"; +"endDate_label" = "Päättyy"; "due_label" = "Määräpäivä:"; -"location_label" = "Sijainti:"; +"location_label" = "Sijainti"; "summary_label" = "Yhteenveto:"; "comment_label" = "Kommentti:"; diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings index 690738b77..db765b83b 100644 --- a/SoObjects/Appointments/French.lproj/Localizable.strings +++ b/SoObjects/Appointments/French.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Tâche confidentielle)"; "The event \"%{Summary}\" was created" = "L'événement «%{Summary}» a été créé"; "The event \"%{Summary}\" was deleted" = "L'événement «%{Summary}» a été effacé"; "The event \"%{Summary}\" was updated" = "L'événement «%{Summary}» a été modifié"; -"The following attendees(s) were notified:" = "Les invités suivants ont été avisés :"; -"The following attendees(s) were added:" = "Les invités suivants ont été ajoutés :"; -"The following attendees(s) were removed:" = "Les invités suivants ont été supprimés :"; +"The following attendees(s) were notified" = "Les invités suivants ont été avisés "; +"The following attendees(s) were added" = "Les invités suivants ont été ajoutés "; +"The following attendees(s) were removed" = "Les invités suivants ont été supprimés "; /* IMIP messages */ -"calendar_label" = "Agenda :"; -"startDate_label" = "Début :"; -"endDate_label" = "Fin :"; +"calendar_label" = "Agenda "; +"startDate_label" = "Début "; +"endDate_label" = "Fin "; "due_label" = "Fin prévue :"; -"location_label" = "Lieu :"; +"location_label" = "Lieu "; "summary_label" = "Titre :"; "comment_label" = "Description :"; diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 1dd3c1a7d..257104e14 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -54,7 +54,7 @@ Appointments_RESOURCE_FILES += \ MSExchangeFreeBusySOAPResponseMap.plist \ MSExchangeFreeBusySOAPRequest.wo -Appointments_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +Appointments_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh Appointments_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings index a9e975288..1857c9560 100644 --- a/SoObjects/Appointments/German.lproj/Localizable.strings +++ b/SoObjects/Appointments/German.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; "The event \"%{Summary}\" was created" = "Der Termin \"%{Summary}\" wurde angelegt"; "The event \"%{Summary}\" was deleted" = "Der Termin \"%{Summary}\" wurde gelöscht"; "The event \"%{Summary}\" was updated" = "Der Termin \"%{Summary}\" wurde geändert"; -"The following attendees(s) were notified:" = "Die folgenden Teilnehmer wurden benachrichtigt:"; -"The following attendees(s) were added:" = "Die folgenden Teilnehmer wurden hinzugefügt:"; -"The following attendees(s) were removed:" = "Die folgenden Teilnehmer wurden entfernt:"; +"The following attendees(s) were notified" = "Die folgenden Teilnehmer wurden benachrichtigt"; +"The following attendees(s) were added" = "Die folgenden Teilnehmer wurden hinzugefügt"; +"The following attendees(s) were removed" = "Die folgenden Teilnehmer wurden entfernt"; /* IMIP messages */ -"calendar_label" = "Kalender:"; -"startDate_label" = "Beginn:"; -"endDate_label" = "Ende:"; +"calendar_label" = "Kalender"; +"startDate_label" = "Beginn"; +"endDate_label" = "Ende"; "due_label" = "Fälligkeit:"; -"location_label" = "Ort:"; +"location_label" = "Ort"; "summary_label" = "Zusammenfassung:"; "comment_label" = "Kommentar:"; diff --git a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings index ab163b121..5669e189e 100644 --- a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Bizalmas feladat)"; "The event \"%{Summary}\" was created" = "A \"%{Summary}\" esemény létre lett hozva"; "The event \"%{Summary}\" was deleted" = "A \"%{Summary}\" esemény törölve lett"; "The event \"%{Summary}\" was updated" = "A \"%{Summary}\" esemény módosítva lett"; -"The following attendees(s) were notified:" = "Az alábbi résztvevők lettek értesítve:"; -"The following attendees(s) were added:" = "Az alábbi résztvevők lettek hozzáadva:"; -"The following attendees(s) were removed:" = "Az alábbi résztvevők lettek eltávolítva:"; +"The following attendees(s) were notified" = "Az alábbi résztvevők lettek értesítve"; +"The following attendees(s) were added" = "Az alábbi résztvevők lettek hozzáadva"; +"The following attendees(s) were removed" = "Az alábbi résztvevők lettek eltávolítva"; /* IMIP messages */ -"calendar_label" = "Naptár:"; -"startDate_label" = "Kezdete:"; -"endDate_label" = "Vége:"; +"calendar_label" = "Naptár"; +"startDate_label" = "Kezdete"; +"endDate_label" = "Vége"; "due_label" = "Lejárat napja:"; -"location_label" = "Hely:"; +"location_label" = "Hely"; "summary_label" = "Összegzés:"; "comment_label" = "Megjegyzés:"; diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings index 5b6a20af2..07c6696f4 100644 --- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings +++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)"; "... from the following event:" = "... af eftirfarandi viðburði:"; /* IMIP messages */ -"startDate_label" = "Byrjun:"; -"endDate_label" = "Endir:"; +"startDate_label" = "Byrjun"; +"endDate_label" = "Endir"; "due_label" = "Lokadagur:"; -"location_label" = "Staðsetning:"; +"location_label" = "Staðsetning"; "summary_label" = "Samantekt:"; "comment_label" = "Athugasemd:"; diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings index 8903c354b..ae1c290d3 100644 --- a/SoObjects/Appointments/Italian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Attività confidenziale)"; "... from the following event:" = "... dal seguente evento:"; /* IMIP messages */ -"startDate_label" = "Inizio:"; -"endDate_label" = "Fine:"; +"startDate_label" = "Inizio"; +"endDate_label" = "Fine"; "due_label" = "Scadenza:"; -"location_label" = "Luogo:"; +"location_label" = "Luogo"; "summary_label" = "Summario:"; "comment_label" = "Commento:"; diff --git a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings index 61a60befd..20f143fbe 100644 --- a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings +++ b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Konfidensiell oppgave)"; "The event \"%{Summary}\" was created" = "Hendelsen \"%{Summary}\" ble opprettet"; "The event \"%{Summary}\" was deleted" = "Hendelsen \"%{Summary}\" ble slettet"; "The event \"%{Summary}\" was updated" = "Hendelsen \"%{Summary}\" ble oppdatert"; -"The following attendees(s) were notified:" = "Følgende deltaker(e) ble varslet:"; -"The following attendees(s) were added:" = "Følgende deltaker(e) ble lagt til:"; -"The following attendees(s) were removed:" = "Følgende deltaker(e) ble fjernet:"; +"The following attendees(s) were notified" = "Følgende deltaker(e) ble varslet"; +"The following attendees(s) were added" = "Følgende deltaker(e) ble lagt til"; +"The following attendees(s) were removed" = "Følgende deltaker(e) ble fjernet"; /* IMIP messages */ -"calendar_label" = "Kalender:"; -"startDate_label" = "Start:"; -"endDate_label" = "Slutt:"; +"calendar_label" = "Kalender"; +"startDate_label" = "Start"; +"endDate_label" = "Slutt"; "due_label" = "Forfallsdato:"; -"location_label" = "Sted:"; +"location_label" = "Sted"; "summary_label" = "Sammendrag:"; "comment_label" = "Kommentar:"; diff --git a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings index 6fbb599a6..21807b6ea 100644 --- a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings +++ b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Konfidensiell oppgave)"; "... from the following event:" = "... fra følgende hendelse:"; /* IMIP messages */ -"startDate_label" = "Start:"; -"endDate_label" = "End:"; +"startDate_label" = "Start"; +"endDate_label" = "End"; "due_label" = "Due Date:"; -"location_label" = "Location:"; +"location_label" = "Location"; "summary_label" = "Summary:"; "comment_label" = "Comment:"; diff --git a/SoObjects/Appointments/Polish.lproj/Localizable.strings b/SoObjects/Appointments/Polish.lproj/Localizable.strings index 092525208..a8c00b8b9 100644 --- a/SoObjects/Appointments/Polish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Polish.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Zadanie poufne)"; "The event \"%{Summary}\" was created" = "Utworzono wydarzenie \"%{Summary}\""; "The event \"%{Summary}\" was deleted" = "Skasowano wydarzenie \"%{Summary}\""; "The event \"%{Summary}\" was updated" = "Zaktualizowano wydarzenie \"%{Summary}\""; -"The following attendees(s) were notified:" = "Następujący uczestnicy zostali powiadomieni:"; -"The following attendees(s) were added:" = "Następujący uczestnicy zostali dodani:"; -"The following attendees(s) were removed:" = "Następujący uczestnicy zostali usunięci:"; +"The following attendees(s) were notified" = "Następujący uczestnicy zostali powiadomieni"; +"The following attendees(s) were added" = "Następujący uczestnicy zostali dodani"; +"The following attendees(s) were removed" = "Następujący uczestnicy zostali usunięci"; /* IMIP messages */ -"calendar_label" = "Kalendarz:"; -"startDate_label" = "Początek:"; -"endDate_label" = "Koniec:"; +"calendar_label" = "Kalendarz"; +"startDate_label" = "Początek"; +"endDate_label" = "Koniec"; "due_label" = "Termin:"; -"location_label" = "Miejsce:"; +"location_label" = "Miejsce"; "summary_label" = "Podsumowanie:"; "comment_label" = "Komentarz:"; diff --git a/SoObjects/Appointments/Russian.lproj/Localizable.strings b/SoObjects/Appointments/Russian.lproj/Localizable.strings index ae3700007..190edffc4 100644 --- a/SoObjects/Appointments/Russian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Russian.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Конфиденциальная задача)"; "The event \"%{Summary}\" was created" = "Было создано мероприятие \"%{Summary}\""; "The event \"%{Summary}\" was deleted" = "Мероприятие \"%{Summary}\" было удалено"; "The event \"%{Summary}\" was updated" = "Мероприятие \"%{Summary}\" было обновлено"; -"The following attendees(s) were notified:" = "Следующие приглашенные были оповещены:"; -"The following attendees(s) were added:" = "Следующие люди были добавлены в список приглашенных:"; -"The following attendees(s) were removed:" = "Следующие люди были исключены из списка приглашенных:"; +"The following attendees(s) were notified" = "Следующие приглашенные были оповещены"; +"The following attendees(s) were added" = "Следующие люди были добавлены в список приглашенных"; +"The following attendees(s) were removed" = "Следующие люди были исключены из списка приглашенных"; /* IMIP messages */ -"calendar_label" = "Календарь:"; -"startDate_label" = "Начало:"; -"endDate_label" = "Конец:"; +"calendar_label" = "Календарь"; +"startDate_label" = "Начало"; +"endDate_label" = "Конец"; "due_label" = "Должно быть готово к:"; -"location_label" = "Местонахождение:"; +"location_label" = "Местонахождение"; "summary_label" = "Краткое содержание:"; "comment_label" = "Комментарий:"; diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h index d535806b4..7139b53ea 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.h +++ b/SoObjects/Appointments/SOGoAppointmentFolder.h @@ -160,9 +160,6 @@ typedef enum { - (NSString *) syncTag; - (void) setSyncTag: (NSString *) newSyncTag; -- (BOOL) synchronizeCalendar; -- (void) setSynchronizeCalendar: (BOOL) new; - - (BOOL) includeInFreeBusy; - (void) setIncludeInFreeBusy: (BOOL) newInclude; diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 3ff2b26ec..81c57d0e7 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -432,61 +432,6 @@ static Class iCalEventK = nil; inCategory: @"FolderShowTasks"]; } -- (NSString *) syncTag -{ - NSString *syncTag; - - syncTag = [self folderPropertyValueInCategory: @"FolderSyncTags"]; - if (!syncTag) - syncTag = @""; - - return syncTag; -} - -- (void) setSyncTag: (NSString *) newSyncTag -{ - // Check for duplicated tags - SOGoUserSettings *settings; - NSDictionary *syncTags; - NSArray *values; - - if ([newSyncTag length]) - { - settings = [[context activeUser] userSettings]; - syncTags = [[settings objectForKey: @"Calendar"] - objectForKey: @"FolderSyncTags"]; - values = [syncTags allValues]; - if (![values containsObject: newSyncTag]) - [self setFolderPropertyValue: newSyncTag - inCategory: @"FolderSyncTags"]; - } - else - [self setFolderPropertyValue: nil - inCategory: @"FolderSyncTags"]; -} - -- (BOOL) synchronizeCalendar -{ - NSNumber *synchronize; - - synchronize = [self folderPropertyValueInCategory: @"FolderSynchronize"]; - - return [synchronize boolValue]; -} - -- (void) setSynchronizeCalendar: (BOOL) new -{ - NSNumber *synchronize; - - if (new) - synchronize = [NSNumber numberWithBool: YES]; - else - synchronize = nil; - - [self setFolderPropertyValue: synchronize - inCategory: @"FolderSynchronize"]; -} - // // If the user is the owner of the calendar, by default we include the freebusy information. // diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index e26bb405d..158a53f6b 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2014 Inverse inc. + Copyright (C) 2007-2015 Inverse inc. Copyright (C) 2004-2005 SKYRIX Software AG This file is part of SOGo @@ -317,7 +317,7 @@ enumerator = [attendees objectEnumerator]; while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) [self _removeEventFromUID: currentUID owner: owner @@ -398,7 +398,7 @@ enumerator = [updateAttendees objectEnumerator]; while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) [self _addOrUpdateEvent: newEvent forUID: currentUID @@ -438,7 +438,7 @@ while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) { @@ -520,7 +520,7 @@ enumerator = [theAttendees objectEnumerator]; while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) { [attendees addObject: currentUID]; @@ -635,7 +635,7 @@ for (i = 0; i < [theAttendees count]; i++) { currentAttendee = [theAttendees objectAtIndex: i]; - if ([[currentAttendee uid] isEqualToString: currentUID]) + if ([[currentAttendee uidInContext: context] isEqualToString: currentUID]) break; else currentAttendee = nil; @@ -713,7 +713,7 @@ enumerator = [attendees objectEnumerator]; while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) [self _addOrUpdateEvent: newEvent forUID: currentUID @@ -838,7 +838,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent enumerator = [updatedAttendees objectEnumerator]; while ((currentAttendee = [enumerator nextObject])) { - currentUID = [currentAttendee uid]; + currentUID = [currentAttendee uidInContext: context]; if (currentUID) [self _addOrUpdateEvent: newEvent forUID: currentUID @@ -1215,7 +1215,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent { [delegates addObject: otherDelegate]; - delegatedUID = [otherDelegate uid]; + delegatedUID = [otherDelegate uidInContext: context]; if (delegatedUID) // Delegate attendee is a local user; remove event from their calendar [self _removeEventFromUID: delegatedUID @@ -1244,7 +1244,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent if (addDelegate) { - delegatedUID = [delegate uid]; + delegatedUID = [delegate uidInContext: context]; delegates = [NSArray arrayWithObject: delegate]; [event addToAttendees: delegate]; @@ -1271,11 +1271,11 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent [self sendResponseToOrganizer: event from: ownerUser]; - organizerUID = [[event organizer] uid]; + organizerUID = [[event organizer] uidInContext: context]; // Event is an exception to a recurring event; retrieve organizer from master event if (!organizerUID) - organizerUID = [[(iCalEntityObject*)[[event parent] firstChildWithTag: [self componentTag]] organizer] uid]; + organizerUID = [[(iCalEntityObject*)[[event parent] firstChildWithTag: [self componentTag]] organizer] uidInContext: context]; if (organizerUID) // Update the attendee in organizer's calendar. @@ -1302,7 +1302,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent for (i = 0; i < [attendees count]; i++) { att = [attendees objectAtIndex: i]; - uid = [att uid]; + uid = [att uidInContext: context]; if (uid && att != attendee && ![uid isEqualToString: delegatedUID]) [self _updateAttendee: attendee withDelegate: delegate @@ -1461,7 +1461,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent { if (delegate && ![[delegate email] isEqualToString: [attendee delegatedTo]]) { - delegatedUid = [delegate uid]; + delegatedUid = [delegate uidInContext: context]; if (delegatedUid) delegatedUser = [SOGoUser userWithLogin: delegatedUid]; if (delegatedUser != nil && [event userIsOrganizer: delegatedUser]) @@ -1831,7 +1831,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent // We now make sure that the organizer, if managed by SOGo, is using // its default email when creating events and inviting attendees. - uid = [[SOGoUserManager sharedUserManager] getUIDForEmail: [[event organizer] rfc822Email]]; + uid = [[event organizer] uidInContext: context]; if (uid) { NSDictionary *defaultIdentity; @@ -2144,7 +2144,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent // occurence, and invite someone, the PUT will have the organizer in the // recurrence-id and not in the master event. We must fix this, otherwise // SOGo will break. - if (!recurrenceId && ![[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid]) + if (!recurrenceId && ![[[[[newEvent parent] events] objectAtIndex: 0] organizer] uidInContext: context]) [[[[newEvent parent] events] objectAtIndex: 0] setOrganizer: [newEvent organizer]]; if (userIsOrganizer) diff --git a/SoObjects/Appointments/Slovak.lproj/Localizable.strings b/SoObjects/Appointments/Slovak.lproj/Localizable.strings index 37d697647..6c0325935 100644 --- a/SoObjects/Appointments/Slovak.lproj/Localizable.strings +++ b/SoObjects/Appointments/Slovak.lproj/Localizable.strings @@ -11,16 +11,16 @@ vtodo_class2 = "(Dôverná úloha)"; "The event \"%{Summary}\" was created" = "Udalosť \"%{Summary}\" bola vytvorená"; "The event \"%{Summary}\" was deleted" = "Udalosť \"%{Summary}\" bola vymazaná"; "The event \"%{Summary}\" was updated" = "Udalosť \"%{Summary}\" bola aktualizovaná"; -"The following attendees(s) were notified:" = "Nasledujúci účastník(ci) bol upozornený:"; -"The following attendees(s) were added:" = "Nasledujúci účastník(ci) bol pridaný:"; -"The following attendees(s) were removed:" = "Nasledujúci účastník(ci) bol odstránený:"; +"The following attendees(s) were notified" = "Nasledujúci účastník(ci) bol upozornený"; +"The following attendees(s) were added" = "Nasledujúci účastník(ci) bol pridaný"; +"The following attendees(s) were removed" = "Nasledujúci účastník(ci) bol odstránený"; /* IMIP messages */ -"calendar_label" = "Kalendár:"; -"startDate_label" = "Začiatok:"; -"endDate_label" = "Koniec:"; +"calendar_label" = "Kalendár"; +"startDate_label" = "Začiatok"; +"endDate_label" = "Koniec"; "due_label" = "Platnosť:"; -"location_label" = "Miesto:"; +"location_label" = "Miesto"; "summary_label" = "Zhrnutie:"; "comment_label" = "Komentár:"; diff --git a/SoObjects/Appointments/Slovenian.lproj/Localizable.strings b/SoObjects/Appointments/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..7fb7389fc --- /dev/null +++ b/SoObjects/Appointments/Slovenian.lproj/Localizable.strings @@ -0,0 +1,67 @@ +"Inviting the following persons is prohibited:" = "Povabilo za naslednje osebe je prepovedano:"; +"Personal Calendar" = "Osebni koledar"; +vevent_class0 = "(Javni dogodek)"; +vevent_class1 = "(Osebni dogodek)"; +vevent_class2 = "(Zaupni dogodek)"; + +vtodo_class0 = "(Javno opravilo)"; +vtodo_class1 = "(Osebno opravilo)"; +vtodo_class2 = "(Zaupno opravilo)"; + +/* Receipts */ +"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 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"; + +/* IMIP messages */ +"calendar_label" = "Koledar"; +"startDate_label" = "Začetek"; +"endDate_label" = "Konec"; +"due_label" = "Datum zapadlosti:"; +"location_label" = "Mesto"; +"summary_label" = "Povzetek:"; +"comment_label" = "Komentar:"; + +/* Invitation */ +"Event Invitation: \"%{Summary}\"" = "Povabila na dogodek: \"%{Summary}\""; +"(sent by %{SentBy}) " = "(posladno od %{SentBy})"; +"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} te je povabil na %{Summary}.\n\n\nZačetek: %{StartDate}\nKonec: %{EndDate}\nOpis: %{Description}"; +"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} te je povabil na %{Summary}.\n\n\nZačetek: %{StartDate} at %{StartTime}\nKonec: %{EndDate} at %{EndTime}\nOpis: %{Description}"; + +/* Deletion */ +"Event Cancelled: \"%{Summary}\"" = "Dogodek odpovedan: \"%{Summary}\""; +"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" += "%{Organizer} %{SentByText} je odpovedal ta dogodek: %{Summary}.\n\n\nZačetek: %{StartDate}\nKonec: %{EndDate}\nOpis: %{Description}"; +"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" += "%{Organizer} %{SentByText} je odpovedal ta dogodek: %{Summary}.\n\n\nZačetek: %{StartDate} at %{StartTime}\nKonec: %{EndDate} at %{EndTime}\nOpis: %{Description}"; + +/* Update */ +"The appointment \"%{Summary}\" for the %{OldStartDate} has changed" += "Sestanek \"%{Summary}\" za %{OldStartDate} se je spremenil"; +"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed" += "Sestanek \"%{Summary}\" za %{OldStartDate} at %{OldStartTime} se je spremenil"; +"The following parameters have changed in the \"%{Summary}\" meeting:" += "Naslednji parametri so se spremenil v \"%{Summary}\" srečanju:"; +"Please accept or decline those changes." += "Prosim sprejmi ali zavrni te spremembe."; + +/* Reply */ +"Accepted invitation: \"%{Summary}\"" = "Sprejeto povabilo: \"%{Summary}\""; +"Declined invitation: \"%{Summary}\"" = "Zavrnjeno povabilo: \"%{Summary}\""; +"Delegated invitation: \"%{Summary}\"" = "Dodeljeno povabilo: \"%{Summary}\""; +"Not yet decided on invitation: \"%{Summary}\"" = "Še neodločeno glede povabila: \"%{Summary}\""; +"%{Attendee} %{SentByText}has accepted your event invitation." += "%{Attendee} %{SentByText} je sprejel tvoje povabilo."; +"%{Attendee} %{SentByText}has declined your event invitation." += "%{Attendee} %{SentByText} je zavrnil tvoje povabilo."; +"%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}." += "%{Attendee} %{SentByText} je posredoval povabilo k %{Delegate}."; +"%{Attendee} %{SentByText}has not yet decided upon your event invitation." += "%{Attendee} %{SentByText} se še ni odločil glede tvojega povabila."; + +/* Resources */ +"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Ne morem dostopati do vira: \"%{Cn} %{SystemEmail}\""; +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Doseženo je največje število sočasnih rezervacij (%{NumberOfSimultaneousBookings}) za vir \"%{Cn} %{SystemEmail}\". Konfliktni dogodek je \"%{EventTitle}\", začel se je %{StartDate}."; diff --git a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings index cdc39f607..8bf5fde71 100644 --- a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings +++ b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Tarea confidencial)"; "The event \"%{Summary}\" was created" = "Se creó el evento \"%{Summary}\""; "The event \"%{Summary}\" was deleted" = "Se borró el evento \"%{Summary}\""; "The event \"%{Summary}\" was updated" = "Se actualizó la información del evento \"%{Summary}\""; -"The following attendees(s) were notified:" = "Se notificó a los siguientes participantes:"; -"The following attendees(s) were added:" = "Se agregaron los siguientes participantes:"; -"The following attendees(s) were removed:" = "Se removieron los siguientes participantes:"; +"The following attendees(s) were notified" = "Se notificó a los siguientes participantes"; +"The following attendees(s) were added" = "Se agregaron los siguientes participantes"; +"The following attendees(s) were removed" = "Se removieron los siguientes participantes"; /* IMIP messages */ -"calendar_label" = "Calendario:"; -"startDate_label" = "Inicio:"; -"endDate_label" = "Fin:"; +"calendar_label" = "Calendario"; +"startDate_label" = "Inicio"; +"endDate_label" = "Fin"; "due_label" = "Fecha de finalización:"; -"location_label" = "Lugar:"; +"location_label" = "Lugar"; "summary_label" = "Resumen:"; "comment_label" = "Comentario:"; diff --git a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings index 5add824eb..c323e1cd6 100644 --- a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings +++ b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings @@ -12,16 +12,16 @@ vtodo_class2 = "(Tarea confidencial)"; "The event \"%{Summary}\" was created" = "El evento \"%{Summary}\" ha sido creado"; "The event \"%{Summary}\" was deleted" = "El evento \"%{Summary}\" ha sido borrado"; "The event \"%{Summary}\" was updated" = "El evento \"%{Summary}\" ha sido actualizado"; -"The following attendees(s) were notified:" = "Los invitados siguientes han sido notificado:"; -"The following attendees(s) were added:" = "Los invitados siguientes han sido añadido:"; -"The following attendees(s) were removed:" = "Los invitados siguientes han sido quitado:"; +"The following attendees(s) were notified" = "Los invitados siguientes han sido notificado"; +"The following attendees(s) were added" = "Los invitados siguientes han sido añadido"; +"The following attendees(s) were removed" = "Los invitados siguientes han sido quitado"; /* IMIP messages */ -"calendar_label" = "Calendario:"; -"startDate_label" = "Inicio:"; -"endDate_label" = "Fin:"; +"calendar_label" = "Calendario"; +"startDate_label" = "Inicio"; +"endDate_label" = "Fin"; "due_label" = "Fecha Fin:"; -"location_label" = "Localización:"; +"location_label" = "Localización"; "summary_label" = "Resumen:"; "comment_label" = "Comentario:"; diff --git a/SoObjects/Appointments/Swedish.lproj/Localizable.strings b/SoObjects/Appointments/Swedish.lproj/Localizable.strings index de76dca55..2abee8bbc 100644 --- a/SoObjects/Appointments/Swedish.lproj/Localizable.strings +++ b/SoObjects/Appointments/Swedish.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Konfidentiell uppgift)"; "... from the following event:" = "... från följande händelse:"; /* IMIP messages */ -"startDate_label" = "Startdatum:"; -"endDate_label" = "Slutdatum:"; +"startDate_label" = "Startdatum"; +"endDate_label" = "Slutdatum"; "due_label" = "Datum:"; -"location_label" = "Plats:"; +"location_label" = "Plats"; "summary_label" = "Sammanfattning:"; "comment_label" = "Kommentar:"; diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings index f56b5a28e..e9d1d3583 100644 --- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Конфіденційне завдання)"; "... from the following event:" = "... з участі в події:"; /* IMIP messages */ -"startDate_label" = "Початок:"; -"endDate_label" = "Кінець:"; +"startDate_label" = "Початок"; +"endDate_label" = "Кінець"; "due_label" = "Триватиме до:"; -"location_label" = "Місце:"; +"location_label" = "Місце"; "summary_label" = "Резюме:"; "comment_label" = "Коментар:"; diff --git a/SoObjects/Appointments/Welsh.lproj/Localizable.strings b/SoObjects/Appointments/Welsh.lproj/Localizable.strings index 924e04f9a..a1974de7d 100644 --- a/SoObjects/Appointments/Welsh.lproj/Localizable.strings +++ b/SoObjects/Appointments/Welsh.lproj/Localizable.strings @@ -25,10 +25,10 @@ vtodo_class2 = "(Tasg gyfrinachol)"; "... from the following event:" = "... from the following event:"; /* IMIP messages */ -"startDate_label" = "Start:"; -"endDate_label" = "End:"; +"startDate_label" = "Start"; +"endDate_label" = "End"; "due_label" = "Due Date:"; -"location_label" = "Location:"; +"location_label" = "Location"; "summary_label" = "Summary:"; "comment_label" = "Comment:"; diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m index 48ba026c3..cfdfc445e 100644 --- a/SoObjects/Appointments/iCalEntityObject+SOGo.m +++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m @@ -184,16 +184,17 @@ NSNumber *iCalDistantFutureNumber = nil; NSArray *oldAttendees; unsigned int count, max; iCalPerson *currentAttendee; - NSString *userID; + NSString *userID, *domain; userID = [user login]; + domain = [user domain]; oldAttendees = [self attendees]; max = [oldAttendees count]; newAttendees = [NSMutableArray arrayWithCapacity: max]; for (count = 0; count < max; count++) { currentAttendee = [oldAttendees objectAtIndex: count]; - if (![[currentAttendee uid] isEqualToString: userID]) + if (![[currentAttendee uidInDomain: domain] isEqualToString: userID]) [newAttendees addObject: currentAttendee]; } diff --git a/SoObjects/Appointments/iCalPerson+SOGo.h b/SoObjects/Appointments/iCalPerson+SOGo.h index 3ce9d31a5..87a499f9d 100644 --- a/SoObjects/Appointments/iCalPerson+SOGo.h +++ b/SoObjects/Appointments/iCalPerson+SOGo.h @@ -1,9 +1,6 @@ /* iCalPerson+SOGo.h - this file is part of SOGo * - * Copyright (C) 2007-2012 Inverse inc. - * - * Author: Wolfgang Sourdeau - * Ludovic Marcotte + * Copyright (C) 2007-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +29,8 @@ - (NSString *) mailAddress; - (NSString *) uid; +- (NSString *) uidInDomain: (NSString *) domain; +- (NSString *) uidInContext: (WOContext *) context; - (NSString *) contactIDInContext: (WOContext *) context; - (BOOL) hasSentBy; - (NSString *) sentBy; diff --git a/SoObjects/Appointments/iCalPerson+SOGo.m b/SoObjects/Appointments/iCalPerson+SOGo.m index e3473c969..986960902 100644 --- a/SoObjects/Appointments/iCalPerson+SOGo.m +++ b/SoObjects/Appointments/iCalPerson+SOGo.m @@ -1,9 +1,6 @@ /* iCalPerson+SOGo.m - this file is part of SOGo * - * Copyright (C) 2007-2012 Inverse inc. - * - * Author: Wolfgang Sourdeau - * Ludovic Marcotte + * Copyright (C) 2007-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -67,6 +64,31 @@ static SOGoUserManager *um = nil; return [um getUIDForEmail: [self rfc822Email]]; } +- (NSString *) uidInContext: (WOContext *) context +{ + NSString *domain; + + domain = [[context activeUser] domain]; + + return [self uidInDomain: domain]; +} + +- (NSString *) uidInDomain: (NSString *) domain +{ + NSDictionary *contact; + NSString *uid; + + if (!um) + um = [SOGoUserManager sharedUserManager]; + + uid = nil; + contact = [um contactInfosForUserWithUIDorEmail: [self rfc822Email] inDomain: domain]; + if (contact) + uid = [contact valueForKey: @"c_uid"]; + + return uid; +} + - (NSString *) contactIDInContext: (WOContext *) context { NSString *domain, *uid; diff --git a/SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings b/SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..075b084aa --- /dev/null +++ b/SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,2 @@ +"Personal Address Book" = "個人通訊錄"; +"Collected Address Book" = "公用通訊錄"; diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile index a27339462..510c38c1f 100644 --- a/SoObjects/Contacts/GNUmakefile +++ b/SoObjects/Contacts/GNUmakefile @@ -27,7 +27,7 @@ Contacts_OBJC_FILES = \ Contacts_RESOURCE_FILES += \ product.plist \ -Contacts_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +Contacts_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh Contacts_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/SoObjects/Contacts/Slovenian.lproj/Localizable.strings b/SoObjects/Contacts/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..e90974bf0 --- /dev/null +++ b/SoObjects/Contacts/Slovenian.lproj/Localizable.strings @@ -0,0 +1,2 @@ +"Personal Address Book" = "Osebni adresar"; +"Collected Address Book" = "Zbrani adresar"; diff --git a/SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings b/SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..c97411cbf --- /dev/null +++ b/SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,2 @@ +"OtherUsersFolderName" = "其他使用者"; +"SharedFoldersName" = "共用資料匣"; diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 1a931ed99..da5092ea6 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -50,6 +50,8 @@ Mailer_RESOURCE_FILES += \ SOGoMailBrazilianPortugueseReply.wo \ SOGoMailCatalanForward.wo \ SOGoMailCatalanReply.wo \ + SOGoMailChineseTaiwanForward.wo \ + SOGoMailChineseTaiwanReply.wo \ SOGoMailCzechForward.wo \ SOGoMailCzechReply.wo \ SOGoMailDanishForward.wo \ @@ -80,6 +82,8 @@ Mailer_RESOURCE_FILES += \ SOGoMailRussianReply.wo \ SOGoMailSlovakForward.wo \ SOGoMailSlovakReply.wo \ + SOGoMailSlovenianForward.wo \ + SOGoMailSlovenianReply.wo \ SOGoMailSpanishSpainForward.wo \ SOGoMailSpanishSpainReply.wo \ SOGoMailSpanishArgentinaForward.wo \ @@ -91,8 +95,7 @@ Mailer_RESOURCE_FILES += \ SOGoMailWelshForward.wo \ SOGoMailWelshReply.wo - -Mailer_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +Mailer_LANGUAGES = Arabic Basque BrazilianPortuguese ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovenian Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh Mailer_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.wod b/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.wod index 96bb247ee..f2436acc9 100755 --- a/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.wod +++ b/SoObjects/Mailer/SOGoMailBasqueForward.wo/SOGoMailBasqueForward.wod @@ -86,12 +86,3 @@ signaturePlacementOnBottom: WOConditional { condition = signaturePlacementOnTop; negate = YES; } - -signaturePlacementOnTop: WOConditional { - condition = signaturePlacementOnTop; -} - -signaturePlacementOnBottom: WOConditional { - condition = signaturePlacementOnTop; - negate = YES; -} diff --git a/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html b/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html new file mode 100644 index 000000000..dacde8b2e --- /dev/null +++ b/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html @@ -0,0 +1,16 @@ +<#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +-------- 原始信件 --------<#newLine/> +主旨: <#subject/><#newLine/> +日期: <#date/><#newLine/> +寄件者: <#from/><#newLine/> +<#hasReplyTo>回覆帳號: <#replyTo/><#hasOrganization>公司: <#organization/>收件者: <#to/><#newLine/> +<#hasCc>副本: <#cc/><#hasNewsGroups>新聞群組: <#newsgroups/><#hasReferences>參考: <#references/><#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> +<#newLine/> diff --git a/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod b/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod new file mode 100644 index 000000000..f2436acc9 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod @@ -0,0 +1,88 @@ +subject: WOString { + value = subject; + escapeHTML = NO; +} + +date: WOString { + value = date; + escapeHTML = NO; +} + +from: WOString { + value = from; + escapeHTML = NO; +} + +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + +hasReplyTo: WOConditional { + condition = hasReplyTo; +} + +replyTo: WOString { + value = replyTo; + escapeHTML = NO; +} + +hasOrganization: WOConditional { + condition = hasOrganization; +} + +organization: WOString { + value = organization; + escapeHTML = NO; +} + +to: WOString { + value = to; + escapeHTML = NO; +} + +hasCc: WOConditional { + condition = hasCc; +} + +cc: WOString { + value = cc; + escapeHTML = NO; +} + +hasNewsGroups: WOConditional { + condition = hasNewsGroups; +} + +newsgroups: WOString { + value = newsgroups; + escapeHTML = NO; +} + +hasReferences: WOConditional { + condition = hasReferences; +} + +references: WOString { + value = references; + escapeHTML = NO; +} + +messageBody: WOString { + value = messageBody; + escapeHTML = NO; +} + +signature: WOString { + value = signature; + escapeHTML = NO; +} + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.html b/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.html new file mode 100644 index 000000000..24c91fe72 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.html @@ -0,0 +1,16 @@ +<#replyPlacementOnTop><#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +<#outlookMode>-------- 原始信件 --------<#newLine/> +主旨: <#subject/><#newLine/> +日期: <#date/><#newLine/> +寄件者: <#from/><#newLine/> +<#hasReplyTo>回覆帳號: <#replyTo/><#hasOrganization>公司: <#organization/>收件者: <#to/><#newLine/> +<#hasCc>副本: <#cc/><#hasNewsGroups>新聞群組: <#newsgroups/><#hasReferences>參考: <#references/><#newLine/> +<#standardMode>日期 <#date/>, <#from/> 編輯:<#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#replyPlacementOnBottom><#newLine/> +<#newLine/> +<#signaturePlacementOnBottom><#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.wod b/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.wod new file mode 100644 index 000000000..3fbed6d61 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailChineseTaiwanReply.wo/SOGoMailChineseTaiwanReply.wod @@ -0,0 +1,106 @@ +outlookMode: WOConditional { + condition = outlookMode; +} + +standardMode: WOConditional { + condition = outlookMode; + negate = YES; +} + +subject: WOString { + value = subject; + escapeHTML = NO; +} + +date: WOString { + value = date; + escapeHTML = NO; +} + +from: WOString { + value = from; + escapeHTML = NO; +} + +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + +hasReplyTo: WOConditional { + condition = hasReplyTo; +} + +replyTo: WOString { + value = replyTo; + escapeHTML = NO; +} + +hasOrganization: WOConditional { + condition = hasOrganization; +} + +organization: WOString { + value = organization; + escapeHTML = NO; +} + +to: WOString { + value = to; + escapeHTML = NO; +} + +hasCc: WOConditional { + condition = hasCc; +} + +cc: WOString { + value = cc; + escapeHTML = NO; +} + +hasNewsGroups: WOConditional { + condition = hasNewsGroups; +} + +newsgroups: WOString { + value = newsgroups; + escapeHTML = NO; +} + +hasReferences: WOConditional { + condition = hasReferences; +} + +references: WOString { + value = references; + escapeHTML = NO; +} + +messageBody: WOString { + value = messageBody; + escapeHTML = NO; +} + +signature: WOString { + value = signature; + escapeHTML = NO; +} + +replyPlacementOnTop: WOConditional { + condition = replyPlacementOnTop; +} + +replyPlacementOnBottom: WOConditional { + condition = replyPlacementOnTop; + negate = YES; +} + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod index 96bb247ee..f2436acc9 100644 --- a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod +++ b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.wod @@ -86,12 +86,3 @@ signaturePlacementOnBottom: WOConditional { condition = signaturePlacementOnTop; negate = YES; } - -signaturePlacementOnTop: WOConditional { - condition = signaturePlacementOnTop; -} - -signaturePlacementOnBottom: WOConditional { - condition = signaturePlacementOnTop; - negate = YES; -} diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h index 84e51d9ca..8ea595344 100644 --- a/SoObjects/Mailer/SOGoMailFolder.h +++ b/SoObjects/Mailer/SOGoMailFolder.h @@ -98,7 +98,8 @@ - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken - fromDate: (NSCalendarDate *) theStartDate; + fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress; /* flags */ diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m index 884e838b6..12a81d6ae 100644 --- a/SoObjects/Mailer/SOGoMailFolder.m +++ b/SoObjects/Mailer/SOGoMailFolder.m @@ -2090,6 +2090,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) - (NSArray *) syncTokenFieldsWithProperties: (NSArray *) theProperties matchingSyncToken: (NSString *) theSyncToken fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress { EOQualifier *searchQualifier; NSMutableArray *allTokens; @@ -2166,6 +2167,9 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) for (i = 0; i < [fetchResults count]; i++) { + if ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"] && initialLoadInProgress) + continue; + d = [NSDictionary dictionaryWithObject: ([[[fetchResults objectAtIndex: i] objectForKey: @"flags"] containsObject: @"deleted"]) ? [NSNull null] : [[fetchResults objectAtIndex: i] objectForKey: @"modseq"] forKey: [[[fetchResults objectAtIndex: i] objectForKey: @"uid"] stringValue]]; [allTokens addObject: d]; @@ -2176,7 +2180,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) if (highestmodseq == 0) highestmodseq = 1; - if (highestmodseq > 0) + if (highestmodseq > 0 && !initialLoadInProgress) { id uid; diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h index 54dc5f63b..d4c516959 100644 --- a/SoObjects/Mailer/SOGoMailForward.h +++ b/SoObjects/Mailer/SOGoMailForward.h @@ -49,6 +49,9 @@ @interface SOGoMailCatalanForward : SOGoMailForward @end +@interface SOGoMailChineseTaiwanForward : SOGoMailForward +@end + @interface SOGoMailCzechForward : SOGoMailForward @end @@ -103,6 +106,9 @@ @interface SOGoMailSlovakForward : SOGoMailForward @end +@interface SOGoMailSlovenianForward : SOGoMailForward +@end + @interface SOGoMailUkrainianForward : SOGoMailForward @end diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index 2de3a64c1..3450539d5 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -260,6 +260,9 @@ @implementation SOGoMailCatalanForward @end +@implementation SOGoMailChineseTaiwanForward +@end + @implementation SOGoMailCzechForward @end @@ -314,6 +317,9 @@ @implementation SOGoMailSlovakForward @end +@implementation SOGoMailSlovenianForward +@end + @implementation SOGoMailUkrainianForward @end diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h index f83d1e872..e2af0fcaf 100644 --- a/SoObjects/Mailer/SOGoMailReply.h +++ b/SoObjects/Mailer/SOGoMailReply.h @@ -48,6 +48,9 @@ @interface SOGoMailCatalanReply : SOGoMailReply @end +@interface SOGoMailChineseTaiwanReply : SOGoMailReply +@end + @interface SOGoMailCzechReply : SOGoMailReply @end @@ -102,6 +105,9 @@ @interface SOGoMailSlovakReply : SOGoMailReply @end +@interface SOGoMailSlovenianReply : SOGoMailReply +@end + @interface SOGoMailUkrainianReply : SOGoMailReply @end diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m index a47e65d54..d0bd38801 100644 --- a/SoObjects/Mailer/SOGoMailReply.m +++ b/SoObjects/Mailer/SOGoMailReply.m @@ -98,6 +98,9 @@ @implementation SOGoMailCatalanReply @end +@implementation SOGoMailChineseTaiwanReply +@end + @implementation SOGoMailCzechReply @end @@ -152,6 +155,9 @@ @implementation SOGoMailSlovakReply @end +@implementation SOGoMailSlovenianReply +@end + @implementation SOGoMailUkrainianReply @end diff --git a/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.html b/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.html new file mode 100644 index 000000000..ca2b6d73c --- /dev/null +++ b/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.html @@ -0,0 +1,16 @@ +<#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +-------- Original Message --------<#newLine/> +Zadeva: <#subject/><#newLine/> +Datum: <#date/><#newLine/> +Od: <#from/><#newLine/> +<#hasReplyTo>Odgovori: <#replyTo/><#hasOrganization>Organizacija: <#organization/>Za: <#to/><#newLine/> +<#hasCc>KP: <#cc/><#hasNewsGroups>Novicarske skupine: <#newsgroups/><#hasReferences>Reference: <#references/><#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#signaturePlacementOnBottom><#newLine/> +<#newLine/> +<#signature/> +<#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.wod b/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.wod new file mode 100644 index 000000000..f2436acc9 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailSlovenianForward.wo/SOGoMailSlovenianForward.wod @@ -0,0 +1,88 @@ +subject: WOString { + value = subject; + escapeHTML = NO; +} + +date: WOString { + value = date; + escapeHTML = NO; +} + +from: WOString { + value = from; + escapeHTML = NO; +} + +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + +hasReplyTo: WOConditional { + condition = hasReplyTo; +} + +replyTo: WOString { + value = replyTo; + escapeHTML = NO; +} + +hasOrganization: WOConditional { + condition = hasOrganization; +} + +organization: WOString { + value = organization; + escapeHTML = NO; +} + +to: WOString { + value = to; + escapeHTML = NO; +} + +hasCc: WOConditional { + condition = hasCc; +} + +cc: WOString { + value = cc; + escapeHTML = NO; +} + +hasNewsGroups: WOConditional { + condition = hasNewsGroups; +} + +newsgroups: WOString { + value = newsgroups; + escapeHTML = NO; +} + +hasReferences: WOConditional { + condition = hasReferences; +} + +references: WOString { + value = references; + escapeHTML = NO; +} + +messageBody: WOString { + value = messageBody; + escapeHTML = NO; +} + +signature: WOString { + value = signature; + escapeHTML = NO; +} + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.html b/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.html new file mode 100644 index 000000000..310c9b168 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.html @@ -0,0 +1,16 @@ +<#replyPlacementOnTop><#newLine/> +<#newLine/> +<#signaturePlacementOnTop><#newLine/> +<#signature/><#newLine/> +<#outlookMode>-------- Izvorno sporocilo --------<#newLine/> +Zadeva: <#subject/><#newLine/> +Datum: <#date/><#newLine/> +Od: <#from/><#newLine/> +<#hasReplyTo>Odgovori: <#replyTo/><#hasOrganization>Organizacija: <#organization/>Za: <#to/><#newLine/> +<#hasCc>KP: <#cc/><#hasNewsGroups>Novicarske skupine: <#newsgroups/><#hasReferences>Reference: <#references/><#newLine/> +<#standardMode>Dne <#date/>, je <#from/> napisal-a:<#newLine/> +<#newLine/> +<#messageBody/><#newLine/> +<#replyPlacementOnBottom><#newLine/> +<#newLine/> +<#signaturePlacementOnBottom><#signature/><#newLine/> diff --git a/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.wod b/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.wod new file mode 100644 index 000000000..3fbed6d61 --- /dev/null +++ b/SoObjects/Mailer/SOGoMailSlovenianReply.wo/SOGoMailSlovenianReply.wod @@ -0,0 +1,106 @@ +outlookMode: WOConditional { + condition = outlookMode; +} + +standardMode: WOConditional { + condition = outlookMode; + negate = YES; +} + +subject: WOString { + value = subject; + escapeHTML = NO; +} + +date: WOString { + value = date; + escapeHTML = NO; +} + +from: WOString { + value = from; + escapeHTML = NO; +} + +newLine: WOString { + value = newLine; + escapeHTML = NO; +} + +hasReplyTo: WOConditional { + condition = hasReplyTo; +} + +replyTo: WOString { + value = replyTo; + escapeHTML = NO; +} + +hasOrganization: WOConditional { + condition = hasOrganization; +} + +organization: WOString { + value = organization; + escapeHTML = NO; +} + +to: WOString { + value = to; + escapeHTML = NO; +} + +hasCc: WOConditional { + condition = hasCc; +} + +cc: WOString { + value = cc; + escapeHTML = NO; +} + +hasNewsGroups: WOConditional { + condition = hasNewsGroups; +} + +newsgroups: WOString { + value = newsgroups; + escapeHTML = NO; +} + +hasReferences: WOConditional { + condition = hasReferences; +} + +references: WOString { + value = references; + escapeHTML = NO; +} + +messageBody: WOString { + value = messageBody; + escapeHTML = NO; +} + +signature: WOString { + value = signature; + escapeHTML = NO; +} + +replyPlacementOnTop: WOConditional { + condition = replyPlacementOnTop; +} + +replyPlacementOnBottom: WOConditional { + condition = replyPlacementOnTop; + negate = YES; +} + +signaturePlacementOnTop: WOConditional { + condition = signaturePlacementOnTop; +} + +signaturePlacementOnBottom: WOConditional { + condition = signaturePlacementOnTop; + negate = YES; +} diff --git a/SoObjects/Mailer/Slovenian.lproj/Localizable.strings b/SoObjects/Mailer/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..6dd4f0cfb --- /dev/null +++ b/SoObjects/Mailer/Slovenian.lproj/Localizable.strings @@ -0,0 +1,2 @@ +"OtherUsersFolderName" = "Ostali uporabniki"; +"SharedFoldersName" = "Mape v skupni rabi"; diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist index d0557c666..572f90e73 100644 --- a/SoObjects/SOGo/SOGoDefaults.plist +++ b/SoObjects/SOGo/SOGoDefaults.plist @@ -39,11 +39,11 @@ SOGoLoginModule = "Mail"; SOGoLanguage = "English"; - SOGoSupportedLanguages = ( "Arabic", "Basque", "Catalan", "Czech", "Dutch", "Danish", "Welsh", "English", + SOGoSupportedLanguages = ( "Arabic", "Basque", "Catalan", "ChineseTaiwan", "Czech", "Dutch", "Danish", "Welsh", "English", "SpanishSpain", "SpanishArgentina", "Finnish", "French", "German", "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", "Slovak", - "Ukrainian", "Swedish" ); + "Slovenian", "Ukrainian", "Swedish" ); SOGoTimeZone = "UTC"; SOGoDayStartTime = "8"; @@ -87,8 +87,6 @@ $label5 = ("Later", "#993399"); }; - SOGoCalendarCategories = ("Customer", "Calls", "Favorites", "Meeting", "Ideas", "Miscellaneous", "Birthday", "Anniversary", "Vacation", "Travel", "Projects", "Suppliers", "Gifts", "Clients", "Issues", "Business", "Holidays", "Personal", "Status", "Competition", "Follow up", "Public Holiday"); - SOGoCalendarCategoriesColors = { "Customer" = "#F0F0F0"; "Calls" = "#F0F0F0"; "Favorites" = "#F0F0F0"; "Meeting" = "#F0F0F0"; "Ideas" = "#F0F0F0"; "Miscellaneous" = "#F0F0F0"; "Birthday" = "#F0F0F0"; "Anniversary" = "#F0F0F0"; "Vacation" = "#F0F0F0"; "Travel" = "#F0F0F0"; "Projects" = "#F0F0F0"; "Suppliers" = "#F0F0F0"; "Gifts" = "#F0F0F0"; "Clients" = "#F0F0F0"; "Issues" = "#F0F0F0"; "Business" = "#F0F0F0"; "Holidays" = "#F0F0F0"; "Personal" = "#F0F0F0"; "Status" = "#F0F0F0"; "Competition" = "#F0F0F0"; "Follow up" = "#F0F0F0"; "Public Holiday" = "#F0F0F0"; }; SOGoSubscriptionFolderFormat = "%{FolderName} (%{UserName} <%{Email}>)"; diff --git a/SoObjects/SOGo/SOGoGCSFolder.h b/SoObjects/SOGo/SOGoGCSFolder.h index 9b8de6b35..6a3f56fa7 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.h +++ b/SoObjects/SOGo/SOGoGCSFolder.h @@ -77,6 +77,9 @@ - (id) folderPropertyValueInCategory: (NSString *) theKey forUser: (SOGoUser *) theUser; +- (BOOL) synchronize; +- (void) setSynchronize: (BOOL) new; + /* lower level fetches */ - (void) deleteEntriesWithIds: (NSArray *) ids; @@ -128,8 +131,8 @@ - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken - fromDate: (NSCalendarDate *) theStartDate; - + fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress; /* multiget helper */ - (WOResponse *) performMultigetInContext: (WOContext *) queryContext diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 9f77359e9..8e245bd9a 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -301,6 +301,29 @@ static NSArray *childRecordFields = nil; return name; } +- (BOOL) synchronize +{ + NSNumber *synchronize; + + synchronize = [self folderPropertyValueInCategory: @"FolderSynchronize"]; + + return [synchronize boolValue]; +} + +- (void) setSynchronize: (BOOL) new +{ + NSNumber *synchronize; + + if (new) + synchronize = [NSNumber numberWithBool: YES]; + else + synchronize = nil; + + [self setFolderPropertyValue: synchronize + inCategory: @"FolderSynchronize"]; +} + + /* This method fetches the display name defined by the owner, but is also the fallback when a subscriber has not redefined the display name yet in their environment. */ @@ -1151,6 +1174,7 @@ static NSArray *childRecordFields = nil; - (NSArray *) syncTokenFieldsWithProperties: (NSDictionary *) properties matchingSyncToken: (NSString *) syncToken fromDate: (NSCalendarDate *) theStartDate + initialLoad: (BOOL) initialLoadInProgress { /* TODO: - validation: @@ -1200,13 +1224,17 @@ static NSArray *childRecordFields = nil; mRecords = [NSMutableArray arrayWithArray: [self _fetchFields: fields withQualifier: qualifier ignoreDeleted: YES]]; - qualifier = [EOQualifier qualifierWithQualifierFormat: - @"c_lastmodified > %d and c_deleted == 1", - syncTokenInt]; - fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_lastmodified", @"c_deleted", nil]; - [mRecords addObjectsFromArray: [self _fetchFields: fields - withQualifier: qualifier - ignoreDeleted: NO]]; + if (!initialLoadInProgress) + { + qualifier = [EOQualifier qualifierWithQualifierFormat: + @"c_lastmodified > %d and c_deleted == 1", + syncTokenInt]; + fields = [NSMutableArray arrayWithObjects: @"c_name", @"c_lastmodified", @"c_deleted", nil]; + [mRecords addObjectsFromArray: [self _fetchFields: fields + withQualifier: qualifier + ignoreDeleted: NO]]; + } + records = mRecords; } else @@ -1499,7 +1527,9 @@ static NSArray *childRecordFields = nil; properties = [self parseDAVRequestedProperties: propElement]; records = [self syncTokenFieldsWithProperties: properties matchingSyncToken: syncToken - fromDate: nil]; + fromDate: nil + initialLoad: NO]; + [self _appendComponentProperties: [properties allKeys] fromRecords: records matchingSyncToken: [syncToken intValue] diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m index d5a6a94d0..598a44614 100644 --- a/SoObjects/SOGo/SOGoUserManager.m +++ b/SoObjects/SOGo/SOGoUserManager.m @@ -780,7 +780,10 @@ static Class NSNullK; NSRange r; r = [theUID rangeOfString: [NSString stringWithFormat: @"@%@", theDomain]]; - theUID = [theUID substringToIndex: r.location]; + + // We check if the range is ok here since we could be using DomainLessLogin + if (r.location != NSNotFound) + theUID = [theUID substringToIndex: r.location]; } sogoSources = [[self authenticationSourceIDsInDomain: theDomain] objectEnumerator]; diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m index 7d0de6c07..aa881b9d3 100644 --- a/SoObjects/SOGo/SQLSource.m +++ b/SoObjects/SOGo/SQLSource.m @@ -489,10 +489,12 @@ forKey: [field substringFromIndex: 2]]; } + // FIXME // We have to do this here since we do not manage modules // constraints right now over a SQL backend. [response setObject: [NSNumber numberWithBool: YES] forKey: @"CalendarAccess"]; [response setObject: [NSNumber numberWithBool: YES] forKey: @"MailAccess"]; + [response setObject: [NSNumber numberWithBool: YES] forKey: @"ActiveSyncAccess"]; // We set the domain, if any value = nil; diff --git a/Tests/Integration/preferences.py b/Tests/Integration/preferences.py index bc861a2fd..e8d715a9a 100644 --- a/Tests/Integration/preferences.py +++ b/Tests/Integration/preferences.py @@ -10,11 +10,11 @@ import sogoLogin # must be kept in sync with SoObjects/SOGo/SOGoDefaults.plist # this should probably be fetched magically... -SOGoSupportedLanguages = [ "Arabic", "Basque", "Catalan", "Czech", "Dutch", "Danish", "Welsh", "English", "Finnish", +SOGoSupportedLanguages = [ "Arabic", "Basque", "Catalan", "ChineseTaiwan", "Czech", "Dutch", "Danish", "Welsh", "English", "Finnish", "SpanishSpain", "SpanishArgentina", "French", "German", "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", "Slovak", - "Ukrainian", "Swedish" ]; + "Slovenian", "Ukrainian", "Swedish" ]; daysBetweenResponseList=[1,2,3,5,7,14,21,30] class HTTPPreferencesPOST (webdavlib.HTTPPOST): diff --git a/Tests/Unit/TestNSString+URLEscaping.m b/Tests/Unit/TestNSString+URLEscaping.m index b0a1fce12..b6116cda2 100644 --- a/Tests/Unit/TestNSString+URLEscaping.m +++ b/Tests/Unit/TestNSString+URLEscaping.m @@ -35,7 +35,7 @@ { const char *inStrings[] = { "éléphant", "2š", "sogo+test", NULL }; const char **inString; - NSString *outStrings[] = { @"%C3%A9l%C3%A9phant", @"2%C5%A1", @"sogo+test" }; + NSString *outStrings[] = { @"%C3%A9l%C3%A9phant", @"2%C5%A1", @"sogo%2Btest" }; NSString **outString; NSString *result, *error; diff --git a/Tools/SOGoToolRemove.m b/Tools/SOGoToolRemove.m index 77af43cf2..34ef10bad 100644 --- a/Tools/SOGoToolRemove.m +++ b/Tools/SOGoToolRemove.m @@ -116,13 +116,19 @@ static NSURL *tableURL = nil; - (void) _removeUserFolders: (NSString *) userId { NSArray *folderPaths; + NSString *path; int count, max; folderPaths = [self _userFolderPaths: userId]; max = [folderPaths count]; if (max > 0) for (count = 0; count < max; count++) - [fm deleteFolderAtPath: [folderPaths objectAtIndex: count]]; + { + path = [folderPaths objectAtIndex: count]; + [fm deleteFolderAtPath: path]; + if (verbose) + NSLog (@"Deleting %@", path); + } else NSLog (@"No folder returned for user '%@'", userId); } @@ -144,6 +150,8 @@ static NSURL *tableURL = nil; userId]; if ([fc evaluateExpressionX: sql]) NSLog (@"Unable to delete the preference record for '%@'", userId); + else if (verbose) + NSLog (@"Removed preference record for '%@'", userId); [cm releaseChannel: fc]; } } diff --git a/UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings b/UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..f04903c87 --- /dev/null +++ b/UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,15 @@ +/* this file is in UTF-8 format! */ + +"Help" = "幫助"; +"Close" = "關閉"; + +"Modules" = "模組"; + +/* Modules short names */ +"ACLs" = "存取控制清單"; + +/* Modules titles */ +"ACLs_title" = "使用者資料匣存取控制清單"; + +/* Modules descriptions */ +"ACLs_description" = "\"

存取控制清單管理模組允許異動每個使用者行事曆及通訊錄的使用權限。

如要修改使用者資料匣的使用權限，請在視窗上方的搜尋欄位輸入使用者名稱後，將遊標移到要修改的資料匣上連續按兩下滑鼠。

"; diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile index 949624e98..450973525 100644 --- a/UI/AdministrationUI/GNUmakefile +++ b/UI/AdministrationUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = AdministrationUI AdministrationUI_PRINCIPAL_CLASS = AdministrationUIProduct -AdministrationUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +AdministrationUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh AdministrationUI_OBJC_FILES = \ AdministrationUIProduct.m \ diff --git a/UI/AdministrationUI/Slovenian.lproj/Localizable.strings b/UI/AdministrationUI/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..ca15c0653 --- /dev/null +++ b/UI/AdministrationUI/Slovenian.lproj/Localizable.strings @@ -0,0 +1,15 @@ +/* this file is in UTF-8 format! */ + +"Help" = "Pomoč"; +"Close" = "Zapri"; + +"Modules" = "Moduli"; + +/* Modules short names */ +"ACLs" = "ACLi"; + +/* Modules titles */ +"ACLs_title" = "Urejanje uporabniških map ACL"; + +/* Modules descriptions */ +"ACLs_description" = "

The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.

To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.

"; diff --git a/UI/Common/ChineseTaiwan.lproj/Localizable.strings b/UI/Common/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..21f7261bc --- /dev/null +++ b/UI/Common/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,118 @@ +/* this file is in UTF-8 format! */ + +/* toolbars */ +"Save" = "儲存"; +"Close" = "關閉"; +"Edit User Rights" = "編輯使用者權限"; + +"Home" = "首頁"; +"Calendar" = "行事曆"; +"Address Book" = "通訊錄"; +"Mail" = "郵件"; +"Preferences" = "個人設定"; +"Administration" = "管理"; +"Disconnect" = "離線"; +"Right Administration" = "管理權限"; +"Log Console (dev.)" = "登錄控制台(dev.)"; + +"User" = "使用者"; +"Vacation message is enabled" = "啟用休假自動回覆訊息功能"; + +"Help" = "幫助"; + +"noJavascriptError" = "SOGo 需要執行Javascript指令。請確定您的瀏覽器偏好設定該選項是開啟的。"; +"noJavascriptRetry" = "重試"; + +"Owner:" = "擁有者"; +"Publish the Free/Busy information" = "公開空閒/忙錄的訊息"; + +"Add..." = "增加..."; +"Remove" = "移除"; + +"Subscribe User" = "訂閱者"; + +"Any Authenticated User" = "任何授權使用者"; +"Public Access" = "公開存取"; +"Any user not listed above" = "列表以外的使用者"; +"Anybody accessing this resource from the public area" = "由公開區域存取資源的任何人"; + +"Sorry, the user rights can not be configured for that object." = "對不起, 使用者的權限無法操作這個項目。"; + +"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?" + = "這個系統的所有帳號都能存取您的郵件信箱\"%{0}\"。您確定所有帳號都可以信任嗎?"; +"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?" + = "這個系統的所有帳號都能存取您的行事曆 \"%{0}\"。您確定所有帳號都可以信任嗎?"; +"Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?" + = "任何人都可以存取您的行事曆 \"%{0}\", 且不限定只有同系統的帳號。確定要在網路上公開行事曆嗎?"; +"Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?" + = "這個系統的所有帳號都能存取您的通訊錄 \"%{0}\"。您確定所有帳號都可以信任嗎?"; +"Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?" + = "任何人都可以存取您的通訊錄 \"%{0}\", 且不限定只有同系統的帳號。確定要在網路上公開通訊錄嗎?"; +"Give Access" = "允許存取"; +"Keep Private" = "保持隱私"; + +/* generic.js */ +"Unable to subscribe to that folder!" + = "無法訂閱這個資料匣!"; +"You cannot subscribe to a folder that you own!" + = "您不能訂閱自己的資料匣!"; +"Unable to unsubscribe from that folder!" + = "無法在資料匣取消訂閱!"; +"You cannot unsubscribe from a folder that you own!" + = "您不能取消訂閱自己的資料匣!"; +"Unable to rename that folder!" = "不能更改資料匣的名稱!"; +"You have already subscribed to that folder!" + = "您己經訂閱了這個資料匣!"; +"The user rights cannot be edited for this object!" + = "使用者的權限無法編輯這個項目!"; +"A folder by that name already exists." = "己有相同名稱的資料匣。"; +"You cannot create a list in a shared address book." + = "您無法在共用的通訊錄新增列表。"; +"Warning" = "警告"; +"Can't contact server" = "連接伺服器失敗。請稍後再試。"; + +"You are not allowed to access this module or this system. Please contact your system administrator." += "您沒有權限存取這個模組或系統。請聯絡您的系統管理者。"; +"You don't have the required privileges to perform the operation." += "您沒有權限執行這項操作。"; + +"noEmailForDelegation" = "您必須指定代理人的電子郵件地址。"; +"delegate is organizer" = "您指定的代理人是組織；請另外指定。"; +"delegate is a participant" = "您指定的代理人己經是受邀者。"; +"delegate is a group" = "您指定的電子郵件帳號為群組。您必須指定代理人的電子郵件帳號。"; + +"Snooze for " = "提醒"; +"5 minutes" = "5分鐘"; +"10 minutes" = "10分鐘"; +"15 minutes" = "15分鐘"; +"30 minutes" = "30分鐘"; +"45 minutes" = "45分鐘"; +"1 hour" = " 1小時"; +"1 day" = "1天"; + +/* common buttons */ +"OK" = "確定"; +"Cancel" = "取消"; +"Yes" = "是"; +"No" = "不是"; + +/* alarms */ +"Reminder:" = "提醒"; +"Start:" = "開始:"; +"Due Date:" = "到期日:"; +"Location:" = "地點:"; + +/* mail labels */ +"Important" = "重要等級"; +"Work" = "工作"; +"Personal" = "私人"; +"To Do" = "待辦"; +"Later" = "稍後"; + +"a2_Sunday" = "星期日"; +"a2_Monday" = "星期一"; +"a2_Tuesday" = "星期二"; +"a2_Wednesday" = "星期三"; +"a2_Thursday" = "星期四"; +"a2_Friday" = "星期五"; +"a2_Saturday" = "星期六"; diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index 45357b5f2..4f03c40fd 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = CommonUI CommonUI_PRINCIPAL_CLASS = CommonUIProduct -CommonUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +CommonUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh CommonUI_OBJC_FILES += \ CommonUIProduct.m \ diff --git a/UI/Common/Slovenian.lproj/Localizable.strings b/UI/Common/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..a63967362 --- /dev/null +++ b/UI/Common/Slovenian.lproj/Localizable.strings @@ -0,0 +1,118 @@ +/* this file is in UTF-8 format! */ + +/* toolbars */ +"Save" = "Shrani"; +"Close" = "Zapri"; +"Edit User Rights" = "Uredi pravice uporabnika"; + +"Home" = "Domov"; +"Calendar" = "Koledar"; +"Address Book" = "Adresar"; +"Mail" = "Pošta"; +"Preferences" = "Nastavitve"; +"Administration" = "Administracija"; +"Disconnect" = "Prekini povezavo"; +"Right Administration" = "Pravica administriranja"; +"Log Console (dev.)" = "Log konzole (dev.)"; + +"User" = "Uporabnik"; +"Vacation message is enabled" = "Obvestilo o odsotnosti je omogočeno"; + +"Help" = "Pomoč"; + +"noJavascriptError" = "SOGo zahteva zagnan Javascript. Prosim zagotovi, da je ta možnost omogočena in aktivirana v tvojih nastavitvah brskalnika."; +"noJavascriptRetry" = "Ponovi"; + +"Owner:" = "Lastnik:"; +"Publish the Free/Busy information" = "Objavi informacijo Prosto/Zasedeno "; + +"Add..." = "Dodaj..."; +"Remove" = "Odstrani"; + +"Subscribe User" = "Naroči uporabnika"; + +"Any Authenticated User" = "Katerikoli preverjeni uporabnik"; +"Public Access" = "Javni dostop"; +"Any user not listed above" = "Katerikoli navedeni uporabnik zgoraj"; +"Anybody accessing this resource from the public area" = "Katerikoli, ki dostopa ta vir iz javnega območja"; + +"Sorry, the user rights can not be configured for that object." = "Oprosti, pravice za uporabnika ni mogoče konfigurirati za ta objekt."; + +"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?" + = "Katerikoli uporabnik z računom na tem sistemu bo lahko dostopal do tvojega poštnega predala \"%{0}\". Si prepričan, da zaupaš vsem?"; +"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?" + = "Katerikoli uporabnik z računom na tem sistemu bo lahko dostopal do tvojega koledarja \"%{0}\". Si prepričan, da zaupaš vsem?"; +"Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?" + = "Kdorkoli na internetu bo imel možnost dostopa do tvojega koledarja \"%{0}\" tudi, če nima računa na tem sistemu. Je ta informacija primerna za javni internet?"; +"Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?" + = "Katerikoli uporabnik z računom na tem sistemu bo lahko dostopal do tvojega adresarja \"%{0}\". Si preričan, da zaupaš vsem?"; +"Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?" + = "Kdorkoli na internetu bo imel možnost dostopa do tvojega adresarja \"%{0}\" tudi, če nima računa na tem sistemu. Je ta informacija primerna za javni internet?"; +"Give Access" = "Daj dostop"; +"Keep Private" = "Obdrži osebno"; + +/* generic.js */ +"Unable to subscribe to that folder!" + = "Nemogoče se je naročiti na to mapo!"; +"You cannot subscribe to a folder that you own!" + = "Ne moreš se naročiti na lastno mapo!"; +"Unable to unsubscribe from that folder!" + = "Nemogoče se odjaviti s te mape!"; +"You cannot unsubscribe from a folder that you own!" + = "Ne moreš se odjaviti z lastne mape!"; +"Unable to rename that folder!" = "Nemogoče je preimenovati to mapo!"; +"You have already subscribed to that folder!" + = "Na to mapo si že naročen!"; +"The user rights cannot be edited for this object!" + = "Uporabniške pravice je nemogoče urediti za ta objekt!"; +"A folder by that name already exists." = "Mapa s tem imenom že obstaja."; +"You cannot create a list in a shared address book." + = "Ne moreš ustvariti seznama v skupnem adresarju."; +"Warning" = "Opozorilo"; +"Can't contact server" = "Prišlo je do napake pri povezovanju s strežniku. Prosim poskusi ponovno pozneje."; + +"You are not allowed to access this module or this system. Please contact your system administrator." += "Nimaš pravice dostopa do tega modula ali tega sistema. Prosim kontaktiraj tvojega sistemskega administratorja."; +"You don't have the required privileges to perform the operation." += "Nimaš zahtevanih pravic za izvedbo te operacije."; + +"noEmailForDelegation" = "Moraš določiti naslov, kateremu želiš dodeliti tvoje povabilo."; +"delegate is organizer" = "Dodeljevalec je organizator. Prosim določi drugega dodeljevalca."; +"delegate is a participant" = "Dodeljevalec je že udeleženec."; +"delegate is a group" = "Določen naslov ustreza skupini. Dodeliš lahko le edinstveni osebi."; + +"Snooze for " = "Opomni za"; +"5 minutes" = "5 minut"; +"10 minutes" = "10 minut"; +"15 minutes" = "15 minut"; +"30 minutes" = "30 minut"; +"45 minutes" = "45 minut"; +"1 hour" = "1 ura"; +"1 day" = "1 dan"; + +/* common buttons */ +"OK" = "V redu"; +"Cancel" = "Prekliči"; +"Yes" = "Da"; +"No" = "Ne"; + +/* alarms */ +"Reminder:" = "Opomnik:"; +"Start:" = "Začetek:"; +"Due Date:" = "Datum zapadlosti:"; +"Location:" = "Mesto:"; + +/* mail labels */ +"Important" = "Pomembno"; +"Work" = "Delo"; +"Personal" = "Osebno"; +"To Do" = "Opravilo"; +"Later" = "Pozneje"; + +"a2_Sunday" = "Ne"; +"a2_Monday" = "Po"; +"a2_Tuesday" = "To"; +"a2_Wednesday" = "Sr"; +"a2_Thursday" = "Če"; +"a2_Friday" = "Pe"; +"a2_Saturday" = "So"; diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index 8c39a7ebd..14c0f64bd 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -126,11 +126,21 @@ - (NSString *) currentUserDisplayName { + NSDictionary *infos; + NSString *uid; SOGoUserManager *um; um = [SOGoUserManager sharedUserManager]; - - return [um getFullEmailForUID: [self currentUser]]; + uid = [self currentUser]; + infos = [um contactInfosForUserWithUIDorEmail: uid inDomain: [[context activeUser] domain]]; + if (infos) + { + return [NSString stringWithFormat: @"%@ <%@>", + [infos objectForKey: @"cn"], + [infos objectForKey: @"c_email"]]; + } + else + return uid; } - (BOOL) canSubscribeUsers diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m index 3519abc0e..79f631326 100644 --- a/UI/Common/UIxUserRightsEditor.m +++ b/UI/Common/UIxUserRightsEditor.m @@ -1,8 +1,6 @@ /* UIxUserRightsEditor.m - this file is part of SOGo * - * Copyright (C) 2007-2010 Inverse inc. - * - * Author: Wolfgang Sourdeau + * Copyright (C) 2007-2015 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +18,8 @@ * Boston, MA 02111-1307, USA. */ +#import + #import #import #import @@ -86,6 +86,7 @@ - (NSString *) userDisplayName { + NSDictionary *infos; SOGoUserManager *um; if ([self userIsAnonymousUser]) @@ -99,9 +100,15 @@ else { um = [SOGoUserManager sharedUserManager]; - return [NSString stringWithFormat: @"%@ <%@>", - [um getCNForUID: uid], - [um getEmailForUID: uid]]; + infos = [um contactInfosForUserWithUIDorEmail: uid inDomain: [[context activeUser] domain]]; + if (infos) + { + return [NSString stringWithFormat: @"%@ <%@>", + [infos objectForKey: @"cn"], + [infos objectForKey: @"c_email"]]; + } + else + return uid; } } diff --git a/UI/Contacts/Arabic.lproj/Localizable.strings b/UI/Contacts/Arabic.lproj/Localizable.strings index 004bd95ca..8c0c3229d 100644 --- a/UI/Contacts/Arabic.lproj/Localizable.strings +++ b/UI/Contacts/Arabic.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "لا يوجد إشتراك"; "Preferred" = "المفضل"; -"Display:" = "عرض:"; -"Display Name:" = "الاسم المعروض:"; +"Display" = "عرض"; +"Display Name" = "الاسم المعروض"; "Email:" = "البريد الالكتروني:"; "Additional Email:" = "بريد إلكتروني إضافي"; -"Phone Number:" = "رقم الهاتف:"; +"Phone Number" = "رقم الهاتف"; "Prefers to receive messages formatted as:" = "يفضل تلقي رسائل منسقة على النحو التالي:"; "Screen Name:" = "أسم التعريف:"; "Categories:" = "الفئات:"; "First:" = "الاول:"; "Last:" = "الاخير:"; -"Nickname:" = "الاسم الرمزي:"; +"Nickname" = "الاسم الرمزي"; "Telephone" = "رقم الهاتف:"; "Work:" = "العمل:"; @@ -103,25 +103,25 @@ "New category" = "فئة جديدة"; /* adresses */ -"Title:" = "اللقب:"; +"Title" = "اللقب"; "Service:" = "الخدمة:"; "Company:" = "الشركة:"; "Department:" = "الادارة:"; "Organization:" = "الجهة"; "Address:" = "العنوان:"; -"City:" = "المدينة:"; +"City" = "المدينة"; "State_Province:" = "الولاية / الاقليم / المحافظة:"; "ZIP_Postal Code:" = "الرمز البريدي:"; -"Country:" = "الدولة:"; +"Country" = "الدولة"; "Web Page:" = "صفحة الانترنت:"; "Work" = "العمل"; "Other Infos" = "معلومات أخرى"; -"Note:" = "ملاحظة:"; +"Note" = "ملاحظة"; "Timezone:" = "المنطقة الزمنية:"; -"Birthday:" = "تاريخ الميلاد:"; -"Birthday (yyyy-mm-dd):" = "تاريخ الميلاد (يوم-شهر-سنة):"; +"Birthday" = "تاريخ الميلاد"; +"Birthday (yyyy-mm-dd)" = "تاريخ الميلاد (يوم-شهر-سنة)"; "Freebusy URL:" = "موقع مشغول /حر:"; "Add as..." = "إضافة إلى ..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "تفاصيل القائمة"; -"List name:" = "اسم القائمة/"; -"List nickname:" = "اسم القائمة الرمزي:"; -"List description:" = "وصف القائمة:"; +"List name" = "اسم القائمة/"; +"List nickname" = "اسم القائمة الرمزي"; +"List description" = "وصف القائمة"; "Members" = "أعضاء"; "Contacts" = "جهات إتصال"; "Add" = "إضافة"; diff --git a/UI/Contacts/Basque.lproj/Localizable.strings b/UI/Contacts/Basque.lproj/Localizable.strings index 9a9b7fd18..b89196d2c 100644 --- a/UI/Contacts/Basque.lproj/Localizable.strings +++ b/UI/Contacts/Basque.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Ez dago harpidetzarako aukerarik"; "Preferred" = "Hobetsitakoa"; -"Display:" = "Bistaratzea:"; -"Display Name:" = "Erakusteko izena:"; +"Display" = "Bistaratzea"; +"Display Name" = "Erakusteko izena"; "Email:" = "Emaila:"; "Additional Email:" = "Beste emaila:"; -"Phone Number:" = "Telefono zenbakia"; +"Phone Number" = "Telefono zenbakia"; "Prefers to receive messages formatted as:" = "Nahiago du mezuak honako formatuan jasotzea:"; "Screen Name:" = "Pantailaren izena"; "Categories:" = "Kategoriak:"; "First:" = "Lehenengoa:"; "Last:" = "Azkena:"; -"Nickname:" = "Goitizena:"; +"Nickname" = "Goitizena"; "Telephone" = "Telefonoa:"; "Work:" = "Lana:"; @@ -103,25 +103,25 @@ "New category" = "Kategoria berria"; /* adresses */ -"Title:" = "Izenburua"; +"Title" = "Izenburua"; "Service:" = "Zerbitzua:"; "Company:" = "Enpresa"; "Department:" = "Saila"; "Organization:" = "Saila:"; "Address:" = "Helbidea"; -"City:" = "Herria"; +"City" = "Herria"; "State_Province:" = "Estatua / Probintzia"; "ZIP_Postal Code:" = "Posta kodea"; -"Country:" = "Herrialdea"; +"Country" = "Herrialdea"; "Web Page:" = "Web orria"; "Work" = "Lana"; "Other Infos" = "Bestelako informazioak"; -"Note:" = "Ohar:"; +"Note" = "Ohar"; "Timezone:" = "Ordu-zona:"; -"Birthday:" = "Jaiotze data:"; -"Birthday (yyyy-mm-dd):" = "Jaiotze data (uuuu-hh-ee):"; +"Birthday" = "Jaiotze data"; +"Birthday (yyyy-mm-dd)" = "Jaiotze data (uuuu-hh-ee)"; "Freebusy URL:" = "LibreLanpetu URL-a:"; "Add as..." = "Gehitu honela..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Zerrendaren xehetasunak"; -"List name:" = "Zerrendaren izena:"; -"List nickname:" = "Zerrendaren goitizena:"; -"List description:" = "Zerrendaren deskribapena:"; +"List name" = "Zerrendaren izena"; +"List nickname" = "Zerrendaren goitizena"; +"List description" = "Zerrendaren deskribapena"; "Members" = "Kideak"; "Contacts" = "Kontaktuak"; "Add" = "Gehitu"; diff --git a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings index 4a09eae65..530e3ba27 100644 --- a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Sem possibilidades de inscrição"; "Preferred" = "Preferido"; -"Display:" = "Exibição:"; -"Display Name:" = "Exibir Nome:"; +"Display" = "Exibição"; +"Display Name" = "Exibir Nome"; "Email:" = "Endereço de Email:"; "Additional Email:" = "Email Adicional:"; -"Phone Number:" = "Telefone:"; +"Phone Number" = "Telefone"; "Prefers to receive messages formatted as:" = "Prefere receber mensagens formatadas como:"; "Screen Name:" = "Nome de Exibição:"; "Categories:" = "Categorias:"; "First:" = "Primeiro Nome:"; "Last:" = "Último Nome:"; -"Nickname:" = "Apelido:"; +"Nickname" = "Apelido"; "Telephone" = "Telefone"; "Work:" = "Comercial:"; @@ -103,25 +103,25 @@ "New category" = "Nova categoria"; /* adresses */ -"Title:" = "Título:"; +"Title" = "Título"; "Service:" = "Serviço:"; "Company:" = "Empresa:"; "Department:" = "Departamento"; "Organization:" = "Organização"; "Address:" = "Endereço:"; -"City:" = "Cidade:"; +"City" = "Cidade"; "State_Province:" = "Estado:"; "ZIP_Postal Code:" = "CEP:"; -"Country:" = "País:"; +"Country" = "País"; "Web Page:" = "Página Web:"; "Work" = "Comercial"; "Other Infos" = "Outras Informações"; -"Note:" = "Notas:"; +"Note" = "Notas"; "Timezone:" = "Fuso Horário:"; -"Birthday:" = "Aniversário:"; -"Birthday (yyyy-mm-dd):" = "Aniversário (yyyy-mm-dd):"; +"Birthday" = "Aniversário"; +"Birthday (yyyy-mm-dd)" = "Aniversário (yyyy-mm-dd)"; "Freebusy URL:" = "URL Livre/Ocupado:"; "Add as..." = "Adicionar como..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Detalhes da lista"; -"List name:" = "Lista nome:"; -"List nickname:" = "Lista Apelido:"; -"List description:" = "Lista descrição:"; +"List name" = "Lista nome"; +"List nickname" = "Lista Apelido"; +"List description" = "Lista descrição"; "Members" = "Membros"; "Contacts" = "Contatos"; "Add" = "Adicionar"; diff --git a/UI/Contacts/Catalan.lproj/Localizable.strings b/UI/Contacts/Catalan.lproj/Localizable.strings index 0371cfe93..9d776abc9 100644 --- a/UI/Contacts/Catalan.lproj/Localizable.strings +++ b/UI/Contacts/Catalan.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "La subscripció no és possible"; "Preferred" = "Preferit"; -"Display:" = "Nom mostrat:"; -"Display Name:" = "Nom:"; +"Display" = "Nom mostrat"; +"Display Name" = "Nom"; "Email:" = "Correu electrònic:"; "Additional Email:" = "Un altre correu electrònic:"; -"Phone Number:" = "Número de telèfon:"; +"Phone Number" = "Número de telèfon"; "Prefers to receive messages formatted as:" = "Prefereix rebre missatges amb format:"; "Screen Name:" = "Nom d'usuari:"; "Categories:" = "Categories:"; "First:" = "Nom:"; "Last:" = "Cognoms:"; -"Nickname:" = "Àlies:"; +"Nickname" = "Àlies"; "Telephone" = "Telèfon"; "Work:" = "Feina:"; @@ -103,25 +103,25 @@ "New category" = "New category"; /* adresses */ -"Title:" = "Títol:"; +"Title" = "Títol"; "Service:" = "Servei:"; "Company:" = "Companyia:"; "Department:" = "Departament:"; "Organization:" = "Organització:"; "Address:" = "Domicili:"; -"City:" = "Ciutat:"; +"City" = "Ciutat"; "State_Province:" = "Estat/província/comarca:"; "ZIP_Postal Code:" = "Codi postal:"; -"Country:" = "País:"; +"Country" = "País"; "Web Page:" = "Web:"; "Work" = "Treball"; "Other Infos" = "Altres dades"; -"Note:" = "Nota:"; +"Note" = "Nota"; "Timezone:" = "Zona hor.:"; -"Birthday:" = "Data de naixement:"; -"Birthday (yyyy-mm-dd):" = "Data naixement (yyyy-mm-dd):"; +"Birthday" = "Data de naixement"; +"Birthday (yyyy-mm-dd)" = "Data naixement (yyyy-mm-dd)"; "Freebusy URL:" = "URL disponibilitat:"; "Add as..." = "Afegir com a..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Detalls de la llista"; -"List name:" = "Nom de la llista:"; -"List nickname:" = "Àlies de la llista:"; -"List description:" = "Descripcció de la llista:"; +"List name" = "Nom de la llista"; +"List nickname" = "Àlies de la llista"; +"List description" = "Descripcció de la llista"; "Members" = "Membres"; "Contacts" = "Contactes"; "Add" = "Afegir"; diff --git a/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings b/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..0d55095e9 --- /dev/null +++ b/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,215 @@ +/* this file is in UTF-8 format! */ + +"Contact" = "連絡人"; +"Address" = "地址"; +"Photos" = "照片"; +"Other" = "其它"; + +"Address Books" = "通訊錄"; +"Addressbook" = "通訊錄"; +"Addresses" = "地址"; +"Update" = "更新"; +"Cancel" = "取消"; +"Common" = "一般"; +"Contact editor" = "連絡人編輯器"; +"Contact viewer" = "連絡人瀏覽器"; +"Email" = "郵件"; +"Screen Name" = "顯示名稱"; +"Extended" = "延伸"; +"Fax" = "傳真"; +"Firstname" = "名"; +"Home" = "家"; +"HomePhone" = "住家電話"; +"Lastname" = "姓氏"; +"Location" = "地點"; +"MobilePhone" = "手機"; +"Name" = "名字"; +"OfficePhone" = "辦公室電話"; +"Organization" = "公司名稱"; +"Work Phone" = "公務電話"; +"Phone" = "電話"; +"Phones" = "電話"; +"Postal" = "郵遞區號"; +"Save" = "儲存"; +"Internet" = "網際網路"; +"Unit" = "部門"; +"delete" = "刪除"; +"edit" = "編輯"; +"invalidemailwarn" = "無效的郵件地址"; +"new" = "新增"; +"Preferred Phone" = "首選電話"; + +"Move To" = "移至"; +"Copy To" = "拷貝到"; +"Add to:" = "增加到"; + +/* Tooltips */ + +"Create a new address book card" = "新增一筆通訊錄卡片"; +"Create a new list" = "新增一份清單"; +"Edit the selected card" = "編輯選擇的卡片"; +"Send a mail message" = "發送一份郵件訊息"; +"Delete selected card or address book" = "刪除選擇的卡片或通訊錄"; +"Reload all contacts" = "重載所有的連絡人"; + +"htmlMailFormat_UNKNOWN" = "未知"; +"htmlMailFormat_FALSE" = "純文字"; +"htmlMailFormat_TRUE" = "HTML"; + +"Name or Email" = "名字或郵件地址"; +"Category" = "類別"; +"Personal Addressbook" = "個人通訊錄"; +"Search in Addressbook" = "搜索通訊錄"; + +"New Card" = "新增卡片"; +"New List" = "新增清單"; +"Edit" = "編輯"; +"Properties" = "屬性"; +"Sharing..." = "共享..."; +"Write" = "寫入"; +"Delete" = "删除"; +"Instant Message" = "即時訊息"; +"Add..." = "新增..."; +"Remove" = "移除"; + +"Please wait..." = "請稍後..."; +"No possible subscription" = "不可訂閱"; + +"Preferred" = "首選"; +"Display" = "顯示"; +"Display Name" = "顯示名稱"; +"Email:" = "郵件:"; +"Additional Email:" = "添加的郵件:"; + +"Phone Number" = "電話號碼"; +"Prefers to receive messages formatted as:" = "喜愛的接收訊息格式為:"; +"Screen Name:" = "顯示名稱:"; +"Categories:" = "類别:"; + +"First:" = "名:"; +"Last:" = "姓:"; +"Nickname" = "暱稱"; + +"Telephone" = "電話"; +"Work:" = "辦公:"; +"Home:" = "家:"; +"Fax:" = "傳真:"; +"Mobile:" = "手機:"; +"Pager:" = "呼叫器:"; + +/* categories */ +"contacts_category_labels" = "同事,競争对手,客户,朋友,家人,事業伙伴,供應商,出版社,VIP"; +"Categories" = "分類"; +"New category" = "新類別"; + +/* adresses */ +"Title" = "頭銜"; +"Service:" = "服務:"; +"Company:" = "公司:"; +"Department:" = "部門:"; +"Organization:" = "组織:"; +"Address:" = "地址:"; +"City" = "城市"; +"State_Province:" = "州/省:"; +"ZIP_Postal Code:" = "ZIP/郵遞區號:"; +"Country" = "國家"; +"Web Page:" = "網页:"; + +"Work" = "辦公"; +"Other Infos" = "其他資訊"; + +"Note" = "備註"; +"Timezone:" = "時區:"; +"Birthday" = "生日"; +"Birthday (yyyy-mm-dd)" = "生日 (yyyy-mm-dd)"; +"Freebusy URL:" = "Freebusy URL:"; + +"Add as..." = "新增為..."; +"Recipient" = "收件人"; +"Carbon Copy" = "副本"; +"Blind Carbon Copy" = "密件副本"; + +"New Addressbook..." = "新增通訊錄..."; +"Subscribe to an Addressbook..." = "訂閱通訊錄..."; +"Remove the selected Addressbook" = "移除選擇的通訊錄"; + +"Name of the Address Book" = " 通訊錄名稱"; +"Are you sure you want to delete the selected address book?" += "您確定要刪除選擇的通訊錄嗎？"; +"You cannot remove nor unsubscribe from a public addressbook." += "您不能從共有通訊錄中移除或取消訂閱。"; +"You cannot remove nor unsubscribe from your personal addressbook." += "您不能從您的個人通訊錄中移除或取消訂閱。"; + +"Are you sure you want to delete the selected contacts?" += "您確定要刪除選擇的連絡人嗎？"; + +"You cannot delete the card of \"%{0}\"." += "您不能删除第\"%{0}\"筆卡片。"; + + + +"You cannot subscribe to a folder that you own!" += "您不能訂閱自己的資料夾。"; +"Unable to subscribe to that folder!" += "不能訂閱到該資料夾。"; + +/* acls */ +"Access rights to" = "給予存取權限至"; +"For user" = "给使用者"; + +"Any Authenticated User" = "任一授權的使用者"; +"Public Access" = "公開存取"; + +"This person can add cards to this addressbook." += "這個人可以新增卡片到這個通訊錄。"; +"This person can edit the cards of this addressbook." += "這個人可以編輯這個通訊錄的卡片。"; +"This person can list the content of this addressbook." += "這個人可以列出這個通訊錄的内容。"; +"This person can read the cards of this addressbook." += "這個人可以讀取這個通訊錄的卡片。"; +"This person can erase cards from this addressbook." += "這個人可以刪除這個通訊錄的卡片。"; + +"The selected contact has no email address." += "被選擇的連絡人沒有郵件地址。"; + +"Please select a contact." = "請選擇連絡人。"; + +/* Error messages for move and copy */ + +"SoAccessDeniedException" = "您不能寫入資料到這個通訊錄。"; +"Forbidden" = "您不能寫入資料到這個通訊錄。"; +"Invalid Contact" = "所選擇的連絡人已經不存在了。"; +"Unknown Destination Folder" = "所選擇的目標地址簿已經不存在了。"; + +/* Lists */ +"List details" = "列出明细"; +"List name" = "列出名字"; +"List nickname" = "列出暱稱"; +"List description" = "列出說明"; +"Members" = "成員"; +"Contacts" = "連絡人"; +"Add" = "新增"; +"Lists can't be moved or copied." = "列表不能被移除或拷貝。"; +"Export" = "匯出"; +"Export Address Book..." = "匯出通訊錄..."; +"View Raw Source" = "查看源文件"; +"Import Cards" = "匯入卡片"; +"Select a vCard or LDIF file." = "選擇一張 vCard 或者 LDIF 檔案。"; +"Upload" = "上傳"; +"Uploading" = "上傳中"; +"Done" = "完成"; +"An error occured while importing contacts." = "導入連絡人時發生錯誤。"; +"No card was imported." = "没有卡片可以被導入。"; +"A total of %{0} cards were imported in the addressbook." = "共有%{0}張卡片被導入到通訊錄中。"; + +"Reload" = "重新載入"; + +/* Properties window */ +"Address Book Name:" = "通訊錄名稱:"; +"Links to this Address Book" = "連結到這本通訊錄"; +"Authenticated User Access" = "授權的使用者存取"; +"CardDAV URL: " = "CardDAV URL:"; + diff --git a/UI/Contacts/Czech.lproj/Localizable.strings b/UI/Contacts/Czech.lproj/Localizable.strings index d420fbf84..ebd06b732 100644 --- a/UI/Contacts/Czech.lproj/Localizable.strings +++ b/UI/Contacts/Czech.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Žádné možné odebírání"; "Preferred" = "Upřednostňovaný"; -"Display:" = "Zobrazované jméno:"; -"Display Name:" = "Zobrazované jméno:"; +"Display" = "Zobrazované jméno"; +"Display Name" = "Zobrazované jméno"; "Email:" = "E-mail:"; "Additional Email:" = "Další e-mail:"; -"Phone Number:" = "Telefonní číslo:"; +"Phone Number" = "Telefonní číslo"; "Prefers to receive messages formatted as:" = "Upřednostňovaný formát zpráv:"; "Screen Name:" = "Zobrazované jméno:"; "Categories:" = "Kategorie:"; "First:" = "Křestní jméno:"; "Last:" = "Příjmení:"; -"Nickname:" = "Přezdívka:"; +"Nickname" = "Přezdívka"; "Telephone" = "Telefon"; "Work:" = "Zaměstnání:"; @@ -103,25 +103,25 @@ "New category" = "Nová kategorie"; /* adresses */ -"Title:" = "Pozice:"; +"Title" = "Pozice"; "Service:" = "Služba:"; "Company:" = "Společnost:"; "Department:" = "Oddělení:"; "Organization:" = "Organizace:"; "Address:" = "Adresa:"; -"City:" = "Město:"; +"City" = "Město"; "State_Province:" = "Stát/Provincie:"; "ZIP_Postal Code:" = "PSČ:"; -"Country:" = "Země:"; +"Country" = "Země"; "Web Page:" = "Web:"; "Work" = "Zaměstnání"; "Other Infos" = "Ostatní informace"; -"Note:" = "Poznámka:"; +"Note" = "Poznámka"; "Timezone:" = "Časové pásmo:"; -"Birthday:" = "Datum narození"; -"Birthday (yyyy-mm-dd):" = "Datum narození (yyyy-mm-dd):"; +"Birthday" = "Datum narození"; +"Birthday (yyyy-mm-dd)" = "Datum narození (yyyy-mm-dd)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Přidat jako..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Skupina"; -"List name:" = "Název:"; -"List nickname:" = "Zkratka:"; -"List description:" = "Popis:"; +"List name" = "Název"; +"List nickname" = "Zkratka"; +"List description" = "Popis"; "Members" = "Členové skupiny"; "Contacts" = "Kontakty"; "Add" = "Přidat"; diff --git a/UI/Contacts/Danish.lproj/Localizable.strings b/UI/Contacts/Danish.lproj/Localizable.strings index 2f8cd2602..4ee4f90f8 100644 --- a/UI/Contacts/Danish.lproj/Localizable.strings +++ b/UI/Contacts/Danish.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Intet muligt abonnement"; "Preferred" = "Foretrukket"; -"Display:" = "Vis:"; -"Display Name:" = "Vist navn:"; +"Display" = "Vis"; +"Display Name" = "Vist navn"; "Email:" = "E-mail:"; "Additional Email:" = "ekstra e-mails:"; -"Phone Number:" = "Telefonnummer:"; +"Phone Number" = "Telefonnummer"; "Prefers to receive messages formatted as:" = "Foretrækker at modtage beskeder formateret som:"; "Screen Name:" = "Skærmnavn:"; "Categories:" = "Kategorier:"; "First:" = "Først:"; "Last:" = "Sidst:"; -"Nickname:" = "Kaldenavn:"; +"Nickname" = "Kaldenavn"; "Telephone" = "Telefon"; "Work:" = "Arbejde:"; @@ -103,25 +103,25 @@ "New category" = "Ny kategori"; /* adresses */ -"Title:" = "Titel:"; +"Title" = "Titel"; "Service:" = "Service:"; "Company:" = "Firma:"; "Department:" = "Afdeling:"; "Organization:" = "Organisation:"; "Address:" = "Adresse:"; -"City:" = "By:"; +"City" = "By"; "State_Province:" = "Stat / provins:"; "ZIP_Postal Code:" = "ZIP/Postnr.:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Hjemmeside:"; "Work" = "Arbejde"; "Other Infos" = "Andet info"; -"Note:" = "Bemærk:"; +"Note" = "Bemærk"; "Timezone:" = "Tidszone:"; -"Birthday:" = "Fødselsdag:"; -"Birthday (yyyy-mm-dd):" = "Fødselsdag (dd-mm-åååå):"; +"Birthday" = "Fødselsdag"; +"Birthday (yyyy-mm-dd)" = "Fødselsdag (dd-mm-åååå)"; "Freebusy URL:" = "Ledig/optaget URL:"; "Add as..." = "Tilføj som ..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Liste detaljer"; -"List name:" = "Liste navn:"; -"List nickname:" = "Liste kaldenavn:"; -"List description:" = "Liste beskrivelse:"; +"List name" = "Liste navn"; +"List nickname" = "Liste kaldenavn"; +"List description" = "Liste beskrivelse"; "Members" = "Medlemmer"; "Contacts" = "Kontaktpersoner"; "Add" = "Tilføj"; diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings index 442c11b08..79476728c 100644 --- a/UI/Contacts/Dutch.lproj/Localizable.strings +++ b/UI/Contacts/Dutch.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Abonnement niet mogelijk"; "Preferred" = "Voorkeurs-"; -"Display:" = "Weergave:"; -"Display Name:" = "Weergavenaam:"; +"Display" = "Weergave"; +"Display Name" = "Weergavenaam"; "Email:" = "E-mail:"; "Additional Email:" = "Alternatieve e-mail:"; -"Phone Number:" = "Telefoon:"; +"Phone Number" = "Telefoon"; "Prefers to receive messages formatted as:" = "Geeft voorkeur aan berichten geformatteerd als:"; "Screen Name:" = "Weergavenaam:"; "Categories:" = "Categorieën:"; "First:" = "Voornaam:"; "Last:" = "Achternaam:"; -"Nickname:" = "Nickname:"; +"Nickname" = "Nickname"; "Telephone" = "Telefoon:"; "Work:" = "Werk:"; @@ -103,25 +103,25 @@ "New category" = "Niewe categorie"; /* adresses */ -"Title:" = "Titel:"; +"Title" = "Titel"; "Service:" = "Service:"; "Company:" = "Bedrijf:"; "Department:" = "Afdeling:"; "Organization:" = "Organisatie:"; "Address:" = "Adres:"; -"City:" = "Plaats:"; +"City" = "Plaats"; "State_Province:" = "Provincie:"; "ZIP_Postal Code:" = "Postcode:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Website:"; "Work" = "Werk"; "Other Infos" = "Overige"; -"Note:" = "Notitie:"; +"Note" = "Notitie"; "Timezone:" = "Tijdzone:"; -"Birthday:" = "Geboortedatum:"; -"Birthday (yyyy-mm-dd):" = "Geboortedatum (yyyy-mm-dd):"; +"Birthday" = "Geboortedatum"; +"Birthday (yyyy-mm-dd)" = "Geboortedatum (yyyy-mm-dd)"; "Freebusy URL:" = "Beschikbaarheids-URL (Free/Busy):"; "Add as..." = "Toevoegen als ..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Toon details"; -"List name:" = "Lijst-naam:"; -"List nickname:" = "Lijst-bijnaam:"; -"List description:" = "Beschrijving:"; +"List name" = "Lijst-naam"; +"List nickname" = "Lijst-bijnaam"; +"List description" = "Beschrijving"; "Members" = "Leden"; "Contacts" = "Contactpersonen"; "Add" = "Toevoegen"; diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 39da819e1..e1a671c7e 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "No possible subscription"; "Preferred" = "Preferred"; -"Display:" = "Display:"; -"Display Name:" = "Display Name:"; +"Display" = "Display"; +"Display Name" = "Display Name"; "Email:" = "Email:"; "Additional Email:" = "Additional Email:"; -"Phone Number:" = "Phone Number:"; +"Phone Number" = "Phone Number"; "Prefers to receive messages formatted as:" = "Prefers to receive messages formatted as:"; "Screen Name:" = "Screen Name:"; "Categories:" = "Categories:"; "First:" = "First:"; "Last:" = "Last:"; -"Nickname:" = "Nickname:"; +"Nickname" = "Nickname"; "Telephone" = "Telephone"; "Work:" = "Work:"; @@ -103,25 +103,25 @@ "New category" = "New category"; /* adresses */ -"Title:" = "Title:"; +"Title" = "Title"; "Service:" = "Service:"; "Company:" = "Company:"; "Department:" = "Department:"; "Organization:" = "Organization:"; "Address:" = "Address:"; -"City:" = "City: "; +"City" = "City "; "State_Province:" = "State/Province:"; "ZIP_Postal Code:" = "ZIP/Postal Code:"; -"Country:" = "Country:"; +"Country" = "Country"; "Web Page:" = "Web Page:"; "Work" = "Work"; "Other Infos" = "Other Infos"; -"Note:" = "Note:"; +"Note" = "Note"; "Timezone:" = "Timezone:"; -"Birthday:" = "Birthday:"; -"Birthday (yyyy-mm-dd):" = "Birthday (yyyy-mm-dd):"; +"Birthday" = "Birthday"; +"Birthday (yyyy-mm-dd)" = "Birthday (yyyy-mm-dd)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Add as..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "List details"; -"List name:" = "List name:"; -"List nickname:" = "List nickname:"; -"List description:" = "List description:"; +"List name" = "List name"; +"List nickname" = "List nickname"; +"List description" = "List description"; "Members" = "Members"; "Contacts" = "Contacts"; "Add" = "Add"; diff --git a/UI/Contacts/Finnish.lproj/Localizable.strings b/UI/Contacts/Finnish.lproj/Localizable.strings index 2d4d7a310..c0e1bb4b3 100644 --- a/UI/Contacts/Finnish.lproj/Localizable.strings +++ b/UI/Contacts/Finnish.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Tilaus ei mahdollinen"; "Preferred" = "Ensisijainen"; -"Display:" = "Näyttö:"; -"Display Name:" = "Näyttönimi:"; +"Display" = "Näyttö"; +"Display Name" = "Näyttönimi"; "Email:" = "Email:"; "Additional Email:" = "Lisäsähköpostiosoite:"; -"Phone Number:" = "Puhelinnumero:"; +"Phone Number" = "Puhelinnumero"; "Prefers to receive messages formatted as:" = "Vastaanottaa viestejä muotoiltuna ensisijaisesti:"; "Screen Name:" = "Näytettävä nimi:"; "Categories:" = "Kategoriat:"; "First:" = "Etunimi:"; "Last:" = "Sukunimi:"; -"Nickname:" = "Lempinimi:"; +"Nickname" = "Lempinimi"; "Telephone" = "Puhelin"; "Work:" = "Työ:"; @@ -103,25 +103,25 @@ "New category" = "Uusi kategoria"; /* adresses */ -"Title:" = "Titteli:"; +"Title" = "Titteli"; "Service:" = "Palvelu:"; "Company:" = "Yritys:"; "Department:" = "Osasto:"; "Organization:" = "Organisaatio:"; "Address:" = "Osoite:"; -"City:" = "Kaupunki: "; +"City" = "Kaupunki "; "State_Province:" = "Maakunta:"; "ZIP_Postal Code:" = "Postinumero:"; -"Country:" = "Maa:"; +"Country" = "Maa"; "Web Page:" = "Web sivu:"; "Work" = "Työ"; "Other Infos" = "Muuta tietoa"; -"Note:" = "Huomautus:"; +"Note" = "Huomautus"; "Timezone:" = "Aikavyöhyke:"; -"Birthday:" = "Syntymäpäivä:"; -"Birthday (yyyy-mm-dd):" = "Syntymäpäivä (vvvv-kk-pp):"; +"Birthday" = "Syntymäpäivä"; +"Birthday (yyyy-mm-dd)" = "Syntymäpäivä (vvvv-kk-pp)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Lisää nimellä..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Luettelon tiedot"; -"List name:" = "Luettelon nimi:"; -"List nickname:" = "Luettelon lempinimi:"; -"List description:" = "Luettelon kuvaus:"; +"List name" = "Luettelon nimi"; +"List nickname" = "Luettelon lempinimi"; +"List description" = "Luettelon kuvaus"; "Members" = "Jäsenet"; "Contacts" = "Yhteystiedot"; "Add" = "Lisää"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index f321d9b56..0825bb81f 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Aucune inscription possible"; "Preferred" = "Préféré"; -"Display:" = "Nom à afficher :"; -"Display Name:" = "Nom à afficher :"; +"Display" = "Nom à afficher "; +"Display Name" = "Nom à afficher "; "Email:" = "Adresse électronique :"; "Additional Email:" = "Adresse alternative :"; -"Phone Number:" = "Numéro de téléphone :"; +"Phone Number" = "Numéro de téléphone "; "Prefers to receive messages formatted as:" = "Préfère recevoir les messages au format :"; "Screen Name:" = "Pseudo :"; "Categories:" = "Catégories :"; "First:" = "Prénom :"; "Last:" = "Nom :"; -"Nickname:" = "Surnom :"; +"Nickname" = "Surnom "; "Telephone" = "Téléphone"; "Work:" = "Travail :"; @@ -103,25 +103,25 @@ "New category" = "Nouvelle catégorie"; /* adresses */ -"Title:" = "Fonction :"; +"Title" = "Fonction "; "Service:" = "Service:"; "Company:" = "Company:"; "Department:" = "Service :"; "Organization:" = "Société :"; "Address:" = "Adresse :"; -"City:" = "Ville/Localité :"; +"City" = "Ville/Localité "; "State_Province:" = "État/Prov. :"; "ZIP_Postal Code:" = "Code postal :"; -"Country:" = "Pays :"; +"Country" = "Pays "; "Web Page:" = "Page Web:"; "Work" = "Professionnelle"; "Other Infos" = "Informations complémentaires"; -"Note:" = "Remarques :"; +"Note" = "Remarques "; "Timezone:" = "Fuseau horaire :"; -"Birthday:" = "D. naissance:"; -"Birthday (yyyy-mm-dd):" = "D. naissance (aaaa-mm-jj):"; +"Birthday" = "D. naissance"; +"Birthday (yyyy-mm-dd)" = "D. naissance (aaaa-mm-jj)"; "Freebusy URL:" = "Adresse du FreeBusy :"; "Add as..." = "Ajouter..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Détails"; -"List name:" = "Liste:"; -"List nickname:" = "Surnom:"; -"List description:" = "Description:"; +"List name" = "Liste"; +"List nickname" = "Surnom"; +"List description" = "Description"; "Members" = "Membres"; "Contacts" = "Contacts"; "Add" = "Ajouter"; diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile index 59ba95ab5..01521a8bc 100644 --- a/UI/Contacts/GNUmakefile +++ b/UI/Contacts/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = ContactsUI ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct -ContactsUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +ContactsUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh ContactsUI_OBJC_FILES = \ UIxContactsUserFolders.m \ diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings index 4e18cb96a..c71fdd017 100644 --- a/UI/Contacts/German.lproj/Localizable.strings +++ b/UI/Contacts/German.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Kein Abonnieren möglich"; "Preferred" = "Bevorzugt"; -"Display:" = "Anzeige:"; -"Display Name:" = "Anzeigename:"; +"Display" = "Anzeige"; +"Display Name" = "Anzeigename"; "Email:" = "E-Mail:"; "Additional Email:" = "Zusätzliche E-Mail:"; -"Phone Number:" = "Telefon:"; +"Phone Number" = "Telefon"; "Prefers to receive messages formatted as:" = "Bevorzugt folgendes Nachrichten-Format:"; "Screen Name:" = "Messenger-Name:"; "Categories:" = "Kategorien:"; "First:" = "Vorname:"; "Last:" = "Nachname:"; -"Nickname:" = "Spitzname:"; +"Nickname" = "Spitzname"; "Telephone" = "Telefon"; "Work:" = "Dienstlich:"; @@ -103,25 +103,25 @@ "New category" = "Neue Kategorie"; /* adresses */ -"Title:" = "Titel:"; +"Title" = "Titel"; "Service:" = "Dienst:"; "Company:" = "Firma:"; "Department:" = "Abteilung:"; "Organization:" = "Organisation:"; "Address:" = "Adresse:"; -"City:" = "Stadt:"; +"City" = "Stadt"; "State_Province:" = "Bundesland:"; "ZIP_Postal Code:" = "PLZ:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Webseite:"; "Work" = "Dienstlich"; "Other Infos" = "Andere Informationen"; -"Note:" = "Notizen:"; +"Note" = "Notizen"; "Timezone:" = "Zeitzone:"; -"Birthday:" = "Geburtsdatum:"; -"Birthday (yyyy-mm-dd):" = "Geburtsdatum (JJJJ-MM-TT):"; +"Birthday" = "Geburtsdatum"; +"Birthday (yyyy-mm-dd)" = "Geburtsdatum (JJJJ-MM-TT)"; "Freebusy URL:" = "Frei/Gebucht URL:"; "Add as..." = "Hinzufügen als ..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Details"; -"List name:" = "Listenname:"; -"List nickname:" = "Listen-Spitzname:"; -"List description:" = "Beschreibung:"; +"List name" = "Listenname"; +"List nickname" = "Listen-Spitzname"; +"List description" = "Beschreibung"; "Members" = "Mitglieder"; "Contacts" = "Kontakte"; "Add" = "Hinzufügen"; diff --git a/UI/Contacts/Hungarian.lproj/Localizable.strings b/UI/Contacts/Hungarian.lproj/Localizable.strings index 89e73d499..59234e883 100644 --- a/UI/Contacts/Hungarian.lproj/Localizable.strings +++ b/UI/Contacts/Hungarian.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Nincs mappa, melyre feliratkozhat"; "Preferred" = "Preferált"; -"Display:" = "Megjelenítendő név:"; -"Display Name:" = "Megjelenítendő név:"; +"Display" = "Megjelenítendő név"; +"Display Name" = "Megjelenítendő név"; "Email:" = "Email cím:"; "Additional Email:" = "További email:"; -"Phone Number:" = "Telefon:"; +"Phone Number" = "Telefon"; "Prefers to receive messages formatted as:" = "Előnyben részesített üzenet formátum:"; "Screen Name:" = "Fedőnév:"; "Categories:" = "Kategóriák:"; "First:" = "Keresztnév:"; "Last:" = "Vezetéknév:"; -"Nickname:" = "Becenév:"; +"Nickname" = "Becenév"; "Telephone" = "Telefon"; "Work:" = "Munkahely:"; @@ -103,25 +103,25 @@ "New category" = "Új kategória"; /* adresses */ -"Title:" = "Cím:"; +"Title" = "Cím"; "Service:" = "Szolgáltatás:"; "Company:" = "Vállalat:"; "Department:" = "Részleg:"; "Organization:" = "Szervezet:"; "Address:" = "Cím:"; -"City:" = "Város:"; +"City" = "Város"; "State_Province:" = "Állam/tartomány:"; "ZIP_Postal Code:" = "Irányítószám:"; -"Country:" = "Ország:"; +"Country" = "Ország"; "Web Page:" = "Web:"; "Work" = "Munkahely"; "Other Infos" = "Egyéb"; -"Note:" = "Megjegyzés:"; +"Note" = "Megjegyzés"; "Timezone:" = "Időzóna:"; -"Birthday:" = "Születésnap:"; -"Birthday (yyyy-mm-dd):" = "Születésnap (éééé-hh-nn):"; +"Birthday" = "Születésnap"; +"Birthday (yyyy-mm-dd)" = "Születésnap (éééé-hh-nn)"; "Freebusy URL:" = "Foglaltság URL:"; "Add as..." = "Hozzáadás mint..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Lista részletek"; -"List name:" = "Lista név:"; -"List nickname:" = "Lista becenév:"; -"List description:" = "Lista leírás:"; +"List name" = "Lista név"; +"List nickname" = "Lista becenév"; +"List description" = "Lista leírás"; "Members" = "Tagok"; "Contacts" = "Kapcsolatok"; "Add" = "Hozzáad"; diff --git a/UI/Contacts/Icelandic.lproj/Localizable.strings b/UI/Contacts/Icelandic.lproj/Localizable.strings index 04f3d5de9..fc0acc56a 100644 --- a/UI/Contacts/Icelandic.lproj/Localizable.strings +++ b/UI/Contacts/Icelandic.lproj/Localizable.strings @@ -77,19 +77,19 @@ "Preferred" = "Sjálfgefið"; "Card for %@" = "Nafnspjald fyrir %@"; -"Display:" = "Birtingarnafn:"; -"Display Name:" = "Birt nafn:"; +"Display" = "Birtingarnafn"; +"Display Name" = "Birt nafn"; "Email:" = "Tölvupóstfang:"; "Additional Email:" = "Auka tölvupóstfang:"; -"Phone Number:" = "Símanúmer:"; +"Phone Number" = "Símanúmer"; "Prefers to receive messages formatted as:" = "Kýs að taka á móti pósti með sniði:"; "Screen Name:" = "Skjánafn:"; "Categories:" = "Flokkar:"; "First:" = "Fornafn:"; "Last:" = "Eftirnafn:"; -"Nickname:" = "Gælunafn:"; +"Nickname" = "Gælunafn"; "Telephone" = "Sími"; "Work:" = "Vinnusími:"; @@ -104,25 +104,25 @@ "New category" = "Nýr flokkur"; /* adresses */ -"Title:" = "Titill:"; +"Title" = "Titill"; "Service:" = "Þjónusta:"; "Company:" = "Fyrirtæki:"; "Department:" = "Deild:"; "Organization:" = "Fyrirtæki/Stofnun:"; "Address:" = "Heimilisfang:"; -"City:" = "Borg: "; +"City" = "Borg "; "State_Province:" = "Hérað/Fylki:"; "ZIP_Postal Code:" = "Póstnúmer:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Vefsíða:"; "Work" = "Vinna"; "Other Infos" = "Aðrar upplýsingar"; -"Note:" = "Athugasemd:"; +"Note" = "Athugasemd"; "Timezone:" = "Tímabelti:"; -"Birthday:" = "Afmælisdagur:"; -"Birthday (yyyy-mm-dd):" = "Afmælisdagur (yyyy-mm-dd):"; +"Birthday" = "Afmælisdagur"; +"Birthday (yyyy-mm-dd)" = "Afmælisdagur (yyyy-mm-dd)"; "Freebusy URL:" = "LaustUpptekið URL"; "Add as..." = "Bæta við sem..."; @@ -185,9 +185,9 @@ /* Lists */ "List details" = "Ítarleg lýsing á lista:"; -"List name:" = "Nafn lista:"; -"List nickname:" = "Gælunafn lista:"; -"List description:" = "Lýsing lista:"; +"List name" = "Nafn lista"; +"List nickname" = "Gælunafn lista"; +"List description" = "Lýsing lista"; "Members" = "Meðlimir"; "Contacts" = "Tengiliðir"; "Add" = "Bæta við"; diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings index 2fa456f3f..4779d5714 100644 --- a/UI/Contacts/Italian.lproj/Localizable.strings +++ b/UI/Contacts/Italian.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Nessuna sottoscrizione possibile"; "Preferred" = "Predefinito"; -"Display:" = "Nome visualizzato:"; -"Display Name:" = "Nome visualizzato:"; +"Display" = "Nome visualizzato"; +"Display Name" = "Nome visualizzato"; "Email:" = "Email:"; "Additional Email:" = "Email aggiuntiva:"; -"Phone Number:" = "Numero di telefono:"; +"Phone Number" = "Numero di telefono"; "Prefers to receive messages formatted as:" = "Formato preferito per i messaggi di posta:"; "Screen Name:" = "Nome Instant Messenger:"; "Categories:" = "Categorie:"; "First:" = "Nome:"; "Last:" = "Cognome"; -"Nickname:" = "Soprannome:"; +"Nickname" = "Soprannome"; "Telephone" = "Telefono"; "Work:" = "Lavoro:"; @@ -103,25 +103,25 @@ "New category" = "Nuova categoria"; /* adresses */ -"Title:" = "Titolo:"; +"Title" = "Titolo"; "Service:" = "Service:"; "Company:" = "Società:"; "Department:" = "Reparto:"; "Organization:" = "Società:"; "Address:" = "Indirizzo:"; -"City:" = "Città:"; +"City" = "Città"; "State_Province:" = "Provincia:"; "ZIP_Postal Code:" = "CAP:"; -"Country:" = "Nazione:"; +"Country" = "Nazione"; "Web Page:" = "Pagina Web:"; "Work" = "Lavoro"; "Other Infos" = "Altre informazioni"; -"Note:" = "Note:"; +"Note" = "Note"; "Timezone:" = "Fuso orario:"; -"Birthday:" = "Data di Nascita:"; -"Birthday (yyyy-mm-dd):" = "Data di Nascita (yyyy-mm-dd):"; +"Birthday" = "Data di Nascita"; +"Birthday (yyyy-mm-dd)" = "Data di Nascita (yyyy-mm-dd)"; "Freebusy URL:" = "Libero-occupato URL:"; "Add as..." = "Aggiungi come..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Dettagli lista"; -"List name:" = "Nome lista:"; -"List nickname:" = "Soprannome lista:"; -"List description:" = "Descrizione lista:"; +"List name" = "Nome lista"; +"List nickname" = "Soprannome lista"; +"List description" = "Descrizione lista"; "Members" = "Membri"; "Contacts" = "Contatti"; "Add" = "Aggiungi"; diff --git a/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings b/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings index c8405b9aa..2d60860a2 100644 --- a/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Abonnering er ikke mulig"; "Preferred" = "Foretrukket"; -"Display:" = "Vise:"; -"Display Name:" = "Visningsnavn:"; +"Display" = "Vise"; +"Display Name" = "Visningsnavn"; "Email:" = "E-post:"; "Additional Email:" = "Ytterlige e-post:"; -"Phone Number:" = "Telefonnummer:"; +"Phone Number" = "Telefonnummer"; "Prefers to receive messages formatted as:" = "Foretrekker å motta melding formatert som:"; "Screen Name:" = "Skjermnavn:"; "Categories:" = "Kategorier:"; "First:" = "Fornavn:"; "Last:" = "Etternavn:"; -"Nickname:" = "Kallenavn:"; +"Nickname" = "Kallenavn"; "Telephone" = "Telefonnummer"; "Work:" = "Arbeid:"; @@ -103,25 +103,25 @@ "New category" = "Ny kategori"; /* adresses */ -"Title:" = "Tittel:"; +"Title" = "Tittel"; "Service:" = "Funksjon:"; "Company:" = "Foretak:"; "Department:" = "Avdeling:"; "Organization:" = "Organisasjon:"; "Address:" = "Adresse:"; -"City:" = "Poststed: "; +"City" = "Poststed "; "State_Province:" = "Landsdel:"; "ZIP_Postal Code:" = "Postnummer:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Nettside:"; "Work" = "Arbeid"; "Other Infos" = "Øvrig informasjon"; -"Note:" = "Anmerkning:"; +"Note" = "Anmerkning"; "Timezone:" = "Tidssone:"; -"Birthday:" = "Fødselsdag:"; -"Birthday (yyyy-mm-dd):" = "Fødselsdag (åååå-mm-dd):"; +"Birthday" = "Fødselsdag"; +"Birthday (yyyy-mm-dd)" = "Fødselsdag (åååå-mm-dd)"; "Freebusy URL:" = "Ledigopptatt URL:"; "Add as..." = "Legg til som..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Informasjon om mailinglisten"; -"List name:" = "Navn på mailingliste:"; -"List nickname:" = "Kallenavn til mailingliste:"; -"List description:" = "Beskrivelse av mailingliste:"; +"List name" = "Navn på mailingliste"; +"List nickname" = "Kallenavn til mailingliste"; +"List description" = "Beskrivelse av mailingliste"; "Members" = "Medlemmer"; "Contacts" = "Kontakter"; "Add" = "Legg til"; diff --git a/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings b/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings index 7d2c1e3ca..af27560af 100644 --- a/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings @@ -77,19 +77,19 @@ "Preferred" = "Foretrukket"; "Card for %@" = "Adressekort for %@"; -"Display:" = "Vise:"; -"Display Name:" = "Visningsnamn:"; +"Display" = "Vise"; +"Display Name" = "Visningsnamn"; "Email:" = "E-post:"; "Additional Email:" = "Ytterlige e-post:"; -"Phone Number:" = "Telefonnummer:"; +"Phone Number" = "Telefonnummer"; "Prefers to receive messages formatted as:" = "Foretrekker å motta melding formatert som:"; "Screen Name:" = "Skjermnavn:"; "Categories:" = "Katagorier:"; "First:" = "Fornavn:"; "Last:" = "Etternavn:"; -"Nickname:" = "Kallenavn:"; +"Nickname" = "Kallenavn"; "Telephone" = "Telefonnummer"; "Work:" = "Arbeid:"; @@ -104,25 +104,25 @@ "New category" = "Ny katagori"; /* adresses */ -"Title:" = "Tittel:"; +"Title" = "Tittel"; "Service:" = "Funksjon:"; "Company:" = "Foretak:"; "Department:" = "Avdelning:"; "Organization:" = "Organisation:"; "Address:" = "Adresse:"; -"City:" = "Poststed: "; +"City" = "Poststed "; "State_Province:" = "Landsdel:"; "ZIP_Postal Code:" = "Postnummer:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Webside:"; "Work" = "Arbeid"; "Other Infos" = "Øvrig"; -"Note:" = "Anmerkning:"; +"Note" = "Anmerkning"; "Timezone:" = "Tidssone:"; -"Birthday:" = "Fødselsdag:"; -"Birthday (yyyy-mm-dd):" = "Fødselsdag (yyyy-mm-dd):"; +"Birthday" = "Fødselsdag"; +"Birthday (yyyy-mm-dd)" = "Fødselsdag (yyyy-mm-dd)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Legg til som..."; @@ -185,9 +185,9 @@ /* Lists */ "List details" = "Informasjon om mailinglisten"; -"List name:" = "Navn på mailingliste:"; -"List nickname:" = "Kallenavn til mailingliste:"; -"List description:" = "Beskrivelse:"; +"List name" = "Navn på mailingliste"; +"List nickname" = "Kallenavn til mailingliste"; +"List description" = "Beskrivelse"; "Members" = "Medlemmer"; "Contacts" = "Kontakter"; "Add" = "Legg til"; diff --git a/UI/Contacts/Polish.lproj/Localizable.strings b/UI/Contacts/Polish.lproj/Localizable.strings index 012134657..0849291cd 100644 --- a/UI/Contacts/Polish.lproj/Localizable.strings +++ b/UI/Contacts/Polish.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Brak możliwej subskrypcji"; "Preferred" = "Preferowane"; -"Display:" = "Wyświetl:"; -"Display Name:" = "Nazwa wyświetlana:"; +"Display" = "Wyświetl"; +"Display Name" = "Nazwa wyświetlana"; "Email:" = "E-mail:"; "Additional Email:" = "Dodatkowy E-mail:"; -"Phone Number:" = "Numer telefonu:"; +"Phone Number" = "Numer telefonu"; "Prefers to receive messages formatted as:" = "Preferuje wiadomości w formacie:"; "Screen Name:" = "Nazwa ekranowa:"; "Categories:" = "Kategorie:"; "First:" = "Imię:"; "Last:" = "Nazwisko:"; -"Nickname:" = "Pseudonim:"; +"Nickname" = "Pseudonim"; "Telephone" = "Telefon"; "Work:" = "Praca:"; @@ -103,25 +103,25 @@ "New category" = "Nowa kategoria"; /* adresses */ -"Title:" = "Tytuł:"; +"Title" = "Tytuł"; "Service:" = "Usługa:"; "Company:" = "Firma:"; "Department:" = "Oddział:"; "Organization:" = "Organizacja:"; "Address:" = "Adres:"; -"City:" = "Miejscowość:"; +"City" = "Miejscowość"; "State_Province:" = "Województwo:"; "ZIP_Postal Code:" = "Kod pocztowy:"; -"Country:" = "Kraj:"; +"Country" = "Kraj"; "Web Page:" = "Strona WWW:"; "Work" = "Praca"; "Other Infos" = "Inne informacje"; -"Note:" = "Uwagi:"; +"Note" = "Uwagi"; "Timezone:" = "Strefa czasowa:"; -"Birthday:" = "Urodziny:"; -"Birthday (yyyy-mm-dd):" = "Urodziny (yyyy-mm-dd):"; +"Birthday" = "Urodziny"; +"Birthday (yyyy-mm-dd)" = "Urodziny (yyyy-mm-dd)"; "Freebusy URL:" = "URL statusu wolny-zajęty:"; "Add as..." = "Dodaj jako"; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Szczegóły listy"; -"List name:" = "Nazwa listy:"; -"List nickname:" = "Nick listy:"; -"List description:" = "Opis listy:"; +"List name" = "Nazwa listy"; +"List nickname" = "Nick listy"; +"List description" = "Opis listy"; "Members" = "Członkowie"; "Contacts" = "Kontakty"; "Add" = "Dodaj"; diff --git a/UI/Contacts/Russian.lproj/Localizable.strings b/UI/Contacts/Russian.lproj/Localizable.strings index 8653d9cab..b5e9c69b2 100644 --- a/UI/Contacts/Russian.lproj/Localizable.strings +++ b/UI/Contacts/Russian.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Нет возможных подписок"; "Preferred" = "Избранные"; -"Display:" = "Показывать:"; -"Display Name:" = "Отображаемое имя:"; +"Display" = "Показывать"; +"Display Name" = "Отображаемое имя"; "Email:" = "E-mail:"; "Additional Email:" = "Дополнительный E-mail:"; -"Phone Number:" = "Номер телефона:"; +"Phone Number" = "Номер телефона"; "Prefers to receive messages formatted as:" = "Предпочитает принимать сообщения, отформатированные следующим образом:"; "Screen Name:" = "Имя показа:"; "Categories:" = "Категории:"; "First:" = "Имя:"; "Last:" = "Последнее:"; -"Nickname:" = "Ник:"; +"Nickname" = "Ник"; "Telephone" = "Телефон"; "Work:" = "Рабочий телефон:"; @@ -103,25 +103,25 @@ "New category" = "Новые категории"; /* adresses */ -"Title:" = "Звание:"; +"Title" = "Звание"; "Service:" = "Сервис:"; "Company:" = "Компания:"; "Department:" = "Отдел:"; "Organization:" = "Организация:"; "Address:" = "Адрес:"; -"City:" = "Город:"; +"City" = "Город"; "State_Province:" = "Область/штат:"; "ZIP_Postal Code:" = "ZIP/Postal Code:"; -"Country:" = "Страна:"; +"Country" = "Страна"; "Web Page:" = "Веб-страница:"; "Work" = "Работа"; "Other Infos" = "Другая информация"; -"Note:" = "Примечание:"; +"Note" = "Примечание"; "Timezone:" = "Часовой пояс:"; -"Birthday:" = "День рождения"; -"Birthday (yyyy-mm-dd):" = "День рождения (ГГГГ-ММ-ДД):"; +"Birthday" = "День рождения"; +"Birthday (yyyy-mm-dd)" = "День рождения (ГГГГ-ММ-ДД)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Добавить как..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Подробности списка"; -"List name:" = "Имя списка:"; -"List nickname:" = "Псевдоним списка:"; -"List description:" = "Описание списка:"; +"List name" = "Имя списка"; +"List nickname" = "Псевдоним списка"; +"List description" = "Описание списка"; "Members" = "Члены"; "Contacts" = "Контакты"; "Add" = "Добавить"; diff --git a/UI/Contacts/Slovak.lproj/Localizable.strings b/UI/Contacts/Slovak.lproj/Localizable.strings index 2aa2e901c..286fa1b4c 100644 --- a/UI/Contacts/Slovak.lproj/Localizable.strings +++ b/UI/Contacts/Slovak.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Žiadne možnosti odberu"; "Preferred" = "Preferovaný"; -"Display:" = "Zobraz:"; -"Display Name:" = "Zobrazované meno:"; +"Display" = "Zobraz"; +"Display Name" = "Zobrazované meno"; "Email:" = "Email:"; "Additional Email:" = "Další email:"; -"Phone Number:" = "Telefónne číslo:"; +"Phone Number" = "Telefónne číslo"; "Prefers to receive messages formatted as:" = "Preferuje prijímať správy formátované ako:"; "Screen Name:" = "Zobrazované meno:"; "Categories:" = "Kategórie:"; "First:" = "Meno:"; "Last:" = "Priezvisko:"; -"Nickname:" = "Prezývka:"; +"Nickname" = "Prezývka"; "Telephone" = "Telefón"; "Work:" = "Do práce:"; @@ -103,25 +103,25 @@ "New category" = "Nová kategória"; /* adresses */ -"Title:" = "Názov:"; +"Title" = "Názov"; "Service:" = "Služba:"; "Company:" = "Spoločnosť:"; "Department:" = "Oddelenie:"; "Organization:" = "Organizácia:"; "Address:" = "Adresa:"; -"City:" = "Mesto:"; +"City" = "Mesto"; "State_Province:" = "Štát:"; "ZIP_Postal Code:" = "Poštové smerové číslo:"; -"Country:" = "Krajina:"; +"Country" = "Krajina"; "Web Page:" = "WWW stránka:"; "Work" = "Práca"; "Other Infos" = "Ostatné informácie"; -"Note:" = "Poznámky:"; +"Note" = "Poznámky"; "Timezone:" = "Časová zóna:"; -"Birthday:" = "Narodeniny:"; -"Birthday (yyyy-mm-dd):" = "Narodeniny (dd-mm-yyyy):"; +"Birthday" = "Narodeniny"; +"Birthday (yyyy-mm-dd)" = "Narodeniny (dd-mm-yyyy)"; "Freebusy URL:" = "URL voľný alebo obsadený:"; "Add as..." = "Pridaj ako..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Detaily zoznamu"; -"List name:" = "Meno zoznamu:"; -"List nickname:" = "Prezývka zoznamu:"; -"List description:" = "Popis zoznamu:"; +"List name" = "Meno zoznamu"; +"List nickname" = "Prezývka zoznamu"; +"List description" = "Popis zoznamu"; "Members" = "Členovia"; "Contacts" = "Kontakty"; "Add" = "Pridaj"; diff --git a/UI/Contacts/Slovenian.lproj/Localizable.strings b/UI/Contacts/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..9526f0eef --- /dev/null +++ b/UI/Contacts/Slovenian.lproj/Localizable.strings @@ -0,0 +1,215 @@ +/* this file is in UTF-8 format! */ + +"Contact" = "Stik"; +"Address" = "Naslov"; +"Photos" = "Slike"; +"Other" = "Ostalo"; + +"Address Books" = "Adresar"; +"Addressbook" = "Adresar"; +"Addresses" = "Naslovi"; +"Update" = "Posodobi"; +"Cancel" = "Prekini"; +"Common" = "Skupno"; +"Contact editor" = "Urejevalnik stikov"; +"Contact viewer" = "Pregledovalnik stikov"; +"Email" = "E-pošta"; +"Screen Name" = "Ime zaslona"; +"Extended" = "Podaljšano"; +"Fax" = "Faks"; +"Firstname" = "Ime"; +"Home" = "Doma"; +"HomePhone" = "DomačiTelefon"; +"Lastname" = "Priimek"; +"Location" = "Mesto"; +"MobilePhone" = "MobilniTelefon"; +"Name" = "Ime"; +"OfficePhone" = "TelefonVPisarni"; +"Organization" = "Organizacija"; +"Work Phone" = "Službeni telefon"; +"Phone" = "Telefon"; +"Phones" = "Telefoni"; +"Postal" = "Pošta"; +"Save" = "Shrani"; +"Internet" = "Internet"; +"Unit" = "Enota"; +"delete" = "briši"; +"edit" = "uredi"; +"invalidemailwarn" = "Ta e-pošta ni pravilna"; +"new" = "novo"; +"Preferred Phone" = "Privzeti telefon"; + +"Move To" = "Premakni v"; +"Copy To" = "Kopiraj v"; +"Add to:" = "Dodaj k:"; + +/* Tooltips */ + +"Create a new address book card" = "Ustvari novi kartico v adresarju"; +"Create a new list" = "Ustvari nov seznam"; +"Edit the selected card" = "Uredi izbrano kartico"; +"Send a mail message" = "Pošlji poštno sporočilo"; +"Delete selected card or address book" = "Briši izbrano kartico ali adresar"; +"Reload all contacts" = "Ponovno naloži vse stike"; + +"htmlMailFormat_UNKNOWN" = "Neznano"; +"htmlMailFormat_FALSE" = "Golo besedilo"; +"htmlMailFormat_TRUE" = "HTML"; + +"Name or Email" = "Ime ali e-pošta"; +"Category" = "Kategorija"; +"Personal Addressbook" = "Osebni adresar"; +"Search in Addressbook" = "Išči v adresarju"; + +"New Card" = "Nova kartica"; +"New List" = "Nov seznam"; +"Edit" = "Uredi"; +"Properties" = "Lastnosti"; +"Sharing..." = "Skupna raba..."; +"Write" = "Piši"; +"Delete" = "Briši"; +"Instant Message" = "Takojšnje sporočilo"; +"Add..." = "Dodaj..."; +"Remove" = "Odstrani"; + +"Please wait..." = "Prosim počakaj..."; +"No possible subscription" = "Naročnina ni mogoča"; + +"Preferred" = "Željeno"; +"Display" = "Prikaz"; +"Display Name" = "Prikazno ime"; +"Email:" = "E-pošta:"; +"Additional Email:" = "Dodatna e-pošta:"; + +"Phone Number" = "Telefonska številka"; +"Prefers to receive messages formatted as:" = "Željen format za prejeta sporočila:"; +"Screen Name:" = "Ime na zaslonu:"; +"Categories:" = "Kategorije:"; + +"First:" = "Prvo:"; +"Last:" = "Zadnje:"; +"Nickname" = "Vzdevek"; + +"Telephone" = "Telefon"; +"Work:" = "Služba:"; +"Home:" = "Doma:"; +"Fax:" = "Faks:"; +"Mobile:" = "Mobilni telefon:"; +"Pager:" = "Pozivnik:"; + +/* categories */ +"contacts_category_labels" = "Kolega, Tekmec, Stranka, Prijatelj, Družina, Poslovni partner, Dobavitelj, Novinar, VIP"; +"Categories" = "Kategorije"; +"New category" = "Nova kategorija"; + +/* adresses */ +"Title" = "Naslov"; +"Service:" = "Storitev:"; +"Company:" = "Podjetje:"; +"Department:" = "Oddelek:"; +"Organization:" = "Organizacija:"; +"Address:" = "Naslov:"; +"City" = "Mesto"; +"State_Province:" = "Država/Provinca:"; +"ZIP_Postal Code:" = "ZIP/Poštna številka:"; +"Country" = "Država"; +"Web Page:" = "Spletna stran:"; + +"Work" = "Delo"; +"Other Infos" = "Ostali podatki"; + +"Note" = "Opomba"; +"Timezone:" = "Časovni pas:"; +"Birthday" = "Rojstni dan"; +"Birthday (yyyy-mm-dd)" = "Rojstni dan (llll-mm-dd)"; +"Freebusy URL:" = "Freebusy URL:"; + +"Add as..." = "Dodaj kot..."; +"Recipient" = "Prejemnik"; +"Carbon Copy" = "Kopija"; +"Blind Carbon Copy" = "Slepa kopija"; + +"New Addressbook..." = "Novi adresar..."; +"Subscribe to an Addressbook..." = "Naroči se na adresar..."; +"Remove the selected Addressbook" = "Odstrani izbrani adresar"; + +"Name of the Address Book" = "Ime adresarja"; +"Are you sure you want to delete the selected address book?" += "Si prepirčan, da želiš brisati izbrani adresar?"; +"You cannot remove nor unsubscribe from a public addressbook." += "Ne moreš se odstraniti ali odjaviti iz javnega adresarja."; +"You cannot remove nor unsubscribe from your personal addressbook." += "Ne moreš se odstraniti ali odjaviti iz osebnega adresarja."; + +"Are you sure you want to delete the selected contacts?" += "Si prepričan, da želiš brisati izbrane stike?"; + +"You cannot delete the card of \"%{0}\"." += "Ne moreš dodeliti kartice od \"%{0}\"."; + + + +"You cannot subscribe to a folder that you own!" += "Ne moreš se naročiti na lastno mapo."; +"Unable to subscribe to that folder!" += "Nemogoče se je naročiti na to mapo."; + +/* acls */ +"Access rights to" = "Pravice za dostop za"; +"For user" = "Za uporabnika"; + +"Any Authenticated User" = "Katerikoli preverjeni uporabnik"; +"Public Access" = "Javni dostop"; + +"This person can add cards to this addressbook." += "Ta oseba lahko dodaja kartice temu adresarju."; +"This person can edit the cards of this addressbook." += "Ta oseba lahko ureja kartice tega adresarja."; +"This person can list the content of this addressbook." += "Ta oseba lahko izpiše vsebino tega adresarja."; +"This person can read the cards of this addressbook." += "Ta oseba lahko bere kartice tega adresarja."; +"This person can erase cards from this addressbook." += "Ta oseba lahko briše kartice tega adresarja."; + +"The selected contact has no email address." += "Izbran stik nima e-poštnega naslova."; + +"Please select a contact." = "Prosim izberi stik."; + +/* Error messages for move and copy */ + +"SoAccessDeniedException" = "Ne moreš pisati v ta adresar."; +"Forbidden" = "Ne moreš pisati v ta adresar."; +"Invalid Contact" = "Izbrani stik ne obstaja več."; +"Unknown Destination Folder" = "Izbrani ciljni adresar ne obstaja več."; + +/* Lists */ +"List details" = "Podrobnosti seznama"; +"List name" = "Ime iz seznama"; +"List nickname" = "Vzdevek iz seznama"; +"List description" = "Opis iz seznama"; +"Members" = "Člani"; +"Contacts" = "Stiki"; +"Add" = "Dodaj"; +"Lists can't be moved or copied." = "Seznami ne morejo biti premaknjeni ali kopirani."; +"Export" = "Izvozi"; +"Export Address Book..." = "Izvozi adresar"; +"View Raw Source" = "Pregled surovega vira"; +"Import Cards" = "Uvozi kartice"; +"Select a vCard or LDIF file." = "Izberi vCard ali LDIF datoteko."; +"Upload" = "Naloži"; +"Uploading" = "Nalaganje"; +"Done" = "Končano"; +"An error occured while importing contacts." = "Prišlo je do napake pri uvozu stikov."; +"No card was imported." = "Nobena kartica ni uvožena."; +"A total of %{0} cards were imported in the addressbook." = "Skupaj %{0} kartic je bilo uvoženo v adresar."; + +"Reload" = "Ponovno naloži"; + +/* Properties window */ +"Address Book Name:" = "Ime adresarja:"; +"Links to this Address Book" = "Povezave do tega adresarja"; +"Authenticated User Access" = "Preverjeni uporabniški dostop"; +"CardDAV URL: " = "CardDAV URL:"; + diff --git a/UI/Contacts/SpanishArgentina.lproj/Localizable.strings b/UI/Contacts/SpanishArgentina.lproj/Localizable.strings index 3adb1eafa..5d1ec88ba 100644 --- a/UI/Contacts/SpanishArgentina.lproj/Localizable.strings +++ b/UI/Contacts/SpanishArgentina.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "No es posible la suscripción"; "Preferred" = "Preferido"; -"Display:" = "Mostrar como:"; -"Display Name:" = "Nombre a mostrar:"; +"Display" = "Mostrar como"; +"Display Name" = "Nombre a mostrar"; "Email:" = "Correo electrónico:"; "Additional Email:" = "Correo electrónico adicional:"; -"Phone Number:" = "Número de teléfono:"; +"Phone Number" = "Número de teléfono"; "Prefers to receive messages formatted as:" = "Formato preferido para los mensajes recibidos:"; "Screen Name:" = "Nombre en Pantalla:"; "Categories:" = "Categorías:"; "First:" = "Nombre:"; "Last:" = "Apellidos:"; -"Nickname:" = "Alias:"; +"Nickname" = "Alias"; "Telephone" = "Teléfono"; "Work:" = "Trabajo:"; @@ -103,25 +103,25 @@ "New category" = "Nueva categoría"; /* adresses */ -"Title:" = "Título:"; +"Title" = "Título"; "Service:" = "Servicio:"; "Company:" = "Empresa:"; "Department:" = "Departamento:"; "Organization:" = "Organización:"; "Address:" = "Domicilio:"; -"City:" = "Ciudad:"; +"City" = "Ciudad"; "State_Province:" = "Estado/Provincia:"; "ZIP_Postal Code:" = "Código postal:"; -"Country:" = "País:"; +"Country" = "País"; "Web Page:" = "Web:"; "Work" = "Trabajo"; "Other Infos" = "Otra Información"; -"Note:" = "Nota:"; +"Note" = "Nota"; "Timezone:" = "Zona horaria:"; -"Birthday:" = "Fecha de nacimiento:"; -"Birthday (yyyy-mm-dd):" = "Fecha e nacimiento (aaaa-mm-dd):"; +"Birthday" = "Fecha de nacimiento"; +"Birthday (yyyy-mm-dd)" = "Fecha e nacimiento (aaaa-mm-dd)"; "Freebusy URL:" = "URL de disponibilidad:"; "Add as..." = "Añadir como..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Detalles de la lista"; -"List name:" = "Nombre de la lista:"; -"List nickname:" = "Alias de la lista:"; -"List description:" = "descripción de la lista:"; +"List name" = "Nombre de la lista"; +"List nickname" = "Alias de la lista"; +"List description" = "descripción de la lista"; "Members" = "Miembros"; "Contacts" = "Contactos"; "Add" = "Añadir"; diff --git a/UI/Contacts/SpanishSpain.lproj/Localizable.strings b/UI/Contacts/SpanishSpain.lproj/Localizable.strings index a8ba01958..cf324d43a 100644 --- a/UI/Contacts/SpanishSpain.lproj/Localizable.strings +++ b/UI/Contacts/SpanishSpain.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "No es posible la suscripción"; "Preferred" = "Preferido"; -"Display:" = "Mostrado:"; -"Display Name:" = "Mostrar Nombre:"; +"Display" = "Mostrado"; +"Display Name" = "Mostrar Nombre"; "Email:" = "Correo electrónico:"; "Additional Email:" = "Correo electrónico Adicional:"; -"Phone Number:" = "Número de teléfono:"; +"Phone Number" = "Número de teléfono"; "Prefers to receive messages formatted as:" = "Formato preferido para los mensajes recibidos:"; "Screen Name:" = "Nombre en Pantalla:"; "Categories:" = "Categorias:"; "First:" = "Nombre:"; "Last:" = "Apellidos:"; -"Nickname:" = "Alias:"; +"Nickname" = "Alias"; "Telephone" = "Teléfono"; "Work:" = "Trabajo:"; @@ -103,25 +103,25 @@ "New category" = "Nueva categoria"; /* adresses */ -"Title:" = "Título:"; +"Title" = "Título"; "Service:" = "Servicio:"; "Company:" = "Empresa:"; "Department:" = "Departamento:"; "Organization:" = "Organización:"; "Address:" = "Domicilio:"; -"City:" = "Ciudad:"; +"City" = "Ciudad"; "State_Province:" = "Estado/Provincia:"; "ZIP_Postal Code:" = "Código postal:"; -"Country:" = "País:"; +"Country" = "País"; "Web Page:" = "Web:"; "Work" = "Trabajo"; "Other Infos" = "Otra Información"; -"Note:" = "Nota:"; +"Note" = "Nota"; "Timezone:" = "Zona horaria:"; -"Birthday:" = "Fecha nacimiento:"; -"Birthday (yyyy-mm-dd):" = "Fecha nacimiento (aaaa-mm-dd):"; +"Birthday" = "Fecha nacimiento"; +"Birthday (yyyy-mm-dd)" = "Fecha nacimiento (aaaa-mm-dd)"; "Freebusy URL:" = "URL disponibilidad:"; "Add as..." = "Añadir como..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Detalles de la lista"; -"List name:" = "Nombre de la lista:"; -"List nickname:" = "Alias de la lista:"; -"List description:" = "descripcion de la lista:"; +"List name" = "Nombre de la lista"; +"List nickname" = "Alias de la lista"; +"List description" = "descripcion de la lista"; "Members" = "Miembros"; "Contacts" = "Contactos"; "Add" = "Añadir"; diff --git a/UI/Contacts/Swedish.lproj/Localizable.strings b/UI/Contacts/Swedish.lproj/Localizable.strings index a09576708..ee45e7b11 100644 --- a/UI/Contacts/Swedish.lproj/Localizable.strings +++ b/UI/Contacts/Swedish.lproj/Localizable.strings @@ -77,19 +77,19 @@ "Preferred" = "Föredragen"; "Card for %@" = "Adresskort för %@"; -"Display:" = "Visa:"; -"Display Name:" = "Visningsnamn:"; +"Display" = "Visa"; +"Display Name" = "Visningsnamn"; "Email:" = "E-post:"; "Additional Email:" = "Ytterligare e-post:"; -"Phone Number:" = "Telefonnummer:"; +"Phone Number" = "Telefonnummer"; "Prefers to receive messages formatted as:" = "Föredrar att få mottagna meddelanden kodade som:"; "Screen Name:" = "Skärmnamn:"; "Categories:" = "Kategorier:"; "First:" = "Förnamn:"; "Last:" = "Efternamn:"; -"Nickname:" = "Kortnamn:"; +"Nickname" = "Kortnamn"; "Telephone" = "Telefonnummer"; "Work:" = "Arbete:"; @@ -104,25 +104,25 @@ "New category" = "Ny kategori"; /* adresses */ -"Title:" = "Titel:"; +"Title" = "Titel"; "Service:" = "Befattning:"; "Company:" = "Företag:"; "Department:" = "Avdelning:"; "Organization:" = "Organisation:"; "Address:" = "Adress:"; -"City:" = "Stad: "; +"City" = "Stad "; "State_Province:" = "Landsdel/Stat:"; "ZIP_Postal Code:" = "Postnummer:"; -"Country:" = "Land:"; +"Country" = "Land"; "Web Page:" = "Webbplats:"; "Work" = "Arbete"; "Other Infos" = "Övrigt"; -"Note:" = "Anteckning:"; +"Note" = "Anteckning"; "Timezone:" = "Tidzon:"; -"Birthday:" = "Födelsedag:"; -"Birthday (yyyy-mm-dd):" = "Födelsedag (yyyy-mm-dd):"; +"Birthday" = "Födelsedag"; +"Birthday (yyyy-mm-dd)" = "Födelsedag (yyyy-mm-dd)"; "Freebusy URL:" = "Ledig/upptagen URL:"; "Add as..." = "Lägg till som..."; @@ -185,9 +185,9 @@ /* Lists */ "List details" = "Information om utskickslistan"; -"List name:" = "Namn på utskickslistan:"; -"List nickname:" = "Smeknamn på utskickslistan:"; -"List description:" = "Beskrivning:"; +"List name" = "Namn på utskickslistan"; +"List nickname" = "Smeknamn på utskickslistan"; +"List description" = "Beskrivning"; "Members" = "Medlemmar"; "Contacts" = "Kontakter"; "Add" = "Lägg till"; diff --git a/UI/Contacts/UIxContactFolderProperties.m b/UI/Contacts/UIxContactFolderProperties.m index 391d82f3d..1f5a92a01 100644 --- a/UI/Contacts/UIxContactFolderProperties.m +++ b/UI/Contacts/UIxContactFolderProperties.m @@ -48,6 +48,41 @@ return [addressBook displayName]; } +- (NSString *) setAddressBookName: (NSString *) newName +{ + [addressBook renameTo: newName]; +} + +- (BOOL) synchronizeAddressBook +{ + return [self mustSynchronize] || [addressBook synchronize]; +} + +- (void) setSynchronizeAddressBook: (BOOL) new +{ + [addressBook setSynchronize: new]; +} + +- (BOOL) mustSynchronize +{ + return [[addressBook nameInContainer] isEqualToString: @"personal"]; +} + +- (BOOL) shouldTakeValuesFromRequest: (WORequest *) request + inContext: (WOContext*) context +{ + NSString *method; + + method = [[request uri] lastPathComponent]; + + return [method isEqualToString: @"saveProperties"]; +} + +- (id ) savePropertiesAction +{ + return [self jsCloseWithRefreshMethod: nil]; +} + - (NSString *) _baseCardDAVURL { NSString *davURL; diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m index aaf35d6c2..5b0c80d64 100644 --- a/UI/Contacts/UIxContactFoldersView.m +++ b/UI/Contacts/UIxContactFoldersView.m @@ -251,6 +251,24 @@ Class SOGoContactSourceFolderK, SOGoGCSFolderK; ? @"available": @"unavailable"); } +- (NSDictionary *) currentContactFolderCardRights +{ + NSArray *roles; + NSString *userLogin, *owner; + BOOL objectEditor, objectEraser; + + userLogin = [[context activeUser] login]; + owner = [currentFolder ownerInContext: context]; + roles = [currentFolder aclsForUser: userLogin]; + objectEditor = ([owner isEqualToString: userLogin] || [roles containsObject: SOGoRole_ObjectEditor]); + objectEraser = ([owner isEqualToString: userLogin] || [roles containsObject: SOGoRole_ObjectEraser]); + + return [NSDictionary dictionaryWithObjectsAndKeys: + (objectEditor? @"available": @"unavailable"), @"editing", + (objectEraser? @"available": @"unavailable"), @"deleting", + nil]; +} + - (NSString *) verticalDragHandleStyle { NSString *vertical; diff --git a/UI/Contacts/Ukrainian.lproj/Localizable.strings b/UI/Contacts/Ukrainian.lproj/Localizable.strings index 7600fd519..47602589d 100644 --- a/UI/Contacts/Ukrainian.lproj/Localizable.strings +++ b/UI/Contacts/Ukrainian.lproj/Localizable.strings @@ -76,19 +76,19 @@ "No possible subscription" = "Відсутні підписки"; "Preferred" = "Найзручніше"; -"Display:" = "Відображати як:"; -"Display Name:" = "Ім’я, що відображається:"; +"Display" = "Відображати як"; +"Display Name" = "Ім’я, що відображається"; "Email:" = "Електронна пошта:"; "Additional Email:" = "Дод. електронна адреса:"; -"Phone Number:" = "Номер телефону:"; +"Phone Number" = "Номер телефону"; "Prefers to receive messages formatted as:" = "Вважає за краще отримувати пошту у форматі:"; "Screen Name:" = "Інтернет-пейджер:"; "Categories:" = "Категорії:"; "First:" = "Ім’я:"; "Last:" = "Прізвище:"; -"Nickname:" = "Псевдонім:"; +"Nickname" = "Псевдонім"; "Telephone" = "Телефон"; "Work:" = "Робочий:"; @@ -103,25 +103,25 @@ "New category" = "Нова категорія"; /* adresses */ -"Title:" = "Посада:"; +"Title" = "Посада"; "Service:" = "Служба:"; "Company:" = "Організація:"; "Department:" = "Відділ:"; "Organization:" = "Організація:"; "Address:" = "Адреса:"; -"City:" = "Місто:"; +"City" = "Місто"; "State_Province:" = "Область, регіон:"; "ZIP_Postal Code:" = "Поштовий індекс:"; -"Country:" = "Країна:"; +"Country" = "Країна"; "Web Page:" = "Веб-сторінка:"; "Work" = "Робоча"; "Other Infos" = "Інша інформація"; -"Note:" = "Примітки:"; +"Note" = "Примітки"; "Timezone:" = "Часова зона:"; -"Birthday:" = "День народження:"; -"Birthday (yyyy-mm-dd):" = "Дата народження (рррр-мм-дд):"; +"Birthday" = "День народження"; +"Birthday (yyyy-mm-dd)" = "Дата народження (рррр-мм-дд)"; "Freebusy URL:" = "Freebusy URL:"; "Add as..." = "Додати як..."; @@ -186,9 +186,9 @@ /* Lists */ "List details" = "Деталі списку"; -"List name:" = "Назва списку:"; -"List nickname:" = "Псевдонім списку:"; -"List description:" = "Опис:"; +"List name" = "Назва списку"; +"List nickname" = "Псевдонім списку"; +"List description" = "Опис"; "Members" = "Учасники"; "Contacts" = "Контакти"; "Add" = "Додати"; diff --git a/UI/Contacts/Welsh.lproj/Localizable.strings b/UI/Contacts/Welsh.lproj/Localizable.strings index aeefefbd3..3b9b026d7 100644 --- a/UI/Contacts/Welsh.lproj/Localizable.strings +++ b/UI/Contacts/Welsh.lproj/Localizable.strings @@ -71,7 +71,7 @@ "Preferred" = "Fafriedig"; "Card for %@" = "Cerdyn i %@"; -"Display Name:" = "Dangos Enw: "; +"Display Name" = "Dangos Enw "; "Email:" = "Cyfeiriad ebost: "; "Additional Email:" = "Additional Email:"; @@ -80,7 +80,7 @@ "First:" = "Enw cyntaf: "; "Last:" = "Cyfenw: "; -"Nickname:" = "Llysenw: "; +"Nickname" = "Llysenw "; "Telephone" = "Teleffon"; "Work:" = "Gwaith: "; @@ -95,23 +95,23 @@ "New category" = "New category"; /* adresses */ -"Title:" = "Teitl: "; +"Title" = "Teitl "; "Service:" = "Gwasanaeth: "; "Company:" = "Cwmni: "; "Street Address:" = "Cyfeiriad Stryd: "; -"City:" = "Dinas: "; +"City" = "Dinas "; "State_Province:" = "Sir/Talaith:"; "ZIP_Postal Code:" = "ZIP/Cod Post:"; -"Country:" = "Gwlad:"; +"Country" = "Gwlad"; "Web:" = "We: "; "Work" = "gwaith"; "Other Infos" = "Gwybodaeth Arall"; -"Note:" = "Nodyn: "; +"Note" = "Nodyn "; "Timezone:" = "Cylchfa Amser: "; -"Birthday:" = "Penblwydd:"; -"Birthday (yyyy-mm-dd):" = "Penblwydd (yyyy-mm-dd):"; +"Birthday" = "Penblwydd"; +"Birthday (yyyy-mm-dd)" = "Penblwydd (yyyy-mm-dd)"; "Freebusy URL:" = "Freebusy URL: "; "Add as..." = "Ychwanegu fel..."; @@ -174,9 +174,9 @@ /* Lists */ "List details" = "List details"; -"List name:" = "List name:"; -"List nickname:" = "List nickname:"; -"List description:" = "List description:"; +"List name" = "List name"; +"List nickname" = "List nickname"; +"List description" = "List description"; "Members" = "Members"; "Contacts" = "Contacts"; "Add" = "Add"; diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist index 7ed3b6314..28103ebd0 100644 --- a/UI/Contacts/product.plist +++ b/UI/Contacts/product.plist @@ -122,6 +122,11 @@ protectedBy = "View"; pageName = "UIxContactFolderProperties"; }; + saveProperties = { + protectedBy = "Access Contents Information"; + pageName = "UIxContactFolderProperties"; + actionName = "saveProperties"; + }; }; }; diff --git a/UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings b/UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..73d7d7516 --- /dev/null +++ b/UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,48 @@ +ACCEPTED = "已接受"; +COMPLETED = "已完成"; +DECLINED = "已拒絶"; +DELEGATED = "已委任"; +"IN-PROCESS" = "處理中"; +"NEEDS-ACTION" = "需要操作"; +TENTATIVE = "未定"; +organized_by_you = "您是發起者"; +you_are_an_attendee = "您是受邀請者"; +add_info_text = "不支援iMIP格式的 'ADD' 。"; +publish_info_text = "寄件者提醒增加這筆事件"; +cancel_info_text = "您的所有邀請事件都取消了。"; +request_info_no_attendee = "正在安排會議出席人員。這封電子郵件是通知您不用出席這場會議。"; +Appointment = "安排"; +"Status Update" = "狀態更新"; +was = "是"; + +Organizer = "發起者"; +Time = "時間"; +Attendees = "出席者"; +request_info = "邀請您參加會議。"; +"Add to calendar" = "加入行事曆"; +"Delete from calendar" = "由行事曆中刪除"; +"Update status" = "更新狀態"; +Accept = "出席"; +Decline = "不出席"; +Tentative = "未定"; +"Delegate ..." = "委任 ..."; +"Delegated to" = "委任給"; +"Update status in calendar" = "在行事曆異動狀態"; +"delegated from" = "委任自"; + +reply_info_no_attendee = "您收到受邀請者不出席的回覆。"; +reply_info = "這是您的出席回覆。"; + +"to" = "到"; + +"Untitled" = "無主旨"; + +"Size" = "大小"; + +"Digital signature is not valid" = "無效的簽署"; +"Message is signed" = "己簽署的郵件"; +"Subject" = "主旨"; +"From" = "寄件人"; +"Date" = "日期"; +"To" = "收件者"; +"Issuer" = "發行者"; diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index 89ed971ef..bbaa636e6 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MailPartViewers MailPartViewers_PRINCIPAL_CLASS = MailPartViewersProduct -MailPartViewers_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MailPartViewers_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MailPartViewers_OBJC_FILES += \ MailPartViewersProduct.m \ diff --git a/UI/MailPartViewers/Slovenian.lproj/Localizable.strings b/UI/MailPartViewers/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..bf0826413 --- /dev/null +++ b/UI/MailPartViewers/Slovenian.lproj/Localizable.strings @@ -0,0 +1,48 @@ +ACCEPTED = "sprejeto"; +COMPLETED = "dokončano"; +DECLINED = "zavrnjeno"; +DELEGATED = "dodeljeno"; +"IN-PROCESS" = "v teku"; +"NEEDS-ACTION" = "potrebuje dejanje"; +TENTATIVE = "pogojno"; +organized_by_you = "organizirano po tebi"; +you_are_an_attendee = "ti si udeleženec"; +add_info_text = "iMIP 'ADD' zahteva ni podprta v SOGo."; +publish_info_text = "Pošiljatelj te obvešča o priloženem dogodku."; +cancel_info_text = "Tvoje vabilo ali celoten dogodek je bil preklican."; +request_info_no_attendee = "predlaga srečanje za udeležence. To pošto si prejel kot obvestilo, nisi pa razporejen kot sodelujoči."; +Appointment = "Sestanek"; +"Status Update" = "Posodobitev statusa"; +was = "je bil"; + +Organizer = "Organizator"; +Time = "Čas"; +Attendees = "Udeleženci"; +request_info = "te vabi, da sodeluješ na srečanju."; +"Add to calendar" = "Dodaj v koledar"; +"Delete from calendar" = "Briši iz koledarja"; +"Update status" = "Posodobi status"; +Accept = "Sprejmi"; +Decline = "Zavrni"; +Tentative = "Pogojno"; +"Delegate ..." = "Dodeli ..."; +"Delegated to" = "Dodeljeno k"; +"Update status in calendar" = "Posodobi status v koledarju"; +"delegated from" = "Dodeljeno od"; + +reply_info_no_attendee = "Prejel si odgovor na razporejen dogodek, toda pošiljatelj tega odgovora ni udeleženec."; +reply_info = "To je odgovor na tvoje povabilo na dogodek."; + +"to" = "za"; + +"Untitled" = "Brez naslova"; + +"Size" = "Velikost"; + +"Digital signature is not valid" = "Digitalno potrdilo ni veljavno"; +"Message is signed" = "Sporočilo je podpisano"; +"Subject" = "Zadeva"; +"From" = "Od"; +"Date" = "Datum"; +"To" = "Za"; +"Issuer" = "Izdajatelj"; diff --git a/UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings b/UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings index 7fa91fcd6..caeffa79c 100644 --- a/UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings +++ b/UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings @@ -22,16 +22,16 @@ request_info = "lo invita a un evento."; "Add to calendar" = "Añadir al calendario"; "Delete from calendar" = "Borrar del calendario"; "Update status" = "Actualizar estado"; -Accept = "Confirmar"; +Accept = "Aceptar"; Decline = "Rechazar"; Tentative = "Tentativo"; "Delegate ..." = "Delegar a ..."; "Delegated to" = "Delegado a"; "Update status in calendar" = "Actualizar estado en el calendario"; -"delegated from" = "delegado de"; +"delegated from" = "delegado por"; reply_info_no_attendee = "Ha recibido una respuesta a una invitación de evento pero el remitente no aparece como un participante."; -reply_info = "Esta es la respuesta a una invitación a un evento que Usted ha organizado."; +reply_info = "Esta es la respuesta a una invitación a un evento que usted ha organizado."; "to" = "para"; @@ -39,7 +39,7 @@ reply_info = "Esta es la respuesta a una invitación a un evento que Usted ha or "Size" = "Tamaño"; -"Digital signature is not valid" = "Firma Digital no válida"; +"Digital signature is not valid" = "Firma digital no válida"; "Message is signed" = "Mensaje firmado"; "Subject" = "Asunto"; "From" = "De"; diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m index ca41c7f62..f1ead5ffd 100644 --- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m +++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m @@ -872,6 +872,19 @@ static NSData* _sanitizeContent(NSData *theData) usingEncodingNamed: [[bodyInfo objectForKey:@"parameterList"] objectForKey: @"charset"]]; + // In some rare cases (like #3276), we can get utterly broken email messages where + // HTML parts are wrongly encoded. We try to fall back to UTF-8 if that happens and + // if it still happens, we fall back to ISO-Latin-1. + if (!s) + { + s = [[NSString alloc] initWithData: preparsedContent encoding: NSUTF8StringEncoding]; + + if (!s) + s = [[NSString alloc] initWithData: preparsedContent encoding: NSISOLatin1StringEncoding]; + + AUTORELEASE(s); + } + #if BYTE_ORDER == BIG_ENDIAN preparsedContent = [s dataUsingEncoding: NSUTF16BigEndianStringEncoding]; enc = XML_CHAR_ENCODING_UTF16BE; diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m index e068ebbe5..567412818 100644 --- a/UI/MailPartViewers/UIxMailPartICalActions.m +++ b/UI/MailPartViewers/UIxMailPartICalActions.m @@ -300,7 +300,7 @@ delegatedAttendee = [iCalPerson new]; [delegatedAttendee autorelease]; [delegatedAttendee setEmail: delegatedEmail]; - delegatedUid = [delegatedAttendee uid]; + delegatedUid = [delegatedAttendee uidInDomain: [user domain]]; if (delegatedUid) { SOGoUser *delegatedUser; diff --git a/UI/MailerUI/Arabic.lproj/Localizable.strings b/UI/MailerUI/Arabic.lproj/Localizable.strings index 490cea964..002a9cc63 100644 --- a/UI/MailerUI/Arabic.lproj/Localizable.strings +++ b/UI/MailerUI/Arabic.lproj/Localizable.strings @@ -237,8 +237,8 @@ /* Folder operations */ "Name :" = "أسم:"; -"Enter the new name of your folder :" - = "أدخل اسم جديد للمجلد:"; +"Enter the new name of your folder" + = "أدخل اسم جديد للمجلد"; "Do you really want to move this folder into the trash ?" = "هل تريد حقا نقل هذا المجلد إلى سلة المهملات؟"; "Operation failed" = "فشلت عملية"; diff --git a/UI/MailerUI/Basque.lproj/Localizable.strings b/UI/MailerUI/Basque.lproj/Localizable.strings index aa1603cba..a3750d5dd 100644 --- a/UI/MailerUI/Basque.lproj/Localizable.strings +++ b/UI/MailerUI/Basque.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "ez zaborra gisa"; "Run Junk Mail Controls" = "Exekutatu zabor-posta kontrolak"; -"Search messages in:" = "Bilatu mezuak hemen:"; +"Search messages in" = "Bilatu mezuak hemen"; "Search" = "Bilatu"; "Search subfolders" = "Bilatu azpikarpetak"; "Match any of the following" = "Irizpide hauetako edozein betetzen dituztenak"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Izena:"; -"Enter the new name of your folder :" - = "Idatzi zure karpetaren izen berria:"; +"Enter the new name of your folder" + = "Idatzi zure karpetaren izen berria"; "Do you really want to move this folder into the trash ?" = "Ziur zaude karpeta hau zakarrontzira mugitu nahi duzula?"; "Operation failed" = "Eragiketak huts egin du"; diff --git a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings index 92af97fe0..82369d0bf 100644 --- a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Como Não é Lixo Eletrônico"; "Run Junk Mail Controls" = "Executar Controle de Lixo Eletrônico"; -"Search messages in:" = "Pesquisar mensagens em:"; +"Search messages in" = "Pesquisar mensagens em"; "Search" = "Pesquisar"; "Search subfolders" = "Pesquisar sub-pastas"; "Match any of the following" = "Combinar qualquer uma das seguintes"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Nome :"; -"Enter the new name of your folder :" - = "Informe o novo nome de sua pasta :"; +"Enter the new name of your folder" + = "Informe o novo nome de sua pasta"; "Do you really want to move this folder into the trash ?" = "Você realmente quer mover esta pasta para a Lixeira ?"; "Operation failed" = "Falha na Operação"; diff --git a/UI/MailerUI/Catalan.lproj/Localizable.strings b/UI/MailerUI/Catalan.lproj/Localizable.strings index c76770b66..0a958dbf9 100644 --- a/UI/MailerUI/Catalan.lproj/Localizable.strings +++ b/UI/MailerUI/Catalan.lproj/Localizable.strings @@ -239,8 +239,8 @@ /* Folder operations */ "Name :" = "Nom: "; -"Enter the new name of your folder :" - = "Introduïu el nom nou per a la carpeta: "; +"Enter the new name of your folder" + = "Introduïu el nom nou per a la carpeta"; "Do you really want to move this folder into the trash ?" = "Voleu moure aquesta carpeta a la paperera?"; "Operation failed" = "Operació no vàlida"; diff --git a/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings b/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..ab5ff7c72 --- /dev/null +++ b/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,308 @@ +/* this file is in UTF-8 format! */ + +/* Icon's label */ +"Create" = "寫信"; +"Empty Trash" = "清空垃圾筒"; +"Delete" = "刪除"; +"Expunge" = "清除"; +"Forward" = "轉寄"; +"Get Mail" = "收信"; +"Junk" = "垃圾信件"; +"Reply" = "回覆"; +"Reply All" = "全部回覆"; +"Print" = "列印"; +"Stop" = "停止"; +"Write" = "寫信"; +"Search" = "搜尋"; + +"Send" = "寄信"; +"Contacts" = "聯絡人"; +"Attach" = "附加檔案"; +"Save" = "儲存"; +"Options" = "選項"; +"Close" = "關閉"; +"Size" = "大小"; + +/* Tooltips */ + +"Send this message now" = "立即寄出"; +"Select a recipient from an Address Book" = "從通訊錄選擇收件者帳號"; +"Include an attachment" = "增加附檔"; +"Save this message" = "儲存信件"; +"Get new messages" = "接收新信"; +"Create a new message" = "建立一封新的信件"; +"Go to address book" = "移動到通訊錄"; +"Reply to the message" = "回信"; +"Reply to sender and all recipients" = "回覆寄件者及所有收件者"; +"Forward selected message" = "轉寄信件"; +"Delete selected message or folder" = "刪除信件或資料匣"; +"Mark the selected messages as junk" = "標示為垃圾郵件"; +"Print this message" = "列印信件"; +"Stop the current transfer" = "停止發送"; +"Attachment" = "附加檔"; +"Unread" = "未讀"; +"Flagged" = "標註"; +"Search multiple mailboxes" = "搜尋多個郵件信箱"; + +/* Main Frame */ + +"Home" = "首頁"; +"Calendar" = "行事曆"; +"Addressbook" = "通訊錄"; +"Mail" = "郵件"; +"Right Administration" = "權限管理"; + +"Help" = "幫助"; + +/* Mail account main windows */ + +"Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!" = "歡迎使用SOGO郵件系統. 請使用左側的列表來檢視郵件帳號!"; + +"Read messages" = "讀信"; +"Write a new message" = "寫新信"; + +"Share: " = "分享:"; +"Account: " = "帳號:"; +"Shared Account: " = "分享的帳號:"; + +/* acls */ +"Access rights to" = "存取權限"; +"For user" = "提供使用者"; + +"Any Authenticated User" = "任何認證的使用者"; + +"List and see this folder" = "列出並檢視這個資料匣"; +"Read mails from this folder" = "讀取這個資料匣的信件"; +"Mark mails read and unread" = "標示信件為己讀/未讀\""; +"Modify the flags of the mails in this folder" = "修改這個資料匣信件的標示"; +"Insert, copy and move mails into this folder" = "插入, 拷貝 及搬移信件到這個資料匣"; +"Post mails" = "寄出信件"; +"Add subfolders to this folder" = "在這個資料匣增加子資料匣"; +"Remove this folder" = "刪除這個資料匣"; +"Erase mails from this folder" = "清除這個資料匣的信件"; +"Expunge this folder" = "清除這個目資料匣"; +"Export This Folder" = "匯出資料匣"; +"Modify the acl of this folder" = "修改這個資料匣的存取控制清單"; + +"Saved Messages.zip" = "儲存信件壓縮檔"; + +"Update" = "更新"; +"Cancel" = " 取消"; + +/* Mail edition */ + +"From" = "寄件人"; +"Subject" = "主旨"; +"To" = "收件者"; +"Cc" = "副本"; +"Bcc" = "密件副本"; +"Reply-To" = "回覆到"; +"Add address" = "增加郵件帳號"; +"Body" = "信件內容"; + +"Open" = "開啟"; +"Select All" = "全部選取"; +"Attach Web Page..." = "附件網頁..."; +"file" = "檔案"; +"files" = "多檔案"; +"Save all" = "全部儲存"; + +"to" = "收件者"; +"cc" = "副本"; +"bcc" = "密件副本"; + +"Edit Draft..." = "編輯草稿..."; +"Load Images" = "加入圖檔"; + +"Return Receipt" = "回覆回條"; +"The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "寄件者要求您讀取信件時回覆通知,請問您要回覆嗎?"; +"Return Receipt (displayed) - %@"= "回覆回條 (顯示) - %@"; +"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." = "這是您寄送給 %@ 的回覆回條。\n\n附註: 回覆回條只代表收件者己收到這封郵件。並不保證收件者己經閱讀或是知道郵件內容。"; + +"Priority" = "優先順序"; +"highest" = "最重要"; +"high" = "重要"; +"normal" = "一般"; +"low" = "低"; +"lowest" = "最低"; + +"This mail is being sent from an unsecure network!" = "這封郵件是來自非安全的網段!"; + +"Address Book:" = "通訊錄:"; +"Search For:" = "搜尋:"; + +/* Popup "show" */ + +"all" = "全部"; +"read" = "已讀"; +"unread" = "未讀"; +"deleted" = "已刪除"; +"flagged" = "已註記"; + +/* MailListView */ + +"Sender" = "寄件者"; +"Subject or Sender" = "主旨或寄件者"; +"To or Cc" = "收件者或副本收件者"; +"Entire Message" = "全部內容"; + +"Date" = "日期"; +"View" = "檢視"; +"All" = "全部"; +"No message" = "沒有信件"; +"messages" = "信件"; + +"first" = "最前"; +"previous" = "前"; +"next" = "後"; +"last" = "最後"; + +"msgnumber_to" = "收件人"; +"msgnumber_of" = "的"; + +"Mark Unread" = "標示為未讀"; +"Mark Read" = "標示為已讀"; + +"Untitled" = "無主旨"; + +/* Tree */ + +"SentFolderName" = "寄件備份"; +"TrashFolderName" = "垃圾桶"; +"InboxFolderName" = "收件匣"; +"DraftsFolderName" = "草稿匣"; +"SieveFolderName" = "垃圾信件匣"; +"Folders" = "目錄\n"; /* title line */ + +/* MailMoveToPopUp */ + +"MoveTo" = "搬移到"; + +/* Address Popup menu */ +"Add to Address Book..." = "加到通訊錄..."; +"Compose Mail To" = "寫新信"; +"Create Filter From Message..." = "建立規則..."; + +/* Image Popup menu */ +"Save Image" = "儲存圖片"; +"Save Attachment" = "儲存附檔"; + +/* Mailbox popup menus */ +"Open in New Mail Window" = "在新視窗開啟信件"; +"Copy Folder Location" = "複製資料匣位置"; +"Subscribe..." = "訂閱..."; +"Mark Folder Read" = "將資料匣標示為已讀"; +"New Folder..." = "新增資料匣..."; +"Compact This Folder" = "壓縮此資料匣"; +"Search Messages..." = "搜尋信件..."; +"Sharing..." = "共享..."; +"New Subfolder..." = "新增子資料匣..."; +"Rename Folder..." = "修改資料匣名稱..."; +"Delete Folder" = "刪除資料匣"; +"Use This Folder For" = "這個資料匣使用於"; +"Get Messages for Account" = "讀取這個帳號的信件"; +"Properties..." = "屬性..."; +"Delegation..." = "授權...\""; + +/* Use This Folder menu */ +"Sent Messages" = "寄信備份"; +"Drafts" = "草稿匣"; +"Deleted Messages" = "垃圾桶"; + +/* Message list popup menu */ +"Open Message In New Window" = "在新視窗開啟信件"; +"Reply to Sender Only" = "只回覆寄件者"; +"Reply to All" = "全部回信"; +"Edit As New..." = "編輯為新的..."; +"Move To" = "移動到"; +"Copy To" = "複製到"; +"Label" = "標籤"; +"Mark" = "標示"; +"Save As..." = "儲存為..."; +"Print Preview" = "預覽列印"; +"View Message Source" = "檢視信件原始檔"; +"Print..." = "列印..."; +"Delete Message" = "刪除信件"; +"Delete Selected Messages" = "刪除選擇的信件"; + +"This Folder" = "該資料匣"; + +/* Label popup menu */ +"None" = "無"; + +/* Mark popup menu */ +"As Read" = "己讀"; +"Thread As Read" = "標示為己讀"; +"As Read By Date..." = "按日期讀取..."; +"All Read" = "全部讀取"; +"Flag" = "標示"; +"As Junk" = "這是垃圾圾郵件"; +"As Not Junk" = "這不是垃圾郵件"; +"Run Junk Mail Controls" = "執行垃圾郵件管制"; + +"Search messages in" = "搜尋信件在"; +"Search" = "搜尋"; +"Search subfolders" = "搜尋子資料匣"; +"Match any of the following" = "符合下列任一條件"; +"Match all of the following" = "符合以下所有條件"; +"contains" = "包含"; +"does not contain" = "不包含"; +"No matches found" = "未找到符合條件的資料"; +"results found" = "搜尋結果"; +"result found" = "搜尋結果"; +"Please specify at least one filter" = "請指定至少一項過濾規則"; + +/* Folder operations */ +"Name :" = "名稱:"; +"Enter the new name of your folder" + = "輸入新資料匣名稱"; +"Do you really want to move this folder into the trash ?" + = "是否確定將這個資料匣移到垃圾桶?"; +"Operation failed" = "操作失敗"; + +"Quota" = "使用空間"; +"quotasFormat" = "%{0}% 己使用 %{1} MB"; + +"Please select a message." = "請選擇一封信件。"; +"Please select a message to print." = "請選擇要列印的信件。"; +"Please select only one message to print." = "請選擇單封信件進行列印。"; +"The message you have selected doesn't exist anymore." = "您選擇的信件已不存在。"; + +"The folder with name \"%{0}\" could not be created." += "無法建立名稱為 \"%{0}\" 的資料匣。"; +"This folder could not be renamed to \"%{0}\"." += "無法將資料匣名稱更改為 \"%{0}\"。"; +"The folder could not be deleted." += "無法刪除此資料匣。"; +"The trash could not be emptied." += "垃圾桶不能清空。"; +"The folder functionality could not be changed." += "無法修改該資料匣的功能。;"; + +"You need to choose a non-virtual folder!" = "您必須選擇一個非虛擬的資料匣!"; + +"Moving a message into its own folder is impossible!" += "不能將信件搬移到原來所在的資料匣!"; +"Copying a message into its own folder is impossible!" += "不能將信件複製到原來所在的資料匣!"; + +/* Message operations */ +"The messages could not be moved to the trash folder. Would you like to delete them immediately?" += "無法將郵件搬移到垃圾桶。您確定要刪除這封郵件嗎?"; + +/* Message editing */ +"error_missingsubject" = "這封郵件沒有主旨。是否仍要寄送?"; +"error_missingrecipients" = "請輸入至少一個收件者帳號。"; +"Send Anyway" = "信件寄送"; +"Error while saving the draft:" = "草稿儲存發生錯誤:"; +"Error while uploading the file \"%{0}\":" = "檔案上傳發送錯誤 \"%{0}\":"; +"There is an active file upload. Closing the window will interrupt it." = "檔案上傳中。視窗關閉會造成上傳中斷。"; + +/* Message sending */ +"cannot send message: (smtp) all recipients discarded" = "無法寄送信件: 所有收件者帳號都無法寄出。"; +"cannot send message (smtp) - recipients discarded:" = "無法寄送信件。下面的收件者帳號無法寄出:"; +"cannot send message: (smtp) error when connecting" = "無法寄送郵件: 連接SMTP伺服器失敗。"; + +/* Contacts list in mail editor */ +"Email" = "電子郵件帳號"; +"Name" = "名稱"; diff --git a/UI/MailerUI/Czech.lproj/Localizable.strings b/UI/MailerUI/Czech.lproj/Localizable.strings index 8c551d65f..743321f39 100644 --- a/UI/MailerUI/Czech.lproj/Localizable.strings +++ b/UI/MailerUI/Czech.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Jako vyžádané"; "Run Junk Mail Controls" = "Spustit kontrolu nevyžádaných"; -"Search messages in:" = "Hledat zprávy v:"; +"Search messages in" = "Hledat zprávy v"; "Search" = "Hledat"; "Search subfolders" = "Hledat v podsložkách"; "Match any of the following" = "Odpovídající některému pravidlu"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Jméno :"; -"Enter the new name of your folder :" - = "Zadejte nový název Vaší složky :"; +"Enter the new name of your folder" + = "Zadejte nový název Vaší složky"; "Do you really want to move this folder into the trash ?" = "Opravdu chcete tuto složku vyhodit do koše ?"; "Operation failed" = "Operace selhala"; diff --git a/UI/MailerUI/Danish.lproj/Localizable.strings b/UI/MailerUI/Danish.lproj/Localizable.strings index e668f8cae..9ac038c4c 100644 --- a/UI/MailerUI/Danish.lproj/Localizable.strings +++ b/UI/MailerUI/Danish.lproj/Localizable.strings @@ -237,8 +237,8 @@ /* Folder operations */ "Name :" = "Navn:"; -"Enter the new name of your folder :" - = "Indtast det nye navn på din mappe:"; +"Enter the new name of your folder" + = "Indtast det nye navn på din mappe"; "Do you really want to move this folder into the trash ?" = "Er du sikker på, at du vil flytte denne mappe til papirkurven?"; "Operation failed" = "Handlingen mislykkedes"; diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings index dff1f42e6..1f4c2c25a 100644 --- a/UI/MailerUI/Dutch.lproj/Localizable.strings +++ b/UI/MailerUI/Dutch.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Als gewenst"; "Run Junk Mail Controls" = "Ongewenste berichtenfilter starten"; -"Search messages in:" = "Zoek berichten in:"; +"Search messages in" = "Zoek berichten in"; "Search" = "Zoeken"; "Search subfolders" = "Zoek in submappen"; "Match any of the following" = "Gelijk aan een van de volgende"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Naam:"; -"Enter the new name of your folder :" - = "Geef de nieuw naam van de map op:"; +"Enter the new name of your folder" + = "Geef de nieuw naam van de map op"; "Do you really want to move this folder into the trash ?" = "Weet u zeker dat u deze map naar de prullenbak wilt verplaatsen?"; "Operation failed" = "Bewerking mislukt."; diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index 02466f5b5..d3557b78f 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "As Not Junk"; "Run Junk Mail Controls" = "Run Junk Mail Controls"; -"Search messages in:" = "Search messages in:"; +"Search messages in" = "Search messages in"; "Search" = "Search"; "Search subfolders" = "Search subfolders"; "Match any of the following" = "Match any of the following"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Name :"; -"Enter the new name of your folder :" - = "Enter the new name of your folder :"; +"Enter the new name of your folder" + ="Enter the new name of your folder"; "Do you really want to move this folder into the trash ?" = "Do you really want to move this folder into the trash ?"; "Operation failed" = "Operation failed"; diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings index 66e488318..f7d226736 100644 --- a/UI/MailerUI/Finnish.lproj/Localizable.strings +++ b/UI/MailerUI/Finnish.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Ei roskaksi"; "Run Junk Mail Controls" = "Käynnistä roskapostien hallinta"; -"Search messages in:" = "Etsi viestejä:"; +"Search messages in" = "Etsi viestejä"; "Search" = "Etsi"; "Search subfolders" = "Etsi alihakemistoista"; "Match any of the following" = "Täsmää mihin tahansa seuraavista"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Nimi:"; -"Enter the new name of your folder :" - = "Syötä kansiosi uusi nimi:"; +"Enter the new name of your folder" + = "Syötä kansiosi uusi nimi"; "Do you really want to move this folder into the trash ?" = "Oletko varma että haluat siirtää tämän kansion roskakoriin? "; "Operation failed" = "Toiminto epäonnistui"; diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings index b136c0a99..57e6e5b1f 100644 --- a/UI/MailerUI/French.lproj/Localizable.strings +++ b/UI/MailerUI/French.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Comme acceptable"; "Run Junk Mail Controls" = "Lancer le contrôle des indésirables"; -"Search messages in:" = "Rechercher dans :"; +"Search messages in" = "Rechercher dans "; "Search" = "Recherche"; "Search subfolders" = "Rechercher dans les sous-dossiers"; "Match any of the following" = "Répondant à un des critères suivants"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Nom:"; -"Enter the new name of your folder :" - = "Entrez le nouveau nom de votre dossier:"; +"Enter the new name of your folder" + = "Entrez le nouveau nom de votre dossier"; "Do you really want to move this folder into the trash ?" = "Voulez-vous vraiment déplacer le dossier sélectionné dans la corbeille?"; "Operation failed" = "L'opération a échoué."; diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index 329a4c873..2e8892603 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MailerUI MailerUI_PRINCIPAL_CLASS = MailerUIProduct -MailerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MailerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MailerUI_OBJC_FILES += \ MailerUIProduct.m \ diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings index 6ea7e17db..414281734 100644 --- a/UI/MailerUI/German.lproj/Localizable.strings +++ b/UI/MailerUI/German.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Kein Junk"; "Run Junk Mail Controls" = "Junk-Filter anwenden"; -"Search messages in:" = "Nachrichten suchen in:"; +"Search messages in" = "Nachrichten suchen in"; "Search" = "Suchen"; "Search subfolders" = "Durchsuche Unterordner"; "Match any of the following" = "Die auf mindestens eines der folgenden Muster passen"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Name:"; -"Enter the new name of your folder :" - = "Geben Sie den Namen des neuen Ordners ein:"; +"Enter the new name of your folder" + = "Geben Sie den Namen des neuen Ordners ein"; "Do you really want to move this folder into the trash ?" = "Wollen Sie diesen Ordner wirklich in den Papierkorb verschieben?"; "Operation failed" = "Operation fehlgeschlagen."; diff --git a/UI/MailerUI/Hungarian.lproj/Localizable.strings b/UI/MailerUI/Hungarian.lproj/Localizable.strings index c22c1cf77..270919fa2 100644 --- a/UI/MailerUI/Hungarian.lproj/Localizable.strings +++ b/UI/MailerUI/Hungarian.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Nem szemétként"; "Run Junk Mail Controls" = "Levélszemétgyűjtő futtatása"; -"Search messages in:" = "Üzenetek keresése ebben:"; +"Search messages in" = "Üzenetek keresése ebben"; "Search" = "Keresés"; "Search subfolders" = "Keresés almappákban"; "Match any of the following" = "A következők egyikének feleljen meg"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Név:"; -"Enter the new name of your folder :" - = "Adja meg az új mappa nevét:"; +"Enter the new name of your folder" + = "Adja meg az új mappa nevét"; "Do you really want to move this folder into the trash ?" = "Biztosan lomtárba kívánja helyezni ezt a mappát ?"; "Operation failed" = "A művelet megszakadt"; diff --git a/UI/MailerUI/Icelandic.lproj/Localizable.strings b/UI/MailerUI/Icelandic.lproj/Localizable.strings index 375f4e6e7..37dba87f6 100644 --- a/UI/MailerUI/Icelandic.lproj/Localizable.strings +++ b/UI/MailerUI/Icelandic.lproj/Localizable.strings @@ -235,8 +235,8 @@ /* Folder operations */ "Name :" = "Nafn :"; -"Enter the new name of your folder :" - = "Enter the new name of your folder :"; +"Enter the new name of your folder" + ="Enter the new name of your folder"; "Do you really want to move this folder into the trash ?" = "Do you really want to move this folder into the trash ?"; "Operation failed" = "Aðgerðin mistókst"; diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings index 0bf331060..7e8012620 100644 --- a/UI/MailerUI/Italian.lproj/Localizable.strings +++ b/UI/MailerUI/Italian.lproj/Localizable.strings @@ -237,8 +237,8 @@ /* Folder operations */ "Name :" = "Nome :"; -"Enter the new name of your folder :" - = "Inserisci il nuovo nome della cartella :"; +"Enter the new name of your folder" + = "Inserisci il nuovo nome della cartella "; "Do you really want to move this folder into the trash ?" = "Sei sicuro di voler spostare la cartella nel cestino ?"; "Operation failed" = "Operazione non riuscita"; diff --git a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings index e2f6937d9..993a492f6 100644 --- a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Som ikke søppel"; "Run Junk Mail Controls" = "Kjør søppelpostkontroll"; -"Search messages in:" = "Søk etter beskjeder i:"; +"Search messages in" = "Søk etter beskjeder i"; "Search" = "Søk"; "Search subfolders" = "Søk i undermapper"; "Match any of the following" = "Passer noen av"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Navn : "; -"Enter the new name of your folder :" - = "Skriv navnet på mappen :"; +"Enter the new name of your folder" + = "Skriv navnet på mappen"; "Do you really want to move this folder into the trash ?" = "Vil du virkelig flytte mappen til papirkurven ?"; "Operation failed" = "Operasjonen mislyktes"; diff --git a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings index 776cc23e6..568f7cc3b 100644 --- a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings @@ -235,8 +235,8 @@ /* Folder operations */ "Name :" = "Navn: "; -"Enter the new name of your folder :" - = "Skriv navnet på mappen: "; +"Enter the new name of your folder" + = "Skriv navnet på mappen"; "Do you really want to move this folder into the trash ?" = "Vil du virkelig flytte mappen till papirkurven?"; "Operation failed" = "Operasjonen misslykkes"; diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings index cf823edc6..f1012b972 100644 --- a/UI/MailerUI/Polish.lproj/Localizable.strings +++ b/UI/MailerUI/Polish.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Jako nie-śmieć"; "Run Junk Mail Controls" = "Uruchom kontrolę wiadomości śmieci"; -"Search messages in:" = "Szukaj wiadomości w:"; +"Search messages in" = "Szukaj wiadomości w"; "Search" = "Szukaj"; "Search subfolders" = "Przeszukaj podfoldery"; "Match any of the following" = "Dopasuj dowolny z warunków"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Nazwa :"; -"Enter the new name of your folder :" - = "Wprowadź nową nazwę twojego folderu:"; +"Enter the new name of your folder" + = "Wprowadź nową nazwę twojego folderu"; "Do you really want to move this folder into the trash ?" = "Czy na pewno chcesz przenieść ten folder do kosza ?"; "Operation failed" = "Operacja nie powiodła się"; diff --git a/UI/MailerUI/Russian.lproj/Localizable.strings b/UI/MailerUI/Russian.lproj/Localizable.strings index 1f7828d61..d2b5b44b3 100644 --- a/UI/MailerUI/Russian.lproj/Localizable.strings +++ b/UI/MailerUI/Russian.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Не спам"; "Run Junk Mail Controls" = "Запустить фильтр спама"; -"Search messages in:" = "Искать сообщения в:."; +"Search messages in" = "Искать сообщения в."; "Search" = "Поиск"; "Search subfolders" = "Искать во вложенных папках"; "Match any of the following" = "Отвечают любому из следующих"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Имя :"; -"Enter the new name of your folder :" - = "Введите новое имя папки :"; +"Enter the new name of your folder" + = "Введите новое имя папки"; "Do you really want to move this folder into the trash ?" = "Вы действительно хотите перенести эту папку в корзину?"; "Operation failed" = "Операция завершилась неудачно"; diff --git a/UI/MailerUI/Slovak.lproj/Localizable.strings b/UI/MailerUI/Slovak.lproj/Localizable.strings index 31a5958a1..98cc4fbf2 100644 --- a/UI/MailerUI/Slovak.lproj/Localizable.strings +++ b/UI/MailerUI/Slovak.lproj/Localizable.strings @@ -239,8 +239,8 @@ /* Folder operations */ "Name :" = "Meno:"; -"Enter the new name of your folder :" - = "Zadajte nové meno adresára:"; +"Enter the new name of your folder" + = "Zadajte nové meno adresára"; "Do you really want to move this folder into the trash ?" = "Skutočne chcete presunúť tento priečinok do koša?"; "Operation failed" = "Operácia zlyhala"; diff --git a/UI/MailerUI/Slovenian.lproj/Localizable.strings b/UI/MailerUI/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..14ad12245 --- /dev/null +++ b/UI/MailerUI/Slovenian.lproj/Localizable.strings @@ -0,0 +1,308 @@ +/* this file is in UTF-8 format! */ + +/* Icon's label */ +"Create" = "Ustvari"; +"Empty Trash" = "Izprazni koš"; +"Delete" = "Briši"; +"Expunge" = "Izbriši"; +"Forward" = "Posreduj"; +"Get Mail" = "Pridobi pošto"; +"Junk" = "Nezaželeno"; +"Reply" = "Odgovori"; +"Reply All" = "Odgovori vsem"; +"Print" = "Tiskaj"; +"Stop" = "Ustavi"; +"Write" = "Piši"; +"Search" = "Išči"; + +"Send" = "Pošlji"; +"Contacts" = "Stiki"; +"Attach" = "Priloži"; +"Save" = "Shrani"; +"Options" = "Možnosti"; +"Close" = "Zapri"; +"Size" = "Velikost"; + +/* Tooltips */ + +"Send this message now" = "Pošlji to sporočilo zdaj"; +"Select a recipient from an Address Book" = "Izberi prejemnika iz adresarja"; +"Include an attachment" = "Vključi prilogo"; +"Save this message" = "Shrani to sporočilo"; +"Get new messages" = "Pridobi nova sporočila"; +"Create a new message" = "Ustvari novo sporočilo"; +"Go to address book" = "Pojdi na adresar"; +"Reply to the message" = "Odgovori na sporočilo"; +"Reply to sender and all recipients" = "Odgovori pošiljatelju in vsem prejemnikom"; +"Forward selected message" = "Posreduj izbrano sporočilo"; +"Delete selected message or folder" = "Zbriši izbrano sporočilo ali mapo"; +"Mark the selected messages as junk" = "Označi izbrana sporočila kot nezaželena"; +"Print this message" = "Tiskaj to sporočilo"; +"Stop the current transfer" = "Ustavi trenutni prenos"; +"Attachment" = "Priloga"; +"Unread" = "Neprebrano"; +"Flagged" = "Označeno z zastavico"; +"Search multiple mailboxes" = "Išči vse poštne predale"; + +/* Main Frame */ + +"Home" = "Domov"; +"Calendar" = "Koledar"; +"Addressbook" = "Adresar"; +"Mail" = "Pošta"; +"Right Administration" = "Pravica administriranja"; + +"Help" = "Pomoč"; + +/* Mail account main windows */ + +"Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!" = "Pozdravljeni v SOGo poštni storitvi. Uporabi drevo map na levi za brskanje tvojih poštnih računov!"; + +"Read messages" = "Beri sporočila"; +"Write a new message" = "Piši novo sporočilo"; + +"Share: " = "Skupna raba:"; +"Account: " = "Račun:"; +"Shared Account: " = "Deljen račun:"; + +/* acls */ +"Access rights to" = "Pravice za dostop"; +"For user" = "Za uporabnika"; + +"Any Authenticated User" = "Katerikoli preverjeni uporabnik"; + +"List and see this folder" = "Izlistaj in preglej to mapo"; +"Read mails from this folder" = "Preberi pošto iz te mape"; +"Mark mails read and unread" = "Označi pošto za prebrano in neprebrano"; +"Modify the flags of the mails in this folder" = "Spremeni zastavico za pošto v tej mapi"; +"Insert, copy and move mails into this folder" = "Vstavi, kopiraj in premakni pošto v to mapo"; +"Post mails" = "Oddaj pošto"; +"Add subfolders to this folder" = "Dodaj podmapo tej mapi"; +"Remove this folder" = "Odstrani to mapo"; +"Erase mails from this folder" = "Izbriši pošto iz te mape"; +"Expunge this folder" = "Izbriši to mapo"; +"Export This Folder" = "Izvozi to mapo"; +"Modify the acl of this folder" = "Spremeni ACL te mape"; + +"Saved Messages.zip" = "Shranjena sporočila.zip"; + +"Update" = "Posodobi"; +"Cancel" = "Prekini"; + +/* Mail edition */ + +"From" = "Od"; +"Subject" = "Zadeva"; +"To" = "Za"; +"Cc" = "Kp"; +"Bcc" = "Skp"; +"Reply-To" = "Odgovori"; +"Add address" = "Dodaj naslov"; +"Body" = "Telo"; + +"Open" = "Odpri"; +"Select All" = "Označi vse"; +"Attach Web Page..." = "Priloži spletno stran"; +"file" = "datoteka"; +"files" = "datoteke"; +"Save all" = "Shrani vse"; + +"to" = "Za"; +"cc" = "Kp"; +"bcc" = "Skp"; + +"Edit Draft..." = "Uredi osnutek..."; +"Load Images" = "Naloži slike"; + +"Return Receipt" = "Povratnica"; +"The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "Pošiljatelj tega sporočila je prosil za obvestilo o branju tega sporočila. Obvestim pošiljatelja?"; +"Return Receipt (displayed) - %@"= "Povratnica (prikazana) - %@"; +"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." = "To je povratnica o prejemu sporočila poslanega %@\n\nOpozorilo: Ta povratnica samo obvešča, da je sporočilo bilo prikazano na prejemnikovem računalniku. Ne obstaja nobeno jamstvo, da je prejemnik sporočilo prebral ali razumel vsebino sporočila."; + +"Priority" = "Prioriteta"; +"highest" = "Najvišja"; +"high" = "Visoka"; +"normal" = "Normalna"; +"low" = "Nizka"; +"lowest" = "Najnižja"; + +"This mail is being sent from an unsecure network!" = "To sporočilo je bilo poslano iz ne varnega omrežja!"; + +"Address Book:" = "Adresar:"; +"Search For:" = "Išči za:"; + +/* Popup "show" */ + +"all" = "vse"; +"read" = "prebrano"; +"unread" = "neprebrano"; +"deleted" = "brisano"; +"flagged" = "označeno z zastavico"; + +/* MailListView */ + +"Sender" = "Pošiljatelj"; +"Subject or Sender" = "Zadeva ali pošiljatelj"; +"To or Cc" = "Za ali kp"; +"Entire Message" = "Celotno sporočilo"; + +"Date" = "Datum"; +"View" = "Pregled"; +"All" = "Vse"; +"No message" = "Ni sporočila"; +"messages" = "sporočila"; + +"first" = "Prvo"; +"previous" = "Prejšnje"; +"next" = "Naslednje"; +"last" = "Zadnje"; + +"msgnumber_to" = "za"; +"msgnumber_of" = "od"; + +"Mark Unread" = "Označi neprebrano"; +"Mark Read" = "Označi prebrano"; + +"Untitled" = "Brez naslova"; + +/* Tree */ + +"SentFolderName" = "Poslano"; +"TrashFolderName" = "Koš"; +"InboxFolderName" = "Prejeto"; +"DraftsFolderName" = "Osnutki"; +"SieveFolderName" = "Filterji"; +"Folders" = "Mape"; /* title line */ + +/* MailMoveToPopUp */ + +"MoveTo" = "Premakni …"; + +/* Address Popup menu */ +"Add to Address Book..." = "Dodaj v adresar..."; +"Compose Mail To" = "Sestavi pošta za"; +"Create Filter From Message..." = "Ustvari filter iz sporočila..."; + +/* Image Popup menu */ +"Save Image" = "Shrani sliko"; +"Save Attachment" = "Shrani prilogo"; + +/* Mailbox popup menus */ +"Open in New Mail Window" = "Odpri v novem poštnem oknu"; +"Copy Folder Location" = "Kopiraj mesto mape"; +"Subscribe..." = "Naroči..."; +"Mark Folder Read" = "Označi mapo kot prebrano"; +"New Folder..." = "Nova mapa..."; +"Compact This Folder" = "Skrči to mapo"; +"Search Messages..." = "Išči sporočila..."; +"Sharing..." = "Skupna raba..."; +"New Subfolder..." = "Nova podmapa..."; +"Rename Folder..." = "Preimenuj mapo..."; +"Delete Folder" = "Briši mapo"; +"Use This Folder For" = "Uporabi to mapo za"; +"Get Messages for Account" = "Pridobi sporočila za račun"; +"Properties..." = "Lastnosti..."; +"Delegation..." = "Dodeljevanje..."; + +/* Use This Folder menu */ +"Sent Messages" = "Poslana sporočila"; +"Drafts" = "Osnutki"; +"Deleted Messages" = "Brisana sporočila"; + +/* Message list popup menu */ +"Open Message In New Window" = "Odpri sporočilo v novem oknu"; +"Reply to Sender Only" = "Odgovori le pošiljatelju"; +"Reply to All" = "Odgovori vsem"; +"Edit As New..." = "Uredi kot novo..."; +"Move To" = "Premakni v"; +"Copy To" = "Kopiraj v"; +"Label" = "Oznaka"; +"Mark" = "Označi"; +"Save As..." = "Shrani kot..."; +"Print Preview" = "Tiskaj predogled"; +"View Message Source" = "Poglej izvorno sporočilo"; +"Print..." = "Tiskaj..."; +"Delete Message" = "Briši sporočilo"; +"Delete Selected Messages" = "Briši izbrana sporočila"; + +"This Folder" = "Ta mapa"; + +/* Label popup menu */ +"None" = "Nobena"; + +/* Mark popup menu */ +"As Read" = "Kot prebrano"; +"Thread As Read" = "Nit kot prebrano"; +"As Read By Date..." = "Prebrano po datumu..."; +"All Read" = "Vse prebrano"; +"Flag" = "Zastavica"; +"As Junk" = "Kot nezaželeno"; +"As Not Junk" = "Kot zaželeno"; +"Run Junk Mail Controls" = "Poženi nadzor nezaželene pošte"; + +"Search messages in" = "Išči sporočila v"; +"Search" = "Išči"; +"Search subfolders" = "Išči podmape"; +"Match any of the following" = "sklada se s katerimkoli od naslednjih"; +"Match all of the following" = "sklada se z naslednjimi"; +"contains" = "vsebuje"; +"does not contain" = "ne vsebuje"; +"No matches found" = "Ni zadetkov"; +"results found" = "najdeni zadetki"; +"result found" = "najden zadetek"; +"Please specify at least one filter" = "Prosim določi vsaj en filter"; + +/* Folder operations */ +"Name :" = "Ime :"; +"Enter the new name of your folder" + = "Vpiši novo ime tvoje mape"; +"Do you really want to move this folder into the trash ?" + = "Zares želiš premakniti to mapo v koš?"; +"Operation failed" = "Dejanje ni uspelo"; + +"Quota" = "Kvota:"; +"quotasFormat" = "%{0}% zasedeno od %{1} MB"; + +"Please select a message." = "Prosim izberi sporočilo."; +"Please select a message to print." = "Prosim izberi sporočilo za tiskanje."; +"Please select only one message to print." = "Prosim izberi samo eno sporočilo za tiskanje."; +"The message you have selected doesn't exist anymore." = "Izbrano sporočilo ne obstaja več."; + +"The folder with name \"%{0}\" could not be created." += "Mape z imenom \"%{0}\" ni mogoče ustvariti."; +"This folder could not be renamed to \"%{0}\"." += "Te mape ni mogoče preimenovati v \"%{0}\"."; +"The folder could not be deleted." += "Mape ni mogoče izbrisati."; +"The trash could not be emptied." += "Koša ni mogoče izprazniti."; +"The folder functionality could not be changed." += "Funkcionalnost mape ni mogoče spremeniti."; + +"You need to choose a non-virtual folder!" = "Izbrati je potrebno nenavidezno mapo."; + +"Moving a message into its own folder is impossible!" += "Premakniti sporočilo v lastno mapo ni mogoče!"; +"Copying a message into its own folder is impossible!" += "Kopiranje sporočila v lastno mapo ni mogoče!"; + +/* Message operations */ +"The messages could not be moved to the trash folder. Would you like to delete them immediately?" += "Sporočila ni mogoče premakniti v koš. Ga želiš izbrisati takoj?"; + +/* Message editing */ +"error_missingsubject" = "Sporočilo nima zadeve. Si prepričan, da ga želiš poslati?"; +"error_missingrecipients" = "Prosim določi vsaj enega prejemnika."; +"Send Anyway" = "Pošlji vseeno"; +"Error while saving the draft:" = "Napaka pri shranjevanju osnutka:"; +"Error while uploading the file \"%{0}\":" = "Napaka pri nalaganju datoteke \"%{0}\":"; +"There is an active file upload. Closing the window will interrupt it." = "Nalaganje datoteke je aktivno. Zapiranje okna ga bo prekinilo."; + +/* Message sending */ +"cannot send message: (smtp) all recipients discarded" = "Ne morem poslati sporočila: vsi prejemniki so napačni."; +"cannot send message (smtp) - recipients discarded:" = "Ne morem poslati sporočila. Naslednji naslovi so napačni:"; +"cannot send message: (smtp) error when connecting" = "Ne morem poslati sporočila: napaka pri povezavi s SMTP strežnikom."; + +/* Contacts list in mail editor */ +"Email" = "E-pošta"; +"Name" = "Ime"; diff --git a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings index 697ab2374..6cc64331e 100644 --- a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings @@ -26,7 +26,7 @@ /* Tooltips */ "Send this message now" = "Enviar este mensaje ahora"; -"Select a recipient from an Address Book" = "Seleccione un destinatario de alguna de las libretas de direcciones"; +"Select a recipient from an Address Book" = "Seleccione un destinatario de una libreta de direcciones"; "Include an attachment" = "Incluir un adjunto"; "Save this message" = "Guardar este mensaje"; "Get new messages" = "Recibir mensajes nuevos"; @@ -144,7 +144,7 @@ "Sender" = "Remitente"; "Subject or Sender" = "Asunto o remitente"; "To or Cc" = "Para o CC"; -"Entire Message" = "Mensage completo"; +"Entire Message" = "Mensaje completo"; "Date" = "Fecha"; "View" = "Vista"; @@ -205,7 +205,7 @@ "Delegation..." = "Delegación..."; /* Use This Folder menu */ -"Sent Messages" = "Enviar mensajes"; +"Sent Messages" = "Mensajes enviados"; "Drafts" = "Borradores"; "Deleted Messages" = "Mensajes borrados"; @@ -216,7 +216,7 @@ "Edit As New..." = "Editar como nuevo..."; "Move To" = "Mover a"; "Copy To" = "Copiar a"; -"Label" = "Etiquetar"; +"Label" = "Etiqueta"; "Mark" = "Marcar"; "Save As..." = "Guardar como..."; "Print Preview" = "Vista preliminar"; @@ -240,11 +240,11 @@ "As Not Junk" = "Como correo normal"; "Run Junk Mail Controls" = "Ejecutar controles de correo basura"; -"Search messages in:" = "Buscar mensajes en:"; +"Search messages in" = "Buscar mensajes en"; "Search" = "Buscar"; "Search subfolders" = "Buscar en subcarpetas"; -"Match any of the following" = "Coincidir con cualquiera de los siguientes"; -"Match all of the following" = "Coincidir con alguno de los siguientes"; +"Match any of the following" = "Coincidir con cualquiera de los siguientes criterios:"; +"Match all of the following" = "Coincidir con todos estos criterios:"; "contains" = "contiene"; "does not contain" = "no contiene"; "No matches found" = "No se encontraron coincidencias"; @@ -254,10 +254,10 @@ /* Folder operations */ "Name :" = "Nombre: "; -"Enter the new name of your folder :" - = "Introduzca el nuevo nombre de la carpeta: "; +"Enter the new name of your folder" + = "Introduzca el nuevo nombre de la carpeta"; "Do you really want to move this folder into the trash ?" - = "¿Seguro que desea mover la carpeta a la papelera?"; + = "¿Está seguro de que desea mover la carpeta a la papelera?"; "Operation failed" = "Operación fallida"; "Quota" = "Cuota"; @@ -279,12 +279,12 @@ "The folder functionality could not be changed." = "La funcionalidad de la carpeta no puede ser cambiada."; -"You need to choose a non-virtual folder!" = "¡Ha de seleccionar una carpeta no virtual!"; +"You need to choose a non-virtual folder!" = "La carpeta seleccionada no debe ser virtual"; "Moving a message into its own folder is impossible!" -= "¡Es imposible mover los mensajes en su propia carpeta!"; += "¡Es imposible mover los mensajes a la misma carpeta!"; "Copying a message into its own folder is impossible!" -= "¡Es imposible copiar mensajes en su propia carpeta!"; += "¡Es imposible copiar mensajes a la misma carpeta!"; /* Message operations */ "The messages could not be moved to the trash folder. Would you like to delete them immediately?" @@ -299,9 +299,9 @@ "There is an active file upload. Closing the window will interrupt it." = "Se está subiendo un archivo. Si cierra la ventana se cancelará la operación."; /* Message sending */ -"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 send message: (smtp) all recipients discarded" = "No se puede enviar el mensaje: Ninguno de los destinatarios es válido."; +"cannot send message (smtp) - recipients discarded:" = "No se puede enviar el mensaje: Las siguientes direcciones no son válidas:"; +"cannot send message: (smtp) error when connecting" = "No se puede enviar el mensaje: Error de conexión mientras se trataba de conectar con el servidor SMTP."; /* Contacts list in mail editor */ "Email" = "Correo"; diff --git a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings index 804acdcc5..81f7e4d2b 100644 --- a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings @@ -240,7 +240,7 @@ "As Not Junk" = "Como correo normal"; "Run Junk Mail Controls" = "Ejecutar controles de correo basura"; -"Search messages in:" = "Buscar mensajes en:"; +"Search messages in" = "Buscar mensajes en"; "Search" = "Buscar"; "Search subfolders" = "Buscar sub carpetas"; "Match any of the following" = "Cumplen cualquiera de las reglas siguientes"; @@ -254,8 +254,8 @@ /* Folder operations */ "Name :" = "Nombre: "; -"Enter the new name of your folder :" - = "Introduzca el nuevo nombre de la carpeta: "; +"Enter the new name of your folder" + = "Introduzca el nuevo nombre de la carpeta"; "Do you really want to move this folder into the trash ?" = "¿Seguro que desea mover la carpeta a la papelera?"; "Operation failed" = "Operación fallida"; diff --git a/UI/MailerUI/Swedish.lproj/Localizable.strings b/UI/MailerUI/Swedish.lproj/Localizable.strings index ee18ce90f..d3922144c 100644 --- a/UI/MailerUI/Swedish.lproj/Localizable.strings +++ b/UI/MailerUI/Swedish.lproj/Localizable.strings @@ -235,8 +235,8 @@ /* Folder operations */ "Name :" = "Namn: "; -"Enter the new name of your folder :" - = "Skriv namnet på mappen: "; +"Enter the new name of your folder" + = "Skriv namnet på mappen"; "Do you really want to move this folder into the trash ?" = "Vill du verkligen flytta mappen till papperskorgen?"; "Operation failed" = "Operationen misslyckades"; diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m index a9bf3a65c..fcc0285ee 100644 --- a/UI/MailerUI/UIxMailEditor.m +++ b/UI/MailerUI/UIxMailEditor.m @@ -823,7 +823,7 @@ static NSArray *infoKeys = nil; recipients_count += [[co allRecipients] count]; messages_count += 1; - if ([dd maximumMessageSubmissionCount] > 0 && [dd maximumRecipientCount] > 0) + if ([dd maximumMessageSubmissionCount] > 0 || [dd maximumRecipientCount] > 0) { [[SOGoCache sharedCache] setMessageSubmissionsCount: messages_count recipientsCount: recipients_count diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings index d7ae77b28..7e35c0c51 100644 --- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings @@ -237,8 +237,8 @@ /* Folder operations */ "Name :" = "Назва :"; -"Enter the new name of your folder :" - = "Введіть нову назву теки :"; +"Enter the new name of your folder" + = "Введіть нову назву теки"; "Do you really want to move this folder into the trash ?" = "Ви справді бажаєте перенести цю теку до кошика?"; "Operation failed" = "Операція завершилась невдало"; diff --git a/UI/MailerUI/Welsh.lproj/Localizable.strings b/UI/MailerUI/Welsh.lproj/Localizable.strings index 8a4d93d7e..533cb7a19 100644 --- a/UI/MailerUI/Welsh.lproj/Localizable.strings +++ b/UI/MailerUI/Welsh.lproj/Localizable.strings @@ -235,8 +235,8 @@ /* Folder operations */ "Name :" = "Enw :"; -"Enter the new name of your folder :" - = "Rhowch yr enw newydd ar eich ffolder :"; +"Enter the new name of your folder" + = "Rhowch yr enw newydd ar eich ffolder"; "Do you really want to move this folder into the trash ?" = "A ydych yn sicr eich bod eisiau symudy ffolder yma i'r sbwriel ?"; "Operation failed" = "Gweithrediad wedi methu"; diff --git a/UI/MainUI/Arabic.lproj/Localizable.strings b/UI/MainUI/Arabic.lproj/Localizable.strings index 7ec32a3a4..9501bd65e 100644 --- a/UI/MainUI/Arabic.lproj/Localizable.strings +++ b/UI/MainUI/Arabic.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "سوجو"; -"Username:" = "اسم المستخدم:"; -"Password:" = "كلمة السر:"; -"Domain:" = "النطاق:"; +"Username" = "اسم المستخدم"; +"Password" = "كلمة السر"; +"Domain" = "النطاق"; "Remember username" = "تذكر اسم المستخدم"; "Connect" = "اتصل"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "بدلا من ذلك، يمكنك أيضا استخدام سفاري."; "Download" = "نزِّل"; -"Language:" = "اللغة:"; +"Language" = "اللغة"; "choose" = "إختار ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Basque.lproj/Localizable.strings b/UI/MainUI/Basque.lproj/Localizable.strings index 5bfc86638..1c8cc1327 100644 --- a/UI/MainUI/Basque.lproj/Localizable.strings +++ b/UI/MainUI/Basque.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Erabiltzailea:"; -"Password:" = "Pasahitza:"; -"Domain:" = "Domeinua"; +"Username" = "Erabiltzailea"; +"Password" = "Pasahitza"; +"Domain" = "Domeinua"; "Remember username" = "Gogoratu erabiltzaile-izena"; "Connect" = "Konektatu"; @@ -17,10 +17,11 @@ "alternativeBrowserSafari" = "Aukeran, Safari arakatzailea erabili dezakezu ere."; "Download" = "Deskargatu"; -"Language:" = "Hizkuntza"; +"Language" = "Hizkuntza"; "choose" = "Aukeratu ..."; "Arabic" = "العربية"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -37,6 +38,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings index 84724f9a7..b9d376927 100644 --- a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Usuário:"; -"Password:" = "Senha:"; -"Domain:" = "Domínio:"; +"Username" = "Usuário"; +"Password" = "Senha"; +"Domain" = "Domínio"; "Remember username" = "Lembrar login"; "Connect" = "Conectar"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternativamente, você pode usar o Safari."; "Download" = "Download"; -"Language:" = "Idioma:"; +"Language" = "Idioma"; "choose" = "Escolha ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Espanhol (Espanha)"; "SpanishArgentina" = "Espanhol (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Catalan.lproj/Localizable.strings b/UI/MainUI/Catalan.lproj/Localizable.strings index ee073336c..83d0ed6a1 100644 --- a/UI/MainUI/Catalan.lproj/Localizable.strings +++ b/UI/MainUI/Catalan.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Usuari:"; -"Password:" = "Contrasenya:"; -"Domain:" = "Domini:"; +"Username" = "Usuari"; +"Password" = "Contrasenya"; +"Domain" = "Domini"; "Remember username" = "recordar usuari"; "Connect" = "Connectar"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Safari."; "Download" = "Descàrrega"; -"Language:" = "Llengua:"; +"Language" = "Llengua"; "choose" = "Triar ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/ChineseTaiwan.lproj/Locale b/UI/MainUI/ChineseTaiwan.lproj/Locale new file mode 100644 index 000000000..61c05604a --- /dev/null +++ b/UI/MainUI/ChineseTaiwan.lproj/Locale @@ -0,0 +1,35 @@ +/* ChineseTaiwan */ +{ + NSLanguageName = "ChineseTaiwan"; + NSFormalName = "ChineseTaiwan"; + NSLocaleCode = "zh"; /* ISO 639-1 */ + NSLanguageCode = "zho"; /* ISO 639-2 */ + NSParentContext = ""; + + NSAMPMDesignation = (AM, PM); + NSCurrencySymbol = "$"; + NSDateFormatString = "%A, %B %e, %Y"; + NSDateTimeOrdering = MDYH; + NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); + NSDecimalSeparator = "."; + NSEarlierTimeDesignations = ("之前", "最後", "過去", "以前"); + NSHourNameDesignations = ((0, "午夜"), (10, "上午"), (12, "中午", "午餐"), (14, "下午"), (19, "晚餐")); + NSInternationalCurrencyString = TWD; /* ISO 4217 */ + NSLaterTimeDesignations = ("次"); + NSMonthNameArray = ("一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"); + NSNextDayDesignations = ("明天"); + NSNextNextDayDesignations = ("次日"); + NSPriorDayDesignations = ("昨天"); + NSShortDateFormatString = "%m/%e/%y"; + NSShortMonthNameArray = (Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec); + NSShortTimeDateFormatString = "%m/%e/%y %I:%M %p"; + NSShortWeekDayNameArray = (Sun, Mon, Tue, Wed, Thu, Fri, Sat); + NSThisDayDesignations = ("今天", "現在"); + NSThousandsSeparator = ","; + NSTimeDateFormatString = "%A, %B %e, %Y %I:%M:%S %p %Z"; + NSTimeFormatString = "%I:%M:%S %p"; + NSWeekDayNameArray = ("星期天", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"); + NSYearMonthWeekDesignations = ("年", "月", "週"); + NSPositiveCurrencyFormatString = "$9,999.00"; + NSNegativeCurrencyFormatString = "-$9,999.00"; +} diff --git a/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..36eb103ed --- /dev/null +++ b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,84 @@ +/* this file is in UTF-8 format! */ + +"title" = "SOGo"; + +"Username" = "Username"; +"Password" = "Password"; +"Domain" = "Domain"; +"Remember username" = "Remember username"; + +"Connect" = "Connect"; + +"Wrong username or password." = "Wrong username or password."; +"cookiesNotEnabled" = "You cannot login because your browser's cookies are disabled. Please enable cookies in your browser's settings and try again."; + +"browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Click on the link below to download the most current version of this browser."; +"alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers"; +"alternativeBrowserSafari" = "Alternatively, you can also use Safari."; +"Download" = "Download"; + +"Language" = "Language"; +"choose" = "Choose ..."; +"Arabic" = "العربية"; +"Basque" = "Euskara"; +"Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; +"Czech" = "Česky"; +"Danish" = "Dansk (Danmark)"; +"Dutch" = "Nederlands"; +"English" = "English"; +"Finnish" = "Suomi"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Icelandic" = "Íslenska"; +"Italian" = "Italiano"; +"NorwegianBokmal" = "Norsk bokmål"; +"NorwegianNynorsk" = "Norsk nynorsk"; +"Polish" = "Polski"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; +"SpanishSpain" = "Español (España)"; +"SpanishArgentina" = "Español (Argentina)"; +"Swedish" = "Svenska"; +"Ukrainian" = "Українська"; +"Welsh" = "Cymraeg"; + +"About" = "About"; +"AboutBox" = "Developed by Inverse, SOGo is a fully-featured groupware server with a focus on scalability and simplicity.

+SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV and CardDAV.

+SOGo is distributed under the GNU GPL version 2 or later and parts are distributed under the GNU LGPL version 2. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.

+See this page for various support options."; + +"Your account was locked due to too many failed attempts." = "Your account was locked due to too many failed attempts."; +"Your account was locked due to an expired password." = "Your account was locked due to an expired password."; +"Login failed due to unhandled error case: " = "Login failed due to unhandled error case: "; +"Change your Password" = "Change your Password"; +"The password was changed successfully." = "The password was changed successfully."; +"Your password has expired, please enter a new one below:" = "Your password has expired, please enter a new one below:"; +"Password must not be empty." = "Password must not be empty."; +"The passwords do not match. Please try again." = "The passwords do not match. Please try again."; +"Password Grace Period" = "Password Grace Period"; +"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog."; +"Password about to expire" = "Password about to expire"; +"Your password is going to expire in %{0} %{1}." = "Your password is going to expire in %{0} %{1}."; +"days" = "days"; +"hours" = "hours"; +"minutes" = "minutes"; +"seconds" = "seconds"; +"Password change failed" = "Password change failed"; +"Password change failed - Permission denied" = "Password change failed - Permission denied"; +"Password change failed - Insufficient password quality" = "Password change failed - Insufficient password quality"; +"Password change failed - Password is too short" = "Password change failed - Password is too short"; +"Password change failed - Password is too young" = "Password change failed - Password is too young"; +"Password change failed - Password is in history" = "Password change failed - Password is in history"; +"Unhandled policy error: %{0}" = "Unhandled policy error: %{0}"; +"Unhandled error response" = "Unhandled error response"; +"Password change is not supported." = "Password change is not supported."; +"Unhandled HTTP error code: %{0}" = "Unhandled HTTP error code: %{0}"; +"New password:" = "New password:"; +"Confirmation:" = "Confirmation:"; +"Cancel" = "Cancel"; +"Please wait..." = "Please wait..."; diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings index 5d64d5b05..17e168ac0 100644 --- a/UI/MainUI/Czech.lproj/Localizable.strings +++ b/UI/MainUI/Czech.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Uživatelské jméno:"; -"Password:" = "Heslo:"; -"Domain:" = "Doména"; +"Username" = "Uživatelské jméno"; +"Password" = "Heslo"; +"Domain" = "Doména"; "Remember username" = "Pamatovat si uživatelské jméno"; "Connect" = "Připojit"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Můžete však použít i Safari."; "Download" = "Stáhnout"; -"Language:" = "Jazyk:"; +"Language" = "Jazyk"; "choose" = "Vybrat ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Danish.lproj/Localizable.strings b/UI/MainUI/Danish.lproj/Localizable.strings index c439c40df..6c40e18cc 100644 --- a/UI/MainUI/Danish.lproj/Localizable.strings +++ b/UI/MainUI/Danish.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "Sogo"; -"Username:" = "Brugernavn:"; -"Password:" = "Adgangskode:"; -"Domain:" = "Domæne:"; +"Username" = "Brugernavn"; +"Password" = "Adgangskode"; +"Domain" = "Domæne"; "Remember username" = "Husk brugernavn"; "Connect" = "Tilslut"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternativt kan du også bruge Safari."; "Download" = "Download"; -"Language:" = "Sprog:"; +"Language" = "Sprog"; "choose" = "Vælg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Spansk (Spanien)"; "SpanishArgentina" = "Spansk (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Dutch.lproj/Localizable.strings b/UI/MainUI/Dutch.lproj/Localizable.strings index ba9875d58..b84ff789f 100644 --- a/UI/MainUI/Dutch.lproj/Localizable.strings +++ b/UI/MainUI/Dutch.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Gebruikersnaam:"; -"Password:" = "Wachtwoord:"; -"Domain:" = "Domein:"; +"Username" = "Gebruikersnaam"; +"Password" = "Wachtwoord"; +"Domain" = "Domein"; "Remember username" = "Onthoud gebruikersnaam"; "Connect" = "Inloggen"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Als alternatief kunt u ook Safari gebruiken."; "Download" = "Download"; -"Language:" = "Taal:"; +"Language" = "Taal"; "choose" = "Kies..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index 64ee320ee..36eb103ed 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Username:"; -"Password:" = "Password:"; -"Domain:" = "Domain:"; +"Username" = "Username"; +"Password" = "Password"; +"Domain" = "Domain"; "Remember username" = "Remember username"; "Connect" = "Connect"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternatively, you can also use Safari."; "Download" = "Download"; -"Language:" = "Language:"; +"Language" = "Language"; "choose" = "Choose ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Finnish.lproj/Localizable.strings b/UI/MainUI/Finnish.lproj/Localizable.strings index 22347aebc..21458c5c2 100644 --- a/UI/MainUI/Finnish.lproj/Localizable.strings +++ b/UI/MainUI/Finnish.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Käyttäjätunnus:"; -"Password:" = "Salasana:"; -"Domain:" = "Domain:"; +"Username" = "Käyttäjätunnus"; +"Password" = "Salasana"; +"Domain" = "Domain"; "Remember username" = "Muista käyttäjätunnus"; "Connect" = "Yhdistä"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Vaihtoehtoisesti voit myös käyttää Safaria."; "Download" = "Lataa"; -"Language:" = "Kieli:"; +"Language" = "Kieli"; "choose" = "Valitse ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings index f1ceecdf8..3131bf5df 100644 --- a/UI/MainUI/French.lproj/Localizable.strings +++ b/UI/MainUI/French.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Nom d'utilisateur :"; -"Password:" = "Mot de passe :"; -"Domain:" = "Domaine :"; +"Username" = "Nom d'utilisateur "; +"Password" = "Mot de passe "; +"Domain" = "Domaine "; "Remember username" = "Se souvenir de moi"; "Connect" = "Connexion"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Comme alternative, vous pouvez aussi utiliser Safari."; "Download" = "Télécharger"; -"Language:" = "Langue:"; +"Language" = "Langue"; "choose" = "Choisir ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile index 81eb5a635..f25dc04ef 100644 --- a/UI/MainUI/GNUmakefile +++ b/UI/MainUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MainUI MainUI_PRINCIPAL_CLASS = MainUIProduct -MainUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MainUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MainUI_OBJC_FILES += \ MainUIProduct.m \ diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings index bbea2d2e8..fa7d2ce07 100644 --- a/UI/MainUI/German.lproj/Localizable.strings +++ b/UI/MainUI/German.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Benutzername:"; -"Password:" = "Passwort:"; -"Domain:" = "Domain:"; +"Username" = "Benutzername"; +"Password" = "Passwort"; +"Domain" = "Domain"; "Remember username" = "Benutzername merken"; "Connect" = "Anmelden"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Sie können auch Safari benutzen."; "Download" = "Herunterladen"; -"Language:" = "Sprache:"; +"Language" = "Sprache"; "choose" = "Auswählen ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentinien)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Hungarian.lproj/Localizable.strings b/UI/MainUI/Hungarian.lproj/Localizable.strings index 14d6765b0..85acf770b 100644 --- a/UI/MainUI/Hungarian.lproj/Localizable.strings +++ b/UI/MainUI/Hungarian.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Felhasználó:"; -"Password:" = "Jelszó:"; -"Domain:" = "Tartomány:"; +"Username" = "Felhasználó"; +"Password" = "Jelszó"; +"Domain" = "Tartomány"; "Remember username" = "Felhasználónév megjegyzése"; "Connect" = "Kapcsolódás"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "A Safari böngésző is használható."; "Download" = "Letöltés"; -"Language:" = "Nyelv:"; +"Language" = "Nyelv"; "choose" = "Válasszon ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings index a5d44cbf4..778dc07e9 100644 --- a/UI/MainUI/Icelandic.lproj/Localizable.strings +++ b/UI/MainUI/Icelandic.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Notandanafn:"; -"Password:" = "Lykilorð:"; -"Domain:" = "Domain:"; +"Username" = "Notandanafn"; +"Password" = "Lykilorð"; +"Domain" = "Domain"; "Connect" = "Tengjast"; @@ -16,11 +16,12 @@ "alternativeBrowserSafari" = "Einnig er hægt að nota Safari."; "Download" = "Hala niður"; -"Language:" = "Tungumál:"; +"Language" = "Tungumál"; "choose" = "Velja..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -37,6 +38,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Italian.lproj/Localizable.strings b/UI/MainUI/Italian.lproj/Localizable.strings index 448aa673b..469c6468a 100644 --- a/UI/MainUI/Italian.lproj/Localizable.strings +++ b/UI/MainUI/Italian.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Nome utente:"; -"Password:" = "Password:"; -"Domain:" = "Dominio"; +"Username" = "Nome utente"; +"Password" = "Password"; +"Domain" = "Dominio"; "Remember username" = "Ricorda il nome utente"; "Connect" = "Entra"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternativamente, puoi utilizzare Safari."; "Download" = "Scarica"; -"Language:" = "Lingua:"; +"Language" = "Lingua"; "choose" = "Scegli..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings index 99a482322..2c70931c3 100644 --- a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Brukernavn:"; -"Password:" = "Passord:"; -"Domain:" = "Domene:"; +"Username" = "Brukernavn"; +"Password" = "Passord"; +"Domain" = "Domene"; "Remember username" = "Husk brukernavn"; "Connect" = "Koble til"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternativt kan du også bruke Safari."; "Download" = "Last ned"; -"Language:" = "Språk:"; +"Language" = "Språk"; "choose" = "Velg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings index b4fd888b8..3481093e3 100644 --- a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Brukernavn:"; -"Password:" = "Passord:"; -"Domain:" = "Domain:"; +"Username" = "Brukernavn"; +"Password" = "Passord"; +"Domain" = "Domain"; "Remember username" = "Husk brukernavn"; "Connect" = "Logg inn"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternativt kan du også bruke Safari."; "Download" = "Last ned"; -"Language:" = "Språk:"; +"Language" = "Språk"; "choose" = "Velg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Polish.lproj/Localizable.strings b/UI/MainUI/Polish.lproj/Localizable.strings index 862672ecd..62105b655 100644 --- a/UI/MainUI/Polish.lproj/Localizable.strings +++ b/UI/MainUI/Polish.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Nazwa użytkownika:"; -"Password:" = "Hasło:"; -"Domain:" = "Domena:"; +"Username" = "Nazwa użytkownika"; +"Password" = "Hasło"; +"Domain" = "Domena"; "Remember username" = "Pamiętaj nazwę użytkownika"; "Connect" = "Zaloguj"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Alternatywnie możesz używać również przeglądarki Safari."; "Download" = "Pobierz"; -"Language:" = "Język:"; +"Language" = "Język"; "choose" = "Wybierz ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Russian.lproj/Localizable.strings b/UI/MainUI/Russian.lproj/Localizable.strings index f29ffc134..fde95a6ae 100644 --- a/UI/MainUI/Russian.lproj/Localizable.strings +++ b/UI/MainUI/Russian.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Логин:"; -"Password:" = "Пароль:"; -"Domain:" = "Домен:"; +"Username" = "Логин"; +"Password" = "Пароль"; +"Domain" = "Домен"; "Remember username" = "Запомнить имя пользователя"; "Connect" = "Соединение"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Также можно использовать Safari."; "Download" = "Скачать"; -"Language:" = "Язык:"; +"Language" = "Язык"; "choose" = "Выбрать ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m index dc9712e88..2422cc8e9 100644 --- a/UI/MainUI/SOGoRootPage.m +++ b/UI/MainUI/SOGoRootPage.m @@ -183,7 +183,6 @@ SOGoWebAuthenticator *auth; SOGoAppointmentFolders *calendars; SOGoUserDefaults *ud; - SOGoSystemDefaults *sd; SOGoUser *loggedInUser; NSString *username, *password, *language, *domain, *remoteHost; NSArray *supportedLanguages; @@ -224,13 +223,15 @@ response = [self responseWithStatus: 200 andJSONRepresentation: json]; - + + // We get the proper username for cookie creation. If we are using a multidomain + // environment with SOGoEnableDomainBasedUID, we could have to append the domain + // to the username. Also when SOGoEnableDomainBasedUID is enabled, we could be in + // the DomainLessLogin situation, so we would NOT add the domain. -getUIDForEmail + // has all the logic for this, so lets use it. if ([domain isNotNull]) { - sd = [SOGoSystemDefaults sharedSystemDefaults]; - if ([sd enableDomainBasedUID] && - [username rangeOfString: @"@"].location == NSNotFound) - username = [NSString stringWithFormat: @"%@@%@", username, domain]; + username = [[SOGoUserManager sharedUserManager] getUIDForEmail: username]; } authCookie = [auth cookieWithUsername: username diff --git a/UI/MainUI/Slovak.lproj/Localizable.strings b/UI/MainUI/Slovak.lproj/Localizable.strings index 37d8b6713..f2272dd65 100644 --- a/UI/MainUI/Slovak.lproj/Localizable.strings +++ b/UI/MainUI/Slovak.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Užívateľské meno:"; -"Password:" = "Heslo:"; -"Domain:" = "Doména:"; +"Username" = "Užívateľské meno"; +"Password" = "Heslo"; +"Domain" = "Doména"; "Remember username" = "Zapamätať uživateľské meno"; "Connect" = "Pripojiť"; @@ -17,7 +17,7 @@ "alternativeBrowserSafari" = "Alternatívne je možné použiť aj Safari."; "Download" = "Stiahnuť"; -"Language:" = "Jazyk:"; +"Language" = "Jazyk"; "choose" = "Výber ..."; "Arabic" = "العربية"; "Catalan" = "Katalánsky"; @@ -37,6 +37,7 @@ "BrazilianPortuguese" = "Portugalská brazílština"; "Russian" = "Ruština"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Španielčina (Španielsko)"; "SpanishArgentina" = "Španielčina (Argentína)"; "Swedish" = "Švédčina"; diff --git a/UI/MainUI/Slovenian.lproj/Locale b/UI/MainUI/Slovenian.lproj/Locale new file mode 100644 index 000000000..0e6ebb92a --- /dev/null +++ b/UI/MainUI/Slovenian.lproj/Locale @@ -0,0 +1,35 @@ +/* Slovenian */ +{ + NSLanguageName = "Slovenian"; + NSFormalName = "Slovenščina"; + NSLocaleCode = "sl"; /* ISO 639-1 */ + NSLanguageCode = "slv"; /* ISO 639-2 */ + NSParentContext = ""; + + NSAMPMDesignation = (AM, PM); + NSCurrencySymbol = "€"; + NSDateFormatString = "%A, %B %e, %Y"; + NSDateTimeOrdering = MDYH; + NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); + NSDecimalSeparator = "."; + NSEarlierTimeDesignations = (pred, zadnji, prejsnji, "ze pred"); + NSHourNameDesignations = ((0, polnoc), (10, jutro), (12, opoldne), (14, popoldne), (19, zvecer)); + NSInternationalCurrencyString = EUR; /* ISO 4217 */ + NSLaterTimeDesignations = (next); + NSMonthNameArray = (Januar, Februar, Marec, April, Maj, Junij, Julij, Avgust, September, Oktober, November, December); + NSNextDayDesignations = (jutri); + NSNextNextDayDesignations = ("naslednji dan"); + NSPriorDayDesignations = (vceraj); + NSShortDateFormatString = "%m/%e/%y"; + NSShortMonthNameArray = (Jan, Feb, Mar, Apr, Maj, Jun, Jul, Avg, Sep, Okt, Nov, Dec); + NSShortTimeDateFormatString = "%m/%e/%y %I:%M %p"; + NSShortWeekDayNameArray = (Ned, Pon, Tor, Sre, Cet, Pet, Sob); + NSThisDayDesignations = (danes, sedaj); + NSThousandsSeparator = ","; + NSTimeDateFormatString = "%A, %B %e, %Y %I:%M:%S %p %Z"; + NSTimeFormatString = "%I:%M:%S %p"; + NSWeekDayNameArray = (Nedelja, Ponedeljek, Torek, Sreda, Cetrtek, Petek, Sobota); + NSYearMonthWeekDesignations = (leto, mesec, teden); + NSPositiveCurrencyFormatString = "€9,999.00"; + NSNegativeCurrencyFormatString = "-€9,999.00"; +} diff --git a/UI/MainUI/Slovenian.lproj/Localizable.strings b/UI/MainUI/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..9d7f33379 --- /dev/null +++ b/UI/MainUI/Slovenian.lproj/Localizable.strings @@ -0,0 +1,80 @@ +/* this file is in UTF-8 format! */ + +"title" = "SOGo"; + +"Username" = "Uporabniško ime"; +"Password" = "Geslo"; +"Domain" = "Domena"; +"Remember username" = "Zapomni si up. ime"; + +"Connect" = "Poveži"; + +"Wrong username or password." = "Napačno uporabniško ime ali geslo."; +"cookiesNotEnabled" = "Ne moreš se prijaviti, ker tvoj brskalnik ne dovoli piškotkov. Dovoli piškotke v nastavitvah tvojega brskalnika in poskusi ponovno."; + +"browserNotCompatible" = "Tvoja različica brskalnika trenutno ni podrta na tej strani. Priporočamo uporabao FireFox. Klikni na povezavo spodaj za prenos zadnje različice tega brskalnika."; +"alternativeBrowsers" = "Alternativno lahko uporabiš naslednje združljive brskalnike"; +"alternativeBrowserSafari" = "Alternativno lahko uporabljaš tudi Safari."; +"Download" = "Prenos"; + +"Language" = "Jezik"; +"choose" = "Izberi ..."; +"Arabic" = "العربية"; +"Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; +"Czech" = "Česky"; +"Danish" = "Dansk (Danmark)"; +"Dutch" = "Nederlands"; +"English" = "English"; +"Finnish" = "Suomi"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Icelandic" = "Íslenska"; +"Italian" = "Italiano"; +"NorwegianBokmal" = "Norsk bokmål"; +"NorwegianNynorsk" = "Norsk nynorsk"; +"Polish" = "Polski"; +"BrazilianPortuguese" = "Português brasileiro"; +"Russian" = "Русский"; +"Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; +"SpanishSpain" = "Español (España)"; +"SpanishArgentina" = "Español (Argentina)"; +"Swedish" = "Svenska"; +"Ukrainian" = "Українська"; +"Welsh" = "Cymraeg"; + +"About" = "O"; +"AboutBox" = "Developed by Inverse, SOGo is a fully-featured groupware server with a focus on scalability and simplicity.

\nSOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV and CardDAV.

\nSOGo is distributed under the GNU GPL version 2 or later and parts are distributed under the GNU LGPL version 2. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.

\nSee this page for various support options."; + +"Your account was locked due to too many failed attempts." = "Tvoj račun je zaklenjen zaradi preveč neuspelih poskusov."; +"Your account was locked due to an expired password." = "Tvoj račun je zaklenjen zaradi pretečenega gesla."; +"Login failed due to unhandled error case: " = "Prijava ni uspela zaradi neobravnavane napake:"; +"Change your Password" = "Spremeni tvoje geslo"; +"The password was changed successfully." = "Geslo je uspešno spremenjeno."; +"Your password has expired, please enter a new one below:" = "Tvoje geslo je poteklo, prosim vnesi spodaj novo:"; +"Password must not be empty." = "Geslo ne sem biti prazno."; +"The passwords do not match. Please try again." = "Gesli se ne ujemata. Prosim poskusi ponovno."; +"Password Grace Period" = "Geslo z odlogom"; +"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "Preostalo ti je še %{0} poskusov prijave, preden bo tvoj račun zaklenjen. Prosim zamenjaj tvoje geslo v nastavitvenem pogovornem oknu."; +"Password about to expire" = "Geslo je pred pretekom"; +"Your password is going to expire in %{0} %{1}." = "Tvoje geslo bo poteklo čez %{0} %{1}."; +"days" = "dnevi"; +"hours" = "ure"; +"minutes" = "minute"; +"seconds" = "sekunde"; +"Password change failed" = "Sprememba gesla neuspešna"; +"Password change failed - Permission denied" = "Sprememba gesla neuspešna - ni dovoljenja"; +"Password change failed - Insufficient password quality" = "Sprememba gesla neuspešna - neprimerna kvaliteta gesla"; +"Password change failed - Password is too short" = "Sprememba gesla neuspešna - geslo je prekratko"; +"Password change failed - Password is too young" = "Sprememba gesla nesupešna - geslo je premalo staro"; +"Password change failed - Password is in history" = "Sprememba gesla neuspešna - geslo je že bilo uporabljeno"; +"Unhandled policy error: %{0}" = "Neobravnavana napaka police: %{0}"; +"Unhandled error response" = "Neobravnavana napaka odziva"; +"Password change is not supported." = "Sprememba gesla ni podprta."; +"Unhandled HTTP error code: %{0}" = "Neobravnavana HTTP napaka: %{0}"; +"New password:" = "Novo geslo:"; +"Confirmation:" = "Potrditev:"; +"Cancel" = "Prekini"; +"Please wait..." = "Prosim počakaj..."; diff --git a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings index 60ec1e466..804006ff9 100644 --- a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Usuario:"; -"Password:" = "Contraseña:"; -"Domain:" = "Dominio:"; +"Username" = "Usuario"; +"Password" = "Contraseña"; +"Domain" = "Dominio"; "Remember username" = "Recordar el nombre de usuario"; "Connect" = "Conectar"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Como alternativa, puede usar Safari."; "Download" = "Descarga"; -"Language:" = "Idioma:"; +"Language" = "Idioma"; "choose" = "Elija ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/SpanishSpain.lproj/Localizable.strings b/UI/MainUI/SpanishSpain.lproj/Localizable.strings index f9e75aa0b..479321ffb 100644 --- a/UI/MainUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/MainUI/SpanishSpain.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Usuario:"; -"Password:" = "Contraseña:"; -"Domain:" = "Dominio:"; +"Username" = "Usuario"; +"Password" = "Contraseña"; +"Domain" = "Dominio"; "Remember username" = "Recordar usuario"; "Connect" = "Conectar"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Como alternativa, puede usar Safari."; "Download" = "Descarga"; -"Language:" = "Idioma:"; +"Language" = "Idioma"; "choose" = "Elija ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Swedish.lproj/Localizable.strings b/UI/MainUI/Swedish.lproj/Localizable.strings index 9f72869bd..e8c165a34 100644 --- a/UI/MainUI/Swedish.lproj/Localizable.strings +++ b/UI/MainUI/Swedish.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Användarnamn:"; -"Password:" = "Lösenord:"; -"Domain:" = "Domain:"; +"Username" = "Användarnamn"; +"Password" = "Lösenord"; +"Domain" = "Domain"; "Connect" = "Logga in"; @@ -16,11 +16,12 @@ "alternativeBrowserSafari" = "Alternativt kan du också använda Safari."; "Download" = "Ladda ner"; -"Language:" = "Språk:"; +"Language" = "Språk"; "choose" = "Välj ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -37,6 +38,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Ukrainian.lproj/Localizable.strings b/UI/MainUI/Ukrainian.lproj/Localizable.strings index fe3086522..f18b55f22 100644 --- a/UI/MainUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MainUI/Ukrainian.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Лоґін:"; -"Password:" = "Пароль:"; -"Domain:" = "Домен:"; +"Username" = "Лоґін"; +"Password" = "Пароль"; +"Domain" = "Домен"; "Remember username" = "Пам’ятати мене"; "Connect" = "Увійти"; @@ -17,11 +17,12 @@ "alternativeBrowserSafari" = "Також можна використовувати Safari."; "Download" = "Звантажити"; -"Language:" = "Мова:"; +"Language" = "Мова"; "choose" = "Вибрати ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -38,6 +39,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/MainUI/Welsh.lproj/Localizable.strings b/UI/MainUI/Welsh.lproj/Localizable.strings index 42d4e962d..d9e58ef44 100644 --- a/UI/MainUI/Welsh.lproj/Localizable.strings +++ b/UI/MainUI/Welsh.lproj/Localizable.strings @@ -2,9 +2,9 @@ "title" = "SOGo"; -"Username:" = "Enw defnyddiwr:"; -"Password:" = "Cyfrinair:"; -"Domain:" = "Domain:"; +"Username" = "Enw defnyddiwr"; +"Password" = "Cyfrinair"; +"Domain" = "Domain"; "Connect" = "Cysylltu"; @@ -16,11 +16,12 @@ "alternativeBrowserSafari" = "Medrwch hefyd defnyddio Safari."; "Download" = "Lawrlwytho"; -"Language:" = "Iaith:"; +"Language" = "Iaith"; "choose" = "Dewis ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -37,6 +38,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; diff --git a/UI/PreferencesUI/Arabic.lproj/Localizable.strings b/UI/PreferencesUI/Arabic.lproj/Localizable.strings index 6ec457f3b..b3ed4f16e 100644 --- a/UI/PreferencesUI/Arabic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Arabic.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "تمكين الرد التلقائي أثناء العطلة"; -"Auto reply message :" = "رسالة الرد التلقائي:"; -"Email addresses (separated by commas) :" = "عناوين البريد الإلكتروني (مفصولة بفواصل):"; +"Auto reply message" ="رسالة الرد التلقائي"; +"Email addresses (separated by commas)" ="عناوين البريد الإلكتروني (مفصولة بفواصل)"; "Add default email addresses" = "إضافة عناوين البريد الإلكتروني الافتراضية"; -"Days between responses :" = "عدد الأيام بين الردود:"; +"Days between responses" ="عدد الأيام بين الردود"; "Do not send responses to mailing lists" = "لا ترسل ردود الى القوائم البريدية"; "Disable auto reply on" = "تعطيل الرد التلقائي في"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "يرجى تحديد العنوان الذي تريد إعادة توجيه رسائلك له."; /* d & t */ -"Current Time Zone :" = "التوقيت الزمني الحالى:"; -"Short Date Format :" = "التاريخ بالصيغة المختصرة:"; -"Long Date Format :" = "التاريخ بالصيغة الكاملة:"; -"Time Format :" = "تنسيق الوقت:"; +"Current Time Zone" ="التوقيت الزمني الحالى"; +"Short Date Format" ="التاريخ بالصيغة المختصرة"; +"Long Date Format" ="التاريخ بالصيغة الكاملة"; +"Time Format" ="تنسيق الوقت"; "default" = "الافتراضي"; @@ -90,23 +90,23 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "بداية الاسبوع:"; -"Day start time :" = "بداية يوم العمل:"; -"Day end time :" = "نهاية يوم العمل:"; +"Week begins on" ="بداية الاسبوع"; +"Day start time" ="بداية يوم العمل"; +"Day end time" ="نهاية يوم العمل"; "Day start time must be prior to day end time." = "يجب أن يكون وقت بداية يوم العمل قبل وقت نهاية يوم العمل."; "Show time as busy outside working hours" = "إظهار الوقت خارج ساعات العمل على أنه مشغول"; -"First week of year :" = "الأسبوع الأول من السنة:"; +"First week of year" ="الأسبوع الأول من السنة"; "Enable reminders for Calendar items" = "تمكين التذكيرات لعناصر التقويم"; "Play a sound when a reminder comes due" = "تشغيل صوت للتذكير بموعد اقترب وقته"; -"Default reminder :" = "التذكير الإفتراضي:"; +"Default reminder" ="التذكير الإفتراضي"; "firstWeekOfYear_January1" = "يبدأ في 1 يناير"; "firstWeekOfYear_First4DayWeek" = "أول 4 ايام في الاسبوع"; "firstWeekOfYear_FirstFullWeek" = "أول اسبوع كامل"; /* Default Calendar */ -"Default calendar :" = "التقويم الإفتراضي:"; +"Default calendar" ="التقويم الإفتراضي"; "selectedCalendar" = "التقويم المحدد"; "personalCalendar" = "التقويم الشخصي"; "firstCalendar" = "أول تقويم ممكن"; @@ -136,11 +136,11 @@ "refreshview_every_30_minutes" = "كل 30 دقيقة"; "refreshview_once_per_hour" = "مرة كل ساعة"; -"Forward messages:" = "أعد توجيه الرسائل:"; +"Forward messages" = "أعد توجيه الرسائل"; "messageforward_inline" = "مضمنة"; "messageforward_attached" = "كمرفق"; -"When replying to a message:" = "متى يُرَدُّ على الرِّسالة:"; +"When replying to a message" = "متى يُرَدُّ على الرِّسالة"; "replyplacement_above" = "بدء الرد فوق الاقتباس"; "replyplacement_below" = "بدء الرد تحت الاقتباس"; "And place my signature" = "ووضع توقيعي"; @@ -156,17 +156,17 @@ /* IMAP Accounts */ "New Mail Account" = "حساب بريد إلكتروني جديد"; -"Server Name:" = "أسم الخادم:"; -"Port:" = "مدخل:"; -"Encryption:" = "التشفير:"; +"Server Name" = "أسم الخادم"; +"Port" = "مدخل"; +"Encryption" = "التشفير"; "None" = "بلا"; -"User Name:" = "اسم المستخدم:"; -"Password:" = "كلمة المرور:"; +"User Name" = "اسم المستخدم"; +"Password" = "كلمة المرور"; -"Full Name:" = "الإسم الكامل:"; -"Email:" = "البريد الإلكتروني:"; -"Reply To Email:" = "الرد على البريد الإلكتروني:"; -"Signature:" = "التوقيع:"; +"Full Name" = "الإسم الكامل"; +"Email" = "البريد الإلكتروني"; +"Reply To Email" = "الرد على البريد الإلكتروني"; +"Signature" = "التوقيع"; "(Click to create)" = "(انقر للصنع)"; "Signature" = "التوقيع"; @@ -179,13 +179,13 @@ "Additional Parameters" = "معلمات إضافية"; /* password */ -"New password:" = "كلمة مرور جديدة:"; -"Confirmation:" = "تأكيد:"; +"New password" = "كلمة مرور جديدة"; +"Confirmation" = "تأكيد"; "Change" = "لا شيء"; /* Event+task classifications */ -"Default events classification :" = "تصنيف الأحداث الافتراضية:"; -"Default tasks classification :" = "تصنيف المهام الافتراضية :"; +"Default events classification" ="تصنيف الأحداث الافتراضية"; +"Default tasks classification" ="تصنيف المهام الافتراضية "; "PUBLIC_item" = "علني"; "CONFIDENTIAL_item" = "سري"; "PRIVATE_item" = "خاص"; @@ -199,13 +199,14 @@ "Contacts" = "دفتر العناوين"; "Mail" = "بريد"; "Last" = "أخر إستخدام"; -"Default Module :" = "وحدة نمطية افتراضية :"; +"Default Module " = "وحدة نمطية افتراضية "; -"Language :" = "اللغة:"; +"Language" ="اللغة"; "choose" = "اختيار ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -222,6 +223,7 @@ "BrazilianPortuguese" = "Português brasileiro"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -229,12 +231,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "عندما اتلقى طلبا لإرسال ايصال استلام:"; +"When I receive a request for a return receipt" = "عندما اتلقى طلبا لإرسال ايصال استلام"; "Never send a return receipt" = "لا ترسل إيصال استلام"; "Allow return receipts for some messages" = "السماح بإرسال إيصالات استلام مقابل بعض الرسائل الواردة"; -"If I'm not in the To or Cc of the message:" = "إذا لم أكن من ضمن المرسل لهم او المرسل لهم نسخة:"; -"If the sender is outside my domain:" = "إذا كان المرسل من خارج النطاق:"; -"In all other cases:" = "في جميع الحالات الأخرى:"; +"If I'm not in the To or Cc of the message" = "إذا لم أكن من ضمن المرسل لهم او المرسل لهم نسخة"; +"If the sender is outside my domain" = "إذا كان المرسل من خارج النطاق"; +"In all other cases" = "في جميع الحالات الأخرى"; "Never send" = "لم يرسل"; "Always send" = "إرسال دائما"; diff --git a/UI/PreferencesUI/Basque.lproj/Localizable.strings b/UI/PreferencesUI/Basque.lproj/Localizable.strings index c203c0549..bfdd4d1cf 100644 --- a/UI/PreferencesUI/Basque.lproj/Localizable.strings +++ b/UI/PreferencesUI/Basque.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Gaitu \"oporretan nago\" erantzun automatikoa"; -"Auto reply message :" = "Erantzun automatikorako mezua:"; -"Email addresses (separated by commas) :" = "Email helbideak (koma bidez banatuak):"; +"Auto reply message" ="Erantzun automatikorako mezua"; +"Email addresses (separated by commas)" ="Email helbideak (koma bidez banatuak)"; "Add default email addresses" = "Gehitu email helbide lehenetsiak"; -"Days between responses :" = "Erantzunen arteko egunak:"; +"Days between responses" ="Erantzunen arteko egunak"; "Do not send responses to mailing lists" = "Ez bidali erantzunak email zerrendatara"; "Disable auto reply on" = "Ezgaitu erantzun automatikoa"; "Always send vacation message response" = "'Oporretan nago' erantzun mezua beti bidali"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Uneko ordu-zona:"; -"Short Date Format :" = "Data-formatu laburra:"; -"Long Date Format :" = "Data-formatu luzea:"; -"Time Format :" = "Ordu-formatua:"; +"Current Time Zone" ="Uneko ordu-zona"; +"Short Date Format" ="Data-formatu laburra"; +"Long Date Format" ="Data-formatu luzea"; +"Time Format" ="Ordu-formatua"; "default" = "Lehenetsia"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Astea hasteko eguna:"; -"Day start time :" = "Egunaren hasiera ordua:"; -"Day end time :" = "Egunaren amaiera ordua:"; +"Week begins on" ="Astea hasteko eguna"; +"Day start time" ="Egunaren hasiera ordua"; +"Day end time" ="Egunaren amaiera ordua"; "Day start time must be prior to day end time." = "Egunaren hasiera orduak amaiera orduak baino lehenago behar du izan."; "Show time as busy outside working hours" = "Erakutsi denbora lanpetuta bezala lan orduetatik kanpo"; -"First week of year :" = "Urteko lehen astea:"; +"First week of year" ="Urteko lehen astea"; "Enable reminders for Calendar items" = "Gaitu oroigarriak egutegiko elementuetarako"; "Play a sound when a reminder comes due" = "Soinua jo oroigarri baten ondorioz."; -"Default reminder :" = "Lehenetsitako oroigarria:"; +"Default reminder" ="Lehenetsitako oroigarria"; "firstWeekOfYear_January1" = "Urtarrilak 1eab hasten da"; "firstWeekOfYear_First4DayWeek" = "Lehenengo 4 eguneko astea"; "firstWeekOfYear_FirstFullWeek" = "Lehenengo aste osoa"; "Prevent from being invited to appointments" = "Hitzorduetara gonbidatua izatea eragotzi."; -"White list for appointment invitations:" = "Hitzordu gonbidapenetarako zerrenda-zuria:"; +"White list for appointment invitations" = "Hitzordu gonbidapenetarako zerrenda-zuria"; "Contacts Names" = "Kontaktuen izenak"; /* Default Calendar */ -"Default calendar :" = "Lehenetsitako egutegia:"; +"Default calendar" ="Lehenetsitako egutegia"; "selectedCalendar" = "Aukeratutako egutegia"; "personalCalendar" = "Egutegi pertsonala"; "firstCalendar" = "Gaitutako lehenengo egutegia"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Antolatu mezuak haritan"; "When sending mail, add unknown recipients to my" = "Mezua bidaltzerakoan gehitu jasotzaile ezezagunak nere"; -"Forward messages:" = "Mezuak birbidali:"; +"Forward messages" = "Mezuak birbidali"; "messageforward_inline" = "Mezuaren barruan"; "messageforward_attached" = "Iruzkin bezala"; -"When replying to a message:" = "Mezu bati erantzuterakoan:"; +"When replying to a message" = "Mezu bati erantzuterakoan"; "replyplacement_above" = "Hasi nere erantzuna aipamenaren gainean"; "replyplacement_below" = "Hasi nere erantzuna aipamenaren azpian"; "And place my signature" = "Eta jarri nere sinadura"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Email kontu berria"; -"Server Name:" = "Zerbitzariaren izena:"; -"Port:" = "Portua:"; -"Encryption:" = "Zifraketa:"; +"Server Name" = "Zerbitzariaren izena"; +"Port" = "Portua"; +"Encryption" = "Zifraketa"; "None" = "Bat ere ez"; -"User Name:" = "Erabiltzaile izena"; -"Password:" = "Pasahitza"; +"User Name" = "Erabiltzaile izena"; +"Password" = "Pasahitza"; -"Full Name:" = "Izen osoa:"; -"Email:" = "Emaila:"; -"Reply To Email:" = "Erantzun honi emaila:"; -"Signature:" = "Sinadura"; +"Full Name" = "Izen osoa"; +"Email" = "Emaila"; +"Reply To Email" = "Erantzun honi emaila"; +"Signature" = "Sinadura"; "(Click to create)" = "(Klikatu sortzeko)"; "Signature" = "Sinadura"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Beste parametroak"; /* password */ -"New password:" = "Pasahitz berria:"; -"Confirmation:" = "Berrespena:"; +"New password" = "Pasahitz berria"; +"Confirmation" = "Berrespena"; "Change" = "Aldatu"; /* Event+task classifications */ -"Default events classification :" = "Ekitaldien sailkapen lehenetsia:"; -"Default tasks classification :" = "Zereginen sailkapen lehenetsia:"; +"Default events classification" ="Ekitaldien sailkapen lehenetsia"; +"Default tasks classification" ="Zereginen sailkapen lehenetsia"; "PUBLIC_item" = "Publikoa"; "CONFIDENTIAL_item" = "Isilpekoa"; "PRIVATE_item" = "Pribatua"; @@ -210,14 +210,15 @@ "Contacts" = "Helbide liburua"; "Mail" = "Emaila"; "Last" = "Azkenekoz erabilia"; -"Default Module :" = "Lehenetsitako modulua:"; -"SOGo Version :" = "SOGo betsioa:"; +"Default Module " = "Lehenetsitako modulua"; +"SOGo Version" ="SOGo betsioa"; -"Language :" = "Hizkuntza"; +"Language" ="Hizkuntza"; "choose" = "Aukeratu ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Eguneratu ikuspegia"; +"Refresh View" ="Eguneratu ikuspegia"; "refreshview_manually" = "Eskuz"; "refreshview_every_minute" = "Minuturo"; "refreshview_every_2_minutes" = "2 minuturo"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Orduro"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Jasotze-agiriaren eskakizun bat jasotzen dudanean:"; +"When I receive a request for a return receipt" = "Jasotze-agiriaren eskakizun bat jasotzen dudanean"; "Never send a return receipt" = "Jasotze agiria inoiz ez bidali."; "Allow return receipts for some messages" = "Baimendu jasotze-agiriak zenbait mezutarako."; -"If I'm not in the To or Cc of the message:" = "Ez banago mezuaren 'nori' edo 'kopia' eremuetan:"; -"If the sender is outside my domain:" = "Bidaltzailea nere domeinutik kanpo badago:"; -"In all other cases:" = "Beste kasu guztietan:"; +"If I'm not in the To or Cc of the message" = "Ez banago mezuaren 'nori' edo 'kopia' eremuetan"; +"If the sender is outside my domain" = "Bidaltzailea nere domeinutik kanpo badago"; +"In all other cases" = "Beste kasu guztietan"; "Never send" = "Inoiz ez bidali"; "Always send" = "Bidali beti"; diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index e18095e74..af865affe 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Habilitar auto resposta de férias"; -"Auto reply message :" = "Auto Responder somente uma vez a cada remetente com o seguinte texto:"; -"Email addresses (separated by commas) :" = "Endereço de e-mail (separado por vírgulas):"; +"Auto reply message" ="Auto Responder somente uma vez a cada remetente com o seguinte texto"; +"Email addresses (separated by commas)" ="Endereço de e-mail (separado por vírgulas)"; "Add default email addresses" = "Adicionar endereço de e-mail padrão"; -"Days between responses :" = "Dias entre respostas:"; +"Days between responses" ="Dias entre respostas"; "Do not send responses to mailing lists" = "Não envie respostas para lista de e-mails"; "Disable auto reply on" = "Desativar resposta automática em"; "Always send vacation message response" = "Sempre enviar resposta de mensagem de férias"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Fuso Horário:"; -"Short Date Format :" = "Formato da Data (Curto) :"; -"Long Date Format :" = "Formato da Data (Longo) :"; -"Time Format :" = "Formato da Hora :"; +"Current Time Zone" ="Fuso Horário"; +"Short Date Format" ="Formato da Data (Curto)"; +"Long Date Format" ="Formato da Data (Longo)"; +"Time Format" ="Formato da Hora"; "default" = "Padrão"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "A Semana começa em :"; -"Day start time :" = "O Dia começa as :"; -"Day end time :" = "O Dia termina as :"; +"Week begins on" ="A Semana começa em"; +"Day start time" ="O Dia começa as"; +"Day end time" ="O Dia termina as"; "Day start time must be prior to day end time." = "Dia de inicio deve ser anterior ao dia de fim."; "Show time as busy outside working hours" = "Exibir horas como ocupadas quando fora do horário de serviço"; -"First week of year :" = "Primeira semana do ano :"; +"First week of year" ="Primeira semana do ano"; "Enable reminders for Calendar items" = "Habilitar lembretes para os itens do Calendário"; "Play a sound when a reminder comes due" = "Executar um som quando existir um lembrete"; -"Default reminder :" = "Lembrete padrão :"; +"Default reminder" ="Lembrete padrão"; "firstWeekOfYear_January1" = "Inicia em 01 de janeiro"; "firstWeekOfYear_First4DayWeek" = "Primeira semana com 4 dias"; "firstWeekOfYear_FirstFullWeek" = "Primeira semana com 5 dias"; "Prevent from being invited to appointments" = "Impedir de ser convidado para um compromisso"; -"White list for appointment invitations:" = "Lista branca para convites de compromissos:"; +"White list for appointment invitations" = "Lista branca para convites de compromissos"; "Contacts Names" = "Nomes de Contatos"; /* Default Calendar */ -"Default calendar :" = "Calendário Padrão"; +"Default calendar" ="Calendário Padrão"; "selectedCalendar" = "Calendário selecionado"; "personalCalendar" = "Calendário pessoal"; "firstCalendar" = "Calendário habilizado pela primeira vez"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Ordenar mensagens por tópicos"; "When sending mail, add unknown recipients to my" = "Ao enviar e-mail, adicionar destinatários desconhecidos ao meu"; -"Forward messages:" = "Encaminhar mensagens:"; +"Forward messages" = "Encaminhar mensagens"; "messageforward_inline" = "No corpo da mensagem"; "messageforward_attached" = "Como anexo"; -"When replying to a message:" = "Ao responder a uma mensagem:"; +"When replying to a message" = "Ao responder a uma mensagem"; "replyplacement_above" = "Começar minha resposta acima das citações"; "replyplacement_below" = "Começar minha resposta abaixo das citações"; "And place my signature" = "E colocar minha assinatura"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nova conta de e-mail"; -"Server Name:" = "Nome do Servidor:"; -"Port:" = "Porta:"; -"Encryption:" = "Encriptação:"; +"Server Name" = "Nome do Servidor"; +"Port" = "Porta"; +"Encryption" = "Encriptação"; "None" = "Nenhum"; -"User Name:" = "Nome do Usuário:"; -"Password:" = "Senha:"; +"User Name" = "Nome do Usuário"; +"Password" = "Senha"; -"Full Name:" = "Nome Completo:"; -"Email:" = "E-mail:"; -"Reply To Email:" = "Responder para o Email:"; -"Signature:" = "Assinatura:"; +"Full Name" = "Nome Completo"; +"Email" = "E-mail"; +"Reply To Email" = "Responder para o Email"; +"Signature" = "Assinatura"; "(Click to create)" = "(Click para criar)"; "Signature" = "Assinatura"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Parâmetros Adicionais"; /* password */ -"New password:" = "Nova senha:"; -"Confirmation:" = "Confirmação:"; +"New password" = "Nova senha"; +"Confirmation" = "Confirmação"; "Change" = "Alterar"; /* Event+task classifications */ -"Default events classification :" = "Classificação padrão do compromisso:"; -"Default tasks classification :" = "Classificação padrão da tarefa:"; +"Default events classification" ="Classificação padrão do compromisso"; +"Default tasks classification" ="Classificação padrão da tarefa"; "PUBLIC_item" = "Público"; "CONFIDENTIAL_item" = "Confidencial"; "PRIVATE_item" = "Particular"; @@ -210,14 +210,15 @@ "Contacts" = "Catálogo"; "Mail" = "Correio"; "Last" = "Último usado"; -"Default Module :" = "Módulo Padrão:"; -"SOGo Version :" = "Versão do SOGo:"; +"Default Module " = "Módulo Padrão"; +"SOGo Version" ="Versão do SOGo"; -"Language :" = "Idioma :"; +"Language" ="Idioma"; "choose" = "Escolha ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -240,7 +241,7 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Atualizar a Visualização:"; +"Refresh View" ="Atualizar a Visualização"; "refreshview_manually" = "Manualmente"; "refreshview_every_minute" = "A cada minuto"; "refreshview_every_2_minutes" = "A cada 2 minutos"; @@ -251,12 +252,12 @@ "refreshview_once_per_hour" = "Uma vez por hora"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Quando eu receber uma confirmação de leitura:"; +"When I receive a request for a return receipt" = "Quando eu receber uma confirmação de leitura"; "Never send a return receipt" = "Nunca enviar confirmação"; "Allow return receipts for some messages" = "Permitir confirmação para algumas mensagens"; -"If I'm not in the To or Cc of the message:" = "Se eu não estiver no Para ou Cc da mensagem:"; -"If the sender is outside my domain:" = "Se o remetente está fora do meu domínio:"; -"In all other cases:" = "Em todos os outros casos:"; +"If I'm not in the To or Cc of the message" = "Se eu não estiver no Para ou Cc da mensagem"; +"If the sender is outside my domain" = "Se o remetente está fora do meu domínio"; +"In all other cases" = "Em todos os outros casos"; "Never send" = "Nunca envia"; "Always send" = "Sempre envia"; diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings index f299cc42d..94265f14b 100644 --- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings +++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Activar resposta automàtica"; -"Auto reply message :" = "Respondre automàticament una sola vegada a cada remitent amb aquest text: "; -"Email addresses (separated by commas) :" = "Adreces de correu (separades per comes) :"; +"Auto reply message" ="Respondre automàticament una sola vegada a cada remitent amb aquest text"; +"Email addresses (separated by commas)" ="Adreces de correu (separades per comes)"; "Add default email addresses" = "Afegir adreces de correu per defecte"; -"Days between responses :" = "Dies entre respostes :"; +"Days between responses" ="Dies entre respostes"; "Do not send responses to mailing lists" = "No enviar respostes a llistes de correu"; "Disable auto reply on" = "Desactivar la resposta automàtica en"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "Especifiqueu l'adreça a la qual voleu redirigir els missatges."; /* d & t */ -"Current Time Zone :" = "Zona horària actual: "; -"Short Date Format :" = "Format de data curt: "; -"Long Date Format :" = "Format de data llarg: "; -"Time Format :" = "Format d'hora: "; +"Current Time Zone" ="Zona horària actual"; +"Short Date Format" ="Format de data curt"; +"Long Date Format" ="Format de data llarg"; +"Time Format" ="Format d'hora"; "default" = "Per defecte"; @@ -90,26 +90,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Setmana comença en: "; -"Day start time :" = "Hora inici dia: "; -"Day end time :" = "Hora final dia: "; +"Week begins on" ="Setmana comença en"; +"Day start time" ="Hora inici dia"; +"Day end time" ="Hora final dia"; "Day start time must be prior to day end time." = "L'hora de començament del dia ha de ser anterior a l'hora d'acabament."; "Show time as busy outside working hours" = "Mostra el temps com ocupat fora de les hores de treball"; -"First week of year :" = "Primera setmana de l'any: "; +"First week of year" ="Primera setmana de l'any"; "Enable reminders for Calendar items" = "Habilitar recordatoris per a ítems del calendari"; "Play a sound when a reminder comes due" = "Usar senyal acústic per als recordatoris"; -"Default reminder :" = "Recordatori per omissió: "; +"Default reminder" ="Recordatori per omissió"; "firstWeekOfYear_January1" = "Comença l'1 de gener"; "firstWeekOfYear_First4DayWeek" = "Primera setmana de 4 dies"; "firstWeekOfYear_FirstFullWeek" = "Primera setmana completa"; "Prevent from being invited to appointments" = "Impedeix ser convidat a cites"; -"White list for appointment invitations:" = "Llista blanca per a invitacions a cites:"; +"White list for appointment invitations" = "Llista blanca per a invitacions a cites"; "Contacts Names" = "Nom dels Contactes"; /* Default Calendar */ -"Default calendar :" = "Calendari per defecte"; +"Default calendar" ="Calendari per defecte"; "selectedCalendar" = "Calendari seleccionat"; "personalCalendar" = "Calendari personal"; "firstCalendar" = "Primer calendari habilitat"; @@ -144,11 +144,11 @@ "refreshview_every_30_minutes" = "Cada 30 minuts"; "refreshview_once_per_hour" = "Cada hora"; -"Forward messages:" = "Reenviar missatges:"; +"Forward messages" = "Reenviar missatges"; "messageforward_inline" = "Incorporats"; "messageforward_attached" = "Com a adjunts"; -"When replying to a message:" = "En contestar a un missatge"; +"When replying to a message" = "En contestar a un missatge"; "replyplacement_above" = "amb la resposta abans"; "replyplacement_below" = "amb la resposta després"; "And place my signature" = "Col·locant la signatura"; @@ -168,17 +168,17 @@ /* IMAP Accounts */ "New Mail Account" = "Compte de correu nou"; -"Server Name:" = "Servidor:"; -"Port:" = "Port:"; -"Encryption:" = "Encriptació:"; +"Server Name" = "Servidor"; +"Port" = "Port"; +"Encryption" = "Encriptació"; "None" = "Cap"; -"User Name:" = "Usuari:"; -"Password:" = "Contrasenya:"; +"User Name" = "Usuari"; +"Password" = "Contrasenya"; -"Full Name:" = "Nom complet:"; -"Email:" = "Correu electrònic:"; -"Reply To Email:" = "Respondre a aquesta adreça de correu: "; -"Signature:" = "Signatura:"; +"Full Name" = "Nom complet"; +"Email" = "Correu electrònic"; +"Reply To Email" = "Respondre a aquesta adreça de correu "; +"Signature" = "Signatura"; "(Click to create)" = "(Clic per a crear-la)"; "Signature" = "Signatura"; @@ -191,13 +191,13 @@ "Additional Parameters" = "Paràmetres addicionals"; /* password */ -"New password:" = "Contrasenya nova:"; -"Confirmation:" = "Confirmar contrasenya nova:"; +"New password" = "Contrasenya nova"; +"Confirmation" = "Confirmar contrasenya nova"; "Change" = "Canviar"; /* Event+task classifications */ -"Default events classification :" = "Classificació per defecte dels esdeveniments "; -"Default tasks classification :" = "Classificació per defecte de les tasques "; +"Default events classification" ="Classificació per defecte dels esdeveniments"; +"Default tasks classification" ="Classificació per defecte de les tasques"; "PUBLIC_item" = "Públic "; "CONFIDENTIAL_item" = "Confidencial "; "PRIVATE_item" = "Privat "; @@ -211,14 +211,15 @@ "Contacts" = "Llibreta d'adreces"; "Mail" = "Correu"; "Last" = "Últim usat"; -"Default Module :" = "Pàgina per defecte :"; -"SOGo Version :" = "Versió del SOGo:"; +"Default Module " = "Pàgina per defecte "; +"SOGo Version" ="Versió del SOGo"; -"Language :" = "Language :"; +"Language" ="Language"; "choose" = "Choose ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -235,6 +236,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -242,12 +244,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Quan reba una sol·licitud de justificant de recepció:"; +"When I receive a request for a return receipt" = "Quan reba una sol·licitud de justificant de recepció"; "Never send a return receipt" = "No enviar mai un justificant de recepció"; "Allow return receipts for some messages" = "Permetre els justificants de recepció per alguns dels missatges"; -"If I'm not in the To or Cc of the message:" = "Si no estic en el camp Per o CC del missatge:"; -"If the sender is outside my domain:" = "Si el remitent està fora del meu domini:"; -"In all other cases:" = "En tots els altres casos:"; +"If I'm not in the To or Cc of the message" = "Si no estic en el camp Per o CC del missatge"; +"If the sender is outside my domain" = "Si el remitent està fora del meu domini"; +"In all other cases" = "En tots els altres casos"; "Never send" = "No enviar mai"; "Always send" = "Enviar sempre"; diff --git a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..547d283c2 --- /dev/null +++ b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,329 @@ +/* toolbar */ +"Save and Close" = "儲存並關閉"; +"Close" = "關閉"; + +/* tabs */ +"General" = "一般"; +"Calendar Options" = "行事曆選項"; +"Contacts Options" = "通訊錄選項"; +"Mail Options" = "郵件選項"; +"IMAP Accounts" = "IMAP 帳號"; +"Vacation" = "休假自動回覆設定"; +"Forward" = "轉寄"; +"Password" = "密碼"; +"Categories" = "分類"; +"Appointments invitations" = "邀請"; +"Name" = "名稱"; +"Color" = "顏色"; +"Add" = "新增"; +"Delete" = "删除"; + +/* contacts categories */ +"contacts_category_labels" = "同事, 競爭對手, 客戶, 朋友, 家庭, 工作伙伴, 供應商, 媒體, VIP"; + +/* vacation (auto-reply) */ +"Enable vacation auto reply" = "開啟休假自動回覆"; +"Auto reply message" ="自動回覆內容"; +"Email addresses (separated by commas)" ="電子郵件地址 (用逗號分隔)"; +"Add default email addresses" = "增加預設的電子郵件地址"; +"Days between responses" ="回覆間隔天數"; +"Do not send responses to mailing lists" = "不要寄送回覆給列表的帳號"; +"Disable auto reply on" = "關閉自動回覆功能"; +"Always send vacation message response" = "開啟休假自動回覆功能"; +"Please specify your message and your email addresses for which you want to enable auto reply." += "請輸入自動回覆的訊息內容及電子郵件帳號。"; +"Your vacation message must not end with a single dot on a line." = "休假自動回覆訊息每一行最後一個字元不能是半型的句號(.)。"; +"End date of your auto reply must be in the future." += "結束日期必須是未來的日期。"; + +/* forward messages */ +"Forward incoming messages" = "信件轉寄"; +"Keep a copy" = "保留備份"; +"Please specify an address to which you want to forward your messages." += "請設定信件轉寄的電子郵件帳號。"; +"You are not allowed to forward your messages to an external email address." = "您不能轉寄信件至外部電子郵件;帳號。"; +"You are not allowed to forward your messages to an internal email address." = "您不能轉寄信件至內部電子郵件;帳號。"; + + +/* d & t */ +"Current Time Zone" ="時區"; +"Short Date Format" ="簡易日期格式"; +"Long Date Format" ="完整日期格式"; +"Time Format" ="時間格式"; + +"default" = "預設"; + +"shortDateFmt_0" = "%d-%b-%y"; + +"shortDateFmt_1" = "%d-%m-%y"; +"shortDateFmt_2" = "%d/%m/%y"; +"shortDateFmt_3" = "%e/%m/%y"; + +"shortDateFmt_4" = "%d-%m-%Y"; +"shortDateFmt_5" = "%d/%m/%Y"; + +"shortDateFmt_6" = "%m-%d-%y"; +"shortDateFmt_7" = "%m/%d/%y"; +"shortDateFmt_8" = "%m/%e/%y"; + +"shortDateFmt_9" = "%y-%m-%d"; +"shortDateFmt_10" = "%y/%m/%d"; +"shortDateFmt_11" = "%y.%m.%d"; + +"shortDateFmt_12" = "%Y-%m-%d"; +"shortDateFmt_13" = "%Y/%m/%d"; +"shortDateFmt_14" = "%Y.%m.%d"; + +"shortDateFmt_15" = ""; + +"longDateFmt_0" = "%A, %B %d, %Y"; +"longDateFmt_1" = "%B %d, %Y"; +"longDateFmt_2" = "%A, %d %B, %Y"; +"longDateFmt_3" = "%d %B, %Y"; +"longDateFmt_4" = ""; +"longDateFmt_5" = ""; +"longDateFmt_6" = ""; +"longDateFmt_7" = ""; +"longDateFmt_8" = ""; +"longDateFmt_9" = ""; +"longDateFmt_10" = ""; + +"timeFmt_0" = "%I:%M %p"; +"timeFmt_1" = "%H:%M"; +"timeFmt_2" = ""; +"timeFmt_3" = ""; +"timeFmt_4" = ""; + +/* calendar */ +"Week begins on" ="一週起始日為"; +"Day start time" ="每日開始時間是"; +"Day end time" ="每日結束時間是"; +"Day start time must be prior to day end time." = "每日開始時間必須早於結束時間。"; +"Show time as busy outside working hours" = "顯示工作時間以下時段顯示為忙碌"; +"First week of year" ="一年的第一週"; +"Enable reminders for Calendar items" = "開啟行事曆的提醒功能"; +"Play a sound when a reminder comes due" = "提醒時撥放音效"; +"Default reminder" ="預設提醒"; + +"firstWeekOfYear_January1" = "開始於一月一日"; +"firstWeekOfYear_First4DayWeek" = "第一個只有四天的週"; +"firstWeekOfYear_FirstFullWeek" = "第一個完整的週"; + +"Prevent from being invited to appointments" = "拒絶邀請"; +"White list for appointment invitations" = "接受邀請的名單列表"; +"Contacts Names" = "連絡人姓名"; + +/* Default Calendar */ +"Default calendar" ="預設行事曆"; +"selectedCalendar" = "選擇的行事曆"; +"personalCalendar" = "個人行事曆"; +"firstCalendar" = "第一個有效的行事曆"; + +"reminder_NONE" = "無提醒"; +"reminder_5_MINUTES_BEFORE" = "5分鐘前"; +"reminder_10_MINUTES_BEFORE" = "10分鐘前"; +"reminder_15_MINUTES_BEFORE" = "15分鐘前"; +"reminder_30_MINUTES_BEFORE" = "30分鐘前"; +"reminder_45_MINUTES_BEFORE" = "45分鐘前"; +"reminder_1_HOUR_BEFORE" = " 1小時前"; +"reminder_2_HOURS_BEFORE" = "2小時前"; +"reminder_5_HOURS_BEFORE" = "5小時前"; +"reminder_15_HOURS_BEFORE" = "15小時前"; +"reminder_1_DAY_BEFORE" = "1天前"; +"reminder_2_DAYS_BEFORE" = "2天前"; +"reminder_1_WEEK_BEFORE" = "1週前"; + +/* Mailer */ +"Labels" = "標籤"; +"Label" = "標籤"; +"Show subscribed mailboxes only" = "只顯示訂閱的信箱"; +"Sort messages by threads" = "依指定的方式進行排序"; +"When sending mail, add unknown recipients to my" = "寄送信件時，將未知的收件者帳號加入我的通訊錄"; + +"Forward messages" = "轉寄信件"; +"messageforward_inline" = "加入原始信件內容"; +"messageforward_attached" = "將原始信件做為附件"; + +"When replying to a message" = "當回覆信件時"; +"replyplacement_above" = "回覆內容在原始信件上面"; +"replyplacement_below" = "回覆內容在原始信件下面"; +"And place my signature" = "增加簽名檔"; +"signatureplacement_above" = "在回覆之下"; +"signatureplacement_below" = "在引用之下"; +"Compose messages in" = "信件撰寫格式"; +"composemessagestype_html" = "HTML"; +"composemessagestype_text" = "純文字"; +"Display remote inline images" = "顯示圖片"; +"displayremoteinlineimages_never" = "從不"; +"displayremoteinlineimages_always" = "永遠"; + +"Auto save every" = "自動存檔間隔"; +"minutes" = "分鐘"; + +/* Contact */ +"Personal Address Book" = "個人通訊錄"; +"Collected Address Book" = "公用通訊錄"; + +/* IMAP Accounts */ +"New Mail Account" = "新的電子郵件帳號"; + +"Server Name" = "伺服器名稱"; +"Port" = "埠號"; +"Encryption" = "加密"; +"None" = "無"; +"User Name" = "使用者名稱"; +"Password" = "密碼"; + +"Full Name" = "全名"; +"Email" = "電子郵件郵件"; +"Reply To Email" = "回覆電子郵件帳號"; +"Signature" = "簽名檔"; +"(Click to create)" = "(點擊後建立)"; + +"Signature" = "簽名"; +"Please enter your signature below:" = "請在下面輸入簽名:"; + +"Please specify a valid sender address." = "請指定一個有效的寄件者帳號。"; +"Please specify a valid reply-to address." = "請指定一個有效的回覆郵件帳號。"; + +/* Additional Parameters */ +"Additional Parameters" = "其他參數"; + +/* password */ +"New password" = "新密碼"; +"Confirmation" = "確認"; +"Change" = "修改"; + +/* Event+task classifications */ +"Default events classification" ="預設的事件類別"; +"Default tasks classification" ="預設的任務類別"; +"PUBLIC_item" = "公開"; +"CONFIDENTIAL_item" = "機密"; +"PRIVATE_item" = "私人"; + +/* Event+task categories */ +"category_none" = "無"; +"calendar_category_labels" = "結婚紀念日,生日,工作,電話,顧客,競爭對手,客戶,收藏, 追踪 ,禮物,假日,想法,會議,事件,雜項,個人,專案,公眾假日,狀態,供應商,旅遊,休假"; + +/* Default module */ +"Calendar" = "行事曆"; +"Contacts" = "通訊錄"; +"Mail" = "郵件"; +"Last" = "上次使用"; +"Default Module " = "預設模式"; +"SOGo Version" ="SOGo版本"; + +"Language" ="語言"; +"choose" = "選擇..."; +"Arabic" = "العربية"; +"Catalan" = "Català"; +"Czech" = "Česky"; +"Danish" = "Dansk (Danmark)"; +"Dutch" = "Nederlands"; +"English" = "English"; +"Finnish" = "Suomi"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Icelandic" = "Íslenska"; +"Italian" = "Italiano"; +"NorwegianBokmal" = "Norsk bokmål"; +"NorwegianNynorsk" = "Norsk nynorsk"; +"BrazilianPortuguese" = "Português brasileiro"; +"Polish" = "Polski"; +"Russian" = "Русский"; +"Slovak" = "Slovensky"; +"SpanishSpain" = "Español (España)"; +"SpanishArgentina" = "Español (Argentina)"; +"Swedish" = "Svenska"; +"Ukrainian" = "Українська"; +"Welsh" = "Cymraeg"; + +"Refresh View" ="重新整理"; +"refreshview_manually" = "手動"; +"refreshview_every_minute" = "每分鐘"; +"refreshview_every_2_minutes" = "每2分鐘"; +"refreshview_every_5_minutes" = "每5分鐘"; +"refreshview_every_10_minutes" = "每10分鐘"; +"refreshview_every_20_minutes" = "每20分鐘"; +"refreshview_every_30_minutes" = "每30分鐘"; +"refreshview_once_per_hour" = "一小時一次"; + +/* Return receipts */ +"When I receive a request for a return receipt" = "當我收到要求讀取回條時"; +"Never send a return receipt" = "不傳送回條"; +"Allow return receipts for some messages" = "部份郵件允許傳送回條"; +"If I'm not in the To or Cc of the message" = "當我的帳號不在郵件的收件者或或副本收件者名單中"; +"If the sender is outside my domain" = "當寄件者帳號與我不同網域名稱"; +"In all other cases" = "任何其他的情形"; + +"Never send" = "不要傳送回條"; +"Always send" = "傳送回條"; +"Ask me" = "傳送回條前先詢問我"; + +/* Filters - UIxPreferences */ +"Filters" = "過濾規則"; +"Active" = "啟動"; +"Move Up" = "上移"; +"Move Down" = "下移"; +"Connection error" = "連接錯誤"; +"Service temporarily unavailable" = "伺服器暫時沒有回應"; + +/* Filters - UIxFilterEditor */ +"Filter name:" = "過濾規則名稱:"; +"For incoming messages that" = "當收到的電子郵件"; +"match all of the following rules:" = "符合下面所有規則:"; +"match any of the following rules:" = "符合下面任何規則:"; +"match all messages" = "符合所有郵件"; +"Perform these actions:" = "執行這些指令:"; +"Untitled Filter" = "沒有名稱的過濾規則"; + +"Subject" = "主旨"; +"From" = "寄件者"; +"To" = "收件者"; +"Cc" = "副本"; +"To or Cc" = "收件者或副本收件者"; +"Size (Kb)" = "大小 (Kb)"; +"Header" = "信件表頭"; +"Body" = "信件本文"; +"Flag the message with:" = "標示郵件為:"; +"Discard the message" = "刪除信件"; +"File the message in:" = "信件歸檔至:"; +"Keep the message" = "保留信件"; +"Forward the message to:" = "轉寄信件至:"; +"Send a reject message:" = "寄送拒絶信件:"; +"Send a vacation message" = "寄送休假訊息"; +"Stop processing filter rules" = "終止郵件過濾"; + +"is under" = "在下面"; +"is over" = "已結束"; +"is" = "是"; +"is not" = "不是"; +"contains" = "包含"; +"does not contain" = "不包含"; +"matches" = "符合"; +"does not match" = "不符合"; +"matches regex" = "符合正規表示法"; +"does not match regex" = "不符合正規表示法"; + +"Seen" = " 已讀"; +"Deleted" = "已刪除"; +"Answered" = "已回覆"; +"Flagged" = "已註記"; +"Junk" = "垃圾信件"; +"Not Junk" = "這不是垃圾郵件"; + +/* Password policy */ +"The password was changed successfully." = "密碼修改完成。"; +"Password must not be empty." = "密碼不可為空白。"; +"The passwords do not match. Please try again." = "密碼不一致，請再試一次。"; +"Password change failed" = "密碼更改失敗"; +"Password change failed - Permission denied" = "密碼更改失敗-權限被拒"; +"Password change failed - Insufficient password quality" = "密碼修改失敗 - 密碼複雜度不符規則"; +"Password change failed - Password is too short" = "密碼修改失敗 - 密碼太短"; +"Password change failed - Password is too young" = "密碼修改失敗 - 密碼太簡單"; +"Password change failed - Password is in history" = "密碼修改失敗 - 曾使用過此密碼,不符歷使用記錄原則"; +"Unhandled policy error: %{0}" = "未知的錯誤: %{0}"; +"Unhandled error response" = "未知的錯誤回覆"; +"Password change is not supported." = "不可更改密碼"; +"Unhandled HTTP error code: %{0}" = "未知的HTTP錯誤碼: %{0}"; diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index 7482be602..964738409 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Zapnout odpovědi v nepřítomnosti"; -"Auto reply message :" = "Zpráva zasílaná v nepřítomnosti :"; -"Email addresses (separated by commas) :" = "Emailové adresy (oddělené čárkami) :"; +"Auto reply message" ="Zpráva zasílaná v nepřítomnosti"; +"Email addresses (separated by commas)" ="Emailové adresy (oddělené čárkami)"; "Add default email addresses" = "Přidat základní emailové adresy"; -"Days between responses :" = "Počet dnů mezi odpověďmi :"; +"Days between responses" ="Počet dnů mezi odpověďmi"; "Do not send responses to mailing lists" = "Neposílat odpovědi do konferencí"; "Disable auto reply on" = "Automatické odpovědi vypnout dne"; "Always send vacation message response" = "Vždy posílat zprávu v nepřítomnosti"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Současné časové pásmo :"; -"Short Date Format :" = "Krátký formát data :"; -"Long Date Format :" = "Dlouhý formát data :"; -"Time Format :" = "Formát času :"; +"Current Time Zone" ="Současné časové pásmo"; +"Short Date Format" ="Krátký formát data"; +"Long Date Format" ="Dlouhý formát data"; +"Time Format" ="Formát času"; "default" = "výchozí"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Týden začíná v :"; -"Day start time :" = "Začátek dne :"; -"Day end time :" = "Konec dne :"; +"Week begins on" ="Týden začíná v"; +"Day start time" ="Začátek dne"; +"Day end time" ="Konec dne"; "Day start time must be prior to day end time." = "Čas Začátek dne musí předcházet času Konec dne."; "Show time as busy outside working hours" = "Čas mimo pracovní dobu zobrazovat jako obsazený"; -"First week of year :" = "První týden roku :"; +"First week of year" ="První týden roku"; "Enable reminders for Calendar items" = "Povolit upozornění pro události v kalendáři"; "Play a sound when a reminder comes due" = "Při upozornění přehrát zvuk"; -"Default reminder :" = "Výchozí upozornění :"; +"Default reminder" ="Výchozí upozornění"; "firstWeekOfYear_January1" = "Začíná 1. ledna"; "firstWeekOfYear_First4DayWeek" = "První 4-denní týden"; "firstWeekOfYear_FirstFullWeek" = "První celý týden"; "Prevent from being invited to appointments" = "Blokovat budoucí pozvání na schůzky"; -"White list for appointment invitations:" = "Seznam povolených pro pozvání na schůzky:"; +"White list for appointment invitations" = "Seznam povolených pro pozvání na schůzky"; "Contacts Names" = "Jména kontaktů"; /* Default Calendar */ -"Default calendar :" = "Výchozí kalendář :"; +"Default calendar" ="Výchozí kalendář"; "selectedCalendar" = "Zvolený kalendář"; "personalCalendar" = "Osobní kalendář"; "firstCalendar" = "První kalendář"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Třídit zprávy podle souvislostí"; "When sending mail, add unknown recipients to my" = "Automaticky přidávat odchozí e-mailovou adresu do složky:"; -"Forward messages:" = "Přeposlat zprávy:"; +"Forward messages" = "Přeposlat zprávy"; "messageforward_inline" = "Do řady"; "messageforward_attached" = "Jako přílohu"; -"When replying to a message:" = "Při odpovědi na zprávu:"; +"When replying to a message" = "Při odpovědi na zprávu"; "replyplacement_above" = "Začít mojí odpověď nad citací"; "replyplacement_below" = "Začít mojí odpověď pod citací"; "And place my signature" = "A umístit můj podpis"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nový poštovní účet"; -"Server Name:" = "Adresa serveru:"; -"Port:" = "Port:"; -"Encryption:" = "Zabezpečení spojení:"; +"Server Name" = "Adresa serveru"; +"Port" = "Port"; +"Encryption" = "Zabezpečení spojení"; "None" = "Žádné"; -"User Name:" = "Uživatelské jméno:"; -"Password:" = "Heslo:"; +"User Name" = "Uživatelské jméno"; +"Password" = "Heslo"; -"Full Name:" = "Celé jméno:"; -"Email:" = "E-mailová adresa:"; -"Reply To Email:" = "Adresa pro odpověď:"; -"Signature:" = "Podpis:"; +"Full Name" = "Celé jméno"; +"Email" = "E-mailová adresa"; +"Reply To Email" = "Adresa pro odpověď"; +"Signature" = "Podpis"; "(Click to create)" = "(Klikni pro vytvoření)"; "Signature" = "Podpis"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Dodatečné parametry"; /* password */ -"New password:" = "Nové heslo:"; -"Confirmation:" = "Potvrzení:"; +"New password" = "Nové heslo"; +"Confirmation" = "Potvrzení"; "Change" = "Změnit"; /* Event+task classifications */ -"Default events classification :" = "Výchozí druh události :"; -"Default tasks classification :" = "Výchozí druh úkolu :"; +"Default events classification" ="Výchozí druh události"; +"Default tasks classification" ="Výchozí druh úkolu"; "PUBLIC_item" = "Veřejné"; "CONFIDENTIAL_item" = "Důvěrné"; "PRIVATE_item" = "Soukromé"; @@ -210,14 +210,15 @@ "Contacts" = "Adresář"; "Mail" = "Pošta"; "Last" = "Naposledy použitý"; -"Default Module :" = "Výchozí modul :"; -"SOGo Version :" = "SOGo verze:"; +"Default Module " = "Výchozí modul "; +"SOGo Version" ="SOGo verze"; -"Language :" = "Jazyk :"; +"Language" ="Jazyk"; "choose" = "Vybrat ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Aktualizace zobrazení:"; +"Refresh View" ="Aktualizace zobrazení"; "refreshview_manually" = "Manuálně"; "refreshview_every_minute" = "Každou minutu"; "refreshview_every_2_minutes" = "Každé 2 minuty"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Jednou za hodinu"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Pokud zpráva obsahuje žádost potvrzení o přečtení:"; +"When I receive a request for a return receipt" = "Pokud zpráva obsahuje žádost potvrzení o přečtení"; "Never send a return receipt" = "Nikdy neodeslat potvrzení o přečtení"; "Allow return receipts for some messages" = "Vracet potvrzení o přečtení pro některé zprávy"; -"If I'm not in the To or Cc of the message:" = "Pokud nejsem uveden v Komu nebo Kopie:"; -"If the sender is outside my domain:" = "Pokud je odesílatel z jiné domény:"; -"In all other cases:" = "Ve všech ostatních případech:"; +"If I'm not in the To or Cc of the message" = "Pokud nejsem uveden v Komu nebo Kopie"; +"If the sender is outside my domain" = "Pokud je odesílatel z jiné domény"; +"In all other cases" = "Ve všech ostatních případech"; "Never send" = "Nikdy neodeslat"; "Always send" = "Vždy odeslat"; diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings index f9976e293..f30f3066f 100644 --- a/UI/PreferencesUI/Danish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Aktivér ferie autosvar"; -"Auto reply message :" = "Automatisk beskedsvar:"; -"Email addresses (separated by commas) :" = "E-mail adresser (adskilt af kommaer):"; +"Auto reply message" ="Automatisk beskedsvar"; +"Email addresses (separated by commas)" ="E-mail adresser (adskilt af kommaer)"; "Add default email addresses" = "Tilføj standard e-mail-adresser"; -"Days between responses :" = "Dage imellem svar:"; +"Days between responses" ="Dage imellem svar"; "Do not send responses to mailing lists" = "Send ikke svar til postlister"; "Disable auto reply on" = "Deaktiver Autosvar til"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "Angiv en adresse, som du ønsker at sende dine beskeder til."; /* d & t */ -"Current Time Zone :" = "Aktuel tidszone:"; -"Short Date Format :" = "Kort dato format:"; -"Long Date Format :" = "Lang dato format:"; -"Time Format :" = "Tidsformat:"; +"Current Time Zone" ="Aktuel tidszone"; +"Short Date Format" ="Kort dato format"; +"Long Date Format" ="Lang dato format"; +"Time Format" ="Tidsformat"; "default" = "Standard"; @@ -90,23 +90,23 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Uge start tidspunkt:"; -"Day start time :" = "Dag start tidspunkt:"; -"Day end time :" = "Dag slut tidspunkt:"; +"Week begins on" ="Uge start tidspunkt"; +"Day start time" ="Dag start tidspunkt"; +"Day end time" ="Dag slut tidspunkt"; "Day start time must be prior to day end time." = "Dagens start tidspunkt skal være før dagens slut tidspunkt."; "Show time as busy outside working hours" = "Vis tid som optaget uden for arbejdstiden"; -"First week of year :" = "Første uge på året:"; +"First week of year" ="Første uge på året"; "Enable reminders for Calendar items" = "Aktivér påmindelser for kalenderemner"; "Play a sound when a reminder comes due" = "Afspil en lyd, når en påmindelse aktiveres"; -"Default reminder :" = "Standard påmindelse:"; +"Default reminder" ="Standard påmindelse"; "firstWeekOfYear_January1" = "Starter den 1. januar"; "firstWeekOfYear_First4DayWeek" = "Første 4-dages uge"; "firstWeekOfYear_FirstFullWeek" = "Første hele uge"; /* Default Calendar */ -"Default calendar :" = "Standard kalender"; +"Default calendar" ="Standard kalender"; "selectedCalendar" = "Valgte kalender"; "personalCalendar" = "Personlig kalender"; "firstCalendar" = "Første aktiveret kalender"; @@ -136,11 +136,11 @@ "refreshview_every_30_minutes" = "Hvert 30. minut"; "refreshview_once_per_hour" = "Én gang i timen"; -"Forward messages:" = "Videresend beskeder:"; +"Forward messages" = "Videresend beskeder"; "messageforward_inline" = "På linie"; "messageforward_attached" = "Som vedhæftet fil"; -"When replying to a message:" = "Når du besvarer en besked:"; +"When replying to a message" = "Når du besvarer en besked"; "replyplacement_above" = "Start mit svar over citat"; "replyplacement_below" = "Start mit svar under citat"; "And place my signature" = "Og placér min signatur"; @@ -156,20 +156,20 @@ /* IMAP Accounts */ "New Mail Account" = "Ny mail-konto"; -"Server Name:" = "Server Navn:"; -"Port:" = "Port:"; -"Encryption:" = "Krypteret:"; +"Server Name" = "Server Navn"; +"Port" = "Port"; +"Encryption" = "Krypteret"; "None" = "Ingen"; -"User Name:" = "Brugernavn:"; -"Password:" = "Adgangskode:"; +"User Name" = "Brugernavn"; +"Password" = "Adgangskode"; -"Full Name:" = "Fulde navn:"; -"Email:" = "E-mail:"; -"Reply To Email:" = "Besvar på mail:"; -"Signature:" = "Signatur:"; +"Full Name" = "Fulde navn"; +"Email" = "E-mail"; +"Reply To Email" = "Besvar på mail"; +"Signature" = "Signatur"; "(Click to create)" = "(Klik for at oprette)"; -"Signature" = "Signatur:"; +"Signature" = "Signatur"; "Please enter your signature below:" = "Indsæt venligst din signatur nedenfor:"; "Please specify a valid sender address." = "Angiv venligst en gyldig afsenderadresse."; @@ -179,13 +179,13 @@ "Additional Parameters" = "Yderligere parametre"; /* password */ -"New password:" = "Ny adgangskode:"; -"Confirmation:" = "Bekræftelse:"; +"New password" = "Ny adgangskode"; +"Confirmation" = "Bekræftelse"; "Change" = "Skift"; /* Event+task classifications */ -"Default events classification :" = "Standard begivenhedsklassifikation:"; -"Default tasks classification :" = "Standard opgaveklassifikation:"; +"Default events classification" ="Standard begivenhedsklassifikation"; +"Default tasks classification" ="Standard opgaveklassifikation"; "PUBLIC_item" = "Offentlig"; "CONFIDENTIAL_item" = "Fortrolig"; "PRIVATE_item" = "Privat"; @@ -199,13 +199,14 @@ "Contacts" = "Adressebog"; "Mail" = "Mail"; "Last" = "Sidst anvendt"; -"Default Module :" = "Standard modul:"; +"Default Module " = "Standard modul"; -"Language :" = "Sprog:"; +"Language" ="Sprog"; "choose" = "Vælg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -229,12 +230,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Når jeg modtager en anmodning om en kvittering:"; +"When I receive a request for a return receipt" = "Når jeg modtager en anmodning om en kvittering"; "Never send a return receipt" = "Send aldrig en kvittering"; "Allow return receipts for some messages" = "Tillad kvitteringer for nogle beskeder"; -"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i feltet Til eller Cc i meddelelsen:"; -"If the sender is outside my domain:" = "Hvis afsenderen er uden for mit domæne:"; -"In all other cases:" = "I alle andre tilfælde:"; +"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i feltet Til eller Cc i meddelelsen"; +"If the sender is outside my domain" = "Hvis afsenderen er uden for mit domæne"; +"In all other cases" = "I alle andre tilfælde"; "Never send" = "Send aldrig"; "Always send" = "Send altid"; diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index d19f8fd06..0500dd1d9 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Automatisch bericht bij afwezigheid inschakelen"; -"Auto reply message :" = "Automatisch eenmalig met het volgende bericht beantwoorden:"; -"Email addresses (separated by commas) :" = "E-mailaddressen (gescheiden door komma's):"; +"Auto reply message" ="Automatisch eenmalig met het volgende bericht beantwoorden"; +"Email addresses (separated by commas)" ="E-mailaddressen (gescheiden door komma's)"; "Add default email addresses" = "Standaard e-mailadres toevoegen"; -"Days between responses :" = "Dagen tussen reacties:"; +"Days between responses" ="Dagen tussen reacties"; "Do not send responses to mailing lists" = "Geen reacties naar maillinglijsten sturen"; "Disable auto reply on" = "Automatisch bericht bij afwezigheid uitschakelen op"; "Always send vacation message response" = "Afwezigheidsbericht altijd versturen"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Huidige tijdzone:"; -"Short Date Format :" = "Kort datumformaat:"; -"Long Date Format :" = "Lang datumformaat:"; -"Time Format :" = "Tijdformaat:"; +"Current Time Zone" ="Huidige tijdzone"; +"Short Date Format" ="Kort datumformaat"; +"Long Date Format" ="Lang datumformaat"; +"Time Format" ="Tijdformaat"; "default" = "Default"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Week begint op:"; -"Day start time :" = "Dag begint om:"; -"Day end time :" = "Dag eindigt om:"; +"Week begins on" ="Week begint op"; +"Day start time" ="Dag begint om"; +"Day end time" ="Dag eindigt om"; "Day start time must be prior to day end time." = "Het begin van de dag moet voor het einde liggen."; "Show time as busy outside working hours" = "Tijd buiten werkdag weergeven als bezet"; -"First week of year :" = "Eerste week van het jaar:"; +"First week of year" ="Eerste week van het jaar"; "Enable reminders for Calendar items" = "Herinneringen inschakelen voor afspraken"; "Play a sound when a reminder comes due" = "Geluid afspelen bij herinnering"; -"Default reminder :" = "Standaardherinnering:"; +"Default reminder" ="Standaardherinnering"; "firstWeekOfYear_January1" = "Begint op 1 januari"; "firstWeekOfYear_First4DayWeek" = "Eerste week met 4 dagen"; "firstWeekOfYear_FirstFullWeek" = "Eerste volledige week"; "Prevent from being invited to appointments" = "Voorkom uitgenodigingen voor gebeurtenissen"; -"White list for appointment invitations:" = "Whitelist voor uitnodigingen:"; +"White list for appointment invitations" = "Whitelist voor uitnodigingen"; "Contacts Names" = "Contactnamen"; /* Default Calendar */ -"Default calendar :" = "Standaardagenda:"; +"Default calendar" ="Standaardagenda"; "selectedCalendar" = "Geselecteerde agenda"; "personalCalendar" = "Persoonlijke agenda"; "firstCalendar" = "Eerste ingeschakelde agenda"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Berichten sorteren op threads"; "When sending mail, add unknown recipients to my" = "Bij het versturen van mail, voeg onbekende ontvangers toe aan mijn"; -"Forward messages:" = "Berichten doorsturen:"; +"Forward messages" = "Berichten doorsturen"; "messageforward_inline" = "In het bericht"; "messageforward_attached" = "Als bijlage"; -"When replying to a message:" = "Bij het beantwoorden van een bericht:"; +"When replying to a message" = "Bij het beantwoorden van een bericht"; "replyplacement_above" = "Reactie boven orginele tekst"; "replyplacement_below" = "Reactie onder orginele tekst"; "And place my signature" = "Ondertekening plaatsen"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nieuw mailaccount"; -"Server Name:" = "Servernaam:"; -"Port:" = "Poort:"; -"Encryption:" = "Encryptie:"; +"Server Name" = "Servernaam"; +"Port" = "Poort"; +"Encryption" = "Encryptie"; "None" = "Geen"; -"User Name:" = "Gebruikersnaam:"; -"Password:" = "Wachtwoord:"; +"User Name" = "Gebruikersnaam"; +"Password" = "Wachtwoord"; -"Full Name:" = "Naam:"; -"Email:" = "E-mail:"; -"Reply To Email:" = "Antwoord op e-mail:"; -"Signature:" = "Ondertekening:"; +"Full Name" = "Naam"; +"Email" = "E-mail"; +"Reply To Email" = "Antwoord op e-mail"; +"Signature" = "Ondertekening"; "(Click to create)" = "(Klik om op te stellen)"; "Signature" = "Ondertekening"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Extra Parameters"; /* password */ -"New password:" = "Nieuw wachtwoord:"; -"Confirmation:" = "Bevestig wachtwoord:"; +"New password" = "Nieuw wachtwoord"; +"Confirmation" = "Bevestig wachtwoord"; "Change" = "Veranderen"; /* Event+task classifications */ -"Default events classification :" = "Standaardclassificatie afspraken:"; -"Default tasks classification :" = "Standaardclassificatie taken:"; +"Default events classification" ="Standaardclassificatie afspraken"; +"Default tasks classification" ="Standaardclassificatie taken"; "PUBLIC_item" = "Publiek"; "CONFIDENTIAL_item" = "Vertrouwelijk"; "PRIVATE_item" = "Privé"; @@ -210,14 +210,15 @@ "Contacts" = "Adresboek"; "Mail" = "Mail"; "Last" = "Laatst gebruikt"; -"Default Module :" = "Standaardmodule:"; -"SOGo Version :" = "SOGo versie:"; +"Default Module " = "Standaardmodule"; +"SOGo Version" ="SOGo versie"; -"Language :" = "Taal:"; +"Language" ="Taal"; "choose" = "Kies..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentinië)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Overzicht verversen"; +"Refresh View" ="Overzicht verversen"; "refreshview_manually" = "Handmatig"; "refreshview_every_minute" = "Iedere minuut"; "refreshview_every_2_minutes" = "Iedere 2 minuten"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Ieder uur"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Bij aanvraag van een ontvangstbevestiging:"; +"When I receive a request for a return receipt" = "Bij aanvraag van een ontvangstbevestiging"; "Never send a return receipt" = "Ontvangstbevestiging nooit sturen"; "Allow return receipts for some messages" = "Ontvangstbevestigingen voor sommige berichten toestaan"; -"If I'm not in the To or Cc of the message:" = "Als ik niet in aan of cc van het bericht sta:"; -"If the sender is outside my domain:" = "Als de afzender buiten mijn domein zit:"; -"In all other cases:" = "In alle andere gevallen:"; +"If I'm not in the To or Cc of the message" = "Als ik niet in aan of cc van het bericht sta"; +"If the sender is outside my domain" = "Als de afzender buiten mijn domein zit"; +"In all other cases" = "In alle andere gevallen"; "Never send" = "Nooit sturen"; "Always send" = "Altijd sturen"; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index a5d59ae2b..8036e6166 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Enable vacation auto reply"; -"Auto reply message :" = "Auto reply message:"; -"Email addresses (separated by commas) :" = "Email addresses (separated by commas):"; +"Auto reply message" ="Auto reply message"; +"Email addresses (separated by commas)" ="Email addresses (separated by commas)"; "Add default email addresses" = "Add default email addresses"; -"Days between responses :" = "Days between responses:"; +"Days between responses" ="Days between responses"; "Do not send responses to mailing lists" = "Do not send responses to mailing lists"; "Disable auto reply on" = "Disable auto reply on"; "Always send vacation message response" = "Always send vacation message response"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Current Time Zone:"; -"Short Date Format :" = "Short Date Format:"; -"Long Date Format :" = "Long Date Format:"; -"Time Format :" = "Time Format:"; +"Current Time Zone" ="Current Time Zone"; +"Short Date Format" ="Short Date Format"; +"Long Date Format" ="Long Date Format"; +"Time Format" ="Time Format"; "default" = "Default"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Week begins on:"; -"Day start time :" = "Day start time:"; -"Day end time :" = "Day end time:"; +"Week begins on" ="Week begins on"; +"Day start time" ="Day start time"; +"Day end time" ="Day end time"; "Day start time must be prior to day end time." = "Day start time must be prior to day end time."; "Show time as busy outside working hours" = "Show time as busy outside working hours"; -"First week of year :" = "First week of year:"; +"First week of year" ="First week of year"; "Enable reminders for Calendar items" = "Enable reminders for Calendar items"; "Play a sound when a reminder comes due" = "Play a sound when a reminder comes due"; -"Default reminder :" = "Default reminder:"; +"Default reminder" ="Default reminder"; "firstWeekOfYear_January1" = "Starts on january 1"; "firstWeekOfYear_First4DayWeek" = "First 4-day week"; "firstWeekOfYear_FirstFullWeek" = "First full week"; "Prevent from being invited to appointments" = "Prevent from being invited to appointments"; -"White list for appointment invitations:" = "White list for appointment invitations:"; +"White list for appointment invitations" = "White list for appointment invitations"; "Contacts Names" = "Contacts Names"; /* Default Calendar */ -"Default calendar :" = "Default calendar:"; +"Default calendar" ="Default calendar"; "selectedCalendar" = "Selected calendar"; "personalCalendar" = "Personal calendar"; "firstCalendar" = "First enabled calendar"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Sort messages by threads"; "When sending mail, add unknown recipients to my" = "When sending mail, add unknown recipients to my"; -"Forward messages:" = "Forward messages:"; +"Forward messages" = "Forward messages"; "messageforward_inline" = "Inline"; "messageforward_attached" = "As Attachment"; -"When replying to a message:" = "When replying to a message:"; +"When replying to a message" = "When replying to a message"; "replyplacement_above" = "Start my reply above the quote"; "replyplacement_below" = "Start my reply below the quote"; "And place my signature" = "And place my signature"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "New Mail Account"; -"Server Name:" = "Server Name:"; -"Port:" = "Port:"; -"Encryption:" = "Encryption:"; +"Server Name" = "Server Name"; +"Port" = "Port"; +"Encryption" = "Encryption"; "None" = "None"; -"User Name:" = "User Name:"; -"Password:" = "Password:"; +"User Name" = "User Name"; +"Password" = "Password"; -"Full Name:" = "Full Name:"; -"Email:" = "Email:"; -"Reply To Email:" = "Reply To Email:"; -"Signature:" = "Signature:"; +"Full Name" = "Full Name"; +"Email" = "Email"; +"Reply To Email" = "Reply To Email"; +"Signature" = "Signature"; "(Click to create)" = "(Click to create)"; "Signature" = "Signature"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Additional Parameters"; /* password */ -"New password:" = "New password:"; -"Confirmation:" = "Confirmation:"; +"New password" = "New password"; +"Confirmation" = "Confirmation"; "Change" = "Change"; /* Event+task classifications */ -"Default events classification :" = "Default events classification:"; -"Default tasks classification :" = "Default tasks classification:"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -210,14 +210,15 @@ "Contacts" = "Address Book"; "Mail" = "Mail"; "Last" = "Last used"; -"Default Module :" = "Default Module:"; -"SOGo Version :" = "SOGo Version:"; +"Default Module " = "Default Module"; +"SOGo Version" ="SOGo Version"; -"Language :" = "Language:"; +"Language" ="Language"; "choose" = "Choose ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Refresh View:"; +"Refresh View" ="Refresh View"; "refreshview_manually" = "Manually"; "refreshview_every_minute" = "Every minute"; "refreshview_every_2_minutes" = "Every 2 minutes"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Once per hour"; /* Return receipts */ -"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:"; +"When I receive a request for a return receipt" = "When I receive a request for a return receipt"; "Never send a return receipt" = "Never send a return receipt"; "Allow return receipts for some messages" = "Allow return receipts for some messages"; -"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:"; -"If the sender is outside my domain:" = "If the sender is outside my domain:"; -"In all other cases:" = "In all other cases:"; +"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message"; +"If the sender is outside my domain" = "If the sender is outside my domain"; +"In all other cases" = "In all other cases"; "Never send" = "Never send"; "Always send" = "Always send"; diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings index 355f2e61f..780d98acf 100644 --- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Laita automaattinen lomavastaaja päälle"; -"Auto reply message :" = "Automaattivastaus:"; -"Email addresses (separated by commas) :" = "Sähköpostiosoitteet (eroteltuna pilkuin)"; +"Auto reply message" ="Automaattivastaus"; +"Email addresses (separated by commas)" ="Sähköpostiosoitteet (eroteltuna pilkuin)"; "Add default email addresses" = "Syötä oletussähköpostiosoite"; -"Days between responses :" = "Päivät vastausten välillä:"; +"Days between responses" ="Päivät vastausten välillä"; "Do not send responses to mailing lists" = "Älä lähetä vastauksia postituslistoille"; "Disable auto reply on" = "Poista automaattivastaus käytöstä"; "Always send vacation message response" = "Lähetä lomaviestivastaus aina"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Nykyinen aikavyöhyke:"; -"Short Date Format :" = "Lyhyt ajan esitysmuoto:"; -"Long Date Format :" = "Pitkä ajan esitysmuoto:"; -"Time Format :" = "Ajan esitysmuoto:"; +"Current Time Zone" ="Nykyinen aikavyöhyke"; +"Short Date Format" ="Lyhyt ajan esitysmuoto"; +"Long Date Format" ="Pitkä ajan esitysmuoto"; +"Time Format" ="Ajan esitysmuoto"; "default" = "Oletus"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Viikon alkupäivä:"; -"Day start time :" = "Päivä alkaa klo:"; -"Day end time :" = "Päivä päättyy klo:"; +"Week begins on" ="Viikon alkupäivä"; +"Day start time" ="Päivä alkaa klo"; +"Day end time" ="Päivä päättyy klo"; "Day start time must be prior to day end time." = "Päivän alkuajan tulee olla ennen päättymisaikaa."; "Show time as busy outside working hours" = "Näytä työajan ulkopuolinen aika varattuna"; -"First week of year :" = "Vuoden ensimmäinen viikko:"; +"First week of year" ="Vuoden ensimmäinen viikko"; "Enable reminders for Calendar items" = "Ota käyttöön kalenterimerkintöjen muistuttajat"; "Play a sound when a reminder comes due" = "Soita äänimerkki kun muistuttaja aktivoituu"; -"Default reminder :" = "Oletusmuistuttaja"; +"Default reminder" ="Oletusmuistuttaja"; "firstWeekOfYear_January1" = "Alkaa Tammikuun 1."; "firstWeekOfYear_First4DayWeek" = "Ensimmäinen nelipäiväinen viikko"; "firstWeekOfYear_FirstFullWeek" = "Ensimmäinen täysi viikko"; "Prevent from being invited to appointments" = "Estä tapaamiskutsut"; -"White list for appointment invitations:" = "Valkoinen lista kalenterikutsuille:"; +"White list for appointment invitations" = "Valkoinen lista kalenterikutsuille"; "Contacts Names" = "Yhteystietojen Nimet"; /* Default Calendar */ -"Default calendar :" = "Oletuskalenteri"; +"Default calendar" ="Oletuskalenteri"; "selectedCalendar" = "Valittu kalenteri"; "personalCalendar" = "Henkilökohtainen kalenteri"; "firstCalendar" = "Ensimmäinen käyttöönotettu kalenteri"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Järjestä viestit ketjuiksi"; "When sending mail, add unknown recipients to my" = "Postia lähettäessä lisää tuntemattomat vastaanottajat"; -"Forward messages:" = "Edelleenlähetä viestit:"; +"Forward messages" = "Edelleenlähetä viestit"; "messageforward_inline" = "Tekstisisällössä"; "messageforward_attached" = "Liitteinä"; -"When replying to a message:" = "Kun vastaan viestiin:"; +"When replying to a message" = "Kun vastaan viestiin"; "replyplacement_above" = "Aloita vastaukseni lainauksen yläpuolelta"; "replyplacement_below" = "Aloita vastaukseni lainauksen alapuolelta"; "And place my signature" = "Ja sijoita allekirjoitukseni"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Uusi sähköpostitili"; -"Server Name:" = "Palvelinnimi:"; -"Port:" = "Portti:"; -"Encryption:" = "Salaus"; +"Server Name" = "Palvelinnimi"; +"Port" = "Portti"; +"Encryption" = "Salaus"; "None" = "Ei mitään"; -"User Name:" = "Käyttäjätunnus:"; -"Password:" = "Salasana:"; +"User Name" = "Käyttäjätunnus"; +"Password" = "Salasana"; -"Full Name:" = "Koko nimi:"; -"Email:" = "Sähköposti:"; -"Reply To Email:" = "Vastaa sähköpostiin:"; -"Signature:" = "Allekirjoitus:"; +"Full Name" = "Koko nimi"; +"Email" = "Sähköposti"; +"Reply To Email" = "Vastaa sähköpostiin"; +"Signature" = "Allekirjoitus"; "(Click to create)" = "(Napsauta luodaksesi)"; "Signature" = "Allekirjoitus"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Lisäparametrit"; /* password */ -"New password:" = "Uusi salasana"; -"Confirmation:" = "Vahvistus:"; +"New password" = "Uusi salasana"; +"Confirmation" = "Vahvistus"; "Change" = "Vaihda"; /* Event+task classifications */ -"Default events classification :" = "Oletus tapahtumaluokittelu:"; -"Default tasks classification :" = "Oletus tehtäväluokittelu:"; +"Default events classification" ="Oletus tapahtumaluokittelu"; +"Default tasks classification" ="Oletus tehtäväluokittelu"; "PUBLIC_item" = "Julkinen"; "CONFIDENTIAL_item" = "Luottamuksellinen"; "PRIVATE_item" = "Yksityinen"; @@ -210,14 +210,15 @@ "Contacts" = "Osoitekirja"; "Mail" = "Sähköposti"; "Last" = "Viimeksi käytetty"; -"Default Module :" = "Oletusmoduli:"; -"SOGo Version :" = "SOGo versio:"; +"Default Module " = "Oletusmoduli"; +"SOGo Version" ="SOGo versio"; -"Language :" = "Kieli:"; +"Language" ="Kieli"; "choose" = "Valitse..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Päivitä näkymä:"; +"Refresh View" ="Päivitä näkymä"; "refreshview_manually" = "Manuaalisesti"; "refreshview_every_minute" = "Joka minuutti"; "refreshview_every_2_minutes" = "Joka toinen minuutti"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Kerran tunnissa "; /* Return receipts */ -"When I receive a request for a return receipt:" = "Kun saan kuittauspyynnön:"; +"When I receive a request for a return receipt" = "Kun saan kuittauspyynnön"; "Never send a return receipt" = "Alä koskaan lähetä kuittausta"; "Allow return receipts for some messages" = "Salli kuittaukset joillekin viesteille"; -"If I'm not in the To or Cc of the message:" = "Jos en ole viestin To tai Cc -kentissä: "; -"If the sender is outside my domain:" = "Jos lähettäjä on oman toimialueeni ulkopuolelta:"; -"In all other cases:" = "Kaikissa muissa tapauksissa:"; +"If I'm not in the To or Cc of the message" = "Jos en ole viestin To tai Cc -kentissä "; +"If the sender is outside my domain" = "Jos lähettäjä on oman toimialueeni ulkopuolelta"; +"In all other cases" = "Kaikissa muissa tapauksissa"; "Never send" = "Älä koskaan lähetä"; "Always send" = "Lähetä aina"; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index f2d537b60..2be47f50c 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Activer message d'absence prolongée"; -"Auto reply message :" = "Message de réponse automatique :"; -"Email addresses (separated by commas) :" = "Adresses courriels (séparées par des virgules) :"; +"Auto reply message" ="Message de réponse automatique"; +"Email addresses (separated by commas)" ="Adresses courriels (séparées par des virgules)"; "Add default email addresses" = "Ajouter les adresses par défaut"; -"Days between responses :" = "Nombre de jours entre réponses :"; +"Days between responses" ="Nombre de jours entre réponses"; "Do not send responses to mailing lists" = "Ne pas envoyer les réponses aux listes de diffusion"; "Disable auto reply on" = "Désactiver la réponse automatique le"; "Always send vacation message response" = "Toujours envoyer le message de vacances prolongées"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Fuseau horaire en cours :"; -"Short Date Format :" = "Style de date courte :"; -"Long Date Format :" = "Style de date longue :"; -"Time Format :" = "Style de l'heure :"; +"Current Time Zone" ="Fuseau horaire en cours"; +"Short Date Format" ="Style de date courte"; +"Long Date Format" ="Style de date longue"; +"Time Format" ="Style de l'heure"; "default" = "Défaut"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Premier jour de la semaine :"; -"Day start time :" = "Début de la journée :"; -"Day end time :" = "Fin de la journée :"; +"Week begins on" ="Premier jour de la semaine"; +"Day start time" ="Début de la journée"; +"Day end time" ="Fin de la journée"; "Day start time must be prior to day end time." = "Le début de la journée doit être avant la fin de la journée."; "Show time as busy outside working hours" = "Afficher comme occupé pendant les heures non-ouvrables"; -"First week of year :" = "Première semaine de l'année :"; +"First week of year" ="Première semaine de l'année"; "Enable reminders for Calendar items" = "Activer les rappels pour les éléments du calendrier"; "Play a sound when a reminder comes due" = "Émettre un signal sonore à l'échéance du rappel"; -"Default reminder :" = "Rappel par défaut :"; +"Default reminder" ="Rappel par défaut"; "firstWeekOfYear_January1" = "Commence le 1er janvier"; "firstWeekOfYear_First4DayWeek" = "Première semaine de 4 jours"; "firstWeekOfYear_FirstFullWeek" = "Première semaine entière"; "Prevent from being invited to appointments" = "Interdire de m'inviter à des rendez-vous"; -"White list for appointment invitations:" = "Liste blanche pour les invitations"; +"White list for appointment invitations" = "Liste blanche pour les invitations"; "Contacts Names" = "Noms des contacts"; /* Default Calendar */ -"Default calendar :" = "Calendrier par défaut :"; +"Default calendar" ="Calendrier par défaut"; "selectedCalendar" = "le calendrier sélectionné"; "personalCalendar" = "le calendrier personnel"; "firstCalendar" = "le premier calendrier actif"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Grouper les discussions"; "When sending mail, add unknown recipients to my" = "Lors de l'envoi d'un message, ajouter les destinataires inconnus au carnet"; -"Forward messages:" = "Transférer les messages :"; +"Forward messages" = "Transférer les messages "; "messageforward_inline" = "intégrés"; "messageforward_attached" = "en pièces jointes"; -"When replying to a message:" = "En répondant à un message"; +"When replying to a message" = "En répondant à un message"; "replyplacement_above" = "Placer ma réponse avant la citation"; "replyplacement_below" = "Placer ma réponse après la citation"; "And place my signature" = "Et placer ma signature"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nouveau compte"; -"Server Name:" = "Serveur :"; -"Port:" = "Port :"; -"Encryption:" = "Chiffrement :"; +"Server Name" = "Serveur "; +"Port" = "Port "; +"Encryption" = "Chiffrement "; "None" = "Aucun"; -"User Name:" = "Utilisateur :"; -"Password:" = "Mot de passe :"; +"User Name" = "Utilisateur "; +"Password" = "Mot de passe "; -"Full Name:" = "Nom complet :"; -"Email:" = "Email :"; -"Reply To Email:" = "Adresse de retour :"; -"Signature:" = "Signature :"; +"Full Name" = "Nom complet "; +"Email" = "Email "; +"Reply To Email" = "Adresse de retour "; +"Signature" = "Signature "; "(Click to create)" = "(Signature vide)"; "Signature" = "Signature"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Paramètres supplémentaires"; /* password */ -"New password:" = "Nouveau mot de passe:"; -"Confirmation:" = "Confirmation:"; +"New password" = "Nouveau mot de passe"; +"Confirmation" = "Confirmation"; "Change" = "Changer"; /* Event+task classifications */ -"Default events classification :" = "Classification par défaut des événements :"; -"Default tasks classification :" = "Classification par défaut des tâches :"; +"Default events classification" ="Classification par défaut des événements"; +"Default tasks classification" ="Classification par défaut des tâches"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidentiel"; "PRIVATE_item" = "Privé"; @@ -210,14 +210,15 @@ "Contacts" = "Carnet d'adresses"; "Mail" = "Courrier"; "Last" = "Dernier utilisé"; -"Default Module :" = "Module par défaut :"; -"SOGo Version :" = "Version :"; +"Default Module " = "Module par défaut "; +"SOGo Version" ="Version"; -"Language :" = "Langue :"; +"Language" ="Langue"; "choose" = "Choisir ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Actualisation :"; +"Refresh View" ="Actualisation"; "refreshview_manually" = "Manuellement"; "refreshview_every_minute" = "Chaque minute"; "refreshview_every_2_minutes" = "Toutes les 2 minutes"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Une fois par heure"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Lors de la réception d'une demande d'accusé de réception :"; +"When I receive a request for a return receipt" = "Lors de la réception d'une demande d'accusé de réception "; "Never send a return receipt" = "Ne jamais envoyer d'accusé de réception"; "Allow return receipts for some messages" = "Autoriser les accusés de réception pour certains messages"; -"If I'm not in the To or Cc of the message:" = "Si je ne suis pas dans le destinataire ou en copie du message :"; -"If the sender is outside my domain:" = "Si l'expéditeur est hors de mon domaine :"; -"In all other cases:" = "Dans tous les autres cas :"; +"If I'm not in the To or Cc of the message" = "Si je ne suis pas dans le destinataire ou en copie du message "; +"If the sender is outside my domain" = "Si l'expéditeur est hors de mon domaine "; +"In all other cases" = "Dans tous les autres cas "; "Never send" = "Ne jamais envoyer"; "Always send" = "Toujours envoyer"; diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile index 570327559..450ede6ec 100644 --- a/UI/PreferencesUI/GNUmakefile +++ b/UI/PreferencesUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = PreferencesUI PreferencesUI_PRINCIPAL_CLASS = PreferencesUIProduct -PreferencesUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +PreferencesUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh PreferencesUI_OBJC_FILES = \ PreferencesUIProduct.m \ diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index 756f73bbf..48bd15efc 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Automatische Abwesenheitsnachricht aktivieren"; -"Auto reply message :" = "Mit folgender Nachricht auf jede eingehende E-Mail antworten:"; -"Email addresses (separated by commas) :" = "E-Mail-Adressen (getrennt durch Kommata):"; +"Auto reply message" ="Mit folgender Nachricht auf jede eingehende E-Mail antworten"; +"Email addresses (separated by commas)" ="E-Mail-Adressen (getrennt durch Kommata)"; "Add default email addresses" = "Standardadresse hinzufügen"; -"Days between responses :" = "Tage zwischen automatischen Abwesenheitsnachrichten:"; +"Days between responses" ="Tage zwischen automatischen Abwesenheitsnachrichten"; "Do not send responses to mailing lists" = "Keine automatischen Abwesenheitsnachrichten an Mailinglisten senden"; "Disable auto reply on" = "Automatische Abwesenheitsnachricht abschalten am"; "Always send vacation message response" = "Immer Abwesenheitsmeldung senden"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Aktuelle Zeitzone:"; -"Short Date Format :" = "Kurzes Datumsformat:"; -"Long Date Format :" = "Langes Datumsformat:"; -"Time Format :" = "Zeitformat:"; +"Current Time Zone" ="Aktuelle Zeitzone"; +"Short Date Format" ="Kurzes Datumsformat"; +"Long Date Format" ="Langes Datumsformat"; +"Time Format" ="Zeitformat"; "default" = "Standard"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Erster Wochentag:"; -"Day start time :" = "Tagesanfang:"; -"Day end time :" = "Tagesende:"; +"Week begins on" ="Erster Wochentag"; +"Day start time" ="Tagesanfang"; +"Day end time" ="Tagesende"; "Day start time must be prior to day end time." = "Der Tagesanfang muss vor dem Tagesende liegen."; "Show time as busy outside working hours" = "Zeiten außerhalb der Arbeitszeit als belegt anzeigen"; -"First week of year :" = "Erste Woche des Jahres:"; +"First week of year" ="Erste Woche des Jahres"; "Enable reminders for Calendar items" = "Termin- und Aufgabenerinnerungen aktivieren"; "Play a sound when a reminder comes due" = "Akustisches Signal zur Terminerinnerung"; -"Default reminder :" = "Standard Terminerinnerung:"; +"Default reminder" ="Standard Terminerinnerung"; "firstWeekOfYear_January1" = "Beginnt am 1. Januar"; "firstWeekOfYear_First4DayWeek" = "Erste 4 Tage Woche"; "firstWeekOfYear_FirstFullWeek" = "Erste ganze Woche"; "Prevent from being invited to appointments" = "Verhindere, dass ich zu Terminen eingeladen werde"; -"White list for appointment invitations:" = "White-Liste für Termineinladungen:"; +"White list for appointment invitations" = "White-Liste für Termineinladungen"; "Contacts Names" = "Kontaktnamen"; /* Default Calendar */ -"Default calendar :" = "Standardkalender"; +"Default calendar" ="Standardkalender"; "selectedCalendar" = "Gewählter Kalender"; "personalCalendar" = "Persönlicher Kalender"; "firstCalendar" = "Erster eingeschalteter Kalender"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Nachrichten nach Thema sortieren"; "When sending mail, add unknown recipients to my" = "Unbekannte Empfänger meiner E-Mails hinzufügen zu"; -"Forward messages:" = "Nachrichten weiterleiten:"; +"Forward messages" = "Nachrichten weiterleiten"; "messageforward_inline" = "Eingebunden"; "messageforward_attached" = "Als Anhang"; -"When replying to a message:" = "Wenn auf eine Nachricht geantwortet wird: "; +"When replying to a message" = "Wenn auf eine Nachricht geantwortet wird "; "replyplacement_above" = "Antwort oberhalb des Zitates beginnen"; "replyplacement_below" = "Antwort unterhalb des Zitates beginnen"; "And place my signature" = "Und setze meine Signatur"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Neues E-Mail-Konto"; -"Server Name:" = "Servername:"; -"Port:" = "Port:"; -"Encryption:" = "Verschlüsselung:"; +"Server Name" = "Servername"; +"Port" = "Port"; +"Encryption" = "Verschlüsselung"; "None" = "Keine"; -"User Name:" = "Benutzername:"; -"Password:" = "Passwort:"; +"User Name" = "Benutzername"; +"Password" = "Passwort"; -"Full Name:" = "Name:"; -"Email:" = "E-Mail-Adresse:"; -"Reply To Email:" = "\"Antworten An\" E-Mail-Adresse (Reply-To):"; -"Signature:" = "Signatur:"; +"Full Name" = "Name"; +"Email" = "E-Mail-Adresse"; +"Reply To Email" = "\"Antworten An\" E-Mail-Adresse (Reply-To)"; +"Signature" = "Signatur"; "(Click to create)" = "(Zum Erstellen klicken)"; "Signature" = "Signatur"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Zusätzliche Einstellungen"; /* password */ -"New password:" = "Neues Passwort:"; -"Confirmation:" = "Bestätigung:"; +"New password" = "Neues Passwort"; +"Confirmation" = "Bestätigung"; "Change" = "Ändern"; /* Event+task classifications */ -"Default events classification :" = "Standard Einstufung Termine:"; -"Default tasks classification :" = "Standard Einstufung Aufgaben:"; +"Default events classification" ="Standard Einstufung Termine"; +"Default tasks classification" ="Standard Einstufung Aufgaben"; "PUBLIC_item" = "Öffentlich"; "CONFIDENTIAL_item" = "Vertraulich"; "PRIVATE_item" = "Privat"; @@ -210,14 +210,15 @@ "Contacts" = "Adressbuch"; "Mail" = "E-Mail"; "Last" = "Zuletzt benutztes"; -"Default Module :" = "Standard Modul:"; -"SOGo Version :" = "SOGo Version:"; +"Default Module " = "Standard Modul"; +"SOGo Version" ="SOGo Version"; -"Language :" = "Sprache:"; +"Language" ="Sprache"; "choose" = "Auswählen ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Ansicht aktualisieren:"; +"Refresh View" ="Ansicht aktualisieren"; "refreshview_manually" = "Manuell"; "refreshview_every_minute" = "Minütlich"; "refreshview_every_2_minutes" = "Alle 2 Minuten"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Stündlich"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte:"; +"When I receive a request for a return receipt" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte"; "Never send a return receipt" = "Niemals eine Bestätigung senden"; "Allow return receipts for some messages" = "Erlaube eine Bestätigung für einige Nachrichten"; -"If I'm not in the To or Cc of the message:" = "Wenn ich nicht in An oder CC der Nachricht bin:"; -"If the sender is outside my domain:" = "Wenn der Absender außerhalb meiner Domain ist:"; -"In all other cases:" = "In allen anderen Fällen:"; +"If I'm not in the To or Cc of the message" = "Wenn ich nicht in An oder CC der Nachricht bin"; +"If the sender is outside my domain" = "Wenn der Absender außerhalb meiner Domain ist"; +"In all other cases" = "In allen anderen Fällen"; "Never send" = "Niemals senden"; "Always send" = "Immer senden"; diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index 367362e67..ce7ae70e6 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Automatikus távollét üzenet engedélyezése"; -"Auto reply message :" = "Automatikus válasz minden feladónak csak egy alkalommal :"; -"Email addresses (separated by commas) :" = "Email címek (vesszővel elválasztva)"; +"Auto reply message" ="Automatikus válasz minden feladónak csak egy alkalommal"; +"Email addresses (separated by commas)" ="Email címek (vesszővel elválasztva)"; "Add default email addresses" = "Saját email címek hozzáadása"; -"Days between responses :" = "Válaszok közötti napok száma:"; +"Days between responses" ="Válaszok közötti napok száma"; "Do not send responses to mailing lists" = "Levelező listákra válasz mellőzése"; "Disable auto reply on" = "Automatikus válasz tiltása"; "Always send vacation message response" = "Mindig küldjön távollét üzenet választ"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Időzóna :"; -"Short Date Format :" = "Rövid dátumformátum :"; -"Long Date Format :" = "Hosszú dátumformátum :"; -"Time Format :" = "Időformátum :"; +"Current Time Zone" ="Időzóna"; +"Short Date Format" ="Rövid dátumformátum"; +"Long Date Format" ="Hosszú dátumformátum"; +"Time Format" ="Időformátum"; "default" = "Alapértelmezett"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Hét kezdőnapja:"; -"Day start time :" = "Nap kezdete:"; -"Day end time :" = "Nap vége:"; +"Week begins on" ="Hét kezdőnapja"; +"Day start time" ="Nap kezdete"; +"Day end time" ="Nap vége"; "Day start time must be prior to day end time." = "A kezdőnap nem lehet későbbi, mint a befejező nap."; "Show time as busy outside working hours" = "A munkaidőn túli időszakokra foglaltság jelzése"; -"First week of year :" = "Év első hete:"; +"First week of year" ="Év első hete"; "Enable reminders for Calendar items" = "Emlékeztető engedélyezése a naptárbejegyzésekhez"; "Play a sound when a reminder comes due" = "Hang lejátszása az emlékeztetőhöz"; -"Default reminder :" = "Alapértelmezett emlékeztető:"; +"Default reminder" ="Alapértelmezett emlékeztető"; "firstWeekOfYear_January1" = "Január 1-jétől"; "firstWeekOfYear_First4DayWeek" = "Első 4 napos héttől"; "firstWeekOfYear_FirstFullWeek" = "Első teljes héttől"; "Prevent from being invited to appointments" = "Megakadályozza a meghívást találkozókra"; -"White list for appointment invitations:" = "Engedélyezési lista a találkozók meghívásaihoz:"; +"White list for appointment invitations" = "Engedélyezési lista a találkozók meghívásaihoz"; "Contacts Names" = "Kapcsolatok nevei"; /* Default Calendar */ -"Default calendar :" = "Alapértelmezett naptár"; +"Default calendar" ="Alapértelmezett naptár"; "selectedCalendar" = "Kiválasztott naptár"; "personalCalendar" = "Személyes naptár"; "firstCalendar" = "Első engedélyezett naptár"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Üzenetek beszélgetések szerinti rendezése "; "When sending mail, add unknown recipients to my" = "Levél küldésekor az ismeretlen címeket adja hozzá a következőhöz"; -"Forward messages:" = "Üzenetek továbbítása:"; +"Forward messages" = "Üzenetek továbbítása"; "messageforward_inline" = "Levélként"; "messageforward_attached" = "Mellékletként"; -"When replying to a message:" = "Amikor válaszol egy üzenetre:"; +"When replying to a message" = "Amikor válaszol egy üzenetre"; "replyplacement_above" = "Válasz elhelyezése az idézet fölött"; "replyplacement_below" = "Válasz elhelyezése az idézet alatt"; "And place my signature" = "Aláírás beszúrása"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Új email fiók"; -"Server Name:" = "Kiszolgáló neve:"; -"Port:" = "Port:"; -"Encryption:" = "Titkosítás:"; +"Server Name" = "Kiszolgáló neve"; +"Port" = "Port"; +"Encryption" = "Titkosítás"; "None" = "Nincs"; -"User Name:" = "Felhasználónév:"; -"Password:" = "Jelszó:"; +"User Name" = "Felhasználónév"; +"Password" = "Jelszó"; -"Full Name:" = "Teljes név:"; -"Email:" = "Email cím:"; -"Reply To Email:" = "Válaszlevél"; -"Signature:" = "Aláírás:"; +"Full Name" = "Teljes név"; +"Email" = "Email cím"; +"Reply To Email" = "Válaszlevél"; +"Signature" = "Aláírás"; "(Click to create)" = "(A létrehozáshoz kattintson ide)"; "Signature" = "Aláírás"; @@ -190,13 +190,13 @@ "Additional Parameters" = "További beállítások"; /* password */ -"New password:" = "Új jelszó:"; -"Confirmation:" = "Megerősítés:"; +"New password" = "Új jelszó"; +"Confirmation" = "Megerősítés"; "Change" = "Megváltoztat"; /* Event+task classifications */ -"Default events classification :" = "Az események alapértelmezett besorolása:"; -"Default tasks classification :" = "Alapértelmezett feladat besorolás"; +"Default events classification" ="Az események alapértelmezett besorolása"; +"Default tasks classification" ="Alapértelmezett feladat besorolás"; "PUBLIC_item" = "Nyilvános"; "CONFIDENTIAL_item" = "Bizalmas"; "PRIVATE_item" = "Magán"; @@ -210,14 +210,15 @@ "Contacts" = "Címjegyzék"; "Mail" = "Levél"; "Last" = "Utoljára használt"; -"Default Module :" = "Alapértelmezett modul"; -"SOGo Version :" = "SOGo verzió:"; +"Default Module " = "Alapértelmezett modul"; +"SOGo Version" ="SOGo verzió"; -"Language :" = "Nyelv :"; +"Language" ="Nyelv"; "choose" = "Válasszon ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -240,7 +241,7 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Nézet frissítés:"; +"Refresh View" ="Nézet frissítés"; "refreshview_manually" = "Kézi"; "refreshview_every_minute" = "Percenként"; "refreshview_every_2_minutes" = "Kétpercenként"; @@ -251,12 +252,12 @@ "refreshview_once_per_hour" = "Óránként"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Visszaigazolási kérelem esetén:"; +"When I receive a request for a return receipt" = "Visszaigazolási kérelem esetén"; "Never send a return receipt" = "Soha ne küldjön visszaigazolást"; "Allow return receipts for some messages" = "Egyes üzenetek esetén visszaigazolás küldésének engedélyezése"; -"If I'm not in the To or Cc of the message:" = "Amennyiben nem szereplek a címzett vagy másolat mezőben:"; -"If the sender is outside my domain:" = "Amennyiben a feladó külső (más domain):"; -"In all other cases:" = "Minden egyéb esetben:"; +"If I'm not in the To or Cc of the message" = "Amennyiben nem szereplek a címzett vagy másolat mezőben"; +"If the sender is outside my domain" = "Amennyiben a feladó külső (más domain)"; +"In all other cases" = "Minden egyéb esetben"; "Never send" = "Küldés mellőzése mindig"; "Always send" = "Küldés minden esetben"; diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings index 4e9808cd2..05088a434 100644 --- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Virkja sjálfvirkt svar í fríi"; -"Auto reply message :" = "Skilaboð fyrir sjálfvirkt svar :"; -"Email addresses (separated by commas) :" = "Netföng (aðgreind með kommu) :"; +"Auto reply message" ="Skilaboð fyrir sjálfvirkt svar"; +"Email addresses (separated by commas)" ="Netföng (aðgreind með kommu)"; "Add default email addresses" = "Bæta við sjálfgefnu netfangi"; -"Days between responses :" = "Dagar milli svara :"; +"Days between responses" ="Dagar milli svara"; "Do not send responses to mailing lists" = "Ekki senda svör til póstlista"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Hér þarf að skrá skilaboðin og netfangið til að virkja sjálfvirkt svar."; @@ -37,10 +37,10 @@ = "Hér þarf að skrá netfangið sem ný skilaboð eiga að áframsendast á"; /* d & t */ -"Current Time Zone :" = "Núverandi tímabelti :"; -"Short Date Format :" = "Stutt dagsetningarform :"; -"Long Date Format :" = "Löng dagsetning :"; -"Time Format :" = "Tímasnið :"; +"Current Time Zone" ="Núverandi tímabelti"; +"Short Date Format" ="Stutt dagsetningarform"; +"Long Date Format" ="Löng dagsetning"; +"Time Format" ="Tímasnið"; "default" = "Sjálfgefið"; @@ -78,15 +78,15 @@ "timeFmt_2" = ""; /* calendar */ -"Week begins on :" = "Vikan byrjar á :"; -"Day start time :" = "Degi lýkur kl. :"; -"Day end time :" = "Dagur hefst kl. :"; -"Day start time must be prior to day end time." = "Tími þegar dagur hefst, þarf að vera fyrir þann tíma sem degi lýkur. "; -"First week of year :" = "Fyrsta vika árs :"; +"Week begins on" ="Vikan byrjar á"; +"Day start time" ="Degi lýkur kl."; +"Day end time" ="Dagur hefst kl."; +"Day start time must be prior to day end time." = "Tími þegar dagur hefst, þarf að vera fyrir þann tíma sem degi lýkur."; +"First week of year" ="Fyrsta vika árs"; "Enable reminders for Calendar items" = "Virkja áminningar fyrir hluti í dagatali"; "Play a sound when a reminder comes due" = "Spila hljóð við áminningu"; -"Default reminder :" = "Sjálfgefin áminning :"; +"Default reminder" ="Sjálfgefin áminning"; "firstWeekOfYear_January1" = "Byrjar 1. janúar"; "firstWeekOfYear_First4DayWeek" = "Fyrstu 4 dagar viku"; @@ -116,7 +116,7 @@ "refreshview_every_30_minutes" = "Hverjar 30 mínútur"; "refreshview_once_per_hour" = "Á klukkustundar fresti"; -"Forward messages:" = "Áframsenda póst:"; +"Forward messages" = "Áframsenda póst"; "messageforward_inline" = "Innfellt"; "messageforward_attached" = "Sem viðhengi"; @@ -132,14 +132,14 @@ /* IMAP Accounts */ "New Mail Account" = "Ný uppsetning á pósti"; -"Server Name:" = "Nafn netþjóns:"; -"Port:" = "Gátt:"; -"User Name:" = "Notandanafn:"; -"Password:" = "Lykilorð:"; +"Server Name" = "Nafn netþjóns"; +"Port" = "Gátt"; +"User Name" = "Notandanafn"; +"Password" = "Lykilorð"; -"Full Name:" = "Fullt nafn :"; -"Email:" = "Tölvupóstfang:"; -"Signature:" = "Undirritun:"; +"Full Name" = "Fullt nafn "; +"Email" = "Tölvupóstfang"; +"Signature" = "Undirritun"; "(Click to create)" = "(Smella til að búa til)"; "Signature" = "Undirritun"; @@ -149,13 +149,13 @@ "Additional Parameters" = "Fleiri færibreytur"; /* password */ -"New password:" = "Nýtt lykilorð:"; -"Confirmation:" = "Staðfesting:"; +"New password" = "Nýtt lykilorð"; +"Confirmation" = "Staðfesting"; "Change" = "Breyta"; /* Event+task classifications */ -"Default events classification :" = "Default events classification :"; -"Default tasks classification :" = "Default tasks classification :"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -169,13 +169,14 @@ "Contacts" = "Nafnaskrá"; "Mail" = "Póstur"; "Last" = "Síðast notað"; -"Default Module :" = "Sjálfgefið viðmót :"; +"Default Module " = "Sjálfgefið viðmót "; -"Language :" = "Tungumál :"; +"Language" ="Tungumál"; "choose" = "Velja..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -192,6 +193,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -199,24 +201,24 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Þegar ég móttek beiðni um staðfestingu á lestri:"; +"When I receive a request for a return receipt" = "Þegar ég móttek beiðni um staðfestingu á lestri"; "Never send a return receipt" = "Aldrei senda staðfestingu á lestri"; "Allow return receipts for some messages" = "Leyfa staðfestinu á lestri fyrir suman póst"; -"If I'm not in the To or Cc of the message:" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins:"; -"If the sender is outside my domain:" = "Ef sendandi er fyrir utan mitt lén:"; -"In all other cases:" = "Í öllum öðrum tilfellum:"; +"If I'm not in the To or Cc of the message" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins"; +"If the sender is outside my domain" = "Ef sendandi er fyrir utan mitt lén"; +"In all other cases" = "Í öllum öðrum tilfellum"; "Never send" = "Aldrei senda"; "Always send" = "Senda alltaf"; "Ask me" = "Spyrja mig"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Þegar ég móttek beiðni um staðfestingu á lestri:"; +"When I receive a request for a return receipt" = "Þegar ég móttek beiðni um staðfestingu á lestri"; "Never send a return receipt" = "Aldrei senda staðfestingu á lestri"; "Allow return receipts for some messages" = "Leyfa staðfestinu á lestri fyrir suman póst"; -"If I'm not in the To or Cc of the message:" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins:"; -"If the sender is outside my domain:" = "Ef sendandi er fyrir utan mitt lén:"; -"In all other cases:" = "Í öllum öðrum tilfellum:"; +"If I'm not in the To or Cc of the message" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins"; +"If the sender is outside my domain" = "Ef sendandi er fyrir utan mitt lén"; +"In all other cases" = "Í öllum öðrum tilfellum"; "Never send" = "Aldrei senda"; "Always send" = "Senda alltaf"; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index 630154439..0df2c568a 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Abilita il risponditore automatico"; -"Auto reply message :" = "Rispondi automaticamente solo una volta ad ogni mittente usando questo testo:"; -"Email addresses (separated by commas) :" = "Indirizzi email (separati da virgole) :"; +"Auto reply message" ="Rispondi automaticamente solo una volta ad ogni mittente usando questo testo"; +"Email addresses (separated by commas)" ="Indirizzi email (separati da virgole)"; "Add default email addresses" = "Aggiungi gli indirizzi email"; -"Days between responses :" = "Numero giorni tra le risposte :"; +"Days between responses" ="Numero giorni tra le risposte"; "Do not send responses to mailing lists" = "Non mandare risposte alle mailing list"; "Disable auto reply on" = "Disabilita il risponditore automatico"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "Prego specificare l'indirizzo verso quale inoltrare i messaggi."; /* d & t */ -"Current Time Zone :" = "Fuso orario:"; -"Short Date Format :" = "Data breve:"; -"Long Date Format :" = "Data estesa:"; -"Time Format :" = "Formato ora:"; +"Current Time Zone" ="Fuso orario"; +"Short Date Format" ="Data breve"; +"Long Date Format" ="Data estesa"; +"Time Format" ="Formato ora"; "default" = "Default"; @@ -90,23 +90,23 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "La settimana inizia il:"; -"Day start time :" = "La giornata lavorativa inizia alle ore:"; -"Day end time :" = "La giornata lavorativa termina alle ore:"; +"Week begins on" ="La settimana inizia il"; +"Day start time" ="La giornata lavorativa inizia alle ore"; +"Day end time" ="La giornata lavorativa termina alle ore"; "Day start time must be prior to day end time." = "Il giorno di inizio deve essere precedente alla giorno di fine."; "Show time as busy outside working hours" = "Mostra come occupato il tempo fuori dalle ore lavorative"; -"First week of year :" = "Prima settimana dell'anno:"; +"First week of year" ="Prima settimana dell'anno"; "Enable reminders for Calendar items" = "Abilita promemoria per gli eventi del Calendario"; "Play a sound when a reminder comes due" = "Riproduci un suono quando un promemoria è attivo"; -"Default reminder :" = "Promemoria predefinito:"; +"Default reminder" ="Promemoria predefinito"; "firstWeekOfYear_January1" = "Inizia l'1 gennaio"; "firstWeekOfYear_First4DayWeek" = "Prima settimana di 4 giorni"; "firstWeekOfYear_FirstFullWeek" = "Prima settimana completa"; /* Default Calendar */ -"Default calendar :" = "Calendario di default"; +"Default calendar" ="Calendario di default"; "selectedCalendar" = "Calendario selezionato"; "personalCalendar" = "Calendario personale"; "firstCalendar" = "Primo calendario abilitato"; @@ -136,7 +136,7 @@ "refreshview_every_30_minutes" = "Ogni 30 minuti"; "refreshview_once_per_hour" = "Ogni ora"; -"Forward messages:" = "Inoltra messaggi come:"; +"Forward messages" = "Inoltra messaggi come"; "messageforward_inline" = "Parte del messaggio"; "messageforward_attached" = "Allegato"; @@ -152,15 +152,15 @@ /* IMAP Accounts */ "New Mail Account" = "Nuovo account mail"; -"Server Name:" = "Nome del server:"; -"Port:" = "Porta:"; -"User Name:" = "Nome utente:"; -"Password:" = "Password:"; +"Server Name" = "Nome del server"; +"Port" = "Porta"; +"User Name" = "Nome utente"; +"Password" = "Password"; -"Full Name:" = "Nome completo:"; -"Email:" = "Email"; -"Reply To Email:" = "Rispondi all'email:"; -"Signature:" = "Firma:"; +"Full Name" = "Nome completo"; +"Email" = "Email"; +"Reply To Email" = "Rispondi all'email"; +"Signature" = "Firma"; "(Click to create)" = "(Clicca per creare)"; "Signature" = "Firma"; @@ -170,13 +170,13 @@ "Additional Parameters" = "Parametri addizionali"; /* password */ -"New password:" = "Nuova password:"; -"Confirmation:" = "Ripeti nuova password:"; +"New password" = "Nuova password"; +"Confirmation" = "Ripeti nuova password"; "Change" = "Cambia Password"; /* Event+task classifications */ -"Default events classification :" = "Classificazioni degli eventi di default:"; -"Default tasks classification :" = "Classificazione di default delle attività:"; +"Default events classification" ="Classificazioni degli eventi di default"; +"Default tasks classification" ="Classificazione di default delle attività"; "PUBLIC_item" = "Pubblico"; "CONFIDENTIAL_item" = "Confidenziale"; "PRIVATE_item" = "Privato"; @@ -190,13 +190,14 @@ "Contacts" = "Rubrica"; "Mail" = "Posta"; "Last" = "Ultimo usato"; -"Default Module :" = "Modulo di default :"; +"Default Module " = "Modulo di default "; -"Language :" = "Lingua :"; +"Language" ="Lingua"; "choose" = "Scegli..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -213,6 +214,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -220,12 +222,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Quando ricevo una richiesta di notifica di lettura:"; +"When I receive a request for a return receipt" = "Quando ricevo una richiesta di notifica di lettura"; "Never send a return receipt" = "Non inviare mail una notifica di lettura"; "Allow return receipts for some messages" = "Permetti la notifica di lettura per alcuni messaggi"; -"If I'm not in the To or Cc of the message:" = "Se non sono presente nel campo To e Cc del messaggio:"; -"If the sender is outside my domain:" = "Se il mittente ha un dominio diverso dal mio:"; -"In all other cases:" = "In tutti gli altri casi:"; +"If I'm not in the To or Cc of the message" = "Se non sono presente nel campo To e Cc del messaggio"; +"If the sender is outside my domain" = "Se il mittente ha un dominio diverso dal mio"; +"In all other cases" = "In tutti gli altri casi"; "Never send" = "Non inviare mai"; "Always send" = "Invia sempre"; diff --git a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings index 4b4a0c91b..6cec64783 100644 --- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Aktiver auto-svar ved fravær"; -"Auto reply message :" = "Auto-svar melding:"; -"Email addresses (separated by commas) :" = "E-postadresser (separert med komma):"; +"Auto reply message" ="Auto-svar melding"; +"Email addresses (separated by commas)" ="E-postadresser (separert med komma)"; "Add default email addresses" = "Legg til standard e-postadresser"; -"Days between responses :" = "Dager mellom svar:"; +"Days between responses" ="Dager mellom svar"; "Do not send responses to mailing lists" = "Ikke send svar til e-postlister"; "Disable auto reply on" = "Skru av auto-svar"; "Always send vacation message response" = "Alltid send ferie melding"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Gjeldende tidssone:"; -"Short Date Format :" = "Kort datoformat:"; -"Long Date Format :" = "Langt datoformat:"; -"Time Format :" = "Tidsformat:"; +"Current Time Zone" ="Gjeldende tidssone"; +"Short Date Format" ="Kort datoformat"; +"Long Date Format" ="Langt datoformat"; +"Time Format" ="Tidsformat"; "default" = "Standard"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Uken begynner med:"; -"Day start time :" = "Dagen begynner kl.:"; -"Day end time :" = "Dagen slutter kl.:"; +"Week begins on" ="Uken begynner med"; +"Day start time" ="Dagen begynner kl."; +"Day end time" ="Dagen slutter kl."; "Day start time must be prior to day end time." = "Dagens starttid må være før dagens sluttid."; "Show time as busy outside working hours" = "Vis tid som opptatt utenfor arbeidstid"; -"First week of year :" = "Første uken i året:"; +"First week of year" ="Første uken i året"; "Enable reminders for Calendar items" = "Aktivere påminnelser for kalenderelementer"; "Play a sound when a reminder comes due" = "Avspill lyd ved en påminnelse"; -"Default reminder :" = "Standardpåminnelse:"; +"Default reminder" ="Standardpåminnelse"; "firstWeekOfYear_January1" = "Begynner den 1. januar"; "firstWeekOfYear_First4DayWeek" = "Første firedagersuken i året"; "firstWeekOfYear_FirstFullWeek" = "Første hele uken i året"; "Prevent from being invited to appointments" = "Hindre fra å bli invitert til avtaler"; -"White list for appointment invitations:" = "Hviteliste for avtale invitasjoner:"; +"White list for appointment invitations" = "Hviteliste for avtale invitasjoner"; "Contacts Names" = "Kontakters navn"; /* Default Calendar */ -"Default calendar :" = "Standard kalender:"; +"Default calendar" ="Standard kalender"; "selectedCalendar" = "Valgte kalender"; "personalCalendar" = "Personlig kalender"; "firstCalendar" = "Første aktiverte kalender"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Sorter meldinger etter tråder"; "When sending mail, add unknown recipients to my" = "Ved sending av mail, legg til ukjente mottakere til min"; -"Forward messages:" = "Videresend meldinger:"; +"Forward messages" = "Videresend meldinger"; "messageforward_inline" = "Innsatt"; "messageforward_attached" = "Som Vedlegg"; -"When replying to a message:" = "Ved svar på melding: "; +"When replying to a message" = "Ved svar på melding "; "replyplacement_above" = "Start svaret ovenfor"; "replyplacement_below" = "Start svaret under"; "And place my signature" = "Legg til min signatur"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Ny e-postkonto"; -"Server Name:" = "Servernavn:"; -"Port:" = "Port:"; -"Encryption:" = "Kryptering:"; +"Server Name" = "Servernavn"; +"Port" = "Port"; +"Encryption" = "Kryptering"; "None" = "Ingen"; -"User Name:" = "Brukernavn:"; -"Password:" = "Passord:"; +"User Name" = "Brukernavn"; +"Password" = "Passord"; -"Full Name:" = "Fullt navn:"; -"Email:" = "E-post:"; -"Reply To Email:" = "Svar til e-post:"; -"Signature:" = "Signatur:"; +"Full Name" = "Fullt navn"; +"Email" = "E-post"; +"Reply To Email" = "Svar til e-post"; +"Signature" = "Signatur"; "(Click to create)" = "(Klikk for å opprette)"; "Signature" = "Signatur"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Øvrige parametre"; /* password */ -"New password:" = "Nytt passord:"; -"Confirmation:" = "Bekreft:"; +"New password" = "Nytt passord"; +"Confirmation" = "Bekreft"; "Change" = "Endre"; /* Event+task classifications */ -"Default events classification :" = "Standard hendelsesklassifikasjon:"; -"Default tasks classification :" = "Standard oppgaveklassifisering"; +"Default events classification" ="Standard hendelsesklassifikasjon"; +"Default tasks classification" ="Standard oppgaveklassifisering"; "PUBLIC_item" = "Offentlig"; "CONFIDENTIAL_item" = "Konfidensiell"; "PRIVATE_item" = "Privat"; @@ -210,14 +210,15 @@ "Contacts" = "Adressebok"; "Mail" = "E-post"; "Last" = "Sist besøkt"; -"Default Module :" = "Standardmodul:"; -"SOGo Version :" = "SOGo versjon:"; +"Default Module " = "Standardmodul"; +"SOGo Version" ="SOGo versjon"; -"Language :" = "Språk:"; +"Language" ="Språk"; "choose" = "Velg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -240,7 +241,7 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Oppdater Visning:"; +"Refresh View" ="Oppdater Visning"; "refreshview_manually" = "Manuelt"; "refreshview_every_minute" = "Hvert minutt"; "refreshview_every_2_minutes" = "Hvert 2. minutt"; @@ -251,12 +252,12 @@ "refreshview_once_per_hour" = "Hver time"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:"; +"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering"; "Never send a return receipt" = "Send aldri en returkvittering"; "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger"; -"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til- eller Cc-feltet i meldingen:"; -"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:"; -"In all other cases:" = "I alle andre tilfeller:"; +"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til- eller Cc-feltet i meldingen"; +"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene"; +"In all other cases" = "I alle andre tilfeller"; "Never send" = "Aldri send"; "Always send" = "Alltid send"; diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings index 839c7adce..e1d9bae0e 100644 --- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Aktiver auto-svar ved fravær"; -"Auto reply message :" = "Auto-svar melding:"; -"Email addresses (separated by commas) :" = "E-postadresser (separert med komma):"; +"Auto reply message" ="Auto-svar melding"; +"Email addresses (separated by commas)" ="E-postadresser (separert med komma)"; "Add default email addresses" = "Legg til standard e-postadresser"; -"Days between responses :" = "Dager mellom svar:"; +"Days between responses" ="Dager mellom svar"; "Do not send responses to mailing lists" = "Ikke send svar til e-postlister"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Skriv melding og angi din e-postadresse som du vil aktivera auto-svar på."; @@ -37,10 +37,10 @@ = "Angi adressen du vil videresende dine meldinger til."; /* d & t */ -"Current Time Zone :" = "Gjeldende tidssone:"; -"Short Date Format :" = "Kort datoformat:"; -"Long Date Format :" = "Langt datoformat:"; -"Time Format :" = "Tidsformat:"; +"Current Time Zone" ="Gjeldende tidssone"; +"Short Date Format" ="Kort datoformat"; +"Long Date Format" ="Langt datoformat"; +"Time Format" ="Tidsformat"; "default" = "Standard"; @@ -78,22 +78,22 @@ "timeFmt_2" = ""; /* calendar */ -"Week begins on :" = "Uken begynner med:"; -"Day start time :" = "Dagen begynner kl.:"; -"Day end time :" = "Dagen slutter kl.:"; +"Week begins on" ="Uken begynner med"; +"Day start time" ="Dagen begynner kl."; +"Day end time" ="Dagen slutter kl."; "Day start time must be prior to day end time." = "Dagens starttid må være før dagens sluttid."; -"First week of year :" = "Første uken i året:"; +"First week of year" ="Første uken i året"; "Enable reminders for Calendar items" = "Aktivere påminnelser for kalenderelementer"; "Play a sound when a reminder comes due" = "Avspill lyd ved en påminnelse"; -"Default reminder :" = "Standardpåminnelse:"; +"Default reminder" ="Standardpåminnelse"; "firstWeekOfYear_January1" = "Begynner den 1. januar"; "firstWeekOfYear_First4DayWeek" = "Første 4-dagersuken i året"; "firstWeekOfYear_FirstFullWeek" = "Første hele uken i året"; /* Default Calendar */ -"Default calendar :" = "Default calendar"; +"Default calendar" ="Default calendar"; "selectedCalendar" = "Selected calendar"; "personalCalendar" = "Personal calendar"; "firstCalendar" = "First enabled calendar"; @@ -123,7 +123,7 @@ "refreshview_every_30_minutes" = "Hvert 30 minutt"; "refreshview_once_per_hour" = "Hver time"; -"Forward messages:" = "Videresend melding:"; +"Forward messages" = "Videresend melding"; "messageforward_inline" = "Innsatt"; "messageforward_attached" = "Vedlegg"; @@ -139,14 +139,14 @@ /* IMAP Accounts */ "New Mail Account" = "Ny epostkonto"; -"Server Name:" = "Servernavn:"; -"Port:" = "Port:"; -"User Name:" = "Brukernavn:"; -"Password:" = "Passord:"; +"Server Name" = "Servernavn"; +"Port" = "Port"; +"User Name" = "Brukernavn"; +"Password" = "Passord"; -"Full Name:" = "Fullt Navn:"; -"Email:" = "E-post:"; -"Signature:" = "Signatur:"; +"Full Name" = "Fullt Navn"; +"Email" = "E-post"; +"Signature" = "Signatur"; "(Click to create)" = "(Klikk for å opprette)"; "Signature" = "Signatur"; @@ -156,13 +156,13 @@ "Additional Parameters" = "Øvrige parametre"; /* password */ -"New password:" = "Nytt passord:"; -"Confirmation:" = "Bekreft:"; +"New password" = "Nytt passord"; +"Confirmation" = "Bekreft"; "Change" = "Endre"; /* Event+task classifications */ -"Default events classification :" = "Default events classification :"; -"Default tasks classification :" = "Default tasks classification :"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -176,13 +176,14 @@ "Contacts" = "Adressebok"; "Mail" = "E-post"; "Last" = "Sist besøkt"; -"Default Module :" = "Standardmodul:"; +"Default Module " = "Standardmodul"; -"Language :" = "Språk:"; +"Language" ="Språk"; "choose" = "Velg ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -199,6 +200,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -206,24 +208,24 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:"; +"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering"; "Never send a return receipt" = "Send aldri en returkvittering"; "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger"; -"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen:"; -"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:"; -"In all other cases:" = "I alle andre tilfeller:"; +"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen"; +"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene"; +"In all other cases" = "I alle andre tilfeller"; "Never send" = "Send aldri"; "Always send" = "Send alltid"; "Ask me" = "Spør meg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:"; +"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering"; "Never send a return receipt" = "Send aldri en returkvittering"; "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger"; -"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen:"; -"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:"; -"In all other cases:" = "I alle andre tilfeller:"; +"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen"; +"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene"; +"In all other cases" = "I alle andre tilfeller"; "Never send" = "Send aldri"; "Always send" = "Send alltid"; @@ -294,5 +296,5 @@ "Unhandled error response" = "Erreur inconnue"; "Password change is not supported." = "Changement de mot de passe non-supporté."; "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}"; -"New password:" = "Nytt passord:"; -"Confirmation:" = "Bekreft:"; \ No newline at end of file +"New password" = "Nytt passord"; +"Confirmation" = "Bekreft"; diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings index 7fab8b4e8..db83009b2 100644 --- a/UI/PreferencesUI/Polish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Włącz autoodpowiedź podczas nieobecności"; -"Auto reply message :" = "Treść autoodpowiedzi :"; -"Email addresses (separated by commas) :" = "Adresy e-mail (oddzielone przecinkami) :"; +"Auto reply message" ="Treść autoodpowiedzi"; +"Email addresses (separated by commas)" ="Adresy e-mail (oddzielone przecinkami)"; "Add default email addresses" = "Dodaj domyślne adresy e-mail"; -"Days between responses :" = "Dni pomiędzy odpowiedziami :"; +"Days between responses" ="Dni pomiędzy odpowiedziami"; "Do not send responses to mailing lists" = "Nie wysyłaj odpowiedzi do grup pocztowych"; "Disable auto reply on" = "Zablokuj autoodpowiedź w"; "Always send vacation message response" = "Zawsze wysyłaj autoodpowiedź"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Bieżąca strefa czasowa :"; -"Short Date Format :" = "Krótki format daty :"; -"Long Date Format :" = "Długi format daty :"; -"Time Format :" = "Format czasu :"; +"Current Time Zone" ="Bieżąca strefa czasowa"; +"Short Date Format" ="Krótki format daty"; +"Long Date Format" ="Długi format daty"; +"Time Format" ="Format czasu"; "default" = "Domyślne"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Pierwszy dzień tygodnia :"; -"Day start time :" = "Początek dnia :"; -"Day end time :" = "Koniec dnia :"; +"Week begins on" ="Pierwszy dzień tygodnia"; +"Day start time" ="Początek dnia"; +"Day end time" ="Koniec dnia"; "Day start time must be prior to day end time." = "Początek dnia musi wypadać wcześniej niż koniec dnia."; "Show time as busy outside working hours" = "Pokaż czas poza godzinami pracy jako zajęty"; -"First week of year :" = "Pierwszy tydzień roku :"; +"First week of year" ="Pierwszy tydzień roku"; "Enable reminders for Calendar items" = "Włącz przypomnienia pozycji kalendarza"; "Play a sound when a reminder comes due" = "Odtwórz dźwięk w momencie przypomnienia"; -"Default reminder :" = "Domyślne przypomnienie :"; +"Default reminder" ="Domyślne przypomnienie"; "firstWeekOfYear_January1" = "rozpoczyna się 1 stycznia"; "firstWeekOfYear_First4DayWeek" = "pierwszy 4-dniowy tydzień"; "firstWeekOfYear_FirstFullWeek" = "pierwszy pełny tydzień"; "Prevent from being invited to appointments" = "Zablokuj możliwość zapraszania cię na wydarzenia"; -"White list for appointment invitations:" = "Osoby, którym pozwalasz się zapraszać:"; +"White list for appointment invitations" = "Osoby, którym pozwalasz się zapraszać"; "Contacts Names" = "Nazwy kontaktów"; /* Default Calendar */ -"Default calendar :" = "Domyślny kalendarz:"; +"Default calendar" ="Domyślny kalendarz"; "selectedCalendar" = "Wybrany kalendarz"; "personalCalendar" = "Kalendarz osobisty"; "firstCalendar" = "Pierwszy kalendarz"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Sortuj wiadomości według wątków"; "When sending mail, add unknown recipients to my" = "Gdy wysyłam e-mail, dodaj adresy nowych odbiorców do"; -"Forward messages:" = "Przekaż wiadomości:"; +"Forward messages" = "Przekaż wiadomości"; "messageforward_inline" = "w treści"; "messageforward_attached" = "jako załącznik"; -"When replying to a message:" = "Gdy odpowiadam na wiadomość:"; +"When replying to a message" = "Gdy odpowiadam na wiadomość"; "replyplacement_above" = "Rozpocznij moją odpowiedź powyżej cytatu"; "replyplacement_below" = "Rozpocznij moją odpowiedź poniżej cytatu"; "And place my signature" = "i wstaw mój podpis"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nowe konto"; -"Server Name:" = "Nazwa serwera:"; -"Port:" = "Port:"; -"Encryption:" = "Szyfrowanie:"; +"Server Name" = "Nazwa serwera"; +"Port" = "Port"; +"Encryption" = "Szyfrowanie"; "None" = "Brak"; -"User Name:" = "Użytkownik:"; -"Password:" = "Hasło:"; +"User Name" = "Użytkownik"; +"Password" = "Hasło"; -"Full Name:" = "Imię i nazwisko:"; -"Email:" = "E-mail:"; -"Reply To Email:" = "Odpowiedź do:"; -"Signature:" = "Sygnatura:"; +"Full Name" = "Imię i nazwisko"; +"Email" = "E-mail"; +"Reply To Email" = "Odpowiedź do"; +"Signature" = "Sygnatura"; "(Click to create)" = "(Kliknij by stworzyć)"; "Signature" = "Podpis"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Dodatkowe parametry"; /* password */ -"New password:" = "Nowe hasło:"; -"Confirmation:" = "Potwierdzenie:"; +"New password" = "Nowe hasło"; +"Confirmation" = "Potwierdzenie"; "Change" = "Zmiana"; /* Event+task classifications */ -"Default events classification :" = "Domyślna klasyfikacja zdarzeń:"; -"Default tasks classification :" = "Domyślna klasyfikacja zadań:"; +"Default events classification" ="Domyślna klasyfikacja zdarzeń"; +"Default tasks classification" ="Domyślna klasyfikacja zadań"; "PUBLIC_item" = "Publiczny"; "CONFIDENTIAL_item" = "Poufny"; "PRIVATE_item" = "Prywatny"; @@ -210,14 +210,15 @@ "Contacts" = "Książka adresowa"; "Mail" = "Poczta"; "Last" = "Ostatnio używane"; -"Default Module :" = "Tryb domyślny:"; -"SOGo Version :" = "Wersja SOGo:"; +"Default Module " = "Tryb domyślny"; +"SOGo Version" ="Wersja SOGo"; -"Language :" = "Język:"; +"Language" ="Język"; "choose" = "Wybierz"; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -240,7 +241,7 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Odświeżanie:"; +"Refresh View" ="Odświeżanie"; "refreshview_manually" = "ręcznie"; "refreshview_every_minute" = "co minutę"; "refreshview_every_2_minutes" = "co 2 minuty"; @@ -251,12 +252,12 @@ "refreshview_once_per_hour" = "raz na godzinę"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Kiedy otrzymam żądanie potwierdzenia odbioru:"; +"When I receive a request for a return receipt" = "Kiedy otrzymam żądanie potwierdzenia odbioru"; "Never send a return receipt" = "Nigdy nie wysyłaj potwierdzenia odbioru"; "Allow return receipts for some messages" = "Pozwól na potwierdzanie odbioru niektórych wiadomości"; -"If I'm not in the To or Cc of the message:" = "Jeśli nie jestem odbiorcą Do lub DW wiadomości:"; -"If the sender is outside my domain:" = "Jeśli nadawca jest spoza mojej domeny:"; -"In all other cases:" = "We wszystkich pozostałych przypadkach:"; +"If I'm not in the To or Cc of the message" = "Jeśli nie jestem odbiorcą Do lub DW wiadomości"; +"If the sender is outside my domain" = "Jeśli nadawca jest spoza mojej domeny"; +"In all other cases" = "We wszystkich pozostałych przypadkach"; "Never send" = "Nigdy nie wysyłaj"; "Always send" = "Zawsze wysyłaj"; diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index 36584850c..73eecd64e 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Включить автоматическую отправку сообщения об отпуске"; -"Auto reply message :" = "Автоматически посылать этот текст каждому отправителю один раз :"; -"Email addresses (separated by commas) :" = "Email адреса (разделенные запятыми) :"; +"Auto reply message" ="Автоматически посылать этот текст каждому отправителю один раз"; +"Email addresses (separated by commas)" ="Email адреса (разделенные запятыми)"; "Add default email addresses" = "Добавить e-mail адреса по умолчанию"; -"Days between responses :" = "Дни между ответами :"; +"Days between responses" ="Дни между ответами"; "Do not send responses to mailing lists" = "Не отправлять ответы на почтовые списки рассылки"; "Disable auto reply on" = "Запрет автоответа включен"; "Always send vacation message response" = "Всегда отправлять ответное сообщение об отпуске"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Текущая временная зона :"; -"Short Date Format :" = "Короткий формат даты :"; -"Long Date Format :" = "Длинный формат даты :"; -"Time Format :" = "Формат времени :"; +"Current Time Zone" ="Текущая временная зона"; +"Short Date Format" ="Короткий формат даты"; +"Long Date Format" ="Длинный формат даты"; +"Time Format" ="Формат времени"; "default" = "Default"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Неделя начинается с:"; -"Day start time :" = "Рабочий день начинается в:"; -"Day end time :" = "Рабочий день заканчивается в :"; +"Week begins on" ="Неделя начинается с"; +"Day start time" ="Рабочий день начинается в"; +"Day end time" ="Рабочий день заканчивается в"; "Day start time must be prior to day end time." = "Время начала дня должно быть перед временем его окончания."; "Show time as busy outside working hours" = "Показывать время, как занятое, если оно за границами рабочего времени."; -"First week of year :" = "Первая неделя года :"; +"First week of year" ="Первая неделя года"; "Enable reminders for Calendar items" = "Включить напоминания для событий календаря"; "Play a sound when a reminder comes due" = "Проигрывать звук когда срабатывает оповещение"; -"Default reminder :" = "Обычное оповещение :"; +"Default reminder" ="Обычное оповещение"; "firstWeekOfYear_January1" = "Начинается 1 января"; "firstWeekOfYear_First4DayWeek" = "Первая 4-х дневная неделя"; "firstWeekOfYear_FirstFullWeek" = "Первая полная неделя"; "Prevent from being invited to appointments" = "Не допускать приглашения на встречи"; -"White list for appointment invitations:" = "Белый список для приглашений на встречи:"; +"White list for appointment invitations" = "Белый список для приглашений на встречи"; "Contacts Names" = "Имена контактов"; /* Default Calendar */ -"Default calendar :" = "Календарь по-умолчанию"; +"Default calendar" ="Календарь по-умолчанию"; "selectedCalendar" = "Выбранный календарь"; "personalCalendar" = "Персональный календарь"; "firstCalendar" = "Первый разрешенный календарь"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Сортировать сообщения по нитям"; "When sending mail, add unknown recipients to my" = "При отправке писем добавлять неизвестных получателей в мою"; -"Forward messages:" = "Пересылать сообщения:"; +"Forward messages" = "Пересылать сообщения"; "messageforward_inline" = "В теле письма"; "messageforward_attached" = "Приложенным файлом"; -"When replying to a message:" = "При ответе на сообщение:"; +"When replying to a message" = "При ответе на сообщение"; "replyplacement_above" = "Начинать мой ответ над цитируемым текстом"; "replyplacement_below" = "Начинать мой ответ под цитируемым текстом"; "And place my signature" = "И поместить мою подпись"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "New Mail Account"; -"Server Name:" = "Имя сервера:"; -"Port:" = "Порт:"; -"Encryption:" = "Шифрование:"; +"Server Name" = "Имя сервера"; +"Port" = "Порт"; +"Encryption" = "Шифрование"; "None" = "Нет"; -"User Name:" = "Имя пользователя:"; -"Password:" = "Пароль:"; +"User Name" = "Имя пользователя"; +"Password" = "Пароль"; -"Full Name:" = "Full Name:"; -"Email:" = "Email:"; -"Reply To Email:" = "Ответить на Email:"; -"Signature:" = "Подпись:"; +"Full Name" = "Full Name"; +"Email" = "Email"; +"Reply To Email" = "Ответить на Email"; +"Signature" = "Подпись"; "(Click to create)" = "(Click to create)"; "Signature" = "Подпись"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Дополнительные параметры"; /* password */ -"New password:" = "Новый пароль:"; -"Confirmation:" = "Повтор нового пароля:"; +"New password" = "Новый пароль"; +"Confirmation" = "Повтор нового пароля"; "Change" = "Изменить"; /* Event+task classifications */ -"Default events classification :" = "Default events classification :"; -"Default tasks classification :" = "Default tasks classification :"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -210,14 +210,15 @@ "Contacts" = "Адресная книга"; "Mail" = "Почта"; "Last" = "Последнее использование"; -"Default Module :" = "Модуль по умолчанию:"; -"SOGo Version :" = "Версия SOGo:"; +"Default Module " = "Модуль по умолчанию"; +"SOGo Version" ="Версия SOGo"; -"Language :" = "Язык:"; +"Language" ="Язык"; "choose" = "Выбрать ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -234,13 +235,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Обновить вид:"; +"Refresh View" ="Обновить вид"; "refreshview_manually" = "Вручную"; "refreshview_every_minute" = "Каждую минуту"; "refreshview_every_2_minutes" = "Каждые 2 минуты"; @@ -251,12 +253,12 @@ "refreshview_once_per_hour" = "Раз в час"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Когда я получаю запрос об уведомлении о доставке:"; +"When I receive a request for a return receipt" = "Когда я получаю запрос об уведомлении о доставке"; "Never send a return receipt" = "Никогда не посылать уведомления о доставке"; "Allow return receipts for some messages" = "Разрешить уведомления о доставке для некоторых сообщений"; -"If I'm not in the To or Cc of the message:" = "Если я не в поле Кому: или Копия: для этого сообщения:"; -"If the sender is outside my domain:" = "Если отправитель вне моего домена:"; -"In all other cases:" = "Во всех остальных случаях:"; +"If I'm not in the To or Cc of the message" = "Если я не в поле Кому или Копия для этого сообщения"; +"If the sender is outside my domain" = "Если отправитель вне моего домена"; +"In all other cases" = "Во всех остальных случаях"; "Never send" = "Никогда не посылать"; "Always send" = "Всегда посылать"; diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings index 19bada4f6..d3c4a31eb 100644 --- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Zapnúť automatickú odpoveď"; -"Auto reply message :" = "Automatická odpoveď:"; -"Email addresses (separated by commas) :" = "Emailové adresy (oddelené čiarkami):"; +"Auto reply message" ="Automatická odpoveď"; +"Email addresses (separated by commas)" ="Emailové adresy (oddelené čiarkami)"; "Add default email addresses" = "Pridať východziu emailovú adresu"; -"Days between responses :" = "Dni medzi odpoveďami:"; +"Days between responses" ="Dni medzi odpoveďami"; "Do not send responses to mailing lists" = "Neposielať odpoveď emailovým skupinám"; "Disable auto reply on" = "Vypnúť automatickú odpoveď"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "Prosím zvoľte adresu na ktorú checete preposielať Vaše správy"; /* d & t */ -"Current Time Zone :" = "Aktuálna Časová Zóna:"; -"Short Date Format :" = "Krátky formát dátumu:"; -"Long Date Format :" = "Dlhý formát dátumu:"; -"Time Format :" = "Formát času:"; +"Current Time Zone" ="Aktuálna Časová Zóna"; +"Short Date Format" ="Krátky formát dátumu"; +"Long Date Format" ="Dlhý formát dátumu"; +"Time Format" ="Formát času"; "default" = "Predvolený"; @@ -90,22 +90,22 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Týždeň začína v:"; -"Day start time :" = "Začiatok dňa:"; -"Day end time :" = "Koniec dňa:"; +"Week begins on" ="Týždeň začína v"; +"Day start time" ="Začiatok dňa"; +"Day end time" ="Koniec dňa"; "Day start time must be prior to day end time." = "Začiatok dňa musí byť skôr ako koniec dňa."; "Show time as busy outside working hours" = "Mimo pracovných hodín ukáž čas ako obsadený"; -"First week of year :" = "Prvý týždeň roka:"; +"First week of year" ="Prvý týždeň roka"; "Enable reminders for Calendar items" = "Zapni pripomienky pre položky Kalendára"; "Play a sound when a reminder comes due" = "Prehraj zvuk keď začne pripomienka"; -"Default reminder :" = "Predvolená pripomienka:"; +"Default reminder" ="Predvolená pripomienka"; "firstWeekOfYear_January1" = "Začína 1. Januárom"; "firstWeekOfYear_First4DayWeek" = "Prvý 4-dňový týždeň"; "firstWeekOfYear_FirstFullWeek" = "Prvý celý týžden"; /* Default Calendar */ -"Default calendar :" = "Predvolený kalendár:"; +"Default calendar" ="Predvolený kalendár"; "selectedCalendar" = "Zvolený kalendár"; "personalCalendar" = "Osobný kalendár"; "firstCalendar" = "Prvý zapnutý kalendár"; @@ -140,11 +140,11 @@ "refreshview_every_30_minutes" = "Každých 30 minút"; "refreshview_once_per_hour" = "Raz za hodinu"; -"Forward messages:" = "Preposielaj správy:"; +"Forward messages" = "Preposielaj správy"; "messageforward_inline" = "Vrade"; "messageforward_attached" = "Ako prílohu"; -"When replying to a message:" = "Pri odpovedaní na správu:"; +"When replying to a message" = "Pri odpovedaní na správu"; "replyplacement_above" = "Odpoveď začína nad citáciou"; "replyplacement_below" = "Odpoveď začína pod citáciou"; "And place my signature" = "A vlož môj podpis"; @@ -164,17 +164,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nový mailový účet"; -"Server Name:" = "Meno servera:"; -"Port:" = "Port:"; -"Encryption:" = "Šifrovanie:"; +"Server Name" = "Meno servera"; +"Port" = "Port"; +"Encryption" = "Šifrovanie"; "None" = "Žiadne"; -"User Name:" = "Užívateľské meno:"; -"Password:" = "Heslo:"; +"User Name" = "Užívateľské meno"; +"Password" = "Heslo"; -"Full Name:" = "Celé meno:"; -"Email:" = "Email:"; -"Reply To Email:" = "Email pre odpoveď:"; -"Signature:" = "Podpis:"; +"Full Name" = "Celé meno"; +"Email" = "Email"; +"Reply To Email" = "Email pre odpoveď"; +"Signature" = "Podpis"; "(Click to create)" = "(klikni pre vytvorenie)"; "Signature" = "Podpis"; @@ -187,13 +187,13 @@ "Additional Parameters" = "Dalšie parametre"; /* password */ -"New password:" = "Nové heslo:"; -"Confirmation:" = "Potvrdenie:"; +"New password" = "Nové heslo"; +"Confirmation" = "Potvrdenie"; "Change" = "Zmena"; /* Event+task classifications */ -"Default events classification :" = "Predvolená klasifikácia udalostí"; -"Default tasks classification :" = "Predvolená klasifikácia úloh"; +"Default events classification" ="Predvolená klasifikácia udalostí"; +"Default tasks classification" ="Predvolená klasifikácia úloh"; "PUBLIC_item" = "Verejný"; "CONFIDENTIAL_item" = "Dôverný"; "PRIVATE_item" = "Súkromný"; @@ -207,14 +207,15 @@ "Contacts" = "Adresár"; "Mail" = "Pošta"; "Last" = "Naposledy použité"; -"Default Module :" = "Predvolený modul:"; -"SOGo Version :" = "Verzia SOGo:"; +"Default Module " = "Predvolený modul"; +"SOGo Version" ="Verzia SOGo"; -"Language :" = "Jazyk:"; +"Language" ="Jazyk"; "choose" = "Vyber..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Netherlands"; @@ -231,6 +232,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -238,12 +240,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Keď dostanem požiadavku na potvrdenie o doručení"; +"When I receive a request for a return receipt" = "Keď dostanem požiadavku na potvrdenie o doručení"; "Never send a return receipt" = "Nikdy neposielať potvrdenie o doručení"; "Allow return receipts for some messages" = "Povoliť potvrdenie o doručení pre niektoré správy"; -"If I'm not in the To or Cc of the message:" = "Pokial nie som v Pre alebo Kópia políčku správy:"; -"If the sender is outside my domain:" = "Pokiaľ je odosielateľ mimo mojej domény:"; -"In all other cases:" = "Vo všetkých ostatných prípadoch:"; +"If I'm not in the To or Cc of the message" = "Pokial nie som v Pre alebo Kópia políčku správy"; +"If the sender is outside my domain" = "Pokiaľ je odosielateľ mimo mojej domény"; +"In all other cases" = "Vo všetkých ostatných prípadoch"; "Never send" = "Nikdy neposielaj"; "Always send" = "Vždy posielaj"; diff --git a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..3e7d70165 --- /dev/null +++ b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings @@ -0,0 +1,331 @@ +/* toolbar */ +"Save and Close" = "Shrani in zapri"; +"Close" = "Zapri"; + +/* tabs */ +"General" = "Splošno"; +"Calendar Options" = "Možnosti koledarja"; +"Contacts Options" = "Možnosti stikov"; +"Mail Options" = "Možnosti pošte"; +"IMAP Accounts" = "IMAP računi"; +"Vacation" = "Odsotnost"; +"Forward" = "Naprej"; +"Password" = "Geslo"; +"Categories" = "Kategorije"; +"Appointments invitations" = "Povabilo na sestanek"; +"Name" = "Ime"; +"Color" = "Barva"; +"Add" = "Dodaj"; +"Delete" = "Izbriši"; + +/* contacts categories */ +"contacts_category_labels" = "Kolega, Tekmec, Kupec, Prijatelj, Družina, Poslovni partner, Dobavitelj, Novinar, VIP"; + +/* vacation (auto-reply) */ +"Enable vacation auto reply" = "Omogoči samodejni odgovor ob odsotnosti"; +"Auto reply message" ="Samodejno sporočilo"; +"Email addresses (separated by commas)" ="E-poštni naslovi (ločeni z vejivo)"; +"Add default email addresses" = "Dodaj privzete e-poštne naslove"; +"Days between responses" ="Dnevi med odzivi"; +"Do not send responses to mailing lists" = "Ne pošlji odzivov na poštne sezname"; +"Disable auto reply on" = "Onemogoči samodejni odgovor za"; +"Always send vacation message response" = "Vedno pošlji sporočilo o odsotnosti"; +"Please specify your message and your email addresses for which you want to enable auto reply." += "Prosim določi tvoje sporočilo in tvoje e-poštne naslove, za katere želiš omogočiti samodejni odgovor."; +"Your vacation message must not end with a single dot on a line." = "Tvoje sporočilo za odsotnost se ne sme končati z enojno piko v vrstici."; +"End date of your auto reply must be in the future." += "Končni datum tvojega samodejnega odgovora mora biti v prihodnosti."; + +/* forward messages */ +"Forward incoming messages" = "Posreduj prejemajoča sporočila"; +"Keep a copy" = "Ohrani kopijo"; +"Please specify an address to which you want to forward your messages." += "Prosim določi naslov, na katerega želiš posredovati tvoja sporočila."; +"You are not allowed to forward your messages to an external email address." = "Ni dovoljeno prepošiljati pošte na zunanji poštni naslov"; +"You are not allowed to forward your messages to an internal email address." = "Ni dovoljeno prepošiljati pošte na interni poštni naslov"; + + +/* d & t */ +"Current Time Zone" ="Trenutni časovni pas"; +"Short Date Format" ="Kratki format datuma"; +"Long Date Format" ="Dolgi format datuma"; +"Time Format" ="Format časa"; + +"default" = "Privzeto"; + +"shortDateFmt_0" = "%d-%b-%y"; + +"shortDateFmt_1" = "%d-%m-%y"; +"shortDateFmt_2" = "%d/%m/%y"; +"shortDateFmt_3" = "%e/%m/%y"; + +"shortDateFmt_4" = "%d-%m-%Y"; +"shortDateFmt_5" = "%d/%m/%Y"; + +"shortDateFmt_6" = "%m-%d-%y"; +"shortDateFmt_7" = "%m/%d/%y"; +"shortDateFmt_8" = "%m/%e/%y"; + +"shortDateFmt_9" = "%y-%m-%d"; +"shortDateFmt_10" = "%y/%m/%d"; +"shortDateFmt_11" = "%y.%m.%d"; + +"shortDateFmt_12" = "%Y-%m-%d"; +"shortDateFmt_13" = "%Y/%m/%d"; +"shortDateFmt_14" = "%Y.%m.%d"; + +"shortDateFmt_15" = ""; + +"longDateFmt_0" = "%A, %B %d, %Y"; +"longDateFmt_1" = "%B %d, %Y"; +"longDateFmt_2" = "%A, %d %B, %Y"; +"longDateFmt_3" = "%d %B, %Y"; +"longDateFmt_4" = ""; +"longDateFmt_5" = ""; +"longDateFmt_6" = ""; +"longDateFmt_7" = ""; +"longDateFmt_8" = ""; +"longDateFmt_9" = ""; +"longDateFmt_10" = ""; + +"timeFmt_0" = "%I:%M %p"; +"timeFmt_1" = "%H:%M"; +"timeFmt_2" = ""; +"timeFmt_3" = ""; +"timeFmt_4" = ""; + +/* calendar */ +"Week begins on" ="Teden se začne z"; +"Day start time" ="Začetni čas dneva"; +"Day end time" ="Končni čas dneva"; +"Day start time must be prior to day end time." = "Začetni čas dneva mora biti pred končnim časom dneva."; +"Show time as busy outside working hours" = "Prikaži čas kot zasedem izven delovnega časa"; +"First week of year" ="Prvi teden leta"; +"Enable reminders for Calendar items" = "Omogoči opomnike za koledarske elemente"; +"Play a sound when a reminder comes due" = "Zvočno opozori, ko opomnik zapade"; +"Default reminder" ="Privzeti opomnik"; + +"firstWeekOfYear_January1" = "Začne s 1. januarjem"; +"firstWeekOfYear_First4DayWeek" = "Prvi 4 dnevni teden"; +"firstWeekOfYear_FirstFullWeek" = "Prvi celotni vikend"; + +"Prevent from being invited to appointments" = "Prepreči pred vabilom na sestanek"; +"White list for appointment invitations" = "Beli seznam za vabila na sestanke"; +"Contacts Names" = "Imena stikov"; + +/* Default Calendar */ +"Default calendar" ="Privzeti koledar"; +"selectedCalendar" = "Izbrani koledar"; +"personalCalendar" = "Osebnik koledar"; +"firstCalendar" = "Prvi omogočeni koledar"; + +"reminder_NONE" = "Brez opomnika"; +"reminder_5_MINUTES_BEFORE" = "5 minut pred"; +"reminder_10_MINUTES_BEFORE" = "10 minut pred"; +"reminder_15_MINUTES_BEFORE" = "15 minut pred"; +"reminder_30_MINUTES_BEFORE" = "30 minut pred"; +"reminder_45_MINUTES_BEFORE" = "45 minut pred"; +"reminder_1_HOUR_BEFORE" = "1 uro pred"; +"reminder_2_HOURS_BEFORE" = "2 uri pred"; +"reminder_5_HOURS_BEFORE" = "5 ur pred"; +"reminder_15_HOURS_BEFORE" = "15 ur pred"; +"reminder_1_DAY_BEFORE" = "1 dan pred"; +"reminder_2_DAYS_BEFORE" = "2 dneva pred"; +"reminder_1_WEEK_BEFORE" = "1 teden pred"; + +/* Mailer */ +"Labels" = "Oznake"; +"Label" = "Oznaka"; +"Show subscribed mailboxes only" = "Prikaži le naročene poštne predale"; +"Sort messages by threads" = "Sortiraj sporočila po nitih"; +"When sending mail, add unknown recipients to my" = "Pri pošiljanju pošte dodaj neznane prejemnike k mojemu"; + +"Forward messages" = "Posreduj sporočila"; +"messageforward_inline" = "V vrsti"; +"messageforward_attached" = "Kot priloga"; + +"When replying to a message" = "Pri odgovoru na sporočilo"; +"replyplacement_above" = "Začni odgovor nad navednicami"; +"replyplacement_below" = "Začni odgovor pod navednicami"; +"And place my signature" = "In umesti moj podpis"; +"signatureplacement_above" = "pod mojim odgovorom"; +"signatureplacement_below" = "pod navednicami"; +"Compose messages in" = "Sestaviti sporočilo v"; +"composemessagestype_html" = "HTML"; +"composemessagestype_text" = "Golo besedilo"; +"Display remote inline images" = "Prikaži oddaljne slike v vrsti"; +"displayremoteinlineimages_never" = "Nikoli"; +"displayremoteinlineimages_always" = "Vedno"; + +"Auto save every" = "Samodejno shrani vsake"; +"minutes" = "minute"; + +/* Contact */ +"Personal Address Book" = "Osebni adresar"; +"Collected Address Book" = "Zbrani adresar"; + +/* IMAP Accounts */ +"New Mail Account" = "Novi poštni račun"; + +"Server Name" = "Ime strežnika"; +"Port" = "Port"; +"Encryption" = "Enkripcija"; +"None" = "Noben"; +"User Name" = "Uporabniško ime"; +"Password" = "Geslo"; + +"Full Name" = "Polno ime"; +"Email" = "E-pošta"; +"Reply To Email" = "Odgovor na e-pošto"; +"Signature" = "Podpis"; +"(Click to create)" = "(Klikni za kreiranje)"; + +"Signature" = "Podpis"; +"Please enter your signature below:" = "Prosim vnesi tvoj podpis spodaj:"; + +"Please specify a valid sender address." = "Prosim določi veljavni naslov pošiljatelja."; +"Please specify a valid reply-to address." = "Prosim določi veljavni naslov za odgovor."; + +/* Additional Parameters */ +"Additional Parameters" = "Dodatni parametri"; + +/* password */ +"New password" = "Novo geslo"; +"Confirmation" = "Potrditev"; +"Change" = "Spremeni"; + +/* Event+task classifications */ +"Default events classification" ="Privzeta razvrstitev dogodkov"; +"Default tasks classification" ="Privzeta razvrstitev opravil"; +"PUBLIC_item" = "Javno"; +"CONFIDENTIAL_item" = "Zaupno"; +"PRIVATE_item" = "Osebno"; + +/* Event+task categories */ +"category_none" = "Noben"; +"calendar_category_labels" = "Obletnica,Rojstni dan,Poslovno,Klici,Stranke,Tekmeci,Kupci,Priljubljeni,Sledenje,Darila,Prazniki,Ideje,Srečanja,Zadeve,Razno,Osebno,Projekti,Javno prazniki,Status,Dobavitelji,Potovanje,Dopust"; + +/* Default module */ +"Calendar" = "Koledar"; +"Contacts" = "Adresar"; +"Mail" = "Pošta"; +"Last" = "Zadnje uporabljeno"; +"Default Module " = "Privzeti modul"; +"SOGo Version" ="SOGo različica"; + +"Language" ="Jezik"; +"choose" = "Izberi ..."; +"Arabic" = "العربية"; +"Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; +"Czech" = "Česky"; +"Danish" = "Dansk (Danmark)"; +"Dutch" = "Nederlands"; +"English" = "English"; +"Finnish" = "Suomi"; +"French" = "Français"; +"German" = "Deutsch"; +"Hungarian" = "Magyar"; +"Icelandic" = "Íslenska"; +"Italian" = "Italiano"; +"NorwegianBokmal" = "Norsk bokmål"; +"NorwegianNynorsk" = "Norsk nynorsk"; +"BrazilianPortuguese" = "Português brasileiro"; +"Polish" = "Polski"; +"Russian" = "Русский"; +"Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; +"SpanishSpain" = "Español (España)"; +"SpanishArgentina" = "Español (Argentina)"; +"Swedish" = "Svenska"; +"Ukrainian" = "Українська"; +"Welsh" = "Cymraeg"; + +"Refresh View" ="Osveži pogled"; +"refreshview_manually" = "Ročno"; +"refreshview_every_minute" = "Vsako minuto"; +"refreshview_every_2_minutes" = "Vsaki 2 minuti"; +"refreshview_every_5_minutes" = "Vsakih 5 minut"; +"refreshview_every_10_minutes" = "Vsakih 10 minut"; +"refreshview_every_20_minutes" = "Vsakih 20 minut"; +"refreshview_every_30_minutes" = "Vsakih 30 minut"; +"refreshview_once_per_hour" = "Enkrat na uro"; + +/* Return receipts */ +"When I receive a request for a return receipt" = "Ko prejmem zahtevo za povratnico"; +"Never send a return receipt" = "Nikoli ne pošlji povratnice"; +"Allow return receipts for some messages" = "Dovoli povratnice za nekatera sporočila"; +"If I'm not in the To or Cc of the message" = "Če nisem med Za ali Kp sporočila"; +"If the sender is outside my domain" = "Če je pošiljatelj izven moje domene"; +"In all other cases" = "V vseh ostalih primerih"; + +"Never send" = "Nikoli ne pošlji"; +"Always send" = "Vedno pošlji"; +"Ask me" = "Vprašaj me"; + +/* Filters - UIxPreferences */ +"Filters" = "Filterji"; +"Active" = "Aktivno"; +"Move Up" = "Pomakni gor"; +"Move Down" = "Pomakni dol"; +"Connection error" = "Napaka pri povezavi"; +"Service temporarily unavailable" = "Storitev začasno ni na voljo"; + +/* Filters - UIxFilterEditor */ +"Filter name:" = "Ime filtra:"; +"For incoming messages that" = "Za prihajajoča sporočila, ki"; +"match all of the following rules:" = "sklada se z naslednjimi pravili:"; +"match any of the following rules:" = "sklada se s katerokoli od naslednjih pravil:"; +"match all messages" = "sklada se z vsemi sporočili"; +"Perform these actions:" = "Izvedi ta dejanja:"; +"Untitled Filter" = "Neimenovani filter:"; + +"Subject" = "Zadeva"; +"From" = "Od"; +"To" = "Za"; +"Cc" = "Kp"; +"To or Cc" = "Za ali Kp"; +"Size (Kb)" = "Velikost (Kb)"; +"Header" = "Glava"; +"Body" = "Telo"; +"Flag the message with:" = "Označi sporočilo z:"; +"Discard the message" = "Zavrzi sporočilo"; +"File the message in:" = "Odloži sporočilo v:"; +"Keep the message" = "Obdrži sporočilo"; +"Forward the message to:" = "Posreduj sporočilo za:"; +"Send a reject message:" = "Pošlji zavrnitev sporočila:"; +"Send a vacation message" = "Pošlji sporočilo o odsotnosti"; +"Stop processing filter rules" = "Ustavi izvajanje pravil filtriranja"; + +"is under" = "je pod"; +"is over" = "je nad"; +"is" = "je"; +"is not" = "ni"; +"contains" = "vsebuje"; +"does not contain" = "ne vsebuje"; +"matches" = "ustreza"; +"does not match" = "ne ustreza"; +"matches regex" = "ustreza regex"; +"does not match regex" = "ne ustreza regex"; + +"Seen" = "Videno"; +"Deleted" = "Brisano"; +"Answered" = "Odgovorjeno"; +"Flagged" = "Označeno"; +"Junk" = "Nezaželeno"; +"Not Junk" = "Zaželeno"; + +/* Password policy */ +"The password was changed successfully." = "Geslo je uspešno spremenjeno."; +"Password must not be empty." = "Geslo ne sme biti prazno."; +"The passwords do not match. Please try again." = "Gesli se ne ujemata. Prosim poskusi ponovno."; +"Password change failed" = "Sprememba gesla ni uspela."; +"Password change failed - Permission denied" = "Sprememba gesla ni uspela - pristop ni dovoljen"; +"Password change failed - Insufficient password quality" = "Sprememba gesla ni uspela - prenizka kvaliteta gesla"; +"Password change failed - Password is too short" = "Sprememba gesla ni uspela - geslo je prekratko"; +"Password change failed - Password is too young" = "Sprememba gesla ni uspela - geslo ni dovolj staro"; +"Password change failed - Password is in history" = "Sprememba gesla ni uspela - geslo je v zgodovini"; +"Unhandled policy error: %{0}" = "Neobravnavana napaka police: %{0}"; +"Unhandled error response" = "Neobravnavana napaka odziva"; +"Password change is not supported." = "Sprememba gesla ni podprta."; +"Unhandled HTTP error code: %{0}" = "Neobravnavana HTTP napaka: %{0}"; diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings index 1b6f89dc3..a325aa53c 100644 --- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Activar respuesta automática por vacaciones"; -"Auto reply message :" = "Mensaje de respuesta automática:"; -"Email addresses (separated by commas) :" = "Dirección de correo (separado por comas):"; +"Auto reply message" ="Mensaje de respuesta automática"; +"Email addresses (separated by commas)" ="Dirección de correo (separado por comas)"; "Add default email addresses" = "Añadir dirección de correo por defecto"; -"Days between responses :" = "Dias entre respuestas:"; +"Days between responses" ="Dias entre respuestas"; "Do not send responses to mailing lists" = "No enviar respuestas a listas de correo"; "Disable auto reply on" = "Deshabilitar la autorrespuesta en la siguiente fecha"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -42,10 +42,10 @@ = "Por favor, especifique una dirección para aquellos mensajes que quiere reenviar."; /* d & t */ -"Current Time Zone :" = "Zona horaria actual:"; -"Short Date Format :" = " Formato de fecha corto:"; -"Long Date Format :" = "Formato de fecha largo:"; -"Time Format :" = "Formato de hora:"; +"Current Time Zone" ="Zona horaria actual"; +"Short Date Format" =" Formato de fecha corto"; +"Long Date Format" ="Formato de fecha largo"; +"Time Format" ="Formato de hora"; "default" = "Por defecto"; @@ -91,26 +91,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "La semana comienza el: "; -"Day start time :" = "Hora de inicio del día: "; -"Day end time :" = "Hora de finalización del día:"; +"Week begins on" ="La semana comienza el"; +"Day start time" ="Hora de inicio del día"; +"Day end time" ="Hora de finalización del día"; "Day start time must be prior to day end time." = "La hora de inicio del día debe ser anterior a la hora de fin del día."; "Show time as busy outside working hours" = "Mostrar el tiempo fuera de las horas de trabajo como ocupado"; -"First week of year :" = "Primera semana del año: "; +"First week of year" ="Primera semana del año"; "Enable reminders for Calendar items" = "Habilitar recordatorios para los elementos del calendario"; "Play a sound when a reminder comes due" = "Señal acústica para los recordatorios"; -"Default reminder :" = "Recordatorio por defecto: "; +"Default reminder" ="Recordatorio por defecto"; "firstWeekOfYear_January1" = "Empieza el 1 de enero"; "firstWeekOfYear_First4DayWeek" = "Primera semana del año de 4 días"; "firstWeekOfYear_FirstFullWeek" = "Primera semana del año completa"; "Prevent from being invited to appointments" = "No permitir que otros me inviten a eventos"; -"White list for appointment invitations:" = "Lista de excepciones para invitación a eventos:"; +"White list for appointment invitations" = "Lista de excepciones para invitación a eventos"; "Contacts Names" = "Nombre de los contactos"; /* Default Calendar */ -"Default calendar :" = "Calendario por defecto"; +"Default calendar" ="Calendario por defecto"; "selectedCalendar" = "Calendario seleccionado"; "personalCalendar" = "Calendario personal"; "firstCalendar" = "Primer calendario habilitado"; @@ -136,11 +136,11 @@ "Sort messages by threads" = "Ordenar mensajes por conversaciones"; "When sending mail, add unknown recipients to my" = "Al enviar correos, agregar destinatarios desconocidos a mi"; -"Forward messages:" = "Reenviar mensajes:"; +"Forward messages" = "Reenviar mensajes"; "messageforward_inline" = "Incorporado"; "messageforward_attached" = "Como adjunto"; -"When replying to a message:" = "Cuando responda a un mensaje:"; +"When replying to a message" = "Cuando responda a un mensaje"; "replyplacement_above" = "Empezar mi respuesta sobre el texto citado"; "replyplacement_below" = "Empieza mi respuesta bajo el texto citado"; "And place my signature" = "Y añadir mi firma"; @@ -160,17 +160,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nueva Cuenta de Correo"; -"Server Name:" = "Nombre del servidor:"; -"Port:" = "Puerto:"; -"Encryption:" = "Cifrado:"; +"Server Name" = "Nombre del servidor"; +"Port" = "Puerto"; +"Encryption" = "Cifrado"; "None" = "Sin cifrar"; -"User Name:" = "Nombre de usuario:"; -"Password:" = "Contraseña:"; +"User Name" = "Nombre de usuario"; +"Password" = "Contraseña"; -"Full Name:" = "Nombre Completo:"; -"Email:" = "Correo Electrónico:"; -"Reply To Email:" = "Responder a esta dirección de correo:"; -"Signature:" = "Firma:"; +"Full Name" = "Nombre Completo"; +"Email" = "Correo Electrónico"; +"Reply To Email" = "Responder a esta dirección de correo"; +"Signature" = "Firma"; "(Click to create)" = "(Click para crear)"; "Signature" = "Firma"; @@ -183,13 +183,13 @@ "Additional Parameters" = "Parámetros Adicionales"; /* password */ -"New password:" = "Nueva contraseña:"; -"Confirmation:" = "Confirmar nueva contraseña:"; +"New password" = "Nueva contraseña"; +"Confirmation" = "Confirmar nueva contraseña"; "Change" = "Cambiar"; /* Event+task classifications */ -"Default events classification :" = "Clasificación por defecto para los eventos"; -"Default tasks classification :" = "Clasificación por defecto para las tareas"; +"Default events classification" ="Clasificación por defecto para los eventos"; +"Default tasks classification" ="Clasificación por defecto para las tareas"; "PUBLIC_item" = "Público"; "CONFIDENTIAL_item" = "Confidencial"; "PRIVATE_item" = "Privado"; @@ -203,14 +203,15 @@ "Contacts" = "Libreta de direcciones"; "Mail" = "Correo"; "Last" = "Ultimo usado"; -"Default Module :" = "Módulo por defecto :"; -"SOGo Version :" = "Versión de SOGo:"; +"Default Module " = "Módulo por defecto "; +"SOGo Version" ="Versión de SOGo"; -"Language :" = "Idioma :"; +"Language" ="Idioma"; "choose" = "Elija ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -227,13 +228,14 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Actualizar la vista:"; +"Refresh View" ="Actualizar la vista"; "refreshview_manually" = "Manualmente"; "refreshview_every_minute" = "Cada minuto"; "refreshview_every_2_minutes" = "Cada 2 minutos"; @@ -244,12 +246,12 @@ "refreshview_once_per_hour" = "Cada hora"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Cuando reciba una petición de un acuse de recibo:"; +"When I receive a request for a return receipt" = "Cuando reciba una petición de un acuse de recibo"; "Never send a return receipt" = "Nunca enviar un acuse de recibo"; "Allow return receipts for some messages" = "Permitir acuses de recibo para algunos mensajes"; -"If I'm not in the To or Cc of the message:" = "Si no estoy en el Para o Cc del mensaje:"; -"If the sender is outside my domain:" = "Si el remitente esta fuera de mi dominio de correo:"; -"In all other cases:" = "En el resto de casos:"; +"If I'm not in the To or Cc of the message" = "Si no estoy en el Para o Cc del mensaje"; +"If the sender is outside my domain" = "Si el remitente esta fuera de mi dominio de correo"; +"In all other cases" = "En el resto de casos"; "Never send" = "No enviar nunca"; "Always send" = "Enviar siempre"; diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings index 71d83d25a..357701090 100644 --- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings @@ -23,10 +23,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Activar respuesta automática para vacaciones"; -"Auto reply message :" = "Mensaje de respuesta automática :"; -"Email addresses (separated by commas) :" = "Dirección de correo (separado por comas) :"; +"Auto reply message" ="Mensaje de respuesta automática"; +"Email addresses (separated by commas)" ="Dirección de correo (separado por comas)"; "Add default email addresses" = "Añadir dirección de correo por defecto"; -"Days between responses :" = "Dias entre respuestas :"; +"Days between responses" ="Dias entre respuestas"; "Do not send responses to mailing lists" = "No enviar respuestas a las listas de distribución"; "Disable auto reply on" = "Desactivar respuesta automatica"; "Always send vacation message response" = "Siempre enviar mensaje de vacaciones"; @@ -46,10 +46,10 @@ /* d & t */ -"Current Time Zone :" = "Zona horaria actual :"; -"Short Date Format :" = "Formato de fecha corto :"; -"Long Date Format :" = "Formato de fecha largo :"; -"Time Format :" = "Formato de hora :"; +"Current Time Zone" ="Zona horaria actual"; +"Short Date Format" ="Formato de fecha corto"; +"Long Date Format" ="Formato de fecha largo"; +"Time Format" ="Formato de hora"; "default" = "Por defecto"; @@ -95,26 +95,26 @@ "timeFmt_4" = ""; /* calendar */ -"Week begins on :" = "Semana empieza por: "; -"Day start time :" = "Hora inicio: "; -"Day end time :" = "Hora fin: "; +"Week begins on" ="Semana empieza por"; +"Day start time" ="Hora inicio"; +"Day end time" ="Hora fin"; "Day start time must be prior to day end time." = "Hora de inicio del día debe ser anterior a la hora de fin del día."; "Show time as busy outside working hours" = "Mostrar tiempo ocupado fuera del horario laboral"; -"First week of year :" = "Primera semana del año: "; +"First week of year" ="Primera semana del año"; "Enable reminders for Calendar items" = "Habilitar recordatorios para elementos del calendario"; "Play a sound when a reminder comes due" = "Señal acústica para los recordatorios"; -"Default reminder :" = "Recordatorio por defecto: "; +"Default reminder" ="Recordatorio por defecto"; "firstWeekOfYear_January1" = "Empieza el 1 de enero"; "firstWeekOfYear_First4DayWeek" = "Primera semana del año de 4 días"; "firstWeekOfYear_FirstFullWeek" = "Primera semana del año completa"; "Prevent from being invited to appointments" = "Evitar invitaciones a eventos"; -"White list for appointment invitations:" = "Lista blanca de invitaciones a eventos:"; +"White list for appointment invitations" = "Lista blanca de invitaciones a eventos"; "Contacts Names" = "Nombres de Contacto"; /* Default Calendar */ -"Default calendar :" = "Calendario por defecto"; +"Default calendar" ="Calendario por defecto"; "selectedCalendar" = "Calendario seleccionado"; "personalCalendar" = "Calendario personal"; "firstCalendar" = "Primer calendario disponible"; @@ -140,11 +140,11 @@ "Sort messages by threads" = "Ordenar mensajes por temas"; "When sending mail, add unknown recipients to my" = "Cuando se envía correo, añade destinatarios desconocidos a mi"; -"Forward messages:" = "Reenviar mensajes:"; +"Forward messages" = "Reenviar mensajes"; "messageforward_inline" = "Incorporado"; "messageforward_attached" = "Como adjunto"; -"When replying to a message:" = "Cuando se contesta a un mensaje:"; +"When replying to a message" = "Cuando se contesta a un mensaje"; "replyplacement_above" = "Empieza mi respuesta sobre el texto"; "replyplacement_below" = "Empieza mi respuesta bajo el texto"; "And place my signature" = "Y añade mi firma"; @@ -167,17 +167,17 @@ /* IMAP Accounts */ "New Mail Account" = "Nueva Cuenta de Correo"; -"Server Name:" = "Nombre de Servidor:"; -"Port:" = "Puerto:"; -"Encryption:" = "Cifrado:"; +"Server Name" = "Nombre de Servidor"; +"Port" = "Puerto"; +"Encryption" = "Cifrado"; "None" = "Ninguno"; -"User Name:" = "Nombre de usuario:"; -"Password:" = "Contraseña:"; +"User Name" = "Nombre de usuario"; +"Password" = "Contraseña"; -"Full Name:" = "Nombre Completo:"; -"Email:" = "Correo Electrónico:"; -"Reply To Email:" = "Correo electronico para responder:"; -"Signature:" = "Firma:"; +"Full Name" = "Nombre Completo"; +"Email" = "Correo Electrónico"; +"Reply To Email" = "Correo electronico para responder"; +"Signature" = "Firma"; "(Click to create)" = "(Click para crear)"; "Signature" = "Firma"; @@ -190,13 +190,13 @@ "Additional Parameters" = "Parámetros Adicionales"; /* password */ -"New password:" = "Nueva contraseña:"; -"Confirmation:" = "Confirmar nueva contraseña:"; +"New password" = "Nueva contraseña"; +"Confirmation" = "Confirmar nueva contraseña"; "Change" = "Cambiar"; /* Event+task classifications */ -"Default events classification :" = "Clasificación de evento por defecto"; -"Default tasks classification :" = "Clasificación de tarea por defecto"; +"Default events classification" ="Clasificación de evento por defecto"; +"Default tasks classification" ="Clasificación de tarea por defecto"; "PUBLIC_item" = "Publico"; "CONFIDENTIAL_item" = "Confidencial"; "PRIVATE_item" = "Privado"; @@ -210,14 +210,15 @@ "Contacts" = "Libreta de direcciones"; "Mail" = "Correo"; "Last" = "Ultimo usado"; -"Default Module :" = "Módulo por defecto :"; -"SOGo Version :" = "Versión de SOGo:"; +"Default Module " = "Módulo por defecto "; +"SOGo Version" ="Versión de SOGo"; -"Language :" = "Idioma :"; +"Language" ="Idioma"; "choose" = "Elija ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -240,7 +241,7 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; -"Refresh View :" = "Refrescar Vista:"; +"Refresh View" ="Refrescar Vista"; "refreshview_manually" = "Manualmente"; "refreshview_every_minute" = "Cada minuto"; "refreshview_every_2_minutes" = "Cada 2 minutos"; @@ -251,12 +252,12 @@ "refreshview_once_per_hour" = "Cada hora"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Cuando reciba una petición de un acuse de recibo:"; +"When I receive a request for a return receipt" = "Cuando reciba una petición de un acuse de recibo"; "Never send a return receipt" = "Nunca enviar un acuse de recibo"; "Allow return receipts for some messages" = "Permitir acuses de recibo para algunos mensajes"; -"If I'm not in the To or Cc of the message:" = "Si no estoy en el Para o Cc del mensaje:"; -"If the sender is outside my domain:" = "Si el remitente esta fuera de mi dominio de correo:"; -"In all other cases:" = "En el resto de casos:"; +"If I'm not in the To or Cc of the message" = "Si no estoy en el Para o Cc del mensaje"; +"If the sender is outside my domain" = "Si el remitente esta fuera de mi dominio de correo"; +"In all other cases" = "En el resto de casos"; "Never send" = "Nunca enviar"; "Always send" = "Enviar siempre"; diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings index b2463926b..5b654e532 100644 --- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Aktivera frånvaro auto-svar"; -"Auto reply message :" = "Auto-svar meddelande:"; -"Email addresses (separated by commas) :" = "E-post adresser (kommaseparerade):"; +"Auto reply message" ="Auto-svar meddelande"; +"Email addresses (separated by commas)" ="E-post adresser (kommaseparerade)"; "Add default email addresses" = "Lägg till standard e-postadress"; -"Days between responses :" = "Dagar mellan svar:"; +"Days between responses" ="Dagar mellan svar"; "Do not send responses to mailing lists" = "Skicka inte svar till utskickslistor"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Skriv meddelandet och ange din e-postadress som du vill aktivera auto-svar."; @@ -37,10 +37,10 @@ = "Ange adressen du vill vidarebefordra dina meddelanden till."; /* d & t */ -"Current Time Zone :" = "Gällande tidszon:"; -"Short Date Format :" = "Kort datumformat:"; -"Long Date Format :" = "Långt datumformat:"; -"Time Format :" = "Tidsformat:"; +"Current Time Zone" ="Gällande tidszon"; +"Short Date Format" ="Kort datumformat"; +"Long Date Format" ="Långt datumformat"; +"Time Format" ="Tidsformat"; "default" = "Standard"; @@ -78,22 +78,22 @@ "timeFmt_2" = ""; /* calendar */ -"Week begins on :" = "Veckan börjar med:"; -"Day start time :" = "Dagen börjar kl:"; -"Day end time :" = "Dagen slutar kl:"; +"Week begins on" ="Veckan börjar med"; +"Day start time" ="Dagen börjar kl"; +"Day end time" ="Dagen slutar kl"; "Day start time must be prior to day end time." = "Dagens starttid måste vara före dagens sluttid."; -"First week of year :" = "Första veckan på året:"; +"First week of year" ="Första veckan på året"; "Enable reminders for Calendar items" = "Aktivera påminnelser för kalenderposter"; "Play a sound when a reminder comes due" = "Spela upp ett ljud vid en påminnelse"; -"Default reminder :" = "Standardpåminnelse:"; +"Default reminder" ="Standardpåminnelse"; "firstWeekOfYear_January1" = "Börjar den 1 januari"; "firstWeekOfYear_First4DayWeek" = "Första 4-dagarsveckan på året"; "firstWeekOfYear_FirstFullWeek" = "Första hela veckan på året"; /* Default Calendar */ -"Default calendar :" = "Default calendar"; +"Default calendar" ="Default calendar"; "selectedCalendar" = "Selected calendar"; "personalCalendar" = "Personal calendar"; "firstCalendar" = "First enabled calendar"; @@ -123,7 +123,7 @@ "refreshview_every_30_minutes" = "Varje 30 minuter"; "refreshview_once_per_hour" = "Varje timme"; -"Forward messages:" = "Vidarebefordra meddelanden:"; +"Forward messages" = "Vidarebefordra meddelanden"; "messageforward_inline" = "Infogade"; "messageforward_attached" = "Bifogade"; @@ -139,16 +139,16 @@ /* IMAP Accounts */ "New Mail Account" = "Nytt e-postkonto"; -"Server Name:" = " +"Server Name" = " Servernamn:"; -"Port:" = "Port:"; -"User Name:" = "Användarnamn:"; -"Password:" = "Lösenord:"; +"Port" = "Port"; +"User Name" = "Användarnamn"; +"Password" = "Lösenord"; -"Full Name:" = "Fullständigt namn:"; -"Email:" = "E-postadress:"; -"Signature:" = "Signatur:"; +"Full Name" = "Fullständigt namn"; +"Email" = "E-postadress"; +"Signature" = "Signatur"; "(Click to create)" = "(Klicka för att skapa)"; "Signature" = "Signatur"; @@ -158,13 +158,13 @@ Servernamn:"; "Additional Parameters" = "Övriga parametrar"; /* password */ -"New password:" = "Nytt lösenord:"; -"Confirmation:" = "Bekräfta:"; +"New password" = "Nytt lösenord"; +"Confirmation" = "Bekräfta"; "Change" = "Ändra"; /* Event+task classifications */ -"Default events classification :" = "Default events classification :"; -"Default tasks classification :" = "Default tasks classification :"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -178,13 +178,14 @@ Servernamn:"; "Contacts" = "Adressbok"; "Mail" = "E-post"; "Last" = "Senast använd"; -"Default Module :" = "Standardmodul:"; +"Default Module " = "Standardmodul"; -"Language :" = "Språk:"; +"Language" ="Språk"; "choose" = "Välj ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -201,6 +202,7 @@ Servernamn:"; "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -208,24 +210,24 @@ Servernamn:"; "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "När jag får en begäran om mottagningskvitto:"; +"When I receive a request for a return receipt" = "När jag får en begäran om mottagningskvitto"; "Never send a return receipt" = "Skicka aldrig mottagningskvitto"; "Allow return receipts for some messages" = "Tillåt mottagningskvitto för vissa meddelanden"; -"If I'm not in the To or Cc of the message:" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält:"; -"If the sender is outside my domain:" = "Om avsändaren finns utanför min domän:"; -"In all other cases:" = "I alla andra fall:"; +"If I'm not in the To or Cc of the message" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält"; +"If the sender is outside my domain" = "Om avsändaren finns utanför min domän"; +"In all other cases" = "I alla andra fall"; "Never send" = "Skicka aldrig"; "Always send" = "Skicka alltid"; "Ask me" = "Fråga mig"; /* Return receipts */ -"When I receive a request for a return receipt:" = "När jag får en begäran om mottagningskvitto:"; +"When I receive a request for a return receipt" = "När jag får en begäran om mottagningskvitto"; "Never send a return receipt" = "Skicka aldrig mottagningskvitto"; "Allow return receipts for some messages" = "Tillåt mottagningskvitto för vissa meddelanden"; -"If I'm not in the To or Cc of the message:" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält:"; -"If the sender is outside my domain:" = "Om avsändaren finns utanför min domän:"; -"In all other cases:" = "I alla andra fall:"; +"If I'm not in the To or Cc of the message" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält"; +"If the sender is outside my domain" = "Om avsändaren finns utanför min domän"; +"In all other cases" = "I alla andra fall"; "Never send" = "Skicka aldrig"; "Always send" = "Skicka alltid"; @@ -296,5 +298,5 @@ Servernamn:"; "Unhandled error response" = "Erreur inconnue"; "Password change is not supported." = "Changement de mot de passe non-supporté."; "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}"; -"New password:" = "Nytt lösenord:"; -"Confirmation:" = "Bekräfta:"; +"New password" = "Nytt lösenord"; +"Confirmation" = "Bekräfta"; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index c73206d0b..5558c7d77 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -26,6 +26,7 @@ #import /* for locale strings */ #import +#import #import #import @@ -643,7 +644,7 @@ static NSArray *reminderValues = nil; SOGoUserSettings *us; NSMutableDictionary *moduleSettings; id whiteList; - + us = [user userSettings]; moduleSettings = [us objectForKey: @"Calendar"]; whiteList = [moduleSettings objectForKey: @"PreventInvitationsWhitelist"]; @@ -652,7 +653,7 @@ static NSArray *reminderValues = nil; { whiteList = [whiteList jsonRepresentation]; } - + return whiteList; } @@ -661,13 +662,13 @@ static NSArray *reminderValues = nil; NSMutableDictionary *moduleSettings; SOGoUserSettings *us; id o; - + us = [user userSettings]; moduleSettings = [us objectForKey: @"Calendar"]; if (!(o = [whiteListString objectFromJSONString])) o = [NSDictionary dictionary]; - + [moduleSettings setObject: o forKey: @"PreventInvitationsWhitelist"]; [us synchronize]; } @@ -752,35 +753,35 @@ static NSArray *reminderValues = nil; /* We want all the SourceIDS */ NSMutableArray *folders, *availableAddressBooksID, *availableAddressBooksName; SOGoParentFolder *contactFolders; - + int i, count; BOOL collectedAlreadyExist; - + contactFolders = [[[context activeUser] homeFolderInContext: context] lookupName: @"Contacts" inContext: context acquire: NO]; folders = [NSMutableArray arrayWithArray: [contactFolders subFolders]]; count = [folders count]-1; - + // Inside this loop we remove all the public or shared addressbooks for (; count >= 0; count--) { if (![[folders objectAtIndex: count] isKindOfClass: [SOGoContactGCSFolder class]]) [folders removeObjectAtIndex: count]; } - + // Parse the objects in order to have only the displayName of the addressbooks to be displayed on the preferences interface availableAddressBooksID = [NSMutableArray arrayWithCapacity: [folders count]]; availableAddressBooksName = [NSMutableArray arrayWithCapacity: [folders count]]; count = [folders count]-1; collectedAlreadyExist = NO; - + for (i = 0; i <= count ; i++) { [availableAddressBooksID addObject:[[folders objectAtIndex:i] realNameInContainer]]; [availableAddressBooksName addObject:[[folders objectAtIndex:i] displayName]]; - + if ([[availableAddressBooksID objectAtIndex:i] isEqualToString: @"collected"]) collectedAlreadyExist = YES; } @@ -795,7 +796,7 @@ static NSArray *reminderValues = nil; [availableAddressBooksID addObject: @"collected"]; [addressBooksIDWithDisplayName setObject: [self labelForKey: @"Collected Address Book"] forKey: @"collected"]; } - + return availableAddressBooksID; } @@ -832,7 +833,7 @@ static NSArray *reminderValues = nil; value = @"every_minute"; else if (interval == 60) value = @"once_per_hour"; - else if (interval == 2 || interval == 5 || interval == 10 + else if (interval == 2 || interval == 5 || interval == 10 || interval == 20 || interval == 30) value = [NSString stringWithFormat: @"every_%d_minutes", interval]; else @@ -1250,7 +1251,7 @@ static NSArray *reminderValues = nil; - (NSString *) forwardConstraints { SOGoDomainDefaults *dd; - + dd = [[context activeUser] domainDefaults]; return [NSString stringWithFormat: @"%d", [dd forwardConstraints]]; @@ -1512,11 +1513,46 @@ static NSArray *reminderValues = nil; - (NSString *) categoryColor { - SOGoDomainDefaults *dd; + NSDictionary *defaultCalendarCategoriesColors; NSString *categoryColor; if (!calendarCategoriesColors) - ASSIGN (calendarCategoriesColors, [userDefaults calendarCategoriesColors]); + { + NSArray *defaultCalendarCategories, *localizedCalendarCategories; + NSMutableDictionary *localizedCalendarCategoriesColors; + NSString *localizedCategory, *defaultCategory; + NSUInteger count, max; + + defaultCalendarCategories = [userDefaults calendarCategories]; + if (defaultCalendarCategories) + { + // User has custom calendar categories + ASSIGN (calendarCategoriesColors, [userDefaults calendarCategoriesColors]); + } + else + { + // Build categories colors dictionary with localized keys + defaultCalendarCategories = [[[self pageResourceManager] stringForKey: @"calendar_category_labels" + inTableNamed: nil + withDefaultValue: nil + languages: [NSArray arrayWithObject: @"English"]] + componentsSeparatedByString: @","]; + defaultCalendarCategoriesColors = [userDefaults calendarCategoriesColors]; + max = [defaultCalendarCategories count]; + localizedCalendarCategories = [self _languageCalendarCategories]; + localizedCalendarCategoriesColors = [NSMutableDictionary dictionaryWithCapacity: max]; + + for (count = 0; count < max; count++) + { + localizedCategory = [localizedCalendarCategories objectAtIndex: count]; + defaultCategory = [defaultCalendarCategories objectAtIndex: count]; + [localizedCalendarCategoriesColors setObject: [defaultCalendarCategoriesColors objectForKey: defaultCategory] + forKey: localizedCategory]; + } + + ASSIGN (calendarCategoriesColors, localizedCalendarCategoriesColors); + } + } categoryColor = [calendarCategoriesColors objectForKey: category]; diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings index 9944a8d0a..fb68f09c1 100644 --- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Увімкнути повідомлення про мою відсутність"; -"Auto reply message :" = "Текст автоматичної відповіді:"; -"Email addresses (separated by commas) :" = "Електронні адреси (розділені комами):"; +"Auto reply message" ="Текст автоматичної відповіді"; +"Email addresses (separated by commas)" ="Електронні адреси (розділені комами)"; "Add default email addresses" = "Додати адреси за замовчанням"; -"Days between responses :" = "Днів між відповідями :"; +"Days between responses" ="Днів між відповідями"; "Do not send responses to mailing lists" = "Не надсилати автоматичні відповіді на адреси розсилок"; "Disable auto reply on" = "Вимкнути автоматичну відповідь"; "Please specify your message and your email addresses for which you want to enable auto reply." @@ -41,10 +41,10 @@ = "Будь ласка, зазначте адресу, на яку потрібно перенаправляти повідомлення, адресовані Вам."; /* d & t */ -"Current Time Zone :" = "Поточна часова зона :"; -"Short Date Format :" = "Стислий формат дати :"; -"Long Date Format :" = "Повний формат дати :"; -"Time Format :" = "Формат часу :"; +"Current Time Zone" ="Поточна часова зона"; +"Short Date Format" ="Стислий формат дати"; +"Long Date Format" ="Повний формат дати"; +"Time Format" ="Формат часу"; "default" = "Типово"; @@ -89,23 +89,23 @@ "timeFmt_3" = ""; /* calendar */ -"Week begins on :" = "Тиждень починаєтья з :"; -"Day start time :" = "Робочий день починається о :"; -"Day end time :" = "Робочий день закінчується о :"; +"Week begins on" ="Тиждень починаєтья з"; +"Day start time" ="Робочий день починається о"; +"Day end time" ="Робочий день закінчується о"; "Day start time must be prior to day end time." = "Початок дня має бути ранішим за кінець дня."; "Show time as busy outside working hours" = "Показувати час зайнятим якщо поза межами робочих годин"; -"First week of year :" = "Перший тиждень року :"; +"First week of year" ="Перший тиждень року"; "Enable reminders for Calendar items" = "Увімкнути нагадування подій календаря"; "Play a sound when a reminder comes due" = "Програти звук у разі сповіщення"; -"Default reminder :" = "Звичайне сповіщення :"; +"Default reminder" ="Звичайне сповіщення"; "firstWeekOfYear_January1" = "Починається 1 січня"; "firstWeekOfYear_First4DayWeek" = "Перший чотириденний тиждень"; "firstWeekOfYear_FirstFullWeek" = "Перший повний тиждень"; /* Default Calendar */ -"Default calendar :" = "Типовий календар"; +"Default calendar" ="Типовий календар"; "selectedCalendar" = "Вибраний календар"; "personalCalendar" = "Особистий календар"; "firstCalendar" = "Перший активний календар"; @@ -135,7 +135,7 @@ "refreshview_every_30_minutes" = "Кожні 30 хвилин"; "refreshview_once_per_hour" = "Раз на годину"; -"Forward messages:" = "Перенаправляти повідомлення:"; +"Forward messages" = "Перенаправляти повідомлення"; "messageforward_inline" = "В тілі листа"; "messageforward_attached" = "Вкладеним файлом"; @@ -151,14 +151,14 @@ /* IMAP Accounts */ "New Mail Account" = "Новий обліковий запис"; -"Server Name:" = "Ім’я сервера:"; -"Port:" = "Порт:"; -"User Name:" = "Ім’я користувача:"; -"Password:" = "Пароль:"; +"Server Name" = "Ім’я сервера"; +"Port" = "Порт"; +"User Name" = "Ім’я користувача"; +"Password" = "Пароль"; -"Full Name:" = "Повне ім’я:"; -"Email:" = "E-Mail:"; -"Signature:" = "Підпис:"; +"Full Name" = "Повне ім’я"; +"Email" = "E-Mail"; +"Signature" = "Підпис"; "(Click to create)" = "(Клацніть, щоб додати)"; "Signature" = "Підпис"; @@ -168,13 +168,13 @@ "Additional Parameters" = "Додаткові параметри"; /* password */ -"New password:" = "Новий пароль:"; -"Confirmation:" = "Повтор нового пароля:"; +"New password" = "Новий пароль"; +"Confirmation" = "Повтор нового пароля"; "Change" = "Змінити"; /* Event+task classifications */ -"Default events classification :" = "Класифікація типових подій:"; -"Default tasks classification :" = "Класифікація типових завдань:"; +"Default events classification" ="Класифікація типових подій"; +"Default tasks classification" ="Класифікація типових завдань"; "PUBLIC_item" = "Загальний доступ"; "CONFIDENTIAL_item" = "Обмежений доступ"; "PRIVATE_item" = "Приватний доступ"; @@ -188,13 +188,14 @@ "Contacts" = "Адресна книга"; "Mail" = "Електронна пошта"; "Last" = "Останнє"; -"Default Module :" = "Модуль за замовчанням :"; +"Default Module " = "Модуль за замовчанням "; -"Language :" = "Мова :"; +"Language" ="Мова"; "choose" = "Choose ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -211,6 +212,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -218,12 +220,12 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "Коли я отримую запит на сповіщення про прочитання:"; +"When I receive a request for a return receipt" = "Коли я отримую запит на сповіщення про прочитання"; "Never send a return receipt" = "Ніколи не відправляти сповіщення"; "Allow return receipts for some messages" = "Дозволити надсилати сповіщення для окремих повідомлень"; -"If I'm not in the To or Cc of the message:" = "Якщо я не серед адресатів та у копії листа:"; -"If the sender is outside my domain:" = "Якщо відправник не з мого домену:"; -"In all other cases:" = "У всіх інших випадках:"; +"If I'm not in the To or Cc of the message" = "Якщо я не серед адресатів та у копії листа"; +"If the sender is outside my domain" = "Якщо відправник не з мого домену"; +"In all other cases" = "У всіх інших випадках"; "Never send" = "Ніколи не відправляти"; "Always send" = "Завжди відправляти"; @@ -285,11 +287,11 @@ "Password must not be empty." = "Пароль не має бути порожнім"; "The passwords do not match. Please try again." = "Паролі не співпадають. Спробуйте ще раз."; "Password change failed" = "Помилка під час зміни пароля."; -"Password change failed - Permission denied" = "Помилка під час зміни пароля: доступ заборонено."; -"Password change failed - Insufficient password quality" = "Помилка під час зміни пароля: недостатня стійкість пароля"; -"Password change failed - Password is too short" = "Помилка під час зміни пароля: пароль замалий"; -"Password change failed - Password is too young" = "Помилка під час зміни пароля: такий пароль нещодавно вже встановлювався"; -"Password change failed - Password is in history" = "Помилка під час зміни пароля: такий пароль вже встановлювався"; +"Password change failed - Permission denied" = "Помилка під час зміни пароля доступ заборонено."; +"Password change failed - Insufficient password quality" = "Помилка під час зміни пароля недостатня стійкість пароля"; +"Password change failed - Password is too short" = "Помилка під час зміни пароля пароль замалий"; +"Password change failed - Password is too young" = "Помилка під час зміни пароля такий пароль нещодавно вже встановлювався"; +"Password change failed - Password is in history" = "Помилка під час зміни пароля такий пароль вже встановлювався"; "Unhandled policy error: %{0}" = "Невідома помилка політик: %{0}"; "Unhandled error response" = "Невідома помилка"; "Password change is not supported." = "Зміна паролю не підтримується."; diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings index b2f2622d6..3c289b703 100644 --- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings @@ -22,10 +22,10 @@ /* vacation (auto-reply) */ "Enable vacation auto reply" = "Enable vacation auto reply"; -"Auto reply message :" = "Ymateb Awtomatig unwaith yn unig i pob anfonwr gyda'r testun canlynol :"; -"Email addresses (separated by commas) :" = "Email addresses (separated by commas) :"; +"Auto reply message" ="Ymateb Awtomatig unwaith yn unig i pob anfonwr gyda'r testun canlynol"; +"Email addresses (separated by commas)" ="Email addresses (separated by commas)"; "Add default email addresses" = "Add default email addresses"; -"Days between responses :" = "Days between responses :"; +"Days between responses" ="Days between responses"; "Do not send responses to mailing lists" = "Do not send responses to mailing lists"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Please specify your message and your email addresses for which you want to enable auto reply."; @@ -37,10 +37,10 @@ = "Please specify an address to which you want to forward your messages."; /* d & t */ -"Current Time Zone :" = "Amser Cyfredol :"; -"Short Date Format :" = "Dyddiad fformat byr :"; -"Long Date Format :" = "Dyddiad fformat hir :"; -"Time Format :" = "Fformat amser :"; +"Current Time Zone" ="Amser Cyfredol"; +"Short Date Format" ="Dyddiad fformat byr"; +"Long Date Format" ="Dyddiad fformat hir"; +"Time Format" ="Fformat amser"; "default" = "Default"; @@ -78,22 +78,22 @@ "timeFmt_2" = ""; /* calendar */ -"Week begins on :" = "wythnos yn dechrau :"; -"Day start time :" = "Amser dechrau'r diwrnod :"; -"Day end time :" = "Amser diwedd y dydd :"; +"Week begins on" ="wythnos yn dechrau"; +"Day start time" ="Amser dechrau'r diwrnod"; +"Day end time" ="Amser diwedd y dydd"; "Day start time must be prior to day end time." = "Day start time must be prior to day end time."; -"First week of year :" = "Wythnos cyntaf y flwyddyn :"; +"First week of year" ="Wythnos cyntaf y flwyddyn"; "Enable reminders for Calendar items" = "Galluogu atgoffa ar gyfer eitemau calendr"; "Play a sound when a reminder comes due" = "Chwarae swn pan fydd amser atgoffa"; -"Default reminder :" = "Atgoffa gwreiddiol :"; +"Default reminder" ="Atgoffa gwreiddiol"; "firstWeekOfYear_January1" = "Dechrau ar Ionawr 1"; "firstWeekOfYear_First4DayWeek" = "First 4-day week"; "firstWeekOfYear_FirstFullWeek" = "Wythnos cyntaf llawn"; /* Default Calendar */ -"Default calendar :" = "Default calendar"; +"Default calendar" ="Default calendar"; "selectedCalendar" = "Selected calendar"; "personalCalendar" = "Personal calendar"; "firstCalendar" = "First enabled calendar"; @@ -123,7 +123,7 @@ "refreshview_every_30_minutes" = "Pob 30 munud"; "refreshview_once_per_hour" = "Unwaith pob awr"; -"Forward messages:" = "Blaenyrru negeseuon:"; +"Forward messages" = "Blaenyrru negeseuon"; "messageforward_inline" = "Mewn llinell"; "messageforward_attached" = "Fel Atodiad"; @@ -139,14 +139,14 @@ /* IMAP Accounts */ "New Mail Account" = "New Mail Account"; -"Server Name:" = "Server Name:"; -"Port:" = "Port:"; -"User Name:" = "User Name:"; -"Password:" = "Cyfrinair:"; +"Server Name" = "Server Name"; +"Port" = "Port"; +"User Name" = "User Name"; +"Password" = "Cyfrinair"; -"Full Name:" = "Full Name:"; -"Email:" = "Email:"; -"Signature:" = "Llofnod:"; +"Full Name" = "Full Name"; +"Email" = "Email"; +"Signature" = "Llofnod"; "(Click to create)" = "(Click to create)"; "Signature" = "Llofnod"; @@ -156,13 +156,13 @@ "Additional Parameters" = "Additional Parameters"; /* password */ -"New password:" = "New password:"; -"Confirmation:" = "Confirmation:"; +"New password" = "New password"; +"Confirmation" = "Confirmation"; "Change" = "Change"; /* Event+task classifications */ -"Default events classification :" = "Default events classification :"; -"Default tasks classification :" = "Default tasks classification :"; +"Default events classification" ="Default events classification"; +"Default tasks classification" ="Default tasks classification"; "PUBLIC_item" = "Public"; "CONFIDENTIAL_item" = "Confidential"; "PRIVATE_item" = "Private"; @@ -176,13 +176,14 @@ "Contacts" = "Address Book"; "Mail" = "Mail"; "Last" = "Last used"; -"Default Module :" = "Default module :"; +"Default Module " = "Default module "; -"Language :" = "Iaith :"; +"Language" ="Iaith"; "choose" = "Dewis ..."; "Arabic" = "العربية"; "Basque" = "Euskara"; "Catalan" = "Català"; +"ChineseTaiwan" = "Chinese (Taiwan)"; "Czech" = "Česky"; "Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; @@ -199,6 +200,7 @@ "Polish" = "Polski"; "Russian" = "Русский"; "Slovak" = "Slovensky"; +"Slovenian" = "Slovenščina"; "SpanishSpain" = "Español (España)"; "SpanishArgentina" = "Español (Argentina)"; "Swedish" = "Svenska"; @@ -206,24 +208,24 @@ "Welsh" = "Cymraeg"; /* Return receipts */ -"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:"; +"When I receive a request for a return receipt" = "When I receive a request for a return receipt"; "Never send a return receipt" = "Never send a return receipt"; "Allow return receipts for some messages" = "Allow return receipts for some messages"; -"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:"; -"If the sender is outside my domain:" = "If the sender is outside my domain:"; -"In all other cases:" = "In all other cases:"; +"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message"; +"If the sender is outside my domain" = "If the sender is outside my domain"; +"In all other cases" = "In all other cases"; "Never send" = "Never send"; "Always send" = "Always send"; "Ask me" = "Ask me"; /* Return receipts */ -"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:"; +"When I receive a request for a return receipt" = "When I receive a request for a return receipt"; "Never send a return receipt" = "Never send a return receipt"; "Allow return receipts for some messages" = "Allow return receipts for some messages"; -"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:"; -"If the sender is outside my domain:" = "If the sender is outside my domain:"; -"In all other cases:" = "In all other cases:"; +"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message"; +"If the sender is outside my domain" = "If the sender is outside my domain"; +"In all other cases" = "In all other cases"; "Never send" = "Never send"; "Always send" = "Always send"; @@ -294,5 +296,5 @@ "Unhandled error response" = "Erreur inconnue"; "Password change is not supported." = "Changement de mot de passe non-supporté."; "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}"; -"New password:" = "New password:"; -"Confirmation:" = "Confirmation:"; +"New password" = "New password"; +"Confirmation" = "Confirmation"; diff --git a/UI/Scheduler/Arabic.lproj/Localizable.strings b/UI/Scheduler/Arabic.lproj/Localizable.strings index 1d4b86057..8e457c291 100644 --- a/UI/Scheduler/Arabic.lproj/Localizable.strings +++ b/UI/Scheduler/Arabic.lproj/Localizable.strings @@ -152,33 +152,33 @@ "Appointment editor" = "محرر المواعيد"; "Appointment proposal" = "اقتراح المواعيد"; "Appointment on" = "تشغيل المواعيد"; -"Start:" = "البدء:"; -"End:" = "النهاية:"; -"Due Date:" = "تاريخ الاستحقاق:"; -"Title:" = "العنوان:"; -"Calendar:" = "الحالة:"; +"Start" = "البدء"; +"End" = "النهاية"; +"Due Date" = "تاريخ الاستحقاق"; +"Title" = "العنوان"; +"Calendar" = "الحالة"; "Name" = "الاسم"; "Email" = "البريد الإلكتروني"; -"Status:" = "الحالة:"; +"Status" = "الحالة"; "% complete" = "اكتمل %c"; -"Location:" = "المكان:"; -"Priority:" = "الأولوية:"; +"Location" = "المكان"; +"Priority" = "الأولوية"; "Privacy" = "الخصوصية"; "Cycle" = "الدورة"; "Cycle End" = "نهاية الدورة"; "Categories" = "التصنيفات"; "Classification" = "التصنيف"; "Duration" = "المدة"; -"Attendees:" = "الحضور:"; +"Attendees" = "الحضور"; "Resources" = "الموارد"; -"Organizer:" = "المنظم:"; -"Description:" = "الوصف:"; -"Document:" = "المستند:"; -"Category:" = "التصنيف:"; -"Repeat:" = "التكرار:"; -"Reminder:" = "التنبيه:"; -"General:" = "العام:"; -"Reply:" = "الرد:"; +"Organizer" = "المنظم"; +"Description" = "الوصف"; +"Document" = "المستند"; +"Category" = "التصنيف"; +"Repeat" = "التكرار"; +"Reminder" = "التنبيه"; +"General" = "العام"; +"Reply" = "الرد"; "Target:" = "الهدف:"; @@ -223,7 +223,7 @@ "view_future" = "جميع الأحداث المستقبلية"; "view_selectedday" = "اليوم المحدد"; -"View:" = "العرض:"; +"View" = "العرض"; "Title or Description" = "العنوان أو الوصف"; "Search" = "ابحث"; @@ -481,8 +481,8 @@ vtodo_class2 = "(مهمة سرية)"; "button_allOccurrences" = "كل التكرارات"; /* Properties dialog */ -"Name:" = "الاسم:"; -"Color:" = "اللون:"; +"Name" = "الاسم"; +"Color" = "اللون"; "Include in free-busy" = "ضمن حالة التوفر-الانشغال"; @@ -497,7 +497,7 @@ vtodo_class2 = "(مهمة سرية)"; "Notifications" = "الإشعارات"; "Receive a mail when I modify my calendar" = "تلقي البريد عندما أقوم بتعديل التقويم الخاص بي"; "Receive a mail when someone else modifies my calendar" = "تلقي البريد عندما يقوم شخص آخر بتعديل التقويم الخاص بي"; -"When I modify my calendar, send a mail to:" = "عندما أقوم بتعديل التقويم الخاص بي، أرسل رسالة بريد إلكتروني إلى:"; +"When I modify my calendar, send a mail to" = "عندما أقوم بتعديل التقويم الخاص بي، أرسل رسالة بريد إلكتروني إلى"; "Links to this Calendar" = "روابط لهذا التقويم"; "Authenticated User Access" = "مصادقة وصول المستخدم"; diff --git a/UI/Scheduler/Basque.lproj/Localizable.strings b/UI/Scheduler/Basque.lproj/Localizable.strings index 8e0c6589f..53d10b842 100644 --- a/UI/Scheduler/Basque.lproj/Localizable.strings +++ b/UI/Scheduler/Basque.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Zerrenda"; "Print Settings" = "Ezarpenak inprimatu"; -"Title:" = "Izena:"; -"Layout:" = "Plana"; +"Title" = "Izena"; +"Layout" = "Plana"; "What to Print" = "Inprimatzeko elementuak"; "Options" = "Aukerak"; "Tasks with no due date" = "Amaiera-datarik gabeko eginkizunak"; @@ -167,34 +167,34 @@ "Appointment editor" = "Kontaktuen editorea"; "Appointment proposal" = "Hitzordu proposamenak"; "Appointment on" = "Hitzordua"; -"Start:" = "Hasi:"; -"End:" = "Amaitu:"; -"Due Date:" = "Epemuga:"; -"Title:" = "Izena:"; -"Calendar:" = "Egutegia"; +"Start" = "Hasi"; +"End" = "Amaitu"; +"Due Date" = "Epemuga"; +"Title" = "Izena"; +"Calendar" = "Egutegia"; "Name" = "Izena"; "Email" = "Emaila"; -"Status:" = "Egoera"; +"Status" = "Egoera"; "% complete" = "% amaituta"; -"Location:" = "Kokapena"; -"Priority:" = "Lehentasuna"; +"Location" = "Kokapena"; +"Priority" = "Lehentasuna"; "Privacy" = "Pribatasuna"; "Cycle" = "Zikloa"; "Cycle End" = "Zikloaren amaiera"; "Categories" = "Kategoriak"; "Classification" = "Sailkapena"; "Duration" = "Epea"; -"Attendees:" = "Partaideak:"; +"Attendees" = "Partaideak"; "Resources" = "Baliabideak"; -"Organizer:" = "Antolatzailea:"; -"Description:" = "Deskribapena:"; -"Document:" = "Dokumentua:"; -"Category:" = "Kategoria:"; -"Repeat:" = "Errepikatu:"; -"Reminder:" = "Oroigarria:"; -"General:" = "Orokorra:"; -"Reply:" = "Errepikatu:"; -"Created by:" = "Honek sortua:"; +"Organizer" = "Antolatzailea"; +"Description" = "Deskribapena"; +"Document" = "Dokumentua"; +"Category" = "Kategoria"; +"Repeat" = "Errepikatu"; +"Reminder" = "Oroigarria"; +"General" = "Orokorra"; +"Reply" = "Errepikatu"; +"Created by" = "Honek sortua"; "Target:" = "Helburua:"; @@ -244,7 +244,7 @@ "view_overdue" = "Epemuga gainditutako zeregina"; "view_incomplete" = "Amaitu gabeko zeregina"; -"View:" = "Ikuskatu:"; +"View" = "Ikuskatu"; "Title, category or location" = "Izenburua, sailkapena edo kokapena"; "Entire content" = "Eduki osoa"; @@ -480,9 +480,9 @@ validate_endbeforestart = "Ipini duzun amaiera-data hasiera-dataren aurretik /* apt list */ "Title" = "Izenburua"; -"Start" = "Hasi:"; -"End" = "Amaitu:"; -"Due Date" = "Epemuga:"; +"Start" = "Hasi"; +"End" = "Amaitu"; +"Due Date" = "Epemuga"; "Location" = "Kokapena"; "(Private Event)" = "(Ekitaldi pribatua)"; @@ -508,8 +508,8 @@ vtodo_class2 = "(Isilpeko zeregina)"; "button_allOccurrences" = "Agerraldi guztiak"; /* Properties dialog */ -"Name:" = "Izena:"; -"Color:" = "Kolorea:"; +"Name" = "Izena"; +"Color" = "Kolorea"; "Include in free-busy" = "libre-lanpetua-n gehitu"; @@ -524,11 +524,11 @@ vtodo_class2 = "(Isilpeko zeregina)"; "Notifications" = "Jakinarazpenak"; "Receive a mail when I modify my calendar" = "Jaso mezua nere egutegia aldatzen dudanean"; "Receive a mail when someone else modifies my calendar" = "Jaso mezua edonorkl nere egutegia aldatzen duenean"; -"When I modify my calendar, send a mail to:" = "Nere egutegia aldatzen dudanean, bidali mezua honi:"; +"When I modify my calendar, send a mail to" = "Nere egutegia aldatzen dudanean, bidali mezua honi"; "Links to this Calendar" = "Egutegi honetarako estekak"; "Authenticated User Access" = "Autentifikatutako erabiltzaileentzako atzipena"; -"CalDAV URL" = "CalDAV URL-a:"; +"CalDAV URL" = "CalDAV URL-a"; "WebDAV ICS URL" = "WebDAV ICS URL-a"; "WebDAV XML URL" = "WebDAV XML URL-a"; diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings index b3686c62f..8def18978 100644 --- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Configurações de Impressão"; -"Title:" = "Título:"; -"Layout:" = "Layout:"; +"Title" = "Título"; +"Layout" = "Layout"; "What to Print" = "O que imprimir"; "Options" = "Opções"; "Tasks with no due date" = "Tarefas sem data de vencimento"; @@ -167,34 +167,34 @@ "Appointment editor" = "Editor de Compromisso"; "Appointment proposal" = "Compromisso Proposto"; "Appointment on" = "Compromisso em"; -"Start:" = "Inicio:"; -"End:" = "Fim:"; -"Due Date:" = "Data:"; -"Title:" = "Título:"; -"Calendar:" = "Calendário:"; +"Start" = "Inicio"; +"End" = "Fim"; +"Due Date" = "Data"; +"Title" = "Título"; +"Calendar" = "Calendário"; "Name" = "Nome"; "Email" = "Correio"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% completado"; -"Location:" = "Localização:"; -"Priority:" = "Prioridade:"; +"Location" = "Localização"; +"Priority" = "Prioridade"; "Privacy" = "Privacidade"; "Cycle" = "Ciclo"; "Cycle End" = "Ciclo Final"; "Categories" = "Categorias"; "Classification" = "Classificação"; "Duration" = "Duração"; -"Attendees:" = "Participantes:"; +"Attendees" = "Participantes"; "Resources" = "Recursos"; -"Organizer:" = "Organizador:"; -"Description:" = "Descrição:"; -"Document:" = "Documento:"; -"Category:" = "Categoria:"; -"Repeat:" = "Repetir:"; -"Reminder:" = "Lembrete:"; -"General:" = "Geral:"; -"Reply:" = "Responder:"; -"Created by:" = "Criado por:"; +"Organizer" = "Organizador"; +"Description" = "Descrição"; +"Document" = "Documento"; +"Category" = "Categoria"; +"Repeat" = "Repetir"; +"Reminder" = "Lembrete"; +"General" = "Geral"; +"Reply" = "Responder"; +"Created by" = "Criado por"; "Target:" = "Marca:"; @@ -244,7 +244,7 @@ "view_overdue" = "Tarefas em atraso"; "view_incomplete" = "Tarefas incompletas"; -"View:" = "Visão:"; +"View" = "Visão"; "Title, category or location" = "Título, categoria ou localização"; "Entire content" = "Todo o conteúdo"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Tarefa Confidencial)"; "button_allOccurrences" = "Todas as ocorrências"; /* Properties dialog */ -"Name:" = "Nome:"; -"Color:" = "Cor:"; +"Name" = "Nome"; +"Color" = "Cor"; "Include in free-busy" = "Incluir na disponibilidade"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Tarefa Confidencial)"; "Notifications" = "Notificações"; "Receive a mail when I modify my calendar" = "Receber um email quando eu modificar meu calendário"; "Receive a mail when someone else modifies my calendar" = "Receber um email quando alguem modificar meu calendário"; -"When I modify my calendar, send a mail to:" = "Quando eu modificar meu calendário, enviar um email para:"; +"When I modify my calendar, send a mail to" = "Quando eu modificar meu calendário, enviar um email para"; "Links to this Calendar" = "Links para este Calendário"; "Authenticated User Access" = "Acesso a Usuário Autenticado"; -"CalDAV URL" = "CalDAV URL:"; +"CalDAV URL" = "CalDAV URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Catalan.lproj/Localizable.strings b/UI/Scheduler/Catalan.lproj/Localizable.strings index 30f5ef20b..2c8dbf04b 100644 --- a/UI/Scheduler/Catalan.lproj/Localizable.strings +++ b/UI/Scheduler/Catalan.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Llista"; "Print Settings" = "Configuració d'Impressió"; -"Title:" = "Títol:"; -"Layout:" = "Disseny:"; +"Title" = "Títol"; +"Layout" = "Disseny"; "What to Print" = "Què imprimir"; "Options" = "Opcions"; "Tasks with no due date" = "Tasques sense data de finalització"; @@ -164,34 +164,34 @@ "Appointment editor" = "Modificar cita"; "Appointment proposal" = "Proposta de cita"; "Appointment on" = "Cita sobre"; -"Start:" = "Des de:"; -"End:" = "Fins a:"; -"Due Date:" = "Data límit:"; -"Title:" = "Títol:"; -"Calendar:" = "Calendari:"; +"Start" = "Des de"; +"End" = "Fins a"; +"Due Date" = "Data límit"; +"Title" = "Títol"; +"Calendar" = "Calendari"; "Name" = "Nom"; "Email" = "Correu"; -"Status:" = "Estat:"; +"Status" = "Estat"; "% complete" = "% complet"; -"Location:" = "Lloc:"; -"Priority:" = "Prioritat:"; +"Location" = "Lloc"; +"Priority" = "Prioritat"; "Privacy" = "Privacitat"; "Cycle" = "Repetir"; "Cycle End" = "Final repetició"; "Categories" = "Categories"; "Classification" = "Privacitat"; "Duration" = "Duració"; -"Attendees:" = "Assistents:"; +"Attendees" = "Assistents"; "Resources" = "Recursos"; -"Organizer:" = "Organitzador:"; -"Description:" = "Descripció:"; -"Document:" = "Document:"; -"Category:" = "Categoria:"; -"Repeat:" = "Repetir:"; -"Reminder:" = "Recordatori:"; -"General:" = "General:"; -"Reply:" = "Respondre:"; -"Created by:" = "Creat per:"; +"Organizer" = "Organitzador"; +"Description" = "Descripció"; +"Document" = "Document"; +"Category" = "Categoria"; +"Repeat" = "Repetir"; +"Reminder" = "Recordatori"; +"General" = "General"; +"Reply" = "Respondre"; +"Created by" = "Creat per"; "Target:" = "URL document:"; @@ -241,7 +241,7 @@ "view_overdue" = "Tasques vençudes"; "view_incomplete" = "Incomplete tasks"; -"View:" = "Veure:"; +"View" = "Veure"; "Title, category or location" = "Títol, categoria o ubicació"; "Entire content" = "Tot el contingut"; @@ -329,7 +329,7 @@ "No end date" = "Sense data final"; "Create" = "Fins a crear"; "appointment(s)" = "cita/es"; -"Repeat until" = "Fins a: "; +"Repeat until" = "Fins a "; "First" = "Primer"; "Second" = "Segon"; @@ -503,8 +503,8 @@ vtodo_class2 = "(Tasca confidencial)"; "button_allOccurrences" = "Totes les ocurrències"; /* Properties dialog */ -"Name:" = "Nom:"; -"Color:" = "Color:"; +"Name" = "Nom"; +"Color" = "Color"; "Include in free-busy" = "Inclòs en lliure-ocupat"; @@ -519,11 +519,11 @@ vtodo_class2 = "(Tasca confidencial)"; "Notifications" = "Notificacions"; "Receive a mail when I modify my calendar" = "Rebre un correu de notificació quan modifique el meu calendari"; "Receive a mail when someone else modifies my calendar" = "Rebre un correu de notificació quan altra persona modifique el meu calendari "; -"When I modify my calendar, send a mail to:" = "Quan modifique el meu calendari, enviar un correu a: "; +"When I modify my calendar, send a mail to" = "Quan modifique el meu calendari, enviar un correu a "; "Links to this Calendar" = "Enllaços a aquest calendari"; "Authenticated User Access" = "Accés autenticat"; -"CalDAV URL" = "URL CalDAV:"; +"CalDAV URL" = "URL CalDAV"; "WebDAV ICS URL" = "url WebDAV ICS"; "WebDAV XML URL" = "url WebDAV XML"; diff --git a/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings b/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings new file mode 100644 index 000000000..98307290e --- /dev/null +++ b/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings @@ -0,0 +1,564 @@ +/* this file is in UTF-8 format! */ + +/* Tooltips */ + +"Create a new event" = "新增事件"; +"Create a new task" = "新增任務"; +"Edit this event or task" = "編輯事件或任務"; +"Print the current calendar view" = "列印正在瀏覽的行事曆"; +"Delete this event or task" = "刪除事件或任務"; +"Go to today" = "移動到今天"; +"Switch to day view" = "切換到日檢視"; +"Switch to week view" = "切換到週檢視"; +"Switch to month view" = "切換到月檢視"; +"Reload all calendars" = "重新載入所有行事曆"; + +/* Tabs */ +"Date" = "日期"; +"Calendars" = "行事曆"; + +/* Day */ + +"DayOfTheMonth" = "該月的同一日"; +"dayLabelFormat" = "%m/%d/%Y"; +"today" = "今天"; + +"Previous Day" = "前一日"; +"Next Day" = "後一日"; + +/* Week */ + +"Week" = "週"; +"this week" = "本週"; + +"Week %d" = "第 %d 週"; + +"Previous Week" = "前一週"; +"Next Week" = "後一週"; + +/* Month */ + +"this month" = "本月"; + +"Previous Month" = "前一月"; +"Next Month" = "後一月"; + +/* Year */ + +"this year" = " 今年"; + +/* Menu */ + +"Calendar" = "行事曆"; +"Contacts" = "連絡人"; + +"New Calendar..." = "建立新行事曆..."; +"Delete Calendar" = "刪除行事曆..."; +"Unsubscribe Calendar" = "取消訂閱"; +"Sharing..." = "分享..."; +"Export Calendar..." = "匯出行事曆..."; +"Import Events..." = "匯入事件..."; +"Import Events" = "匯入事件"; +"Select an iCalendar file (.ics)." = "選擇iCalendar文件檔(.ics)。"; +"Upload" = "上傳"; +"Uploading" = "上傳中"; +"Publish Calendar..." = "公開行事曆..."; +"Reload Remote Calendars" = "重新載入遠端的行事曆"; +"Properties" = "屬性"; +"Done" = "完成"; +"An error occurred while importing calendar." = "匯入行事曆時發生錯誤。"; +"No event was imported." = "沒有事件匯入。\""; +"A total of %{0} events were imported in the calendar." = "共 %{0} 筆事件匯入此行事曆。"; + +"Compose E-Mail to All Attendees" = "發送通知信件給所有的邀請者"; +"Compose E-Mail to Undecided Attendees" = "發送通知信件給所有未定的邀請者"; + +/* Folders */ +"Personal calendar" = "個人行事曆"; + +/* Misc */ + +"OpenGroupware.org" = "OpenGroupware.org"; +"Forbidden" = "禁止"; + +/* acls */ + +"Access rights to" = "給予存取權限至"; +"For user" = "给使用者"; + +"Any Authenticated User" = "任一授權的使用者"; +"Public Access" = "公開存取"; + +"label_Public" = "公開"; +"label_Private" = "私人"; +"label_Confidential" = "機密"; + +"label_Viewer" = "顯示全部"; +"label_DAndTViewer" = "只顯示日期和時間"; +"label_Modifier" = "修改"; +"label_Responder" = " 回應"; +"label_None" = "無"; + +"View All" = "顯示全部"; +"View the Date & Time" = "只顯示日期和時間"; +"Modify" = "修改"; +"Respond To" = "回應"; +"None" = "無"; + +"This person can create objects in my calendar." += "允許在我的行事曆新增事件。"; +"This person can erase objects from my calendar." += "允許在我的行事曆刪除事件。"; + +/* Button Titles */ + +"Subscribe to a Calendar..." = "\"訂閱行事曆..."; +"Remove the selected Calendar" = "移除選擇的行事曆"; + +"Name of the Calendar" = "行事曆名稱"; + +"new" = "新增"; +"Print view" = "預覽列印"; +"edit" = "編輯"; +"delete" = "删除"; +"proposal" = "建議"; +"Save and Close" = "儲存並關閉"; +"Close" = "關閉"; +"Invite Attendees" = "邀請出席者"; +"Attach" = "附加檔案"; +"Update" = "更新"; +"Cancel" = "取消"; +"show_rejected_apts" = "顯示已拒絶的邀請"; +"hide_rejected_apts" = "隱藏已拒絶的邀請"; + + +/* Schedule */ + +"Schedule" = "行程"; +"No appointments found" = "沒有議程"; +"Meetings proposed by you" = "您主持的會議"; +"Meetings proposed to you" = "您出席的會議"; +"sched_startDateFormat" = "%d/%m %H:%M"; +"action" = "操作"; +"accept" = "接受"; +"decline" = "拒絶"; +"more attendees" = "其他出席者"; +"Hide already accepted and rejected appointments" = "隱藏已接受/已拒絶的議程"; +"Show already accepted and rejected appointments" = "顯示已接受/已拒絶的議程"; + +/* Print view */ + +"LIST" = "列表"; +"Print Settings" = "列印設定"; +"Title" = "標題"; +"Layout" = "格式"; +"What to Print" = "列印內容"; +"Options" = "選項"; +"Tasks with no due date" = "無截止日期的任務"; +"Display working hours only" = "只顯示工作時段"; +"Completed tasks" = "完成的任務"; +"Display events and tasks colors" = "顯示事件和任務的顏色"; +"Borders" = "邊界"; +"Backgrounds" = "背景"; + +/* Appointments */ + +"Appointment viewer" = "顯示議程"; +"Appointment editor" = "編輯議程"; +"Appointment proposal" = "安排議程"; +"Appointment on" = "會議安排在"; +"Start" = "開始"; +"End" = "結束"; +"Due Date" = "到期日"; +"Title" = "標題"; +"Calendar" = "行事曆"; +"Name" = "名字"; +"Email" = "郵件"; +"Status" = "狀態"; +"% complete" = "% 完成"; +"Location" = "地點"; +"Priority" = "優先順序"; +"Privacy" = "私人"; +"Cycle" = "重複事件"; +"Cycle End" = "重複事件結束"; +"Categories" = "類别"; +"Classification" = "分類"; +"Duration" = "期間"; +"Attendees" = "出席者"; +"Resources" = "資源"; +"Organizer" = "發起人"; +"Description" = "說明"; +"Document" = "文件"; +"Category" = "類別"; +"Repeat" = "重複"; +"Reminder" = "提醒"; +"General" = "一般"; +"Reply" = "回覆"; +"Created by" = "建立者"; + + +"Target:" = "目標:"; + +"attributes" = "屬性"; +"attendees" = "出席者"; +"delegated from" = "委任自"; + +/* checkbox title */ +"is private" = "私人的"; +/* classification */ +"Public" = "公開"; +"Private" = "私人"; +/* text used in overviews and tooltips */ +"empty title" = "沒有主題"; +"private appointment" = "私人議程"; + +"Change..." = "修改..."; + +/* Appointments (participation state) */ + +"partStat_NEEDS-ACTION" = "我稍後確認"; +"partStat_ACCEPTED" = "我會出席"; +"partStat_DECLINED" = "我不出席"; +"partStat_TENTATIVE" = "我可能出席"; +"partStat_DELEGATED" = "我委任其他人出席"; +"partStat_OTHER" = "其它"; + +/* Appointments (error messages) */ + +"Conflicts found!" = "發現衝突事件!"; +"Invalid iCal data!" = "無效的 iCal 資料!"; +"Could not create iCal data!" = "無法建立 iCal 資料!"; + +/* Searching */ + +"view_all" = "全部"; +"view_today" = "今天"; +"view_next7" = "一週後"; +"view_next14" = "二週後"; +"view_next31" = "31天後"; +"view_thismonth" = "本月"; +"view_future" = "全部將來的事件"; +"view_selectedday" = "選擇的日期"; + +"view_not_started" = "尚未開始的任務"; +"view_overdue" = "逾期的任務"; +"view_incomplete" = "未完任的任務"; + +"View" = "檢視"; +"Title, category or location" = "主題, 類別或地點"; +"Entire content" = "全部內容"; + +"Search" = "搜尋"; +"Search attendees" = "搜尋出席者"; +"Search resources" = "搜尋資源"; +"Search appointments" = "搜尋議程"; + +"All day Event" = "全天事件"; +"check for conflicts" = "檢查衝突事件"; + +"Browse URL" = "瀏覽網址"; + +"newAttendee" = "增加出席者"; + +/* calendar modes */ + +"Overview" = "總覽"; +"Chart" = "圖表"; +"List" = "列表"; +"Columns" = "列"; + +/* Priorities */ + +"prio_0" = "未指定"; +"prio_1" = "重要"; +"prio_2" = "重要"; +"prio_3" = "重要"; +"prio_4" = "重要"; +"prio_5" = "一般"; +"prio_6" = "低"; +"prio_7" = "低"; +"prio_8" = "低"; +"prio_9" = "低"; + +/* access classes (privacy) */ +"PUBLIC_vevent" = "公開事件"; +"CONFIDENTIAL_vevent" = "機密事件"; +"PRIVATE_vevent" = "私人事件"; +"PUBLIC_vtodo" = "公開任務"; +"CONFIDENTIAL_vtodo" = "機密任務"; +"PRIVATE_vtodo" = "私人任務"; + +/* status type */ +"status_" = "未指定"; +"status_NOT-SPECIFIED" = "未指定"; +"status_TENTATIVE" = "未定"; +"status_CONFIRMED" = "確認"; +"status_CANCELLED" = "取消"; +"status_NEEDS-ACTION" = "需要操作"; +"status_IN-PROCESS" = "處理中"; +"status_COMPLETED" = "完成於"; + +/* Cycles */ + +"cycle_once" = "重複一次"; +"cycle_daily" = "日重複"; +"cycle_weekly" = "週重複"; +"cycle_2weeks" = "雙週重複"; +"cycle_4weeks" = "每四週重複"; +"cycle_monthly" = "月重覆"; +"cycle_weekday" = "週末重覆"; +"cycle_yearly" = "年重複"; + +"cycle_end_never" = "沒有結束日期"; +"cycle_end_until" = "結束於"; + +"Recurrence pattern" = "重複模式"; +"Range of recurrence" = "重複範圍"; + +"Repeat" = "重複"; +"Daily" = "日"; +"Weekly" = "週"; +"Monthly" = "月"; +"Yearly" = "年"; +"Every" = "每"; +"Days" = "天"; +"Week(s)" = "週"; +"On" = "在"; +"Month(s)" = "月"; +/* [Event recurrence editor] Ex: _The_ first Sunday */ +"The" = "此"; +"Recur on day(s)" = "重複事件發生日"; +"Year(s)" = "年"; +/* [Event recurrence editor] Ex: Every first Sunday _of_ April */ +"cycle_of" = "的\n"; +"No end date" = "沒有結束日期"; +"Create" = "建立"; +"appointment(s)" = "議程"; +"Repeat until" = "重複直到"; + +"First" = "第一"; +"Second" = "第二"; +"Third" = "第三"; +"Fourth" = "第四"; +"Fift" = "第五"; +"Last" = "最後"; + +/* Appointment categories */ + +"category_none" = "無"; +"category_labels" = "結婚紀念日,生日,工作,電話,顧客,競爭對手,客戶,收藏, 追踪 ,禮物,假日,想法,會議,事件,雜項,個人,專案,公眾假日,狀態,供應商,旅遊,休假"; + +"repeat_NEVER" = "不重複"; +"repeat_DAILY" = "日重複"; +"repeat_WEEKLY" = "週重複"; +"repeat_BI-WEEKLY" = "雙週重複"; +"repeat_EVERY WEEKDAY" = "工作日重複"; +"repeat_MONTHLY" = " 月重複"; +"repeat_YEARLY" = "年重複"; +"repeat_CUSTOM" = "自訂..."; + +"reminder_NONE" = "無提醒"; +"reminder_5_MINUTES_BEFORE" = "5分鐘前"; +"reminder_10_MINUTES_BEFORE" = "10分鐘前"; +"reminder_15_MINUTES_BEFORE" = "15分鐘前"; +"reminder_30_MINUTES_BEFORE" = "30分鐘前"; +"reminder_45_MINUTES_BEFORE" = "45分鐘前"; +"reminder_1_HOUR_BEFORE" = " 1小時前"; +"reminder_2_HOURS_BEFORE" = "2小時前"; +"reminder_5_HOURS_BEFORE" = "5小時前"; +"reminder_15_HOURS_BEFORE" = "15小時前"; +"reminder_1_DAY_BEFORE" = "1天前"; +"reminder_2_DAYS_BEFORE" = "2天前"; +"reminder_1_WEEK_BEFORE" = "1週前"; +"reminder_CUSTOM" = "自訂..."; + +"reminder_MINUTES" = "分鐘"; +"reminder_HOURS" = "小時"; +"reminder_DAYS" = "天"; +"reminder_BEFORE" = "之前"; +"reminder_AFTER" = "之後"; +"reminder_START" = "事件開始於"; +"reminder_END" = "事件結束於"; +"Reminder Details" = "提醒詳細內容"; + +"Choose a Reminder Action" = "選擇提醒方式"; +"Show an Alert" = "顯示警告訊息"; +"Send an E-mail" = "寄送電子郵件\""; +"Email Organizer" = "電子郵件發送者"; +"Email Attendees" = "電子郵件接收者"; + +"zoom_400" = "400%"; +"zoom_200" = "200%"; +"zoom_100" = "100%"; +"zoom_50" = "50%"; +"zoom_25" = "25%"; + +/* transparency */ + +"Show Time as Free" = "顯示空閒時間"; + +/* email notifications */ +"Send Appointment Notifications" = "寄送預約通知"; + +/* validation errors */ + +validate_notitle = "沒有標題,是否繼續?"; +validate_invalid_startdate = "開始日期欄位不正確!"; +validate_invalid_enddate = "結束日期欄位不正確!"; +validate_endbeforestart = "事件開始時間不能大於結束時間。"; + +"Events" = "事件"; +"Tasks" = "任務"; +"Show completed tasks" = "顯示已完成的任務"; + +/* tabs */ +"Task" = "任務"; +"Event" = "事件"; +"Recurrence" = "重複"; + +/* toolbar */ +"New Event" = "新增事件"; +"New Task" = "新增任務"; +"Edit" = "編輯"; +"Delete" = "删除"; +"Go to Today" = "移動到今天"; +"Day View" = "日檢視"; +"Week View" = "週檢視"; +"Month View" = "月檢視"; +"Reload" = "重新載入"; + +"eventPartStatModificationError" = "您無法修改出席狀態。"; + +/* menu */ +"New Event..." = "新增事件..."; +"New Task..." = "新增任務..."; +"Edit Selected Event..." = "編輯選擇的事件..."; +"Delete Selected Event" = "刪除選擇的事件..."; +"Select All" = "全部選取"; +"Workweek days only" = "只顯示工作日"; +"Tasks in View" = "檢視任務"; + +"eventDeleteConfirmation" = "以下的事件將會被清除:"; +"taskDeleteConfirmation" = "以下的任務將會被清除:"; +"Would you like to continue?" = "您要繼續嗎?"; + +"You cannot remove nor unsubscribe from your personal calendar." += "您不能刪除或取消訂閱自己的行事曆。"; +"Are you sure you want to delete the calendar \"%{0}\"?" += "您確定要刪除這本行事曆 \"%{0}\"嗎?"; + +/* Legend */ +"Participant" = "出席者"; +"Optional Participant" = "可能出席者"; +"Non Participant" = "非出席者"; +"Chair" = "席次"; + +"Needs action" = "需要操作"; +"Accepted" = "已接受"; +"Declined" = "已拒絶"; +"Tentative" = "未定"; + +"Free" = "空閒"; +"Busy" = "忙碌"; +"Maybe busy" = "可能忙碌"; +"No free-busy information" = "沒有 空閒/忙碌 資訊"; + +/* FreeBusy panel buttons and labels */ +"Suggest time slot:" = "建議時段:"; +"Zoom:" = "縮放"; +"Previous slot" = "前一時段"; +"Next slot" = "後一時段"; +"Previous hour" = "前一小時"; +"Next hour" = "前一小時"; +"Work days only" = "只限工作日"; +"The whole day" = "所有日期"; +"Between" = "介於"; +"and" = "和"; + +"A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?" += "出席者中有人在此時段有其他的行程安排。\n是否要維持現在的議程安排?"; + +/* apt list */ +"Title" = "標題"; +"Start" = "開始"; +"End" = "結束"; +"Due Date" = "到期日"; +"Location" = "地點"; + +"(Private Event)" = "(私人事件)"; + +vevent_class0 = "(公開事件)"; +vevent_class1 = "(私人事件)"; +vevent_class2 = "(機密事件)"; + +"Priority" = "優先順序"; +"Category" = "類別"; + +vtodo_class0 = "(公開任務)"; +vtodo_class1 = "(私人任務)"; +vtodo_class2 = "(機密任務)"; + +"closeThisWindowMessage" = "謝謝! 您可以關閉視窗或檢視您的"; +"Multicolumn Day View" = "每日多列檢視"; + +"Please select an event or a task." = "請選擇一項事件或任務。"; + +"editRepeatingItem" = "這是一筆重複事件。請問您要編輯所有重複事件還是只有單獨這一筆事件?"; +"button_thisOccurrenceOnly" = "僅目前這一筆"; +"button_allOccurrences" = "所有重複事件"; + +/* Properties dialog */ +"Color" = "顏色"; + +"Include in free-busy" = "包括忙碌-空間"; + +"Synchronization" = "同步"; +"Synchronize" = "同步"; +"Tag:" = "標籤"; + +"Display" = "顯示"; +"Show alarms" = "顯示提醒"; +"Show tasks" = "顯示任務"; + +"Notifications" = "提醒"; +"Receive a mail when I modify my calendar" = "當我修改我的行事曆時以電子郵件通知我"; +"Receive a mail when someone else modifies my calendar" = "當有其他人修改我的行事曆時以電子郵件通知我"; +"When I modify my calendar, send a mail to" = "當我修改我的行事曆時以電子郵件通知"; + +"Links to this Calendar" = "連結到這本行事曆"; +"Authenticated User Access" = "授權的使用者存取"; +"CalDAV URL" = "CalDAV URL "; +"WebDAV ICS URL" = "WebDAV ICS URL"; +"WebDAV XML URL" = "WebDAV XML URL"; + +/* Error messages */ +"dayFieldInvalid" = "請在日數欄位輸入1或大於1的數字。"; +"weekFieldInvalid" = "請在週數欄位輸入1或大於1的數字。"; +"monthFieldInvalid" = "請在月數欄位輸入1或大於1的數字。"; +"monthDayFieldInvalid" = "請在每月第幾日欄位輸入1或大於1的數字。"; +"yearFieldInvalid" = "請在年數欄位輸入1或大於1的數字。"; +"appointmentFieldInvalid" = "請在次數欄位輸入1或大於1的數字。"; +"recurrenceUnsupported" = "未支援這種重複類型。"; +"Please specify a calendar name." = "請輸入行事曆的名稱。"; +"tagNotDefined" = "果您想要同步行事曆必需指定標籤。"; +"tagAlreadyExists" = "您指定的標籤已經用於其他行事曆。"; +"tagHasChanged" = "如果您修改了行事曆的標籤，您就必須在您的行動裝置重新下載所有資料。\n是否繼續?"; +"tagWasAdded" = "如果您想要同步這本行事曆，您就必須在您的行動裝置重新下載所有資料。\n是否繼續?"; +"tagWasRemoved" = "如果您取消這本行事曆的同步設定，您就必須在您的行動裝置重新下載所有資料。\n是否繼續?"; +"DestinationCalendarError" = "來源行事曆和目的行事曆是相同的，請複製為不同的行事曆。"; +"EventCopyError" = "複製失敗。請複製為為不同的行事曆。"; +"Please select at least one calendar" = "請選擇至少一本行事曆"; + +"Open Task..." = "開啟任務..."; +"Mark Completed" = "標示為完成"; +"Delete Task" = "刪除任務"; +"Delete Event" = "刪除事件 "; +"Copy event to my calendar" = "將事件複製到我的行事曆"; +"View Raw Source" = "檢視原始碼"; + +"Subscribe to a web calendar..." = "訂閱到web行事曆..."; +"URL of the Calendar" = "行事曆的URL"; +"Web Calendar" = "Web 行事曆"; +"Reload on login" = "登入時重新載入"; +"Invalid number." = "無效的數字。"; +"Please identify yourself to %{0}" = "請向 %{0} 識別您的身分"; diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings index 2404787a7..db252811c 100644 --- a/UI/Scheduler/Czech.lproj/Localizable.strings +++ b/UI/Scheduler/Czech.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Seznam"; "Print Settings" = "Nastavení tisku"; -"Title:" = "Název:"; -"Layout:" = "Vzhled:"; +"Title" = "Název"; +"Layout" = "Vzhled"; "What to Print" = "Rozsah tisku"; "Options" = "Možnosti"; "Tasks with no due date" = "Úkoly bez termínu"; @@ -167,34 +167,34 @@ "Appointment editor" = "Editovat schůzky"; "Appointment proposal" = "Navrhnout schůzku"; "Appointment on" = "Schůzka na"; -"Start:" = "Začátek:"; -"End:" = "Konec:"; -"Due Date:" = "Datum splnění:"; -"Title:" = "Název:"; -"Calendar:" = "Kalendář:"; +"Start" = "Začátek"; +"End" = "Konec"; +"Due Date" = "Datum splnění"; +"Title" = "Název"; +"Calendar" = "Kalendář"; "Name" = "Jméno"; "Email" = "E-Mail"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% hotovo"; -"Location:" = "Místo:"; -"Priority:" = "Priorita:"; +"Location" = "Místo"; +"Priority" = "Priorita"; "Privacy" = "Soukromí"; "Cycle" = "Cyklus opakování"; "Cycle End" = "Konec cyklu"; "Categories" = "Kategorie"; "Classification" = "Klasifikace"; "Duration" = "Trvání"; -"Attendees:" = "Účastníci:"; +"Attendees" = "Účastníci"; "Resources" = "Zdroje"; -"Organizer:" = "Organizátor:"; -"Description:" = "Popis:"; -"Document:" = "Dokument:"; -"Category:" = "Kategorie:"; -"Repeat:" = "Opakování:"; -"Reminder:" = "Připomenutí:"; -"General:" = "Obecný:"; -"Reply:" = "Odpověď:"; -"Created by:" = "Vytvořeno:"; +"Organizer" = "Organizátor"; +"Description" = "Popis"; +"Document" = "Dokument"; +"Category" = "Kategorie"; +"Repeat" = "Opakování"; +"Reminder" = "Připomenutí"; +"General" = "Obecný"; +"Reply" = "Odpověď"; +"Created by" = "Vytvořeno"; "Target:" = "Vložte adresu webové stránky nebo dokumentu."; @@ -244,7 +244,7 @@ "view_overdue" = "Nesplněné úkoly"; "view_incomplete" = "Nedokončené úkoly"; -"View:" = "Zobrazit:"; +"View" = "Zobrazit"; "Title, category or location" = "Název, kategorie nebo místo"; "Entire content" = "Celý obsah"; @@ -506,8 +506,7 @@ vtodo_class2 = "(Důvěrný úkol)"; "button_allOccurrences" = "Všechna opakování"; /* Properties dialog */ -"Name:" = "Název:"; -"Color:" = "Barva:"; +"Color" = "Barva"; "Include in free-busy" = "Zahrnout do obsazeného času (free-busy)"; @@ -522,11 +521,11 @@ vtodo_class2 = "(Důvěrný úkol)"; "Notifications" = "Připomenutí"; "Receive a mail when I modify my calendar" = "Obdržet zprávu když upravím svůj kalendář"; "Receive a mail when someone else modifies my calendar" = "Obdržet zprávu když někdo jiný upraví můj kalendář"; -"When I modify my calendar, send a mail to:" = "Když upravím svůj kalendář, poslat zprávu na:"; +"When I modify my calendar, send a mail to" = "Když upravím svůj kalendář, poslat zprávu na"; "Links to this Calendar" = "Odkazy na tento kalendář"; "Authenticated User Access" = "Přístup pro ověřené uživatele"; -"CalDAV URL" = "CalDAV URL:"; +"CalDAV URL" = "CalDAV URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Danish.lproj/Localizable.strings b/UI/Scheduler/Danish.lproj/Localizable.strings index f3141ffa5..6de7deeff 100644 --- a/UI/Scheduler/Danish.lproj/Localizable.strings +++ b/UI/Scheduler/Danish.lproj/Localizable.strings @@ -152,33 +152,33 @@ "Appointment editor" = "Aftale editor"; "Appointment proposal" = "Aftale Forslag"; "Appointment on" = "Aftale på"; -"Start:" = "Start:"; -"End:" = "Slut:"; -"Due Date:" = "Forfaldsdato:"; -"Title:" = "Titel:"; -"Calendar:" = "Kalender:"; +"Start" = "Start"; +"End" = "Slut"; +"Due Date" = "Forfaldsdato"; +"Title" = "Titel"; +"Calendar" = "Kalender"; "Name" = "Navn"; "Email" = "E-mail"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% Færdig"; -"Location:" = "Sted:"; -"Priority:" = "Prioritet:"; +"Location" = "Sted"; +"Priority" = "Prioritet"; "Privacy" = "Beskyttelse af personlige oplysninger"; "Cycle" = "Cyklus"; "Cycle End" = "Cyklus sluttidspunkt"; "Categories" = "Kategorier"; "Classification" = "Klassifikation"; "Duration" = "Varighed"; -"Attendees:" = "Deltagere:"; +"Attendees" = "Deltagere"; "Resources" = "Ressourcer"; -"Organizer:" = "Arrangør:"; -"Description:" = "Beskrivelse:"; -"Document:" = "Dokument:"; -"Category:" = "Kategori:"; -"Repeat:" = "Gentag:"; -"Reminder:" = "Påmindelse:"; -"General:" = "Generelt:"; -"Reply:" = "Svar:"; +"Organizer" = "Arrangør"; +"Description" = "Beskrivelse"; +"Document" = "Dokument"; +"Category" = "Kategori"; +"Repeat" = "Gentag"; +"Reminder" = "Påmindelse"; +"General" = "Generelt"; +"Reply" = "Svar"; "Target:" = "Mål:"; @@ -223,7 +223,7 @@ "view_future" = "Alle fremtidige begivenheder"; "view_selectedday" = "Valgte dag"; -"View:" = "Vis:"; +"View" = "Vis"; "Title or Description" = "Titel eller Beskrivelse"; "Search" = "Søg"; @@ -481,8 +481,8 @@ vtodo_class2 = "(Hemmelig opgave)"; "button_allOccurrences" = "Alle forekomster"; /* Properties dialog */ -"Name:" = "Navn:"; -"Color:" = "Farve:"; +"Name" = "Navn"; +"Color" = "Farve"; "Include in free-busy" = "Medtag i ledig-optaget"; @@ -497,7 +497,7 @@ vtodo_class2 = "(Hemmelig opgave)"; "Notifications" = "Notifikationer"; "Receive a mail when I modify my calendar" = "Modtag en mail, når jeg ændrer min kalender"; "Receive a mail when someone else modifies my calendar" = "Modtag en mail, når andre ændrer min kalender"; -"When I modify my calendar, send a mail to:" = "Når jeg ændrer min kalender, så send en mail til:"; +"When I modify my calendar, send a mail to" = "Når jeg ændrer min kalender, så send en mail til"; "Links to this Calendar" = "Links til denne kalender"; "Authenticated User Access" = "Godkendt brugeradgang"; diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings index f6f0c9b21..e44167199 100644 --- a/UI/Scheduler/Dutch.lproj/Localizable.strings +++ b/UI/Scheduler/Dutch.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lijst"; "Print Settings" = "Print instellingen"; -"Title:" = "Titel:"; -"Layout:" = "Opmaak:"; +"Title" = "Titel"; +"Layout" = "Opmaak"; "What to Print" = "Wat moet afgedrukt worden"; "Options" = "Opties:"; "Tasks with no due date" = "Taken zonder verloopdatum"; @@ -167,34 +167,34 @@ "Appointment editor" = "Afspraak aanpassen"; "Appointment proposal" = "Afspraak voorstellen"; "Appointment on" = "Afspraak op"; -"Start:" = "Begin:"; -"End:" = "Einde:"; -"Due Date:" = "Verloopdatum:"; -"Title:" = "Titel:"; -"Calendar:" = "Agenda:"; +"Start" = "Begin"; +"End" = "Einde"; +"Due Date" = "Verloopdatum"; +"Title" = "Titel"; +"Calendar" = "Agenda"; "Name" = "Naam"; "Email" = "E-mail"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% voltooid"; -"Location:" = "Plaats:"; -"Priority:" = "Prioriteit:"; +"Location" = "Plaats"; +"Priority" = "Prioriteit"; "Privacy" = "Privacy"; "Cycle" = "Herhalen"; "Cycle End" = "Einde herhaling"; "Categories" = "Categoriën"; "Classification" = "Classificatie"; "Duration" = "Duur"; -"Attendees:" = "Deelnemers:"; +"Attendees" = "Deelnemers"; "Resources" = "Middelen"; -"Organizer:" = "Organisator:"; -"Description:" = "Omschrijving:"; -"Document:" = "Document:"; -"Category:" = "Categorie:"; -"Repeat:" = "Herhalen:"; -"Reminder:" = "Alarm:"; -"General:" = "Algemeen:"; -"Reply:" = "Antwoord:"; -"Created by:" = "Aangemaakt door:"; +"Organizer" = "Organisator"; +"Description" = "Omschrijving"; +"Document" = "Document"; +"Category" = "Categorie"; +"Repeat" = "Herhalen"; +"Reminder" = "Alarm"; +"General" = "Algemeen"; +"Reply" = "Antwoord"; +"Created by" = "Aangemaakt door"; "Target:" = "Bestemming:"; @@ -244,7 +244,7 @@ "view_overdue" = "Achterstallige taken"; "view_incomplete" = "Onvolledige taken"; -"View:" = "Bekijken:"; +"View" = "Bekijken"; "Title, category or location" = "Titel, categorie of plaats"; "Entire content" = "Volledige inhoud"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Vertrouwelijke taak)"; "button_allOccurrences" = "Alle herhalingen"; /* Properties dialog */ -"Name:" = "Naam:"; -"Color:" = "Kleur:"; +"Name" = "Naam"; +"Color" = "Kleur"; "Include in free-busy" = "In de beschikbaarheid insluiten"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Vertrouwelijke taak)"; "Notifications" = "Notificaties"; "Receive a mail when I modify my calendar" = "Ontvang een e-mail als ik mijn agenda verander"; "Receive a mail when someone else modifies my calendar" = "Ontvang een e-mail als iemand anders mijn agenda verandert"; -"When I modify my calendar, send a mail to:" = "Als ik mijn agenda verander, stuur een e-mail naar:"; +"When I modify my calendar, send a mail to" = "Als ik mijn agenda verander, stuur een e-mail naar"; "Links to this Calendar" = "Koppelingen naar deze agenda"; "Authenticated User Access" = "Toegang voor geauthenticeerde gebruikers"; -"CalDAV URL" = "CalDAV-URL:"; +"CalDAV URL" = "CalDAV-URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 4bb62c42b..8cc0ee7c2 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "List"; "Print Settings" = "Print Settings"; -"Title:" = "Title:"; -"Layout:" = "Layout:"; +"Title" = "Title"; +"Layout" = "Layout"; "What to Print" = "What to Print"; "Options" = "Options"; "Tasks with no due date" = "Tasks with no due date"; @@ -167,34 +167,34 @@ "Appointment editor" = "Appointment Editor"; "Appointment proposal" = "Appointment Proposal"; "Appointment on" = "Appointment on"; -"Start:" = "Start:"; -"End:" = "End:"; -"Due Date:" = "Due Date:"; -"Title:" = "Title:"; -"Calendar:" = "Calendar:"; +"Start" = "Start"; +"End" = "End"; +"Due Date" = "Due Date"; +"Title" = "Title"; +"Calendar" = "Calendar"; "Name" = "Name"; "Email" = "Email"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% complete"; -"Location:" = "Location:"; -"Priority:" = "Priority:"; +"Location" = "Location"; +"Priority" = "Priority"; "Privacy" = "Privacy"; "Cycle" = "Cycle"; "Cycle End" = "Cycle End"; "Categories" = "Categories"; "Classification" = "Classification"; "Duration" = "Duration"; -"Attendees:" = "Attendees:"; +"Attendees" = "Attendees"; "Resources" = "Resources"; -"Organizer:" = "Organizer:"; -"Description:" = "Description:"; -"Document:" = "Document:"; -"Category:" = "Category:"; -"Repeat:" = "Repeat:"; -"Reminder:" = "Reminder:"; -"General:" = "General:"; -"Reply:" = "Reply:"; -"Created by:" = "Created by:"; +"Organizer" = "Organizer"; +"Description" = "Description"; +"Document" = "Document"; +"Category" = "Category"; +"Repeat" = "Repeat"; +"Reminder" = "Reminder"; +"General" = "General"; +"Reply" = "Reply"; +"Created by" = "Created by"; "Target:" = "Target:"; @@ -244,7 +244,7 @@ "view_overdue" = "Overdue tasks"; "view_incomplete" = "Incomplete tasks"; -"View:" = "View:"; +"View" = "View"; "Title, category or location" = "Title, category or location"; "Entire content" = "Entire content"; @@ -508,8 +508,8 @@ vtodo_class2 = "(Confidential task)"; "button_allOccurrences" = "All occurences"; /* Properties dialog */ -"Name:" = "Name:"; -"Color:" = "Color:"; +"Name" = "Name"; +"Color" = "Color"; "Include in free-busy" = "Include in free-busy"; @@ -524,11 +524,11 @@ vtodo_class2 = "(Confidential task)"; "Notifications" = "Notifications"; "Receive a mail when I modify my calendar" = "Receive a mail when I modify my calendar"; "Receive a mail when someone else modifies my calendar" = "Receive a mail when someone else modifies my calendar"; -"When I modify my calendar, send a mail to:" = "When I modify my calendar, send a mail to:"; +"When I modify my calendar, send a mail to" = "When I modify my calendar, send a mail to"; "Links to this Calendar" = "Links to this Calendar"; "Authenticated User Access" = "Authenticated User Access"; -"CalDAV URL" = "CalDAV URL: "; +"CalDAV URL" = "CalDAV URL "; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Finnish.lproj/Localizable.strings b/UI/Scheduler/Finnish.lproj/Localizable.strings index 5a052696e..babc6aaa0 100644 --- a/UI/Scheduler/Finnish.lproj/Localizable.strings +++ b/UI/Scheduler/Finnish.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Tulostusasetukset"; -"Title:" = "Otsikko:"; -"Layout:" = "Ulkoasu"; +"Title" = "Otsikko"; +"Layout" = "Ulkoasu"; "What to Print" = "Tulostusvalinnat"; "Options" = "Asetukset"; "Tasks with no due date" = "Tehtävät ilman määräpäivää"; @@ -167,34 +167,34 @@ "Appointment editor" = "Tapaamisen muokkain"; "Appointment proposal" = "Tapaamisehdotus"; "Appointment on" = "Tapaaminen"; -"Start:" = "Alkaa:"; -"End:" = "Päättyy:"; -"Due Date:" = "Määräpäivä:"; -"Title:" = "Otsikko:"; -"Calendar:" = "Kalenteri:"; +"Start" = "Alkaa"; +"End" = "Päättyy"; +"Due Date" = "Määräpäivä"; +"Title" = "Otsikko"; +"Calendar" = "Kalenteri"; "Name" = "Nimi"; "Email" = "Sähköposti"; -"Status:" = "Tila:"; +"Status" = "Tila"; "% complete" = "% valmiina"; -"Location:" = "Paikka:"; -"Priority:" = "Prioriteetti:"; +"Location" = "Paikka"; +"Priority" = "Prioriteetti"; "Privacy" = "Yksityisyys"; "Cycle" = "Kierto"; "Cycle End" = "Kierto päättyy"; "Categories" = "Luokat"; "Classification" = "Luokittelu"; "Duration" = "Kesto"; -"Attendees:" = "Osallistujat:"; +"Attendees" = "Osallistujat"; "Resources" = "Resurssit"; -"Organizer:" = "Järjestäjä:"; -"Description:" = "Kuvaus:"; -"Document:" = "Tiedosto:"; -"Category:" = "Luokka:"; -"Repeat:" = "Toista:"; -"Reminder:" = "Muistuttaja:"; -"General:" = "Yleinen:"; -"Reply:" = "Vastaus:"; -"Created by:" = "Luonut:"; +"Organizer" = "Järjestäjä"; +"Description" = "Kuvaus"; +"Document" = "Tiedosto"; +"Category" = "Luokka"; +"Repeat" = "Toista"; +"Reminder" = "Muistuttaja"; +"General" = "Yleinen"; +"Reply" = "Vastaus"; +"Created by" = "Luonut"; "Target:" = "Kohde:"; @@ -244,7 +244,7 @@ "view_overdue" = "Myöhästyneet tehtävät"; "view_incomplete" = "Keskeneräiset tehtävät"; -"View:" = "Näytä:"; +"View" = "Näytä"; "Title, category or location" = "Otsikko, luokka tai sijainti"; "Entire content" = "Koko sisältö"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)"; "button_allOccurrences" = "Kaikki esiintymät"; /* Properties dialog */ -"Name:" = "Nimi:"; -"Color:" = "Väri:"; +"Name" = "Nimi"; +"Color" = "Väri"; "Include in free-busy" = "Sisällytä vapaa-varattuun"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)"; "Notifications" = "Ilmoitukset"; "Receive a mail when I modify my calendar" = "Vastaanota sähköposti kun muokkaan kalenteriani"; "Receive a mail when someone else modifies my calendar" = "Vastaanota sähköposti kun joku muu muokkaa kalenteriani"; -"When I modify my calendar, send a mail to:" = "Kun muokkaan kalenteriani lähetä viesti osoitteeseen:"; +"When I modify my calendar, send a mail to" = "Kun muokkaan kalenteriani lähetä viesti osoitteeseen"; "Links to this Calendar" = "Linkit tähän kalenteriin"; "Authenticated User Access" = "Kirjautuneiden käyttäjien pääsy"; -"CalDAV URL" = "CalDAV URL: "; +"CalDAV URL" = "CalDAV URL "; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 5516e8152..a813f6780 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Liste"; "Print Settings" = "Paramètres d'impression"; -"Title:" = "Titre :"; -"Layout:" = "Vue :"; +"Title" = "Titre "; +"Layout" = "Vue "; "What to Print" = "Contenu"; "Options" = "Options"; "Tasks with no due date" = "Tâches sans date d'échéance"; @@ -167,34 +167,34 @@ "Appointment editor" = "Edition de rendez-vous"; "Appointment proposal" = "Proposition de rendez-vous"; "Appointment on" = "Rendez-vous le"; -"Start:" = "Début :"; -"End:" = "Au :"; -"Due Date:" = "Fin prévue :"; -"Title:" = "Titre :"; -"Calendar:" = "Agenda :"; +"Start" = "Début "; +"End" = "Au "; +"Due Date" = "Fin prévue "; +"Title" = "Titre "; +"Calendar" = "Agenda "; "Name" = "Nom"; "Email" = "Courrier"; -"Status:" = "Statut :"; +"Status" = "Statut "; "% complete" = "% d'achèvement"; -"Location:" = "Lieu :"; -"Priority:" = "Priorité"; +"Location" = "Lieu "; +"Priority" = "Priorité"; "Privacy" = "Confidentialité"; "Cycle" = "Récurrence"; "Cycle End" = "s'arreter"; "Categories" = "Catégories"; "Classification" = "Classification"; "Duration" = "Durée"; -"Attendees:" = "Participants :"; +"Attendees" = "Participants "; "Resources" = "Ressources"; -"Organizer:" = "Organisateur :"; -"Description:" = "Description :"; -"Document:" = "Document :"; -"Category:" = "Catégorie :"; -"Repeat:" = "Répétition :"; -"Reminder:" = "Rappel :"; -"General:" = "Général:"; -"Reply:" = "Réponse:"; -"Created by:" = "Créé par:"; +"Organizer" = "Organisateur "; +"Description" = "Description "; +"Document" = "Document "; +"Category" = "Catégorie "; +"Repeat" = "Répétition "; +"Reminder" = "Rappel "; +"General" = "Général"; +"Reply" = "Réponse"; +"Created by" = "Créé par"; "Target:" = "Destination :"; @@ -244,7 +244,7 @@ "view_overdue" = "Tâches en retard"; "view_incomplete" = "Tâches à compléter"; -"View:" = "Voir :"; +"View" = "Voir "; "Title, category or location" = "Titre, catégorie ou lieu"; "Entire content" = "Tout le contenu"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Tâche confidentielle)"; "button_allOccurrences" = "Toutes les occurences"; /* Properties dialog */ -"Name:" = "Nom :"; -"Color:" = "Couleur :"; +"Name" = "Nom "; +"Color" = "Couleur "; "Include in free-busy" = "Inclure dans la disponibilité"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Tâche confidentielle)"; "Notifications" = "Notifications"; "Receive a mail when I modify my calendar" = "Émettre un courrier quand je modifie mon agenda"; "Receive a mail when someone else modifies my calendar" = "Émettre un courrier quand quelqu'un d'autre modifie mon agenda"; -"When I modify my calendar, send a mail to:" = "Quand je modifie mon agenda, émettre un courrier à :"; +"When I modify my calendar, send a mail to" = "Quand je modifie mon agenda, émettre un courrier à "; "Links to this Calendar" = "Liens vers cet agenda"; "Authenticated User Access" = "Accès aux utilisateurs authentifiés"; -"CalDAV URL" = "Accès en CalDAV :"; +"CalDAV URL" = "Accès en CalDAV "; "WebDAV ICS URL" = "Représentation ICS en WebDAV"; "WebDAV XML URL" = "Représentation XML en WebDAV"; diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 5c3d00357..e376c5a9a 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = SchedulerUI SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct -SchedulerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +SchedulerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh SchedulerUI_OBJC_FILES = \ SchedulerUIProduct.m \ diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings index 131fd1c27..52c2a8734 100644 --- a/UI/Scheduler/German.lproj/Localizable.strings +++ b/UI/Scheduler/German.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Liste"; "Print Settings" = "Druckeinstellungen"; -"Title:" = "Titel:"; -"Layout:" = "Formatierung:"; +"Title" = "Titel"; +"Layout" = "Formatierung"; "What to Print" = "Was soll gedruckt werden"; "Options" = "Optionen"; "Tasks with no due date" = "Aufgaben ohne Fälligkeitsdatum"; @@ -167,34 +167,34 @@ "Appointment editor" = "Termin Bearbeiten"; "Appointment proposal" = "Termin Vorschlag"; "Appointment on" = "Termin am"; -"Start:" = "Beginn:"; -"End:" = "Ende:"; -"Due Date:" = "Fällig:"; -"Title:" = "Titel:"; -"Calendar:" = "Kalender:"; +"Start" = "Beginn"; +"End" = "Ende"; +"Due Date" = "Fällig"; +"Title" = "Titel"; +"Calendar" = "Kalender"; "Name" = "Name"; "Email" = "E-Mail"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% fertig"; -"Location:" = "Ort: "; -"Priority:" = "Priorität: "; +"Location" = "Ort "; +"Priority" = "Priorität "; "Privacy" = "Vertraulichkeit"; "Cycle" = "Wiederholen"; "Cycle End" = "Wiederholungsende"; "Categories" = "Kategorien"; "Classification" = "Einordnung"; "Duration" = "Dauer"; -"Attendees:" = "Teilnehmer:"; +"Attendees" = "Teilnehmer"; "Resources" = "Ressourcen"; -"Organizer:" = "Organisator:"; -"Description:" = "Beschreibung:"; -"Document:" = "Dokument:"; -"Category:" = "Kategorie:"; -"Repeat:" = "Wiederholen:"; -"Reminder:" = "Erinnerung:"; -"General:" = "Allgemein:"; -"Reply:" = "Antwort:"; -"Created by:" = "Erstellt von:"; +"Organizer" = "Organisator"; +"Description" = "Beschreibung"; +"Document" = "Dokument"; +"Category" = "Kategorie"; +"Repeat" = "Wiederholen"; +"Reminder" = "Erinnerung"; +"General" = "Allgemein"; +"Reply" = "Antwort"; +"Created by" = "Erstellt von"; "Target:" = "Ziel:"; @@ -244,7 +244,7 @@ "view_overdue" = "Überfällige Aufgaben"; "view_incomplete" = "Unvollständige Aufgaben"; -"View:" = "Anzeigen:"; +"View" = "Anzeigen"; "Title, category or location" = "Titel, Kategorie oder Ort"; "Entire content" = "Gesamter Inhalt"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; "button_allOccurrences" = "Alle Ereignisse"; /* Properties dialog */ -"Name:" = "Name:"; -"Color:" = "Farbe:"; +"Name" = "Name"; +"Color" = "Farbe"; "Include in free-busy" = "In der Verfügbarkeit einschließen"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Vertrauliche Aufgabe)"; "Notifications" = "Benachrichtigungen"; "Receive a mail when I modify my calendar" = "E-Mail erhalten, wenn ich meinen Kalender verändere"; "Receive a mail when someone else modifies my calendar" = "E-Mail erhalten, wenn jemand anderes meinen Kalender verändert"; -"When I modify my calendar, send a mail to:" = "Wenn ich meinen Kalender verändere, schicke eine E-Mail an: "; +"When I modify my calendar, send a mail to" = "Wenn ich meinen Kalender verändere, schicke eine E-Mail an "; "Links to this Calendar" = "Links zu diesem Kalender"; "Authenticated User Access" = "Zugang für authentifizierte Benutzer"; -"CalDAV URL" = "CalDAV-URL:"; +"CalDAV URL" = "CalDAV-URL"; "WebDAV ICS URL" = "WebDAV-ICS-URL"; "WebDAV XML URL" = "WebDAV-XML-URL"; diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings index a1ee97ab7..8f63f2b4c 100644 --- a/UI/Scheduler/Hungarian.lproj/Localizable.strings +++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings @@ -115,7 +115,7 @@ "Subscribe to a Calendar..." = "Feliratkozás naptárra..."; "Remove the selected Calendar" = "Kijelölt naptár törlése"; -"Name of the Calendar" = "A naptár neve:"; +"Name of the Calendar" = "A naptár neve"; "new" = "Új"; "Print view" = "Nyomtatási nézet"; @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Nyomtatási beállítások"; -"Title:" = "Cím:"; -"Layout:" = "Elrendezés:"; +"Title" = "Cím"; +"Layout" = "Elrendezés"; "What to Print" = "Mi kerüljön nyomtatásra"; "Options" = "Beállítások"; "Tasks with no due date" = "Befejező dátum nélküli feladatok"; @@ -167,34 +167,34 @@ "Appointment editor" = "Találkozó szerkesztő"; "Appointment proposal" = "Találkozó ajánló"; "Appointment on" = "Találkozó ekkor"; -"Start:" = "Kezdete:"; -"End:" = "Vége:"; -"Due Date:" = "Lejárat:"; -"Title:" = "Cím:"; -"Calendar:" = "Naptár:"; +"Start" = "Kezdete"; +"End" = "Vége"; +"Due Date" = "Lejárat"; +"Title" = "Cím"; +"Calendar" = "Naptár"; "Name" = "Név"; "Email" = "Email"; -"Status:" = "Állapot"; +"Status" = "Állapot"; "% complete" = "% kész"; -"Location:" = "Hely:"; -"Priority:" = "Prioritás:"; +"Location" = "Hely"; +"Priority" = "Prioritás"; "Privacy" = "Adatvédelem"; "Cycle" = "Ismétlődés"; "Cycle End" = "Ismétlődés vége"; "Categories" = "Kategória"; "Classification" = "Besorolás"; "Duration" = "Időtartam"; -"Attendees:" = "Résztvevők:"; +"Attendees" = "Résztvevők"; "Resources" = "Erőforrások"; -"Organizer:" = "Szervező:"; -"Description:" = "Leírás:"; -"Document:" = "Dokumentum:"; -"Category:" = "Kategória:"; -"Repeat:" = "Ismétlés:"; -"Reminder:" = "Emlékeztető:"; -"General:" = "Általános:"; -"Reply:" = "Válasz:"; -"Created by:" = "Létrehozta:"; +"Organizer" = "Szervező"; +"Description" = "Leírás"; +"Document" = "Dokumentum"; +"Category" = "Kategória"; +"Repeat" = "Ismétlés"; +"Reminder" = "Emlékeztető"; +"General" = "Általános"; +"Reply" = "Válasz"; +"Created by" = "Létrehozta"; "Target:" = "Cél:"; @@ -244,7 +244,7 @@ "view_overdue" = "Lejárt feladatok"; "view_incomplete" = "Befejezetlen feladat"; -"View:" = "Nézet:"; +"View" = "Nézet"; "Title, category or location" = "Cím, kategória vagy helyszin"; "Entire content" = "Teljes tartalom"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Bizalmas feladat)"; "button_allOccurrences" = "Az összes előfordulást"; /* Properties dialog */ -"Name:" = "Név:"; -"Color:" = "Szín:"; +"Name" = "Név"; +"Color" = "Szín"; "Include in free-busy" = "Foglaltság mutatása"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Bizalmas feladat)"; "Notifications" = "Értesítések"; "Receive a mail when I modify my calendar" = "Kapjak email értesítést, amikor módosítok a naptáramon"; "Receive a mail when someone else modifies my calendar" = "Kapjak email értesítést, amikor mások módosítják a naptáramat"; -"When I modify my calendar, send a mail to:" = "Email értesítés küldése az alábbi címre a naptáram módosításakor"; +"When I modify my calendar, send a mail to" = "Email értesítés küldése az alábbi címre a naptáram módosításakor"; "Links to this Calendar" = "Hivatkozások ehhez a naptárhoz"; "Authenticated User Access" = "Belépett felhasználók"; -"CalDAV URL" = "CalDAV URL:"; +"CalDAV URL" = "CalDAV URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Icelandic.lproj/Localizable.strings b/UI/Scheduler/Icelandic.lproj/Localizable.strings index 499ed3c80..8e40020b2 100644 --- a/UI/Scheduler/Icelandic.lproj/Localizable.strings +++ b/UI/Scheduler/Icelandic.lproj/Localizable.strings @@ -151,33 +151,33 @@ "Appointment editor" = "Sýsla með tímapantanir"; "Appointment proposal" = "Tillaga um tímapöntun"; "Appointment on" = "Tímapöntun á"; -"Start:" = "Byrjun:"; -"End:" = "Endir:"; -"Due Date:" = "Lokadagur:"; -"Title:" = "Titill:"; -"Calendar:" = "Dagatal:"; +"Start" = "Byrjun"; +"End" = "Endir"; +"Due Date" = "Lokadagur"; +"Title" = "Titill"; +"Calendar" = "Dagatal"; "Name" = "Nafn"; "Email" = "Tölvupóstur"; -"Status:" = "Staða:"; +"Status" = "Staða"; "% complete" = "% lokið"; -"Location:" = "Staðsetning:"; -"Priority:" = "Mikilvægi:"; +"Location" = "Staðsetning"; +"Priority" = "Mikilvægi"; "Privacy" = "Friðhelgi"; "Cycle" = "Cycle"; "Cycle End" = "Cycle End"; "Categories" = "Flokkar"; "Classification" = "Classification"; "Duration" = "Tímalengd"; -"Attendees:" = "Þáttakendur:"; +"Attendees" = "Þáttakendur"; "Resources" = "Tilföng"; -"Organizer:" = "Skipuleggjandi:"; -"Description:" = "Lýsing:"; -"Document:" = "Skjal:"; -"Category:" = "Flokkun:"; -"Repeat:" = "Endurtaka:"; -"Reminder:" = "Áminning:"; -"General:" = "Almennt:"; -"Reply:" = "Reply:"; +"Organizer" = "Skipuleggjandi"; +"Description" = "Lýsing"; +"Document" = "Skjal"; +"Category" = "Flokkun"; +"Repeat" = "Endurtaka"; +"Reminder" = "Áminning"; +"General" = "Almennt"; +"Reply" = "Reply"; "Target:" = "Target:"; @@ -222,7 +222,7 @@ "view_future" = "Allir framtíðarviðburðir"; "view_selectedday" = "Valinn Dagur"; -"View:" = "Sýn:"; +"View" = "Sýn"; "Title or Description" = "Titill eða Lýsing"; "Search" = "Leita"; @@ -475,8 +475,8 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)"; "button_allOccurrences" = "Öllum atvikum"; /* Properties dialog */ -"Name:" = "Nafn:"; -"Color:" = "Litur:"; +"Name" = "Nafn"; +"Color" = "Litur"; "Include in free-busy" = "Taka með í upplýsingum um lausan og upptekin tíma"; diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings index 3ca6154f9..ed69aaf49 100644 --- a/UI/Scheduler/Italian.lproj/Localizable.strings +++ b/UI/Scheduler/Italian.lproj/Localizable.strings @@ -152,33 +152,33 @@ "Appointment editor" = "Modifica appuntamenti"; "Appointment proposal" = "Proponi appuntamenti"; "Appointment on" = "Appuntamento del"; -"Start:" = "Inizio:"; -"End:" = "Fine:"; -"Due Date:" = "Scadenza:"; -"Title:" = "Titolo:"; -"Calendar:" = "Calendario:"; +"Start" = "Inizio"; +"End" = "Fine"; +"Due Date" = "Scadenza"; +"Title" = "Titolo"; +"Calendar" = "Calendario"; "Name" = "Nome"; "Email" = "Email"; -"Status:" = "Stato:"; +"Status" = "Stato"; "% complete" = "% completato"; -"Location:" = "Luogo:"; -"Priority:" = "Priorità:"; +"Location" = "Luogo"; +"Priority" = "Priorità"; "Privacy" = "Privacy"; "Cycle" = "Ricorrenza"; "Cycle End" = "Termine ricorrenza"; "Categories" = "Categorie"; "Classification" = "Classificazione"; "Duration" = "Durata"; -"Attendees:" = "Partecipanti:"; +"Attendees" = "Partecipanti"; "Resources" = "Risorse"; -"Organizer:" = "Proprietario:"; -"Description:" = "Descrizione:"; -"Document:" = "Documento:"; -"Category:" = "Categoria:"; -"Repeat:" = "Ripeti:"; -"Reminder:" = "Promemoria:"; -"General:" = "Generale:"; -"Reply:" = "Risposta:"; +"Organizer" = "Proprietario"; +"Description" = "Descrizione"; +"Document" = "Documento"; +"Category" = "Categoria"; +"Repeat" = "Ripeti"; +"Reminder" = "Promemoria"; +"General" = "Generale"; +"Reply" = "Risposta"; "Target:" = "Percorso:"; @@ -223,7 +223,7 @@ "view_future" = "Tutti i prossimi eventi"; "view_selectedday" = "Giorno selezionato"; -"View:" = "Visualizza:"; +"View" = "Visualizza"; "Title or Description" = "Titolo o descrizione"; "Search" = "Cerca"; @@ -476,8 +476,8 @@ vtodo_class2 = "(Attività confidenziale)"; "button_allOccurrences" = "Tutte le occorrenze"; /* Properties dialog */ -"Name:" = "Nome:"; -"Color:" = "Colore:"; +"Name" = "Nome"; +"Color" = "Colore"; "Include in free-busy" = "Includi nel libero-occupato"; @@ -491,7 +491,7 @@ vtodo_class2 = "(Attività confidenziale)"; "Receive a mail when I modify my calendar" = "Ricevi una mail quando io modifico il mio calendario"; "Receive a mail when someone else modifies my calendar" = "Ricevi una mail quando qualcuno modifica il mio calendario"; -"When I modify my calendar, send a mail to:" = "Quando modifico il mio calendario, invia una mail a:"; +"When I modify my calendar, send a mail to" = "Quando modifico il mio calendario, invia una mail a"; "Links to this Calendar" = "Link a questo Calendario"; "Authenticated User Access" = "Tutti gli utenti autenticati"; diff --git a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings index 28c606bb1..bbcc23789 100644 --- a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Liste"; "Print Settings" = "Utskrift instillinger"; -"Title:" = "Tittel:"; -"Layout:" = "Visning:"; +"Title" = "Tittel"; +"Layout" = "Visning"; "What to Print" = "Hva som skal printes"; "Options" = "Alternativer"; "Tasks with no due date" = "Oppgaver uten forfallsdato"; @@ -167,34 +167,34 @@ "Appointment editor" = "Avtaleredigerer"; "Appointment proposal" = "Avtaleforslag"; "Appointment on" = "Møteavtale"; -"Start:" = "Starter:"; -"End:" = "Slutter:"; -"Due Date:" = "Dato:"; -"Title:" = "Tittel:"; -"Calendar:" = "Kalender:"; +"Start" = "Starter"; +"End" = "Slutter"; +"Due Date" = "Dato"; +"Title" = "Tittel"; +"Calendar" = "Kalender"; "Name" = "Navn"; "Email" = "E-post"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% utført"; -"Location:" = "Sted:"; -"Priority:" = "Prioritet:"; +"Location" = "Sted"; +"Priority" = "Prioritet"; "Privacy" = "Personvern"; "Cycle" = "Intervall"; "Cycle End" = "Intervall slutter"; "Categories" = "Kategorier"; "Classification" = "Klassifisering"; "Duration" = "Varighet"; -"Attendees:" = "Deltakere:"; +"Attendees" = "Deltakere"; "Resources" = "Ressurser"; -"Organizer:" = "Organisator:"; -"Description:" = "Beskrivelse:"; -"Document:" = "Dokument:"; -"Category:" = "Kategori:"; -"Repeat:" = "Gjenta:"; -"Reminder:" = "Påminnelse:"; -"General:" = "Generell:"; -"Reply:" = "Svar:"; -"Created by:" = "Opprettet av:"; +"Organizer" = "Organisator"; +"Description" = "Beskrivelse"; +"Document" = "Dokument"; +"Category" = "Kategori"; +"Repeat" = "Gjenta"; +"Reminder" = "Påminnelse"; +"General" = "Generell"; +"Reply" = "Svar"; +"Created by" = "Opprettet av"; "Target:" = "Mål:"; @@ -244,7 +244,7 @@ "view_overdue" = "Forfalte oppgaver"; "view_incomplete" = "Ufullstendige oppgaver"; -"View:" = "Vis:"; +"View" = "Vis"; "Title, category or location" = "Tittel, kategori eller sted"; "Entire content" = "Fullstendig innhold"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Konfidensiell oppgave)"; "button_allOccurrences" = "Alle forekomster"; /* Properties dialog */ -"Name:" = "Navn:"; -"Color:" = "Farge:"; +"Name" = "Navn"; +"Color" = "Farge"; "Include in free-busy" = "Inkluder i fritt opptatt"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Konfidensiell oppgave)"; "Notifications" = "Varslinger"; "Receive a mail when I modify my calendar" = "Motta e-post når jeg oppdaterer kalenderen min"; "Receive a mail when someone else modifies my calendar" = "Motta e-post når andre oppdaterer kalenderen min"; -"When I modify my calendar, send a mail to:" = "Når jeg endrer kalenderen, send e-post til:"; +"When I modify my calendar, send a mail to" = "Når jeg endrer kalenderen, send e-post til"; "Links to this Calendar" = "Linker til denne kalenderen"; "Authenticated User Access" = "Autentisert brukertilgang"; -"CalDAV URL" = "CalDAV URL:"; +"CalDAV URL" = "CalDAV URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings index e5ead80b3..89ce83889 100644 --- a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings @@ -151,33 +151,33 @@ "Appointment editor" = "Avtaleredigerer"; "Appointment proposal" = "Avtaleforslag"; "Appointment on" = "Møteavtale"; -"Start:" = "Starter:"; -"End:" = "Slutter:"; -"Due Date:" = "Dato:"; -"Title:" = "Tittel:"; -"Calendar:" = "Kalender:"; +"Start" = "Starter"; +"End" = "Slutter"; +"Due Date" = "Dato"; +"Title" = "Tittel"; +"Calendar" = "Kalender"; "Name" = "Navn"; "Email" = "E-post"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% utført"; -"Location:" = "Plass:"; -"Priority:" = "Prioritet:"; +"Location" = "Plass"; +"Priority" = "Prioritet"; "Privacy" = "Personvern"; "Cycle" = "Intervall"; "Cycle End" = "Intervall slutter"; "Categories" = "Kategorier"; "Classification" = "Klassifisering"; "Duration" = "Varighet"; -"Attendees:" = "Deltakere:"; +"Attendees" = "Deltakere"; "Resources" = "Ressurser"; -"Organizer:" = "Organisatør:"; -"Description:" = "Beskrivelse:"; -"Document:" = "Dokument:"; -"Category:" = "Kategori:"; -"Repeat:" = "Gjenta:"; -"Reminder:" = "Påminnelse:"; -"General:" = "Generell:"; -"Reply:" = "Svar:"; +"Organizer" = "Organisatør"; +"Description" = "Beskrivelse"; +"Document" = "Dokument"; +"Category" = "Kategori"; +"Repeat" = "Gjenta"; +"Reminder" = "Påminnelse"; +"General" = "Generell"; +"Reply" = "Svar"; "Target:" = "Mål:"; @@ -222,7 +222,7 @@ "view_future" = "Alle fremtidige hendelser"; "view_selectedday" = "Valgt dag"; -"View:" = "Vis:"; +"View" = "Vis"; "Title or Description" = "Tittel eller beskrivelse"; "Search" = "Søk"; @@ -475,8 +475,8 @@ vtodo_class2 = "(Konfidensiell oppgave)"; "button_allOccurrences" = "Alle forekomster"; /* Properties dialog */ -"Name:" = "Navn:"; -"Color:" = "Farge:"; +"Name" = "Navn"; +"Color" = "Farge"; "Include in free-busy" = "Inkluder i fritt opptatt"; diff --git a/UI/Scheduler/Polish.lproj/Localizable.strings b/UI/Scheduler/Polish.lproj/Localizable.strings index 928b6572c..d69138a1d 100644 --- a/UI/Scheduler/Polish.lproj/Localizable.strings +++ b/UI/Scheduler/Polish.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Ustawienia wydruku"; -"Title:" = "Tytuł:"; -"Layout:" = "Układ:"; +"Title" = "Tytuł"; +"Layout" = "Układ"; "What to Print" = "Elementy do wydruku"; "Options" = "Opcje"; "Tasks with no due date" = "Zadania bez terminu"; @@ -167,34 +167,34 @@ "Appointment editor" = "Edytor spotkań"; "Appointment proposal" = "Propozycja spotkania"; "Appointment on" = "Spotkanie w"; -"Start:" = "Początek:"; -"End:" = "Koniec:"; -"Due Date:" = "Termin:"; -"Title:" = "Tytuł:"; -"Calendar:" = "Kalendarz:"; +"Start" = "Początek"; +"End" = "Koniec"; +"Due Date" = "Termin"; +"Title" = "Tytuł"; +"Calendar" = "Kalendarz"; "Name" = "Nazwa"; "Email" = "E-mail"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% wykonania"; -"Location:" = "Miejsce:"; -"Priority:" = "Priorytet:"; +"Location" = "Miejsce"; +"Priority" = "Priorytet"; "Privacy" = "Prywatność"; "Cycle" = "Powtarzaj"; "Cycle End" = "Koniec powtarzania"; "Categories" = "Kategorie"; "Classification" = "Klasyfikacja"; "Duration" = "Czas trwania"; -"Attendees:" = "Uczestnicy:"; +"Attendees" = "Uczestnicy"; "Resources" = "Zasoby"; -"Organizer:" = "Organizator:"; -"Description:" = "Opis:"; -"Document:" = "Dokument:"; -"Category:" = "Kategoria:"; -"Repeat:" = "Powtórz:"; -"Reminder:" = "Przypomnienie:"; -"General:" = "Ogólne:"; -"Reply:" = "Odpowiedź:"; -"Created by:" = "Stworzone przez:"; +"Organizer" = "Organizator"; +"Description" = "Opis"; +"Document" = "Dokument"; +"Category" = "Kategoria"; +"Repeat" = "Powtórz"; +"Reminder" = "Przypomnienie"; +"General" = "Ogólne"; +"Reply" = "Odpowiedź"; +"Created by" = "Stworzone przez"; "Target:" = "Cel:"; @@ -244,7 +244,7 @@ "view_overdue" = "Zadania zaległe"; "view_incomplete" = "Zadania nieukończone"; -"View:" = "Widok:"; +"View" = "Widok"; "Title, category or location" = "Tytuł, kategoria lub położenie"; "Entire content" = "Cała zawartość"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Zadanie poufne)"; "button_allOccurrences" = "Wszystkie wystąpienia"; /* Properties dialog */ -"Name:" = "Nazwa:"; -"Color:" = "Kolor:"; +"Name" = "Nazwa"; +"Color" = "Kolor"; "Include in free-busy" = "Uwzględnij w wolny-zajęty"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Zadanie poufne)"; "Notifications" = "Powiadomienia"; "Receive a mail when I modify my calendar" = "Przyślij e-mail, gdy zmieniam swój kalendarz"; "Receive a mail when someone else modifies my calendar" = "Przyślij e-mail, gdy ktoś zmienia mój kalendarz"; -"When I modify my calendar, send a mail to:" = "Gdy zmieniam swój kalendarz, wyślij e-mail do:"; +"When I modify my calendar, send a mail to" = "Gdy zmieniam swój kalendarz, wyślij e-mail do"; "Links to this Calendar" = "Odnośniki do tego kalendarza"; "Authenticated User Access" = "Dostęp dla zalogowanych użytkowników"; -"CalDAV URL" = "CalDAV URL:"; +"CalDAV URL" = "CalDAV URL"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings index 1f43a8900..d5f4c679f 100644 --- a/UI/Scheduler/Russian.lproj/Localizable.strings +++ b/UI/Scheduler/Russian.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Список"; "Print Settings" = "Настройки печати"; -"Title:" = "Заголовок:"; -"Layout:" = "Разметка:"; +"Title" = "Заголовок"; +"Layout" = "Разметка"; "What to Print" = "Что печатать"; "Options" = "Опции"; "Tasks with no due date" = "Задачи без указания времени окончания"; @@ -167,34 +167,34 @@ "Appointment editor" = "Редактор встреч"; "Appointment proposal" = "Предложение встреч"; "Appointment on" = "Встреча"; -"Start:" = "Начало:"; -"End:" = "Конец:"; -"Due Date:" = "К дате:"; -"Title:" = "Заголовок:"; -"Calendar:" = "Календарь:"; +"Start" = "Начало"; +"End" = "Конец"; +"Due Date" = "К дате"; +"Title" = "Заголовок"; +"Calendar" = "Календарь"; "Name" = "Имя"; "Email" = "Email"; -"Status:" = "Статус:"; +"Status" = "Статус"; "% complete" = "% выполнено"; -"Location:" = "Место:"; -"Priority:" = "Приоритет:"; +"Location" = "Место"; +"Priority" = "Приоритет"; "Privacy" = "Приватность"; "Cycle" = "Цикл"; "Cycle End" = "Конец цикла"; "Categories" = "Категории"; "Classification" = "Классификация"; "Duration" = "Продолжительность"; -"Attendees:" = "Участники:"; +"Attendees" = "Участники"; "Resources" = "Ресурсы"; -"Organizer:" = "Организатор:"; -"Description:" = "Описание:"; -"Document:" = "Документ:"; -"Category:" = "Категория:"; -"Repeat:" = "Повторять:"; -"Reminder:" = "Напоминание:"; -"General:" = "Общее:"; -"Reply:" = "Ответ:"; -"Created by:" = "Создано:"; +"Organizer" = "Организатор"; +"Description" = "Описание"; +"Document" = "Документ"; +"Category" = "Категория"; +"Repeat" = "Повторять"; +"Reminder" = "Напоминание"; +"General" = "Общее"; +"Reply" = "Ответ"; +"Created by" = "Создано"; "Target:" = "Цель:"; @@ -244,7 +244,7 @@ "view_overdue" = "Просроченные задачи"; "view_incomplete" = "Незаконченные задачи"; -"View:" = "Вид:"; +"View" = "Вид"; "Title, category or location" = "Заголовок, категория или место"; "Entire content" = "Всё содержимое"; @@ -506,8 +506,7 @@ vtodo_class2 = "(Конфиденциальное задание)"; "button_allOccurrences" = "Все повторы"; /* Properties dialog */ -"Name:" = "Название:"; -"Color:" = "Цвет:"; +"Color" = "Цвет"; "Include in free-busy" = "Включить в free-busy"; @@ -522,11 +521,11 @@ vtodo_class2 = "(Конфиденциальное задание)"; "Notifications" = "Напоминания"; "Receive a mail when I modify my calendar" = "Получать письмо в случае если я изменю свой календарь"; "Receive a mail when someone else modifies my calendar" = "Получать письмо если кто-то изменит мой календарь"; -"When I modify my calendar, send a mail to:" = "Если я изменю свой календарь, отправить письмо на адрес: "; +"When I modify my calendar, send a mail to" = "Если я изменю свой календарь, отправить письмо на адрес "; "Links to this Calendar" = "Ссылки на этот календарь"; "Authenticated User Access" = "Доступ авторизированных пользователей"; -"CalDAV URL" = "CalDAV URL: "; +"CalDAV URL" = "CalDAV URL "; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Slovak.lproj/Localizable.strings b/UI/Scheduler/Slovak.lproj/Localizable.strings index be50e57cb..2738cc158 100644 --- a/UI/Scheduler/Slovak.lproj/Localizable.strings +++ b/UI/Scheduler/Slovak.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Zoznam"; "Print Settings" = "Nastavenia tlače"; -"Title:" = "Názov:"; -"Layout:" = "Zobrazenie:"; +"Title" = "Názov"; +"Layout" = "Zobrazenie"; "What to Print" = "Čo chcete tlačiť"; "Options" = "Možnosti"; "Tasks with no due date" = "Úlohy bez časového obmedzenia"; @@ -163,34 +163,34 @@ "Appointment editor" = "Editovať schôdzky"; "Appointment proposal" = "Navrhnúť schôdzku"; "Appointment on" = "Schôdzka na"; -"Start:" = "Začiatok:"; -"End:" = "Koniec:"; -"Due Date:" = "Dátum splnenia:"; -"Title:" = "Názov:"; -"Calendar:" = "Kalendár:"; +"Start" = "Začiatok"; +"End" = "Koniec"; +"Due Date" = "Dátum splnenia"; +"Title" = "Názov"; +"Calendar" = "Kalendár"; "Name" = "Meno"; "Email" = "E-Mail"; -"Status:" = "Stav:"; +"Status" = "Stav"; "% complete" = "% hotovo"; -"Location:" = "Miesto:"; -"Priority:" = "Priorita:"; +"Location" = "Miesto"; +"Priority" = "Priorita"; "Privacy" = "Súkromie"; "Cycle" = "Cyklus opakovania"; "Cycle End" = "Koniec cyklu"; "Categories" = "Kategórie"; "Classification" = "Klasifikácia"; "Duration" = "Trvanie"; -"Attendees:" = "Účastníci:"; +"Attendees" = "Účastníci"; "Resources" = "Zdroje"; -"Organizer:" = "Organizátor:"; -"Description:" = "Popis:"; -"Document:" = "Dokument:"; -"Category:" = "Kategória:"; -"Repeat:" = "Opakovanie:"; -"Reminder:" = "Pripomenutie:"; -"General:" = "Hlavný:"; -"Reply:" = "Odpoveď:"; -"Created by:" = "Vytvorené:"; +"Organizer" = "Organizátor"; +"Description" = "Popis"; +"Document" = "Dokument"; +"Category" = "Kategória"; +"Repeat" = "Opakovanie"; +"Reminder" = "Pripomenutie"; +"General" = "Hlavný"; +"Reply" = "Odpoveď"; +"Created by" = "Vytvorené"; "Target:" = "Cieľ:"; @@ -240,7 +240,7 @@ "view_overdue" = "Vypršané úlohy"; "view_incomplete" = "Nedokončené úlohy"; -"View:" = "Zobraziť:"; +"View" = "Zobraziť"; "Title, category or location" = "Názov, kategória alebo miesto"; "Entire content" = "Celý obsah"; @@ -502,8 +502,7 @@ vtodo_class2 = "(Dôverná úloha)"; "button_allOccurrences" = "Všetky opakovania"; /* Properties dialog */ -"Name:" = "Názov:"; -"Color:" = "Farba:"; +"Color" = "Farba"; "Include in free-busy" = "Zahrnúť do voľný-obsadený"; @@ -518,11 +517,11 @@ vtodo_class2 = "(Dôverná úloha)"; "Notifications" = "Oznámenia"; "Receive a mail when I modify my calendar" = "Informuj emailom keď upravím môj kalendár"; "Receive a mail when someone else modifies my calendar" = "Informuj emailom keď niekto iný upraví môj kalendár"; -"When I modify my calendar, send a mail to:" = "Keď upravím svoj kalendár, pošli email:"; +"When I modify my calendar, send a mail to" = "Keď upravím svoj kalendár, pošli email"; "Links to this Calendar" = "Odkazy na tento kalendár"; "Authenticated User Access" = "Prístup pre overeného užívateľa"; -"CalDAV URL" = "CalDAV url:"; +"CalDAV URL" = "CalDAV url"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Slovenian.lproj/Localizable.strings b/UI/Scheduler/Slovenian.lproj/Localizable.strings new file mode 100644 index 000000000..d92e3d29c --- /dev/null +++ b/UI/Scheduler/Slovenian.lproj/Localizable.strings @@ -0,0 +1,565 @@ +/* this file is in UTF-8 format! */ + +/* Tooltips */ + +"Create a new event" = "Ustvari novi dogodek"; +"Create a new task" = "Ustvari novo opravilo"; +"Edit this event or task" = "Urejaj ta dogodek ali opravilo"; +"Print the current calendar view" = "Tiskaj trenutni pogled koledarja"; +"Delete this event or task" = "Briši ta dogodek ali opravilo"; +"Go to today" = "Pojdi na danes"; +"Switch to day view" = "Preklopi na dnevni pogled"; +"Switch to week view" = "Preklopi na tedenski pogled"; +"Switch to month view" = "Preklopi na mesečni pogled"; +"Reload all calendars" = "Ponovno naloži vse koledarje"; + +/* Tabs */ +"Date" = "Datum"; +"Calendars" = "Koledarji"; + +/* Day */ + +"DayOfTheMonth" = "Dan meseca"; +"dayLabelFormat" = "%m/%d/%Y"; +"today" = "Danes"; + +"Previous Day" = "Prejšnji dan"; +"Next Day" = "Naslednji dan"; + +/* Week */ + +"Week" = "Teden"; +"this week" = "ta teden"; + +"Week %d" = "Teden %d"; + +"Previous Week" = "Prejšnji teden"; +"Next Week" = "Naslednji teden"; + +/* Month */ + +"this month" = "ta mesec"; + +"Previous Month" = "Prejšnji mesec"; +"Next Month" = "Naslednji mesec"; + +/* Year */ + +"this year" = "to leto"; + +/* Menu */ + +"Calendar" = "Koledar"; +"Contacts" = "Stiki"; + +"New Calendar..." = "Novi koledar..."; +"Delete Calendar" = "Briši koledar..."; +"Unsubscribe Calendar" = "Odjavi koledar"; +"Sharing..." = "Skupna raba..."; +"Export Calendar..." = "Izvoz koledarja"; +"Import Events..." = "Uvoz dogodkov.."; +"Import Events" = "Uvoz dogodkov"; +"Select an iCalendar file (.ics)." = "Izberi iCalendar datoteko (.ics)."; +"Upload" = "Naloži"; +"Uploading" = "Nalaganje"; +"Publish Calendar..." = "Objavi koledar..."; +"Reload Remote Calendars" = "Ponovno naloži oddaljene koledarje"; +"Properties" = "Lastnosti"; +"Done" = "Končano"; +"An error occurred while importing calendar." = "Prišlo je do napake pri uvozu koledarja."; +"No event was imported." = "Noben dogodek ni uvožen."; +"A total of %{0} events were imported in the calendar." = "Skupaj %{0} dogodkov je bilo uvoženo v koledar."; + +"Compose E-Mail to All Attendees" = "Sestavi pošto za vse udeležence"; +"Compose E-Mail to Undecided Attendees" = "Sestavi e-pošto za neodločene udeležence"; + +/* Folders */ +"Personal calendar" = "Osebnik koledar"; + +/* Misc */ + +"OpenGroupware.org" = "OpenGroupware.org"; +"Forbidden" = "Prepovedano"; + +/* acls */ + +"Access rights to" = "Pravice za dostop za"; +"For user" = "Za uporabnika"; + +"Any Authenticated User" = "Katerikoli preverjeni uporabnik"; +"Public Access" = "Javni dostop"; + +"label_Public" = "Javno"; +"label_Private" = "Osebno"; +"label_Confidential" = "Zaupno"; + +"label_Viewer" = "Preglej vse"; +"label_DAndTViewer" = "Pregled datum in čas"; +"label_Modifier" = "Spremeni"; +"label_Responder" = "Odzovi se na"; +"label_None" = "Noben"; + +"View All" = "Preglej vse"; +"View the Date & Time" = "Preglej datum in čas"; +"Modify" = "Spremeni"; +"Respond To" = "Odzovi se na"; +"None" = "Noben"; + +"This person can create objects in my calendar." += "Ta oseba lahko ustvari objekte v mojem koledarju."; +"This person can erase objects from my calendar." += "Ta oseba lahko briše objekte v mojem koledarju."; + +/* Button Titles */ + +"Subscribe to a Calendar..." = "Naroči na koledar..."; +"Remove the selected Calendar" = "Odstrani izbrani koledar"; + +"Name of the Calendar" = "Ime koledarja"; + +"new" = "Novo"; +"Print view" = "Tiskaj pregled"; +"edit" = "Uredi"; +"delete" = "Briši"; +"proposal" = "Predlog"; +"Save and Close" = "Shrani in zapri"; +"Close" = "Zapri"; +"Invite Attendees" = "Povabi udeležence"; +"Attach" = "Priloži"; +"Update" = "Posodobi"; +"Cancel" = "Prekliči"; +"show_rejected_apts" = "Prikaži zavrnjene sestanke"; +"hide_rejected_apts" = "Skrij zavrnjene sestanke"; + + +/* Schedule */ + +"Schedule" = "Razporedi"; +"No appointments found" = "Noben sestanek ni najden"; +"Meetings proposed by you" = "Srečanje predlagano od tebe"; +"Meetings proposed to you" = "Srečanja predlagana tebi"; +"sched_startDateFormat" = "%d/%m %H:%M"; +"action" = "Dejanje"; +"accept" = "Sprejmi"; +"decline" = "Zavrni"; +"more attendees" = "Več udeležencev"; +"Hide already accepted and rejected appointments" = "Skrij že sprejete in zavrnjene sestanke."; +"Show already accepted and rejected appointments" = "Prikaži že sprejete in zavrnjene sestanke"; + +/* Print view */ + +"LIST" = "Seznam"; +"Print Settings" = "Tiskaj nastavitve"; +"Title" = "Naslov"; +"Layout" = "Postavitev"; +"What to Print" = "Kaj za tiskanje"; +"Options" = "Možnosti"; +"Tasks with no due date" = "Opravila brez datuma zapadlosti"; +"Display working hours only" = "Prikaži le delovne ure"; +"Completed tasks" = "Zaključena opravila"; +"Display events and tasks colors" = "Prikaži barve dogodkov in opravil"; +"Borders" = "Obrobe"; +"Backgrounds" = "Ozadja"; + +/* Appointments */ + +"Appointment viewer" = "Pregledovalnik sestankov"; +"Appointment editor" = "Urejevalnik sestankov"; +"Appointment proposal" = "Predlog sestanka"; +"Appointment on" = "Sestanek na"; +"Start" = "Začetek"; +"End" = "Konec"; +"Due Date" = "Datum zapadlosti"; +"Title" = "Naslov"; +"Calendar" = "Koledar"; +"Name" = "Ime"; +"Email" = "E-pošta"; +"Status" = "Status"; +"% complete" = "% dokončan"; +"Location" = "Mesto"; +"Priority" = "Prioriteta"; +"Privacy" = "Zasebnost"; +"Cycle" = "Cikel"; +"Cycle End" = "Konec cikla"; +"Categories" = "Kategorije"; +"Classification" = "Razvrstitev"; +"Duration" = "Trajanje"; +"Attendees" = "Udeleženci"; +"Resources" = "Viri"; +"Organizer" = "Organizator"; +"Description" = "Opis"; +"Document" = "Dokument"; +"Category" = "Kategorija"; +"Repeat" = "Ponovitev"; +"Reminder" = "Opomnik"; +"General" = "Splošno"; +"Reply" = "Odgovori"; +"Created by" = "Ustvaril"; + + +"Target:" = "Cilj:"; + +"attributes" = "atributi"; +"attendees" = "udeleženci"; +"delegated from" = "dodeljeno od"; + +/* checkbox title */ +"is private" = "je osebno"; +/* classification */ +"Public" = "Javno"; +"Private" = "Osebno"; +/* text used in overviews and tooltips */ +"empty title" = "Prazen naslov"; +"private appointment" = "Osebni sestanek"; + +"Change..." = "Spremeni..."; + +/* Appointments (participation state) */ + +"partStat_NEEDS-ACTION" = "Potrdil bom pozneje"; +"partStat_ACCEPTED" = "Udeležil se bom"; +"partStat_DECLINED" = "Ne bom se udeležil"; +"partStat_TENTATIVE" = "Mogoče se udeležim"; +"partStat_DELEGATED" = "Dodeljujem"; +"partStat_OTHER" = "Ostalo"; + +/* Appointments (error messages) */ + +"Conflicts found!" = "Najdeni konflikti!"; +"Invalid iCal data!" = "Napačni iCal podatki!"; +"Could not create iCal data!" = "Ne morem ustvariti iCal podatkov!"; + +/* Searching */ + +"view_all" = "Vse"; +"view_today" = "Danes"; +"view_next7" = "Naslednjih 7 dni"; +"view_next14" = "Naslednjih 14 dni"; +"view_next31" = "Naslednjih 31 dni"; +"view_thismonth" = "Ta mesec"; +"view_future" = "Vsi prihodnji dogodki"; +"view_selectedday" = "Izbrani dan"; + +"view_not_started" = "Nezačeta opravila"; +"view_overdue" = "Zapadla opravila"; +"view_incomplete" = "Nedokončana opravila"; + +"View" = "Pregled"; +"Title, category or location" = "Naslov, kategorija ali mesto"; +"Entire content" = "Vsa vsebina"; + +"Search" = "Išči"; +"Search attendees" = "Išči udeležence"; +"Search resources" = "Išči vire"; +"Search appointments" = "Išči sestanke"; + +"All day Event" = "Celodnevni dogodek"; +"check for conflicts" = "Preveri konflikte"; + +"Browse URL" = "Prebrskaj URL"; + +"newAttendee" = "Dodaj udeleženca"; + +/* calendar modes */ + +"Overview" = "Pregled"; +"Chart" = "Grafikon"; +"List" = "Seznam"; +"Columns" = "Stolpci"; + +/* Priorities */ + +"prio_0" = "Ni določen"; +"prio_1" = "Visoka"; +"prio_2" = "Visoka"; +"prio_3" = "Visoka"; +"prio_4" = "Visoka"; +"prio_5" = "Normalna"; +"prio_6" = "Nizka"; +"prio_7" = "Nizka"; +"prio_8" = "Nizka"; +"prio_9" = "Nizka"; + +/* access classes (privacy) */ +"PUBLIC_vevent" = "Javni dogodek"; +"CONFIDENTIAL_vevent" = "Zaupni dogodek"; +"PRIVATE_vevent" = "Osebni dogodek"; +"PUBLIC_vtodo" = "Javno opravilo"; +"CONFIDENTIAL_vtodo" = "Zaupno opravilo"; +"PRIVATE_vtodo" = "Osebno opravilo"; + +/* status type */ +"status_" = "Ni določeno"; +"status_NOT-SPECIFIED" = "Ni določeno"; +"status_TENTATIVE" = "Pogojno"; +"status_CONFIRMED" = "Potrjeno"; +"status_CANCELLED" = "Preklicano"; +"status_NEEDS-ACTION" = "Potrebuje ukrepanje"; +"status_IN-PROCESS" = "V teku"; +"status_COMPLETED" = "Dokončano na"; + +/* Cycles */ + +"cycle_once" = "cycle_once"; +"cycle_daily" = "cycle_daily"; +"cycle_weekly" = "cycle_weekly"; +"cycle_2weeks" = "cycle_2weeks"; +"cycle_4weeks" = "cycle_4weeks"; +"cycle_monthly" = "cycle_monthly"; +"cycle_weekday" = "cycle_weekday"; +"cycle_yearly" = "cycle_yearly"; + +"cycle_end_never" = "cycle_end_never"; +"cycle_end_until" = "cycle_end_until"; + +"Recurrence pattern" = "Ponovitev vzorca"; +"Range of recurrence" = "Obseg ponovitev"; + +"Repeat" = "Ponovi"; +"Daily" = "Dnevno"; +"Weekly" = "Tedensko"; +"Monthly" = "Mesečno"; +"Yearly" = "Letno"; +"Every" = "Vsak"; +"Days" = "Dnevi"; +"Week(s)" = "Tedni"; +"On" = "Na"; +"Month(s)" = "Meseci"; +/* [Event recurrence editor] Ex: _The_ first Sunday */ +"The" = " "; +"Recur on day(s)" = "Ponovi po dnevih"; +"Year(s)" = "Leta"; +/* [Event recurrence editor] Ex: Every first Sunday _of_ April */ +"cycle_of" = "od"; +"No end date" = "Brez končnega datuma"; +"Create" = "Ustvari"; +"appointment(s)" = "sestanki"; +"Repeat until" = "Ponavljaj do"; + +"First" = "Prvo"; +"Second" = "Drugo"; +"Third" = "Tretje"; +"Fourth" = "Četrto"; +"Fift" = "Peto"; +"Last" = "Zadnje"; + +/* Appointment categories */ + +"category_none" = "Noben"; +"category_labels" = "Obletnica,Rojstni dan,Poslovno,Klici,Stranke,Tekmeci,Kupci,Priljubljeni,Sledenje,Darila,Prazniki,Ideje,Srečanja,Zadeve,Razno,Osebno,Projekti,Javno prazniki,Status,Dobavitelji,Potovanje,Dopust"; + +"repeat_NEVER" = "Se ne ponavlja"; +"repeat_DAILY" = "Dnevno"; +"repeat_WEEKLY" = "Tedensko"; +"repeat_BI-WEEKLY" = "Dvotedensko"; +"repeat_EVERY WEEKDAY" = "Vsak teden"; +"repeat_MONTHLY" = "Mesečno"; +"repeat_YEARLY" = "Letno"; +"repeat_CUSTOM" = "Po meri..."; + +"reminder_NONE" = "Brez opomnika"; +"reminder_5_MINUTES_BEFORE" = "5 minut pred"; +"reminder_10_MINUTES_BEFORE" = "10 minut pred"; +"reminder_15_MINUTES_BEFORE" = "15 minut pred"; +"reminder_30_MINUTES_BEFORE" = "30 minut pred"; +"reminder_45_MINUTES_BEFORE" = "45 minut pred"; +"reminder_1_HOUR_BEFORE" = "1 uro pred"; +"reminder_2_HOURS_BEFORE" = "2 uri pred"; +"reminder_5_HOURS_BEFORE" = "5 ur pred"; +"reminder_15_HOURS_BEFORE" = "15 ur pred"; +"reminder_1_DAY_BEFORE" = "1 dan pred"; +"reminder_2_DAYS_BEFORE" = "2 dneva pred"; +"reminder_1_WEEK_BEFORE" = "1 teden pred"; +"reminder_CUSTOM" = "Po meri..."; + +"reminder_MINUTES" = "minute"; +"reminder_HOURS" = "ure"; +"reminder_DAYS" = "dnevi"; +"reminder_BEFORE" = "pred"; +"reminder_AFTER" = "po"; +"reminder_START" = "dogodek se začne"; +"reminder_END" = "dogodek se konča"; +"Reminder Details" = "Podrobnosti opomnika"; + +"Choose a Reminder Action" = "Izberi dejanja opomnika"; +"Show an Alert" = "Prikaži opozorilo"; +"Send an E-mail" = "Pošlji e-pošto"; +"Email Organizer" = "Organizator e-pošte"; +"Email Attendees" = "E-poštni udeleženci"; + +"zoom_400" = "400%"; +"zoom_200" = "200%"; +"zoom_100" = "100%"; +"zoom_50" = "50%"; +"zoom_25" = "25%"; + +/* transparency */ + +"Show Time as Free" = "Prikaži čas kot prosto"; + +/* email notifications */ +"Send Appointment Notifications" = "Pošlji obvestilo o sestanku"; + +/* validation errors */ + +validate_notitle = "Naslov ni vpisan, nadaljujem?"; +validate_invalid_startdate = "Napačeno polje začetni datum!"; +validate_invalid_enddate = "Napačno polje končni datum!"; +validate_endbeforestart = "Vnešeni končni datum je pred začetnim datumom."; + +"Events" = "Dogodki"; +"Tasks" = "Opravila"; +"Show completed tasks" = "Prikaži dokončana opravila"; + +/* tabs */ +"Task" = "Opravilo"; +"Event" = "Dogodek"; +"Recurrence" = "Ponovitev"; + +/* toolbar */ +"New Event" = "Nov dogodek"; +"New Task" = "Novo opravilo"; +"Edit" = "Uredi"; +"Delete" = "Briši"; +"Go to Today" = "Pojdi na danes"; +"Day View" = "Dnevni pregled"; +"Week View" = "Tedenski pregled"; +"Month View" = "Mesečni pregled"; +"Reload" = "Ponovno naloži"; + +"eventPartStatModificationError" = "Tvoj status sodelovanja se ne da spremeniti."; + +/* menu */ +"New Event..." = "Novi dogodek..."; +"New Task..." = "Novo opravilo..."; +"Edit Selected Event..." = "Uredi izbran dogodek..."; +"Delete Selected Event" = "Briši izbran dogodek"; +"Select All" = "Označi vse"; +"Workweek days only" = "Samo delovni dnevi tedna"; +"Tasks in View" = "Opravila v pregledu"; + +"eventDeleteConfirmation" = "Naslednji dogodki bodo brisani:"; +"taskDeleteConfirmation" = "Naslednja opravila so bila brisani:"; +"Would you like to continue?" = "Želiš nadaljevati?"; + +"You cannot remove nor unsubscribe from your personal calendar." += "Ne moreš se odstraniti ali odjaviti iz osebnega koledarja."; +"Are you sure you want to delete the calendar \"%{0}\"?" += "Si prepirčan, da želiš brisati izbrani koledar \"%{0}\"?"; + +/* Legend */ +"Participant" = "Sodelujoči"; +"Optional Participant" = "Neobvezni sodelujoči"; +"Non Participant" = "Ne sodelujoči"; +"Chair" = "Stol"; + +"Needs action" = "Potrebuje ukrepanje"; +"Accepted" = "Sprejet"; +"Declined" = "Zavrnjen"; +"Tentative" = "Pogojno"; + +"Free" = "Prosto"; +"Busy" = "Zasedeno"; +"Maybe busy" = "Mogoče zasedeno"; +"No free-busy information" = "Ni informacije o prosto-zasedeno"; + +/* FreeBusy panel buttons and labels */ +"Suggest time slot:" = "Predlagaj časovno režo:"; +"Zoom:" = "Povečaj:"; +"Previous slot" = "Prejšnja reža"; +"Next slot" = "Naslednja reža"; +"Previous hour" = "Prejšnja ura"; +"Next hour" = "Naslednja ura"; +"Work days only" = "Samo delovni dnevi"; +"The whole day" = "Celi dan"; +"Between" = "Med"; +"and" = "in"; + +"A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?" += "Obstaja časovni konflikt med enim ali več udeleženci.\nŽeliš vseeno obdržati trenutne nastavitve?"; + +/* apt list */ +"Title" = "Naslov"; +"Start" = "Začetek"; +"End" = "Konec"; +"Due Date" = "Datum zapadlosti"; +"Location" = "Mesto"; + +"(Private Event)" = "(Osebni dogodek)"; + +vevent_class0 = "(Javni dogodek)"; +vevent_class1 = "(Osebni dogodek)"; +vevent_class2 = "(Zaupni dogodek)"; + +"Priority" = "Prioriteta"; +"Category" = "Kategorija"; + +vtodo_class0 = "(Javno opravilo)"; +vtodo_class1 = "(Osebno opravilo)"; +vtodo_class2 = "(Zaupno opravilo)"; + +"closeThisWindowMessage" = "Hvala. Smeš zapreti to okno ali pogledati tvoje"; +"Multicolumn Day View" = "Dnevni pogled v več stolpcih"; + +"Please select an event or a task." = "Prosim izberi dogodek ali opravilo."; + +"editRepeatingItem" = "Element, ki ga urejaš, je ponavljajoči element. Želiš urediti vse ponovite ali samo eno instanco?"; +"button_thisOccurrenceOnly" = "Le ta ponovitev"; +"button_allOccurrences" = "Vse ponovitve"; + +/* Properties dialog */ +"Name" = "Ime"; +"Color" = "Barva"; + +"Include in free-busy" = "Vključi v prosto-zasedeno"; + +"Synchronization" = "Sinhronizacija"; +"Synchronize" = "Sinhroniziraj"; +"Tag:" = "Značka:"; + +"Display" = "Prikaz"; +"Show alarms" = "Prikaži alarme"; +"Show tasks" = "Prikaži opravila"; + +"Notifications" = "Obvestila"; +"Receive a mail when I modify my calendar" = "Prejmi pošto, ko spremenim moj koledar"; +"Receive a mail when someone else modifies my calendar" = "Prejmi pošto, ko kdorkoli drugi spremeni moj koledar"; +"When I modify my calendar, send a mail to" = "Ko spremenim moj koledar, pošlji pošto za"; + +"Links to this Calendar" = "Povezave do tega koledarja"; +"Authenticated User Access" = "Preverjeni uporabniški dostop"; +"CalDAV URL" = "CalDAV URL"; +"WebDAV ICS URL" = "WebDAV ICS URL"; +"WebDAV XML URL" = "WebDAV XML URL"; + +/* Error messages */ +"dayFieldInvalid" = "Prosim določi numerično vrednost v polju Dnevi večje ali enko 1."; +"weekFieldInvalid" = "Prosim določi numerično vrednost v polje Tedni večje ali enako 1."; +"monthFieldInvalid" = "Prosim določi numerično vrednost v polje Meseci večje ali enako 1."; +"monthDayFieldInvalid" = "Prosim določi numerično vrednost v polje mesec dan večje ali enako 1."; +"yearFieldInvalid" = "Prosim določi numerično vrednost v polje Leta večje ali enako 1."; +"appointmentFieldInvalid" = "Prosim določi numerično vrednost v polje Sesetanki večje ali enako 1."; +"recurrenceUnsupported" = "Ta tip ponovitve trenutno ni podprt."; +"Please specify a calendar name." = "Prosim določi ime koledarja."; +"tagNotDefined" = "Določiti moraš značko, če želiš sinhronizirati ta koledar."; +"tagAlreadyExists" = "Značka, ki si jo določil, je že povezana z drugim koledarjem."; +"tagHasChanged" = "Če spremeniš značko tvojega koledarja, boš moral ponovno naložiti podatke na tvoji mobilni napravi.\nNadaljujem?"; +"tagWasAdded" = "Če želiš sinhronizirati ta koledar, boš moral ponovno naložiti podatke na tvoji mobilni napravi.\nNadaljujem?"; +"tagWasRemoved" = "Če umakneš ta koledar iz sinhronizacije, boš moral ponovno naložiti podatke na tvoji mobilni napravi.\nNadaljujem?"; +"DestinationCalendarError" = "Izvorni in ciljni koledarji so enaki. Prosim poskusi kopirati drugi koledar."; +"EventCopyError" = "Kopiranje ni uspelo. Prosim poskusi kopirati v drugi koledar."; +"Please select at least one calendar" = "Prosim določi vsaj en koledar."; + +"Open Task..." = "Odprto opravilo..."; +"Mark Completed" = "Označitev dokončana"; +"Delete Task" = "Briši opravilo"; +"Delete Event" = "Briši dogodek"; +"Copy event to my calendar" = "Kopiraj dogodek v moj koledar"; +"View Raw Source" = "Preglej surovi vir"; + +"Subscribe to a web calendar..." = "Naroči na spletni koledar..."; +"URL of the Calendar" = "URL koledarja"; +"Web Calendar" = "Spletni koledar"; +"Reload on login" = "Ponovno naloži ob prijavi"; +"Invalid number." = "Napačno število."; +"Please identify yourself to %{0}" = "Prosim predstavi se %{0}"; diff --git a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings index a987dcfbf..52e44022e 100644 --- a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings +++ b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Opciones de impresión"; -"Title:" = "Título:"; -"Layout:" = "Disposición:"; +"Title" = "Título"; +"Layout" = "Disposición"; "What to Print" = "Qué imprimir"; "Options" = "Opciones"; "Tasks with no due date" = "Tareas sin fecha de vencimiento"; @@ -167,34 +167,34 @@ "Appointment editor" = "Editor de eventos"; "Appointment proposal" = "Propuesta de evento"; "Appointment on" = "Evento"; -"Start:" = "Desde:"; -"End:" = "Hasta:"; -"Due Date:" = "Vencimiento:"; -"Title:" = "Título:"; -"Calendar:" = "Calendario:"; +"Start" = "Desde"; +"End" = "Hasta"; +"Due Date" = "Vencimiento"; +"Title" = "Título"; +"Calendar" = "Calendario"; "Name" = "Nombre"; "Email" = "Correo"; -"Status:" = "Estado:"; +"Status" = "Estado"; "% complete" = "% completo"; -"Location:" = "Lugar:"; -"Priority:" = "Prioridad:"; +"Location" = "Lugar"; +"Priority" = "Prioridad"; "Privacy" = "Privacidad"; "Cycle" = "Repetir"; "Cycle End" = "Fin repetición"; "Categories" = "Categorías"; "Classification" = "Privacidad"; "Duration" = "Duración"; -"Attendees:" = "Asistentes:"; +"Attendees" = "Asistentes"; "Resources" = "Recursos"; -"Organizer:" = "Organizador:"; -"Description:" = "Descripción:"; -"Document:" = "Documento:"; -"Category:" = "Categoría:"; -"Repeat:" = "Repetir:"; -"Reminder:" = "Recordatorio:"; -"General:" = "General:"; -"Reply:" = "Responder:"; -"Created by:" = "Creado por:"; +"Organizer" = "Organizador"; +"Description" = "Descripción"; +"Document" = "Documento"; +"Category" = "Categoría"; +"Repeat" = "Repetir"; +"Reminder" = "Recordatorio"; +"General" = "General"; +"Reply" = "Responder"; +"Created by" = "Creado por"; "Target:" = "URL documento:"; @@ -244,7 +244,7 @@ "view_overdue" = "Tareas que han vencido"; "view_incomplete" = "Tareas incompletas"; -"View:" = "Ver:"; +"View" = "Ver"; "Title, category or location" = "Título, categoría o lugar"; "Entire content" = "Contenido completo"; @@ -332,7 +332,7 @@ "No end date" = "Sin fecha de finalización"; "Create" = "Crear"; "appointment(s)" = "evento(s)"; -"Repeat until" = "Repetir hasta: "; +"Repeat until" = "Repetir hasta "; "First" = "Primero"; "Second" = "Segundo"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Tarea confidencial)"; "button_allOccurrences" = "Todas las apariciones"; /* Properties dialog */ -"Name:" = "Nombre:"; -"Color:" = "Color:"; +"Name" = "Nombre"; +"Color" = "Color"; "Include in free-busy" = "Incluir en información de disponibilidad"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Tarea confidencial)"; "Notifications" = "Notificaciones"; "Receive a mail when I modify my calendar" = "Recibir un correo de notificación cuando modifique mi calendario"; "Receive a mail when someone else modifies my calendar" = "Recibir un correo de notificación cuando otra persona modifique mi calendario"; -"When I modify my calendar, send a mail to:" = "Cuando modifique mi calendario enviar un correo a: "; +"When I modify my calendar, send a mail to" = "Cuando modifique mi calendario enviar un correo a "; "Links to this Calendar" = "Vínculos a éste calendario"; "Authenticated User Access" = "Acceso a usuario autenticado"; -"CalDAV URL" = "URL CalDAV:"; +"CalDAV URL" = "URL CalDAV"; "WebDAV ICS URL" = "URL ICS WebDAV"; "WebDAV XML URL" = "URL XML WebDAV"; diff --git a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings index 2eeb4c3f9..99397e321 100644 --- a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings +++ b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings @@ -150,8 +150,8 @@ "LIST" = "Lista"; "Print Settings" = "Opciones de impresión"; -"Title:" = "Título:"; -"Layout:" = "Disposición"; +"Title" = "Título"; +"Layout" = "Disposición"; "What to Print" = "Que imprimir"; "Options" = "Parametros"; "Tasks with no due date" = "Tareas sin fecha de vencimiento"; @@ -167,34 +167,34 @@ "Appointment editor" = "Editor de eventos"; "Appointment proposal" = "Propuesta de evento"; "Appointment on" = "Evento"; -"Start:" = "Desde:"; -"End:" = "Hasta:"; -"Due Date:" = "Vencimiento:"; -"Title:" = "Título:"; -"Calendar:" = "Calendario:"; +"Start" = "Desde"; +"End" = "Hasta"; +"Due Date" = "Vencimiento"; +"Title" = "Título"; +"Calendar" = "Calendario"; "Name" = "Nombre"; "Email" = "Correo"; -"Status:" = "Estado:"; +"Status" = "Estado"; "% complete" = "% completo"; -"Location:" = "Lugar:"; -"Priority:" = "Prioridad:"; +"Location" = "Lugar"; +"Priority" = "Prioridad"; "Privacy" = "Privacidad"; "Cycle" = "Repetir"; "Cycle End" = "Fin repetición"; "Categories" = "Categorías"; "Classification" = "Privacidad"; "Duration" = "Duración"; -"Attendees:" = "Asistentes:"; +"Attendees" = "Asistentes"; "Resources" = "Recursos"; -"Organizer:" = "Organizador:"; -"Description:" = "Descripción:"; -"Document:" = "Documento:"; -"Category:" = "Categoría:"; -"Repeat:" = "Repetir:"; -"Reminder:" = "Recordatorio:"; -"General:" = "General:"; -"Reply:" = "Responder:"; -"Created by:" = "Creado por:"; +"Organizer" = "Organizador"; +"Description" = "Descripción"; +"Document" = "Documento"; +"Category" = "Categoría"; +"Repeat" = "Repetir"; +"Reminder" = "Recordatorio"; +"General" = "General"; +"Reply" = "Responder"; +"Created by" = "Creado por"; "Target:" = "URL documento:"; @@ -244,7 +244,7 @@ "view_overdue" = "Tareas vencidas"; "view_incomplete" = "Tareas Incompletas"; -"View:" = "Ver:"; +"View" = "Ver"; "Title, category or location" = "Titulo, Categoría o localización"; "Entire content" = "Contenido Completo"; @@ -332,7 +332,7 @@ "No end date" = "Sin fecha fin"; "Create" = "Crear"; "appointment(s)" = "evento(s)"; -"Repeat until" = "Repetir hasta: "; +"Repeat until" = "Repetir hasta "; "First" = "Primero"; "Second" = "Segundo"; @@ -506,8 +506,8 @@ vtodo_class2 = "(Tarea confidencial)"; "button_allOccurrences" = "Todas las apariciones"; /* Properties dialog */ -"Name:" = "Nombre:"; -"Color:" = "Color:"; +"Name" = "Nombre"; +"Color" = "Color"; "Include in free-busy" = "Incluye en tiempo libre-ocupado"; @@ -522,11 +522,11 @@ vtodo_class2 = "(Tarea confidencial)"; "Notifications" = "Notificaciones"; "Receive a mail when I modify my calendar" = "Recibir un correo electrónico cuando modifico mi calendario"; "Receive a mail when someone else modifies my calendar" = "Recibir un correo electrónico cuando alguien distinto modifica mi calendario"; -"When I modify my calendar, send a mail to:" = "Cuando modifico mi calendario, envir un correo electrónico a:"; +"When I modify my calendar, send a mail to" = "Cuando modifico mi calendario, envir un correo electrónico a"; "Links to this Calendar" = "Vínculos a éste calendario"; "Authenticated User Access" = "Acceso a usuario autenticado"; -"CalDAV URL" = "URL CalDAV:"; +"CalDAV URL" = "URL CalDAV"; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; diff --git a/UI/Scheduler/Swedish.lproj/Localizable.strings b/UI/Scheduler/Swedish.lproj/Localizable.strings index 7a151b7ca..95092af21 100644 --- a/UI/Scheduler/Swedish.lproj/Localizable.strings +++ b/UI/Scheduler/Swedish.lproj/Localizable.strings @@ -151,33 +151,33 @@ "Appointment editor" = "Mötesredigerare"; "Appointment proposal" = "Mötesförslag"; "Appointment on" = "Möte"; -"Start:" = "Startar:"; -"End:" = "Slutar:"; -"Due Date:" = "Datum:"; -"Title:" = "Titel:"; -"Calendar:" = "Kalender:"; +"Start" = "Startar"; +"End" = "Slutar"; +"Due Date" = "Datum"; +"Title" = "Titel"; +"Calendar" = "Kalender"; "Name" = "Namn"; "Email" = "E-post"; -"Status:" = "Status:"; +"Status" = "Status"; "% complete" = "% utfört"; -"Location:" = "Plats:"; -"Priority:" = "Prioritet:"; +"Location" = "Plats"; +"Priority" = "Prioritet"; "Privacy" = "Sekretess"; "Cycle" = "Intervall"; "Cycle End" = "Intervall slutar"; "Categories" = "Kategorier"; "Classification" = "Klassifiering"; "Duration" = "Längd"; -"Attendees:" = "Deltagare:"; +"Attendees" = "Deltagare"; "Resources" = "Resurser"; -"Organizer:" = "Organisatör:"; -"Description:" = "Beskrivning:"; -"Document:" = "Dokument:"; -"Category:" = "Kategori:"; -"Repeat:" = "Upprepa:"; -"Reminder:" = "Påminnelse:"; -"General:" = "Allmännt:"; -"Reply:" = "Svara:"; +"Organizer" = "Organisatör"; +"Description" = "Beskrivning"; +"Document" = "Dokument"; +"Category" = "Kategori"; +"Repeat" = "Upprepa"; +"Reminder" = "Påminnelse"; +"General" = "Allmännt"; +"Reply" = "Svara"; "Target:" = "Mål:"; @@ -222,7 +222,7 @@ "view_future" = "Alla framtida händelser"; "view_selectedday" = "Vald dag"; -"View:" = "Visa:"; +"View" = "Visa"; "Title or Description" = "Titel eller beskrivning"; "Search" = "Sök"; @@ -475,8 +475,8 @@ vtodo_class2 = "(Konfidentiell uppgift)"; "button_allOccurrences" = "Alla förekomster"; /* Properties dialog */ -"Name:" = "Namn:"; -"Color:" = "Färg:"; +"Name" = "Namn"; +"Color" = "Färg"; "Include in free-busy" = "Inkludera i ledig/upptagen"; diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 653226628..314ee6681 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -452,7 +452,7 @@ delegatedAttendee = [iCalPerson new]; [delegatedAttendee autorelease]; [delegatedAttendee setEmail: delegatedEmail]; - delegatedUid = [delegatedAttendee uid]; + delegatedUid = [delegatedAttendee uidInDomain: [user domain]]; if (delegatedUid) { SOGoUser *delegatedUser; diff --git a/UI/Scheduler/UIxCalendarProperties.h b/UI/Scheduler/UIxCalendarProperties.h index de17b6117..f46e2cfa3 100644 --- a/UI/Scheduler/UIxCalendarProperties.h +++ b/UI/Scheduler/UIxCalendarProperties.h @@ -43,11 +43,7 @@ - (BOOL) synchronizeCalendar; - (void) setSynchronizeCalendar: (BOOL) new; -- (NSString *) originalCalendarSyncTag; -- (NSString *) allCalendarSyncTags; - (BOOL) mustSynchronize; -- (NSString *) calendarSyncTag; -- (void) setCalendarSyncTag: (NSString *) newTag; /* notifications */ - (BOOL) notifyOnPersonalModifications; diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m index 8f0ec4e81..46c2c8048 100644 --- a/UI/Scheduler/UIxCalendarProperties.m +++ b/UI/Scheduler/UIxCalendarProperties.m @@ -91,52 +91,12 @@ - (BOOL) synchronizeCalendar { - return [self mustSynchronize] || [calendar synchronizeCalendar]; + return [self mustSynchronize] || [calendar synchronize]; } - (void) setSynchronizeCalendar: (BOOL) new { - [calendar setSynchronizeCalendar: new]; -} - -- (NSString *) originalCalendarSyncTag -{ - return [calendar syncTag]; -} - -- (NSString *) allCalendarSyncTags -{ - SOGoUserSettings *settings; - NSMutableDictionary *calendarSettings; - NSMutableDictionary *syncTags; - NSEnumerator *keysList; - NSMutableArray *tags; - NSString *key, *result; - - settings = [[context activeUser] userSettings]; - calendarSettings = [settings objectForKey: @"Calendar"]; - tags = nil; - - if (calendarSettings) - { - syncTags = [calendarSettings objectForKey: @"FolderSyncTags"]; - if (syncTags) - { - tags = [NSMutableArray arrayWithCapacity: [syncTags count]]; - keysList = [syncTags keyEnumerator]; - while ((key = (NSString*)[keysList nextObject])) { - if (![key isEqualToString: [calendar folderReference]]) - [tags addObject: [syncTags objectForKey: key]]; - } - } - } - - if (!tags) - result = @""; - else - result = [tags componentsJoinedByString: @","]; - - return result; + [calendar setSynchronize: new]; } - (BOOL) mustSynchronize @@ -144,16 +104,6 @@ return [[calendar nameInContainer] isEqualToString: @"personal"]; } -- (NSString *) calendarSyncTag -{ - return [calendar syncTag]; -} - -- (void) setCalendarSyncTag: (NSString *) newTag -{ - [calendar setSyncTag: newTag]; -} - - (BOOL) showCalendarAlarms { return [calendar showCalendarAlarms]; diff --git a/UI/Scheduler/Ukrainian.lproj/Localizable.strings b/UI/Scheduler/Ukrainian.lproj/Localizable.strings index 8818182b4..27781ae75 100644 --- a/UI/Scheduler/Ukrainian.lproj/Localizable.strings +++ b/UI/Scheduler/Ukrainian.lproj/Localizable.strings @@ -151,33 +151,33 @@ "Appointment editor" = "Зміна зустрічі"; "Appointment proposal" = "Пропозиція зустрічі"; "Appointment on" = "Зустріч"; -"Start:" = "Початок:"; -"End:" = "Кінець:"; -"Due Date:" = "Дійсно до:"; -"Title:" = "Назва:"; -"Calendar:" = "Календар:"; +"Start" = "Початок"; +"End" = "Кінець"; +"Due Date" = "Дійсно до"; +"Title" = "Назва"; +"Calendar" = "Календар"; "Name" = "Ім’я"; "Email" = "E-Mail"; -"Status:" = "Стан:"; +"Status" = "Стан"; "% complete" = "% виконано"; -"Location:" = "Місце:"; -"Priority:" = "Пріоритет:"; +"Location" = "Місце"; +"Priority" = "Пріоритет"; "Privacy" = "Конфіденційність"; "Cycle" = "Цикл"; "Cycle End" = "Закінчення циклу"; "Categories" = "Категорії"; "Classification" = "Визначення"; "Duration" = "Термін"; -"Attendees:" = "Учасники:"; +"Attendees" = "Учасники"; "Resources" = "Ресурси"; -"Organizer:" = "Організатор:"; -"Description:" = "Опис:"; -"Document:" = "Документ:"; -"Category:" = "Категорія:"; -"Repeat:" = "Повтор:"; -"Reminder:" = "Нагадування:"; -"General:" = "Загальне:"; -"Reply:" = "Відповідь:"; +"Organizer" = "Організатор"; +"Description" = "Опис"; +"Document" = "Документ"; +"Category" = "Категорія"; +"Repeat" = "Повтор"; +"Reminder" = "Нагадування"; +"General" = "Загальне"; +"Reply" = "Відповідь"; "Target:" = "Введіть веб-сторінку або місце документа:"; @@ -222,7 +222,7 @@ "view_future" = "Всі майбутні події"; "view_selectedday" = "Вибраний день"; -"View:" = "Перегляд:"; +"View" = "Перегляд"; "Title or Description" = "Назва або опис"; "Search" = "Пошук"; @@ -475,8 +475,7 @@ vtodo_class2 = "(Конфіденційне завдання)"; "button_allOccurrences" = "Всі повторення"; /* Properties dialog */ -"Name:" = "Назва:"; -"Color:" = "Колір:"; +"Color" = "Колір"; "Include in free-busy" = "Вставити до free-busy"; diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings index a68551a4d..2051c51cb 100644 --- a/UI/Scheduler/Welsh.lproj/Localizable.strings +++ b/UI/Scheduler/Welsh.lproj/Localizable.strings @@ -151,33 +151,33 @@ "Appointment editor" = "Golygydd Apwyntiadau"; "Appointment proposal" = "Cynnig Apwyntiad"; "Appointment on" = "Apwyntiad ar"; -"Start:" = "Dechrau:"; -"End:" = "Diwedd:"; -"Due Date:" = "Dyddiad dyledus:"; -"Title:" = "Teitl:"; -"Calendar:" = "Calendr:"; +"Start" = "Dechrau"; +"End" = "Diwedd"; +"Due Date" = "Dyddiad dyledus"; +"Title" = "Teitl"; +"Calendar" = "Calendr"; "Name" = "Enw"; "Email" = "Ebost"; -"Status:" = "Statws:"; +"Status" = "Statws"; "% complete" = "% cwblhau"; -"Location:" = "Lleoliad:"; -"Priority:" = "Blaenoriaeth:"; +"Location" = "Lleoliad"; +"Priority" = "Blaenoriaeth"; "Privacy" = "Preifatrwydd"; "Cycle" = "Cylch"; "Cycle End" = "Diwedd Cylch"; "Categories" = "Categoriau"; "Classification" = "Dosbarthiad"; "Duration" = "Parhad"; -"Attendees:" = "Mynychwyr:"; +"Attendees" = "Mynychwyr"; "Resources" = "Adnoddau"; -"Organizer:" = "Trefnwr:"; -"Description:" = "Disgrifiad:"; -"Document:" = "Dogfen:"; -"Category:" = "Categori:"; -"Repeat:" = "Ailwneud:"; -"Reminder:" = "Atgoffa:"; -"General:" = "General:"; -"Reply:" = "Reply:"; +"Organizer" = "Trefnwr"; +"Description" = "Disgrifiad"; +"Document" = "Dogfen"; +"Category" = "Categori"; +"Repeat" = "Ailwneud"; +"Reminder" = "Atgoffa"; +"General" = "General"; +"Reply" = "Reply"; "Target:" = "Targed:"; @@ -222,7 +222,7 @@ "view_future" = "Holl digwyddiadau'r dyfodol"; "view_selectedday" = "Diwrnod dewisol"; -"View:" = "Golygfa:"; +"View" = "Golygfa"; "Title or Description" = "Teitl neu disgrifiad"; "Search" = "Chwilio"; @@ -475,8 +475,8 @@ vtodo_class2 = "(Tasg gyhoeddus)"; "button_allOccurrences" = "Pob achlysur"; /* Properties dialog */ -"Name:" = "Enw:"; -"Color:" = "Lliw:"; +"Name" = "Enw"; +"Color" = "Lliw"; "Include in free-busy" = "Include in free-busy"; diff --git a/UI/Templates/Appointments/SOGoAptMailReceipt.wox b/UI/Templates/Appointments/SOGoAptMailReceipt.wox index fc9f701d7..0e2111a12 100644 --- a/UI/Templates/Appointments/SOGoAptMailReceipt.wox +++ b/UI/Templates/Appointments/SOGoAptMailReceipt.wox @@ -41,7 +41,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon > + label:value="The following attendees(s) were notified" const:escapeHTML="NO"/> @@ -54,7 +54,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon > + label:value="The following attendees(s) were added" const:escapeHTML="NO"/> @@ -67,7 +67,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon > + label:value="The following attendees(s) were removed" const:escapeHTML="NO"/> diff --git a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox index bcecf8ba8..cea9954ef 100644 --- a/UI/Templates/ContactsUI/UIxContactFolderProperties.wox +++ b/UI/Templates/ContactsUI/UIxContactFolderProperties.wox @@ -11,6 +11,8 @@ const:popup="YES" title="title"> +
  • @@ -29,6 +31,20 @@
+ +
+ + +
+ +
@@ -60,4 +76,5 @@ +
diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 323badb7d..44983ff1d 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -110,6 +110,8 @@ var:class="currentContactFolderClass" var:acl-editing="currentContactFolderAclEditing" var:list-editing="currentContactFolderListEditing" + var:card-editing="currentContactFolderCardRights.editing" + var:card-deleting="currentContactFolderCardRights.deleting" > diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox index d82e9cc89..7f30d24cd 100644 --- a/UI/Templates/ContactsUI/UIxListEditor.wox +++ b/UI/Templates/ContactsUI/UIxListEditor.wox @@ -20,13 +20,13 @@
- +
- + - +
diff --git a/UI/Templates/MailerUI/UIxMailSearch.wox b/UI/Templates/MailerUI/UIxMailSearch.wox index 669bd6d02..c111d2f7e 100644 --- a/UI/Templates/MailerUI/UIxMailSearch.wox +++ b/UI/Templates/MailerUI/UIxMailSearch.wox @@ -23,7 +23,7 @@ - + -