To check out this repository please hg clone the following URL, or open the URL using EasyMercurial or your preferred Mercurial client.

Statistics Download as Zip
| Branch: | Tag: | Revision:

root / config / locales / en-GB.yml @ 442:753f1380d6bc

History | View | Annotate | Download (41.8 KB)

# Date Author Comment
442:753f1380d6bc 2011-06-06 02:41 PM Chris Cannam

Merge from branch "redmine-1.2"

441:cbce1fd3b1b7 2011-06-06 02:24 PM Chris Cannam

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

318:f7c525dc7585 2011-03-28 06:17 PM Luis Figueira

Merge from branch "live"

314:c80103b81194 2011-03-28 06:05 PM Chris Cannam

Merge from branch "feature_117"

313:862e47cc1e09 2011-03-28 06:04 PM Chris Cannam

Merge from branch "bug_97"

310:b9c2ba9e49b4 2011-03-28 05:50 PM Chris Cannam

Merge from branch "feature_73"

308:766ad4e52e6e 2011-03-28 05:41 PM Chris Cannam

Merge from branch "feature_117"

307:c7d3b58bd01c 2011-03-28 05:41 PM Chris Cannam

Produce a single en.yml which contains British texts but describes itself as just English.
The difference between en and en-GB is minimal for this application, apart from date formats, and the pain in maintaining both is significant. See #117 and #58.

304:6c56a595dc1c 2011-03-28 05:32 PM Chris Cannam

Merge from branch "feature_73"

303:93b4cfd3aaaa 2011-03-28 05:30 PM Chris Cannam

Merge from branch "bug_97"

295:3b367754d2b0 2011-03-24 01:00 PM Luis Figueira

merge from branch bug_97

294:ba87afa76607 2011-03-24 12:52 PM Luis Figueira

fixed template variable problems; created subject label; fixed old labels

293:b133cb3ce3b1 2011-03-24 10:04 AM Luis Figueira

new format for label variables.

292:5f4ac0a159fa 2011-03-23 10:22 PM Luis Figueira

DEV commit: created template; need to solve bug in template variables.

289:2de308601155 2011-03-23 11:33 AM Chris Cannam

Merge from branch "bug_95"

284:23c69f60a959 2011-03-23 11:19 AM Chris Cannam

Merge from branch "bug_95"

282:f7e79424e753 2011-03-22 02:16 PM Luis Figueira

merge from branch bug_95

280:d242e28efb23 2011-03-22 02:14 PM Luis Figueira

merge from feature_72

279:782d4fc319bb 2011-03-21 06:02 PM Luis Figueira

added the description; changed the roles labels. minor fixes to layout.

277:ab672e427b9b 2011-03-21 04:02 PM Chris Cannam

Merge from branch "feature_72"

275:ec56461d3770 2011-03-21 02:40 PM Luis Figueira

the status messages now depend on the repository type.

264:7b74f431bdab 2011-03-04 04:04 PM Chris Cannam

Merge from branch "feature_80"

263:797be8798817 2011-03-04 04:02 PM Chris Cannam

Add "translation"

250:c90c42a771ec 2011-03-03 02:38 PM Chris Cannam
  • Restore further things broken during merge
247:73ff0e6a11b1 2011-03-03 12:11 PM Chris Cannam
  • Merge from branch cannam-pre-20110113-merge
246:eeebe205a056 2011-03-03 12:02 PM Chris Cannam
  • Merge from default branch, bringing us up to SVN trunk rev 4993
245:051f544170fe 2011-03-03 11:42 AM Chris Cannam
  • Update to SVN trunk revision 4993
240:6c282df74a30 2011-02-22 04:50 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge"

238:83bf35c4f9d1 2011-02-18 10:02 AM Chris Cannam

Merge from branch "bug_83"

236:2241ff65dd33 2011-02-17 07:48 PM Chris Cannam

Merge from branch "live"

235:61f66ddb0b65 2011-02-17 07:48 PM Chris Cannam

Merge from branch "live"

232:e77e267057c8 2011-02-17 07:10 PM Chris Cannam

Merge from branch "feature_20" (initial implementation of #20).

231:5d6e2819f3dd 2011-02-17 06:35 PM Chris Cannam

Merge from branch "feature_20". This initial implementation of #20 has been tested, but needs to be tested again in the proper context.

229:344f68e4b103 2011-02-17 04:43 PM Chris Cannam

Merge from branch "luisf". This merges the label change from Files to Downloads

227:5f386daac32d 2011-02-17 04:33 PM Luis Figueira

renamed files to downloads

210:0579821a129a 2011-02-08 01:51 PM Chris Cannam

Update to Redmine trunk rev 4802

209:ff5112f823e5 2011-02-08 01:24 PM Chris Cannam

Merge from branch "feature_72", to provide just enough of the site support for external repos to permit testing while developing the conversion code

204:6849e7b210c7 2011-02-07 05:20 PM Luis Figueira

text field for external repo URL

201:61d8fba252fd 2011-02-07 04:04 PM Luis Figueira

external repository check box.

200:abc11f2ead72 2011-02-07 02:21 PM Chris Cannam

Add some missing GB "translations"

199:55c3f4afe85d 2011-02-07 02:17 PM Chris Cannam

Merge from branch "live"

198:5d8c3fe4e7e2 2011-02-07 02:16 PM Chris Cannam

Merge from branch "cannam-pre-20110113-merge". Brings in table reorganisation for Projects page; moves our scripts from extra/svn to extra/soundsoftware; reduces page min-width

197:5da98461a9f6 2011-02-07 02:13 PM Chris Cannam

Merge from branch "live"

196:2eaccf99a7b0 2011-02-07 02:07 PM Chris Cannam

Merge from branch "live"

195:172b8d25c1ae 2011-02-07 01:47 PM Chris Cannam

Merge from branch "feature_64"

194:c56dcdfe6722 2011-02-07 01:16 PM Chris Cannam

Merge from branch "feature_64"

193:90cc857e968a 2011-02-07 12:52 PM Luis Figueira

Merge from branch "feature_64"

192:d1713ab10813 2011-02-07 12:30 PM Luis Figueira

feature_64: link to terms and conditions wiki page; fixed form resubmission bug.

190:440c4f4bf2d6 2011-02-03 05:11 PM Luis Figueira

created the model validation and the checkbox in the registration view.

184:b46db3a8b1b4 2011-02-03 03:15 PM Chris Cannam

Merge from branch "feature_55"

163:9a5a265e77f0 2011-01-31 06:10 PM Luis Figueira

labels correctly named
institution field is now mandatory and validated.

155:1ca23eedd587 2011-01-27 11:04 AM Chris Cannam
  • More helpful names for the project modules -- especially the Embedded module
150:857ac9ccf613 2011-01-24 02:18 PM Chris Cannam

Merge from branch "live"

143:0460c75392bc 2011-01-21 02:31 PM Luis Figueira

development commit: terms and conditions

136:bf38a7365edf 2011-01-19 03:34 PM Chris Cannam

Merge fixes for bug #51 and bug #35 from branch "cannam-pre-20110113-merge"

135:6a2f8e88344e 2011-01-19 01:27 PM Chris Cannam

Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)

134:c7d72c765cc6 2011-01-19 12:41 PM Chris Cannam

Make repo-to-be-created text a label string, and make it a bit more helpful

133:1890a968b404 2011-01-18 05:22 PM Chris Cannam
  • Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy
132:ab611b7c7ecc 2011-01-18 05:02 PM Chris Cannam

Make the project list into a sortable table with a little more information in it

127:32b5adec7422 2011-01-19 01:27 PM Chris Cannam

Bug #51: make New Member box show matching users only when at least 2 characters have been typed in search (avoid really long results lists)

126:11e93d30115a 2011-01-19 12:41 PM Chris Cannam

Make repo-to-be-created text a label string, and make it a bit more helpful

125:ca48d8b6f55d 2011-01-18 05:22 PM Chris Cannam
  • Show Public or Private next to my projects; fix ordering of my projects so as to retain hierarchy
124:bc91f2025d05 2011-01-18 05:02 PM Chris Cannam

Make the project list into a sortable table with a little more information in it

120:cd2282d2aa55 2011-01-13 02:33 PM Chris Cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).

119:8661b858af72 2011-01-13 02:12 PM Chris Cannam
  • Update to Redmine trunk rev 4705
118:b859cc0c4fa1 2011-01-13 01:21 PM Chris Cannam

Merge from branch "redmine-1.1"

117:af80e5618e9b 2011-01-13 12:53 PM Chris Cannam
  • Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
114:8a205cc048de 2011-01-06 10:41 AM Chris Cannam
  • Add a missing GB "translation"
103:d206f38ae405 2010-12-16 05:46 PM Luis Figueira

Merge from branch "live"

102:dc252f2ddef5 2010-12-16 05:42 PM Luis Figueira

- Removed Wiki Toolbar from DEscription input box
- Added the Institution dropdown to the registration view

101:2248a45897a0 2010-12-16 04:44 PM Chris Cannam

Merge from branch "cannam"

100:1412841d48a3 2010-12-16 04:29 PM Chris Cannam
  • Projects page: If I'm logged in but have no projects, use single All Projects heading
  • Projects page: Rename "Other Projects" to "Everyone Else's Projects"
  • Projects page: Remove stars from my project links; remove key explaining star
  • Projects page: Reorder top-right nav links to isolate the "+ New Project" icon
97:5467cbbf393b 2010-12-16 01:43 PM Luis Figueira

Merge from branch "live"

96:98b2834d136b 2010-12-16 01:29 PM Chris Cannam

Merge from branch "cannam". Includes changes merged previously from luisf branch to provide user description field etc.

95:74cb18079dd6 2010-12-16 01:27 PM Chris Cannam

Separate out Home (link) and Home (heading) texts

90:dc814db90c47 2010-12-16 11:18 AM Chris Cannam

Further minor textual fix

89:e2700bca4679 2010-12-16 11:16 AM Chris Cannam

Minor textual fix

88:13e6e1e853a2 2010-12-16 11:15 AM Chris Cannam

Add a more descriptive explanation for Description field, and propagate it across to en-GB

87:6cdfe738a02d 2010-12-16 10:22 AM Chris Cannam

Restore luisf changes to locales file (lost in confusion because I had somehow ended up changing every line with Windows line endings)

86:680871aa9cb1 2010-12-16 10:21 AM Chris Cannam

Restore Unix line endings (grrr)

84:432bb11e0390 2010-12-16 10:03 AM Chris Cannam

Merge from branch "luisf"

76:8a49eabbb30a 2010-12-14 02:05 PM Chris Cannam
  • Change Home label to "Welcome!"
75:b9c2324779f6 2010-12-14 11:03 AM Chris Cannam
  • Some textual fixes
66:29d087fde142 2010-12-06 01:48 PM Luis Figueira

Correctly prints the error messages if user description is blank.

60:cf39b52d24b4 2010-12-01 06:04 PM Luis Figueira

DEVELOPMENT COMMIT: The description can now be seen and edited BUT when a new user registers the informations is not saved to the correct table.

51:371eac10df0b 2010-11-24 12:20 PM Chris Cannam
  • Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
50:97333e644a2c 2010-11-23 03:59 PM Chris Cannam

Merge

47:22ae926000f9 2010-11-23 12:47 PM Luis Figueira

Added Notifications Area in Welcome page.
Minor changes to welcome page layout;

45:65d9e2cabaa3 2010-11-23 11:50 AM Luis Figueira

Added tipoftheday to the config/settings in order to correct previous issues.
Tip of the day is now working correctly.
Added the heading strings to the locales files.

41:7f0e922c8982 2010-11-19 02:45 PM Luis Figueira

merged with new version from trunk

38:33d69fee1d99 2010-11-19 01:41 PM Chris Cannam
  • Merge SVN update from default branch
37:94944d00e43c 2010-11-19 01:24 PM Chris Cannam
  • Update to SVN trunk rev 4411
25:9fd6221709a6 2010-09-24 03:51 PM Chris Cannam
  • Merge cannam branch
23:ca82a3468d27 2010-09-24 02:17 PM Chris Cannam
  • Merge SVN update from default
22:40f7cfd4df19 2010-09-24 02:06 PM Chris Cannam
  • Update to SVN trunk rev 4173
15:9c6c72729d91 2010-08-25 04:33 PM Chris Cannam
  • Merge from default (for SVN trunk update)
14:1d32c0a0efbf 2010-08-25 04:30 PM Chris Cannam
  • Update to SVN trunk (revisions 3892-4040)
1:cca12e1c1fd4 2010-07-28 12:08 PM Chris Cannam
  • Update to Redmine trunk (SVN revisions 3860-3892)
0:513646585e45 2010-07-23 03:52 PM Chris Cannam
  • Import Redmine trunk SVN rev 3859