[zanata/zanata] 49ce2a: rhbz836092 - Add assamese plural form.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
      https://github.com/zanata/zanata/commit/49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  rhbz836092 - Add assamese plural form.

Also added a default plural form (no plurals allowed by default) when no plural form is detected.


  Commit: 0074c94b6b9001ce399e88fb8b5760faef942404
      https://github.com/zanata/zanata/commit/0074c94b6b9001ce399e88fb8b5760faef942404
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Merge branch '1.6' into integration/master


  Commit: fb64a3c79e222aa70c23d5416e5555246952010f
      https://github.com/zanata/zanata/commit/fb64a3c79e222aa70c23d5416e5555246952010f
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
      https://github.com/zanata/zanata/commit/deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-common to 1.6.1


  Commit: 7b992e7a36110a321e41b5902de4e5d5e52e3013
      https://github.com/zanata/zanata/commit/7b992e7a36110a321e41b5902de4e5d5e52e3013
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  rhbz836092 - Allowing addition of locales for which no plural information is found.

A warning will be shown when this occurs but the system won't prevent the addition of the new locale. All other locale validation rules still apply.


  Commit: 0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
      https://github.com/zanata/zanata/commit/0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch '1.6' of github.com:zanata/zanata into 1.6


  Commit: 6baccfb516017da17584bd1e123f851b2d1bf955
      https://github.com/zanata/zanata/commit/6baccfb516017da17584bd1e123f851b2d1bf955
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge branch '1.6' into integration/master


Compare: https://github.com/zanata/zanata/compare/4e405272dd4f...6baccfb51601