aboutsummaryrefslogtreecommitdiffstats
path: root/po
Commit message (Collapse)AuthorAgeFilesLines
* Updated Spanish translationJorge González2010-01-311-165/+189
|
* Updated Bengali translationJamil Ahmed2010-01-291-10333/+12163
|
* Updated Norwegian Nynorsk translationÅsmund Skjæveland2010-01-281-305/+303
|
* Updated Slovenian translationMatej Urbančič2010-01-281-2057/+2114
|
* Updated Bulgarian translationKrasimir Chonov2010-01-281-408/+414
|
* Updated Spanish translationJorge González2010-01-261-368/+374
|
* Updated Traditional Chinese translation(Hong Kong and Taiwan)Chao-Hsiung Liao2010-01-212-21338/+20154
|
* Updated Bulgarian translationAlexander Shopov2010-01-201-2/+2
|
* Updated Bulgarian translationAlexander Shopov2010-01-201-5/+5
|
* Updated Bulgarian translationKrasimir Chonov2010-01-201-7533/+5769
|
* Updated Spanish translationJorge González2010-01-201-1323/+1338
|
* Move e-search-bar around.Kjartan Maraas2010-01-201-1/+1
|
* Updated Norwegian bokmål translationKjartan Maraas2010-01-201-3/+48
|
* Added Norwegian to the listKjartan Maraas2010-01-201-1304/+1283
|
* Updated Norwegian bokmål translationMilan Crha2010-01-141-673/+768
|
* Updated Spanish translationJorge González2010-01-131-719/+753
|
* Updated Swedish translationDaniel Nylander2010-01-101-2736/+2877
|
* Updated Polish translationTomasz Dominikowski2010-01-091-8677/+7713
|
* Updated Spanish translationJorge González2010-01-081-1045/+1026
|
* Fix this upKjartan Maraas2010-01-071-1/+2
|
* Updated Norwegian bokmål translationKjartan Maraas2010-01-071-2103/+2035
|
* Fixed Czech translation by Jiri EischmannPetr Kovar2010-01-051-2359/+1267
| | | | Fixes bug #595776, thanks to Andre Klapper and Lucas Lommer.
* Updated Telugu Translationskrishnababu k2010-01-041-7/+6
|
* Updated Slovenian translationMatej Urbančič2010-01-011-1951/+2062
|
* Updated Spanish translationJorge González2009-12-291-1184/+1295
|
* Punctuation fixesJordi Mas2009-12-211-4/+4
|
* Updated Spanish translationJorge González2009-12-201-241/+221
|
* Updated Spanish translationJorge González2009-12-201-92/+50
|
* Updated Spanish translationJorge González2009-12-201-1747/+2011
|
* Fix distcheck errors.Matthew Barnes2009-12-191-0/+2
|
* Updated Slovenian translationMatej Urbančič2009-12-171-1304/+1480
|
* Updated Norwegian bokmål translation.Kjartan Maraas2009-12-161-1151/+1281
|
* Update thisKjartan Maraas2009-12-161-1/+2
|
* Bug #591938 - Update translator's commentsMilan Crha2009-12-101-2/+0
|
* Adding new file to POTFILES.in (from commit to bug #359755)Milan Crha2009-12-081-0/+1
|
* Updated Swedish translationDaniel Nylander2009-12-071-4431/+5111
|
* Updated Hebrew translationYair Hershkovitz2009-12-061-10554/+12503
|
* Updated Norwegian bokmål translation.Kjartan Maraas2009-12-051-5708/+4750
|
* Update thisKjartan Maraas2009-12-051-1/+1
|
* Updated Slovenian translationMatej Urbančič2009-12-051-401/+417
|
* Update Simplified Chinese translation.Ray Wang2009-12-011-11612/+11654
|
* Updated Slovenian translationMatej Urbančič2009-12-011-2053/+3483
|
* Updated Spanish translationJorge González2009-11-271-444/+510
|
* Bug #361156 - contacts-map pluginCedric Bosdonnat2009-11-271-0/+2
| | | | | Add a map showing the location of contacts when possible. It's disabled at the moment.
* Fixed bug #602920 in German translationMario Blättermann2009-11-261-387/+320
|
* Updating Estonian translationIvar Smolin2009-11-251-3/+3
|
* Updating Estonian translationMattias Põldaru2009-11-251-2/+2
|
* Updated French translationClaude Paroz2009-11-231-6782/+4494
| | | | Contributed by Bruno Brouard and Claude Paroz
* Updated Spanish translationJorge González2009-11-231-87/+22
|
* Updating Estonian translationMattias Põldaru2009-11-231-3/+3
|
* Updated Spanish translationJorge González2009-11-221-60/+25
|
* Updated Spanish translationJorge González2009-11-221-100/+31
|
* Updated Spanish translationJorge González2009-11-221-2314/+3362
|
* Add gettext/glade prefix before ui files in POTFILES.inClaude Paroz2009-11-221-37/+37
|
* Updated Slovenian translationMatej Urbančič2009-11-201-851/+836
|
* Updated Slovenian translationMatej Urbančič2009-11-201-604/+545
|
* Updated Spanish translationJorge González2009-11-201-3731/+3060
|
* Updated Slovenian translationMatej Urbančič2009-11-191-55/+23
|
* Remove unused files after GtkBuilder mergeMilan Crha2009-11-181-8/+0
|
* Updated Slovenian translationMatej Urbančič2009-11-181-3404/+2256
|
* Updated POTFILES.in/skip after GTKBuilder migrationClaude Paroz2009-11-172-56/+48
|
* Updated Spanish translationJorge González2009-11-161-140/+67
|
* Updated Spanish translationJorge González2009-11-151-113/+62
|
* Updated Spanish translationJorge González2009-11-151-72/+35
|
* updated Tamil translationvasudeven2009-11-151-259/+267
|
* updated Tamil translationvasudeven2009-11-141-0/+16
|
* updated Tamil translationvasudeven2009-11-141-1153/+1237
|
* Updated Spanish translationJorge González2009-11-141-184/+147
|
* Updated Spanish translationJorge González2009-11-141-66/+23
|
* Updated Spanish translationJorge González2009-11-141-1072/+1141
|
* Updated Slovenian translationMatej Urbančič2009-11-131-3/+3
|
* Updated Slovenian translationMatej Urbančič2009-11-131-1363/+1288
|
* Fix distcheck errors.Matthew Barnes2009-11-121-2/+3
|
* Updated Spanish translationJorge González2009-11-111-115/+25
|
* further Shavian translationThomas Thurman2009-11-101-1/+6744
|
* Further Shavian translationThomas Thurman2009-11-091-0/+1949
|
* Updated Spanish translationJorge González2009-11-081-163/+76
|
* First pass of Shavian translationThomas Thurman2009-11-082-0/+9056
|
* Updated Spanish translationJorge González2009-11-071-87/+77
|
* Updated Spanish translationJorge González2009-11-071-153/+143
|
* Updated Spanish translationJorge González2009-11-061-181/+153
|
* Updated Slovenian translationMatej Urbančič2009-11-061-3/+3
|
* Updated Slovenian translationMatej Urbančič2009-11-061-8615/+8845
|
* Updated Spanish translationJorge González2009-11-051-163/+101
|
* Updated Spanish translationJorge González2009-11-051-72/+41
|
* Added Tamil translationvasudeven2009-11-021-454/+488
|
* Updated Spanish translationJorge González2009-11-021-8378/+9582
|
* Fix distcheck errors.Matthew Barnes2009-10-301-8/+8
|
* Updated Tamil translationdrtvasudevan2009-10-271-86/+138
|
* Updating Estonian translationIvar Smolin2009-10-261-3/+3
|
* Fix distcheck errors.Matthew Barnes2009-10-241-0/+4
|
* Updated Norwegian Nynorsk translationÅsmund Skjæveland2009-10-231-344/+262
|
* Updated Tamil translationdrtvasudevan2009-10-211-943/+1054
|
* Updated Russian translationLeonid Kanter2009-10-201-11026/+10848
|
* Updated Norwegian Nynorsk translationÅsmund Skjæveland2009-10-171-6762/+7935
|
* Updated Catalan translation from the gnome-2-28 branchDavid Planella2009-10-131-11021/+12269
|
* Updated Italian translationLuca Ferretti2009-10-121-216/+215
|
* Updated Tamil translationdrtvasudevan2009-10-111-360/+211
|
* Updated Tamil translationdrtvasudevan2009-10-111-8366/+7551
|
* Updated Tamil translationdrtvasudevan2009-10-111-70/+138
|
* Updated Slovenian translationAndrej Žnidaršič2009-10-081-339/+309
|
* Updated Swedish translationDaniel Nylander2009-10-051-2/+2
|
* Updated Italian translationLuca Ferretti2009-10-051-5687/+6315
|
* Updated Swedish translationDaniel Nylander2009-10-041-8283/+8378
|
* Updated Swedish translationDaniel Nylander2009-10-041-5/+5
|
* Updating Estonian translationMattias Põldaru2009-10-031-5/+14
|
* Bug #456240 - Move exchange plugin to exchange packageMilan Crha2009-10-022-17/+0
| | | | Also added gtkhtml-editor and libgnomecanvas-2.0 to evolution-plugin.pc
* Updating Estonian translationIvar Smolin2009-10-011-5/+5
|
* Fix distcheck errors.Matthew Barnes2009-09-301-1/+1
|
* Bug #593609 - Have buildable exchange-operations plugin againMilan Crha2009-09-251-13/+0
|
* Updated Arabic translationKhaled Hosny2009-09-251-2618/+2662
|
* Updated Slovenian translationMatej Urbančič2009-09-241-5926/+5966
|
* Fix distcheck errors.Matthew Barnes2009-09-231-0/+1
|
* GN-bug #593617 - GroupWise plugins are not builtMilan Crha2009-09-232-2/+2
|
* Updated Japanese translationTakayuki KUSANO2009-09-231-5719/+6186
|
* Kill the ipod-sync plugin, along with the HAL dependency.Matthew Barnes2009-09-221-3/+0
|
* Updated Romanian translationAdi Roiban2009-09-221-5871/+4949
|
* Update Czech translationAndre Klapper2009-09-211-280/+7
|
* Update Czech translationAndre Klapper2009-09-211-6963/+8117
|
* Updated Bulgarian translationYavor Doganov2009-09-211-8609/+8054
|
* Fix distcheck errors.Matthew Barnes2009-09-201-0/+5
|
* Updated Greek translation.Kostas Papadimas2009-09-191-10057/+11577
|
* Updated Traditional Chinese translation(Hong Kong and Taiwan)Chao-Hsiung Liao2009-09-192-6606/+4926
|
* Updating Estonian translationMattias Põldaru2009-09-191-9/+11
|
* Updated Hungarian translationGabor Kelemen2009-09-191-5831/+4999
|
* Fix a distcheck error.Matthew Barnes2009-09-191-1/+0
|
* Updated Norwegian bokmål translation.Kjartan Maraas2009-09-181-1521/+1440
|
* Updating Estonian translationIvar Smolin2009-09-171-8/+12
|
* Updated Marathi TranslationsSandeep Shedmake2009-09-161-7358/+8496
|
* Updated Telugu Translationskrishnababu k2009-09-151-5805/+4943
|
* Updated Gujarati TranslationsSweta Kothari2009-09-151-104/+76
|
* Updated Gujarati TranslationsSweta Kothari2009-09-141-71/+78
|
* Updated Polish translationWadim Dziedzic2009-09-141-10833/+11497
|
* Updated Welsh translationIestyn Pryce2009-09-131-7416/+7878
|
* Updated Danish translationAsk H. Larsen2009-09-131-177/+173
|
* Updated Finnish translationIlkka Tuohela2009-09-131-10001/+11099
|
* Updating Translation for PunjabiA S Alam2009-09-131-5775/+6549
|
* Merged updated British English translation from gnome-2-28 branchBruce Cowan2009-09-131-10067/+11513
| | | | | This doesn't deal with any of the consequent fuzzy translations — it just ensures we don't lose the work done for gnome-2-28.
* Updated Danish translationKenneth Nielsen2009-09-121-8078/+9375
|
* Updated Gujarati TranslationsSweta Kothari2009-09-101-156/+70
|
* Updated Portuguese translationDuarte Loreto2009-09-101-10201/+11534
|
* Fix distcheck errors.Matthew Barnes2009-09-091-6/+0
|
* Finish killing Bonobo.Matthew Barnes2009-09-091-1/+2
|
* Updated Arabic translationKhaled Hosny2009-09-081-9691/+11131
|
* Updated Gujarati TranslationsSweta Kothari2009-09-081-277/+186
|
* Updated Lithuanian translationŽygimantas Beručka2009-09-071-9925/+11455
|
* Updating Estonian translationIvar Smolin2009-09-071-14/+17
|
* Updating Estonian translationIvar Smolin2009-09-051-10/+40
|
* Synced French translation from 2.28 branchClaude Paroz2009-09-041-8041/+8758
|
* Get the publish-calendar plugin working.Milan Crha2009-09-021-1/+0
|
* Updated Serbian translationIgor Nestorović2009-09-012-16658/+14942
|
* Update Norwegian bokmål translation.Kjartan Maraas2009-09-011-6814/+6882
|
* Updated breton translationDenis Arnaud2009-08-311-1403/+996
|
* Fix distcheck errors.Matthew Barnes2009-08-302-7/+9
|
* Merge commit 'origin/kill-bonobo'Matthew Barnes2009-08-304-158/+119
|\
| * Fix distcheck error.Matthew Barnes2009-08-281-0/+1
| |
| * Updated Swedish translationDaniel Nylander2009-08-241-1048/+1302
| |
| * Updated German translationChristian Kirbach2009-08-241-3541/+4154
| |
| * Updated Bulgarian translationAlexander Shopov2009-08-241-5610/+6215
| |
| * Added Norwegian bokmål translation.Kjartan Maraas2009-08-241-861/+1011
| |
| * Updated Irish translationSeán de Búrca2009-08-241-140/+122
| |
| * Updated Galician TranslationAntón Méixome2009-08-241-297/+228
| |
| * Updated Irish translationSeán de Búrca2009-08-241-68/+52
| |
| * Updated Irish translationSeán de Búrca2009-08-241-384/+242
| |
| * Updated Irish translationSeán de Búrca2009-08-241-392/+301
| |
| * Updated Hebrew translationMark Krapivner2009-08-241-3052/+3383
| |
| * Updated Irish translationSeán de Búrca2009-08-241-739/+424
| |
| * Updated Bengali translationJamil Ahmed2009-08-241-9454/+11827
| |
| * Updated Marathi TranslationsSandeep Shedmake2009-08-241-3959/+21364
| |
| * Updated Marathi TranslationsSandeep Shedmake2009-08-241-22604/+3954
| |
| * Fix distcheck error.Matthew Barnes2009-08-231-1/+0
| |
| * Fix a distcheck error.Matthew Barnes2009-08-191-1/+0
| |
| * Get the backup-restore plugin working.Matthew Barnes2009-08-121-1/+0
| |
| * Fix distcheck errors.Matthew Barnes2009-08-121-6/+1
| |
| * Updating Estonian translationIvar Smolin2009-08-121-45/+146
| |
| * Mark some ngettext strings as fuzzy to be able to branchChenthill Palanisamy2009-08-121-2/+2
| |
| * Mark some ngettext strings as fuzzy to be able to branchAndre Klapper2009-08-121-5662/+6157
| |
| * Fix msgfmt check by setting strings to fuzzyAndre Klapper2009-08-121-8097/+11092
| |
| * Fix msgfmt check by setting strings to fuzzyAndre Klapper2009-08-121-10/+10
| |
| * Fix msgfmt check by setting strings to fuzzyAndre Klapper2009-08-121-12/+12
| |
| * Fix msgfmt check by setting strings to fuzzyAndre Klapper2009-08-121-8316/+13286
| |
| * Updated Spanish translationJorge González2009-08-121-6/+12
| |
| * Updated Galician translationAntón Méixome2009-08-121-6843/+4880
| |
| * Bug #205137 - Configurable date formats in componentsMilan Crha2009-08-121-0/+1
| |
| * Fix distcheck errors.Matthew Barnes2009-08-111-0/+1
| |
| * Updating Estonian translationIvar Smolin2009-08-111-8/+9
| |
| * Updated Spanish translationJorge González2009-08-111-46/+8
| |
| * Updated Spanish translationJorge González2009-08-111-288/+281
| |
| * Updated Irish translationSeán de Búrca2009-08-111-264/+333
| |
| * Updated Irish translationSeán de Búrca2009-08-111-36/+37
| |
| * Updated Irish translationSeán de Búrca2009-08-111-228/+171
| |
| * Updated Irish translationSeán de Búrca2009-08-111-196/+90
| |
| * Updated Spanish translationJorge González2009-08-111-1120/+1488
| |
| * Updated Welsh translationIestyn Pryce2009-08-111-1143/+1345
| |
| * Update Welsh translationIestyn Pryce2009-08-111-9305/+10082
| |
| * Updated Irish translationSeán de Búrca2009-08-111-8401/+8171
| |
| * Updating Estonian translationIvar Smolin2009-08-111-70/+183
| |
| * Updated Norwegian bokmål translation.Kjartan Maraas2009-08-111-499/+659
| |
| * Updated Norwegian bokmål translation.Kjartan Maraas2009-08-111-4/+4
| |
| * Updated Norwegian bokmål translation.Kjartan Maraas2009-08-111-2130/+2150
| |
| * Updating Estonian translationIvar Smolin2009-08-111-27/+22
| |
| * Updating Estonian translationIvar Smolin2009-08-111-69/+64
| |
| * Updating Estonian translationMattias Põldaru2009-08-111-977/+234
| |
| * Merge commit 'EVOLUTION_2_27_5' into kill-bonoboMatthew Barnes2009-07-286-17358/+16808
| |\
| * | Fix distcheck errors.Matthew Barnes2009-07-281-0/+9
| | |
| * | Merge branch 'master' into kill-bonoboMatthew Barnes2009-07-151-62/+65
| |\ \
| * | | Fix distcheck errors.Matthew Barnes2009-07-141-0/+2
| | | |
| * | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-07-113-6304/+6900
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addressbook/util/addressbook.h calendar/gui/e-week-view-main-item.c configure.ac e-util/Makefile.am mail/em-account-editor.c mail/em-folder-selection-button.c shell/e-shell.c
| * | | | Kill the last GtkOptionMenu instances.Matthew Barnes2009-07-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrote a new widget (ECharsetComboBox) to replace e-charset-picker.c. The widget provides a "charset" string property that allows us to bind to GConf keys (via EShellSettings). Moved e_charset_add_radio_actions() to e-util/e-charset.c. Updated Glade files, #include lines, etc.
| * | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-07-017-6421/+6942
| |\ \ \ \
| * | | | | Fix "make distcheck" errors and other build cleanups.Matthew Barnes2009-07-011-4/+1
| | | | | |
| * | | | | Radically reorganize source code.Matthew Barnes2009-06-251-56/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Collect all shell modules into a new top-level 'modules' directory: $(top_srcdir)/modules/addressbook $(top_srcdir)/modules/calendar $(top_srcdir)/modules/mail Nothing is allowed to link to these, not plugins nor other modules. THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X. - Mimic the libevolution-mail-shared library from master (except drop the "shared" suffix) and have libevolution-mail-importers and all mail-related plugins link to it. - Discard the a11y subdirectories and have the files live alongside their counterpart widgets.
| * | | | | Merge commit 'EVOLUTION_2_27_3' into kill-bonoboMatthew Barnes2009-06-205-18559/+18268
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: composer/e-composer-header-table.h composer/e-composer-header.c composer/e-composer-private.c configure.ac mail/em-account-editor.c po/POTFILES.in po/or.po widgets/misc/e-search-bar.c
| * | | | | | Fix "make distcheck" errors.Matthew Barnes2009-06-201-30/+0
| | | | | | |
| * | | | | | Added Entries for Oriya Translation.Manoj Kumar Giri2009-06-091-0/+4
| | | | | | |
| * | | | | | Updated Spanish translationJorge Gonzalez2009-06-041-26/+28
| | | | | | |
| * | | | | | Updated Spanish translationJorge Gonzalez2009-06-041-124/+127
| | | | | | |
| * | | | | | Updated Spanish translationJorge Gonzalez2009-06-041-1/+1
| | | | | | |
| * | | | | | Updated Spanish translationJorge Gonzalez2009-06-041-571/+538
| | | | | | |
| * | | | | | Updated Spanish translationJorge Gonzalez2009-06-021-229/+170
| | | | | | |
| * | | | | | Updated Danish translationAsk H. Larsen2009-06-021-5003/+5272
| | | | | | |
| * | | | | | Small updateGabor Kelemen2009-06-021-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-274-12288/+10408
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: a11y/widgets/ea-combo-button.c a11y/widgets/ea-combo-button.h addressbook/gui/component/addressbook-component.c addressbook/gui/component/addressbook-component.h addressbook/gui/component/addressbook-view.c addressbook/gui/component/addressbook-view.h addressbook/gui/component/component-factory.c addressbook/gui/widgets/e-addressbook-view.c addressbook/gui/widgets/eab-contact-display.c addressbook/gui/widgets/eab-gui-util.h addressbook/gui/widgets/eab-menu.c addressbook/gui/widgets/eab-menu.h addressbook/gui/widgets/eab-popup-control.c addressbook/gui/widgets/eab-popup-control.h addressbook/gui/widgets/eab-popup.c addressbook/gui/widgets/eab-popup.h calendar/gui/cal-search-bar.c calendar/gui/calendar-commands.c calendar/gui/calendar-component.c calendar/gui/comp-editor-factory.c calendar/gui/comp-editor-factory.h calendar/gui/control-factory.c calendar/gui/dialogs/comp-editor.c calendar/gui/e-cal-component-memo-preview.c calendar/gui/e-cal-component-memo-preview.h calendar/gui/e-calendar-table.c calendar/gui/e-memo-table.c calendar/gui/e-memos.c calendar/gui/e-tasks.c calendar/gui/gnome-cal.c calendar/gui/gnome-cal.h calendar/gui/itip-bonobo-control.c calendar/gui/itip-bonobo-control.h calendar/gui/main.c calendar/gui/memos-component.c calendar/gui/memos-control.c calendar/gui/memos-control.h calendar/gui/migration.c calendar/gui/migration.h calendar/gui/tasks-component.c calendar/gui/tasks-control.c calendar/importers/main.c composer/Makefile.am composer/e-composer-header-table.c composer/e-composer-header.c composer/e-composer-header.h composer/e-composer-name-header.c composer/e-composer-private.c composer/e-composer-text-header.c composer/e-msg-composer.c composer/e-msg-composer.h e-util/e-corba-utils.h e-util/e-logger.c e-util/e-logger.h e-util/e-util-labels.c e-util/e-util-labels.h em-format/em-format.c mail/Makefile.am mail/e-mail-shell-migrate.c mail/em-account-editor.c mail/em-account-editor.h mail/em-composer-prefs.c mail/em-composer-utils.c mail/em-composer-utils.h mail/em-folder-browser.c mail/em-folder-tree-model.c mail/em-folder-tree.c mail/em-folder-tree.h mail/em-folder-utils.c mail/em-folder-utils.h mail/em-folder-view.c mail/em-format-html-display.c mail/em-format-html.c mail/em-mailer-prefs.c mail/em-mailer-prefs.h mail/em-message-browser.c mail/em-message-browser.h mail/em-network-prefs.h mail/em-popup.c mail/em-utils.c mail/importers/Makefile.am mail/mail-component-factory.c mail/mail-component.c mail/mail-config-factory.c mail/mail-config-factory.h mail/mail-config.c mail/mail-dialogs.glade mail/mail-types.h plugins/calendar-weather/calendar-weather.c plugins/mail-account-disable/mail-account-disable.c plugins/select-one-source/select-one-source.c po/POTFILES.in shell/e-component-registry.c shell/e-component-registry.h shell/e-component-view.c shell/e-component-view.h shell/e-corba-config-page.c shell/e-corba-config-page.h shell/e-shell-constants.h shell/e-shell-settings-dialog.c shell/e-shell-settings-dialog.h shell/e-shell-window-commands.c shell/e-shell-window.c shell/e-shell.h shell/e-sidebar.c shell/e-sidebar.h shell/e-user-creatable-items-handler.c shell/e-user-creatable-items-handler.h shell/es-menu.c shell/es-menu.h shell/evolution-component.h shell/evolution-config-control.c shell/evolution-config-control.h shell/evolution-listener.c shell/evolution-listener.h shell/evolution-shell-component-utils.c shell/evolution-shell-component-utils.h shell/importer/evolution-importer-client.c shell/importer/evolution-importer-client.h shell/importer/evolution-importer-listener.c shell/importer/evolution-importer-listener.h shell/importer/evolution-importer.c shell/importer/evolution-importer.h shell/importer/evolution-intelligent-importer.c shell/importer/evolution-intelligent-importer.h shell/importer/intelligent.c shell/main.c shell/test/evolution-test-component.c shell/test/evolution-test-component.h widgets/menus/gal-view-instance.c widgets/menus/gal-view-menus.c widgets/menus/gal-view-menus.h widgets/misc/Makefile.am widgets/misc/e-activity-handler.c widgets/misc/e-activity-handler.h widgets/misc/e-charset-picker.c widgets/misc/e-combo-button.c widgets/misc/e-combo-button.h widgets/misc/e-config-page.h widgets/misc/e-dropdown-button.c widgets/misc/e-dropdown-button.h widgets/misc/e-filter-bar.c widgets/misc/e-info-label.c widgets/misc/e-info-label.h widgets/misc/e-multi-config-dialog.c widgets/misc/e-multi-config-dialog.h widgets/misc/e-search-bar.c widgets/misc/e-search-bar.h widgets/misc/e-task-bar.c widgets/misc/e-task-bar.h widgets/misc/e-task-widget.c widgets/misc/e-task-widget.h widgets/misc/test-dropdown-button.c widgets/misc/test-error.c widgets/misc/test-info-label.c widgets/table/e-table-example-1.c
| * | | | | | | Fix "make check" errors.Matthew Barnes2009-05-251-68/+101
| | | | | | | |
| * | | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-223-290/+210
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addressbook/gui/component/addressbook-view.c addressbook/gui/component/component-factory.c addressbook/gui/component/eab-composer-util.h addressbook/gui/widgets/Makefile.am addressbook/gui/widgets/e-addressbook-model.c addressbook/gui/widgets/e-addressbook-view.c addressbook/gui/widgets/e-addressbook-view.h addressbook/gui/widgets/eab-gui-util.c addressbook/gui/widgets/eab-gui-util.h addressbook/gui/widgets/eab-menu.h addressbook/gui/widgets/eab-popup.h calendar/gui/calendar-component.c calendar/gui/e-cal-event.h calendar/gui/e-calendar-table.c calendar/gui/e-calendar-view.c calendar/gui/e-calendar-view.h calendar/gui/e-memo-table.c calendar/gui/memos-component.c calendar/gui/tasks-component.c composer/e-composer-header-table.c composer/e-composer-private.h composer/e-msg-composer.c composer/e-msg-composer.h composer/evolution-composer.ui configure.ac data/icons/Makefile.am em-format/em-format.c em-format/em-format.h mail/Makefile.am mail/e-mail-shell-migrate.c mail/e-searching-tokenizer.c mail/e-searching-tokenizer.h mail/em-composer-utils.c mail/em-composer-utils.h mail/em-folder-browser.c mail/em-folder-tree-model.c mail/em-folder-view.c mail/em-format-html-display.c mail/em-format-html-display.h mail/em-mailer-prefs.c mail/em-message-browser.c plugins/vcard-inline/Makefile.am plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml plugins/vcard-inline/vcard-inline.c shell/e-component-registry.h shell/e-shell-window.c shell/es-menu.h widgets/misc/e-filter-bar.c widgets/misc/e-filter-bar.h widgets/misc/e-search-bar.c widgets/misc/e-search-bar.h
| * | | | | | | | Use -no-undefined on Linux tooMilan Crha2009-05-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There still left two things opened, search for KILL-BONOBO to find them. One is in calendar's Makefile.am, one in composer.
| * | | | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-113-699/+612
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fudge translation issues in be.po.Matthew Barnes2009-05-111-14/+14
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-072-852/+653
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: shell/e-shell-window-commands.c
| * | | | | | | | | | Not sure how that file got lost...Matthew Barnes2009-05-071-0/+26065
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-061-3973/+2740
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: calendar/gui/dialogs/comp-editor.c
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into kill-bonoboMatthew Barnes2009-05-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addressbook/gui/Makefile.am addressbook/gui/widgets/Makefile.am addressbook/gui/widgets/eab-popup-control.c calendar/gui/e-meeting-time-sel.c calendar/gui/migration.c calendar/modules/e-memo-shell-module-migrate.h e-util/e-logger.c mail/e-mail-attachment-bar.c mail/em-composer-utils.c mail/em-format-html-display.c plugins/mail-account-disable/Makefile.am plugins/select-one-source/Makefile.am po/es.po shell/Makefile.am shell/e-shell-common.h shell/e-shell-nm.c shell/e-shell-window-commands.c shell/e-shell-window.c shell/e-sidebar.c shell/e-user-creatable-items-handler.c shell/importer/Makefile.am shell/test/Makefile.am widgets/misc/test-error.c widgets/misc/test-info-label.c widgets/misc/test-multi-config-dialog.c
| * | | | | | | | | | | | Updated Spanish translationJorge Gonzalez2009-05-041-153/+103
| | | | | | | | | | | | |
| * | | | | | | | | | | | Delist removed Glade files from POTFILES.in.Matthew Barnes2009-05-041-2/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated Spanish translationJorge Gonzalez2009-05-041-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use Behdad's brilliant git.mk to generate .gitignore files.Matthew Barnes2009-05-041-4/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated Spanish translationJorge Gonzalez2009-05-041-79/+68
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated Spanish translationJorge Gonzalez2009-05-041-2544/+2480
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge changes from master.Matthew Barnes2009-05-023-3832/+3820
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated Norwegian bokmål translation.Kjartan Maraas2009-05-011-3670/+2415
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update POTFILES.in with removed and newly added filesMilan Crha2009-05-011-21/+15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add some initial .gitignore files.Matthew Barnes2009-04-281-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Updated Spanish translationJorge Gonzalez2009-04-281-1484/+1587
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix translation issues.Matthew Barnes2009-04-252-26065/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Manual conflict resolutionMatthew Barnes2009-04-251-324/+1721
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into kill-bonoboMatthew Barnes2009-04-2550-143278/+206437
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a particularly messy merge. Watch out for regressions! Conflicts: ChangeLog NEWS a11y/ChangeLog a11y/widgets/ea-combo-button.c a11y/widgets/ea-combo-button.h a11y/widgets/ea-widgets.c addressbook/ChangeLog addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in addressbook/gui/component/addressbook-component.c addressbook/gui/component/addressbook-component.h addressbook/gui/component/addressbook-config.c addressbook/gui/component/addressbook-migrate.h addressbook/gui/component/addressbook-view.c addressbook/gui/component/addressbook-view.h addressbook/gui/component/addressbook.h addressbook/gui/component/autocompletion-config.c addressbook/gui/component/autocompletion-config.h addressbook/gui/component/component-factory.c addressbook/gui/component/e-book-shell-module-migrate.c addressbook/gui/component/ldap-config.glade addressbook/gui/contact-editor/Makefile.am addressbook/gui/contact-editor/contact-editor.glade addressbook/gui/contact-editor/e-contact-editor-address.c addressbook/gui/contact-editor/e-contact-editor-address.h addressbook/gui/contact-editor/e-contact-editor-im.c addressbook/gui/contact-editor/e-contact-editor-im.h addressbook/gui/contact-editor/e-contact-editor.c addressbook/gui/contact-editor/e-contact-editor.h addressbook/gui/contact-editor/eab-editor.c addressbook/gui/contact-editor/eab-editor.h addressbook/gui/contact-editor/test-editor.c addressbook/gui/contact-list-editor/Makefile.am addressbook/gui/widgets/Makefile.am addressbook/gui/widgets/e-addressbook-model.c addressbook/gui/widgets/e-addressbook-model.h addressbook/gui/widgets/e-addressbook-reflow-adapter.c addressbook/gui/widgets/e-addressbook-view.c addressbook/gui/widgets/e-addressbook-view.h addressbook/gui/widgets/e-minicard-view.c addressbook/gui/widgets/eab-contact-display.c addressbook/gui/widgets/eab-gui-util.c addressbook/gui/widgets/eab-menu.c addressbook/gui/widgets/eab-menu.h addressbook/gui/widgets/eab-popup-control.c addressbook/gui/widgets/eab-popup-control.h addressbook/gui/widgets/eab-popup.c addressbook/gui/widgets/eab-popup.h addressbook/gui/widgets/eab-vcard-control.c addressbook/gui/widgets/eab-vcard-control.h addressbook/gui/widgets/gal-view-minicard.c addressbook/gui/widgets/gal-view-minicard.h addressbook/printing/e-contact-print-style-editor.c addressbook/printing/e-contact-print-style-editor.h addressbook/printing/e-contact-print.glade addressbook/printing/test-contact-print-style-editor.c addressbook/tools/evolution-addressbook-export.c addressbook/util/Makefile.am calendar/ChangeLog calendar/gui/Makefile.am calendar/gui/apps_evolution_calendar.schemas.in calendar/gui/calendar-component.c calendar/gui/calendar-component.h calendar/gui/calendar-config.c calendar/gui/comp-editor-factory.c calendar/gui/comp-editor-factory.h calendar/gui/comp-util.c calendar/gui/comp-util.h calendar/gui/control-factory.c calendar/gui/control-factory.h calendar/gui/dialogs/alarm-dialog.c calendar/gui/dialogs/cal-prefs-dialog.c calendar/gui/dialogs/cal-prefs-dialog.glade calendar/gui/dialogs/cal-prefs-dialog.h calendar/gui/dialogs/comp-editor.c calendar/gui/dialogs/comp-editor.h calendar/gui/dialogs/event-editor.c calendar/gui/dialogs/event-page.c calendar/gui/dialogs/memo-editor.c calendar/gui/dialogs/memo-page.c calendar/gui/dialogs/recurrence-page.c calendar/gui/dialogs/task-details-page.c calendar/gui/dialogs/task-details-page.glade calendar/gui/dialogs/task-editor.c calendar/gui/dialogs/task-page.c calendar/gui/e-cal-component-memo-preview.c calendar/gui/e-cal-component-memo-preview.h calendar/gui/e-cal-component-preview.c calendar/gui/e-cal-component-preview.h calendar/gui/e-cal-event.h calendar/gui/e-cal-model.c calendar/gui/e-cal-popup.c calendar/gui/e-calendar-table.c calendar/gui/e-calendar-view.c calendar/gui/e-day-view.c calendar/gui/e-itip-control.c calendar/gui/e-memo-table.c calendar/gui/e-memos.c calendar/gui/e-memos.h calendar/gui/e-tasks.c calendar/gui/e-tasks.h calendar/gui/e-week-view.c calendar/gui/gnome-cal.c calendar/gui/goto.c calendar/gui/itip-bonobo-control.c calendar/gui/itip-bonobo-control.h calendar/gui/itip-utils.c calendar/gui/itip-utils.h calendar/gui/main.c calendar/gui/memos-component.c calendar/gui/memos-control.c calendar/gui/memos-control.h calendar/gui/migration.c calendar/gui/migration.h calendar/gui/tasks-component.c calendar/gui/tasks-control.c calendar/importers/main.c composer/ChangeLog composer/e-composer-actions.c composer/e-composer-private.c composer/e-msg-composer.c composer/e-msg-composer.h composer/evolution-composer.ui configure.in doc/reference/shell/eshell-overrides.txt e-util/ChangeLog e-util/Makefile.am e-util/e-corba-utils.c e-util/e-corba-utils.h e-util/e-gui-utils.c e-util/e-gui-utils.h e-util/e-logger.c e-util/e-non-intrusive-error-dialog.c e-util/e-non-intrusive-error-dialog.h e-util/e-plugin-ui.c e-util/e-util-labels.c e-util/e-util-labels.h e-util/e-util.c e-util/e-util.h filter/ChangeLog filter/filter-option.c help/C/evolution.xml help/ChangeLog help/Makefile.am help/cs/cs.po help/de/de.po help/es/es.po help/eu/figures/Screenshot-Free-Busy.png help/eu/figures/evo_blink.png help/eu/figures/evo_dialog-info.png help/eu/figures/evo_dialog-warning.png help/eu/figures/evo_email_a.png help/eu/figures/evo_flag_follow_up_a.png help/eu/figures/evo_proxyadd_a.png help/eu/figures/evo_shd_memo_a.png help/eu/figures/exchange-delegation.png help/eu/figures/exchange-identity.png help/eu/figures/exchange-receive-options.png help/eu/figures/exchange-receive.png help/eu/figures/exchg-identity.png help/eu/figures/exchng-identity.png help/eu/figures/exchng-rec-mail.png help/eu/figures/exchng-rec-option.png help/eu/figures/exchng-rec-options.png help/eu/figures/free_busy.png help/eu/figures/full-1.png help/eu/figures/full-2.png help/eu/figures/full-3.png help/eu/figures/full-4.png help/eu/figures/full-5.png help/eu/figures/full-6.png help/eu/figures/full-7.png help/eu/figures/mail-druid-pic.png help/eu/figures/mail-inbox.png help/eu/figures/mail-threaded.png help/eu/figures/mainwindow-pic.png help/eu/figures/minus.png help/eu/figures/plus.png help/eu/figures/proxy-cal.png help/eu/figures/proxy-login.png help/eu/figures/schedule.png help/eu/figures/stock_search.png help/eu/figures/sub-others-folder.png help/eu/figures/sub-pub-fold.png help/eu/figures/vfolder-createrule-fig.png help/quickref/Makefile.am mail/ChangeLog mail/Makefile.am mail/default/Makefile.am mail/e-mail-shell-module-migrate.c mail/e-searching-tokenizer.c mail/em-account-editor.c mail/em-account-prefs.h mail/em-composer-prefs.c mail/em-composer-prefs.h mail/em-composer-utils.c mail/em-filter-folder-element.c mail/em-folder-browser.c mail/em-folder-selection-button.h mail/em-folder-selector.c mail/em-folder-tree-model.c mail/em-folder-tree-model.h mail/em-folder-tree.c mail/em-folder-tree.h mail/em-folder-utils.c mail/em-folder-utils.h mail/em-folder-view.c mail/em-format-html-display.c mail/em-format-html-print.c mail/em-format-html-print.h mail/em-format-html.c mail/em-format-quote.h mail/em-format.c mail/em-format.h mail/em-html-stream.h mail/em-mailer-prefs.c mail/em-mailer-prefs.h mail/em-message-browser.c mail/em-message-browser.h mail/em-migrate.h mail/em-network-prefs.h mail/em-popup.c mail/em-search-context.h mail/em-subscribe-editor.c mail/em-utils.c mail/em-utils.h mail/filtertypes.xml mail/mail-component-factory.c mail/mail-component.c mail/mail-config-factory.c mail/mail-config-factory.h mail/mail-config.c mail/mail-config.glade mail/mail-crypto.c mail/mail-crypto.h mail/mail-dialogs.glade mail/mail-folder-cache.c mail/mail-mt.c mail/mail-send-recv.c mail/mail-send-recv.h mail/mail-session.c mail/mail-session.h mail/mail-types.h mail/mail-vfolder.c mail/message-list.c mail/message-tag-followup.c mail/searchtypes.xml mail/vfoldertypes.xml plugins/attachment-reminder/Makefile.am plugins/audio-inline/org-gnome-audio-inline.eplug.xml plugins/caldav/ChangeLog plugins/caldav/caldav-source.c plugins/calendar-http/ChangeLog plugins/calendar-weather/ChangeLog plugins/calendar-weather/calendar-weather.c plugins/email-custom-header/ChangeLog plugins/email-custom-header/email-custom-header.c plugins/exchange-operations/ChangeLog plugins/google-account-setup/ChangeLog plugins/google-account-setup/Makefile.am plugins/google-account-setup/google-contacts-source.c plugins/google-account-setup/google-source.c plugins/import-ics-attachments/ChangeLog plugins/import-ics-attachments/Makefile.am plugins/import-ics-attachments/icsimporter.c plugins/itip-formatter/ChangeLog plugins/itip-formatter/itip-view.c plugins/mail-account-disable/ChangeLog plugins/mail-account-disable/mail-account-disable.c plugins/mail-notification/ChangeLog plugins/mail-notification/mail-notification.c plugins/mail-to-meeting/ChangeLog plugins/mail-to-task/ChangeLog plugins/mark-all-read/mark-all-read.c plugins/publish-calendar/ChangeLog plugins/publish-calendar/publish-format-fb.c plugins/publish-calendar/publish-format-ical.c plugins/save-attachments/ChangeLog plugins/save-attachments/Makefile.am plugins/save-attachments/save-attachments.c plugins/select-one-source/ChangeLog plugins/select-one-source/Makefile.am plugins/select-one-source/select-one-source.c plugins/startup-wizard/ChangeLog plugins/startup-wizard/startup-wizard.c plugins/webdav-account-setup/ChangeLog plugins/webdav-account-setup/Makefile.am plugins/webdav-account-setup/webdav-contacts-source.c po/ChangeLog po/POTFILES.in po/ar.po po/bg.po po/bn_IN.po po/ca.po po/cs.po po/da.po po/de.po po/el.po po/en_GB.po po/es.po po/et.po po/fr.po po/gl.po po/gu.po po/hi.po po/hu.po po/it.po po/ja.po po/kn.po po/ko.po po/lt.po po/ml.po po/mr.po po/nb.po po/nl.po po/pa.po po/pl.po po/pt.po po/ru.po po/sl.po po/sr.po po/sr@latin.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po po/zh_HK.po po/zh_TW.po shell/ChangeLog shell/Evolution-Component.idl shell/Makefile.am shell/apps_evolution_shell.schemas.in shell/e-component-registry.c shell/e-component-registry.h shell/e-component-view.c shell/e-component-view.h shell/e-corba-config-page.c shell/e-corba-config-page.h shell/e-shell-constants.h shell/e-shell-importer.c shell/e-shell-importer.h shell/e-shell-nm.c shell/e-shell-settings-dialog.c shell/e-shell-settings-dialog.h shell/e-shell-view.c shell/e-shell-view.h shell/e-shell-window-commands.c shell/e-shell-window-commands.h shell/e-shell-window.c shell/e-shell-window.h shell/e-shell.c shell/e-shell.h shell/e-sidebar.c shell/e-sidebar.h shell/e-user-creatable-items-handler.c shell/e-user-creatable-items-handler.h shell/es-menu.c shell/es-menu.h shell/evolution-component.c shell/evolution-component.h shell/evolution-config-control.c shell/evolution-config-control.h shell/evolution-listener.c shell/evolution-listener.h shell/evolution-shell-component-utils.c shell/evolution-shell-component-utils.h shell/importer/evolution-importer-client.c shell/importer/evolution-importer-client.h shell/importer/evolution-importer-listener.c shell/importer/evolution-importer-listener.h shell/importer/evolution-importer.c shell/importer/evolution-importer.h shell/importer/evolution-intelligent-importer.c shell/importer/evolution-intelligent-importer.h shell/importer/import.glade shell/importer/intelligent.c shell/importer/intelligent.h shell/main.c shell/shell.error.xml shell/test/evolution-test-component.c shell/test/evolution-test-component.h smime/ChangeLog smime/lib/Makefile.am ui/Makefile.am ui/evolution-addressbook.xml ui/evolution-calendar.xml widgets/ChangeLog widgets/menus/gal-view-menus.c widgets/menus/gal-view-menus.h widgets/misc/ChangeLog widgets/misc/Makefile.am widgets/misc/e-activity-handler.c widgets/misc/e-activity-handler.h widgets/misc/e-attachment-bar.c widgets/misc/e-attachment-bar.h widgets/misc/e-attachment.c widgets/misc/e-attachment.h widgets/misc/e-calendar-item.c widgets/misc/e-charset-picker.c widgets/misc/e-combo-button.c widgets/misc/e-combo-button.h widgets/misc/e-config-page.c widgets/misc/e-config-page.h widgets/misc/e-dropdown-button.c widgets/misc/e-dropdown-button.h widgets/misc/e-filter-bar.h widgets/misc/e-info-label.c widgets/misc/e-info-label.h widgets/misc/e-multi-config-dialog.c widgets/misc/e-multi-config-dialog.h widgets/misc/e-online-button.c widgets/misc/e-search-bar.c widgets/misc/e-search-bar.h widgets/misc/e-signature-combo-box.c widgets/misc/e-signature-combo-box.h widgets/misc/e-signature-editor.c widgets/misc/e-signature-editor.h widgets/misc/e-task-bar.c widgets/misc/e-task-bar.h widgets/misc/e-task-widget.c widgets/misc/e-task-widget.h widgets/misc/test-dropdown-button.c widgets/misc/test-info-label.c widgets/misc/test-multi-config-dialog.c widgets/table/ChangeLog widgets/table/e-cell-date.c widgets/table/e-table-group-container.c widgets/table/e-table-group-leaf.c widgets/table/e-table-group.c widgets/table/e-table-group.h widgets/table/e-table.c widgets/table/e-table.h
| * | | | | | | | | | | | | Merge revisions 37200:3266 from trunk.Matthew Barnes2009-02-1512-27753/+29784
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn path=/branches/kill-bonobo/; revision=37270
| * | | | | | | | | | | | | Merge revisions 37108:37199 from trunk.Matthew Barnes2009-02-0118-42678/+49035
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn path=/branches/kill-bonobo/; revision=37200
| * | | | | | | | | | | | | Merge revisions 37075:37107 from trunk.Matthew Barnes2009-01-217-10461/+11200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn path=/branches/kill-bonobo/; revision=37112
| * | | | | | | | | | | | | Merge revisions 37047:37074 from trunk.Matthew Barnes2009-01-153-5487/+4723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn path=/branches/kill-bonobo/; revision=37075
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 16:00:18 +0800