OpenMRS

.classpath

@@ -5 +5 @@
-        <classpathentry kind="src" path="src/web"/>
-        <classpathentry kind="src" path="test/api"/>
-        <classpathentry kind="src" path="test/web"/>
-        <classpathentry kind="lib" path="lib/ant-contrib/ant-contrib-1.0b2.jar"/>
-        <classpathentry kind="lib" path="lib/antlr/antlr_2.7.6.jar"/>
-        <classpathentry kind="lib" path="lib/cglib/cglib-2.1_3.jar"/>
-        <classpathentry kind="lib" path="lib/commons-beanutils/commons-beanutils-1.7.0.jar"/>
@@ -57 +56 @@
-        <classpathentry kind="lib" path="metadata/api/spring"/>
-        <classpathentry kind="lib" path="metadata/api/hibernate"/>
-        <classpathentry kind="lib" path="metadata/api/log4j"/>
+        <classpathentry kind="lib" path="lib/ant-contrib/ant-contrib-1.0b2.jar"/>
-        <classpathentry kind="output" path="build/"/>
-</classpath>

src/api/org/openmrs/util/OpenmrsConstants.java

@@ -532 +532 @@
-        public static final String USER_PROPERTY_NOTIFICATION                   = "notification";
-        public static final String USER_PROPERTY_NOTIFICATION_ADDRESS   = "notificationAddress";
-        public static final String USER_PROPERTY_NOTIFICATION_FORMAT    = "notificationFormat";         // text/plain, text/html
+
+        /**
+         * A user property name. The value should be a comma-separated ordered 
+         * list of fully qualified locales within which the user is a proficient 
+         * speaker. The list should be ordered from the most to the least proficiency.
+         * 
+         * Example:
+         * <code>proficientLocales = en_US, en_GB, en, fr_RW</code>
+         */
+        public static final String USER_PROPERTY_PROFICIENT_LOCALES                     = "proficientLocales";
-        
-        /*
-         * Report object properties

src/api/org/openmrs/util/LocaleFactory.java

@@ +1 @@
+package org.openmrs.util;
+
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Vector;
+
+/**
+ * A factory for creating Locales.
+ * 
+ * @author <a href="mailto:akollegger@tembopublic.org">Andreas Kollegger</a>
+ */
+public class LocaleFactory {
+
+        /**
+         * Default internal locale.
+         * 
+         * ABKTODO: this should be defined/configured somewhere else
+         */
+        public static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
+        
+        /**
+         * Creates a locale based on a string specification. The specification
+         * must be conform with the following format: ll_CC_vv
+         * 
+         * Where:
+         *      ll two-character lowercase ISO-639 language code
+         *  CC two-character uppercase ISO-3166 country code optional
+         *  vv arbitrary length variant code
+         * 
+         * For example:
+         *      en_US_Traditional_WIN
+         * ...represents English language in the United States with the traditional collation for windows.
+         * 
+         * @param localeSpecification encoded locale specification
+         * @return the representative Locale, or null if the specification is invalid
+         */
+        public static Locale fromSpecification(String localeSpecification)
+        {
+                Locale createdLocale = null;
+                
+                localeSpecification = localeSpecification.trim();
+                
+                String[] localeComponents = localeSpecification.split("_");
+                if (localeComponents.length == 1)
+                {
+                        createdLocale = new Locale(localeComponents[0]);
+                }
+                else if (localeComponents.length == 2)
+                {
+                        createdLocale = new Locale(localeComponents[0], localeComponents[1]);
+                }
+                else if (localeComponents.length > 2)
+                {
+                        String variant = localeSpecification.substring(localeSpecification.indexOf(localeComponents[2]));
+                        createdLocale = new Locale(localeComponents[0], localeComponents[1], variant);
+                }
+                
+                return createdLocale;
+        }
+}

src/api/org/openmrs/User.java

@@ -13 +13 @@
- */
-package org.openmrs;
-
+import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.openmrs.util.LocaleFactory;
-import org.openmrs.util.OpenmrsConstants;
-
-/**
@@ -548 +552 @@
-        public String getLastName() {
-                return getFamilyName();
-        }
+
+        /**
+         * Returns a list of Locales for which the User 
+         * is considered proficient.
+     * 
+     * @return List of the User's proficient locales
+     */
+    public List<Locale> getProficientLocales() {
+        List<Locale> proficientLocales = new ArrayList<Locale>();
+                String proficientLocalesValue = getUserProperty(OpenmrsConstants.USER_PROPERTY_PROFICIENT_LOCALES);
+                
+                String[] proficientLocalesArray = proficientLocalesValue.split(",");
+                for (String proficientLocaleSpec : proficientLocalesArray) {
+                        if (proficientLocaleSpec.length() > 0) {
+                                proficientLocales.add(LocaleFactory.fromSpecification(proficientLocaleSpec));
+                        }
+                }
+        return proficientLocales;
+    }
-}

src/api/org/openmrs/api/db/ConceptDAO.java

@@ -212 +212 @@
-        /**
-         * Searches on given phrase via the concept word table
-         * @param phrase/search/words String
- Locale
+s Locales to include in search
-         * @param includeRetired boolean
-         * @param requireClasses List<ConceptClass>
-         * @param excludeClasses List<ConceptClass>
@@ -220 +220 @@
-         * @param excludeDatatypes List<ConceptDatatype>
-         * @return
-         */
-ocale locale
+ist<Locale> locales
-                        List<ConceptClass> requireClasses, List<ConceptClass> excludeClasses,
-                        List<ConceptDatatype> requireDatatypes, List<ConceptDatatype> excludeDatatypes);
-        

src/api/org/openmrs/api/db/hibernate/HibernateConceptDAO.java

@@ -499 +499 @@
-        }
-
-        // TODO below are functions worthy of a second tier
-
+
-        /**
-         * @see org.openmrs.api.db.ConceptService#findConcepts(java.lang.String,java.util.Locale,boolean)
-         */
-        @SuppressWarnings("unchecked")
-ocale loc
+ist<Locale> locales
-                        List<ConceptClass> requireClasses, List<ConceptClass> excludeClasses,
-                        List<ConceptDatatype> requireDatatypes, List<ConceptDatatype> excludeDatatypes) 
-                        {
-String locale = loc.getLanguage().substring(0, 2);             //only get language portion of locale
+
-                List<String> words = ConceptWord.getUniqueWords(phrase); //assumes getUniqueWords() removes quote(') characters.  (otherwise we would have a security leak)
-                
-                List<ConceptWord> conceptWords = new Vector<ConceptWord>();
-                
-                if (words.size() > 0) {
-
+       
-                        Criteria searchCriteria = sessionFactory.getCurrentSession().createCriteria(ConceptWord.class, "cw1");
-
+
+
-                        if (includeRetired == false) {
-                                searchCriteria.createAlias("concept", "concept");
-                                searchCriteria.add(Expression.eq("concept.retired", false));
@@ -531 +532 @@
-                                                        .setProjection(Property.forName("concept"))
-                                                        .add(Expression.eqProperty("concept", "cw1.concept"))
-                                                        .add(Restrictions.like("word", w, MatchMode.START))
-Restrictions.eq("locale", locale
+Expression.in("locale", locales
-                                junction.add(Subqueries.exists(crit));
-                        }
-                        searchCriteria.add(junction);
@@ -560 +561 @@
-                
-                return conceptWords;
-        }
+
-        
-        /**
-         * @see org.openmrs.api.db.ConceptService#findConcepts(java.lang.String,java.util.Locale,org.openmrs.Concept,boolean)

src/api/org/openmrs/api/ConceptService.java

@@ -350 +350 @@
-                        List<ConceptClass> requireClasses, List<ConceptClass> excludeClasses,
-                        List<ConceptDatatype> requireDatatypes,List<ConceptDatatype> excludeDatatypes);
-
+
-        /**
+         * Searches on given phrase via the concept word table within a sorted list of Locales
-         * 
+         * @param phrase/search/words
+         *            String
+         * @param searchLocales
+         *            ordered List of Locales within which to search
+         * @param includeRetired
+         *            boolean
+         * @param requireClasses
+         *            List<ConceptClass>
+         * @param excludeClasses
+         *            List<ConceptClass>
+         * @param requireDatatypes
+         *            List<ConceptDatatype>
+         * @param excludeDatatypes
+         *            List<ConceptDatatype>
+         * @return
+         * 
+         * @see ConceptService.findConcepts(String,Locale,boolean)
+         */
+        @Transactional(readOnly=true)
+        @Authorized({"View Concepts"})
+        public List<ConceptWord> findConcepts(String phrase, List<Locale> searchLocales, boolean includeRetired, 
+                        List<ConceptClass> requireClasses, List<ConceptClass> excludeClasses,
+                        List<ConceptDatatype> requireDatatypes,List<ConceptDatatype> excludeDatatypes);
+        
+        /**
+         * 
-         * Finds concepts but only returns the given range
-         * 
-         * @param phrase

src/api/org/openmrs/api/impl/ConceptServiceImpl.java

@@ -476 +476 @@
-                        requireDatatypes = new Vector<ConceptDatatype>();
-                if (excludeDatatypes == null)
-                        excludeDatatypes = new Vector<ConceptDatatype>();
+
+                List<Locale> searchLocales = new ArrayList<Locale>();
+                searchLocales.add(locale);
-                
-                List<ConceptWord> conceptWords = getConceptDAO().findConcepts(phrase,
-               locale
+                                                              searchLocales
-
-                return weightWords(phrase, locale, conceptWords);
-        }
-
-        /**
+     * @see org.openmrs.api.ConceptService#findConcepts(java.lang.String, java.util.List, boolean, java.util.List, java.util.List, java.util.List, java.util.List)
+     */
+    public List<ConceptWord> findConcepts(String phrase,
+            List<Locale> searchLocales, boolean includeRetired,
+            List<ConceptClass> requireClasses,
+            List<ConceptClass> excludeClasses,
+            List<ConceptDatatype> requireDatatypes,
+            List<ConceptDatatype> excludeDatatypes) {
+
+                if (requireClasses == null)
+                        requireClasses = new Vector<ConceptClass>();
+                if (excludeClasses == null)
+                        excludeClasses = new Vector<ConceptClass>();
+                if (requireDatatypes == null)
+                        requireDatatypes = new Vector<ConceptDatatype>();
+                if (excludeDatatypes == null)
+                        excludeDatatypes = new Vector<ConceptDatatype>();
+                
+                List<ConceptWord> conceptWords = getConceptDAO().
+                        findConcepts(phrase, searchLocales, includeRetired, requireClasses, 
+                                     excludeClasses, requireDatatypes, excludeDatatypes);
+
+                return weightWords(phrase, searchLocales, conceptWords);
+    }
+    
+        /**
-         * 
-         * Finds concepts but only returns the given range
-         * 
@@ -529 +558 @@
-
-        /**
-         * This will weight and sort the concepts we are assuming the hits are
-
+.
-         * 
+         * @deprecated use weightWords() with multiple locales instead
+         * 
-         * @param phrase
-         *            that was used to get this search
-         * @param locale
@@ -540 +571 @@
-         */
-        protected List<ConceptWord> weightWords(String phrase, Locale locale,
-                        List<ConceptWord> conceptWords) {
+                List<Locale> locales = new ArrayList<Locale>();
+                locales.add(locale);
+                return weightWords(phrase, locales, conceptWords);
+        }
+        
+        /**
+         * This will weight and sort the concepts we are assuming the hits are
+         * sorted with synonym matches at the bottom
+         * 
+         * @param phrase
+         *            that was used to get this search
+         * @param locales
+         *            that were used to get this search
+         * @param conceptWords
+         * @return
+         */
+        protected List<ConceptWord> weightWords(String phrase, List<Locale> locales,
+                        List<ConceptWord> conceptWords) {
-
-                // Map<ConceptId, ConceptWord>
-                Map<Integer, ConceptWord> uniqueConcepts = new HashMap<Integer, ConceptWord>();
@@ -564 +613 @@
-                                // check synonym in case we have multiple synonym hits
-                                String toSplit = initialWord.getSynonym();
-                                if (toSplit == null || toSplit.equals("")) {
-
-
+
+
+
+
+
+
+
+
+
-                                }
-                                List<String> nameWords = ConceptWord.getUniqueWords(toSplit);
-
@@ -593 +649 @@
-                                if (matchedString.length() == 0) {
-                                        // We weight name matches higher
-                                        tmpWord.increaseWeight(2.0);
-
-
+
+
+
+
+
+
+
-                                }
-
-                                // increase the weight by a factor of the % of words matched

src/web/org/openmrs/web/OptionsForm.java

@@ -17 +17 @@
-
-        private String defaultLocation = "";
-        private String defaultLocale = "";
+        private String proficientLocales = "";
-        private Boolean showRetiredMessage = true;
-        private Boolean verbose = false;
-        
@@ -160 +161 @@
-                this.verbose = verbose;
-        }
-
-
+
+
+
+
+
+
+
+
-
+        /**
+         * Returns the locales within which the user is proficient.
+     * 
+     */
+        public String getProficientLocales() {
+                return proficientLocales;
+        }
+
-}

src/web/org/openmrs/web/controller/OptionsFormController.java

@@ -29 +29 @@
-import org.openmrs.api.EncounterService;
-import org.openmrs.api.UserService;
-import org.openmrs.api.context.Context;
+import org.openmrs.util.LocaleFactory;
-import org.openmrs.util.OpenmrsConstants;
-import org.openmrs.web.OptionsForm;
-import org.openmrs.web.WebConstants;
@@ -101 +102 @@
-                        
-                        properties.put(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCATION, opts.getDefaultLocation());
-                        properties.put(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCALE, opts.getDefaultLocale());
+                        properties.put(OpenmrsConstants.USER_PROPERTY_PROFICIENT_LOCALES, opts.getProficientLocales());
-                        properties.put(OpenmrsConstants.USER_PROPERTY_SHOW_RETIRED, opts.getShowRetiredMessage().toString());
-                        properties.put(OpenmrsConstants.USER_PROPERTY_SHOW_VERBOSE, opts.getVerbose().toString());
-                        properties.put(OpenmrsConstants.USER_PROPERTY_NOTIFICATION, opts.getNotification() == null ? "" : opts.getNotification().toString());
@@ -197 +199 @@
-                        Map<String, String> props = user.getUserProperties();
-                        opts.setDefaultLocation(props.get(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCATION));
-                        opts.setDefaultLocale(props.get(OpenmrsConstants.USER_PROPERTY_DEFAULT_LOCALE));
+                        opts.setProficientLocales(props.get(OpenmrsConstants.USER_PROPERTY_PROFICIENT_LOCALES));
-                        opts.setShowRetiredMessage(new Boolean(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_RETIRED)));
-                        opts.setVerbose(new Boolean(props.get(OpenmrsConstants.USER_PROPERTY_SHOW_VERBOSE)));
-                        opts.setUsername(user.getUsername());

src/web/org/openmrs/web/dwr/DWRConceptService.java

@@ -75 +75 @@
-
-                log.info(userId + "|" + phrase + "|" + includeClassNames.toString());
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if (includeClassNames == null)
-                        includeClassNames = new Vector<String>();
-                if (excludeClassNames == null)
@@ -94 +105 @@
-                                // corresponding conceptId
-                                Concept c = cs.getConcept(Integer.valueOf(phrase));
-                                if (c != null) {
-l
+defaultL
-                                                        .getLanguage(), "Concept Id #" + phrase);
-                                        words.add(word);
-                                }
@@ -128 +139 @@
-                                                excludeDatatypes.add(cs.getConceptDatatypeByName(name));
-
-                                // perform the search
-locale
+searchLocales
-                                                includeClasses, excludeClasses,
-                                                includeDatatypes, excludeDatatypes));
-                        }
-
-                        if (words.size() == 0) {
-                                objectList
-Context.getLocale().getDisplayName()
+defaultLocale
-                        } else {
-                                objectList = new Vector<Object>(words.size());
-                                int maxCount = 500;
@@ -154 +165 @@
-                                                if (classId.equals(OpenmrsConstants.CONCEPT_CLASS_DRUG))
-                                                        for (Drug d : cs.getDrugs(word.getConcept()))
-                                                                objectList.add(new ConceptDrugListItem(d,
-l
+defaultL
-                                        }
-                                }
-                        }
@@ -166 +177 @@
-                }
-
-                if (objectList.size() == 0)
-Context.getLocale().getDisplayName()
+defaultLocale
-
-                return objectList;
-        }
@@ -348 +359 @@
-                Concept c = Context.getConceptService().getConcept(conceptId);
-                Collection<ConceptAnswer> answers = c.getAnswers();
-                // TODO: deal with concept answers (e.g. drug) whose answer concept is null. (Not sure if this actually ever happens)
+                Locale locale = Context.getLocale();
-                for (ConceptAnswer ca : answers)
-                        if (ca.getAnswerConcept() != null)
-Context.getLocale()
+locale
-                return ret;
-        }
-

web/WEB-INF/messages.properties

@@ -7 +7 @@
-findPatient.title=OpenMRS - Find Patient
-optionsForm.title=OpenMRS - User Options
-cohortBuilder.title=OpenMRS - Cohort Builder
-OpenMRS - Concept Dictionary
+Concept Dictionary Maintenance
-
-
-Navigation.home = Home
@@ -121 +121 @@
-general.locale=Locale
-general.nMore={0} more
-general.nLess={0} less
-O
+o
-general.onDate=on
-general.hide=Hide
-general.drop=Drop
@@ -145 +145 @@
-general.version=Version
-general.includeVoided=Include Voided
-general.dateConstraints=Date range
-general.optional=optional
-general.since=since
-general.nWeeks={0} week(s)
-general.displayingXtoYofZ=Displaying {0} to {1} of {2}
@@ -177 +176 @@
-diagnosis.title=Select a Diagnosis
-conceptAnswer.title=Choose an Answer
-conceptAnswer.forConcept=
-
-dictionary.title=Concept Dictionary Maintenance
-dictionary.title.short=Dictionary
-dictionary.searchBox=Search Phrase:
-dictionary.includeRetired=Include retired concepts
@@ -219 +216 @@
-options.default.legend=Defaults
-options.default.location=Default Location
-options.default.locale=Default Locale
+options.proficient.locales=Proficient Locales
-options.default.verbose=Verbose Display On
-options.showRetiredMessage=Show Retired Message?
-options.login.legend=Change Login Info
@@ -271 +269 @@
-typeMismatch.java.lang.Long={0} is not a valid value. Do not use decimals or characters.
-
-welcome=Welcome to <span class="webappName">{0}</span>. Please login to proceed.
-
+\
-
-#
-#### Openmrs POJO messages #### 
@@ -335 +333 @@
-Concept.add=Add new Concept
-Concept.id=Concept Id
-Concept.set=Is Set?
-=Question should typically not be datatype
+\=Question should typically not be datatype\
-Concept.search=Find a concept by typing in its name
-Concept.view.title=Viewing Concept {0}
-Concept.edit.title=Editing Concept {0}
@@ -658 +656 @@
-Form.javascriptRequired=Javascript must be enabled to use the schema editor.
-
-FormField.add=Add Form Field
-
+\
-FormField.fieldPart= Field Part 
-
+\
-FormField.minOccurs= Min 
-FormField.maxOccurs= Max
-FormField.maxOccurs.help=-1 for infinite 
@@ -801 +799 @@
-Obs.valueModifier=Value Modifier
-Obs.valueText=Value Text
-Obs.valueInvalid.description=Invalid Concept Selected!
-
+\
-Obs.dateStarted=Date Started
-Obs.dateStopped=Date Stopped
-Obs.comment=Comment
@@ -1138 +1136 @@
-RelationshipType.null=Relationship type cannot be null
-RelationshipType.aIsToB=A is to B
-RelationshipType.bIsToA=B is to A
-RelationshipType.bIsToA.required=A is to B name is required
-RelationshipType.bIsToA.required=B is to A name is required
-RelationshipType.views.title=Manage Relationship Type Views
-RelationshipType.views.order=Display Order
@@ -1159 +1156 @@
-Role.add=Add Role
-Role.inheritedRoles=Inherited Roles
-Role.inheritedRoles.description=<span class="thisRole">This role</span> inherits privileges from these roles
-
+\
-Role.privileges=Privileges
-Role.list.title=Current Roles
-Role.delete=Delete Selected Roles
@@ -1355 +1352 @@
-Module.loaded=Module {0} has been loaded
-Module.stopped=Module {0} has been stopped
-Module.error=Error processing Module
-Module.add=Add Module
-Module.addJar=Module file to add
-Module.invalid=Invalid module specified {0}
-Module.notStarted=Not Started
@@ -1368 +1364 @@
-Module.help.unload=When a module is unloaded, it is first 'stopped', then the omod file is removed from the repository.
-Module.help.startStop=A loaded module can be stopped and started.  A stopped module is still loaded, it just doesn't have any effect on the system.
-Module.help.update=In order to update a module, either click 'Install Update' or: 1) Download the update, 2) unload the current module then 3) upload the new module via the form above.
-="moduleRepository" href="https
+\="moduleRepository" href\="https\
-Module.unloadWarning=You are about to completely remove this module from the system.
-Module.allowUploads=Allow Uploads?
-Module.disallowUploads=Uploads are not allowed from the website at this time.  The runtime property {0} must be set to true.
@@ -1433 +1429 @@
-
-Scheduler.scheduleForm.title=Schedule Form
-Scheduler.scheduleForm.legend=Schedule
-
+\
-Scheduler.scheduleForm.started=Started
-Scheduler.scheduleForm.startOnStartup=Start on startup
-Scheduler.scheduleForm.startTimePattern=Start time pattern
@@ -1487 +1483 @@
-Program.states=States
-Program.state=State
-Program.conversion.manage=Manage Triggered State Conversions
- State Conversio
+ed state conversion has bee
-Program.conversion.manage.title=Triggered State Conversions
-Program.conversion.programWorkflow=In this workflow
-Program.conversion.concept=This concept
@@ -1495 +1491 @@
-Program.conversion.list.title=Current Triggered State Conversions
-Program.conversion.add=Add new state conversion
-Program.conversion.save=Save this state conversion
-Program.conversion.saved=Triggered state conversion has been saved
-Program.conversion=Triggered State Conversion
-Program.conversion.nonedeleted=No Triggered State Conversions deleted
-Program.conversion.deleteSelected=Delete selected Triggered State Conversion(s)

web/WEB-INF/messages_pt.properties

@@ -1 +1 @@
-header.logged.in=Entrou no sistema como
-ã
+\u00E3
-header.login=Entrar no sistema
-s
+S
-header.help=Ajuda
-
-ê
+\u00EA
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-Navigation.home=Pagina Inicial
-Navigation.findPatient=Procurar Paciente
-Navigation.findCreatePatient = Procurar/Criar Paciente
-á
-çã
-á
+\u00E1
+\u00E7\u00E3
+\u00E1
-Navigation.options=Meu Perfil
-
-general.select=Escolher
-general.name=Nome
-çã
+\u00E7\u00E3
-general.creator=Criador
-general.createdBy=Criado por
-çã
+\u00E7\u00E3
-general.voided=Anulado
-general.voidedBy=Anulado por
-çã
-çã
+\u00E7\u00E3
+\u00E7\u00E3
-general.changedBy=Alterado Por
-çã
+\u00E7\u00E3
-general.delete=Apagar
-general.deleted=Apagado
-ã
-ã
+\u00E3
+\u00E3
-general.retired=Suprimido
-ã
+\u00E3
-general.retiredBy=Suprimido por
-general.addAnother=Adicionar Outro
-general.new=Novo
@@ -63 +62 @@
-general.true=Verdadeiro
-general.false=Falso
-general.cancel=Cancelar
-çã
+\u00E7\u00E3
-general.preferred=Preferido
-general.submit=Submeter
-general.answer=Resposta
@@ -72 +71 @@
-general.end=Terminar
-general.format=Formatar
-general.yes=Sim
-ã
+\u00E3
-general.choose=Escolher
-general.clear=Limpar
-general.type=Tipo
-general.subType=Subtipo
-çã
+\u00E7\u00E3
-general.toggle.voided=Mostrar/Esconder Anulado
-çã
+\u00E7\u00E3
-general.or=ou
-general.value=Valor
-general.none=Nenhum
-çõ
-ão concluí
-ão concluí
+\u00E7\u00F5
+\u00E3o conclu\u00ED
+\u00E3o conclu\u00ED
-general.dateStart=Data de Inicio
-general.dateAutoExpire=Data de validade
-çã
+\u00E7\u00E3
-general.locale=Local
-general.nMore={0} Mais
-general.optional=Opcional
@@ -101 +100 @@
-general.fromDate=de
-general.toDate=a
-
-ê
+\u00EA
-auth.login=Entrar no sistema
-ário/Senha invá
-á
-ção do Nome de usuário e resposta secreta invá
-ã
-à
+\u00E1rio/Senha inv\u00E1
+\u00E1
+\u00E7\u00E3o do Nome de usu\u00E1rio e resposta secreta inv\u00E1
+\u00E3
+\u00E0
-auth.password.reset=A sua senha foi apagada. Por favor preencha os campos para sua nova senha.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-options.login.password.old=Antiga Senha
-options.login.password.new=Nova Senha
-options.login.password.confirm=Confirme a nova senha
-ê pode criar ou editar a sua pergunta secreta abaixo. A pergunta secreta é usada para recuperaçã
+\u00EA pode criar ou editar a sua pergunta secreta abaixo. A pergunta secreta \u00E9 usada para recupera\u00E7\u00E3
-options.login.secretQuestionNew=Pergunta secreta
-options.login.secretAnswerNew=Resposta Secreta
-options.login.secretAnswerConfirm=Confirme a resposta secreta.
-é
-çõ
+\u00E9
+\u00E7\u00F5
-options.notify.internalOnly=Somente dentro do sistema
-options.notify.internal=Dentro do sistema, mas notifique por e-mail para novas mensagens.
-í
+\u00ED
-