Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge branch 'integration/master' into rhbz1004620
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Jul 7, 2015
2 parents 3cd7f88 + 243ef95 commit 21ea07e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions docs/release-notes.md
Expand Up @@ -4,6 +4,7 @@
* [1233524](https://bugzilla.redhat.com/show_bug.cgi?id=1233524) - Update project search page to include user
* [1235070](https://bugzilla.redhat.com/show_bug.cgi?id=1235070) - Copied translations (using copy trans) should not be taken into account as contributions in the stats
* [1004620](https://bugzilla.redhat.com/show_bug.cgi?id=1004620) - Import TM box should disable the Import button when no file specified
* [1002386](https://bugzilla.redhat.com/show_bug.cgi?id=1002386) - Capitalised proper nouns in project type description

-----------------------

Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/main/resources/messages.properties
Expand Up @@ -45,8 +45,8 @@ jsf.project.projectType.Description=Help: Creating a project and project type
jsf.iteration.projectType.Description=Help: Creating a version and project type
jsf.projectType.NotSpecifiedBehaviour=If no project type is specified, the type from containing project is used.
jsf.projectType.detail.File=For plain text, Libre Office, InDesign, HTML, Subtitles etc.
jsf.projectType.detail.Gettext=For gettext software strings.
jsf.projectType.detail.Podir=For publican/docbook strings.
jsf.projectType.detail.Gettext=For Gettext software strings.
jsf.projectType.detail.Podir=For Publican/Docbook strings.
jsf.projectType.detail.Properties=For Java properties files.
jsf.projectType.detail.Utf8Properties=For UTF8-encoded Java properties.
jsf.projectType.detail.Xliff=For supported XLIFF files.
Expand Down

0 comments on commit 21ea07e

Please sign in to comment.