[chronojump: 2/2] Merge branch 'master' of gitlab.gnome.org:GNOME/chronojump Instructions for compile with a virtual m

[Xavier Padullés <xpadulles src gnome org>]

commit 1fe82e10517ad30911a1b17d1f1b7cb91aa50a3e
Merge: 0262bf61 8a9e3995
Author: Xavier Padullés <testing chronojump org>
Date:   Fri May 29 21:22:04 2020 +0200

    Merge branch 'master' of gitlab.gnome.org:GNOME/chronojump
    Instructions for compile with a virtual machine

 .gitignore                                         |    4 +
 chronojump.csproj                                  |    1 +
 configure.ac                                       |   28 +-
 glade/app1.glade                                   | 1818 ++++++++----
 glade/{ => old}/dialog_help_ports.glade            |    0
 glade/preferences_win.glade                        | 1054 +++----
 howto_compile.txt                                  |    2 +-
 images/board-encoder.png                           |  Bin 4572 -> 4450 bytes
 images/selector-encoder.png                        |  Bin 8802 -> 8835 bytes
 images/svg/chronojump-1.7.1.svg                    |  213 +-
 package/macos/Makefile                             |   60 +
 package/macos/app/Applications                     |    1 +
 .../app/Chronojump.app/Contents/MacOS/Chronojump   |    1 +
 .../Chronojump.app/Contents/Resources/icon.icns    |  Bin 0 -> 88060 bytes
 package/macos/resources/Info.plist                 |   26 +
 package/macos/resources/config                     |   54 +
 package/macos/resources/osxrelocator.py            |  139 +
 po/POTFILES.in                                     |    6 +-
 po/es.po                                           | 1450 +++++-----
 po/ro.po                                           | 2958 ++++++++++----------
 resources.txt                                      |    1 +
 src/Makefile.am                                    |    4 +-
 src/chronojump-importer/chronojump_importer.py     |   35 +-
 src/gui/app1/chronojump.cs                         |  120 +-
 src/gui/app1/contactsExercise.cs                   |    4 +-
 src/gui/app1/encoder.cs                            |    4 +-
 src/gui/app1/forceSensor.cs                        |    4 +-
 src/gui/app1/forceSensorAnalyze.cs                 |    2 +-
 src/gui/app1/icons.cs                              |   24 +-
 src/gui/app1/menu.cs                               |  111 +-
 src/gui/app1/menu_tiny.cs                          |   46 +-
 src/gui/app1/runEncoder.cs                         |    2 +-
 src/gui/app1/session/backup.cs                     |  315 +++
 src/gui/app1/session/loadAndImport.cs              |   15 +-
 src/gui/app1/session/main.cs                       |   57 +-
 src/gui/chronojumpImporter.cs                      |    6 +-
 src/gui/networks.cs                                |    4 +-
 src/gui/{ => old}/helpPorts.cs                     |    0
 src/gui/preferences.cs                             |  334 +--
 src/gui/repetitiveConditions.cs                    |    6 +-
 src/preferences.cs                                 |    5 +
 src/sqlite/main.cs                                 |   13 +
 src/sqlite/preferences.cs                          |    2 +
 src/utilDate.cs                                    |    4 +
 44 files changed, 4839 insertions(+), 4094 deletions(-)
---
diff --cc howto_compile.txt
index 13ade67b,739d91ae..68749bd0
--- a/howto_compile.txt
+++ b/howto_compile.txt
@@@ -17,14 -17,9 +17,14 @@@ http://foro.chronojump.org/showthread.p
  MACOSX
  -------------------------------------------------------------------
  
 +If you need to create a virtual machine with MacOS it is recommended to use:
 +https://github.com/myspaghetti/macos-virtualbox
 +It is inportant not to interact with the virtual machine and only press enter when promnpted by the script
 +If something fails the script can be resumed at the desired point. See documentation
 +
  install cerbero
  
- git clone git://git.gnome.org/chronojump
+ git clone https://gitlab.gnome.org/GNOME/chronojump.git
  
  start cerbero shell
  #this works from terminal or from ssh