aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* factor out remove_from_member_if_neededGuillaume Desmottes2010-03-311-2/+10
* factor out add_to_membersGuillaume Desmottes2010-03-311-9/+20
* empathy_icon_name_for_presence: use 'pending' icon if presence is unknownGuillaume Desmottes2010-03-311-1/+2
* rename EMPATHY_IMAGE_UNKNOWN to EMPATHY_IMAGE_PENDINGGuillaume Desmottes2010-03-311-1/+1
* tp-contact-list: Improve hash table descriptionsGuillaume Desmottes2010-03-312-4/+19
* Merge branch 'undo-close-tab'Jonny Lamb2010-03-307-0/+406
|\
| * chat-manager: take an EmpathyChat instead of an EmpathyContactJonny Lamb2010-03-063-20/+105
| * Add EmpathyChatManager::chats-changed signal and make the chat window listen ...Jonny Lamb2010-03-063-7/+67
| * Add chat manager which tracks chats closing and can respawn them (bug #609832)Jonny Lamb2010-03-067-0/+261
* | fix #endif commentGuillaume Desmottes2010-03-301-1/+1
* | add gconf key to disable auto-away (#613603)Christian Kampka2010-03-303-2/+38
* | properly cast GArray contentGuillaume Desmottes2010-03-301-1/+1
* | map-view: display position of contacts added after the map has been created (...Guillaume Desmottes2010-03-301-0/+41
* | factor out contact_addedGuillaume Desmottes2010-03-301-4/+11
* | map_view_update_contact_position: don't call contact_has_location twiceGuillaume Desmottes2010-03-301-5/+7
* | Always connect "notify::location" on contactGuillaume Desmottes2010-03-301-3/+0
* | map_view_contacts_foreach: no need to create the marker any moreGuillaume Desmottes2010-03-301-1/+0
* | map_view_update_contact_position: create marker if neededGuillaume Desmottes2010-03-301-1/+10
* | factor out contact_has_locationGuillaume Desmottes2010-03-301-10/+19
* | factor out create_markerGuillaume Desmottes2010-03-301-19/+28
* | rename map_view_marker_update_position to map_view_update_contact_position an...Guillaume Desmottes2010-03-301-18/+14
* | map-view: add a mapping from EmpathyContact to ChamplainMarkerGuillaume Desmottes2010-03-301-0/+8
* | empathy_tp_call_leave: allocate the array on the stackGuillaume Desmottes2010-03-301-7/+2
* | empathy_call_handler_stop_call: use empathy_tp_call_leave rather than empathy...Guillaume Desmottes2010-03-301-1/+1
* | add empathy_tp_call_leaveGuillaume Desmottes2010-03-302-0/+48
* | call-window: call empathy_call_handler_stop_call when closing a callGuillaume Desmottes2010-03-301-1/+8
* | empathy_call_window_disconnected: remove call to empathy_call_window_reset_pi...Guillaume Desmottes2010-03-301-1/+3
* | remove forget buttonGuillaume Desmottes2010-03-3010-308/+51
* | Add clear icon in entry containing password (#608104)Guillaume Desmottes2010-03-301-0/+42
* | 2.31 here we goGuillaume Desmottes2010-03-301-1/+1
* | Rename empathy status icons to fit standard icon nameGuillaume Desmottes2010-03-3031-30/+30
* | use the 'user-invisible' icon if implementedGuillaume Desmottes2010-03-302-2/+10
* | Use standard names for status icons (#602420)Guillaume Desmottes2010-03-301-6/+6
* | Merge branch 'people-nearby-fake-group-613558'Danielle Madeley2010-03-304-35/+76
|\ \
| * | Remove People Nearby from sorted groups listDanielle Madeley2010-03-301-1/+0
| * | Clean up sorting function to take top/bottom lists of fake groupsDanielle Madeley2010-03-241-9/+52
| * | Add an icon for People NearbyDanielle Madeley2010-03-241-5/+8
| * | Make People Nearby into a Fake Group like Ungrouped and FavouritesDanielle Madeley2010-03-243-21/+17
* | | CellRendererText: Use G_PARAM_STATIC_STRINGSWill Thompson2010-03-301-6/+8
* | | Show status messages in compact view (#614052)Will Thompson2010-03-304-30/+60
* | | Use a temporary variable for param specsWill Thompson2010-03-301-28/+17
* | | disconnect NewChannels signal once we got all the list channels we care aboutGuillaume Desmottes2010-03-301-1/+19
* | | tp-contact-list: watch for list channels announced in NewChannels signalsGuillaume Desmottes2010-03-301-0/+47
* | | allow got_list_channel to be called more than once for the same channelGuillaume Desmottes2010-03-301-2/+6
* | | factor out got_list_channelGuillaume Desmottes2010-03-301-19/+27
* | | don't leak the classes listGuillaume Desmottes2010-03-301-4/+12
* | | Unsensitive roomlist expander if roomlist is not supported (#614002)Guillaume Desmottes2010-03-301-0/+2
* | | Don't request roomlist channel if not supported (#614002)Guillaume Desmottes2010-03-301-1/+14
* | | empathy_dispatcher_find_requestable_channel_classes: allow handle_type being 0Guillaume Desmottes2010-03-301-2/+0
* | | release.py: releases are now tagged EMPATHY_2_30*Guillaume Desmottes2010-03-301-1/+1
* | | Sets sensitivity of Previous/Next Tab menu items based on gtk-keynav-wrap-aro...Aaron Brown2010-03-301-2/+7
* | | Updated Arabic translationKhaled Hosny2010-03-301-125/+121
* | | Updated Latvian translation.Peteris Krisjanis2010-03-301-474/+335
* | | chat: use empathy_signal_connect_weak to connect signal on the bufferGuillaume Desmottes2010-03-291-2/+2
* | | chat_input_text_buffer_changed_cb: 'priv' is uselessGuillaume Desmottes2010-03-291-3/+0
* | | coding style fixesGuillaume Desmottes2010-03-291-6/+5
* | | Check for errors when linking the video source into a call (#612020)Olivier Crête2010-03-291-7/+60
* | | Verify that the video source could be linked into the pipelineOlivier Crête2010-03-291-1/+5
* | | Return error when the audio source can not be startedOlivier Crête2010-03-291-4/+31
* | | telepathy-glib sucks, need to send stream error from the main threadOlivier Crête2010-03-291-2/+13
* | | Return a telepathy error if the source can't be addedOlivier Crête2010-03-292-4/+10
* | | Remove false commentOlivier Crête2010-03-291-1/+0
* | | Add audio conversion filter to receive pipelineOlivier Crête2010-03-291-1/+43
* | | Add fakesink to srcpad if not real sink could be linkedOlivier Crête2010-03-291-0/+30
* | | Emit error when failing to link audio padOlivier Crête2010-03-291-1/+12
* | | Send stream error when the src pad can't be linkedOlivier Crête2010-03-292-4/+11
* | | Handle errors from audio sinkOlivier Crête2010-03-291-5/+53
* | | new-chatroom-dialog: filter CM not implementing groupchatAndrew Gorcester2010-03-291-1/+45
* | | tp-chat: update self user if it has been renamed (#613930)Guillaume Desmottes2010-03-291-0/+6
* | | start dev of next releaseGuillaume Desmottes2010-03-291-1/+1
* | | fallback to JID if alias is emptyFelix Kaser2010-03-291-5/+8
* | | fix alignment of the label in error-infobarFelix Kaser2010-03-291-0/+1
* | | Updated Greek translation for empathy documentationSimos Xenitellis2010-03-291-1/+1
* | | prepare 2.30 releaseEMPATHY_2_30_0Guillaume Desmottes2010-03-292-3/+74
* | | release.py: add release date in NEWSGuillaume Desmottes2010-03-291-1/+2
* | | release.py: draw a 'line' of the length of the titleGuillaume Desmottes2010-03-291-1/+3
* | | Update Simplified Chinese translation.Aron Xu2010-03-291-726/+960
* | | remove empathy_log_store_empathy_get_dirGuillaume Desmottes2010-03-292-10/+0
* | | ship a copy of empathy_log_store_empathy_get_dir in migrate-butterfly-logs.cGuillaume Desmottes2010-03-291-5/+32
* | | coding style fixesGuillaume Desmottes2010-03-291-2/+2
* | | fix menu_tabs_right acceleratorGuillaume Desmottes2010-03-291-1/+1
* | | Merge commit 'treitter/bug-613272'Guillaume Desmottes2010-03-293-527/+543
|\ \ \
| * | | Set a default empathy-accounts window size such that any scrolled Advanced se...Travis Reitter2010-03-271-1/+1
| * | | Another way to fix Gnome bug #613272. This puts the Advanced expander content...Travis Reitter2010-03-254-628/+630
| * | | Make the account details pane scrollable, in case the Advanced section is too...Travis Reitter2010-03-203-105/+119
* | | | Adds Ctrl+Shift+PgUp/PgDn accelerator key to move current tab left/right (#61...Aaron Brown2010-03-291-0/+2
* | | | Updated Serbian translationsBranko Kokanović2010-03-292-484/+548
* | | | Update Czech translationPetr Kovar2010-03-291-27/+22
* | | | Updated Bengali translationJamil Ahmed2010-03-281-148/+132
* | | | Updated Danish translationAsk H. Larsen2010-03-281-941/+1507
* | | | Updated Greek translationSimos Xenitellis2010-03-271-2/+2
* | | | Updated Basque languageInaki Larranaga Murgoitio2010-03-271-15/+39
* | | | Updated Bengali translationJamil Ahmed2010-03-271-638/+741
* | | | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2010-03-272-78/+70
* | | | Updated Norwegian bokmål translationKjartan Maraas2010-03-271-240/+250
* | | | Update Czech translationJiri Eischmann2010-03-271-910/+1364
* | | | Updated Lithuanian translationŽygimantas Beručka2010-03-271-860/+1571
* | | | Updated Greek translation for empathy documentationMarios Zindilis2010-03-271-138/+47
* | | | Updated Kurdish translationSîmurg562010-03-261-844/+1274
* | | | Updated Kurdish translationSîmurg562010-03-261-1360/+701
* | | | Updated Ukrainian translationMaxim V. Dziumanenko2010-03-261-205/+225
* | | | Updated German doc translationMario Blättermann2010-03-261-402/+420
* | | | Add a comment explaining translator how to make the Facebook string look niceGuillaume Desmottes2010-03-261-1/+1
* | | | One more time...Timo Jyrinki2010-03-261-13/+13
* | | | Updated French doc translationBruno Brouard2010-03-261-2/+2
* | | | Updated translation from Launchpad.Timo Jyrinki2010-03-261-124/+126
* | | | Updated Crimean Tatar (Crimean Turkish) translationReşat SABIQ2010-03-261-872/+1495
* | | | Removed the non standard notification capabilities from the listNicolò Chieffo2010-03-251-4/+0
* | | | Merge branch 'hidden-613892'Guillaume Desmottes2010-03-251-1/+1
|\ \ \ \
| * | | | Launch Empathy in hidden mode when invoked (#613892)Guillaume Desmottes2010-03-251-1/+1
* | | | | Updated Greek translationΜάριος Ζηντίλης2010-03-251-1150/+973
|/ / / /
* | | | Updated Greek translationKostas Papadimas2010-03-251-809/+411
* | | | Updated Spanish translationJorge González2010-03-251-6/+8
* | | | fix enalbe typo - bgo 613772Paul Cutler2010-03-241-1/+1
* | | | Updated Galician translationFran Diéguez2010-03-241-26/+20
* | | | Updated French doc translationBruno Brouard2010-03-241-1023/+2980
* | | | Same reap-child fix for empathy-debuggerDanielle Madeley2010-03-241-1/+1
* | | | Automatically reap the empathy-accounts child processDanielle Madeley2010-03-244-31/+8
| |/ / |/| |
* | | empathy-contact-manager: no need to pass object as user_data and weak_objectDanielle Madeley2010-03-241-2/+2
* | | empathy-contact-manager: remove unrequired for loop when unpacking structDanielle Madeley2010-03-241-14/+5
* | | Updated Catalan translationGil Forcada2010-03-241-989/+1512
* | | empathy-debugger: set text domainGuillaume Desmottes2010-03-231-0/+1
* | | updating for Punjabi by A S AlamA S Alam2010-03-231-56/+64
* | | Updated Basque languageInaki Larranaga Murgoitio2010-03-231-6/+6
* | | empathy-accounts: set text domainGuillaume Desmottes2010-03-221-0/+1
* | | Update Romanian translationAdi Roiban2010-03-221-207/+235
* | | chat-window: remove some DEBUG callsGuillaume Desmottes2010-03-221-15/+0
* | | empathy_window_present: use X server time if there is no eventGuillaume Desmottes2010-03-221-2/+51
* | | Estonian translation updatedIvar Smolin2010-03-221-6/+6
* | | Updated Hungarian translationGabor Kelemen2010-03-211-745/+957
* | | Updated Portuguese translationDuarte Loreto2010-03-211-862/+1481
* | | Updated Galician translationFran Diéguez2010-03-211-174/+213
* | | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2010-03-202-364/+428
* | | Updated German translationChristian Kirbach2010-03-201-9/+5
* | | Updated Korean translationChangwoo Ryu2010-03-201-879/+1417
* | | Updated Arabic translationKhaled Hosny2010-03-191-8/+14
* | | Updated Swedish translationDaniel Nylander2010-03-191-26/+26
|/ /
* | Updated Italian translationMilo Casagrande2010-03-191-6/+10
* | Updated Polish translationPiotr Drąg2010-03-191-21/+21
* | Estonian translation updatedMattias Põldaru2010-03-181-31/+34
* | Updated Finnish translation by Jiri Grönroos. Via Launchpad.Timo Jyrinki2010-03-181-877/+1809
* | Updated Russian translation from Yury KozlovLeonid Kanter2010-03-181-39/+18
* | Updated Brazilian Portuguese translationDjavan Fagundes2010-03-181-177/+207
* | Updated French translationBruno Brouard2010-03-181-46/+52
* | Updated British English translationBruce Cowan2010-03-181-178/+208
* | Updated German translationChristian.Kirbach2010-03-181-173/+207
* | Updated Spanish translationJorge González2010-03-181-55/+55
* | Updated Bulgarian translationAlexander Shopov2010-03-171-5/+5
* | Updated Slovenian translationMatej Urbančič2010-03-171-53/+53
* | Updated Basque languageInaki Larranaga Murgoitio2010-03-171-75/+49
* | sidebar: fix assertion in empathy_sidebar_menu_position_underGuillaume Desmottes2010-03-171-1/+1
* | fix escaping of UTF-chars in ui file (#613117)Gabor Kelemen2010-03-172-4/+4
* | Added gtk-keynav-wrap-around check before cycling tabsmrhappypants2010-03-171-2/+10
* | updating for Punjabi by A S AlamA S Alam2010-03-171-232/+248
* | Updated Kurdish translationsimurg562010-03-171-981/+2855
* | Updated Basque languageInaki Larranaga Murgoitio2010-03-171-43/+69
* | Updated Basque languageInaki Larranaga Murgoitio2010-03-171-196/+190
* | Updated Bulgarian translationAlexander Shopov2010-03-161-228/+237
* | Update Russian translation from Alexander SaprykinLeonid Kanter2010-03-161-222/+246
* | start dev of next releaseGuillaume Desmottes2010-03-161-1/+1
* | Revert "Updated Italian translation"Milo Casagrande2010-03-161-3091/+3050
* | Updated Italian translationFrancesco Marlatta2010-03-161-3050/+3091
* | Updated French translationClaude Paroz2010-03-161-143/+160
* | Updated Italian translationMilo Casagrande2010-03-161-237/+247
* | Updated Arabic translationKhaled Hosny2010-03-161-220/+242
* | Updated Swedish translationDaniel Nylander2010-03-161-268/+285
* | Updated Spanish translationJorge González2010-03-161-53/+58
* | fix typo in release nameEMPATHY_2_29_93Guillaume Desmottes2010-03-161-1/+1
* | Prepare 2.29.93 releaseGuillaume Desmottes2010-03-162-2/+46
* | Merge commit 'staz/dnd'Guillaume Desmottes2010-03-162-13/+19
|\ \
| * | DnD: add a text/path-list target to contact list windows tooOlivier Le Thanh Duong2010-03-161-0/+2
| * | DnD: add a new text/path-list target in chat windowOlivier Le Thanh Duong2010-03-161-6/+13
| * | chat_window_drag_motion : search in all the drop targetsOlivier Le Thanh Duong2010-03-051-7/+4
* | | Updated Polish translationPiotr Drąg2010-03-161-216/+222
* | | empathy_window_present: use _NET_WM_USER_TIME only has a fallbackGuillaume Desmottes2010-03-151-1/+5
* | | empathy_window_present: use gdk_x11_display_get_user_time as timestampGuillaume Desmottes2010-03-151-1/+3
* | | empathy_window_present: remove useless 'steal_focus' argGuillaume Desmottes2010-03-156-9/+7
* | | main_window_chat_quit_cb: release the reference on the chatroom mgrGuillaume Desmottes2010-03-151-0/+1
* | | call-window: display the 'audio input' page by default (#612450)Guillaume Desmottes2010-03-151-6/+7
* | | idle: Only restore state but not status message when getting back from idle (...Brian Curtis2010-03-151-14/+3
* | | Updated Slovenian translationMatej Urbančič2010-03-151-218/+236
* | | add COPYING-DOCS, COPYING.LGPL and COPYING.SHARE-ALIKE to EXTRA_DIST so they ...Guillaume Desmottes2010-03-151-5/+9
* | | return correct value in g_return_val_if_failGuillaume Desmottes2010-03-151-1/+1
* | | contact-selector-dialog: unref filter_account when disposingGuillaume Desmottes2010-03-151-0/+5
* | | contact_selector_dialog_account_changed_cb: cope with tp_account_get_connecti...Guillaume Desmottes2010-03-151-0/+3
* | | invite-participant-dialog: filter contacts by accountGuillaume Desmottes2010-03-153-4/+10
* | | contact-selector-dialog: Add a property to filter contacts by accountGuillaume Desmottes2010-03-152-3/+72
* | | contact_widget_contact_update: don't call contact_widget_favourites_changed_c...Guillaume Desmottes2010-03-151-0/+2
* | | Allow to unmark contacts as favorite using DnDGuillaume Desmottes2010-03-151-2/+13
* | | Allow to remove contact from the 'Ungrouped' group using DnDGuillaume Desmottes2010-03-151-3/+8
* | | factor out group_can_be_modifiedGuillaume Desmottes2010-03-151-6/+19
* | | Support to tag contact as favorite using DnDGuillaume Desmottes2010-03-151-2/+11
* | | Don't allow moving contacts to fake groups using DnDGuillaume Desmottes2010-03-153-4/+16
* | | add 'favorite' checkbox to the edit dialogGuillaume Desmottes2010-03-153-6/+82
* | | remove double ;Guillaume Desmottes2010-03-151-2/+2
* | | rephrase fake favorite group display nameGuillaume Desmottes2010-03-151-1/+1
* | | stop exporting FAVOURITE_CONTACTS_CFLAGS and FAVOURITE_CONTACTS_LIBSGuillaume Desmottes2010-03-153-6/+0
* | | libtelepathy-logger has been renamed to telepathy-loggerGuillaume Desmottes2010-03-151-1/+1
* | | contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITEGuillaume Desmottes2010-03-152-36/+0
* | | Don't display context menu when right clicking on a fake groupGuillaume Desmottes2010-03-152-5/+14
* | | compare_separator_and_groups: check that the group is actually a fake oneGuillaume Desmottes2010-03-151-13/+15
* | | contact-list-store: add a column saying if a group is a fake one or notGuillaume Desmottes2010-03-152-5/+10
* | | stop displaying favorite contacts on top of groupsGuillaume Desmottes2010-03-151-10/+3
* | | Display icon near the favorite fake groupGuillaume Desmottes2010-03-151-0/+53
* | | Display the fake 'Favorites' group at the top of the contact listGuillaume Desmottes2010-03-151-1/+5
* | | Create a fake 'Favorites People' groupGuillaume Desmottes2010-03-152-1/+19
* | | factor out add_contact_to_storeGuillaume Desmottes2010-03-151-26/+24
* | | Move the 'Ungrouped' fake contact to the bottom of the contact listGuillaume Desmottes2010-03-151-2/+8
* | | factor out compare_separator_and_groupsGuillaume Desmottes2010-03-151-41/+45
* | | add 'Ungrouped' fake contactGuillaume Desmottes2010-03-152-1/+16
* | | Move the 'Favorite' menu item after 'Information'Guillaume Desmottes2010-03-151-7/+7
* | | remove EMPATHY_IMAGE_(UN)FAVOURITEGuillaume Desmottes2010-03-151-2/+0
* | | remove 'favorite' column in the contact listGuillaume Desmottes2010-03-151-88/+0
* | | Add 'favorite' checkbox to the contact menuGuillaume Desmottes2010-03-152-0/+50
* | | check that logger is not NULL before unrefing itGuillaume Desmottes2010-03-151-1/+2
* | | fix hash table leakGuillaume Desmottes2010-03-151-1/+2
* | | factor out add_contacts_to_favouritesGuillaume Desmottes2010-03-151-31/+30
* | | Unref contact returned by empathy_contact_list_get_membersGuillaume Desmottes2010-03-151-1/+2
* | | log an error if {Add,Remove}FavouriteContact failedGuillaume Desmottes2010-03-151-2/+22
* | | document the favorites hash tableGuillaume Desmottes2010-03-151-0/+2
* | | coding style fixesGuillaume Desmottes2010-03-155-51/+54
* | | Sync Unix_Timestamp64 definition with the specGuillaume Desmottes2010-03-151-3/+3
* | | Rebase the favourites support upon the telepathy-logger instead of a speciall...Travis Reitter2010-03-159-21/+564
* | | Cut out the concept of a special Favourites groupTravis Reitter2010-03-154-78/+33
* | | Add a favorite contacts build option and make Moblin support automatically tu...Travis Reitter2010-03-156-0/+68
* | | Add support for marking contacts as favorites (which gives them a highlightedTravis Reitter2010-03-156-6/+181
* | | Updated Spanish translationJorge González2010-03-151-10/+11
* | | Updated Spanish translationJorge González2010-03-151-204/+221
* | | empathy-accounts: set a title for the assistantDanielle Madeley2010-03-151-0/+3
* | | empathy-accounts: set "Empathy Accounts" as application nameGuillaume Desmottes2010-03-151-1/+1
* | | empathy-debugger: set "Empathy Debugger" as application nameGuillaume Desmottes2010-03-151-1/+1
* | | Separate the debug window into its own process.Mike Ruprecht2010-03-155-3/+88
* | | Merge branch 'butterfly-networkid'Jonny Lamb2010-03-158-0/+291
|\ \ \
| * | | Migrate butterfly logs to remove the network ID suffix.Jonny Lamb2010-03-138-0/+291
* | | | Updated Spanish translationJorge González2010-03-151-21/+43
* | | | Updated Italian help translationMilo Casagrande2010-03-151-67/+91
* | | | Update Galician translationFran Diéguez2010-03-141-39/+26
* | | | Updated German doc translationMario Blättermann2010-03-131-21/+44
* | | | [help] Updated the irc-join-pwd topic: password protected IRC room now worksMilo Casagrande2010-03-131-9/+21
* | | | set $HOME as default directory when sending a fileGuillaume Desmottes2010-03-121-0/+3
* | | | Set XDG_DOWNLOAD_DIR as default directory when receiving a file (#612672)Guillaume Desmottes2010-03-121-0/+8
|/ / /
* | | Updated German doc translationMario Blättermann2010-03-121-463/+455
* | | updated breton translationdeniarnuad2010-03-121-1049/+1972
* | | Updated Spanish translationJorge González2010-03-121-79/+72
* | | [help] Removed the offline-contacts topic (bug 612448):Milo Casagrande2010-03-123-52/+43
* | | Fix a small typoLuca Ferretti2010-03-111-2/+2
* | | Merge branch 'butterfly-conference-misc'Jonny Lamb2010-03-112-3/+12
|\ \ \
| * | | tp-chat: remove butterfly MSN HandleType=NONE workaroundJonny Lamb2010-03-111-0/+8
| * | | tp-chat: when seeing if a chat can be upgraded, don't worry about handle typeJonny Lamb2010-03-111-1/+1
| * | | dispatcher: allow not caring about handle type when looking up RCCsJonny Lamb2010-03-111-2/+3
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:03:33 +0800