aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated Norwegian bokmål translationKjartan Maraas2012-02-211-160/+195
* try installing telepathy-hazeGuillaume Desmottes2012-02-211-0/+21
* explain why the account has been disabledGuillaume Desmottes2012-02-211-2/+13
* accounts-dialog: hide the switch in butterfly accountsGuillaume Desmottes2012-02-211-2/+9
* Use the MSN account widget with HazeGuillaume Desmottes2012-02-211-1/+1
* protocol-chooser: stop using ButterflyGuillaume Desmottes2012-02-211-0/+4
* Updated Spanish translationDaniel Mustieles2012-02-211-157/+175
* Merge remote-tracking branch 'glassrose/debug-window-send-to-pastebin-button-...Guillaume Desmottes2012-02-212-21/+283
|\
| * License to publish the author's pastebin API developer key in openChandni Verma2012-02-212-1/+112
| * "Send to pastebin" button in EmpathyDebugWindowChandni Verma2012-02-211-21/+172
* | drag_data_received_individual_id: make sure manager is initializedGuillaume Desmottes2012-02-211-1/+1
* | Updated Galician translationsFran Diéguez2012-02-211-124/+124
* | tp_call_channel_add_content_async() now takes the directionGuillaume Desmottes2012-02-211-1/+2
* | Depend on tp-farstream 0.2.1Guillaume Desmottes2012-02-211-1/+2
* | Merge remote-tracking branch 'origin/call1' into master+callGuillaume Desmottes2012-02-2124-470/+272
|\ \
| * | Port DTMF code to new tp-glib APIXavier Claessens2012-01-271-63/+8
| * | Merge branch 'master' into call1Danielle Madeley2012-01-1721-5144/+5311
| |\ \
| * | | call-handler: also accept outgoing calls immediatelyDanielle Madeley2012-01-131-4/+15
| * | | call-handler: check the state before deferring the accept()Danielle Madeley2012-01-121-1/+7
| * | | Wait for call state to be INITIALISED before accepting incoming callXavier Claessens2012-01-101-21/+26
| * | | Remove tp-yell and use TpCallChannelXavier Claessens2012-01-1024-395/+230
* | | | depend on tp-glib 0.17.5Guillaume Desmottes2012-02-211-1/+1
* | | | Updated Danish translationKenneth Nielsen2012-02-211-1226/+1413
* | | | Updated Belarusian translation.Ihar Hrachyshka2012-02-201-238/+110
* | | | Updated Serbian translationМирослав Николић2012-02-202-472/+454
* | | | Updated Galician translationsFran Diéguez2012-02-201-255/+240
* | | | Updated Norwegian bokmål translationKjartan Maraas2012-02-191-582/+414
* | | | [l10n] Updated German doc translationChristian Kirbach2012-02-191-2637/+2632
* | | | [l10n] Updated Estonian translationMattias Põldaru2012-02-191-60/+28
* | | | Updated Swedish translationDaniel Nylander2012-02-191-1308/+1382
| |_|/ |/| |
* | | Updated Arabic translationAnas Afif Emad2012-02-191-1062/+1910
* | | Updated Bulgarian translationAlexander Shopov2012-02-181-1236/+1095
* | | Updated Spanish translationDaniel Mustieles2012-02-181-2478/+2715
* | | Use new documentation infraestructureJavier Jardón2012-02-174-9/+6
* | | chat-window: invite contacts using DnDGuillaume Desmottes2012-02-171-0/+72
* | | Patch to change Yes/No to Accept/RejectBrian Curtis2012-02-171-2/+2
* | | chat-window: display a phone icon in the tab labelGuillaume Desmottes2012-02-171-0/+13
* | | Updated Hebrew translation.Yaron Shahrabani2012-02-171-550/+610
* | | Updated Spanish translationDaniel Mustieles2012-02-171-204/+188
* | | Merge remote-tracking branch 'glassrose/add-All-service-selection-in-debug-wi...Guillaume Desmottes2012-02-171-304/+591
|\ \ \
| * | | Use gtk_list_store_insert_with_values ()Chandni Verma2012-01-281-22/+11
| * | | Un-pausing incoming messages should update All's active buffer tooChandni Verma2012-01-281-3/+8
| * | | Set window sensitivityChandni Verma2012-01-281-12/+17
| * | | Add incoming messages to All's bufferChandni Verma2012-01-281-11/+37
| * | | Refresh "All" selection's active-buffer when neededChandni Verma2012-01-281-34/+157
| * | | Add "All" selection to service_chooser and all_active_buffer to privChandni Verma2012-01-281-3/+35
| * | | Preparing for adding "All" option to service_chooserChandni Verma2012-01-281-13/+60
| * | | Factor out create_proxy_to_get_messagesChandni Verma2012-01-271-35/+60
| * | | Debug window - Use one active buffer and one pause buffer per serviceChandni Verma2012-01-271-270/+305
* | | | Updated POTFILES.inPiotr Drąg2012-02-171-3/+1
* | | | local-xmpp-assistant-widget: increase row-spacingGuillaume Desmottes2012-02-171-1/+1
* | | | use the 48x48 version of the local-xmpp iconGuillaume Desmottes2012-02-171-1/+1
* | | | move the second part of the message at the end of the widgetGuillaume Desmottes2012-02-171-8/+15
* | | | widget-local-xmpp: expand the entry fieldsGuillaume Desmottes2012-02-171-0/+6
* | | | local-xmpp-assistant-widget: inherit from a GtkGridGuillaume Desmottes2012-02-172-13/+8
* | | | salut-dialog: use 'Skip' instead of 'Ignore'Guillaume Desmottes2012-02-171-1/+1
* | | | remove empathy-auto-salut-account-helperGuillaume Desmottes2012-02-176-152/+0
* | | | Remove empathy-account-assistantGuillaume Desmottes2012-02-173-1421/+0
* | | | Stop using the accounts assistantGuillaume Desmottes2012-02-171-62/+5
* | | | empathy-accounts: remove --assistant optionGuillaume Desmottes2012-02-173-10/+3
* | | | accounts-dialog: suggest to create a salut accountGuillaume Desmottes2012-02-171-2/+68
* | | | Move should_create_salut_account to local-xmpp-assistant-widgetGuillaume Desmottes2012-02-175-29/+32
* | | | add empathy-local-xmpp-assistant-widgetGuillaume Desmottes2012-02-174-0/+345
* | | | accounts-dialog: display the import dialog if there is no accountGuillaume Desmottes2012-02-171-0/+17
* | | | Updated Spanish translationDaniel Mustieles2012-02-171-73/+77
* | | | accounts-dialog: improve the 'no protocol installed' messageGuillaume Desmottes2012-02-161-1/+1
* | | | accounts_dialog_add_account: select if that's the first account addedGuillaume Desmottes2012-02-161-3/+7
* | | | accounts-dialog: move the 'no protocol' message to a different pageGuillaume Desmottes2012-02-162-44/+48
* | | | accounts-dialog: remove hbox_protocolGuillaume Desmottes2012-02-162-29/+0
* | | | accounts-dialog: don't automatically open the add accountGuillaume Desmottes2012-02-161-9/+0
* | | | import-dialog: set a verb on the 'Ok' buttonGuillaume Desmottes2012-02-161-2/+4
* | | | import-dialog: expand and fill the import widgetGuillaume Desmottes2012-02-161-1/+1
* | | | Pass EmpathyConnectionManagers to the import widgetGuillaume Desmottes2012-02-166-30/+70
* | | | factor out display_import_dialog()Guillaume Desmottes2012-02-161-3/+11
* | | | remove useless includeGuillaume Desmottes2012-02-161-1/+0
* | | | coding style fixesGuillaume Desmottes2012-02-161-2/+2
* | | | Update Simplified Chinese translation.Wylmer Wang2012-02-161-1517/+1584
* | | | Updated Russian translationYuri Myasoedov2012-02-161-1160/+1262
* | | | Updated Belarusian translation.Ihar Hrachyshka2012-02-161-132/+145
* | | | empathy-chat: keep the individual manager alive as a cacheGuillaume Desmottes2012-02-151-0/+7
* | | | empathy-chat: use empathy_ensure_individual_from_tp_contact()Guillaume Desmottes2012-02-151-1/+2
* | | | add empathy_ensure_individual_from_tp_contact()Guillaume Desmottes2012-02-152-0/+23
* | | | add empathy_individual_manager_lookup_by_contact()Guillaume Desmottes2012-02-152-0/+56
* | | | set the presence message as a tooltip on its labelGuillaume Desmottes2012-02-151-0/+3
* | | | accounts-dialog: ellipsize presence messageGuillaume Desmottes2012-02-151-1/+1
* | | | Updated Galician translationsFran Diéguez2012-02-151-343/+357
* | | | Display a spinner while loading contacts from FolksGuillaume Desmottes2012-02-142-14/+85
* | | | individual-manager: add API to know when contacts have been loaded from folksGuillaume Desmottes2012-02-142-0/+46
* | | | Updated Serbian translationМирослав Николић2012-02-142-294/+316
* | | | Updated Spanish translationDaniel Mustieles2012-02-141-4/+5
* | | | tls-dialog: add accessor on the 'Continue' buttonGuillaume Desmottes2012-02-131-1/+1
* | | | Updated Spanish translationDaniel Mustieles2012-02-131-140/+150
* | | | Toggle telling others you are typing to themPatrick F. Allen2012-02-133-1/+21
* | | | Updated Serbian translationМирослав Николић2012-02-122-244/+180
* | | | Updated French doc translationBruno Brouard2012-02-121-3223/+629
* | | | Updated Belarusian translation.Ihar Hrachyshka2012-02-121-1202/+1242
* | | | Don't unhighlight chat tabs when more messages are receivedWill Thompson2012-02-113-29/+33
* | | | start_gnome_contacts: make sure individual is validGuillaume Desmottes2012-02-101-0/+2
* | | | fix individual_info_menu_item_activate_cb signatureGuillaume Desmottes2012-02-101-1/+2
* | | | ContactInfo: always escape IRC channel names in markupWill Thompson2012-02-101-1/+1
* | | | Updated Spanish translationDaniel Mustieles2012-02-101-75/+83
* | | | empathy-call: call XInitThreads()Guillaume Desmottes2012-02-091-0/+10
* | | | stop using clutter_gst_video_sink_new()Guillaume Desmottes2012-02-091-4/+11
* | | | Add a gsetting key to show/hide groupsGuillaume Desmottes2012-02-093-0/+9
* | | | account-widget-jabber: doesn't allow negative priorityGuillaume Desmottes2012-02-091-1/+1
* | | | Updated Spanish translationDaniel Mustieles2012-02-091-137/+122
* | | | Updated Serbian translationМирослав Николић2012-02-092-3442/+3938
* | | | po: Updated en_CA.poTiffany Antopolski2012-02-091-1763/+4103
* | | | contact-widget: use 'Personal Details' when editing our own infoGuillaume Desmottes2012-02-082-1/+10
* | | | [l10n] Update Japanese translationMako N2012-02-081-2158/+2187
* | | | Remove unused persona store/viewGuillaume Desmottes2012-02-085-2258/+0
* | | | remove linking UIGuillaume Desmottes2012-02-086-1203/+0
* | | | individual-menu: remove link-contacts-activated signalGuillaume Desmottes2012-02-082-34/+0
* | | | Remove 'Link Contact' menu itemGuillaume Desmottes2012-02-083-57/+5
* | | | disable clutter deprecation warnings for nowGuillaume Desmottes2012-02-081-0/+3
* | | | add missing config.hGuillaume Desmottes2012-02-082-0/+3
* | | | Try installing gnome-contacts using PackageKitGuillaume Desmottes2012-02-081-5/+47
* | | | add empathy-pkg-kitGuillaume Desmottes2012-02-083-0/+201
* | | | factor out start_gnome_contacts()Guillaume Desmottes2012-02-081-1/+7
* | | | Factor out show_gnome_contacts_error_dialog()Guillaume Desmottes2012-02-081-14/+19
* | | | improve TP_ERROR_STR_ALREADY_CONNECTED displayed error stringGuillaume Desmottes2012-02-081-1/+1
* | | | [l10n] Updated Estonian translationMattias Põldaru2012-02-081-586/+653
* | | | Updated Spanish translationDaniel Mustieles2012-02-081-891/+897
* | | | remove empathy-individual-information-dialogGuillaume Desmottes2012-02-074-381/+0
* | | | Use gnome-contacts instead of the information dialogGuillaume Desmottes2012-02-071-2/+56
* | | | [l10n] Updated German doc translationMario Blättermann2012-02-071-249/+270
* | | | add missing config.hGuillaume Desmottes2012-02-072-0/+3
* | | | remove released flagGuillaume Desmottes2012-02-071-1/+1
* | | | Update telepathy-yellEMPATHY_3_3_5Guillaume Desmottes2012-02-071-0/+0
* | | | prepare 3.3.5Guillaume Desmottes2012-02-072-2/+44
* | | | individual_menu_add_personas: remove useless variableGuillaume Desmottes2012-02-061-1/+0
* | | | account_widget_generic_format_param_name: make sure param_name is not NULLGuillaume Desmottes2012-02-061-0/+2
* | | | Make the default chat window size bigger.Ken VanDine2012-02-061-2/+2
* | | | Updated Galician translationsFran Diéguez2012-02-061-292/+382
* | | | Updated Norwegian bokmål translationKjartan Maraas2012-02-041-29/+55
* | | | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2012-02-042-519/+682
* | | | Updated Spanish translationDaniel Mustieles2012-02-031-26/+44
* | | | display a message if accounts need to be enabledGuillaume Desmottes2012-02-031-4/+83
* | | | display a specific message if no account is configuredGuillaume Desmottes2012-02-031-0/+27
* | | | add generic contact icon and account settings button to the message pageGuillaume Desmottes2012-02-032-4/+73
* | | | make code displaying the 'no match found' page more genericGuillaume Desmottes2012-02-031-16/+28
* | | | assistant: hide the buttons in the salut widgetGuillaume Desmottes2012-02-031-0/+2
* | | | Updated Slovenian translationMatej Urbančič2012-02-031-51/+91
* | | | Updated Norwegian bokmål translationKjartan Maraas2012-02-021-51/+100
* | | | Updated Spanish translationDaniel Mustieles2012-02-021-32/+37
* | | | presence-manager: stop watching connectivity changesGuillaume Desmottes2012-02-021-67/+3
* | | | Chat: show who changed the subjectWill Thompson2012-02-023-2/+34
* | | | Updated Telugu TranslationPraveen Illa2012-01-311-962/+1143
* | | | Updated Spanish translationDaniel Mustieles2012-01-311-15/+12
* | | | preferences: fix phrasing of the EMPATHY_PREFS_SOUNDS_CONTACT_LOGINGuillaume Desmottes2012-01-311-1/+1
* | | | individual_view_drag_end: remove the auto scrollGuillaume Desmottes2012-01-311-0/+6
* | | | Updated Spanish translationDaniel Mustieles2012-01-311-13/+63
* | | | Don't warn before leaving disconnected chatroomsWill Thompson2012-01-301-2/+14
* | | | Shorten "Leave chat room" to "Leave room"Will Thompson2012-01-301-1/+1
* | | | Special-case closing a window with exactly one tabWill Thompson2012-01-301-0/+13
* | | | Confirm closing windows containing chat rooms.Will Thompson2012-01-301-31/+115
* | | | Confirm closing chat room tabsWill Thompson2012-01-301-2/+59
* | | | Updated Slovenian translationMatej Urbančič2012-01-291-192/+212
* | | | Updated Norwegian bokmål translationKjartan Maraas2012-01-281-157/+170
* | | | auth-client: set keep above on dialogsGuillaume Desmottes2012-01-272-0/+4
* | | | Updated Hebrew translation.Yaron Shahrabani2012-01-271-288/+306
* | | | coding style fixGuillaume Desmottes2012-01-271-1/+1
* | | | Updated Spanish translationDaniel Mustieles2012-01-271-21/+33
* | | | roster_window_connection_items_setup: remove edit_personal_informationGuillaume Desmottes2012-01-271-1/+0
* | | | Merge remote-tracking branch 'danni/trivia'Guillaume Desmottes2012-01-274-57/+97
|\ \ \ \
| * | | | preferences: split "Open new chats in separate windows" into a radiobuttonDanielle Madeley2012-01-272-10/+43
| * | | | individual-store: contacts in Favourite People are not UngroupedDanielle Madeley2012-01-271-47/+53
| * | | | empathy-tls-dialog: add a title for screenshotsDanielle Madeley2012-01-261-0/+1
* | | | | Updated Spanish translationDaniel Mustieles2012-01-271-117/+118
|/ / / /
* | | | Utils: provide a human-readable message for CM crashesWill Thompson2012-01-261-0/+4
* | | | Merge branch 'highlight-regex'Will Thompson2012-01-2613-104/+205
|\ \ \ \
| * | | | EmpathyChat: cache highlight regex.Will Thompson2012-01-251-17/+45
| * | | | EmpathyChat: track self contact.Will Thompson2012-01-191-8/+27
| * | | | TpChat: add a :self-contact property.Will Thompson2012-01-191-0/+19
| * | | | Don't highlight messages in 1-1 chats.Will Thompson2012-01-191-0/+4
| * | | | Don't highlight messages the user sent themselfWill Thompson2012-01-191-0/+4
| * | | | Move empathy_message_should_highlight to EmpathyChatWill Thompson2012-01-193-74/+71
| * | | | EmpathyChat: include should_highlight in ::new-messageWill Thompson2012-01-192-3/+13
| * | | | chat_view_append_message: take a should_highlight argumentWill Thompson2012-01-199-27/+46
| * | | | Use /\b<nickname>\b/ to decide whether to highlightWill Thompson2012-01-191-33/+34
* | | | | Updated Spanish translationDaniel Mustieles2012-01-251-189/+191
* | | | | org.gnome.Empathy.gschema.xml.in: fix sort-criterium's descriptionGuillaume Desmottes2012-01-251-1/+1
* | | | | Updated Norwegian bokmål translationKjartan Maraas2012-01-251-128/+120
* | | | | accounts-dialog: don't add newly created account twiceGuillaume Desmottes2012-01-241-69/+9
* | | | | accounts_dialog_get_account_iter: use the COL_ACCOUNT directlyGuillaume Desmottes2012-01-241-4/+4
* | | | | accounts-dialog: no more need to manually prepare TpAccountGuillaume Desmottes2012-01-241-20/+1
* | | | | don't display 'No topic defined' if topic are not supportedGuillaume Desmottes2012-01-241-4/+8
* | | | | contact-widget: merge grid_contact and main_grid_contactGuillaume Desmottes2012-01-231-70/+52
* | | | | move vbox_avatar to grid_contactGuillaume Desmottes2012-01-231-12/+13
* | | | | contact-widget: move hbox_presence to grid_contactGuillaume Desmottes2012-01-231-27/+16
* | | | | empathy-contact-widget: replace hbox_contact by a GtkGridGuillaume Desmottes2012-01-231-6/+5
* | | | | contact-widget: stop storing hbox_contactGuillaume Desmottes2012-01-231-2/+0
* | | | | Updated Slovenian translationMatej Urbančič2012-01-221-586/+580
* | | | | Updated Spanish translationDaniel Mustieles2012-01-211-76/+62
* | | | | remove an unnecessary adjectiveYasumichi Akahoshi2012-01-211-1/+1
* | | | | remove empathy_contact_personal_dialog_show()Guillaume Desmottes2012-01-202-54/+0
* | | | | remove 'edit->personnal information' menuGuillaume Desmottes2012-01-202-15/+0
* | | | | Use a localized format when displaying timesGuillaume Desmottes2012-01-201-8/+5
* | | | | empathy-time: port to TP coding styleGuillaume Desmottes2012-01-202-81/+85
* | | | | Updated Czech translationMarek Černocký2012-01-201-837/+788
* | | | | help: fixed cause of validation errorTiffany Antopolski2012-01-201-2/+1
* | | | | update mark to add custom message as a favoriteYasumichi Akahoshi2012-01-201-1/+1
* | | | | Remove about Add New Preset section on the Saved Presets boxYasumichi Akahoshi2012-01-201-25/+2
* | | | | empathy-tls-test: use g_assert_(no_)error()Guillaume Desmottes2012-01-191-22/+23
* | | | | empathy-irc-network-manager-test: use more specific assertionsGuillaume Desmottes2012-01-191-22/+21
|/ / / /
* | | | Updated Swedish translationDaniel Nylander2012-01-181-968/+996
* | | | account-widget: allow JID such as 'test@localhost'Guillaume Desmottes2012-01-171-1/+1
| |_|/ |/| |
* | | client-factory: ensure alias, presence, capabilities and avatar are preparedDanielle Madeley2012-01-171-6/+12
* | | don't free content of the list returned by empathy_connection_aggregator_get_...Guillaume Desmottes2012-01-172-2/+1
* | | empathy_pixbuf_avatar_from_individual_scaled_async: set an error if no avatarGuillaume Desmottes2012-01-171-11/+10
* | | Updated Galician translationsFran Diéguez2012-01-172-3941/+5231
* | | Updated Galician translationsFran Diéguez2012-01-171-4969/+3707
* | | Updated Norwegian bokmål translationKjartan Maraas2012-01-171-1260/+1229
* | | remove released flagGuillaume Desmottes2012-01-161-1/+1
* | | prepare 3.3.4EMPATHY_3_3_4Guillaume Desmottes2012-01-162-2/+42
* | | individual-view: remove GTK+ workaroundsGuillaume Desmottes2012-01-161-68/+0
* | | empathy_account_get_error_message: get the reason before displaying itGuillaume Desmottes2012-01-161-2/+2
* | | coding style fixGuillaume Desmottes2012-01-161-1/+1
* | | individual-view: use tp_g_signal_connect_object() to connect the destroy sigGuillaume Desmottes2012-01-161-2/+4
* | | filter_result_callback_data_new: add some checksGuillaume Desmottes2012-01-161-0/+4
* | | Updated Galician translationsFran Diéguez2012-01-151-1641/+1639
* | | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2012-01-142-1682/+1674
* | | Updated Slovenian translationAndrej Žnidaršič2012-01-141-203/+288
* | | account-widget-irc: fix label position in the gridGuillaume Desmottes2012-01-131-0/+1
* | | be less restrictive regarding the Service formatGuillaume Desmottes2012-01-131-11/+17
* | | irc-network-chooser-dialog: be more NULL-safeGuillaume Desmottes2012-01-131-1/+4
* | | irc-network-chooser: set the account serviceGuillaume Desmottes2012-01-131-0/+35
* | | account-settings: allow to change the serviceGuillaume Desmottes2012-01-132-0/+47
* | | roster-window: watch for TpAccount:connection changesGuillaume Desmottes2012-01-121-4/+25
* | | roster-window: factor out add_account()Guillaume Desmottes2012-01-121-26/+26
| |/ |/|
* | roster-window: use self->priv patternGuillaume Desmottes2012-01-102-447/+390
* | roster-window: port to new coding styleGuillaume Desmottes2012-01-102-1860/+1874
* | rename MainWindow to RosterWindowGuillaume Desmottes2012-01-109-385/+385
* | EmpathySoundManager: passing a GtkWidget is optionalXavier Claessens2012-01-101-10/+19
* | Disable join button when protocol irc is selectedJovanka Gulicoska2012-01-101-0/+8
* | Fix a doubled word in the Hungarian translationGabor Kelemen2012-01-091-4/+4
* | Updated Russian translationYuri Myasoedov2012-01-081-415/+413
* | added # in join room when irc protocol selectedJovanka Gulicoska2012-01-061-0/+6
* | contact-chooser: keep a ref on the TpContact we requestedGuillaume Desmottes2012-01-061-2/+20
* | [l10n] Updated Dutch translationHannie Dumoleyn2012-01-031-924/+1054
* | [l10n] Updated Estonian translationMattias Põldaru2012-01-021-217/+101
* | [l10n]Updated Turkish translationMuhammet Kara2011-12-311-837/+819
* | Updated Hebrew translation.Yaron Shahrabani2011-12-301-386/+383
* | Updated Belarusian translation.Kasia Bondarava2011-12-291-860/+837
* | Added Macedonian translation.Jovan Naumovski2011-12-251-1014/+4329
* | Updated Spanish translationDaniel Mustieles2011-12-231-548/+540
* | New translatino for Xhosa (xh)Andiswa Mvanyashe2011-12-232-0/+4794
* | individual-widget: display champlain map in tooltipsGuillaume Desmottes2011-12-221-2/+1
* | Check for champlain 0.12.1Guillaume Desmottes2011-12-221-1/+2
* | individual_grid_destroy: remove the ChamplainEmbedView from its containerGuillaume Desmottes2011-12-221-0/+11