Revision: 1714
http://mrbs.svn.sourceforge.net/mrbs/?rev=1714&view=rev
Author: cimorrison
Date: 2010-12-17 16:29:30 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/ics_attachments/web/lang.pt
Property Changed:
----------------
mrbs/branches/ics_attachments/
mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/ics_attachments
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1711
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1652-1713
Modified: mrbs/branches/ics_attachments/web/lang.pt
===================================================================
--- mrbs/branches/ics_attachments/web/lang.pt 2010-12-17 16:24:19 UTC (rev
1713)
+++ mrbs/branches/ics_attachments/web/lang.pt 2010-12-17 16:29:30 UTC (rev
1714)
@@ -85,7 +85,7 @@
$vocab["rep_type_2"] = "Semanalmente";
$vocab["rep_type_3"] = "Mensalmente";
$vocab["rep_type_4"] = "Anualmente";
-$vocab["rep_type_5"] = "Mensalmente, no dia correspoondente";
+$vocab["rep_type_5"] = "Mensalmente, no dia correspondente";
$vocab["rep_type_6"] = "n-semanalmente";
$vocab["rep_end_date"] = "Repetir Termo";
$vocab["rep_rep_day"] = "Repetir Dia";
@@ -96,14 +96,16 @@
$vocab["ctrl_click"] = "Carregue Control-Click para seleccionar mais
de uma sala";
$vocab["entryid"] = "ID de entrada";
$vocab["repeat_id"] = "Repetir ID ";
-$vocab["you_have_not_entered"] = "N\xE3o introduziu uma";
+$vocab["you_have_not_entered"] = "N\xE3o introduziu um";
$vocab["you_have_not_selected"] = "Ainda n\xE3o seleccionou a";
-$vocab["valid_room"] = "room.";
+$vocab["valid_room"] = "sala.";
$vocab["brief_description"] = "Descri\xE7\xE3o breve.";
$vocab["useful_n-weekly_value"] = "valor n-semanal vi\xE1vel.";
$vocab["status"] = "Estado";
$vocab["private"] = "Privado";
$vocab["unavailable"] = "N\xE3o dispon\xEDvel";
+$vocab["is_mandatory_field"] = "\xE9 de preenchimento obrigat\xF3rio.";
+$vocab["missing_mandatory_field"] = "Este campo \xE9 de preenchimento
obrigat\xF3rio";
$vocab["confirmed"] = "Confirmado";
// Used in view_entry.php
@@ -112,11 +114,11 @@
$vocab["createdby"] = "Marcado por";
$vocab["lastupdate"] = "\xDAltima Actualiza\xE7\xE3o";
$vocab["deleteentry"] = "Apagar entrada";
-$vocab["deleteseries"] = "Apagar Series";
+$vocab["deleteseries"] = "Apagar s\xE9ries";
$vocab["confirmdel"] = "Tem a certeza\\nque quer\\napagar esta
entrada?\\n\\n";
-$vocab["returnprev"] = "Voltar \xE0 P\xE1gina anterior";
+$vocab["returnprev"] = "Voltar \xE0 p\xE1gina anterior";
$vocab["invalid_entry_id"] = "Id inv\xE1lido.";
-$vocab["invalid_series_id"] = "Invalid series id.";
+$vocab["invalid_series_id"] = "ID da s\xE9rie inv\xE1lido.";
$vocab["confirmation_status"]= "Estado da reserva";
$vocab["tentative"] = "N\xE3o reservado";
$vocab["approval_status"] = "Estado da reserva";
@@ -181,8 +183,8 @@
$vocab["users.level"] = "Direitos";
$vocab["unknown_user"] = "Utilizador n\xE3o identificado";
$vocab["you_are"] = "";
-$vocab["login"] = "Log in";
-$vocab["logoff"] = "Log Off";
+$vocab["login"] = "Aceder";
+$vocab["logoff"] = "Sair";
// Database upgrade code
$vocab["database_login"] = "Login na base de dados";
@@ -220,10 +222,10 @@
$vocab["user"] = "Utilizador";
$vocab["administrator"] = "Administrador";
$vocab["unknown"] = "N\xE3o identificado";
-$vocab["ok"] = "OK";
+$vocab["ok"] = "Ok";
$vocab["show_my_entries"] = "Prima para mostrar todas as entradas";
$vocab["no_users_initial"] = "N\xE3o existem utilizadores na base de dados,
permitir a cria\xE7\xE3o";
-$vocab["no_users_create_first_admin"] = "Create a user configured as an
administrator and then you can log in and create more users.";
+$vocab["no_users_create_first_admin"] = "Crie um utilizador com direitos de
administra\xE7\xE3o depois efectue o log in e crie mais utilizadores.";
$vocab["warning_last_admin"] = "Aten\xE7\xE3o! \xDAltimo administrador, n\xE3o
pode eliminar ou remover direitos, caso contr\xE1rio perde o acesso ao
sistema.";
// Used in search.php
@@ -248,7 +250,7 @@
$vocab["report_end"] = "Data termo";
$vocab["match_area"] = "\xC1rea";
$vocab["match_room"] = "Sala";
-$vocab["match_type"] = "Match type";
+$vocab["match_type"] = "Tipo";
$vocab["ctrl_click_type"] = "Utilize Control-Click para escolher mais de um
tipo";
$vocab["match_entry"] = "Breve Descri\xE7\xE3o";
$vocab["match_descr"] = "Descri\xE7\xE3o completa";
@@ -275,7 +277,7 @@
$vocab["rep_dsp_end"] = "Termo";
$vocab["fulldescription_short"] = "Descri\xE7\xE3o";
$vocab["both"] = "Todos";
-$vocab["privacy_status"] = "Privacy status";
+$vocab["privacy_status"] = "Estado da privacidade";
$vocab["search_criteria"] = "Crit\xE9rio de pesquisa";
$vocab["presentation_options"] = "op\xE7\xF5es de apresenta\xE7\xE3o";
@@ -301,11 +303,11 @@
$vocab["addarea"] = "Acrescentar \xC1rea";
$vocab["name"] = "Nome";
$vocab["noarea"] = "\xC1rea n\xE3o selecionada";
-$vocab["browserlang"] = "O seu browser est\xE1 preparado para use";
+$vocab["browserlang"] = "O seu browser est\xE1 preparado para usar";
$vocab["addroom"] = "Acrescentar Sala";
$vocab["capacity"] = "Capacidade";
$vocab["norooms"] = "N\xE3o h\xE1 salas.";
-$vocab["administration"] = "Administration";
+$vocab["administration"] = "Administra\xE7\xE3o";
$vocab["invalid_area_name"] = "O nome desta \xE1rea j\xE1 est\xE1 em uso!";
$vocab["empty_name"] = "Por favor introduza um nome!";
@@ -335,25 +337,25 @@
$vocab["general_settings"] = "Geral";
$vocab["time_settings"] = "Tempo do Slot";
$vocab["confirmation_settings"] = "Confirma\xE7\xE3o";
-$vocab["allow_confirmation"] = "Allow tentative bookings";
-$vocab["default_settings_conf"] = "Default settings";
+$vocab["allow_confirmation"] = "Permitir a confirma\xE7\xE3o de reservas";
+$vocab["default_settings_conf"] = "Defini\xE7\xF5es por omiss\xE3o";
$vocab["default_confirmed"] = "Confirmado";
$vocab["default_tentative"] = "N\xE3o confirmado";
$vocab["approval_settings"] = "Aprova\xE7\xE3o";
$vocab["enable_approval"] = "Requerer aprova\xE7\xE3o de reservas";
-$vocab["enable_reminders"] = "Allow users to remind admins";
+$vocab["enable_reminders"] = "Permitir os ulizadores de relembrarem o
admin";
$vocab["private_settings"] = "Reservas privadas";
$vocab["allow_private"] = "Permitir reservads privadas";
$vocab["force_private"] = "For\xE7ar reservas privadas";
-$vocab["default_settings"] = "Default/forced settings";
+$vocab["default_settings"] = "Defini\xE7\xF5es por
omiss\xE3o/for\xE7adas";
$vocab["default_private"] = "Privado";
$vocab["default_public"] = "P\xFAblico";
$vocab["private_display"] = "Reservas privadas (mostrar)";
$vocab["private_display_label"] = "Como as reservas privadas devem ser
mostradas?";
-$vocab["private_display_caution"] = "CAUTION: think carefully about the
privacy implications before changing these settings!";
+$vocab["private_display_caution"] = "ATEN\xC7\xC3O: Pense bem acerca das
implica\xE7\xF5es na privacidade antes de alterar estes param\xEAtros!";
$vocab["treat_respect"] = "Respeite o caracter privado da reserva";
-$vocab["treat_private"] = "Treat all bookings as private, ignoring
their privacy settings";
-$vocab["treat_public"] = "Treat all bookings as public, ignoring
their privacy settings";
+$vocab["treat_private"] = "Tratar todas as reservadas como privadas,
ignorando os param\xEAtros de privacidade";
+$vocab["treat_public"] = "Tratar todas as reservadas como
p\xFAblicas, ignorando os param\xEAtros de privacidade";
$vocab["sort_key"] = "Chave de classifica\xE7\xE3o";
$vocab["sort_key_note"] = "Esta chave \xE9 utilizada para ordenar as
salas";
$vocab["booking_policies"] = "Regras para reservas";
@@ -361,6 +363,11 @@
$vocab["max_book_ahead"] = "Reservas avan\xE7adas - m\xE1ximo";
$vocab["custom_html"] = "HTML personalizado";
$vocab["custom_html_note"] = "Este campo pode ser utilizado para
inserir HTML personalizado, por exemplo um mapa do Google embutido";
+$vocab["email_list_note"] = "Introduza uma lista de endere\xE7os de
email separados por v\xEDrgulas ou por uma nova linha";
+$vocab["mode"] = "Modo";
+$vocab["mode_periods"] = "Per\xEDodos";
+$vocab["mode_times"] = "Tempo";
+$vocab["times_only"] = "Apenas tempo";
// Used in edit_users.php
$vocab["name_empty"] = "Insira um nome.";
Property changes on: mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1711
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1652-1713
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
