Hi Caleb,
I think that whatever changes you make to the non default language files (ca, fr in your
example) will be overwritten at the next import from
l10n.xwiki.org. Changes should thus
be made on l10n.
-Vincent
On Feb 23, 2010, at 4:55 PM, cjdelisle (SVN) wrote:
Author: cjdelisle
Date: 2010-02-23 16:55:15 +0100 (Tue, 23 Feb 2010)
New Revision: 27231
Modified:
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_ca.properties
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_fr.properties
Log:
XAADMINISTRATION-77: Improve the registration interface - Corrected some translation keys
which were named against convention.
Modified:
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties
===================================================================
---
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties 2010-02-23
15:48:47 UTC (rev 27230)
+++
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources.properties 2010-02-23
15:55:15 UTC (rev 27231)
@@ -1771,6 +1771,18 @@
xe.admin.configurable.sectionIconNoAccess=(No Access)
xe.admin.configurable.sectionIconNoAccessTooltip=You don't have permission to
configure this section.
xe.admin.configurable.noViewAccessSomeApplications=Some sections may not be displayed
because you do not have view access to some configurable applications including: {0}
+# XWiki.Registration
+xe.admin.registration.fieldMandatory=This field is mandatory.
+xe.admin.registration.passwordTooShort=Please use a longer password.
+xe.admin.registration.passwordMismatch=Your passwords aren't the same.
+xe.admin.registration.invalidEmail=Please give a valid email address.
+xe.admin.registration.fieldOkay=Ok.
+# Depricated misnamed XWiki.Registration keys (Remove for v2.4)
+XWiki.Registration.fieldMandatory=This field is mandatory.
+XWiki.Registration.passwordTooShort=Please use a longer password.
+XWiki.Registration.passwordMismatch=Your passwords aren't the same.
+XWiki.Registration.invalidEmail=Please give a valid email address.
+XWiki.Registration.fieldOkay=Ok.
# Blog application
xe.blog.archive.noarticle=No articles yet...
@@ -2523,11 +2535,3 @@
XWiki.XWikiSkins_edit.vm=Edit
XWiki.XWikiSkins_baseskin=Base Skin
XWiki.XWikiSkins_logo=Logo
-
-# Verified Registration Application
-# TODO: move to language pack after language packs can be imported without modifying
XWikiPreferences
-XWiki.Registration.fieldMandatory=This field is mandatory.
-XWiki.Registration.passwordTooShort=Please use a longer password.
-XWiki.Registration.passwordMismatch=Your passwords aren't the same.
-XWiki.Registration.invalidEmail=Please give a valid email address.
-XWiki.Registration.fieldOkay=Ok.
Modified:
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_ca.properties
===================================================================
---
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_ca.properties 2010-02-23
15:48:47 UTC (rev 27230)
+++
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_ca.properties 2010-02-23
15:55:15 UTC (rev 27231)
@@ -55,10 +55,19 @@
XWiki.Mail_language=Idioma
XWiki.Mail_subject=Assumpte
XWiki.Mail_text=Text
+xe.admin.registration.fieldOkay=Acceptar.
+xe.admin.registration.invalidEmail=Proporcioneu una adre\u00E7a de correu v\u00E0lida.
+xe.admin.registration.passwordMismatch=Les contrasenyes no coincideixen.
+xe.admin.registration.passwordTooShort=Utilitzeu una contrasenya m\u00E9s llarga.
+xe.admin.registration.fieldMandatory=Aquest camp \u00E9s obligatori.
+
+# Depricated misnamed XWiki.Registration keys (Remove for v2.4)
XWiki.Registration.fieldOkay=Acceptar.
XWiki.Registration.invalidEmail=Proporcioneu una adre\u00E7a de correu v\u00E0lida.
XWiki.Registration.passwordMismatch=Les contrasenyes no coincideixen.
XWiki.Registration.passwordTooShort=Utilitzeu una contrasenya m\u00E9s llarga.
+XWiki.Registration.fieldMandatory=Aquest camp \u00E9s obligatori.
+
XWiki.ResetPasswordRequestClass_verification=Sol\u00B7licitar cadena de text de
verificaci\u00F3
XWiki.SchedulerJobClass_cron=Expressi\u00F3 Cron
XWiki.SchedulerJobClass_jobClass=Classe treball
@@ -181,7 +190,6 @@
XWiki.XWikiUsers_skin=plantilla
XWiki.XWikiUsers_usertype=Tipus d'usuari
XWiki.XWikiUsers_validkey=Clau validaci\u00F3
-Xwiki.Registration.fieldMandatory=Aquest camp \u00E9s obligatori.
accountdisabled=El vostre compte ha estat deshabilitat. Contacteu amb l'administrador
si creeu que aix\u00F2 \u00E9s un problema.
accountnotactive=El vostre compte encara no est\u00E0 actiu, perqu\u00E8 la vostra
adre\u00E7a de correu electr\u00F2nic encara no ha estat confirmada.
accountnotactive_email=Haur\u00EDeu d'haver rebut un correu electr\u00F2nic amb
l'enlla\u00E7 de confirmaci\u00F3 de la vostra adre\u00E7a electr\u00F2nica.
Tamb\u00E9 podeu copiar i enganxar el codi d'activaci\u00F3 en el mateix correu
electr\u00F2nic en el camp seg\u00FCent.
Modified:
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_fr.properties
===================================================================
---
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_fr.properties 2010-02-23
15:48:47 UTC (rev 27230)
+++
platform/core/trunk/xwiki-core/src/main/resources/ApplicationResources_fr.properties 2010-02-23
15:55:15 UTC (rev 27231)
@@ -55,11 +55,19 @@
XWiki.Mail_language=Langue
XWiki.Mail_subject=Sujet
XWiki.Mail_text=Texte
+xe.admin.registration.fieldMandatory=Ce champ est obligatoire.
+xe.admin.registration.fieldOkay=Ok.
+xe.admin.registration.invalidEmail=Donnez une adresse e-mail valide s'il vous
plait.
+xe.admin.registration.passwordMismatch=Vos mots de passe ne sont pas les m\u00EAmes.
+xe.admin.registration.passwordTooShort=Utilisez un mot de passe plus long s'il vouis
plait.
+
+# Depricated misnamed XWiki.Registration keys (Remove for v2.4)
XWiki.Registration.fieldMandatory=Ce champ est obligatoire.
XWiki.Registration.fieldOkay=Ok.
XWiki.Registration.invalidEmail=Donnez une adresse e-mail valide s'il vous plait.
XWiki.Registration.passwordMismatch=Vos mots de passe ne sont pas les m\u00EAmes.
XWiki.Registration.passwordTooShort=Utilisez un mot de passe plus long s'il vouis
plait.
+
XWiki.ResetPasswordRequestClass_verification=Demander un string de v\u00E9rification
XWiki.SchedulerJobClass_cron=Expression CRON
XWiki.SchedulerJobClass_jobClass=Classe des traitements
_______________________________________________
notifications mailing list
notifications(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications