[chronojump: 10/10] Merge branch 'different_glades_2'

[Carles Pina i Estany <carlespina src gnome org>]

commit 6ea944d1fbe281a38d42cf3d7100645875056110
Merge: 0340491 834acf0
Author: Carles Pina i Estany <carles pina cat>
Date:   Thu Oct 20 23:07:30 2016 +0200

    Merge branch 'different_glades_2'

 Makefile.am                          |    2 +-
 chronojump.csproj                    |  112 +-
 glade/app1.glade                     |19459 +++++++++++
 glade/chronojump.glade               |62662 ----------------------------------
 glade/chronojump.gladep              |    8 -
 glade/chronopic_window.glade         | 1111 +
 glade/chronopic_wizard_win.glade     |  933 +
 glade/confirm_window.glade           |  120 +
 glade/convert_weight.glade           |  173 +
 glade/dialog_about.glade             |  471 +
 glade/dialog_calendar.glade          |   60 +
 glade/dialog_help_ports.glade        |  257 +
 glade/dialog_image_test.glade        |  150 +
 glade/dialog_message.glade           |  314 +
 glade/dialog_server_stats.glade      | 2657 ++
 glade/edit_event.glade               | 4687 +++
 glade/encoder_configuration.glade    | 1540 +
 glade/error_dialog.glade             |   61 +
 glade/error_window.glade             |  357 +
 glade/evaluator_window.glade         | 1057 +
 glade/event_graph_configure.glade    |  373 +
 glade/execute_auto.glade             |  885 +
 glade/generic_window.glade           |  742 +
 glade/howto_add_new_glade.txt        |    7 +
 glade/jump_type_add.glade            |  534 +
 glade/jumps_runs_more.glade          |  147 +
 glade/person_multiple_infinite.glade | 7253 ++++
 glade/person_recuperate.glade        |  281 +
 glade/person_select_window.glade     | 2756 ++
 glade/person_show_all_events.glade   |  125 +
 glade/person_win.glade               | 2047 ++
 glade/preferences_win.glade          | 3304 ++
 glade/query_server_window.glade      | 3987 +++
 glade/repair_sub_event.glade         |  340 +
 glade/repetitive_conditions.glade    | 3523 ++
 glade/report_window.glade            |  766 +
 glade/run_type_add.glade             |  695 +
 glade/session_add_edit.glade         |  609 +
 glade/session_load.glade             |  244 +
 glade/session_load2.glade            |  235 +
 glade/session_load3.glade            |  235 +
 glade/session_upload.glade           |  436 +
 glade/splash_window.glade            |  134 +
 glade/stats_select_sessions.glade    |  254 +
 howto_compile.txt                    |    2 +-
 po/POTFILES.in                       |   36 +-
 src/Makefile.am                      |   38 +-
 src/gui/about.cs                     |    2 +-
 src/gui/chronojump.cs                |    2 +-
 src/gui/chronopic.cs                 |    2 +-
 src/gui/chronopicWizard.cs           |    2 +-
 src/gui/confirm.cs                   |    4 +-
 src/gui/convertWeight.cs             |    2 +-
 src/gui/dialogCalendar.cs            |    2 +-
 src/gui/dialogImageTest.cs           |    4 +-
 src/gui/dialogMessage.cs             |    2 +-
 src/gui/dialogServerStats.cs         |    2 +-
 src/gui/encoderConfiguration.cs      |    2 +-
 src/gui/error.cs                     |    2 +-
 src/gui/evaluator.cs                 |    2 +-
 src/gui/event.cs                     |    4 +-
 src/gui/eventGraphConfigure.cs       |    2 +-
 src/gui/executeAuto.cs               |    2 +-
 src/gui/genericWindow.cs             |    2 +-
 src/gui/helpPorts.cs                 |    2 +-
 src/gui/jump.cs                      |   10 +-
 src/gui/jumpType.cs                  |    2 +-
 src/gui/multiChronopic.cs            |    2 +-
 src/gui/person.cs                    |   12 +-
 src/gui/personSelect.cs              |    2 +-
 src/gui/preferences.cs               |    2 +-
 src/gui/pulse.cs                     |    4 +-
 src/gui/queryServer.cs               |    2 +-
 src/gui/reactionTime.cs              |    2 +-
 src/gui/repetitiveConditions.cs      |    2 +-
 src/gui/report.cs                    |    2 +-
 src/gui/run.cs                       |   10 +-
 src/gui/runType.cs                   |    2 +-
 src/gui/server.cs                    |    2 +-
 src/gui/session.cs                   |    6 +-
 src/gui/splash.cs                    |    2 +-
 81 files changed, 63556 insertions(+), 62729 deletions(-)
---