gitextensions · RussKie · May 14, 2018 · May 13, 2018
diff --git a/source/getting_started.rst b/source/getting_started.rst
@@ -1,21 +1,14 @@
 Getting Started
 ===============
 
-This section is primarily written for Windows users. There are extra sections
-about installing Git Extensions on Linux and Mac OS X.
-
 Installation
 ------------
 
-There is a single click installer GitExtensions-X.XX.XX-SetupComplete.msi that installs Git for Windows 32bit, Kdiff3 32bit
-and Git Extensions. The installer can be found `here <https://github.com/gitextensions/gitextensions/releases/latest>`_.
+The single click Git Extensions installer can be found `here <https://github.com/gitextensions/gitextensions/releases/latest>`_.
 
 .. image:: /images/install/install1.png
 
-.. figure:: /images/install/install2.png
-
-    Git Extensions depends heavily on Git for Windows. When Git for Windows is not installed, ensure the "Install Git for Windows" checkbox is checked. Kdiff3 is
-    optional, but is advised as a merge tool.
+    Git Extensions depends heavily on Git for Windows.
 
 .. image:: /images/install/install3.png
 
@@ -29,73 +22,6 @@ and Git Extensions. The installer can be found `here <https://github.com/gitexte
 
 .. image:: /images/install/install6.png
 
-Installation (Linux)
---------------------
-You can watch this video as a starting point: `Install Git Extensions on Ubuntu 11.04  <http://www.youtube.com/watch?v=zk2MMUQuW4s>`_
-
-For further help go to https://groups.google.com/forum/?fromgroups=#!forum/gitextensions
-
-This section only covers mono installation, you should have git installed in your Linux at this point. Please refer to https://git-scm.com/download/linux
-
-First, make sure you have the latest mono version on your Linux. This section will cover installation of Mono 4.6 on a Linux.
-
-1) Install mono latest version. You can always check for this here: http://www.mono-project.com/download/#download-lin
-2) If everything went okay, you should open your terminal and check mono version::
-
-    $ mono --version
-    Mono JIT compiler version 4.6.1 (Stable 4.6.1.5/ef43c15 Wed Oct 12 09:10:37 UTC 2016)
-    Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
-        TLS:           __thread
-        SIGSEGV:       altstack
-        Notifications: epoll
-        Architecture:  amd64
-        Disabled:      none
-        Misc:          softdebug
-        LLVM:          supported, not enabled.
-        GC:            sgen
-3) Now download Git Extensions latest version from https://github.com/gitextensions/gitextensions/releases/latest. Remember to select the appropriate package otherwise you could have problems.
-4) Browse into the folder where you extracted the package and just run mono command, like the example below::
-
-    $ mono GitExtensions.exe
-
-Installation (macOS)
---------------------
-
-This section only covers mono installation, you should have git installed in your Mac at this point. Please refer to https://git-scm.com/download/mac
-
-First, make sure you have the latest mono version on your Mac. This section will cover installation of Mono 4.6 on a Mac.
-
-1) Download mono latest version. You can always check for this here: http://www.mono-project.com/download/#download-mac
-2) After you have completed the download, you will see a .dmg file. Double click it to open the package.
-3) Inside the .dmg file you will have MonoFramework-{version}.pkg. Double click to start the installation process.
-4) Follow the wizard until it's completion.
-5) If everything went okay, you should open your terminal and check mono version::
-
-    $ mono --version
-    Mono JIT compiler version 4.6.1 (mono-4.6.0-branch-c8sr0/abb06f1 Fri Sep 23 19:24:23 EDT 2016)
-    Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
-        TLS:           normal
-        SIGSEGV:       altstack
-        Notification:  kqueue
-        Architecture:  x86
-        Disabled:      none
-        Misc:          softdebug
-        LLVM:          yes(3.6.0svn-mono-master/8b1520c)
-        GC:            sgen
-
-6) Now download Git Extensions latest version from https://github.com/gitextensions/gitextensions/releases/latest. Remember to select the appropriate package otherwise you could have problems.
-7) Browse into the folder where you extracted the package and just run mono command, like the example below::
-
-    $ mono GitExtensions.exe
-
-This is the minimal setup you need in order to run Git Extensions.
-
-Troubleshooting Mac Installation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-1) If your Git Extensions crashes with an exception that a font is missing (generic sans serif), you probably can fix this by installing Xquartz. This is a version of the X.Org X Windows System that runs on OS X. I am not sure what the side effects are. This can be installed from here: http://xquartz.macosforge.org/landing/
-2) If Git Extensions still crashes because it is unable to load a plugin, empty the plugins folder.
-
 Settings
 --------
 

diff --git a/source/git_extensions.rst b/source/git_extensions.rst
@@ -1,19 +1,21 @@
 Git Extensions
 ==============
 
-Git Extensions is a toolkit aimed at making working with Git under Windows more intuitive
-(note that Git Extensions is also available on Linux and Macintosh OS X using Mono). The shell 
+Git Extensions is a toolkit aimed at making working with Git under Windows more intuitive.
+The shell 
 extension will integrate in Windows Explorer and presents a context menu on files and directories. 
-There is also a Visual Studio plug-in to use Git from the Visual Studio IDE.
+There is also a Visual Studio extension to use Git from the Visual Studio IDE.
 
 Features
 --------
 
 * Windows Explorer integration for Git
-* Visual Studio (2010 - 2015) plug-in for Git
 * Feature rich user interface for Git
-* Single installer installs Git, Git Extensions and the merge tool KDiff3 
 * 32bit and 64bit support
+* Visual Studio extension (2015-2017)
+
+Specific in 2.5x releases:
+* Visual Studio (2010 - 2015) add-in
 * Runs under Linux or Mac OS X using `Mono <http://www.mono-project.com>`_
 
 Video tutorials

diff --git a/source/images/install/install2.png b/source/images/install/install2.png
diff --git a/source/locale/getting_started.pot b/source/locale/getting_started.pot
@@ -29,11 +29,11 @@ msgid "Installation"
 msgstr ""
 
 #: ..\getting_started.rst:10
-msgid "There is a single click installer GitExtensions-X.XX.XX-SetupComplete.msi that installs Git for Windows 32bit, Kdiff3 32bit and Git Extensions. The installer can be found `here <https://github.com/gitextensions/gitextensions/releases/latest>`_."
+msgid "The single click Git Extensions installer can be found `here <https://github.com/gitextensions/gitextensions/releases/latest>`_."
 msgstr ""
 
 #: ..\getting_started.rst:17
-msgid "Git Extensions depends heavily on Git for Windows. When Git for Windows is not installed, ensure the \"Install Git for Windows\" checkbox is checked. Kdiff3 is optional, but is advised as a merge tool."
+msgid "Git Extensions depends heavily on Git for Windows."
 msgstr ""
 
 #: ..\getting_started.rst:24

diff --git a/source/plugins.rst b/source/plugins.rst
@@ -18,6 +18,8 @@ List of the available plugins
 * Release Notes Generator
 * Statistics
 
+(Incomplete list)
+
 GitFlow
 -------
 

diff --git a/source/settings.rst b/source/settings.rst
@@ -25,7 +25,7 @@ button has no effect for the page - this will be noted on the page in the area n
 
 Settings that are specific to Git Extensions and apply globally will be stored in a file called ``GitExtensions.settings``
 either in the user's application data path or with the program.
-The location is dependant on the IsPortable setting in the ``GitExtensions.exe.config`` file that is with the program.
+The location is dependent on the IsPortable setting in the ``GitExtensions.exe.config`` file that is with the program.
 Settings that are specific to Git Extensions but apply to only the current repository will be stored in a file of the same
 name, ``GitExtensions.settings``, but in either the root folder of the repository or the ``.git`` folder of the repository,
 depending on whether or not they are distributed with that repository.
@@ -92,19 +92,18 @@ The settings that are used by Git are stored in the configuration files of Git.
 
       When enabled, the number of pending commits are shown on the toolbar as a figure in parentheses next to the Commit button.
       Git Extensions must be stopped and restarted to activate changes to this option.
+      Turn this off if you experience slowdowns.
 
     .. setting:: Show current working directory changes in revision graph
       :id: working-dir-changes
 
       When enabled, two extra revisions are added to the revision graph. 
       The first shows the current working directory status. The second shows the staged files.
-      This option can cause slowdowns when browsing large repositories.
 
     .. setting:: Use FileSystemWatcher to check if index is changed
       :id: filesystemwatcher
 
       Using the FileSystemWatcher to check index state improves the performance in some cases.
-      Turn this off if you experience refresh problems in commit log.
 
     .. setting:: Show stash count on status bar in browse window
       :id: stash-count
@@ -1077,7 +1076,7 @@ The settings that are used by Git are stored in the configuration files of Git.
 
 .. settingspage:: Plugins
 
-  Plugins provide extra functionality for Git Extensions.
+  Plugins provide extra functionality for Git Extensions. This list is incomplete.
 
   .. settingspage:: Auto compile SubModules
 
@@ -1232,10 +1231,10 @@ The settings that are used by Git are stored in the configuration files of Git.
     This involves summarising all commits between the specified from and to commit expressions
     when the plugin is started. This output can be copied to the clipboard in various formats.
 
-  .. settingspage:: Create Bitbucket Pull Request
+  .. settingspage:: Bitbucket Server
 
     If your repository is hosted on Atlassian Bitbucket Server
-    then this plugin will enable you to create a pull request for Bitbucket from Git Extensions
+    then this plugin will enable you to create a pull request for Bitbucket from Git Extensions. The plugin cannot be used for bitbucket.org.
 
     For more information see: https://www.atlassian.com/software/bitbucket/server
 

diff --git a/source/translations.rst b/source/translations.rst
@@ -12,12 +12,4 @@ Git Extensions installation directory. The files are readable xml files.
 Translate Git Extensions
 ------------------------
 
-The application has a built-in translation tool to help create and edit translations. To open the translation tool choose 
-``Translate`` in the ``Help`` menu.
-
-.. image:: /images/translate.png
-
-The functions of the translation tool are described in the image below. To contribute any translations you can either e-mail 
-a patch or send a pull request using github.
-
-.. image:: /images/translate_window.png
+Translations are done on Transifex: https://www.transifex.com/git-extensions/git-extensions/
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,8 @@ List of the available plugins @@
     * Release Notes Generator
     * Statistics
+    (Incomplete list)
     GitFlow
     -------
@@ Expand Down @@