", // partly quoted
diff --git a/Tests/Unit/TestNGMimeMessageGenerator.m b/Tests/Unit/TestNGMimeMessageGenerator.m
index 51b4e4745..f440bda97 100644
--- a/Tests/Unit/TestNGMimeMessageGenerator.m
+++ b/Tests/Unit/TestNGMimeMessageGenerator.m
@@ -117,7 +117,7 @@
NSString *diff = [self stringFromDiffBetween: [NSString stringWithString: resultString]
and: [NSString stringWithString: expected]];
NSString *testErrorMsg = [NSString
- stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %u lengthExpected: %u",
+ stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %lu lengthExpected: %lu",
header,
resultString,
expected,
diff --git a/Tests/Unit/TestVersit.m b/Tests/Unit/TestVersit.m
index 92ddf02bb..e09dce49f 100644
--- a/Tests/Unit/TestVersit.m
+++ b/Tests/Unit/TestVersit.m
@@ -34,6 +34,10 @@
- (void) test_rendering
{
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-string-compare"
+
CardElement *element;
CardVersitRenderer *renderer;
NSString *result;
@@ -137,10 +141,17 @@
testEquals(result, @"ELEM:NONEMPTY=coucou\r\n");
/** tests about parameters handling could be nice */
+
+#pragma clang diagnostic pop
+
}
- (void) test_parsing
{
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-string-compare"
+
CardGroup *group;
CardElement *element;
NSString *versit;
@@ -201,6 +212,9 @@
element = [group firstChildWithTag: @"element"];
testEquals([element flattenedValueAtIndex: 0 forKey: @""], @"value");
testEquals([element value: 0 ofAttribute: @"param1"], @"paramvalue1, with comma");
+
+#pragma clang diagnostic pop
+
}
@end
diff --git a/Tests/Unit/TestiCalRecurrenceCalculator.m b/Tests/Unit/TestiCalRecurrenceCalculator.m
index dcd9529d9..ae1d34f3d 100644
--- a/Tests/Unit/TestiCalRecurrenceCalculator.m
+++ b/Tests/Unit/TestiCalRecurrenceCalculator.m
@@ -107,7 +107,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
@@ -211,7 +211,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
@@ -376,7 +376,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
diff --git a/Tests/Unit/TestiCalTimeZonePeriod.m b/Tests/Unit/TestiCalTimeZonePeriod.m
index 02325e9bc..b6eb1b1b7 100644
--- a/Tests/Unit/TestiCalTimeZonePeriod.m
+++ b/Tests/Unit/TestiCalTimeZonePeriod.m
@@ -80,8 +80,8 @@
testWithMessage ((NSInteger) [testDate timeIntervalSince1970]
== occurrenceSeconds[count],
([NSString stringWithFormat:
- @"test %d: seconds do not match:"
- @" delta = %d", count, delta]));
+ @"test %ld: seconds do not match:"
+ @" delta = %ld", count, delta]));
}
}
diff --git a/Tools/SOGoEAlarmsNotifier.m b/Tools/SOGoEAlarmsNotifier.m
index ad8cc8f7a..382e25675 100644
--- a/Tools/SOGoEAlarmsNotifier.m
+++ b/Tools/SOGoEAlarmsNotifier.m
@@ -81,8 +81,8 @@
timestamp = (int) [[NSDate date] timeIntervalSince1970];
pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
- messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%u>",
- pid, timestamp, sequence, random(), [pGUID hash]];
+ messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%lu>",
+ pid, timestamp, sequence, (unsigned int)random(), [pGUID hash]];
return [messageID lowercaseString];
}
diff --git a/Tools/SOGoSockDOperation.m b/Tools/SOGoSockDOperation.m
index c3604b865..56cae6b35 100644
--- a/Tools/SOGoSockDOperation.m
+++ b/Tools/SOGoSockDOperation.m
@@ -145,7 +145,7 @@ Class SOGoContactSourceFolderKlass = Nil;
[self _appendEntry: [resultEntries objectAtIndex: count]
toResult: result];
- [result appendFormat: @"RESULT\ncode: %", resultCode];
+ [result appendFormat: @"RESULT\ncode: %d", resultCode];
[responseSocket
safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]];
}
diff --git a/Tools/SOGoToolCreateFolder.m b/Tools/SOGoToolCreateFolder.m
index 423ec7266..2eba46e8b 100644
--- a/Tools/SOGoToolCreateFolder.m
+++ b/Tools/SOGoToolCreateFolder.m
@@ -97,7 +97,7 @@
rc = [self createFolder: folder withFM: fm];
if (!rc)
{
- NSLog (@"Create directory failed at path %s", folder);
+ NSLog (@"Create directory failed at path %@", folder);
return NO;
}
diff --git a/Tools/SOGoToolExpireUserSessions.m b/Tools/SOGoToolExpireUserSessions.m
index 98d40470e..dbe78d6d9 100644
--- a/Tools/SOGoToolExpireUserSessions.m
+++ b/Tools/SOGoToolExpireUserSessions.m
@@ -143,7 +143,7 @@
else
{
if (verbose)
- NSLog(@"No session to remove", sessionsToDelete);
+ NSLog(@"No session to remove");
}
[cm releaseChannel: channel];
diff --git a/Tools/SOGoToolManageEAS.m b/Tools/SOGoToolManageEAS.m
index 0e01da733..115f49eb6 100644
--- a/Tools/SOGoToolManageEAS.m
+++ b/Tools/SOGoToolManageEAS.m
@@ -227,7 +227,7 @@ typedef enum
NSMutableString *sql;
- sql = [NSMutableString stringWithFormat: @"DELETE FROM %@" @" WHERE c_path like '/%@%'", [oc tableName], deviceId];
+ sql = [NSMutableString stringWithFormat: @"DELETE FROM %@ WHERE c_path like '/%@'", [oc tableName], deviceId];
[oc performBatchSQLQueries: [NSArray arrayWithObject: sql]];
rc = YES;
diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m
index c26254a6a..4d6a36115 100644
--- a/Tools/SOGoToolRemoveDoubles.m
+++ b/Tools/SOGoToolRemoveDoubles.m
@@ -175,7 +175,7 @@
now = [NSCalendarDate date];
delSql = [NSString stringWithFormat: @"UPDATE %@"
- @" SET c_deleted = 1, c_lastmodified = %d,"
+ @" SET c_deleted = 1, c_lastmodified = %lu,"
@" c_content = ''"
@" WHERE c_name = '%@'",
tableName,
diff --git a/Tools/SOGoToolRenameUser.m b/Tools/SOGoToolRenameUser.m
index 937424d76..cf260134e 100644
--- a/Tools/SOGoToolRenameUser.m
+++ b/Tools/SOGoToolRenameUser.m
@@ -148,7 +148,7 @@
if (sqlError)
{
[ac rollbackTransaction];
- NSLog([sqlError reason]);
+ NSLog(@"%@", [sqlError reason]);
}
else
rc = [ac commitTransaction];
@@ -201,7 +201,7 @@
if (sqlError)
{
[ac rollbackTransaction];
- NSLog([sqlError reason]);
+ NSLog(@"%@", [sqlError reason]);
}
else
rc = [ac commitTransaction];
diff --git a/Tools/SOGoToolRestore.m b/Tools/SOGoToolRestore.m
index 712c680ba..5f1527cc8 100644
--- a/Tools/SOGoToolRestore.m
+++ b/Tools/SOGoToolRestore.m
@@ -574,6 +574,7 @@
NSLog (@" %@ (%@)",
folderKey, [currentFolder objectForKey: @"displayname"]);
}
+ rc = YES;
}
else
{
diff --git a/Tools/SOGoToolUserPreferences.m b/Tools/SOGoToolUserPreferences.m
index 4f981cb4f..a51505f53 100644
--- a/Tools/SOGoToolUserPreferences.m
+++ b/Tools/SOGoToolUserPreferences.m
@@ -115,7 +115,7 @@ typedef enum
[theKey caseInsensitiveCompare: @"Vacation"] == NSOrderedSame)
{
/* credentials file handling */
- NSString *credsFilename, *authname, *authpwd;
+ NSString *credsFilename, *authname=nil, *authpwd=nil;
SOGoCredentialsFile *cf;
credsFilename = [[NSUserDefaults standardUserDefaults] stringForKey: @"p"];
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index bc4755416..85c87d528 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -149,7 +149,7 @@
command, [currentTool objectAtIndex: 1]];
}
- NSLog (helpString);
+ NSLog (@"%@", helpString);
}
- (void) registerTools
diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile
index 450973525..0bb4829d4 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+AdministrationUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
AdministrationUI_OBJC_FILES = \
AdministrationUIProduct.m \
diff --git a/UI/AdministrationUI/Macedonian.lproj/Localizable.strings b/UI/AdministrationUI/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..56e617650
--- /dev/null
+++ b/UI/AdministrationUI/Macedonian.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/Portuguese.lproj/Localizable.strings b/UI/AdministrationUI/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..77b5d071e
--- /dev/null
+++ b/UI/AdministrationUI/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,15 @@
+/* this file is in UTF-8 format! */
+
+"Help" = "Ajuda";
+"Close" = "Fechar";
+
+"Modules" = "Módulos";
+
+/* Modules short names */
+"ACLs" = "ACLs";
+
+/* Modules titles */
+"ACLs_title" = "Gerenciamento de ACLs para Utilizadores";
+
+/* Modules descriptions */
+"ACLs_description" = "O módulo administrativo das Listas de Controlo de Acessos permitem alterar os ACLs de Calendário e Contactos de cada utilizador.
Para modificar as ACLs do utilizador, digite o nome no campo de pesquisa, no topo da janela e dê um duplo-click na opção desejada.
";
diff --git a/UI/AdministrationUI/Slovenian.lproj/Localizable.strings b/UI/AdministrationUI/Slovenian.lproj/Localizable.strings
index ca15c0653..5269c464e 100644
--- a/UI/AdministrationUI/Slovenian.lproj/Localizable.strings
+++ b/UI/AdministrationUI/Slovenian.lproj/Localizable.strings
@@ -9,7 +9,7 @@
"ACLs" = "ACLi";
/* Modules titles */
-"ACLs_title" = "Urejanje uporabniških map ACL";
+"ACLs_title" = "Urejanje uporabniških pravic na mapah";
/* 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/GNUmakefile b/UI/Common/GNUmakefile
index 4f03c40fd..fda8cba2a 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+CommonUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
CommonUI_OBJC_FILES += \
CommonUIProduct.m \
diff --git a/UI/Common/Macedonian.lproj/Localizable.strings b/UI/Common/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..43110896f
--- /dev/null
+++ b/UI/Common/Macedonian.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.)" = "Конзола на логови (развој)";
+
+"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/Portuguese.lproj/Localizable.strings b/UI/Common/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..1a78a4e6a
--- /dev/null
+++ b/UI/Common/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,118 @@
+/* this file is in UTF-8 format! */
+
+/* toolbars */
+"Save" = "Gravar";
+"Close" = "Fechar";
+"Edit User Rights" = "Editar direitos do utilizador";
+
+"Home" = "InÃcio";
+"Calendar" = "Calendário";
+"Address Book" = "Contactos";
+"Mail" = "Correio";
+"Preferences" = "Preferências";
+"Administration" = "Administração";
+"Disconnect" = "Sair";
+"Right Administration" = "Administração de permissões";
+"Log Console (dev.)" = "Log Console (dev.)";
+
+"User" = "Utilizador";
+"Vacation message is enabled" = "Mensagem de ausência está ativa";
+
+"Help" = "Ajuda";
+
+"noJavascriptError" = "SOGo requer Javascript para correr. Por favor, certifique-se que a opção está disponÃvel e habilitada nas preferências de seu navegador.";
+"noJavascriptRetry" = "Repetir";
+
+"Owner:" = "Proprietário:";
+"Publish the Free/Busy information" = "Divulgar a informação Livre/Ocupado";
+
+"Add..." = "Adicionar...";
+"Remove" = "Remover";
+
+"Subscribe User" = "Utilizador Inscrito";
+
+"Any Authenticated User" = "Qualquer Utilizador Autenticado";
+"Public Access" = "Acesso Público";
+"Any user not listed above" = "Qualquer utilizador não listado abaixo";
+"Anybody accessing this resource from the public area" = "Ninguém acedendo a este recurso de uma área pública";
+
+"Sorry, the user rights can not be configured for that object." = "Desculpe, os accessos do utilizador não podem ser modificados para este objeto.";
+
+"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?"
+ = "Qualquer utilizador com uma conta neste sistema será capaz de aceder à sua caixa postal \"% {0}\". Tem a certeza que confia em todos?";
+"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?"
+ = "Qualquer utilizador com uma conta neste sistema poderá aceder seu calendário \"%{0}\". Você tem certeza que confia em todos?";
+"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?"
+ = "Qualquer um na Internet poderá aceder ao seu calendário \"%{0}\". Estas informações podem ser publicadas na 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?"
+ = "Qualquer utilizador com uma conta neste sistema será capaz de aceder seu catálogo de endereços \"% {0}\". Tem a certeza que confia em todos?";
+"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?"
+ = "Qualquer pessoa na Internet será capaz de aceder ao seu catálogo de endereços \"% {0}\", mesmo se não tiver uma conta no sistema. Esta informação pode ser tornar pública na Internet?";
+"Give Access" = "Conceder Acesso";
+"Keep Private" = "Manter Privado";
+
+/* generic.js */
+"Unable to subscribe to that folder!"
+ = "Não foi possÃvel inscrever-se nesta pasta!";
+"You cannot subscribe to a folder that you own!"
+ = "Você não se pode inscrever numa pasta que é proprietário!";
+"Unable to unsubscribe from that folder!"
+ = "Não foi possÃvel anular a subscrição desta pasta!";
+"You cannot unsubscribe from a folder that you own!"
+ = "Você não pode anular subscrição de uma pasta que você é proprietário!";
+"Unable to rename that folder!" = "Não foi possÃvel renomear esta pasta!";
+"You have already subscribed to that folder!"
+ = "Você já se inscreveu nesta pasta!";
+"The user rights cannot be edited for this object!"
+ = "Os direitos do utilizador não podem ser editados para este objeto!";
+"A folder by that name already exists." = "Este nome já existe.";
+"You cannot create a list in a shared address book."
+ = "Você não pode criar uma lista num catálogo de endereços público";
+"Warning" = "Aviso";
+"Can't contact server" = "Um erro ocorreu na ligação ao servidor. Por favor, tente mais tarde.";
+
+"You are not allowed to access this module or this system. Please contact your system administrator."
+= "Você não está autrizado para aceder a este módulo ou este sistema. Por favor, contate seu administrador de sistemas.";
+"You don't have the required privileges to perform the operation."
+= "Você não tem os privilégios necessários para realizar esta operação.";
+
+"noEmailForDelegation" = "Você deve informar o endereço ao qual deseja delegar seu convite.";
+"delegate is organizer" = "O delegado é o organizador. Por favor, especifique um delegado diferente.";
+"delegate is a participant" = "O delegado já é um participante.";
+"delegate is a group" = "O endereço especificado corresponde a um grupo. Você só pode delegar a uma pessoa única.";
+
+"Snooze for " = "Uma pausa de";
+"5 minutes" = "5 minutos";
+"10 minutes" = "10 minutos";
+"15 minutes" = "15 minutos";
+"30 minutes" = "30 minutos";
+"45 minutes" = "45 minutos";
+"1 hour" = "1 hora";
+"1 day" = "1 dia";
+
+/* common buttons */
+"OK" = "OK";
+"Cancel" = "Cancelar";
+"Yes" = "Sim";
+"No" = "No";
+
+/* alarms */
+"Reminder:" = "Lembrete:";
+"Start:" = "Inicio:";
+"Due Date:" = "Data de vencimento:";
+"Location:" = "Localização:";
+
+/* mail labels */
+"Important" = "Importante";
+"Work" = "Trabalho";
+"Personal" = "Pessoal";
+"To Do" = "A fazer";
+"Later" = "Adiar";
+
+"a2_Sunday" = "Do";
+"a2_Monday" = "Se";
+"a2_Tuesday" = "Te";
+"a2_Wednesday" = "Qu";
+"a2_Thursday" = "Qu";
+"a2_Friday" = "Se";
+"a2_Saturday" = "Sa";
diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index b4376b311..3deda0ce5 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -166,7 +166,7 @@
[self errorWithFormat:
@"not toolbar configuration found on SoObject: %@ (%@)",
[self clientObject], [[self clientObject] soClass]];
- toolbarConfig = [[NSNull null] retain];
+ toolbarConfig = (NSArray *)[[NSNull null] retain];
return nil;
}
diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m
index 805acbe8c..fada54f17 100644
--- a/UI/Common/WODirectAction+SOGo.m
+++ b/UI/Common/WODirectAction+SOGo.m
@@ -22,6 +22,7 @@
#import
#import
+#import
#import
#import
@@ -33,6 +34,8 @@
#import
#import
+#import
+
#import "WODirectAction+SOGo.h"
@implementation WODirectAction (SOGoExtension)
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index 01521a8bc..e386089d6 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+ContactsUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
ContactsUI_OBJC_FILES = \
UIxContactsUserFolders.m \
diff --git a/UI/Contacts/Macedonian.lproj/Localizable.strings b/UI/Contacts/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..b84658a31
--- /dev/null
+++ b/UI/Contacts/Macedonian.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" = "Колега, конкурент, клиент, пријател, фамилија, деловен партнер, провајдер, новинар, ВИП";
+"Categories" = "Категории";
+"New category" = "Ðова категорија";
+
+/* adresses */
+"Title:" = "ÐаÑлов:";
+"Service:" = "СервиÑ:";
+"Company:" = "Компанија:";
+"Department:" = "Сектор:";
+"Organization:" = "Организација:";
+"Address:" = "ÐдреÑа:";
+"City" = "Град";
+"State_Province:" = "Држава/провинција:";
+"ZIP_Postal Code:" = "ПоштенÑки број:";
+"Country" = "Земја";
+"Web Page:" = "Веб Ñтраница:";
+
+"Work" = "Работа";
+"Other Infos" = "Други информации";
+
+"Note" = "Забелешка";
+"Timezone:" = "ВременÑка зона:";
+"Birthday" = "Роденден";
+"Birthday (yyyy-mm-dd)" = "Роденден (гггг-мм-дд)";
+"Freebusy URL:" = "Слободно-зафатено 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: " = "CalDAV URL:";
+
diff --git a/UI/Contacts/Portuguese.lproj/Localizable.strings b/UI/Contacts/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..9b2e5e17c
--- /dev/null
+++ b/UI/Contacts/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,215 @@
+/* this file is in UTF-8 format! */
+
+"Contact" = "Contacto";
+"Address" = "Endereço";
+"Photos" = "Fotos";
+"Other" = "Outros";
+
+"Address Books" = "Catálogo de endereços";
+"Addressbook" = "Catálogo de endereço";
+"Addresses" = "Contacto";
+"Update" = "Atualizar";
+"Cancel" = "Cancelar";
+"Common" = "Comum";
+"Contact editor" = "Editor de Contatos";
+"Contact viewer" = "Visualizador de Contatos";
+"Email" = "Email";
+"Screen Name" = "Nome de Apresentação";
+"Extended" = "Extendido";
+"Fax" = "Fax";
+"Firstname" = "Primeiro Nome";
+"Home" = "Residencia";
+"HomePhone" = "Telefone Residencia";
+"Lastname" = "Último Nome";
+"Location" = "Localização";
+"MobilePhone" = "Telefone móvel";
+"Name" = "Nome";
+"OfficePhone" = "Telefone de escritório";
+"Organization" = "Organização";
+"Work Phone" = "Telefone de trabalho";
+"Phone" = "Telefone";
+"Phones" = "Telefones";
+"Postal" = "Código postal";
+"Save" = "Gravar";
+"Internet" = "Internet";
+"Unit" = "Sector";
+"delete" = "apagar";
+"edit" = "editar";
+"invalidemailwarn" = "O email é inválido";
+"new" = "novo";
+"Preferred Phone" = "Telefone Preferencial";
+
+"Move To" = "Mover para";
+"Copy To" = "Copiar para";
+"Add to:" = "Adicionar a:";
+
+/* Tooltips */
+
+"Create a new address book card" = "Cria um novo contato";
+"Create a new list" = "Cria uma nova lista";
+"Edit the selected card" = "Edita o contacto selecionado";
+"Send a mail message" = "Envia uma mensagem de email";
+"Delete selected card or address book" = "Apaga o contacto ou catálogo selecionado";
+"Reload all contacts" = "Actualizar todos os contactos";
+
+"htmlMailFormat_UNKNOWN" = "Desconhecido";
+"htmlMailFormat_FALSE" = "Apenas texto";
+"htmlMailFormat_TRUE" = "HTML";
+
+"Name or Email" = "Nome ou Email";
+"Category" = "Categoria";
+"Personal Addressbook" = "Catálogo Pessoal";
+"Search in Addressbook" = "Localizar no Catálogo";
+
+"New Card" = "Novo Contato";
+"New List" = "Nova Lista";
+"Edit" = "Editar";
+"Properties" = "Propriedades";
+"Sharing..." = "Partilhando...";
+"Write" = "Escrever";
+"Delete" = "Apagar";
+"Instant Message" = "Mensagem Instantânea";
+"Add..." = "Adicionar...";
+"Remove" = "Remover";
+
+"Please wait..." = "Por favor, aguarde...";
+"No possible subscription" = "Sem possibilidades de inscrição";
+
+"Preferred" = "Preferido";
+"Display" = "Exibir";
+"Display Name:" = "Exibir Nome:";
+"Email:" = "Endereço de Email:";
+"Additional Email:" = "Email adicional:";
+
+"Phone Number:" = "Numero de telegone:";
+"Prefers to receive messages formatted as:" = "Preferências na recepção de mensagens no formato:";
+"Screen Name:" = "Nome de apresentado:";
+"Categories:" = "Categorias:";
+
+"First:" = "Primeiro Nome:";
+"Last:" = "Último Nome:";
+"Nickname" = "Apelido";
+
+"Telephone" = "Telefone";
+"Work:" = "Trabalho:";
+"Home:" = "Residencia:";
+"Fax:" = "Fax:";
+"Mobile:" = "Móvel:";
+"Pager:" = "Pager:";
+
+/* categories */
+"contacts_category_labels" = "Colega, Concorrência, Cliente, Amigo, Familia, Parceiro económico, Fornecedor, Impressa, VIP";
+"Categories" = "Categorias";
+"New category" = "New categoria";
+
+/* adresses */
+"Title:" = "TÃtulo:";
+"Service:" = "Serviço:";
+"Company:" = "Empresa:";
+"Department:" = "Departmento:";
+"Organization:" = "Organização:";
+"Address:" = "Endereço:";
+"City" = "Cidade";
+"State_Province:" = "Região:";
+"ZIP_Postal Code:" = "Código postal:";
+"Country" = "PaÃs";
+"Web Page:" = "Página web:";
+
+"Work" = "Trabalho";
+"Other Infos" = "Outras Informações";
+
+"Note:" = "Notas:";
+"Timezone:" = "Fuso Horário:";
+"Birthday" = "Aniversário";
+"Birthday (yyyy-mm-dd)" = "Aniversário (yyyy-mm-dd)";
+"Freebusy URL:" = "URL Livre/Ocupado:";
+
+"Add as..." = "Adicionar como...";
+"Recipient" = "Beneficiário";
+"Carbon Copy" = "Cópia em bloco";
+"Blind Carbon Copy" = "Cópia em bloco Oculta";
+
+"New Addressbook..." = "Novo Catálogo...";
+"Subscribe to an Addressbook..." = "Inscrever-se num Catálogo...";
+"Remove the selected Addressbook" = "Remover o Catálogo selecionado";
+
+"Name of the Address Book" = "Nome do Catálogo";
+"Are you sure you want to delete the selected address book?"
+= "Você tem certeza que quer apagar o catálogo selecionado?";
+"You cannot remove nor unsubscribe from a public addressbook."
+= "Você não pode apagar nem retirar-se de uma catálogo público.";
+"You cannot remove nor unsubscribe from your personal addressbook."
+= "Você não pode apagar nem retirar-se de uma catálogo pessoal.";
+
+"Are you sure you want to delete the selected contacts?"
+= "Você tem certeza que quer apagar os contatos selecionados?";
+
+"You cannot delete the card of \"%{0}\"."
+= "Você não pode apagar o contato de \"%{0}\".";
+
+
+
+"You cannot subscribe to a folder that you own!"
+= "Você não pode inscrever-se numa pasta que você é dono.";
+"Unable to subscribe to that folder!"
+= "Não foi possÃvel inscrever-se nesta pasta.";
+
+/* acls */
+"Access rights to" = "Direitos de acesso para";
+"For user" = "Para usuário";
+
+"Any Authenticated User" = "Qualquer utilizador autenticado";
+"Public Access" = "Acesso Publico";
+
+"This person can add cards to this addressbook."
+= "Essa pessoa pode adicionar contatos ao meu catálogo.";
+"This person can edit the cards of this addressbook."
+= "Essa pessoa pode editar contatos deste catálogo.";
+"This person can list the content of this addressbook."
+= "Essa pessoa pode listar o conteudo deste catálogo.";
+"This person can read the cards of this addressbook."
+= "Essa pessoa pode ler os contatos deste catálogo.";
+"This person can erase cards from this addressbook."
+= "Essa pessoa pode apagar contatos deste catálogo.";
+
+"The selected contact has no email address."
+= "O contato selecionado não tem endereço de email.";
+
+"Please select a contact." = "Por favor, selecione um contato.";
+
+/* Error messages for move and copy */
+
+"SoAccessDeniedException" = "Você não pode gravar neste catálogo.";
+"Forbidden" = "Você não pode gravar neste catálogo.";
+"Invalid Contact" = "O contato selecionado não existe.";
+"Unknown Destination Folder" = "O catálogo de destino selecionado não existe.";
+
+/* Lists */
+"List details" = "List details";
+"List name:" = "List name:";
+"List nickname:" = "List nickname:";
+"List description:" = "List description:";
+"Members" = "Members";
+"Contacts" = "Contacts";
+"Add" = "Add";
+"Lists can't be moved or copied." = "Lists can't be moved or copied.";
+"Export" = "Export";
+"Export Address Book..." = "Export Address Book...";
+"View Raw Source" = "Visualizar Fonte";
+"Import Cards" = "Import Cards";
+"Select a vCard or LDIF file." = "Select a vCard or LDIF file.";
+"Upload" = "Upload";
+"Uploading" = "Carregando";
+"Done" = "Done";
+"An error occured while importing contacts." = "An error occured while importing contacts.";
+"No card was imported." = "No card was imported.";
+"A total of %{0} cards were imported in the addressbook." = "A total of %{0} cards were imported in the addressbook.";
+
+"Reload" = "Atualizar";
+
+/* Properties window */
+"Address Book Name:" = "Nome do Catálogo:";
+"Links to this Address Book" = "Link para este Catálogo";
+"Authenticated User Access" = "Acesso de Usuário Autenticado";
+"CardDAV URL: " = "CardDAV URL:";
+
diff --git a/UI/Contacts/UIxContactActions.m b/UI/Contacts/UIxContactActions.m
index b1d9e1269..9706e402c 100644
--- a/UI/Contacts/UIxContactActions.m
+++ b/UI/Contacts/UIxContactActions.m
@@ -141,7 +141,7 @@
content = [NSMutableString string];
response = [context response];
- [content appendFormat: [[self clientObject] contentAsString]];
+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
[response setHeader: @"text/plain; charset=utf-8"
forKey: @"content-type"];
[response appendContentString: content];
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 974e7d5d0..d19d826c8 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -28,10 +28,14 @@
#import
#import
#import
+#define COMPILING_NGOBJWEB 1 /* we want httpRequest for parsing multi-part
+ form data */
#import
+#undef COMPILING_NGOBJWEB
#import
#import
#import
+#import
#import
#import
@@ -78,9 +82,9 @@
inContext: [self context]
acquire: NO];
if ([currentChild respondsToSelector: @selector (vCard)])
- [content appendFormat: [[currentChild ldifRecord] ldifRecordAsString]];
+ [content appendFormat: @"%@", [[currentChild ldifRecord] ldifRecordAsString]];
else if ([currentChild respondsToSelector: @selector (vList)])
- [content appendFormat: [[currentChild vList] ldifString]];
+ [content appendFormat: @"%@", [[currentChild vList] ldifString]];
[content appendString: @"\n"];
}
diff --git a/UI/Contacts/UIxContactFolderProperties.m b/UI/Contacts/UIxContactFolderProperties.m
index 1f5a92a01..cf93a83eb 100644
--- a/UI/Contacts/UIxContactFolderProperties.m
+++ b/UI/Contacts/UIxContactFolderProperties.m
@@ -19,6 +19,8 @@
*/
#import
+#import
+#import
#import "UIxContactFolderProperties.h"
@@ -48,7 +50,7 @@
return [addressBook displayName];
}
-- (NSString *) setAddressBookName: (NSString *) newName
+- (void) setAddressBookName: (NSString *) newName
{
[addressBook renameTo: newName];
}
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 4a4541794..94d475e6f 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -350,7 +350,7 @@
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
- [data appendFormat: @", ", country];
+ [data appendFormat: @", "];
[data appendString: country];
return [self _cardStringWithLabel: nil value: data];
@@ -562,7 +562,7 @@
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
- [data appendFormat: @" ", country];
+ [data appendFormat: @" "];
[data appendString: country];
return [self _cardStringWithLabel: nil value: data];
diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index bbaa636e6..5b1f13a1b 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+MailPartViewers_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
MailPartViewers_OBJC_FILES += \
MailPartViewersProduct.m \
diff --git a/UI/MailPartViewers/Macedonian.lproj/Localizable.strings b/UI/MailPartViewers/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..13643908d
--- /dev/null
+++ b/UI/MailPartViewers/Macedonian.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' барања Ñеуште не Ñе подржани од SOGo.";
+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/Portuguese.lproj/Localizable.strings b/UI/MailPartViewers/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..e03c76a5c
--- /dev/null
+++ b/UI/MailPartViewers/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,48 @@
+ACCEPTED = "aceite";
+COMPLETED = "finalizado";
+DECLINED = "rejeitado";
+DELEGATED = "apagado";
+"IN-PROCESS" = "em processamento";
+"NEEDS-ACTION" = "acções necessárias";
+TENTATIVE = "tentativa";
+organized_by_you = "organizado por si";
+you_are_an_attendee = "você é um participante";
+add_info_text = "As solicitações iMIP 'ADD' ainda não são suportadas pelo SOGo.";
+publish_info_text = "O solicitante informa-o sobre um evento anexo.";
+cancel_info_text = "O seu convite ou evento foi cancelado.";
+request_info_no_attendee = "está propondo uma reunião aos participantes. Está recebendo este email como uma notificação, não está agendado como um particiopante.";
+Appointment = "Compromisso";
+"Status Update" = "Estado da Atualização";
+was = "foi";
+
+Organizer = "Organizador";
+Time = "Hora";
+Attendees = "Participantes";
+request_info = "convidou-o para participar numa reunião.";
+"Add to calendar" = "Adicionar ao calendário";
+"Delete from calendar" = "Apagar do calendário";
+"Update status" = "Atualizar estado";
+Accept = "Aceitar";
+Decline = "Rejeitar";
+Tentative = "Tentativa";
+"Delegate ..." = "Delegado ...";
+"Delegated to" = "Delegado para";
+"Update status in calendar" = "Atualizar estado no calendário";
+"delegated from" = "delegado de";
+
+reply_info_no_attendee = "Recebeu uma resposta de um evento agendado, mas o remetente da resposta não é um participante.";
+reply_info = "Esta é uma resposta de um convite feito por si.";
+
+"to" = "para";
+
+"Untitled" = "Sem tÃtulo";
+
+"Size" = "Tamanho";
+
+"Digital signature is not valid" = "Assinatura digital inválida";
+"Message is signed" = "A Mensagem está assinada";
+"Subject" = "Assunto";
+"From" = "De";
+"Date" = "Data";
+"To" = "Para";
+"Issuer" = "Emissor";
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index f1ead5ffd..d464fbfc2 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -161,10 +161,10 @@ static NSData* _sanitizeContent(NSData *theData)
if (i < len-5)
{
if ((*bytes == '<') &&
- (*(bytes+1) == 'm' || *(bytes+2) == 'M') &&
- (*(bytes+2) == 'e' || *(bytes+3) == 'E') &&
- (*(bytes+3) == 't' || *(bytes+4) == 'T') &&
- (*(bytes+4) == 'a' || *(bytes+5) == 'A') &&
+ (*(bytes+1) == 'm' || *(bytes+1) == 'M') &&
+ (*(bytes+2) == 'e' || *(bytes+2) == 'E') &&
+ (*(bytes+3) == 't' || *(bytes+3) == 'T') &&
+ (*(bytes+4) == 'a' || *(bytes+4) == 'A') &&
(*(bytes+5) == ' '))
in_meta = YES;
}
@@ -741,7 +741,7 @@ static NSData* _sanitizeContent(NSData *theData)
/* SaxLexicalHandler */
- (void) comment: (unichar *) _chars
- length: (NSUInteger) _len
+ length: (int) _len
{
showWhoWeAre();
if (inStyle)
@@ -807,7 +807,7 @@ static NSData* _sanitizeContent(NSData *theData)
}
[dump appendFormat: @"--- end ---\n"];
- NSLog(dump);
+ NSLog(@"%@",dump);
[dump release];
}
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m
index 567412818..9f233515c 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.m
+++ b/UI/MailPartViewers/UIxMailPartICalActions.m
@@ -46,6 +46,7 @@
#import
#import
#import
+#import
#import
#import "UIxMailPartICalActions.h"
diff --git a/UI/MailPartViewers/UIxMailPartMixedViewer.m b/UI/MailPartViewers/UIxMailPartMixedViewer.m
index 39544c0d8..707650c93 100644
--- a/UI/MailPartViewers/UIxMailPartMixedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartMixedViewer.m
@@ -57,7 +57,7 @@
- (NSString *)childPartName {
char buf[8];
- sprintf(buf, "%d", [self childIndex] + 1);
+ sprintf(buf, "%d", (int)[self childIndex] + 1);
return [NSString stringWithCString:buf];
}
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index c973acbb6..1fc29721d 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -270,7 +270,7 @@
if ([filename length])
// We replace any slash by a dash since Apache won't allow encoded slashes by default.
// See http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
- filename = [filename stringByReplacingString: @"/" withString: @"-"];
+ filename = (NSMutableString *)[filename stringByReplacingString: @"/" withString: @"-"];
else
[filename appendFormat: @"%@-%@",
[self labelForKey: @"Untitled"],
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 2e8892603..2af49a213 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+MailerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
MailerUI_OBJC_FILES += \
MailerUIProduct.m \
diff --git a/UI/MailerUI/Macedonian.lproj/Localizable.strings b/UI/MailerUI/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..eab73da5d
--- /dev/null
+++ b/UI/MailerUI/Macedonian.lproj/Localizable.strings
@@ -0,0 +1,307 @@
+/* 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!" = "Добредојдовте на СОГо мејлерот. КориÑтете го дрвото Ñо папки на левата Ñтрана за да Ñе движите низ вашите Ñметки за пошта!";
+
+"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" = "Снимени 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" = "Папки"; /* 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}% used on %{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" = "Ðе можам да ја иÑпртам пораката: грешка при поврзувањето Ñо SMPT Ñерверот.";
+
+/* Contacts list in mail editor */
+"Email" = "ЕлектронÑка порака";
+"Name" = "Име";
diff --git a/UI/MailerUI/Portuguese.lproj/Localizable.strings b/UI/MailerUI/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..e9393fc9c
--- /dev/null
+++ b/UI/MailerUI/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,308 @@
+/* this file is in UTF-8 format! */
+
+/* Icon's label */
+"Create" = "Criar";
+"Empty Trash" = "Esvaziar Lixo";
+"Delete" = "Apagar";
+"Expunge" = "Expurgar";
+"Forward" = "Reencaminhar";
+"Get Mail" = "Receber";
+"Junk" = "Lixo Eletrônico";
+"Reply" = "Responder";
+"Reply All" = "Responder a Todos";
+"Print" = "Imprimir";
+"Stop" = "Parar";
+"Write" = "Escrever";
+"Search" = "Pesquisar";
+
+"Send" = "Enviar";
+"Contacts" = "Contatos";
+"Attach" = "Anexo";
+"Save" = "Gravar";
+"Options" = "Opções";
+"Close" = "Fechar";
+"Size" = "Tamanho";
+
+/* Tooltips */
+
+"Send this message now" = "Enviar esta mensagem agora";
+"Select a recipient from an Address Book" = "Seleciona um destinatário a partir de um Catálogo de Endereços";
+"Include an attachment" = "Incluir um anexo";
+"Save this message" = "Gravar esta mensagem";
+"Get new messages" = "Receber novas mensagens";
+"Create a new message" = "Cria uma nova mensagem";
+"Go to address book" = "Ir para Catálogo de Endereços";
+"Reply to the message" = "Responder a esta mensagem";
+"Reply to sender and all recipients" = "Responder ao remetente e a todos os destinatários";
+"Forward selected message" = "Reencaminhar a mensagem selecionada";
+"Delete selected message or folder" = "Apagar a mensagem ou pasta seleccionada";
+"Mark the selected messages as junk" = "Marca a mensagem selecionada como Lixo Eletrônico";
+"Print this message" = "Imprimir esta mensagem";
+"Stop the current transfer" = "Interromper a transferência";
+"Attachment" = "Anexos";
+"Unread" = "Não Lido";
+"Flagged" = "Sinalizado";
+"Search multiple mailboxes" = "Pesquisar múltiplas caixas de correio";
+
+/* Main Frame */
+
+"Home" = "InÃcio";
+"Calendar" = "Calendário";
+"Addressbook" = "Contactos";
+"Mail" = "Correio";
+"Right Administration" = "Administração de permissões";
+
+"Help" = "Ajuda";
+
+/* Mail account main windows */
+
+"Welcome to the SOGo Mailer. Use the folder tree on the left to browse your mail accounts!" = "Bem-Vindo ao SOGo WebMail. Use as pastas à esquerda para exibir suas contas de email!";
+
+"Read messages" = "Ler mensagens";
+"Write a new message" = "Escrever uma nova mensagem";
+
+"Share: " = "Partilha: ";
+"Account: " = "Conta: ";
+"Shared Account: " = "Conta partilhada: ";
+
+/* acls */
+"Access rights to" = "Permissões de acesso para";
+"For user" = "Para utilizador";
+
+"Any Authenticated User" = "Qualquer Utilizador Autenticado";
+
+"List and see this folder" = "Listar e ver esta pasta";
+"Read mails from this folder" = "Ler emails desta pasta";
+"Mark mails read and unread" = "Marcar emails como lido e não lido";
+"Modify the flags of the mails in this folder" = "Modificar a sinalização dos emails nesta pasta";
+"Insert, copy and move mails into this folder" = "Inserir, copiar e mover emails nesta pasta";
+"Post mails" = "Remetar emails";
+"Add subfolders to this folder" = "Adicionar subpastas a esta pasta";
+"Remove this folder" = "Apagar esta pasta";
+"Erase mails from this folder" = "Apagar emails desta pasta";
+"Expunge this folder" = "Expurgar esta pasta";
+"Export This Folder" = "Exportar esta pasta";
+"Modify the acl of this folder" = "Modificar as permissões desta pasta";
+
+"Saved Messages.zip" = "Mensagens Gravadas.zip";
+
+"Update" = "Actualizar";
+"Cancel" = "Cancelar";
+
+/* Mail edition */
+
+"From" = "De";
+"Subject" = "Assunto";
+"To" = "Para";
+"Cc" = "Cc";
+"Bcc" = "Bcc";
+"Reply-To" = "Responder-Para";
+"Add address" = "Adicionar endereço";
+"Body" = "Corpo";
+
+"Open" = "Abrir";
+"Select All" = "Seleccionar Tudo";
+"Attach Web Page..." = "Anexar Página Web...";
+"file" = "arquivo";
+"files" = "arquivos";
+"Save all" = "Gravar tudo";
+
+"to" = "Para";
+"cc" = "Cc";
+"bcc" = "Bcc";
+
+"Edit Draft..." = "Editar Rascunho...";
+"Load Images" = "Carregar Imagens";
+
+"Return Receipt" = "Endereço de Resposta";
+"The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "O remetente desta mensagem pediu para ser notificado quando ler esta mensagem. Deseja notificar o remetente?";
+"Return Receipt (displayed) - %@"= "Endereço de Resposta - %@";
+"This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "Este é o Endereço de Resposta do e-mail que enviou para %@.\n\nNota: Este Endereço de Resposta permite saber que a mensagem foi visualizada pelo destinatário. Não há garantia de que o destinatário tenha lido ou entendido o conteúdo da mensagem.";
+
+"Priority" = "Prioridade";
+"highest" = "Muito Alta";
+"high" = "Alta";
+"normal" = "Normal";
+"low" = "Baixa";
+"lowest" = "Muito Baixa";
+
+"This mail is being sent from an unsecure network!" = "Este email está sendo enviado por uma rede não segura!";
+
+"Address Book:" = "Contactos:";
+"Search For:" = "Pesquisar Por:";
+
+/* Popup "show" */
+
+"all" = "todos";
+"read" = "lido";
+"unread" = "não lido";
+"deleted" = "apagados";
+"flagged" = "sinalizados";
+
+/* MailListView */
+
+"Sender" = "Remetente";
+"Subject or Sender" = "Assunto ou Remetente";
+"To or Cc" = "Para ou Cc";
+"Entire Message" = "Mensagem Inteira";
+
+"Date" = "Data";
+"View" = "Vista";
+"All" = "Tudo";
+"No message" = "Sem mensagem";
+"messages" = "mensagens";
+
+"first" = "Primeiro";
+"previous" = "Anterior";
+"next" = "Próximo";
+"last" = "Último";
+
+"msgnumber_to" = "para";
+"msgnumber_of" = "de";
+
+"Mark Unread" = "Marcar como Não Lido";
+"Mark Read" = "Marcar como Lido";
+
+"Untitled" = "Sem tÃtulo";
+
+/* Tree */
+
+"SentFolderName" = "Enviados";
+"TrashFolderName" = "Lixo";
+"InboxFolderName" = "Entrada";
+"DraftsFolderName" = "Rascunhos";
+"SieveFolderName" = "Filtros";
+"Folders" = "Pastas"; /* title line */
+
+/* MailMoveToPopUp */
+
+"MoveTo" = "Mover …";
+
+/* Address Popup menu */
+"Add to Address Book..." = "Adicionar a Catálogo...";
+"Compose Mail To" = "Escrever Mensagem Para";
+"Create Filter From Message..." = "Criar Filtro Da Mensagem...";
+
+/* Image Popup menu */
+"Save Image" = "Gravar Imagem";
+"Save Attachment" = "Gravar Anexo.";
+
+/* Mailbox popup menus */
+"Open in New Mail Window" = "Abrir numa Nova Janela";
+"Copy Folder Location" = "Copiar o Local da Pasta";
+"Subscribe..." = "Subscrever...";
+"Mark Folder Read" = "Marcar Pasta como Lido...";
+"New Folder..." = "Nova Pasta...";
+"Compact This Folder" = "Compactar Esta Pasta";
+"Search Messages..." = "Procurar Mensagens...";
+"Sharing..." = "Partilhando...";
+"New Subfolder..." = "Nova Subpasta...";
+"Rename Folder..." = "Renomear Pasta...";
+"Delete Folder" = "Apagar Pasta";
+"Use This Folder For" = "Usar Esta Pasta Para";
+"Get Messages for Account" = "Receber Mensagens por Conta";
+"Properties..." = "Propriedades...";
+"Delegation..." = "Delegação...";
+
+/* Use This Folder menu */
+"Sent Messages" = "Enviar Mensagens";
+"Drafts" = "Rascunhos";
+"Deleted Messages" = "Mensagens Apagadas";
+
+/* Message list popup menu */
+"Open Message In New Window" = "Abrir Mensagens numa nova Nova Janela";
+"Reply to Sender Only" = "Responder somente para o Remetente";
+"Reply to All" = "Responder a Todos";
+"Edit As New..." = "Editar Como Novo...";
+"Move To" = "Mover Para";
+"Copy To" = "Copiar Para";
+"Label" = "Etiqueta";
+"Mark" = "Marcar";
+"Save As..." = "Gravar Como...";
+"Print Preview" = "Pré-visualizar Impressão";
+"View Message Source" = "Ver Código-Fonte da Mensagem";
+"Print..." = "Imprimir...";
+"Delete Message" = "Apagar Mensagem";
+"Delete Selected Messages" = "Apagar Mensagens Selecionadas";
+
+"This Folder" = "Esta Pasta";
+
+/* Label popup menu */
+"None" = "Nenhum";
+
+/* Mark popup menu */
+"As Read" = "Como Lido";
+"Thread As Read" = "Tarefa Como Lida";
+"As Read By Date..." = "Como Lido Por Data...";
+"All Read" = "Tudo Lido";
+"Flag" = "Sinalizado";
+"As Junk" = "Como Lixo Eletrônico";
+"As Not Junk" = "Como Não é Lixo Eletrônico";
+"Run Junk Mail Controls" = "Executar Controlo de Lixo Eletrônico";
+
+"Search messages in:" = "Pesquisar mensagens em:";
+"Search" = "Pesquisar";
+"Search subfolders" = "Pesquisar sub-pastas";
+"Match any of the following" = "Corresponder qualquer uma das seguintes";
+"Match all of the following" = "Corresponder todas as seguintes";
+"contains" = "contêm";
+"does not contain" = "não contêm";
+"No matches found" = "Nenhuma correspondencia encontrada";
+"results found" = "Resultados encontrados";
+"result found" = "Resultado encontrado";
+"Please specify at least one filter" = "Por favor, especifique pelo menos um filtro";
+
+/* Folder operations */
+"Name :" = "Nome :";
+"Enter the new name of your folder :"
+ = "Introduza o novo nome de sua pasta :";
+"Do you really want to move this folder into the trash ?"
+ = "Você realmente quer mover esta pasta para o Lixo ?";
+"Operation failed" = "Falha na Operação";
+
+"Quota" = "Quota:";
+"quotasFormat" = "%{0}% utilizado de %{1} MB";
+
+"Please select a message." = "Por favor, selecione uma mensagem.";
+"Please select a message to print." = "Por favor, selecione a mensagem para imprimir.";
+"Please select only one message to print." = "Por favor, selecione apenas uma mensagem para imprimir.";
+"The message you have selected doesn't exist anymore." = "A mensagem que você seleccionou não existe mais.";
+
+"The folder with name \"%{0}\" could not be created."
+= "A pasta com o nome \"%{0}\" não pode ser criada.";
+"This folder could not be renamed to \"%{0}\"."
+= "Esta pasta não pode ser renomeada para \"%{0}\".";
+"The folder could not be deleted."
+= "A pasta não pode ser apagada.";
+"The trash could not be emptied."
+= "O Lixo não pode ser esvaziado.";
+"The folder functionality could not be changed."
+= "A funcionalidade da pasta não pode ser alterada";
+
+"You need to choose a non-virtual folder!" = "Você precisa escolher uma pasta não-virtual!";
+
+"Moving a message into its own folder is impossible!"
+= "Mover a mensagem na própria pasta é impossÃvel!";
+"Copying a message into its own folder is impossible!"
+= "Copiar a mensagem na própria pasta é impossÃvel!";
+
+/* Message operations */
+"The messages could not be moved to the trash folder. Would you like to delete them immediately?"
+= "As mensagens não podem ser movidas para a pasta do lixo. Gostaria de eliminar imediatamente?";
+
+/* Message editing */
+"error_missingsubject" = "Falta o Assunto";
+"error_missingrecipients" = "Sem destinatários seleccionados";
+"Send Anyway" = "Enviar na mesma";
+"Error while saving the draft:" = "Erro ao gravar o rascunho:";
+"Error while uploading the file \"%{0}\":" = "Erro ao carregar o arquivo \"%{0}\":";
+"There is an active file upload. Closing the window will interrupt it." = "Este arquivo está a ser carregado. Se fechar a janela irá interromper o processo.";
+
+/* Message sending */
+"cannot send message: (smtp) all recipients discarded" = "Não é possÃvel enviar a mensagem: todos os destinatários são inválidos.";
+"cannot send message (smtp) - recipients discarded:" = "Não é possÃvel enviar a mensagem. Os seguintes endereços estão inválidos:";
+"cannot send message: (smtp) error when connecting" = "Não é possÃvel enviar a mensagem: erro ao conectar ao servidor SMTP.";
+
+/* Contacts list in mail editor */
+"Email" = "Email";
+"Name" = "Nome";
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 80fd4fa20..3c7c1edb4 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -383,7 +383,7 @@
- (WOResponse *) moveMessagesAction
{
SOGoMailFolder *co;
- SOGoUserSettings *us;
+ SOGoUserSettings *us=nil;
WOResponse *response;
NSArray *uids;
NSString *value, *destinationFolder;
diff --git a/UI/MailerUI/UIxMailListActions.h b/UI/MailerUI/UIxMailListActions.h
index 26a917778..8d0f2dda5 100644
--- a/UI/MailerUI/UIxMailListActions.h
+++ b/UI/MailerUI/UIxMailListActions.h
@@ -43,7 +43,6 @@
}
- (NSString *) defaultSortKey;
-- (NSString *) imap4SortKey;
- (NSString *) imap4SortOrdering;
- (EOQualifier *) searchQualifier;
- (NSString *) msgLabels;
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index e6ee428e5..5c78c4d25 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -335,12 +335,17 @@
- (WOResponse *) getFoldersStateAction
{
- NSString *expandedFolders;
+ id o;
+ NSArray *expandedFolders;
[self _setupContext];
- expandedFolders = [moduleSettings objectForKey: @"ExpandedFolders"];
+ o = [moduleSettings objectForKey: @"ExpandedFolders"];
+ if ([o isKindOfClass: [NSString class]])
+ expandedFolders = [o componentsSeparatedByString: @","];
+ else
+ expandedFolders = o;
- return [self responseWithStatus: 200 andString: expandedFolders];
+ return [self responseWithStatus: 200 andJSONRepresentation: expandedFolders];
}
- (NSString *) verticalDragHandleStyle
@@ -398,16 +403,18 @@
- (WOResponse *) saveFoldersStateAction
{
WORequest *request;
- NSString *expandedFolders;
+ NSArray *expandedFolders;
+ NSString *json;
[self _setupContext];
request = [context request];
- expandedFolders = [request formValueForKey: @"expandedFolders"];
-
- [moduleSettings setObject: expandedFolders
- forKey: @"ExpandedFolders"];
-
- [us synchronize];
+ json = [request formValueForKey: @"expandedFolders"];
+ if ([json length])
+ {
+ expandedFolders = [json objectFromJSONString];
+ [moduleSettings setObject: expandedFolders forKey: @"ExpandedFolders"];
+ [us synchronize];
+ }
return [self responseWithStatus: 204];
}
@@ -627,7 +634,7 @@
- (NSString *) columnsDisplayCount
{
- return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
+ return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]];
}
- (void) setCurrentColumn: (NSDictionary *) newCurrentColumn
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 110fac61b..453169327 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -53,6 +53,7 @@
#import
#import // cyclic
#import
+#import
#import "WOContext+UIxMailer.h"
diff --git a/UI/MainUI/Arabic.lproj/Localizable.strings b/UI/MainUI/Arabic.lproj/Localizable.strings
index 9501bd65e..568c685c1 100644
--- a/UI/MainUI/Arabic.lproj/Localizable.strings
+++ b/UI/MainUI/Arabic.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Basque.lproj/Localizable.strings b/UI/MainUI/Basque.lproj/Localizable.strings
index 1c8cc1327..1c42656c4 100644
--- a/UI/MainUI/Basque.lproj/Localizable.strings
+++ b/UI/MainUI/Basque.lproj/Localizable.strings
@@ -20,6 +20,7 @@
"Language" = "Hizkuntza";
"choose" = "Aukeratu ...";
"Arabic" = "العربية";
+"Basque" = "Euskara";
"Catalan" = "Català ";
"ChineseTaiwan" = "Chinese (Taiwan)";
"Czech" = "ÄŒesky";
@@ -32,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
index b9d376927..714e5e5a9 100644
--- a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -33,15 +33,17 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
-"NorwegianBokmal" = "Noruega (Norsk bokmål)";
-"NorwegianNynorsk" = "Noruega (Norsk nynorsk)";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
-"SpanishSpain" = "Espanhol (Espanha)";
-"SpanishArgentina" = "Espanhol (Argentina)";
+"SpanishSpain" = "Español (España)";
+"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
"Ukrainian" = "УкраїнÑька";
"Welsh" = "Cymraeg";
diff --git a/UI/MainUI/Catalan.lproj/Localizable.strings b/UI/MainUI/Catalan.lproj/Localizable.strings
index 83d0ed6a1..495df5095 100644
--- a/UI/MainUI/Catalan.lproj/Localizable.strings
+++ b/UI/MainUI/Catalan.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
index 36eb103ed..e36b4fcfb 100644
--- a/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings
index 17e168ac0..2ad6e066c 100644
--- a/UI/MainUI/Czech.lproj/Localizable.strings
+++ b/UI/MainUI/Czech.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Danish.lproj/Localizable.strings b/UI/MainUI/Danish.lproj/Localizable.strings
index 6c40e18cc..9ba97a7b5 100644
--- a/UI/MainUI/Danish.lproj/Localizable.strings
+++ b/UI/MainUI/Danish.lproj/Localizable.strings
@@ -33,15 +33,17 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
-"NorwegianBokmal" = "Norsk";
-"NorwegianNynorsk" = "Nynorsk";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
-"SpanishSpain" = "Spansk (Spanien)";
-"SpanishArgentina" = "Spansk (Argentina)";
+"SpanishSpain" = "Español (España)";
+"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
"Ukrainian" = "УкраїнÑька";
"Welsh" = "Cymraeg";
diff --git a/UI/MainUI/Dutch.lproj/Localizable.strings b/UI/MainUI/Dutch.lproj/Localizable.strings
index b84ff789f..5aff9ddb1 100644
--- a/UI/MainUI/Dutch.lproj/Localizable.strings
+++ b/UI/MainUI/Dutch.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
-"NorwegianBokmal" = "Norsk Bokmål";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 36eb103ed..e36b4fcfb 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Finnish.lproj/Localizable.strings b/UI/MainUI/Finnish.lproj/Localizable.strings
index 21458c5c2..cb9875f16 100644
--- a/UI/MainUI/Finnish.lproj/Localizable.strings
+++ b/UI/MainUI/Finnish.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings
index 3131bf5df..554b85816 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";
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index f25dc04ef..998961abd 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+MainUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese 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 fa7d2ce07..1e0a12ad2 100644
--- a/UI/MainUI/German.lproj/Localizable.strings
+++ b/UI/MainUI/German.lproj/Localizable.strings
@@ -33,15 +33,17 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
-"NorwegianBokmal" = "Norsk Bokmål";
-"NorwegianNynorsk" = "Norsk Nynorsk";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
"SpanishSpain" = "Español (España)";
-"SpanishArgentina" = "Español (Argentinien)";
+"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
"Ukrainian" = "УкраїнÑька";
"Welsh" = "Cymraeg";
diff --git a/UI/MainUI/Hungarian.lproj/Localizable.strings b/UI/MainUI/Hungarian.lproj/Localizable.strings
index 85acf770b..d400e508f 100644
--- a/UI/MainUI/Hungarian.lproj/Localizable.strings
+++ b/UI/MainUI/Hungarian.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings
index 778dc07e9..bdb1c3afc 100644
--- a/UI/MainUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MainUI/Icelandic.lproj/Localizable.strings
@@ -32,9 +32,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Italian.lproj/Localizable.strings b/UI/MainUI/Italian.lproj/Localizable.strings
index 469c6468a..f65ce392e 100644
--- a/UI/MainUI/Italian.lproj/Localizable.strings
+++ b/UI/MainUI/Italian.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Macedonian.lproj/Locale b/UI/MainUI/Macedonian.lproj/Locale
new file mode 100644
index 000000000..9e7aaded3
--- /dev/null
+++ b/UI/MainUI/Macedonian.lproj/Locale
@@ -0,0 +1,35 @@
+/* Macedonian */
+{
+ NSLanguageName = "Macedonian";
+ NSFormalName = "МакедонÑки";
+ NSLocaleCode = "mk"; /* ISO 639-1 */
+ NSLanguageCode = "mkd"; /* ISO 639-2 */
+ NSParentContext = "";
+
+ NSAMPMDesignation = (AM, PM);
+ NSCurrencySymbol = "MKD";
+ NSDateFormatString = "%A, %B %e, %Y";
+ NSDateTimeOrdering = DMYH;
+ NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+ NSDecimalSeparator = ",";
+ NSEarlierTimeDesignations = ("претходно", "поÑледен", "минато", "пред");
+ NSHourNameDesignations = ((0, "полноќ"), (10, "утро"), (12, "пладне", "ручек"), (14, "попладне"), (19, "вечера"));
+ NSInternationalCurrencyString = "MKD"; /* ISO 4217 */
+ NSLaterTimeDesignations = ("Ñледен");
+ NSMonthNameArray = ("Јануари", "Февруари", "Март", "Ðприл", "Мај", "Јуни", "Јули", "ÐвгуÑÑ‚", "Септември", "Октомври", "Ðоември", "Декември");
+ NSNextDayDesignations = ("утре");
+ NSNextNextDayDesignations = ("утре");
+ NSPriorDayDesignations = ("вчера");
+ NSShortDateFormatString = "%m/%e/%y";
+ NSShortMonthNameArray = ("Јан", "Фев", "Мар", "Ðпр", "Мај", "Јун", "Јул", "Ðвг", "Сеп", "Окт", "Ðое", "Дек");
+ NSShortTimeDateFormatString = "%m/%e/%y %I:%M %p";
+ NSShortWeekDayNameArray = ("Ðед", "Пон", "Вто", "Сре", "Чет", "Пет", "Саб");
+ 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/Macedonian.lproj/Localizable.strings b/UI/MainUI/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..953a7ad9b
--- /dev/null
+++ b/UI/MainUI/Macedonian.lproj/Localizable.strings
@@ -0,0 +1,83 @@
+/* this file is in UTF-8 format! */
+
+"title" = "SOGo";
+
+"Username:" = "КориÑничко име:";
+"Password:" = "Лозинка:";
+"Domain:" = "Домејн:";
+"Remember username" = "Запомни го кориÑничкото име";
+
+"Connect" = "Поврзи Ñе";
+
+"Wrong username or password." = "Погрешно кориÑничко име или лозинка.";
+"cookiesNotEnabled" = "Ðе можете да Ñе најавите поради тоа што колачињата на вашиот прелиÑтувач не Ñе активирани. Ве молиме да ги овозможите колачињата во опциите на вашиот прелиÑтувач и да Ñе обидете повторно.";
+
+"browserNotCompatible" = "Забележивме дека вашиот прелиÑтувач во моментов не е поддржан од овој Ñајт. Ðаша препорака е да кориÑтите Firefox. Клинете врз овој линк да ја преземете поÑледната верзија на овој прелиÑтувач.";
+"alternativeBrowsers" = "Како алтернатива иÑто така можете да кориÑтите еден оф компатибилните прелиÑтувачи";
+"alternativeBrowserSafari" = "Како крајна можноÑÑ‚, можете иÑто така да го кориÑтите Safari.";
+"Download" = "Преземи";
+
+"Language:" = "Јазик:";
+"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";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
+"Polish" = "Polski";
+"Portuguese" = "Português";
+"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" = "За";
+"AboutBox" = "Развиено од Inverse, SOGo е комплетен групвер Ñервер Ñо Ñ„Ð¾ÐºÑƒÑ Ð½Ð° ÑкалабилноÑÑ‚ и едноÑтавноÑÑ‚.
\nSOGo овозможува богат AJAX-базиран Web Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÑ˜Ñ Ð¸ поддржува повеќе нативни клиенти кориÑтејќи Ñтандардни протоколи како на пример CalDAV и CardDAV.
\nSOGo е диÑтрибуиран под GNU GPL верзија 2 или подоцнежна и делови Ñе диÑтрибуиирани под GNU LGPL version 2. Ова е беÑплатен Ñофтвер: вие Ñте Ñлободни да го менувате и редиÑтрибуирате. Ðема гаранција, до ниво дозволено Ñо закон.
\nПогледни ја Ñтраницава за разни можноÑти на поддршка.";
+
+"Your account was locked due to too many failed attempts." = "Вашиот налог е блокиран поради премногу погрешни обиди.";
+"Your account was locked due to an expired password." = "Вашата Ñметка е блокирана поради иÑтечена лозинка.";
+"Login failed due to unhandled error case: " = "Ðајавувањето е неуÑпешно поради непозната грешка:";
+"Change your Password" = "Сменете ја вашата лозинка";
+"The password was changed successfully." = "Лозинката е уÑпешно Ñменета.";
+"Your password has expired, please enter a new one below:" = "Вашата лозинка е иÑтечена. Ве молам да внеÑете нова:";
+"Password must not be empty." = "Лозинката не може да биде празна.";
+"The passwords do not match. Please try again." = "Лозинките не Ñе иÑти. Обидете Ñе повторно.";
+"Password Grace Period" = "Ð“Ñ€ÐµÑ˜Ñ Ð¿ÐµÑ€Ð¸Ð¾Ð´ на лозинката";
+"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "Ви преоÑтанаа %{0} обиди за најавување пред да Ñе блокира Ñметката. Ве молиме Ñменете ја лозинката во дадениот дијалог.";
+"Password about to expire" = "Лозинката Ñао што не иÑтекла";
+"Your password is going to expire in %{0} %{1}." = "Вашата лозинка ќе иÑтеча за %{0} %{1}.";
+"days" = "денови";
+"hours" = "чаÑови";
+"minutes" = "минути";
+"seconds" = "Ñекунди";
+"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}";
+"New password:" = "Ðова лозинка:";
+"Confirmation:" = "Потврда:";
+"Cancel" = "Откажи";
+"Please wait..." = "Ве молиме почекајте...";
diff --git a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
index 2c70931c3..bc32129c3 100644
--- a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
index 3481093e3..669158bf8 100644
--- a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Polish.lproj/Localizable.strings b/UI/MainUI/Polish.lproj/Localizable.strings
index 62105b655..dd8c656e1 100644
--- a/UI/MainUI/Polish.lproj/Localizable.strings
+++ b/UI/MainUI/Polish.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Portuguese.lproj/Locale b/UI/MainUI/Portuguese.lproj/Locale
new file mode 100644
index 000000000..eab1d0149
--- /dev/null
+++ b/UI/MainUI/Portuguese.lproj/Locale
@@ -0,0 +1,35 @@
+/* Portuguese */
+{
+ NSLanguageName = "Portuguese";
+ NSFormalName = "Portuguese";
+ NSLocaleCode = "pt_PT"; /* ISO-639-1 */
+ NSLanguageCode = "por"; /* ISO 639-2 */
+ NSParentContext = "";
+
+ NSAMPMDesignation = (AM, PM);
+ NSCurrencySymbol = " €";
+ NSDateFormatString = "%A, %B de %e de %Y";
+ NSDateTimeOrdering = DMYH;
+ NSDecimalDigits = ("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
+ NSDecimalSeparator = ",";
+ NSEarlierTimeDesignations = (anterior, "último", passado, "atrás");
+ NSHourNameDesignations = ((0, meia-noite), (10, "manhã"), (12, meio-dia, "almoço"), (14, tarde), (19, noite));
+ NSInternationalCurrencyString = EUR; /* ISO 4217 */
+ NSLaterTimeDesignations = ("próxima");
+ NSMonthNameArray = (Janeiro, Fevereiro, "Março", Abril, Maio, Junho, Julho, Agosto, Setembro, Outubro, Novembro, Dezembro);
+ NSNextDayDesignations = ("amanhã");
+ NSNextNextDayDesignations = ("dia seguinte");
+ NSPriorDayDesignations = (ontem);
+ NSShortDateFormatString = "%e/%m/%y";
+ NSShortMonthNameArray = (Jan, Fev, Mar, Abr, Mai, Jun, Jul, Ago, Set, Out, Nov, Dez);
+ NSShortTimeDateFormatString = "%e/%m/%y %H%M";
+ NSShortWeekDayNameArray = (Dom, Seg, Ter, Qua, Qui, Sex, Sab);
+ NSThisDayDesignations = (hoje, agora);
+ NSThousandsSeparator = ".";
+ NSTimeDateFormatString = "%A, %B de %e de %Y %I:%M:%S %p %Z";
+ NSTimeFormatString = "%H:%M:%S";
+ NSWeekDayNameArray = (Domingo, Segunda, "Terça", Quarta, Quinta, Sexta, "Sábado");
+ NSYearMonthWeekDesignations = (ano, "mês", semana);
+ NSPositiveCurrencyFormatString = "€ 9.999,00";
+ NSNegativeCurrencyFormatString = "(€ -9.999,00)";
+}
diff --git a/UI/MainUI/Portuguese.lproj/Localizable.strings b/UI/MainUI/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..0c6522492
--- /dev/null
+++ b/UI/MainUI/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,83 @@
+/* this file is in UTF-8 format! */
+
+"title" = "SOGo";
+
+"Username:" = "Utilizador:";
+"Password:" = "Senha:";
+"Domain:" = "DomÃnio:";
+"Remember username" = "Memorizar login";
+
+"Connect" = "Conectar";
+
+"Wrong username or password." = "Utilizador ou Senha Inválida.";
+"cookiesNotEnabled" = "Você não pode logar por a opção cookies está desabilitada. Por favor, habilite os cookies nas configurações de seu navegador e tente novamente.";
+
+"browserNotCompatible" = "Foi detectado que a atual versão de seu navegador não é suportado neste site. Recomentamos que use o Firefox. Clique no link abaixo para baixar a versão atual deste navegador.";
+"alternativeBrowsers" = "Alternativamente, você pode usar os seguinte navegadores compatÃveis";
+"alternativeBrowserSafari" = "Alternativamente, você pode usar o Safari.";
+"Download" = "Download";
+
+"Language:" = "Idioma:";
+"choose" = "Escolha ...";
+"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";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
+"Polish" = "Polski";
+"Portuguese" = "Português";
+"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" = "Sobre";
+"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." = "A sua conta foi bloqueada devido a muitas tentativas falhadas.";
+"Your account was locked due to an expired password." = "A sua conta foi bloqueada devido a uma senha expirada.";
+"Login failed due to unhandled error case: " = "O Login falhou pelo seguinte erro:";
+"Change your Password" = "Altere sua Senha";
+"The password was changed successfully." = "Senha alterada com sucesso.";
+"Your password has expired, please enter a new one below:" = "A sua senha expirou, por favor, insira uma nova abaixo:";
+"Password must not be empty." = "A Senha não pode estar vazia.";
+"The passwords do not match. Please try again." = "As senhas não coincidem. Por favor, tente novamente.";
+"Password Grace Period" = "Periodo de carência da Senha";
+"You have %{0} logins remaining before your account is locked. Please change your password in the preference dialog." = "Você tem %{0} logins restantes antes de bloquear a sua conta. Por favor, altere sua senha no menu preferências.";
+"Password about to expire" = "Senha prestes a expirar";
+"Your password is going to expire in %{0} %{1}." = "A sua senha vai expirar em %{0} %{1}.";
+"days" = "dias";
+"hours" = "horas";
+"minutes" = "minutos";
+"seconds" = "segundos";
+"Password change failed" = "Alteração da senha falhou";
+"Password change failed - Permission denied" = "Alteração da senha falhou - Permissão negada";
+"Password change failed - Insufficient password quality" = "Alteração da senha falhou - Senha muito fraca";
+"Password change failed - Password is too short" = "Alteração da senha falhou - Senha muito curta";
+"Password change failed - Password is too young" = "Alteração da senha falhou - Senha usada recentemente";
+"Password change failed - Password is in history" = "Password is too young - Senha está no histórico";
+"Unhandled policy error: %{0}" = "PolÃtica de erro não tratada: %{0}";
+"Unhandled error response" = "Erro de resposta não tratado";
+"Password change is not supported." = "Alteração da senha não suportada.";
+"Unhandled HTTP error code: %{0}" = "Erro HTTP não tratado: %{0}";
+"New password:" = "Nova senha:";
+"Confirmation:" = "Confirmação:";
+"Cancel" = "Cancelar";
+"Please wait..." = "Por favor, aguarde...";
diff --git a/UI/MainUI/Russian.lproj/Localizable.strings b/UI/MainUI/Russian.lproj/Localizable.strings
index fde95a6ae..627bb7ddc 100644
--- a/UI/MainUI/Russian.lproj/Localizable.strings
+++ b/UI/MainUI/Russian.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
index c487d5cce..ea9566dee 100644
--- a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
+++ b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
@@ -30,6 +30,9 @@
#import
#import
+#import
+#import
+
@interface SOGoMicrosoftActiveSyncActions : WODirectAction
@end
@@ -47,7 +50,7 @@
id dispatcher;
Class clazz;
- request = [context request];
+ request = (WORequest *)[context request];
response = [self responseWithStatus: 200];
bundle = [NSBundle bundleForClass: NSClassFromString(@"ActiveSyncProduct")];
diff --git a/UI/MainUI/Slovak.lproj/Localizable.strings b/UI/MainUI/Slovak.lproj/Localizable.strings
index f2272dd65..40d0532c4 100644
--- a/UI/MainUI/Slovak.lproj/Localizable.strings
+++ b/UI/MainUI/Slovak.lproj/Localizable.strings
@@ -20,29 +20,33 @@
"Language" = "Jazyk";
"choose" = "Výber ...";
"Arabic" = "العربية";
-"Catalan" = "Katalánsky";
+"Basque" = "Euskara";
+"Catalan" = "Català ";
+"ChineseTaiwan" = "Chinese (Taiwan)";
"Czech" = "ÄŒesky";
"Danish" = "Dansk (Danmark)";
-"Dutch" = "Holandsky";
-"English" = "Anglicky";
+"Dutch" = "Nederlands";
+"English" = "English";
"Finnish" = "Suomi";
-"French" = "Francúzsky";
-"German" = "Nemecky";
-"Hungarian" = "MaÄarsky";
-"Icelandic" = "IslandÄina";
-"Italian" = "Taliansky";
-"NorwegianBokmal" = "NórÄina bokmÃ¥l";
-"NorwegianNynorsk" = "NórÄina nynorsk";
-"Polish" = "Poľština";
-"BrazilianPortuguese" = "Portugalská brazÃlÅ¡tina";
-"Russian" = "Ruština";
+"French" = "Français";
+"German" = "Deutsch";
+"Hungarian" = "Magyar";
+"Icelandic" = "Ãslenska";
+"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
+"Polish" = "Polski";
+"Portuguese" = "Português";
+"BrazilianPortuguese" = "Português brasileiro";
+"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
-"SpanishSpain" = "Å panielÄina (Å panielsko)";
-"SpanishArgentina" = "Å panielÄina (ArgentÃna)";
-"Swedish" = "Å védÄina";
-"Ukrainian" = "UkrajinÄina";
-"Welsh" = "GalÄina";
+"SpanishSpain" = "Español (España)";
+"SpanishArgentina" = "Español (Argentina)";
+"Swedish" = "Svenska";
+"Ukrainian" = "УкраїнÑька";
+"Welsh" = "Cymraeg";
"About" = "O";
"AboutBox" = "Vyvinuté Inverse, SOGo je plne vybavený groupware server s dôrazom na škálovateľnosť a jednoduchosť.
\nSOGo ponúka bohaté Web rozhranie na báze AJAX-u a natÃvne podporuje mnoho klientov použitÃm Å¡tandardov ako sú CalDAV a CardDAV.
\nSOGo je distribuované pod licenciou GNU GPL verzie 2 alebo novÅ¡ej a niektoré Äasti pod licenciou GNU LGPL verzie 2. Toto je voľne Å¡Ãritelný softvér: môžete ho meniÅ¥ a Å¡ÃriÅ¥ Äalej. Neexistuje ŽIADNA ZÃRUKA, v rozsahu povolenom zákonom.
\nPozrite si túto stránku pre rôzne možnosti podpory.";
diff --git a/UI/MainUI/Slovenian.lproj/Localizable.strings b/UI/MainUI/Slovenian.lproj/Localizable.strings
index 9d7f33379..13e20e588 100644
--- a/UI/MainUI/Slovenian.lproj/Localizable.strings
+++ b/UI/MainUI/Slovenian.lproj/Localizable.strings
@@ -20,6 +20,7 @@
"Language" = "Jezik";
"choose" = "Izberi ...";
"Arabic" = "العربية";
+"Basque" = "Euskara";
"Catalan" = "Català ";
"ChineseTaiwan" = "Chinese (Taiwan)";
"Czech" = "ÄŒesky";
@@ -32,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
index 804006ff9..150cf9879 100644
--- a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/SpanishSpain.lproj/Localizable.strings b/UI/MainUI/SpanishSpain.lproj/Localizable.strings
index 479321ffb..c91a5896e 100644
--- a/UI/MainUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/MainUI/SpanishSpain.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Swedish.lproj/Localizable.strings b/UI/MainUI/Swedish.lproj/Localizable.strings
index e8c165a34..b4b074c0f 100644
--- a/UI/MainUI/Swedish.lproj/Localizable.strings
+++ b/UI/MainUI/Swedish.lproj/Localizable.strings
@@ -32,9 +32,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Ukrainian.lproj/Localizable.strings b/UI/MainUI/Ukrainian.lproj/Localizable.strings
index f18b55f22..bbf1ca544 100644
--- a/UI/MainUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/MainUI/Ukrainian.lproj/Localizable.strings
@@ -33,9 +33,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
-"NorwegianNynorsk" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/MainUI/Welsh.lproj/Localizable.strings b/UI/MainUI/Welsh.lproj/Localizable.strings
index d9e58ef44..205508fd6 100644
--- a/UI/MainUI/Welsh.lproj/Localizable.strings
+++ b/UI/MainUI/Welsh.lproj/Localizable.strings
@@ -32,9 +32,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
diff --git a/UI/PreferencesUI/Arabic.lproj/Localizable.strings b/UI/PreferencesUI/Arabic.lproj/Localizable.strings
index b3ed4f16e..31e323b06 100644
--- a/UI/PreferencesUI/Arabic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Arabic.lproj/Localizable.strings
@@ -12,7 +12,7 @@
"Forward" = "ارسال الى";
"Password" = "كلمة السر";
"Categories" = "الÙئات";
-"Name" = "اسم ";
+"Name" = "اسم";
"Color" = "اللون";
"Add" = "إضاÙØ©";
"Delete" = "مسØ";
@@ -185,7 +185,7 @@
/* Event+task classifications */
"Default events classification" ="تصني٠الأØداث الاÙتراضية";
-"Default tasks classification" ="تصني٠المهام الاÙتراضية ";
+"Default tasks classification" ="تصني٠المهام الاÙتراضية";
"PUBLIC_item" = "علني";
"CONFIDENTIAL_item" = "سري";
"PRIVATE_item" = "خاص";
@@ -199,7 +199,7 @@
"Contacts" = "دÙتر العناوين";
"Mail" = "بريد";
"Last" = "أخر إستخدام";
-"Default Module " = "ÙˆØدة نمطية اÙتراضية ";
+"Default Module " = "ÙˆØدة نمطية اÙتراضية";
"Language" ="اللغة";
"choose" = "اختيار ...";
@@ -217,9 +217,11 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"Polish" = "Polski";
+"Portuguese" = "Português";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
@@ -260,7 +262,7 @@
"Subject" = "موضوع";
"From" = "من";
"To" = "إلى";
-"Cc" = "نسخة ";
+"Cc" = "نسخة";
"To or Cc" = "إلى أو نسخة";
"Size (Kb)" = "الØجم (كيلو بايت)";
"Header" = "قمة";
@@ -275,7 +277,7 @@
"is under" = "هو تØت";
"is over" = "هو Ùوق";
-"is" = "هو ";
+"is" = "هو";
"is not" = "هو لا";
"contains" = "ÙŠØتوي";
"does not contain" = "لا ÙŠØتوي";
diff --git a/UI/PreferencesUI/Basque.lproj/Localizable.strings b/UI/PreferencesUI/Basque.lproj/Localizable.strings
index bfdd4d1cf..776a85242 100644
--- a/UI/PreferencesUI/Basque.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Basque.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
index af865affe..b328bade8 100644
--- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -203,7 +203,7 @@
/* Event+task categories */
"category_none" = "Nenhum";
-"calendar_category_labels" = "Aniversário,Negócios,Ligações,Concorrência,Cliente,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Meeting,Problemas,Miscelânea,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias";
+"calendar_category_labels" = "Celebração Anual,Aniversário,Negócios,Ligações,Clientes,Concorrência,Comprador,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Reunião,Problemas,Miscelânea,Pessoal,Projetos,Feriado,Posição,Fornecedores,Viagem,Férias";
/* Default module */
"Calendar" = "Calendário";
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Eslovaco";
"SpanishSpain" = "Español (España)";
diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
index 94265f14b..49d324285 100644
--- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
@@ -30,7 +30,7 @@
"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."
= "Especifiqueu el missatge i les adreces de correu per a les quals voleu activar la resposta automà tica.";
-"Your vacation message must not end with a single dot on a line." = "El seu missatge d'autoresposta per vacances no ha d'acabar amb un punt en una lÃnia a part. ";
+"Your vacation message must not end with a single dot on a line." = "El seu missatge d'autoresposta per vacances no ha d'acabar amb un punt en una lÃnia a part.";
"End date of your auto reply must be in the future."
= "La data de finalització de la seva resposta automà tica ha d'estar en el futur.";
@@ -134,7 +134,7 @@
"Show subscribed mailboxes only" = "Mostrar només les bústies subscrites";
"Sort messages by threads" = "Ordenar els missatges per temes";
"When sending mail, add unknown recipients to my" = "En enviar un missatge, afegeix els destinataris desconeguts al meu";
-"Check for new mail:" = "Comprovar nou correu: ";
+"Check for new mail:" = "Comprovar nou correu:";
"refreshview_manually" = "Manualment";
"refreshview_every_minute" = "Cada minut";
"refreshview_every_2_minutes" = "Cada 2 minuts";
@@ -177,15 +177,15 @@
"Full Name" = "Nom complet";
"Email" = "Correu electrònic";
-"Reply To Email" = "Respondre a aquesta adreça de correu ";
+"Reply To Email" = "Respondre a aquesta adreça de correu";
"Signature" = "Signatura";
"(Click to create)" = "(Clic per a crear-la)";
"Signature" = "Signatura";
"Please enter your signature below:" = "Si us plau, poseu la signatura a sota:";
-"Please specify a valid sender address." = "Per favor, especifique una adreça và lida per al remitent. ";
-"Please specify a valid reply-to address." = "Per favor, especifique una adreça de resposta và lida. ";
+"Please specify a valid sender address." = "Per favor, especifique una adreça và lida per al remitent.";
+"Please specify a valid reply-to address." = "Per favor, especifique una adreça de resposta và lida.";
/* Additional Parameters */
"Additional Parameters" = "Parà metres addicionals";
@@ -198,9 +198,9 @@
/* Event+task classifications */
"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 ";
+"PUBLIC_item" = "Públic";
+"CONFIDENTIAL_item" = "Confidencial";
+"PRIVATE_item" = "Privat";
/* Event+task categories */
"category_none" = "Cap";
@@ -211,7 +211,7 @@
"Contacts" = "Llibreta d'adreces";
"Mail" = "Correu";
"Last" = "Últim usat";
-"Default Module " = "PÃ gina per defecte ";
+"Default Module " = "PÃ gina per defecte";
"SOGo Version" ="Versió del SOGo";
"Language" ="Language";
@@ -230,10 +230,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
index 547d283c2..9f48a77cd 100644
--- a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
@@ -216,7 +216,9 @@
"Language" ="語言";
"choose" = "é¸æ“‡...";
"Arabic" = "العربية";
+"Basque" = "Euskara";
"Catalan" = "Català ";
+"ChineseTaiwan" = "Chinese (Taiwan)";
"Czech" = "ÄŒesky";
"Danish" = "Dansk (Danmark)";
"Dutch" = "Nederlands";
@@ -227,12 +229,15 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
"SpanishSpain" = "Español (España)";
"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings
index 964738409..bf8697b51 100644
--- a/UI/PreferencesUI/Czech.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings
@@ -210,7 +210,7 @@
"Contacts" = "Adresář";
"Mail" = "Pošta";
"Last" = "Naposledy použitý";
-"Default Module " = "Výchozà modul ";
+"Default Module " = "Výchozà modul";
"SOGo Version" ="SOGo verze";
"Language" ="Jazyk";
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Portugues brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings
index f30f3066f..3ecb7a20c 100644
--- a/UI/PreferencesUI/Danish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings
@@ -217,6 +217,7 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk";
"NorwegianNynorsk" = "Nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
index 0500dd1d9..33a6c7a87 100644
--- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk Bokmål";
"NorwegianNynorsk" = "Norsk Nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 8036e6166..2f1e2ed9c 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
-"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
+"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
index 780d98acf..466a13f0b 100644
--- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
@@ -250,13 +252,13 @@
"refreshview_every_10_minutes" = "10 minuutin välein";
"refreshview_every_20_minutes" = "20 minuutin välein";
"refreshview_every_30_minutes" = "Puolen tunnin välein";
-"refreshview_once_per_hour" = "Kerran tunnissa ";
+"refreshview_once_per_hour" = "Kerran tunnissa";
/* Return receipts */
"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 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";
@@ -326,7 +328,7 @@
"Password change failed - Password is too short" = "Salasanan vaihto epäonnistui - Liian lyhyt salasana";
"Password change failed - Password is too young" = "Salasanan vaihto epäonnistui - Salasana on liian nuori";
"Password change failed - Password is in history" = "Salasanan vaihto epäonnistui - Salasanaa on käytetty aiemmin";
-"Unhandled policy error: %{0}" = "Käsittelemätön sääntövirhe: %{0} ";
+"Unhandled policy error: %{0}" = "Käsittelemätön sääntövirhe: %{0}";
"Unhandled error response" = "Käsittelemätön virhevastaus";
"Password change is not supported." = "Salasanan vaihto ei ole tuettu.";
"Unhandled HTTP error code: %{0}" = "Käsittelämätön HTTP virhekoodi: %{0}";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 2be47f50c..76b93179e 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -140,7 +140,7 @@
"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";
@@ -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";
@@ -210,7 +210,7 @@
"Contacts" = "Carnet d'adresses";
"Mail" = "Courrier";
"Last" = "Dernier utilisé";
-"Default Module " = "Module par défaut ";
+"Default Module " = "Module par défaut";
"SOGo Version" ="Version";
"Language" ="Langue";
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index 450ede6ec..8f02f34b4 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+PreferencesUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese 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 48bd15efc..2a1fc413d 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -144,7 +144,7 @@
"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";
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
index ce7ae70e6..16c224661 100644
--- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
@@ -137,7 +137,7 @@
"Labels" = "CÃmkék";
"Label" = "CÃmke";
"Show subscribed mailboxes only" = "Csak azok a fiókok mutatása, amelyre feliratkozott";
-"Sort messages by threads" = "Üzenetek beszélgetések szerinti rendezése ";
+"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";
@@ -229,12 +229,15 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
-"Slovak" = "Szlovén";
+"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
"SpanishSpain" = "Español (España)";
"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
index 05088a434..733f8d73a 100644
--- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
@@ -137,7 +137,7 @@
"User Name" = "Notandanafn";
"Password" = "Lykilorð";
-"Full Name" = "Fullt nafn ";
+"Full Name" = "Fullt nafn";
"Email" = "Tölvupóstfang";
"Signature" = "Undirritun";
"(Click to create)" = "(Smella til að búa til)";
@@ -169,7 +169,7 @@
"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";
"choose" = "Velja...";
@@ -187,10 +187,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings
index 0df2c568a..5f606739d 100644
--- a/UI/PreferencesUI/Italian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings
@@ -30,7 +30,7 @@
"Disable auto reply on" = "Disabilita il risponditore automatico";
"Please specify your message and your email addresses for which you want to enable auto reply."
= "Prego specificare il tuo messaggio e l'indirizzo email per il quale vuoi abilitare il risponditore automatico.";
-"Your vacation message must not end with a single dot on a line." = "Il messaggio dell'auto-risponditore non deve finire con un singolo punto per linea ";
+"Your vacation message must not end with a single dot on a line." = "Il messaggio dell'auto-risponditore non deve finire con un singolo punto per linea";
"End date of your auto reply must be in the future."
= "La data di fine del risponditore automatico deve essere nel futuro";
@@ -190,7 +190,7 @@
"Contacts" = "Rubrica";
"Mail" = "Posta";
"Last" = "Ultimo usato";
-"Default Module " = "Modulo di default ";
+"Default Module " = "Modulo di default";
"Language" ="Lingua";
"choose" = "Scegli...";
@@ -208,10 +208,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Macedonian.lproj/Localizable.strings b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..542f329c1
--- /dev/null
+++ b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings
@@ -0,0 +1,334 @@
+/* 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" = "Колега, конкурент, клиент, пријател, фамилија, деловен партнер, провајдер, новинар, ВИП";
+
+/* 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-%b-%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" = "Започнува на 1ви Јануари";
+"firstWeekOfYear_First4DayWeek" = "Првата 4-дневна недела";
+"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" = "Годишница,Роденден,Деловно,Повици,Clients,Конкуренција,КориÑник,Фаворити,Да Ñе Ñледи,Подарок,Празници,Идеи,СоÑтаноци,Проблеми,Разно,Лични,Проекти,Јавни празници,СтатуÑ,Добавувачи,Патување,Одмор";
+
+/* Default module */
+"Calendar" = "Календар";
+"Contacts" = "ÐдреÑна книга";
+"Mail" = "ЕлектронÑка пошта";
+"Last" = "ПоÑледно кориÑтено";
+"Default Module" = "Стандарден модул";
+"SOGo Version" = "Верзија на SOGo";
+
+"Language" = "Јазик";
+"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";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
+"BrazilianPortuguese" = "Português brasileiro";
+"Polish" = "Polski";
+"Portuguese" = "Português";
+"Russian" = "РуÑÑкий";
+"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
+"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/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
index 6cec64783..2a5b5bd41 100644
--- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
@@ -32,7 +32,7 @@
"Always send vacation message response" = "Alltid send ferie melding";
"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 aktivere auto-svar for.";
-"Your vacation message must not end with a single dot on a line." = "Fraværsmeldingen kan ikke slutte med ett ensomt punktum på en linje. ";
+"Your vacation message must not end with a single dot on a line." = "Fraværsmeldingen kan ikke slutte med ett ensomt punktum på en linje.";
"End date of your auto reply must be in the future."
= "Slutt-dato for auto-svar må være i framtiden.";
@@ -144,7 +144,7 @@
"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";
@@ -229,12 +229,15 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
-"Polish" = "Polsk";
+"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
-"Slovak" = "Slovensk";
+"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
"SpanishSpain" = "Español (España)";
"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
index e1d9bae0e..35808f568 100644
--- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -194,10 +194,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings
index db83009b2..492ae470d 100644
--- a/UI/PreferencesUI/Polish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovenská";
"SpanishSpain" = "Español (España)";
diff --git a/UI/PreferencesUI/Portuguese.lproj/Localizable.strings b/UI/PreferencesUI/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..facc5a3ff
--- /dev/null
+++ b/UI/PreferencesUI/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,330 @@
+/* toolbar */
+"Save and Close" = "Gravar e Fechar";
+"Close" = "Fechar";
+
+/* tabs */
+"General" = "Geral";
+"Calendar Options" = "Calendário";
+"Contacts Options" = "Opções de Contatos";
+"Mail Options" = "Correio";
+"IMAP Accounts" = "Contas IMAP";
+"Vacation" = "Férias";
+"Forward" = "Reencaminhar";
+"Password" = "Senha";
+"Categories" = "Categorias";
+"Appointments invitations" = "Convites de Compromissos";
+"Name" = "Nome";
+"Color" = "Cor";
+"Add" = "Adicionar";
+"Delete" = "Excluir";
+
+/* contacts categories */
+"contacts_category_labels" = "Colega, Concorrente, Cliente, Amigo, FamÃlia, Parceiro de Negócios, Provedor, Imprensa, VIP";
+
+/* vacation (auto-reply) */
+"Enable vacation auto reply" = "Habilitar auto resposta de férias";
+"Auto reply message" = "AutoResponder 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";
+"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";
+"Please specify your message and your email addresses for which you want to enable auto reply."
+= "Por favor especifique a sua mensagem e os seus endereços de e-mail para o qual você deseja ativar resposta automática.";
+"Your vacation message must not end with a single dot on a line." = "A sua mensagem de férias não deve terminar com um ponto final na linha.";
+"End date of your auto reply must be in the future."
+= "A data final da resposta automática deve estar no futuro.";
+
+/* forward messages */
+"Forward incoming messages" = "Reencaminhar mensagens recebidas";
+"Keep a copy" = "Manter uma cópia";
+"Please specify an address to which you want to forward your messages."
+= "Por favor especificar um endereço para o qual você deseja encaminhar suas mensagens.";
+
+/* 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";
+
+"default" = "Padrão";
+
+"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" = "A Semana começa em";
+"Day start time" = "O Dia começa à s";
+"Day end time" = "O Dia termina à s";
+"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";
+"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";
+
+"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";
+"Contacts Names" = "Nomes de Contatos";
+
+/* Default Calendar */
+"Default calendar" = "Calendário Padrão";
+"selectedCalendar" = "Calendário selecionado";
+"personalCalendar" = "Calendário pessoal";
+"firstCalendar" = "Calendário habilizado pela primeira vez";
+
+"reminder_NONE" = "Não lembrar";
+"reminder_5_MINUTES_BEFORE" = "5 minutos";
+"reminder_10_MINUTES_BEFORE" = "10 minutos";
+"reminder_15_MINUTES_BEFORE" = "15 minutos";
+"reminder_30_MINUTES_BEFORE" = "30 minutos";
+"reminder_45_MINUTES_BEFORE" = "45 minutos antes";
+"reminder_1_HOUR_BEFORE" = "1 hora";
+"reminder_2_HOURS_BEFORE" = "2 horas";
+"reminder_5_HOURS_BEFORE" = "5 horas";
+"reminder_15_HOURS_BEFORE" = "15 horas";
+"reminder_1_DAY_BEFORE" = "1 dia";
+"reminder_2_DAYS_BEFORE" = "2 dias";
+"reminder_1_WEEK_BEFORE" = "1 semana antes";
+
+/* Mailer */
+"Labels" = "Etiquetas";
+"Label" = "Etiqueta";
+"Show subscribed mailboxes only" = "Exibir somente caixas de correio inscritas";
+"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";
+"messageforward_inline" = "No corpo da mensagem";
+"messageforward_attached" = "Como anexo";
+
+"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";
+"signatureplacement_above" = "abaixo da minha resposta";
+"signatureplacement_below" = "abaixo da citação";
+"Compose messages in" = "Escrever mensagens em";
+"composemessagestype_html" = "HTML";
+"composemessagestype_text" = "Texto puro";
+"Display remote inline images" = "Exibir imagens remotas";
+"displayremoteinlineimages_never" = "Nunca";
+"displayremoteinlineimages_always" = "Sempre";
+
+"Auto save every" = "Gravar automatáticamente cada";
+"minutes" = "minutos";
+
+/* Contact */
+"Personal Address Book" = "Contactos Pessoais";
+"Collected Address Book" = "Contactos Coleccionados";
+
+/* IMAP Accounts */
+"New Mail Account" = "Nova conta de e-mail";
+
+"Server Name" = "Nome do Servidor";
+"Port" = "Porta";
+"Encryption" = "Encriptação";
+"None" = "Nenhum";
+"User Name" = "Nome do Utilizador";
+"Password" = "Senha";
+
+"Full Name" = "Nome Completo";
+"Email" = "E-mail";
+"Reply To Email" = "Responder para o Email";
+"Signature" = "Assinatura";
+"(Click to create)" = "(Click para criar)";
+
+"Signature" = "Assinatura";
+"Please enter your signature below:" = "Por favor, digite sua assinatura abaixo:";
+
+"Please specify a valid sender address." = "Por favor, especifique um endereço de email válido.";
+"Please specify a valid reply-to address." = "Por favor,especifique um endereço de resposta válido.";
+
+/* Additional Parameters */
+"Additional Parameters" = "Parâmetros Adicionais";
+
+/* password */
+"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";
+"PUBLIC_item" = "Público";
+"CONFIDENTIAL_item" = "Confidencial";
+"PRIVATE_item" = "Particular";
+
+/* Event+task categories */
+"category_none" = "Nenhum";
+"calendar_category_labels" = "Celebração Anual,Aniversário,Negócios,Ligações,Clientes,Concorrência,Comprador,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Meeting,Problemas,Miscelânea,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias";
+
+/* Default module */
+"Calendar" = "Calendário";
+"Contacts" = "Contactos";
+"Mail" = "Correio";
+"Last" = "Último usado";
+"Default Module" = "Módulo Padrão";
+"SOGo Version" = "Versão SOGo";
+
+"Language" = "Idioma";
+"choose" = "Escolha ...";
+"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";
+"Macedonian" = "МакедонÑки";
+"NorwegianBokmal" = "Norsk bokmål";
+"NorwegianNynorsk" = "Norsk nynorsk";
+"BrazilianPortuguese" = "Português brasileiro";
+"Polish" = "Polski";
+"Portuguese" = "Português";
+"Russian" = "РуÑÑкий";
+"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
+"SpanishSpain" = "Español (España)";
+"SpanishArgentina" = "Español (Argentina)";
+"Swedish" = "Svenska";
+"Ukrainian" = "УкраїнÑька";
+"Welsh" = "Cymraeg";
+
+"Refresh View" = "Actualizar a Visualização";
+"refreshview_manually" = "Manualmente";
+"refreshview_every_minute" = "A cada minuto";
+"refreshview_every_2_minutes" = "A cada 2 minutos";
+"refreshview_every_5_minutes" = "A cada 5 minutos";
+"refreshview_every_10_minutes" = "A cada 10 minutos";
+"refreshview_every_20_minutes" = "A cada 20 minutos";
+"refreshview_every_30_minutes" = "A cada 30 minutos";
+"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";
+"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";
+
+"Never send" = "Nunca enviar";
+"Always send" = "Sempre enviar";
+"Ask me" = "Pergunte-me";
+
+/* Filters - UIxPreferences */
+"Filters" = "Filtros";
+"Active" = "Ativo";
+"Move Up" = "Mover para cima";
+"Move Down" = "Move para baixo";
+"Connection error" = "Erro de conexão";
+"Service temporarily unavailable" = "Serviço temporariamente indisponÃvel";
+
+/* Filters - UIxFilterEditor */
+"Filter name:" = "Nome do filtro:";
+"For incoming messages that" = "Para mensagens recebidas que";
+"match all of the following rules:" = "correspondem a todas as seguintes regras:";
+"match any of the following rules:" = "corresponde a nenhuma das seguintes regras:";
+"match all messages" = "corresponder a todas as mensagens";
+"Perform these actions:" = "Realizar essas ações:";
+"Untitled Filter" = "Filtro sem tÃtulo";
+
+"Subject" = "Assunto";
+"From" = "De";
+"To" = "Para";
+"Cc" = "Cc";
+"To or Cc" = "Para ou Cc";
+"Size (Kb)" = "Tamanho (Kb)";
+"Header" = "Cabeçalho";
+"Body" = "Corpo";
+"Flag the message with:" = "Marcar a mensagem com:";
+"Discard the message" = "Descartar a mensagem";
+"File the message in:" = "Arquivo da mensagem em:";
+"Keep the message" = "Manter a mensagem";
+"Forward the message to:" = "Rencaminhar a mensagem para:";
+"Send a reject message:" = "Enviar uma mensagem de rejeição:";
+"Send a vacation message" = "Enviar uma mensagem de ausência";
+"Stop processing filter rules" = "Parar o processamento dos filtros";
+
+"is under" = "abaixo";
+"is over" = "acima";
+"is" = "é";
+"is not" = "não é";
+"contains" = "contêm";
+"does not contain" = "não contêm";
+"matches" = "corresponde";
+"does not match" = "não corresponde";
+"matches regex" = "coincide com a expressão";
+"does not match regex" = "não coincide com a expressão";
+
+"Seen" = "Visto";
+"Deleted" = "Removido";
+"Answered" = "Respondido";
+"Flagged" = "Marcado";
+"Junk" = "Lixo";
+"Not Junk" = "Não é Lixo";
+
+/* Password policy */
+"The password was changed successfully." = "Senha alterada com sucesso.";
+"Password must not be empty." = "A senha não pode ser vazia.";
+"The passwords do not match. Please try again." = "A senha não coincide. Por favor tente novamente.";
+"Password change failed" = "Alteração de senha falhada";
+"Password change failed - Permission denied" = "Alteração de senha falhada - não tem permissões";
+"Password change failed - Insufficient password quality" = "Alteraçao de senha falhada - Qualidade da senha insuficiente";
+"Password change failed - Password is too short" = "Alteração de senha falhada - Senha é demasiado curta";
+"Password change failed - Password is too young" = "Alteração de senha falhada - Senha é demasiado comprida";
+"Password change failed - Password is in history" = "Alteração de senha falhada - Senha já foi utilizada no passado";
+"Unhandled policy error: %{0}" = "Erro de politica não controlada: %{0}";
+"Unhandled error response" = "Erro de resposta não controlada";
+"Password change is not supported." = "A alteração de senha não é suportada.";
+"Unhandled HTTP error code: %{0}" = "Erro de HTTP não controlado, código: %{0}";
diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings
index 73eecd64e..9be953f32 100644
--- a/UI/PreferencesUI/Russian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings
@@ -229,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings
index d3c4a31eb..cab0677d1 100644
--- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings
@@ -150,7 +150,7 @@
"And place my signature" = "A vlož môj podpis";
"signatureplacement_above" = "pod odpoveÄou";
"signatureplacement_below" = "pod citáciou";
-"Compose messages in" = "Vytvor správu v ";
+"Compose messages in" = "Vytvor správu v";
"composemessagestype_html" = "HTML";
"composemessagestype_text" = "Čistý text";
"Display remote inline images" = "Zobraziť externe pripojené obrázky";
@@ -226,10 +226,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
@@ -288,7 +290,7 @@
"is under" = "je pod";
"is over" = "je nad";
"is" = "je";
-"is not" = "nie je ";
+"is not" = "nie je";
"contains" = "obsahuje";
"does not contain" = "neobsahuje";
"matches" = "zodpovedá";
diff --git a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
index 3e7d70165..65e16c571 100644
--- a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
@@ -216,6 +216,7 @@
"Language" ="Jezik";
"choose" = "Izberi ...";
"Arabic" = "العربية";
+"Basque" = "Euskara";
"Catalan" = "Català ";
"ChineseTaiwan" = "Chinese (Taiwan)";
"Czech" = "ÄŒesky";
@@ -228,10 +229,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
index a325aa53c..525f79e51 100644
--- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
@@ -203,7 +203,7 @@
"Contacts" = "Libreta de direcciones";
"Mail" = "Correo";
"Last" = "Ultimo usado";
-"Default Module " = "Módulo por defecto ";
+"Default Module " = "Módulo por defecto";
"SOGo Version" ="Versión de SOGo";
"Language" ="Idioma";
@@ -222,10 +222,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
index 357701090..3bb1d19bc 100644
--- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
@@ -210,7 +210,7 @@
"Contacts" = "Libreta de direcciones";
"Mail" = "Correo";
"Last" = "Ultimo usado";
-"Default Module " = "Módulo por defecto ";
+"Default Module " = "Módulo por defecto";
"SOGo Version" ="Versión de SOGo";
"Language" ="Idioma";
@@ -229,12 +229,15 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
-"Slovak" = "Eslovaquia";
+"Slovak" = "Slovensky";
+"Slovenian" = "SlovenÅ¡Äina";
"SpanishSpain" = "Español (España)";
"SpanishArgentina" = "Español (Argentina)";
"Swedish" = "Svenska";
diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
index 5b654e532..e74a1800a 100644
--- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
@@ -196,10 +196,12 @@ Servernamn:";
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 11bd05b36..33a97f708 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -29,6 +29,11 @@
#import
#import
#import
+#import
+#import
+
+#import
+#import
#import "UIxJSONPreferences.h"
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 5558c7d77..0de77d28f 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1366,15 +1366,15 @@ static NSArray *reminderValues = nil;
if ([account updateFilters])
// If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
// See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
- results = [self responseWithStatus: 200
+ results = (id )[self responseWithStatus: 200
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
else
- results = [self responseWithStatus: 502
+ results = (id )[self responseWithStatus: 502
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
}
else
- results = [self responseWithStatus: 503
+ results = (id )[self responseWithStatus: 503
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
}
else
diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
index fb68f09c1..395333b7a 100644
--- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
@@ -188,7 +188,7 @@
"Contacts" = "ÐдреÑна книга";
"Mail" = "Електронна пошта";
"Last" = "ОÑтаннє";
-"Default Module " = "Модуль за замовчаннÑм ";
+"Default Module " = "Модуль за замовчаннÑм";
"Language" ="Мова";
"choose" = "Choose ...";
@@ -206,10 +206,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
index 3c289b703..01d2710bf 100644
--- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -176,7 +176,7 @@
"Contacts" = "Address Book";
"Mail" = "Mail";
"Last" = "Last used";
-"Default Module " = "Default module ";
+"Default Module " = "Default module";
"Language" ="Iaith";
"choose" = "Dewis ...";
@@ -194,10 +194,12 @@
"Hungarian" = "Magyar";
"Icelandic" = "Ãslenska";
"Italian" = "Italiano";
+"Macedonian" = "МакедонÑки";
"NorwegianBokmal" = "Norsk bokmål";
"NorwegianNynorsk" = "Norsk nynorsk";
"BrazilianPortuguese" = "Português brasileiro";
"Polish" = "Polski";
+"Portuguese" = "Português";
"Russian" = "РуÑÑкий";
"Slovak" = "Slovensky";
"Slovenian" = "SlovenÅ¡Äina";
diff --git a/UI/SOGoUI/SOGoAptFormatter.m b/UI/SOGoUI/SOGoAptFormatter.m
index dbd49401d..163606d42 100644
--- a/UI/SOGoUI/SOGoAptFormatter.m
+++ b/UI/SOGoUI/SOGoAptFormatter.m
@@ -155,14 +155,14 @@
*/
[_buf appendFormat:@"%02i:%02i",
- [_date hourOfDay],
- [_date minuteOfHour]];
+ (int)[_date hourOfDay],
+ (int)[_date minuteOfHour]];
if (_refDate && ![_date isDateOnSameDay:_refDate]) {
[_buf appendFormat:@" (%02i-%02i",
- [_date monthOfYear],
- [_date dayOfMonth]];
+ (int)[_date monthOfYear],
+ (int)[_date dayOfMonth]];
if ([_date yearOfCommonEra] != [_refDate yearOfCommonEra])
- [_buf appendFormat:@"-%04i", [_date yearOfCommonEra]];
+ [_buf appendFormat:@"-%04i", (int)[_date yearOfCommonEra]];
[_buf appendString:@")"];
}
}
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 8cc0ee7c2..306072be8 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -10,6 +10,7 @@
"Go to today" = "Go to today";
"Switch to day view" = "Switch to day view";
"Switch to week view" = "Switch to week view";
+"Switch to multi-columns day view" = "Switch to multi-columns day view";
"Switch to month view" = "Switch to month view";
"Reload all calendars" = "Reload all calendars";
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index e376c5a9a..28f77bf68 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 ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
+SchedulerUI_LANGUAGES = Arabic Basque BrazilianPortuguese Catalan ChineseTaiwan Czech Danish Dutch English Finnish French German Hungarian Icelandic Italian Macedonian NorwegianBokmal NorwegianNynorsk Polish Portuguese Russian Slovak Slovenian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh
SchedulerUI_OBJC_FILES = \
SchedulerUIProduct.m \
diff --git a/UI/Scheduler/Macedonian.lproj/Localizable.strings b/UI/Scheduler/Macedonian.lproj/Localizable.strings
new file mode 100644
index 000000000..7fd72c6c1
--- /dev/null
+++ b/UI/Scheduler/Macedonian.lproj/Localizable.strings
@@ -0,0 +1,565 @@
+/* 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" = "% 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" = "Следните 7 дена";
+"view_next14" = "Следните 14 дена";
+"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" = "Види го 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_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" = "Шема која Ñе повторува";
+"Range of recurrence" = "ОпÑег на повторување";
+
+"Repeat" = "Повтори";
+"Daily" = "Дневно";
+"Weekly" = "Ðеделно";
+"Monthly" = "МеÑечно";
+"Yearly" = "Годишно";
+"Every" = "Секоја";
+"Days" = "Денови";
+"Week(s)" = "Ðедели";
+"On" = "Ðа";
+"Month(s)" = "МеÑеци";
+/* [Event recurrence editor] Ex: _The_ first Sunday */
+"The" = "The";
+"Recur on day(s)" = "Се повторува на ден(ови)";
+"Year(s)" = "Година(ни)";
+/* [Event recurrence editor] Ex: Every first Sunday _of_ April */
+"cycle_of" = "од";
+"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 */
+"Name:" = "Име:";
+"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.";
+"weekFieldInvalid" = "ВнеÑете нумеричка вредноÑÑ‚ во полето за недели која е поголема или еднаква на 1.";
+"monthFieldInvalid" = "ВнеÑете нумеричка вредноÑÑ‚ во полето за меÑеци која е поголема или еднаква на 1.";
+"monthDayFieldInvalid" = "Обезбеди нумеричка вредноÑÑ‚ во меÑец ден поле кое е поголемо или еднакво на 1.";
+"yearFieldInvalid" = "Обезбедете конкретна нумеричка вредноÑÑ‚ во полето на години или поголем од 1.";
+"appointmentFieldInvalid" = "ВнеÑете нумеричка вредноÑÑ‚ во полето за закажувања која е поголема или еднаква на 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..." = "Претплатете Ñе на веб календар...";
+"URL of the Calendar" = "URL на календарот";
+"Web Calendar" = "Веб календар";
+"Reload on login" = "Ðаново вчитај при најавување";
+"Invalid number." = "Погрешен број.";
+"Please identify yourself to %{0}" = "Ве молам идентификувајте Ñе до %{0}";
diff --git a/UI/Scheduler/Portuguese.lproj/Localizable.strings b/UI/Scheduler/Portuguese.lproj/Localizable.strings
new file mode 100644
index 000000000..48f7c0939
--- /dev/null
+++ b/UI/Scheduler/Portuguese.lproj/Localizable.strings
@@ -0,0 +1,564 @@
+/* this file is in UTF-8 format! */
+
+/* Tooltips */
+
+"Create a new event" = "Criar um novo evento";
+"Create a new task" = "Criar uma nova tarefa";
+"Edit this event or task" = "Editar este evento ou tarefa";
+"Print the current calendar view" = "Imprimir a visualização do calendário atual";
+"Delete this event or task" = "Apagar este evento ou tarefa";
+"Go to today" = "Ir para hoje";
+"Switch to day view" = "Visualizar Dia";
+"Switch to week view" = "Visualizar Semana";
+"Switch to month view" = "Visualizar Mês";
+"Reload all calendars" = "Recarregar todos os calendários";
+
+/* Tabs */
+"Date" = "Data";
+"Calendars" = "Calendários";
+
+/* Day */
+
+"DayOfTheMonth" = "Dia do mês";
+"dayLabelFormat" = "%m/%d/%Y";
+"today" = "Hoje";
+
+"Previous Day" = "Dia Anterior";
+"Next Day" = "Próximo Dia";
+
+/* Week */
+
+"Week" = "Semana";
+"this week" = "esta semana";
+
+"Week %d" = "Semana %d";
+
+"Previous Week" = "Semana Anterior";
+"Next Week" = "Próxima Semana";
+
+/* Month */
+
+"this month" = "este mês";
+
+"Previous Month" = "Mês Anterior";
+"Next Month" = "Próximo Mês";
+
+/* Year */
+
+"this year" = "este ano";
+
+/* Menu */
+
+"Calendar" = "Calendário";
+"Contacts" = "Contatos";
+
+"New Calendar..." = "Novo Calendário...";
+"Delete Calendar" = "Apagar Calendário";
+"Unsubscribe Calendar" = "Cancelar Calendário";
+"Sharing..." = "Partilhando...";
+"Export Calendar..." = "Exportar Calendário...";
+"Import Events..." = "Importar Eventos...";
+"Import Events" = "Importar Eventos";
+"Select an iCalendar file (.ics)." = "Selecione um arquivo iCalendar (.ics).";
+"Upload" = "Carregar";
+"Uploading" = "Carregando";
+"Publish Calendar..." = "Publicar Calendário...";
+"Reload Remote Calendars" = "Recarregar Calendários Remotos";
+"Properties" = "Propriedades";
+"Done" = "Efectuado";
+"An error occurred while importing calendar." = "Um erro ocorreu na importação do calendário.";
+"No event was imported." = "Nenhum evento importado.";
+"A total of %{0} events were imported in the calendar." = "Um total de %{0} eventos foram importados no calendário.";
+
+"Compose E-Mail to All Attendees" = "Compor E-Mail para Todos os Participantes";
+"Compose E-Mail to Undecided Attendees" = "Compor E-Mail para os Participantes não confirmados";
+
+/* Folders */
+"Personal calendar" = "Calendário Pessoal";
+
+/* Misc */
+
+"OpenGroupware.org" = "OpenGroupware.org";
+"Forbidden" = "Proibido";
+
+/* acls */
+
+"Access rights to" = "Permissões de acesso para";
+"For user" = "Para utilizador";
+
+"Any Authenticated User" = "Qualquer utilizador autenticado";
+"Public Access" = "Acesso Público";
+
+"label_Public" = "Público";
+"label_Private" = "Privado";
+"label_Confidential" = "Confidencial";
+
+"label_Viewer" = "Ver Tudo";
+"label_DAndTViewer" = "Ver Data e Hora";
+"label_Modifier" = "Modificar";
+"label_Responder" = "Responder Para";
+"label_None" = "Nenhum";
+
+"View All" = "Ver Tudo";
+"View the Date & Time" = "Ver Data e Hora";
+"Modify" = "Modificar";
+"Respond To" = "Responder Para";
+"None" = "Nenhum";
+
+"This person can create objects in my calendar."
+= "Esta pessoa pode criar objetos no meu calendário.";
+"This person can erase objects from my calendar."
+= "Esta pessoa pode apagar objetos no meu calendário.";
+
+/* Button Titles */
+
+"Subscribe to a Calendar..." = "Inscrever-se num Calendário...";
+"Remove the selected Calendar" = "Remover o Calendário seleccionado";
+
+"Name of the Calendar" = "Nome deste Calendário";
+
+"new" = "Novo";
+"Print view" = "Visualização de Impressão";
+"edit" = "Editar";
+"delete" = "Apagar";
+"proposal" = "Proposta";
+"Save and Close" = "Gravar e Fechar";
+"Close" = "Fechar";
+"Invite Attendees" = "Convidar Participantes";
+"Attach" = "Adicionar atalho";
+"Update" = "Atualizar";
+"Cancel" = "Cancelar";
+"show_rejected_apts" = "Exibir compromissos rejeitados";
+"hide_rejected_apts" = "Ocultar compromissos rejeitados";
+
+
+/* Schedule */
+
+"Schedule" = "Agenda";
+"No appointments found" = "Compromissos não encontrados";
+"Meetings proposed by you" = "Reuniões propostas por si";
+"Meetings proposed to you" = "Reuniões propostas para si";
+"sched_startDateFormat" = "%d/%m %H:%M";
+"action" = "Acção";
+"accept" = "Aceitar";
+"decline" = "Rejeitar";
+"more attendees" = "Mais Participantes";
+"Hide already accepted and rejected appointments" = "Ocultar compromissos já aceites e rejeitados";
+"Show already accepted and rejected appointments" = "Exibir compromissos já aceites e rejeitados";
+
+/* Print view */
+
+"LIST" = "Lista";
+"Print Settings" = "Configurações de Impressão";
+"Title:" = "TÃtulo:";
+"Layout:" = "Disposição:";
+"What to Print" = "O que imprimir";
+"Options" = "Opções";
+"Tasks with no due date" = "Tarefas sem data de vencimento";
+"Display working hours only" = "Exibir somente o horário de trabalho";
+"Completed tasks" = "Tarefas efectuadas";
+"Display events and tasks colors" = "Exibir eventos e tarefas com cores";
+"Borders" = "Margens";
+"Backgrounds" = "Plano de fundo";
+
+/* Appointments */
+
+"Appointment viewer" = "Visualizador de Compromissos";
+"Appointment editor" = "Editor de Compromissos";
+"Appointment proposal" = "Compromisso Proposto";
+"Appointment on" = "Compromisso a";
+"Start:" = "Inicio:";
+"End:" = "Fim:";
+"Due Date:" = "Data:";
+"Title:" = "TÃtulo:";
+"Calendar:" = "Calendário:";
+"Name" = "Nome";
+"Email" = "Correio";
+"Status:" = "Estado:";
+"% complete" = "% efectuado";
+"Location:" = "Localização:";
+"Priority:" = "Prioridade:";
+"Privacy" = "Privacidade";
+"Cycle" = "Ciclo";
+"Cycle End" = "Ciclo Final";
+"Categories" = "Categorias";
+"Classification" = "Classificação";
+"Duration" = "Duração";
+"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:";
+
+
+"Target:" = "Destino:";
+
+"attributes" = "atributos";
+"attendees" = "participantes";
+"delegated from" = "delegado por";
+
+/* checkbox title */
+"is private" = "é privado";
+/* classification */
+"Public" = "Público";
+"Private" = "Privado";
+/* text used in overviews and tooltips */
+"empty title" = "TÃtulo Vazio";
+"private appointment" = "Compromisso privado";
+
+"Change..." = "Alterar...";
+
+/* Appointments (participation state) */
+
+"partStat_NEEDS-ACTION" = "Ações necessárias";
+"partStat_ACCEPTED" = "Vou participar";
+"partStat_DECLINED" = "Não vou participar";
+"partStat_TENTATIVE" = "Confirmarei depois";
+"partStat_DELEGATED" = "Delegado";
+"partStat_OTHER" = "Outro";
+
+/* Appointments (error messages) */
+
+"Conflicts found!" = "Conflitos encontrados!";
+"Invalid iCal data!" = "Dados iCal inválidos!";
+"Could not create iCal data!" = "Não foi possÃvel criar dados iCal!";
+
+/* Searching */
+
+"view_all" = "Tudo";
+"view_today" = "Hoje";
+"view_next7" = "Próximos 7 dias";
+"view_next14" = "Próximos 14 dias";
+"view_next31" = "Próximos 31 dias";
+"view_thismonth" = "Este Mês";
+"view_future" = "Todos os Eventos Futuros";
+"view_selectedday" = "Dia Selecionado";
+
+"view_not_started" = "Tarefas não iniciadas";
+"view_overdue" = "Tarefas em atraso";
+"view_incomplete" = "Tarefas incompletas";
+
+"View:" = "Vista:";
+"Title, category or location" = "TÃtulo, categoria ou localização";
+"Entire content" = "Todo o conteúdo";
+
+"Search" = "Pesquisar";
+"Search attendees" = "Pesquisar participantes";
+"Search resources" = "Pesquisar recursos";
+"Search appointments" = "Pesquisar compromissos";
+
+"All day Event" = "Evento diário";
+"check for conflicts" = "Verificar conflitos";
+
+"Browse URL" = "Abrir URL";
+
+"newAttendee" = "Adicionar participante";
+
+/* calendar modes */
+
+"Overview" = "Visão Geral";
+"Chart" = "Gráfico";
+"List" = "Lista";
+"Columns" = "Colunas";
+
+/* Priorities */
+
+"prio_0" = "Não especificado";
+"prio_1" = "Alta 3";
+"prio_2" = "Alta 2";
+"prio_3" = "Alta 1";
+"prio_4" = "Alta";
+"prio_5" = "Normal";
+"prio_6" = "Baixa";
+"prio_7" = "Baixa 1";
+"prio_8" = "Baixa 2";
+"prio_9" = "Baixa 3";
+
+/* access classes (privacy) */
+"PUBLIC_vevent" = "Evento Público";
+"CONFIDENTIAL_vevent" = "Evento Confidencial";
+"PRIVATE_vevent" = "Evento Privado";
+"PUBLIC_vtodo" = "Tarefa Pública";
+"CONFIDENTIAL_vtodo" = "Tarefa Confidencial";
+"PRIVATE_vtodo" = "Tarefa Privada";
+
+/* status type */
+"status_" = "Não especificado";
+"status_NOT-SPECIFIED" = "Não especificado";
+"status_TENTATIVE" = "Tentativa";
+"status_CONFIRMED" = "Confirmado";
+"status_CANCELLED" = "Cancelado";
+"status_NEEDS-ACTION" = "Ações Necessárias";
+"status_IN-PROCESS" = "Em Processamento";
+"status_COMPLETED" = "Completado";
+
+/* Cycles */
+
+"cycle_once" = "Uma Vez";
+"cycle_daily" = "Diariamente";
+"cycle_weekly" = "Semanalmente";
+"cycle_2weeks" = "2 semanas";
+"cycle_4weeks" = "4 semanas";
+"cycle_monthly" = "Mensalmente";
+"cycle_weekday" = "Dia da Semana";
+"cycle_yearly" = "Anualmente";
+
+"cycle_end_never" = "Sem fim";
+"cycle_end_until" = "Finalizar até";
+
+"Recurrence pattern" = "Padrão de Repetição";
+"Range of recurrence" = "Intervalo de Repetição";
+
+"Repeat" = "Repetir";
+"Daily" = "Diariamente";
+"Weekly" = "Semanalmente";
+"Monthly" = "Mensalmente";
+"Yearly" = "Anualmente";
+"Every" = "A cada";
+"Days" = "Dias";
+"Week(s)" = "Semana(s)";
+"On" = "Em";
+"Month(s)" = "Mês(es)";
+"The" = "O/A";
+"Recur on day(s)" = "Retorne em dia(s)";
+"Year(s)" = "Ano(s)";
+"cycle_of" = "de";
+"No end date" = "Sem data final";
+"Create" = "Criar";
+"appointment(s)" = "compromissos(s)";
+"Repeat until" = "Repetir até";
+
+"First" = "Primeiro";
+"Second" = "Segundo";
+"Third" = "Terceiro";
+"Fourth" = "Quarto";
+"Fift" = "Quinto";
+"Last" = "Último";
+
+/* Appointment categories */
+
+"category_none" = "Nenhum";
+"category_labels" = "Aniversário,Negócios,Ligações,Concorrência,Cliente,Favoritos,Acompanhamento,Presentes,Feriados,Idéias,Problemas,Miscelânea,Meeting,Pessoal,Projetos,Feriado público,Posição,Fornecedores,Viagem,Férias";
+
+"repeat_NEVER" = "Sem repetição";
+"repeat_DAILY" = "Diariamente";
+"repeat_WEEKLY" = "Semanalmente";
+"repeat_BI-WEEKLY" = "Bi-semanal";
+"repeat_EVERY WEEKDAY" = "Cada dia útil";
+"repeat_MONTHLY" = "Mensalmente";
+"repeat_YEARLY" = "Anualmente";
+"repeat_CUSTOM" = "Personalizar...";
+
+"reminder_NONE" = "Não lembrar";
+"reminder_5_MINUTES_BEFORE" = "5 minutos antes";
+"reminder_10_MINUTES_BEFORE" = "10 minutos antes";
+"reminder_15_MINUTES_BEFORE" = "15 minutos antes";
+"reminder_30_MINUTES_BEFORE" = "30 minutos antes";
+"reminder_45_MINUTES_BEFORE" = "45 minutos antes";
+"reminder_1_HOUR_BEFORE" = "1 hora antes";
+"reminder_2_HOURS_BEFORE" = "2 horas antes";
+"reminder_5_HOURS_BEFORE" = "5 horas antes";
+"reminder_15_HOURS_BEFORE" = "15 horas antes";
+"reminder_1_DAY_BEFORE" = "1 dia antes";
+"reminder_2_DAYS_BEFORE" = "2 dias antes";
+"reminder_1_WEEK_BEFORE" = "1 semana antes";
+"reminder_CUSTOM" = "Personalizar...";
+
+"reminder_MINUTES" = "minutos";
+"reminder_HOURS" = "horas";
+"reminder_DAYS" = "dias";
+"reminder_BEFORE" = "antes";
+"reminder_AFTER" = "depois";
+"reminder_START" = "inicio do evento";
+"reminder_END" = "fim do evento";
+"Reminder Details" = "Detalhes do Lembrete";
+
+"Choose a Reminder Action" = "Escolha uma ação";
+"Show an Alert" = "Exibir um Alerta";
+"Send an E-mail" = "Enviar um E-mail";
+"Email Organizer" = "Organizador de Email";
+"Email Attendees" = "Email Participantes";
+
+"zoom_400" = "400%";
+"zoom_200" = "200%";
+"zoom_100" = "100%";
+"zoom_50" = "50%";
+"zoom_25" = "25%";
+
+/* transparency */
+
+"Show Time as Free" = "Exibir Hora como Livre";
+
+/* email notifications */
+"Send Appointment Notifications" = "Enviar Notificações de Apontamento";
+
+/* validation errors */
+
+validate_notitle = "Nenhum tÃtulo informado, continue?";
+validate_invalid_startdate = "Campo Data Inicial incorreto!";
+validate_invalid_enddate = "Campo Data Final incorreto!";
+validate_endbeforestart = "A data que informou ocorre antes da data inicial.";
+
+"Events" = "Eventos";
+"Tasks" = "Tarefas";
+"Show completed tasks" = "Exibir tarefas efectuadas";
+
+/* tabs */
+"Task" = "Tarefa";
+"Event" = "Evento";
+"Recurrence" = "Recorrencia";
+
+/* toolbar */
+"New Event" = "Novo Evento";
+"New Task" = "Nova Tarefa";
+"Edit" = "Editar";
+"Delete" = "Apagar";
+"Go to Today" = "Ir para Hoje";
+"Day View" = "Visualizar Dia";
+"Week View" = "Visualizar Semana";
+"Month View" = "Visualizar Mês";
+"Reload" = "Recarregar";
+
+"eventPartStatModificationError" = "O seu estado de participação não pode ser modificado.";
+
+/* menu */
+"New Event..." = "Novo Evento...";
+"New Task..." = "Nova Tarefa...";
+"Edit Selected Event..." = "Editar o Evento Selecionado...";
+"Delete Selected Event" = "Apagar o Evento Selecionado";
+"Select All" = "Selecionar Tudo";
+"Workweek days only" = "Apenas semanas úteis";
+"Tasks in View" = "Tarefas na vista";
+
+"eventDeleteConfirmation" = "O(s) seguinte(s) evento(s) será(ão) apagado(s):";
+"taskDeleteConfirmation" = "Apagar permanentemente esta tarefa.";
+"Would you like to continue?" = "Pretende continuar?";
+
+"You cannot remove nor unsubscribe from your personal calendar."
+= "Você não pode remover nem retirar-se do seu calendário pessoal.";
+"Are you sure you want to delete the calendar \"%{0}\"?"
+= "Você tem certeza que quer apagar o calendário \"%{0}\"?";
+
+/* Legend */
+"Participant" = "Participante";
+"Optional Participant" = "Participante Opcional";
+"Non Participant" = "Não Participante";
+"Chair" = "Cadeira";
+
+"Needs action" = "Ações necessárias";
+"Accepted" = "Aceite";
+"Declined" = "Rejeitado";
+"Tentative" = "Tentativa";
+
+"Free" = "Livre";
+"Busy" = "Ocupado";
+"Maybe busy" = "Talvez ocupado";
+"No free-busy information" = "Sem informação Livre/Ocupado";
+
+/* FreeBusy panel buttons and labels */
+"Suggest time slot:" = "Sugerir espaço de tempo:";
+"Zoom:" = "Zoom:";
+"Previous slot" = "Espaço anterior";
+"Next slot" = "Próximo espaço";
+"Previous hour" = "Hora anterior";
+"Next hour" = "Próxima hora";
+"Work days only" = "Somente dias de trabalho";
+"The whole day" = "O dia inteiro";
+"Between" = "Entre";
+"and" = "e";
+
+"A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
+= "Existe um conflito de tempo com um ou mais participantes.\nGostaria de manter as configurações atuais?";
+
+/* apt list */
+"Title" = "TÃtulo";
+"Start" = "InÃcio";
+"End" = "Fim";
+"Due Date" = "Data de Vencimento";
+"Location" = "Localização";
+
+"(Private Event)" = "(Evento Privado)";
+
+vevent_class0 = "(Evento Público)";
+vevent_class1 = "(Evento Privado)";
+vevent_class2 = "(Evento Confidencial)";
+
+"Priority" = "Prioridade";
+"Category" = "Categoria";
+
+vtodo_class0 = "(Tarefa Pública)";
+vtodo_class1 = "(Tarefa Privada)";
+vtodo_class2 = "(Tarefa Confidencial)";
+
+"closeThisWindowMessage" = "Obrigado! Agora já pode fechar esta janela ou visualização ";
+"Multicolumn Day View" = "Visão Diária Multicolunas";
+
+"Please select an event or a task." = "Por favor, selecione um evento ou tarefa.";
+
+"editRepeatingItem" = "O item que está editando é um item repetitivo. Você quer editar todas as ocorrências deste ou somente este?";
+"button_thisOccurrenceOnly" = "Somente esta ocorrência";
+"button_allOccurrences" = "Todas as ocorrências";
+
+/* Properties dialog */
+"Name:" = "Nome:";
+"Color:" = "Cor:";
+
+"Include in free-busy" = "Incluir na disponibilidade";
+
+"Synchronization" = "Sincronização";
+"Synchronize" = "Sincronizar";
+"Tag:" = "Marca:";
+
+"Display" = "Exibir";
+"Show alarms" = "Exibir alarmes";
+"Show tasks" = "Exibir tarefas";
+
+"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:";
+
+"Links to this Calendar" = "Links para este Calendário";
+"Authenticated User Access" = "Acesso a Utilizador Autenticado";
+"CalDAV URL" = "CalDAV URL:";
+"WebDAV ICS URL" = "WebDAV ICS URL";
+"WebDAV XML URL" = "WebDAV XML URL";
+
+/* Error messages */
+"dayFieldInvalid" = "Por favor, especifique um valor numérico no campo Dias, maior ou igual a 1.";
+"weekFieldInvalid" = "Por favor, especifique um valor numérico no campo Semana(s), maior ou igual a 1.";
+"monthFieldInvalid" = "Por favor, especifique um valor numérico no campo Mes(es), maior ou igual a 1.";
+"monthDayFieldInvalid" = "Por favor, especifique um valor numéricio no campo Dia do Mes, maior ou igual a 1.";
+"yearFieldInvalid" = "Por favor, especifique um valor numéricio no campo Ano(s), maior ou igual a 1.";
+"appointmentFieldInvalid" = "Por favor, especifique um valor numéricio no campo Apontamento(s) maior ou igual a 1.";
+"recurrenceUnsupported" = "Este tipo de recorrência não é suportado.";
+"Please specify a calendar name." = "Por favor, especifique um nome de calendário.";
+"tagNotDefined" = "Você deve especificar um dispositivo se deseja sincronizar este calendário.";
+"tagAlreadyExists" = "Este dispositivo especificado já está associado a outro calendário.";
+"tagHasChanged" = "Se você trocar o dispositivo deste calendário, será necessário sincronizar novamente seus dados no dispositivo móvel.\nContinuar?";
+"tagWasAdded" = "Se você quisar sincronizar este calendário, será necessário sincronizar novamente seus dados no dispositivo móvel.\nContinuar?";
+"tagWasRemoved" = "Se você remover este calendário da sincronização, será necessário sincronizar novamente seus dados no dispositivo móvel.\nContinuar?";
+"DestinationCalendarError" = "Os calendários de origem e destino são os mesmos. Por favor, tente copiar para outro calendário diferente.";
+"EventCopyError" = "A cópia falhou. Por favor, tente copiar para um calendário diferente.";
+"Please select at least one calendar" = "Por favor, selecione pelo menos um calendário";
+
+
+"Open Task..." = "Abrir Tarefa...";
+"Mark Completed" = "Marcar como ConcluÃda";
+"Delete Task" = "Remover Tarefa";
+"Delete Event" = "Remover Evento";
+"Copy event to my calendar" = "Copiar evento para o meu calendário";
+"View Raw Source" = "Visualizar Fonte";
+
+"Subscribe to a web calendar..." = "Inscrever-se num calendário web...";
+"URL of the Calendar" = "URL do Calendário";
+"Web Calendar" = "Calendário Web";
+"Reload on login" = "Recarregar no login";
+"Invalid number." = "Número inválido.";
+"Please identify yourself to %{0}" = "Por favor, identifique-se para %{0}";
diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m
index 2b2559fe3..a9bb518f3 100644
--- a/UI/Scheduler/UIxCalDateSelector.m
+++ b/UI/Scheduler/UIxCalDateSelector.m
@@ -117,7 +117,7 @@
date = [self startDate];
- return [NSString stringWithFormat: @"%.2d", [date monthOfYear]];
+ return [NSString stringWithFormat: @"%.2d", (int)[date monthOfYear]];
}
- (NSString *) headerMonthString
@@ -136,7 +136,7 @@
date = [self startDate];
- return [NSString stringWithFormat: @"%d", [date yearOfCommonEra]];
+ return [NSString stringWithFormat: @"%d", (int)[date yearOfCommonEra]];
}
- (NSString *) localizedDayOfWeekName
diff --git a/UI/Scheduler/UIxCalDayTable.h b/UI/Scheduler/UIxCalDayTable.h
index 57d91e846..ceaed3b56 100644
--- a/UI/Scheduler/UIxCalDayTable.h
+++ b/UI/Scheduler/UIxCalDayTable.h
@@ -39,7 +39,8 @@
NSArray *weekDays;
NSString *currentView, *timeFormat, *currentTableHour;
NSCalendarDate *startDate, *currentTableDay;
- NSMutableArray *daysToDisplay, *calendarsToDisplay, *currentCalendar, *hoursToDisplay;
+ NSMutableArray *daysToDisplay, *calendarsToDisplay, *hoursToDisplay;
+ NSMutableDictionary *currentCalendar;
unsigned int numberOfDays;
}
@@ -55,7 +56,7 @@
- (NSArray *) calendarsToDisplay;
- (void) setCurrentTableDay: (NSCalendarDate *) aTableDay;
- (NSCalendarDate *) currentTableDay;
-- (NSMutableArray *) currentCalendar;
+- (NSMutableDictionary *) currentCalendar;
@end
diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 7cfde1b1f..bea4ad518 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -37,6 +37,9 @@
#import
#import
+#import
+#import
+
#import "UIxCalDayTable.h"
@class SOGoAppointment;
@@ -191,7 +194,7 @@
NSMutableDictionary *calendar;
unsigned int count, foldersCount;
NSString *folderName, *fDisplayName;
- BOOL *isActive;
+ BOOL isActive;
co = [self clientObject];
folders = [co subFolders];
@@ -200,8 +203,8 @@
for (count = 0; count < foldersCount; count++)
{
folder = [folders objectAtIndex: count];
- isActive = [NSNumber numberWithBool: [folder isActive]];
- if ([isActive intValue] != 0) {
+ isActive = [folder isActive];
+ if (isActive != NO) {
calendar = [NSMutableDictionary dictionary];
folderName = [folder nameInContainer];
fDisplayName = [folder displayName];
@@ -214,7 +217,7 @@
[calendar setObject: fDisplayName forKey: @"displayName"];
[calendar setObject: folderName forKey: @"folder"];
[calendar setObject: [folder calendarColor] forKey: @"color"];
- [calendar setObject: isActive forKey: @"active"];
+ [calendar setObject: [NSNumber numberWithBool:isActive] forKey: @"active"];
[calendar setObject: [folder ownerInContext: context]
forKey: @"owner"];
[calendarsToDisplay addObject: calendar];
@@ -235,12 +238,12 @@
return currentTableDay;
}
-- (void) setCurrentCalendar: (NSMutableArray *) aCalendar
+- (void) setCurrentCalendar: (NSMutableDictionary *) aCalendar
{
ASSIGN(currentCalendar, aCalendar);
}
-- (NSMutableArray *) currentCalendar
+- (NSMutableDictionary *) currentCalendar
{
return currentCalendar;
}
diff --git a/UI/Scheduler/UIxCalDayView.m b/UI/Scheduler/UIxCalDayView.m
index 8dca83462..8f2644370 100644
--- a/UI/Scheduler/UIxCalDayView.m
+++ b/UI/Scheduler/UIxCalDayView.m
@@ -164,7 +164,7 @@
date = [self selectedDate];
hmString = [NSString stringWithFormat:@"%.2d%.2d",
- [date hourOfDay], [date minuteOfHour]];
+ (int)[date hourOfDay], (int)[date minuteOfHour]];
qp = [[self queryParameters] mutableCopy];
[self setSelectedDateQueryParameter:date inDictionary:qp];
[qp setObject: hmString forKey:@"hm"];
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index bb94e7c4f..87f1e6168 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -316,7 +316,7 @@ static NSArray *tasksFields = nil;
NSString *owner, *role, *calendarName, *filters, *iCalString;
NSRange match;
iCalCalendar *calendar;
- iCalObject *master;
+ iCalEntityObject *master;
SOGoAppointmentFolder *currentFolder;
SOGoAppointmentFolders *clientObject;
SOGoUser *ownerUser;
@@ -350,7 +350,7 @@ static NSArray *tasksFields = nil;
else if ([criteria isEqualToString:@"entireContent"])
{
// First search : Through the quick table inside the location, category and title columns
- quickInfos = [currentFolder fetchCoreInfosFrom: startDate
+ quickInfos = (NSMutableArray *)[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: value
component: component
@@ -366,7 +366,7 @@ static NSArray *tasksFields = nil;
}
// Second research : Every objects except for those already in the quickInfos array
- allInfos = [currentFolder fetchCoreInfosFrom: startDate
+ allInfos = (NSMutableArray *)[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: nil
component: component];
@@ -383,7 +383,7 @@ static NSArray *tasksFields = nil;
{
iCalString = [[allInfos objectAtIndex:i] objectForKey:@"c_content"];
calendar = [iCalCalendar parseSingleFromSource: iCalString];
- master = [calendar firstChildWithTag:component];
+ master = (iCalEntityObject *)[calendar firstChildWithTag:component];
if (master) {
if ([[master comment] length] > 0)
{
@@ -1089,7 +1089,7 @@ _computeBlocksPosition (NSArray *blocks)
if ([currentView isEqualToString: @"multicolumndayview"])
{
- calendars = [self _selectedCalendars];
+ calendars = (NSMutableArray *)[self _selectedCalendars];
eventsByCalendars = [NSMutableArray arrayWithCapacity:[calendars count]];
for (i = 0; i < [calendars count]; i++) // For each calendar
{
diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m
index c0c51097f..be35a5b75 100644
--- a/UI/Scheduler/UIxCalMonthView.m
+++ b/UI/Scheduler/UIxCalMonthView.m
@@ -299,7 +299,7 @@
[classes appendFormat: @"day weekOf%d week%dof%d day%d",
numberOfWeeks,
- [weeksToDisplay indexOfObject: currentWeek],
+ (int)[weeksToDisplay indexOfObject: currentWeek],
numberOfWeeks, dayOfWeek];
if (realDayOfWeek == 0 || realDayOfWeek == 6)
[classes appendString: @" weekEndDay"];
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index 813e2e2ad..c49fd8a18 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -49,6 +49,7 @@ static NSArray *layoutItems = nil;
- (void) dealloc
{
[item release];
+ [super dealloc];
}
- (void) setItem: (NSString *) newItem
@@ -68,7 +69,7 @@ static NSArray *layoutItems = nil;
- (NSString *) itemPrintLayoutText
{
- return [self labelForKey: [NSString stringWithFormat: item]];
+ return [self labelForKey: [NSString stringWithFormat: @"%@", item]];
}
//
diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m
index 46c2c8048..771bf8a37 100644
--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/UI/Scheduler/UIxCalendarProperties.m
@@ -91,6 +91,9 @@
- (BOOL) synchronizeCalendar
{
+ if ([self isWebCalendar])
+ return NO;
+
return [self mustSynchronize] || [calendar synchronize];
}
@@ -101,7 +104,7 @@
- (BOOL) mustSynchronize
{
- return [[calendar nameInContainer] isEqualToString: @"personal"];
+ return ([[calendar nameInContainer] isEqualToString: @"personal"] || [self isWebCalendar]);
}
- (BOOL) showCalendarAlarms
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index a7581e57c..531daa076 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -2472,7 +2472,7 @@ RANGE(2);
content = [NSMutableString string];
response = [context response];
- [content appendFormat: [[self clientObject] contentAsString]];
+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
[response setHeader: @"text/plain; charset=utf-8"
forKey: @"content-type"];
[response appendContentString: content];
diff --git a/UI/Scheduler/UIxRecurrenceEditor.m b/UI/Scheduler/UIxRecurrenceEditor.m
index d4449b40a..45f3d7324 100644
--- a/UI/Scheduler/UIxRecurrenceEditor.m
+++ b/UI/Scheduler/UIxRecurrenceEditor.m
@@ -148,7 +148,7 @@
[shortWeekDaysList retain];
}
- id = [NSString stringWithFormat: @"weekDay%i", [shortWeekDaysList indexOfObject: item]];
+ id = [NSString stringWithFormat: @"weekDay%i", (int)[shortWeekDaysList indexOfObject: item]];
return id;
}
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 893b94ddd..06b4e759f 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -57,7 +57,7 @@