• last updated 10 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7833 more files in changeset.
Remove package versions from info files. Support ajaxfs parameter in portlet

  1. … 2 more files in changeset.
Import of message keys from translation server for core and .LRN packages.

This catalogs have no package version info. Check http://openacs.org/forums/message-view?message%5fid=1007666

  1. … 1287 more files in changeset.
Greek catalogs for dotlrn

  1. … 45 more files in changeset.
Merged changes to HEAD ...

  1. … 1542 more files in changeset.
Merging dotlrn-all and dotlrn-extras from oacs-5-2

  1. … 868 more files in changeset.
First shot at merging oacs-5-2 apps used in .LRN to HEAD.

  1. … 2464 more files in changeset.
file fs-portlet.hi_IN.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./fs-portlet.hi_IN.utf-8.xml
remove the unused .ms_my locale files which conflict with the ms_MY on OS X and are just confusing to keep around

  1. … 36 more files in changeset.
file fs-portlet.es_CO.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.es_CO.ISO-8859-1.xml
file fs-portlet.en_AU.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.en_AU.ISO-8859-1.xml
commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040724 and jcd-merge-5-1-20050111

  1. … 2261 more files in changeset.
file fs-portlet.ca_ES.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.ca_ES.ISO-8859-1.xml
file fs-portlet.ms_MY.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.ms_MY.utf-8.xml
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040517 and jcd-merge-5-1-20040628 to HEAD

  1. … 678 more files in changeset.
file fs-portlet.ar_EG.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.ar_EG.utf-8.xml
file fs-portlet.zh_CN.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.zh_CN.utf-8.xml
file fs-portlet.th_TH.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.th_TH.utf-8.xml
file fs-portlet.ro_RO.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.ro_RO.utf-8.xml
file fs-portlet.es_GT.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.es_GT.ISO-8859-1.xml
file fs-portlet.ar_LB.utf-8.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.ar_LB.utf-8.xml
merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517

  1. … 820 more files in changeset.
file fs-portlet.nn_NO.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./fs-portlet.nn_NO.ISO-8859-1.xml
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

  1. … 642 more files in changeset.
file fs-portlet.ch_zh.utf-8.xml was initially added on branch dotlrn-2-0.

    • -0
    • +0
    ./fs-portlet.ch_zh.utf-8.xml
file fs-portlet.RO_RO.utf-8.xml was initially added on branch dotlrn-2-0.

    • -0
    • +0
    ./fs-portlet.RO_RO.utf-8.xml
exporting catalog files from the translation server

  1. … 135 more files in changeset.
removing obsolete catalog files

  1. … 23 more files in changeset.
exporting messages from translation server

  1. … 385 more files in changeset.
re-adding non-ISO-8859-1 catalog files with utf-8 encoding

    • -0
    • +7
    ./fs-portlet.AR_EG.utf-8.xml
    • -0
    • +13
    ./fs-portlet.AR_LB.utf-8.xml
    • -0
    • +7
    ./fs-portlet.el_GR.utf-8.xml
    • -0
    • +10
    ./fs-portlet.hu_HU.utf-8.xml
    • -0
    • +6
    ./fs-portlet.ja_JP.utf-8.xml
    • -0
    • +13
    ./fs-portlet.ko_KR.utf-8.xml
    • -0
    • +13
    ./fs-portlet.ms_my.utf-8.xml
    • -0
    • +13
    ./fs-portlet.pl_PL.utf-8.xml
    • -0
    • +13
    ./fs-portlet.ru_RU.utf-8.xml
    • -0
    • +10
    ./fs-portlet.sh_HR.utf-8.xml
    • -0
    • +8
    ./fs-portlet.tr_TR.utf-8.xml
    • -0
    • +5
    ./fs-portlet.zh_TW.utf-8.xml
  1. … 337 more files in changeset.