Subversion Repositories eFlore/Applications.coel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1512 → Rev 1513

/trunk/src/org/tela_botanica/client/i18n/Constantes.properties
565,7 → 565,9
commentaireMessageTitre = Veuillez saisir un titre pour la note !
 
# Pour personne : Publis liées
personneOngletPublication = Publications
personnePublication = dont la personne est le sujet
typeRelationPersonne = Relation
 
# Journal
titreJournal = Journal de l'application
Property changes:
Modified: svn:mergeinfo
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/Constantes.properties:r1417-1511
Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.properties:r11-119
/trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties
Property changes:
Modified: svn:mergeinfo
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1417-1511
Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r11-464
/trunk/src/org/tela_botanica/client/i18n/Constantes.java
552,6 → 552,8
 
//Pour personne: publications liés
String personnePublication();
String personneOngletPublication();
String typeRelationPersonne();
String tousProjets();
// Journal
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.java:r11-119
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/Constantes.java:r1417-1511
/trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java:r11-464
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1417-1511
/trunk/src/org/tela_botanica/client/i18n/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/i18n:r11-119
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/i18n:r1417-1511