Commit Graph

370 Commits

Author SHA1 Message Date
Arpit Jalan
6148ae8775 Update Translations 2015-06-17 22:05:22 +05:30
Neil Lalonde
d9efb37ec7 Update translations 2015-06-11 15:35:01 -04:00
Arpit Jalan
7bc3a6fff0 Update Translations 2015-06-10 18:10:46 +05:30
Arpit Jalan
45a7c314c2 Update Translations 2015-06-03 20:39:08 +05:30
Arpit Jalan
1ac4e60c90 Update Translations 2015-06-01 23:33:27 +05:30
Arpit Jalan
5880313e84 Update Translations 2015-05-26 20:08:20 +05:30
Arpit Jalan
56544f2048 Update Translations 2015-05-21 00:24:12 +05:30
Arpit Jalan
ee960899df Update Translations 2015-05-06 21:32:11 +05:30
Arpit Jalan
787b30c354 Update Translations 2015-04-29 22:38:29 +05:30
Arpit Jalan
574052b786 Update Translations 2015-04-22 19:05:15 +05:30
Arpit Jalan
77baae13bc Update Translations 2015-04-13 23:58:48 +05:30
Arpit Jalan
8623f179ff Update Translations 2015-04-09 20:58:06 +05:30
Arpit Jalan
47525c6af4 Update Translations 2015-04-01 22:16:57 +05:30
Arpit Jalan
7acae703d9 Update Translations 2015-03-24 20:57:12 +05:30
Arpit Jalan
27a793073a Update Translations 2015-03-18 18:27:27 +05:30
Robin Ward
354b9ccf3b Allow users to choose "Every 3 days" as a digest frequency 2015-03-10 16:04:48 -04:00
Arpit Jalan
ade082c072 Update Translations 2015-03-02 21:59:07 +05:30
Arpit Jalan
253ba977ef Update Translations 2015-02-25 22:47:17 +05:30
Arpit Jalan
5c61661b7c Update Translations 2015-02-19 21:41:24 +05:30
Arpit Jalan
439f13b040 Update Translations 2015-02-13 19:37:41 +05:30
Arpit Jalan
ba0cb45f4b Update Translations 2015-02-04 00:20:05 +05:30
Arpit Jalan
a144e61440 Update Translations 2015-01-21 22:58:30 +05:30
Arpit Jalan
2aff46532c Update Translations 2015-01-14 21:22:13 +05:30
Arpit Jalan
8f06e8f708 Update Translations 2015-01-12 19:53:52 +05:30
Arpit Jalan
28dfde8194 Update Translations 2015-01-02 19:04:05 +05:30
Arpit Jalan
fa8ba67523 Update Translations 2014-12-29 19:06:33 +05:30
Arpit Jalan
d0ddbc4cb4 Update translations 2014-12-13 00:40:01 +05:30
Arpit Jalan
45c2a24075 Update Translations 2014-12-07 22:32:13 +05:30
Arpit Jalan
44e694819d Update Translations 2014-12-04 19:48:21 +05:30
Arpit Jalan
cd8ab37507 Update Translations 2014-11-27 20:28:52 +05:30
Arpit Jalan
e04cc1c9f5 Update Translations 2014-11-21 18:09:29 +05:30
Arpit Jalan
dbd5823881 Update Translations 2014-11-17 21:35:06 +05:30
Neil Lalonde
1565bd5e67 Update translations 2014-11-06 15:16:58 -05:00
Neil Lalonde
718854f055 Update translations 2014-10-30 17:30:05 -04:00
Arpit Jalan
d0cf73f105 Update Translations 2014-10-23 20:15:56 +05:30
Arpit Jalan
8bd2bf9f29 Update Translations 2014-10-19 21:37:25 +05:30
Arpit Jalan
92efee088e Add missing transation files and update translations 2014-10-16 23:25:34 +05:30
Robin Ward
285c66b899 FIX: Say the file uploaded is too large, not "image" as you can upload
other kinds of files.
2014-10-09 16:03:04 -04:00
Arpit Jalan
648e7b90f4 Update Translations 2014-10-09 01:37:59 +05:30
Neil Lalonde
4f461739fb Update translations 2014-10-03 10:41:37 -04:00
Arpit Jalan
6989557a26 Update Translations 2014-09-30 19:53:17 +05:30
Robin Ward
6c275cd64d Update i18n keys for site_content rename 2014-09-24 16:13:48 -04:00
Arpit Jalan
b8b20cb9af Update Translations 2014-09-23 21:17:42 +05:30
Arpit Jalan
6455dc7580 Add pl_PL translations for Poll plugin and update translations 2014-09-14 23:52:24 +05:30
Arpit Jalan
93d9fe0497 Update Translations 2014-09-04 21:48:58 +05:30
Arpit Jalan
be8249f113 Update Translations 2014-08-28 08:52:11 +05:30
Arpit Jalan
02d05ca2ab Update Translations 2014-08-26 23:07:10 +05:30
Arpit Jalan
2e89ee953e Update Translations 2014-08-21 23:44:58 +05:30
Robin Ward
db4abe76db CLEANUP: Remove dead resetRead code path 2014-08-18 14:35:33 -04:00
Arpit Jalan
8c2476100b Update Translations 2014-08-18 20:47:59 +05:30
Arpit Jalan
e98a6cf993 Update Translation 2014-08-15 23:32:14 +05:30
Arpit Jalan
38d6e74c0b Update translation to fix missing strings 2014-08-12 11:35:33 +05:30
Arpit Jalan
3339b30001 Update Translations 2014-08-09 02:04:01 +05:30
Arpit Jalan
2820bd34da Update Translations 2014-08-01 20:02:56 +05:30
Arpit Jalan
2413da4157 Update translations 2014-07-25 19:05:28 +05:30
Arpit Jalan
37981fb258 Update translations 2014-07-17 10:33:49 +05:30
Arpit Jalan
842f317d62 Update translations 2014-07-11 01:37:19 +05:30
Neil Lalonde
337630a216 Update translations 2014-07-02 16:42:59 -04:00
Arpit Jalan
923fa4646b Update Translations 2014-06-30 16:21:43 +05:30
Arpit Jalan
7dd7c5eb11 Update Translations 2014-06-19 17:49:05 +05:30
Neil Lalonde
a8c1babbfe Update translations 2014-06-10 10:48:27 -04:00
Arpit Jalan
96b72c7615 Update translations 2014-06-10 03:07:50 +05:30
Arpit Jalan
0571d500c9 Update translations 2014-05-30 07:08:40 +05:30
Neil Lalonde
56bd657d76 Update translations 2014-05-23 19:20:16 -04:00
Arpit Jalan
f8255f4443 Update translations 2014-05-22 22:28:47 +05:30
Neil Lalonde
f111e4ba56 Update translations 2014-05-14 12:37:00 -04:00
Jeff Atwood
5a22385b76 unread_message_count is just a string now 2014-05-13 22:15:06 -07:00
Neil Lalonde
11c0eb8db3 Update translations 2014-05-07 10:33:41 -04:00
Neil Lalonde
cb2bcb89ff Update translations 2014-05-02 14:01:27 -04:00
Neil Lalonde
0f4014eef1 Update translations 2014-04-24 10:53:04 -04:00
Régis Hanol
de53385ed2 display the copy & paste images hint to FF users too 2014-04-23 18:49:54 +02:00
Neil Lalonde
31043275d3 Update translations from Transifex 2014-04-14 11:53:25 -04:00
Neil Lalonde
6b0cae8910 Update translations 2014-04-11 11:53:02 -04:00
Neil Lalonde
cb11967715 Add transifex config. Reconcile client.yml and server.yml translations in github and transifex. Transifex is now the source of all client.yml and server.yml files. 2014-04-10 15:42:38 -04:00
Onaldanm
750745ba5f French Translations Updates
Updates client and server
Fix wrong "active" in privacy.html
Use same same terms between faq/tos/privacy page.
2014-03-26 11:24:58 +01:00
Onaldanm
134af37cbd Badges, poll and french Translation
New Badges system
New string in the poll plugin + change the term "poll option"
Re-add some empty strings (like notifications.title)
And updates
2014-03-17 11:21:47 +01:00
Onaldanm
761dccbe73 French Translation
Big update translation from Transifex

Changelog:
- topic = sujet
- Uniformisation des termes
2014-03-14 16:12:11 +01:00
Jeff Atwood
aea608c81c simplify version number display a bit 2014-03-12 17:13:39 -07:00
Jeff Atwood
d5ec409434 add Transifex link to header of translation files 2014-03-04 14:35:23 -08:00
infogulch
bf21a55571 Explicit button text in abandon dialog in all lang
The current post abandon dialog displays typical yes/no buttons and should
instead show more informative button text.

This commit updates all `config/locales/client.*.yml` files and *alters the
structure* of the `post.abandon` node, and *adds three new nodes* under it:
`confirm`, `yes_value`, and `no_value`. The current value of the
`post.abandon` node is moved into `post.abandon.confirm` for all languages.
For English language text, the nodes `post.abandon.yes_value` and
`.no_value` are changed to `"Yes, abandon"` and `"No, keep"`, respectively.
For other languages, the standard yes/no values are copied, allowing simple
copyedits to make them more explicit in the future.

I also make the necessary changes to the `composer_controller.js` file so
the new values are used correctly.
2014-02-28 23:42:14 -06:00
voisintotoro
5723124be9 Updated French tranlations 2014-02-23 20:46:18 +01:00
Régis Hanol
0fefdb3ed9 Merge pull request #1980 from Onaldanm/patch-fr-bulk
Add topics.bulk french translation
2014-02-20 10:15:30 +01:00
Onaldanm
7d1a39de84 Add topics.bulk french translation
First proposition, I hope doing it correctly :)

Fix extra space
2014-02-20 03:31:56 -05:00
Jonathan Allard
c513725f26 Allow users to toggle interface language in their preferences 2014-02-18 14:53:59 -05:00
Sam
7ad00f426c FEATURE REMOVAL: persona login
see: https://meta.discourse.org/t/pulling-persona-out-of-discourse-core/12613
2014-02-11 16:56:48 +11:00
Jonathan Allard
862faf2a17 Locales/fr: Add filter strings and change :read_more_MF 2014-02-08 18:51:18 -05:00
Sam
227873df78 FEATURE: proper mailing list mode
once enable_mailing_list_mode is enabled any user can elect
to get every post via email unless they opt out of category or topic
2014-02-07 11:07:52 +11:00
Neil Lalonde
b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Francis Brunelle
94846f6a0a remplacer conversation par discussion (French locale) 2014-01-29 06:20:46 -05:00
Francis Brunelle
ca1695406b minor corrections for French locale 2014-01-28 07:27:14 -05:00
Robin Ward
4981525047 REFACTOR: Fixes poor class hierarchy for listing topics
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
Sam
e20f5f89e6 Merge pull request #1795 from ok-harry/master
internationalize Discourse.Formatter.tinyDateYear
2014-01-12 14:34:10 -08:00
Julien Grillot
8bf8ab03fc Restore fr.topic.notifications.title 2014-01-11 00:19:38 +01:00
Neil Lalonde
52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
voisintotoro
e1dcb0272a Updated French translation 2014-01-08 22:00:17 +01:00
Harry Seo
7713dfb8b0 internationalize Discourse.Formatter.tinyDateYear 2014-01-07 21:32:33 +09:00
Régis Hanol
a1f80e9e51 fixed a couple typos in the French translations 🇫🇷 2014-01-06 12:14:01 +01:00
Julien Grillot
9c049d9e43 Update french locales 2014-01-05 15:48:29 +01:00
Julien Grillot
54b2242d6b similar_topics french locale was rough 2013-12-23 14:42:57 +01:00
voisintotoro
cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva)
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
2013-12-12 11:46:36 +01:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Robin Ward
b646495798 Remove unused translations 2013-12-06 13:16:04 -05:00
Gilles Manzato
e6995945ea Update french translation 2013-11-21 09:17:15 +01:00
Robin Ward
f5fc0b6b55 Only show external link icons, use the wikipedia-style icon. 2013-11-19 12:42:19 -05:00
Gilles Manzato
231fa9c2c0 Update french translation 2013-11-19 01:00:05 +01:00
Robin Ward
a2466d182f Added Participants, Likes to Topic Map 2013-11-18 13:49:53 -05:00
Robin Ward
4ce81e1b01 Rename "Best Of" to "Summary" 2013-11-18 12:48:26 -05:00
Robin Ward
ad3e276b4b Rename TopicSummary -> TopicMap 2013-11-18 12:08:21 -05:00
Neil Lalonde
0c6f794eb0 Used the term suspended instead of banned. 2013-11-07 13:53:49 -05:00
Robin Ward
52c3457133 Site setting to support showing real names in posts. Also put back in type to search on site settings 2013-11-01 16:32:12 -04:00
Robin Ward
7ef76fd4c3 Change "Create XXX Topic" to "Create Topic" 2013-10-31 16:29:41 -04:00
Robin Ward
bb135fafb4 Replace slow auto-filter in site settings with a filter button 2013-10-29 17:03:50 -04:00
Gilles Manzato
b3e65c937b Update french locale 2013-10-29 21:14:48 +01:00
Gilles Manzato
524bd5ec70 Add missing translation in FR 2013-10-25 14:03:06 +02:00
Sam
666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate
this cleans up a bunch of internals and removes some settings
2013-10-24 12:08:02 +11:00
voisintotoro
b997cc2486 New update of the french translation
I hope i didn't missed some of the previous remarks.
2013-10-16 22:10:29 +02:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Régis Hanol
4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Régis Hanol
dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Régis Hanol
e397c14702 updated locales 2013-08-13 22:09:36 +02:00
Régis Hanol
faeb4a9ebd enhance upload selector
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
2013-08-02 01:30:18 +02:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
uploads selector texts is now different when attachments are enabled
2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion
Add confirmation modal to admin group deletion
2013-07-23 00:43:06 -07:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
46ff98f2d3 fix composer toolbar upload title 2013-07-17 01:21:27 +02:00
Régis Hanol
36e6345eee change the icon in the composer toolbar with a more generic upload icon
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Régis Hanol
3397c2235f display the size of the attachment in the preview
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
Neil Lalonde
ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Régis Hanol
45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02:00
Régis Hanol
7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Robin Ward
f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions
Conflicts:
	app/models/site_setting.rb
2013-07-03 11:18:42 -04:00
ThomasHarper
64a00e284e Update client.fr.yml
Missing capital on homepage
2013-07-03 11:43:52 +02:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
ThomasHarper
0382ec319e Update client.fr.yml 2013-06-28 16:38:10 +02:00
Robin Ward
251d169c0d Merge pull request #1104 from ThomasHarper/patch-5
Update client.fr.yml
2013-06-28 07:21:10 -07:00
ThomasHarper
71464c0c31 Update client.fr.yml
dynamic_favion added
2013-06-28 16:04:20 +02:00
ThomasHarper
80e886bfde Update client.fr.yml
Adding few translations again
2013-06-28 15:58:19 +02:00
ThomasHarper
a94947f5b0 Update client.fr.yml
Adding missing fr translation
2013-06-28 15:25:05 +02:00
Robin Ward
bad7707cf3 Merge pull request #1082 from ThomasHarper/patch-2
Update client.fr.yml
2013-06-24 06:28:51 -07:00
ThomasHarper
b8960f26c9 Update client.fr.yml
Dates were missing and few stuff on back end
2013-06-24 12:43:02 +03:00
ThomasHarper
fadab25609 Update client.fr.yml
Missing quote
2013-06-24 12:01:42 +03:00
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward
0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Régis Hanol
2daf3ba8ca keep French localization up to date
🇫🇷
2013-05-30 00:18:29 +02:00
Régis Hanol
402af452c2 keep French localization up to date
🇫🇷
2013-05-27 21:29:26 +02:00
Régis Hanol
7594aef906 keep French l10n up to date
🇫🇷
2013-05-21 00:46:24 +02:00
Jeff Atwood
7cf3f16d62 add YAML lint hint to the top of lang YAML files 2013-05-17 16:54:07 -07:00
Régis Hanol
64ba7c75f4 keep French l10n up to date
🇫🇷
2013-05-17 00:20:23 +02:00
Régis Hanol
fe18527989 keep French l10n up to date
🇫🇷
2013-05-15 02:01:31 +02:00
Régis Hanol
af773ab4ea keep French l10n up to date 2013-05-10 15:48:47 +02:00
Régis Hanol
16c8836977 keep French l10n up to date 2013-05-10 00:22:02 +02:00
Régis Hanol
82450ac67e keep French l10n up to date 2013-05-05 01:34:57 +02:00
Régis Hanol
3a0e41ab90 keep French l10n up to date
🇫🇷
2013-05-03 00:04:04 +02:00
Régis Hanol
2c1b75fc36 keep French l10n up to date
🇫🇷
2013-05-02 00:07:23 +02:00
Régis Hanol
4d6f6a8322 keep French l10n up to date 2013-04-24 02:09:36 +02:00
Régis Hanol
3743287f12 keep French l10n up to date 2013-04-20 23:14:02 +02:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Sam
b81da5ee66 Merge pull request #722 from ZogStriP/keep-french-l10n-up-to-date
keep French l10n up to date
2013-04-17 01:10:28 -07:00
Régis Hanol
7c1eb16aec keep French l10n up to date 2013-04-17 02:29:37 +02:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
Régis Hanol
efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Régis Hanol
ed790384b0 keep French l10n up to date 2013-04-12 00:07:14 +02:00
Régis Hanol
a7bdbd863e keep French l10n up to date 2013-04-10 15:48:59 +02:00
Régis Hanol
a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00
Régis Hanol
1793f3e3bb keep French l10n up to date 2013-04-05 23:17:57 +02:00
Robin Ward
0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images
prevent users from uploading files other than images
2013-04-03 07:39:55 -07:00
Régis Hanol
a02b8730de keep French l10n up to date 2013-04-03 10:41:30 +02:00
Régis Hanol
3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Régis Hanol
7918bef7ff keep French l10n up to date 2013-04-02 01:09:08 +02:00
Robin Ward
75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload
improved images upload on the client side
2013-04-01 07:11:26 -07:00
Régis Hanol
72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Régis Hanol
f5567c10e3 keep French l10n up to date 2013-03-30 16:25:08 +01:00
Régis Hanol
6b4022dbfc keep French l10n up to date 2013-03-29 01:00:16 +01:00
Régis Hanol
518203281d keep French l10n up to date 2013-03-28 03:19:23 +01:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde
35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Neil Lalonde
4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Régis Hanol
1db78185e0 keep French l10n up to date 2013-03-27 02:00:21 +01:00
Régis Hanol
386967c56e keeping French l10n up to date 2013-03-25 23:15:10 +01:00
Robin Ward
cb9106c3a7 Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-2013-03-22
keep French l10n up to date [ci skip]
2013-03-23 07:38:03 -07:00
Jeff Atwood
38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Régis Hanol
d2e47cad5f keep French l10n up to date 2013-03-22 23:57:23 +01:00
habfast
bc1aa12b02 Improving french translation
Quoting everything
minor correction for respecting french grammar rules
2013-03-22 15:15:32 +01:00
Régis Hanol
ce33432ac4 keeping the French l10n up to date 2013-03-21 22:12:48 +01:00
Neil Lalonde
40962c84ca Add 'all' column to admin dashboard counts 2013-03-21 16:51:50 -04:00
Régis Hanol
6dc630383e keep French l10n up to date 2013-03-20 23:52:51 +01:00
Régis Hanol
54399e4d2e keep French l10n up to date 2013-03-20 02:12:20 +01:00
Robin Ward
79884284c4 Add utf-8 headers to all ymls 2013-03-19 16:11:58 -04:00
Sam
0e1174dbe8 Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-with-status
keep favorite/star button's title in sync with starred status
2013-03-18 21:48:12 -07:00
Régis Hanol
967b03fcfc keep favorite/star button's title in sync with starred status 2013-03-18 18:57:03 +01:00
Régis Hanol
43e13cf3ea keeping french l10n up to date 2013-03-18 18:23:19 +01:00
Robin Ward
4e057335d5 Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
Régis Hanol
de58e30a8f keeping the French l10n up to date 2013-03-16 00:40:33 +01:00
Robin Ward
1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
2013-03-15 16:49:17 -04:00