Quick note: unless you know: 1. where the changes came from 2. what the purpose is 3. how they do it and what each change actually does
please don't commit it! In this case, maybe someone just ran the label tool stuff or something. It's a bad place to look for contributions in general. -David On Mar 3, 2011, at 3:11 AM, Jacques Le Roux wrote: > Hi, > > Is there any reasons AccountingErrorUiLabels has been modified on trunk demo > and not committed rather? > Should we apply the patch, revert? > > Index: applications/accounting/config/AccountingErrorUiLabels.xml > =================================================================== > --- applications/accounting/config/AccountingErrorUiLabels.xml (revision > 1076533) > +++ applications/accounting/config/AccountingErrorUiLabels.xml (working copy) > @@ -19,11 +19,6 @@ > under the License. > --> > <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> > - <property key="AccountingDeleteRateAmount"> > - <value xml:lang="en">Could not find RateAmount record to be > deleted</value> > - <value xml:lang="it">Non è possibile trovare un record di > RateAmount che deve essere cancellato</value> > - <value xml:lang="pt">Não foi possà vel localizar o registro a ser > excluà do RateAmount</value> > - </property> > <property key="AccountingEftAccountCannotBeCreated"> > <value xml:lang="en">ERROR: Could not create payment method Id (id > generation failure)</value> > <value xml:lang="it">ERRORE: Non è possibile creare il metodo > pagamento (fallimento generazione id)</value> > @@ -384,6 +379,42 @@ > <value xml:lang="en">Data error getting tax settings: > ${errorString}</value> > <value xml:lang="it">Errore di lettura impostazioni tasse: > ${errorString}</value> > </property> > + <property > key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference"> > + <value xml:lang="en">Failed To Execute Service > CreatePaymentFromPreference</value> > + <value xml:lang="fr">Échec sur l'execution du service de création > d'un payment suivant les préférence (CreatePaymentFromPreference)</value> > + <value xml:lang="hi_IN">सरà¥à¤µà¤¿à¤¸ > CreatePaymentFromPreference पर अमल(execute) करने में > असफल</value> > + <value xml:lang="it">Fallita esecuzione servizio > CreatePaymentFromPreference</value> > + </property> > + <property key="idealEvents.noValidOrderIdReturned"> > + <value xml:lang="en">No Valid OrderId Returned</value> > + <value xml:lang="fr">Référence commande retournée n'est pas > valide</value> > + <value xml:lang="hi_IN">मानà¥à¤¯ OrderId वापस > नहीं लौटा</value> > + <value xml:lang="it">Nessun numero ordine restituito</value> > + </property> > + <property key="idealEvents.problemsConnectingWithIdeal"> > + <value xml:lang="en">Problems Connecting With iDEAL</value> > + <value xml:lang="fr">Problème rencontré dans la connexion avec > iDEAL</value> > + <value xml:lang="hi_IN">iDEAL के साथ जोड़ने > में समसà¥à¤¯à¤¾</value> > + <value xml:lang="it">Problema nella connessione con iDEAL</value> > + </property> > + <property key="idealEvents.problemsGettingAuthenticationUser"> > + <value xml:lang="en">Problems Getting Authentication User</value> > + <value xml:lang="fr">Problème sur l'authentification de > l'utilisateur</value> > + <value xml:lang="hi_IN">उपयोगकरà¥à¤¤à¤¾(user) के > पà¥à¤°à¤®à¤¾à¤£à¥€à¤•रण में समसà¥à¤¯à¤¾à¤à¤ हो > रही</value> > + <value xml:lang="it">Problema durante l'autenticazione utente</value> > + </property> > + <property key="idealEvents.problemsGettingMerchantConfiguration"> > + <value xml:lang="en">Problems Getting Merchant Configuration</value> > + <value xml:lang="fr">Problème de récupération de la configuration > marchand</value> > + <value xml:lang="hi_IN">वà¥à¤¯à¤¾à¤ªà¤¾à¤°à¥€ > विनà¥à¤¯à¤¾à¤¸ में समसà¥à¤¯à¤¾à¤à¤ हो > रही</value> > + <value xml:lang="it">Problema nel ricavare la configurazione del > negoziante</value> > + </property> > + <property key="idealEvents.problemsGettingOrderHeader"> > + <value xml:lang="en">Problems Getting OrderHeader</value> > + <value xml:lang="fr">Problème de récupération de la > commande</value> > + <value xml:lang="hi_IN">OrderHeader में > समसà¥à¤¯à¤¾à¤à¤ हो रही</value> > + <value xml:lang="it">Problema nel ricavare la testata ordine</value> > + </property> > <property > key="payPalEvents.failedToExecuteServiceCreatePaymentFromPreference"> > <value xml:lang="en">Failed to execute service > createPaymentFromPreference</value> > <value xml:lang="fr">Echec à l'exécution du service > createPaymentFromPreference</value> > @@ -517,40 +548,4 @@ > <value xml:lang="it">Problema nel ricavare la testata ordine</value> > <value xml:lang="pt">Problemas Obtendo OrderHeader</value> > </property> > - <property > key="idealEvents.failedToExecuteServiceCreatePaymentFromPreference"> > - <value xml:lang="en">Failed To Execute Service > CreatePaymentFromPreference</value> > - <value xml:lang="fr">Échec sur l'execution du service de création > d'un payment suivant les préférence (CreatePaymentFromPreference)</value> > - <value xml:lang="hi_IN">सरà¥à¤µà¤¿à¤¸ > CreatePaymentFromPreference पर अमल(execute) करने में > असफल</value> > - <value xml:lang="it">Fallita esecuzione servizio > CreatePaymentFromPreference</value> > - </property> > - <property key="idealEvents.noValidOrderIdReturned"> > - <value xml:lang="en">No Valid OrderId Returned</value> > - <value xml:lang="fr">Référence commande retournée n'est pas > valide</value> > - <value xml:lang="hi_IN">मानà¥à¤¯ OrderId वापस > नहीं लौटा</value> > - <value xml:lang="it">Nessun numero ordine restituito</value> > - </property> > - <property key="idealEvents.problemsConnectingWithIdeal"> > - <value xml:lang="en">Problems Connecting With iDEAL</value> > - <value xml:lang="fr">Problème rencontré dans la connexion avec > iDEAL</value> > - <value xml:lang="hi_IN">iDEAL के साथ जोड़ने > में समसà¥à¤¯à¤¾</value> > - <value xml:lang="it">Problema nella connessione con iDEAL</value> > - </property> > - <property key="idealEvents.problemsGettingAuthenticationUser"> > - <value xml:lang="en">Problems Getting Authentication User</value> > - <value xml:lang="fr">Problème sur l'authentification de > l'utilisateur</value> > - <value xml:lang="hi_IN">उपयोगकरà¥à¤¤à¤¾(user) के > पà¥à¤°à¤®à¤¾à¤£à¥€à¤•रण में समसà¥à¤¯à¤¾à¤à¤ हो > रही</value> > - <value xml:lang="it">Problema durante l'autenticazione utente</value> > - </property> > - <property key="idealEvents.problemsGettingMerchantConfiguration"> > - <value xml:lang="en">Problems Getting Merchant Configuration</value> > - <value xml:lang="fr">Problème de récupération de la configuration > marchand</value> > - <value xml:lang="hi_IN">वà¥à¤¯à¤¾à¤ªà¤¾à¤°à¥€ > विनà¥à¤¯à¤¾à¤¸ में समसà¥à¤¯à¤¾à¤à¤ हो > रही</value> > - <value xml:lang="it">Problema nel ricavare la configurazione del > negoziante</value> > - </property> > - <property key="idealEvents.problemsGettingOrderHeader"> > - <value xml:lang="en">Problems Getting OrderHeader</value> > - <value xml:lang="fr">Problème de récupération de la > commande</value> > - <value xml:lang="hi_IN">OrderHeader में > समसà¥à¤¯à¤¾à¤à¤ हो रही</value> > - <value xml:lang="it">Problema nel ricavare la testata ordine</value> > - </property> > </resource> > > Thanks > > Jacques > PS: BTW a crash occurred 1st March I will have a look... >
