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

    • -6
    • +7
    ./general-comments.de_DE.ISO-8859-1.xml
    • -0
    • +1
    ./general-comments.en_US.ISO-8859-1.xml
    • -3
    • +4
    ./general-comments.es_ES.ISO-8859-1.xml
    • -8
    • +9
    ./general-comments.it_IT.ISO-8859-1.xml
  1. … 7831 more files in changeset.
- update of russian catalog files as contributed by v v (see issue #3276)

    • -25
    • +25
    ./general-comments.ru_RU.utf-8.xml
Remove package version from catalog files

    • -1
    • +1
    ./general-comments.en_AU.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.nl_ZA.ISO-8859-1.xml
  1. … 8 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
    • +1
    ./general-comments.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.gl_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.it_IT.ISO-8859-1.xml
  1. … 1287 more files in changeset.
Greek catalogs for dotlrn

    • -0
    • +102
    ./general-comments.el_GR.utf-8.xml
  1. … 45 more files in changeset.
Merging dotlrn-all and dotlrn-extras from oacs-5-2

    • -0
    • +109
    ./general-comments.nl_ZA.ISO-8859-1.xml
  1. … 880 more files in changeset.
file general-comments.cs_CZ.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./general-comments.cs_CZ.utf-8.xml
file general-comments.nl_ZA.ISO-8859-1.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./general-comments.nl_ZA.ISO-8859-1.xml
First shot at merging oacs-5-2 apps used in .LRN to HEAD.

    • -1
    • +1
    ./general-comments.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.de_DE.ISO-8859-1.xml
    • -0
    • +106
    ./general-comments.en_AU.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.en_US.ISO-8859-1.xml
    • -0
    • +101
    ./general-comments.es_CO.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.gl_ES.ISO-8859-1.xml
    • -0
    • +101
    ./general-comments.hi_IN.utf-8.xml
    • -1
    • +1
    ./general-comments.it_IT.ISO-8859-1.xml
  1. … 2464 more files in changeset.
file general-comments.hi_IN.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./general-comments.hi_IN.utf-8.xml
file general-comments.ro_RO.utf-8.xml was initially added on branch oacs-5-2.

    • -0
    • +0
    ./general-comments.ro_RO.utf-8.xml
Added message keys

    • -1
    • +1
    ./general-comments.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.en_US.ISO-8859-1.xml
  1. … 33 more files in changeset.
remove the unused .ms_my locale files which conflict with the ms_MY on OS X and are just confusing to keep around

    • -101
    • +0
    ./general-comments.ms_my.utf-8.xml
  1. … 36 more files in changeset.
file general-comments.es_CO.ISO-8859-1.xml was initially added on branch oacs-5-1.

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

    • -0
    • +0
    ./general-comments.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

    • -0
    • +101
    ./general-comments.ca_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.da_DK.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.de_DE.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.en_US.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_ES.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.es_GT.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.fr_FR.ISO-8859-1.xml
    • -1
    • +1
    ./general-comments.gl_ES.ISO-8859-1.xml
    • -9
    • +9
    ./general-comments.it_IT.ISO-8859-1.xml
    • -0
    • +101
    ./general-comments.ms_MY.utf-8.xml
  1. … 2261 more files in changeset.
file general-comments.ca_ES.ISO-8859-1.xml was initially added on branch oacs-5-1.

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

    • -0
    • +0
    ./general-comments.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

    • -100
    • +0
    ./general-comments.AR_LB.utf-8.xml
    • -0
    • +101
    ./general-comments.ar_LB.utf-8.xml
    • -0
    • +101
    ./general-comments.es_GT.ISO-8859-1.xml
    • -0
    • +101
    ./general-comments.zh_CN.utf-8.xml
  1. … 682 more files in changeset.
file general-comments.ar_EG.utf-8.xml was initially added on branch oacs-5-1.

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

    • -0
    • +0
    ./general-comments.zh_CN.utf-8.xml
file general-comments.es_GT.ISO-8859-1.xml was initially added on branch oacs-5-1.

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

    • -0
    • +0
    ./general-comments.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

    • -27
    • +27
    ./general-comments.nl_NL.ISO-8859-1.xml
    • -0
    • +101
    ./general-comments.nn_NO.ISO-8859-1.xml
    • -2
    • +3
    ./general-comments.no_NO.ISO-8859-1.xml
  1. … 832 more files in changeset.
file general-comments.nn_NO.ISO-8859-1.xml was initially added on branch oacs-5-1.

    • -0
    • +0
    ./general-comments.nn_NO.ISO-8859-1.xml
added new keys

    • -34
    • +41
    ./general-comments.nl_NL.ISO-8859-1.xml
    • -8
    • +8
    ./general-comments.sv_SE.ISO-8859-1.xml
  1. … 81 more files in changeset.
added new keys

    • -5
    • +5
    ./general-comments.de_DE.ISO-8859-1.xml
    • -13
    • +34
    ./general-comments.ms_my.utf-8.xml
    • -32
    • +32
    ./general-comments.nl_NL.ISO-8859-1.xml
    • -1
    • +2
    ./general-comments.sv_SE.ISO-8859-1.xml
  1. … 287 more files in changeset.
merge of all changes on oacs-5-0 branch between tag openacs-5-0-0-final and jcd-merge-pre503 (except those in lars-blogger).

    • -0
    • +1
    ./general-comments.da_DK.ISO-8859-1.xml
    • -68
    • +67
    ./general-comments.de_DE.ISO-8859-1.xml
    • -0
    • +1
    ./general-comments.es_ES.ISO-8859-1.xml
    • -0
    • +1
    ./general-comments.it_IT.ISO-8859-1.xml
    • -0
    • +2
    ./general-comments.nl_NL.ISO-8859-1.xml
    • -0
    • +1
    ./general-comments.pt_BR.ISO-8859-1.xml
  1. … 286 more files in changeset.
exporting catalog files from the translation server

    • -27
    • +26
    ./general-comments.nl_NL.ISO-8859-1.xml
    • -1
    • +0
    ./general-comments.pt_PT.ISO-8859-1.xml
  1. … 133 more files in changeset.
removing obsolete catalog files

    • -74
    • +0
    ./general-comments.fi_FI.ISO-8859-15.xml
  1. … 23 more files in changeset.