Skip to:

  1. Skip to Jira Navigation
  2. Skip to Side Navigation
  3. Skip to Main Content

Update catalan translation

Description

Update the Catalan bundles for samigo

Environment

None

Test Plan

None

Attachments

2

Activity

Show:

Sam Ottenhoff April 3, 2013 at 2:53 PM

2.9.x r122150

Alexandre Ballesté Crevillén April 3, 2013 at 4:52 AM

Hi merged all changes
svn merge -c 116886 https://source.sakaiproject.org/svn/sam/trunk
in conflicts I applied resolution [mine conflicts] mc
After I applied
svn merge -c 118113 https://source.sakaiproject.org/svn/sam/trunk
svn merge -c 121796 https://source.sakaiproject.org/svn/sam/trunk

Tested in the 2.9.x-all updated to 122097
I attached the generated sam-2028-2.9.x.patch with the result of this process.

Thanks

Anthony Whyte April 1, 2013 at 4:54 PM

2.9.x merge conflicts, please resolve.

svn merge -c 116886 https://source.sakaiproject.org/svn/sam/trunk
— Merging r116886 into 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle':
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/PrintMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorFrontDoorMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/EvaluationMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/TemplateMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/QuestionPoolMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AssessmentSettingsMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/SamLite_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/GeneralMessages_ca.properties
Conflict discovered in 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ca.properties'.
C samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorMessages_ca.properties
Conflict discovered in 'samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ca.properties'.
C samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/AuthorImportExport_ca.properties
A samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/EventLogMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/SelectIndexMessages_ca.properties
U samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/CommonMessages_ca.properties
Summary of conflicts:
Text conflicts: 2

Alexandre Ballesté Crevillén March 26, 2013 at 5:08 PM

Tested on sakai/trunk on Oracle - Built: 03/26/13 16:00 - Sakai Revision: 121800 (Kernel 1.4.0-SNAPSHOT)- Server sakai-nightly.uits.iupui.edu

Alexandre Ballesté Crevillén March 26, 2013 at 11:59 AM

Detected a " ' " character not valid

Fixed

Details

Assignee

Reporter

Labels

Components

Fix versions

Affects versions

Priority

Created November 28, 2012 at 8:15 AM
Updated April 17, 2018 at 8:17 AM
Resolved March 26, 2013 at 5:08 PM