Combine multiline strings into one string which will be placed in the textbox input. Also add additional comments in strings.po

22 files changed, 143 insertions, 157 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index cb40d52cea..898faefae4 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -2640,12 +2640,10 @@ msgid "To:"
 msgstr ""
 
 msgctxt "#608"
-msgid "Couldn't rip CD or track"
+msgid "Couldn't rip CD or track because CDDARipPath is not set."
 msgstr ""
 
-msgctxt "#609"
-msgid "CDDARipPath is not set."
-msgstr ""
+#empty string id 609
 
 msgctxt "#610"
 msgid "Rip audio track"
@@ -3357,13 +3355,10 @@ msgstr ""
 
 #: xbmc/music/windows/GUIWindowMusicBase.cpp
 msgctxt "#800"
-msgid "Music library needs to rescan tags from files."
+msgid "Music library needs to rescan tags from files. Would you like to scan now?"
 msgstr ""
 
-#: xbmc/music/windows/GUIWindowMusicBase.cpp
-msgctxt "#801"
-msgid "Would you like to scan now?"
-msgstr ""
+#empty string id 801
 
 #. Label of progess bar which shows the available/total space of pvr backend
 #: xbmc/pvr/PVRGUIInfo.cpp
@@ -5454,15 +5449,10 @@ msgstr ""
 
 #: xbmc\network\NetworkServices.cpp
 msgctxt "#13141"
-msgid "If you proceed, you might not be able to control this application"
-msgstr ""
-
-#: xbmc\network\NetworkServices.cpp
-msgctxt "#13142"
-msgid "any longer. Are you sure you want to stop the event server?"
+msgid "If you proceed, you might not be able to control this application any longer. Are you sure you want to stop the event server?"
 msgstr ""
 
-#empty string with id 13143
+#empty string id 13142 to 13143
 
 #: xbmc\osx\XBMCHelper.cpp
 msgctxt "#13144"
@@ -5471,20 +5461,10 @@ msgstr ""
 
 #: xbmc\osx\XBMCHelper.cpp
 msgctxt "#13145"
-msgid "If you are currently using the Apple Remote to control"
+msgid "If you are currently using the Apple Remote to control this application, changing this setting might affect your ability to continue controlling it. Do you want to proceed?"
 msgstr ""
 
-#: xbmc\osx\XBMCHelper.cpp
-msgctxt "#13146"
-msgid "this application, changing this setting might affect your ability"
-msgstr ""
-
-#: xbmc\osx\XBMCHelper.cpp
-msgctxt "#13147"
-msgid "to continue controlling it. Do you want to proceed?"
-msgstr ""
-
-#empty strings from id 13148 to 13158
+#empty strings from id 13146 to 13158
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13159"
@@ -5753,13 +5733,13 @@ msgctxt "#13307"
 msgid "Track naming template"
 msgstr ""
 
+
+#: unused
 msgctxt "#13308"
-msgid "Do you wish to reboot your system?"
+msgid "Do you wish to reboot your system instead of just this application?"
 msgstr ""
 
-msgctxt "#13309"
-msgid "instead of just this application?"
-msgstr ""
+#empty string id 13309
 
 msgctxt "#13310"
 msgid "Zoom effect"
@@ -6671,17 +6651,17 @@ msgctxt "#14037"
 msgid "DVD cache - Local network"
 msgstr ""
 
+#: xbmc/network/NetworkServices.cpp
 msgctxt "#14038"
 msgid "Network settings changed"
 msgstr ""
 
+#: xbmc/network/NetworkServices.cpp
 msgctxt "#14039"
-msgid "A restart is required to change your"
+msgid "A restart is required to change your network setup. Would you like to restart now?"
 msgstr ""
 
-msgctxt "#14040"
-msgid "network setup.  Would you like to restart now?"
-msgstr ""
+#empty string with id 14040
 
 #: system/settings/settings.xml
 msgctxt "#14041"
@@ -7371,6 +7351,7 @@ msgstr ""
 
 #empty strings from id 16042 to 16099
 
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#16100"
 msgid "All videos"
 msgstr ""
@@ -7383,22 +7364,35 @@ msgctxt "#16102"
 msgid "Watched"
 msgstr ""
 
+#: xbmc/music/windows/GUIWindowMusicNav.cpp
+#: xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
+#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#16103"
 msgid "Mark as watched"
 msgstr ""
 
+#: xbmc/music/windows/GUIWindowMusicNav.cpp
+#: xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
+#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#16104"
 msgid "Mark as unwatched"
 msgstr ""
 
+#: xbmc/music/windows/GUIWindowMusicNav.cpp
+#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#16105"
 msgid "Edit title"
 msgstr ""
 
+#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#16106"
 msgid "Manage..."
 msgstr ""
 
+#: xbmc/video/dialogs/GUIDialogVideoInfo.cpp
 msgctxt "#16107"
 msgid "Edit sort title"
 msgstr ""
@@ -7664,10 +7658,12 @@ msgctxt "#19000"
 msgid "Switch to channel"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19001"
 msgid "Separate the search words by using AND, OR and / or NOT."
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19002"
 msgid "or use phrases to find an exact match, like \"The wizard of Oz\"."
 msgstr ""
@@ -7687,30 +7683,37 @@ msgctxt "#19004"
 msgid "Importing guide from clients"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19005"
 msgid "PVR stream information"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19006"
 msgid "Receiving device"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19007"
 msgid "Device status"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19008"
 msgid "Signal quality"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19009"
 msgid "SNR"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19010"
 msgid "BER"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19011"
 msgid "UNC"
 msgstr ""
@@ -7720,18 +7723,22 @@ msgctxt "#19012"
 msgid "PVR backend"
 msgstr ""
 
+#: xbmc/pvr/channels/PVRChannel.cpp
 msgctxt "#19013"
 msgid "Free to air"
 msgstr ""
 
+#: xbmc/pvr/channels/PVRChannel.cpp
 msgctxt "#19014"
 msgid "Fixed"
 msgstr ""
 
+#: skin.confluence
 msgctxt "#19015"
 msgid "Encryption"
 msgstr ""
 
+#: unused
 msgctxt "#19016"
 msgid "PVR backend %i - %s"
 msgstr ""
@@ -7753,22 +7760,34 @@ msgctxt "#19019"
 msgid "Channels"
 msgstr ""
 
+#: xbmc/pvr/channels/PVRChannelGroupsContainer.cpp
+#: xbmc/pvr/PVRManager.cpp
+#: skin.confluence
 msgctxt "#19020"
 msgid "TV"
 msgstr ""
 
+#: xbmc/pvr/channels/PVRChannelGroupsContainer.cpp
+#: xbmc/pvr/PVRManager.cpp
+#: skin.confluence
 msgctxt "#19021"
 msgid "Radio"
 msgstr ""
 
+#: xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
+#: xbmc/pvr/windows/GUIWindowPVRChannels.cpp
 msgctxt "#19022"
 msgid "Hidden"
 msgstr ""
 
+#: xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
+#: skin.confluence
 msgctxt "#19023"
 msgid "TV channels"
 msgstr ""
 
+#: xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
+#: skin.confluence
 msgctxt "#19024"
 msgid "Radio channels"
 msgstr ""
@@ -8257,13 +8276,12 @@ msgctxt "#19136"
 msgid "Channel unavailable"
 msgstr ""
 
+#: xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
 msgctxt "#19137"
-msgid "No groups defined"
+msgid "No groups defined. Please create a group first"
 msgstr ""
 
-msgctxt "#19138"
-msgid "Please create a group first"
-msgstr ""
+#empty string id 19138
 
 msgctxt "#19139"
 msgid "Name of the new group"
@@ -8707,21 +8725,19 @@ msgctxt "#19239"
 msgid "Starting background threads"
 msgstr ""
 
+#: xbmc/pvr/windows/PVRClients.cpp
 msgctxt "#19240"
 msgid "No PVR add-on enabled"
 msgstr ""
 
+#: xbmc/pvr/windows/PVRClients.cpp
 msgctxt "#19241"
-msgid "The PVR manager has been enabled without any"
+msgid "The PVR manager has been enabled without any enabled PVR add-on. Enable at least one add-on in order to use the PVR functionality."
 msgstr ""
 
-msgctxt "#19242"
-msgid "enabled PVR add-on. Enable at least one add-on"
-msgstr ""
+#empty strings id 19242
 
-msgctxt "#19243"
-msgid "in order to use the PVR functionality."
-msgstr ""
+#empty strings id 19243
 
 #: system/settings/settings.xml
 msgctxt "#19244"
@@ -8852,16 +8868,12 @@ msgid "No PVR add-ons could be found"
 msgstr ""
 
 msgctxt "#19272"
-msgid "You need a tuner, backend software, and an"
+msgid "You need a tuner, backend software, and an add-on for the backend to be able to use PVR. Please visit http://kodi.wiki/view/PVR to learn more."
 msgstr ""
 
-msgctxt "#19273"
-msgid "add-on for the backend to be able to use PVR."
-msgstr ""
+#empty string id 19273
 
-msgctxt "#19274"
-msgid "Please visit http://kodi.wiki/view/PVR to learn more."
-msgstr ""
+#empty string id 19274
 
 #: xbmc/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19275"
@@ -9685,8 +9697,9 @@ msgctxt "#20047"
 msgid "Create profile '%s'?"
 msgstr ""
 
+#: xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
 msgctxt "#20048"
-msgid "Start with fresh settings"
+msgid "Start with fresh settings or copy from default?"
 msgstr ""
 
 msgctxt "#20049"
@@ -9780,19 +9793,17 @@ msgctxt "#20070"
 msgid "Profile directory"
 msgstr ""
 
+#: xbmc/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20071"
-msgid "Start with fresh media sources"
+msgid "Start with fresh media sources or copy from default?"
 msgstr ""
 
 #: xbmc/dialogs/GUIDialogFileBrowser.cpp
 msgctxt "#20072"
-msgid "Make sure the selected folder is writeable"
+msgid "Make sure the selected folder is writable and that the new folder name is valid"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogFileBrowser.cpp
-msgctxt "#20073"
-msgid "and that the new folder name is valid"
-msgstr ""
+#empty string id 20073
 
 #: xbmc/playlists/SmartPlaylist.cpp
 msgctxt "#20074"
@@ -9911,24 +9922,20 @@ msgctxt "#20101"
 msgid "Entering master lock code always enables master mode"
 msgstr ""
 
-msgctxt "#20102"
-msgid "or copy from default?"
-msgstr ""
+#empty string id 20102
 
 msgctxt "#20103"
 msgid "Save changes to profile?"
 msgstr ""
 
 msgctxt "#20104"
-msgid "Old settings found."
+msgid "Old settings found. Do you want to use them?"
 msgstr ""
 
-msgctxt "#20105"
-msgid "Do you want to use them?"
-msgstr ""
+#empty string id 20105
 
 msgctxt "#20106"
-msgid "Old media sources found."
+msgid "Old media sources found. Do you want to use them?"
 msgstr ""
 
 msgctxt "#20107"
@@ -9983,12 +9990,10 @@ msgid "Invalid lock code."
 msgstr ""
 
 msgctxt "#20118"
-msgid "This requires the master lock to be set."
+msgid "This requires the master lock to be set. Would you like to set it now?"
 msgstr ""
 
-msgctxt "#20119"
-msgid "Would you like to set it now?"
-msgstr ""
+#empty string id 20119
 
 msgctxt "#20120"
 msgid "Loading program information"
@@ -10582,13 +10587,12 @@ msgctxt "#20339"
 msgid "Director"
 msgstr ""
 
+#: xbmc/music/windows/GUIWindowMusicSongs.cpp
 msgctxt "#20340"
-msgid "Do you want to remove all items within"
+msgid "Do you want to remove all items within this path from your library?"
 msgstr ""
 
-msgctxt "#20341"
-msgid "this path from your library?"
-msgstr ""
+#empty string id 20341
 
 #: xbmc/dialogs/GUIDialogMediaFilter.cpp
 #: xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
@@ -10979,12 +10983,10 @@ msgid "Fanart slideshow"
 msgstr ""
 
 msgctxt "#20426"
-msgid "Export to a single file or separate"
+msgid "Export to a single file or separate files per entry?"
 msgstr ""
 
-msgctxt "#20427"
-msgid "files per entry?"
-msgstr ""
+#empty string id 20427
 
 msgctxt "#20428"
 msgid "Single file"
@@ -11057,12 +11059,10 @@ msgid "Change content"
 msgstr ""
 
 msgctxt "#20443"
-msgid "Do you want to refresh information for all"
+msgid "Do you want to refresh info for all items within this path?"
 msgstr ""
 
-msgctxt "#20444"
-msgid "items within this path?"
-msgstr ""
+#empty string id 20444
 
 #: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
 msgctxt "#20445"
@@ -11070,12 +11070,10 @@ msgid "Fanart"
 msgstr ""
 
 msgctxt "#20446"
-msgid "Locally stored information found."
+msgid "Locally stored information found. Ignore and refresh from Internet?"
 msgstr ""
 
-msgctxt "#20447"
-msgid "Ignore and refresh from Internet?"
-msgstr ""
+#empty string id 20447
 
 #: xbmc/video/VideoInfoScanner.cpp
 msgctxt "#20448"
@@ -11087,8 +11085,9 @@ msgctxt "#20449"
 msgid "Unable to connect to remote server"
 msgstr ""
 
+#: xbmc/video/VideoInfoScanner.cpp
 msgctxt "#20450"
-msgid "Would you like to continue scanning?"
+msgid "Unable to connect to remote server. Would you like to continue scanning?"
 msgstr ""
 
 #: xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
@@ -13446,20 +13445,7 @@ msgctxt "#33073"
 msgid "View changelog"
 msgstr ""
 
-#: Unknown
-msgctxt "#33074"
-msgid "This version of %s requires an"
-msgstr ""
-
-#: Unknown
-msgctxt "#33075"
-msgid "Kodi revision of %s or greater to run."
-msgstr ""
-
-#: Unknown
-msgctxt "#33076"
-msgid "Please update Kodi."
-msgstr ""
+#empty string id from 33074 to 33076
 
 #: Unknown
 msgctxt "#33077"
@@ -13530,7 +13516,7 @@ msgstr ""
 
 #empty strings from id 33104 to 33199
 
-#: xbmc\network\eventclient.cpp
+#: xbmc/network/eventclient.cpp
 msgctxt "#33200"
 msgid "Detected new connection"
 msgstr ""
@@ -13585,51 +13571,61 @@ msgctxt "#34100"
 msgid "Number of channels"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34101"
 msgid "2.0"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34102"
 msgid "2.1"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34103"
 msgid "3.0"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34104"
 msgid "3.1"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34105"
 msgid "4.0"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34106"
 msgid "4.1"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34107"
 msgid "5.0"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34108"
 msgid "5.1"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34109"
 msgid "7.0"
 msgstr ""
 
+#. Indicates the number of audio channels in settings
 #: system/settings/settings.xml
 msgctxt "#34110"
 msgid "7.1"
@@ -13722,19 +13718,17 @@ msgctxt "#34301"
 msgid "Is Apple's Bonjour service installed?[CR]Check the log for more information about this message."
 msgstr ""
 
+#: xbmc/network/NetworkServices.cpp
 msgctxt "#34302"
 msgid "AirPlay requires Zeroconf to be enabled."
 msgstr ""
 
+#: xbmc/network/NetworkServices.cpp
 msgctxt "#34303"
-msgid "Unable to stop Zeroconf"
+msgid "Unable to stop Zeroconf. AirPlay and AirTunes depend on Zeroconf running."
 msgstr ""
 
-msgctxt "#34304"
-msgid "AirPlay and AirTunes depend on Zeroconf running."
-msgstr ""
-
-#empty strings from id 34305 to 34399
+#empty strings from id 34304 to 34399
 
 #: xbmc\cores\VideoRenderers\LinuxRendererGL.cpp
 msgctxt "#34400"
@@ -14095,15 +14089,10 @@ msgstr ""
 
 #: xbmc/peripherals/devices/peripheralcecadapter.cpp
 msgctxt "#36043"
-msgid "No CEC capable TV detected."
-msgstr ""
-
-#: xbmc/peripherals/devices/peripheralcecadapter.cpp
-msgctxt "#36044"
-msgid "Disable polling for CEC capable devices?"
+msgid "No CEC capable TV detected. Disable polling for CEC capable devices?"
 msgstr ""
 
-#empty strings from id 36045 to 36100
+#empty strings from id 36044 to 36100
 #strings from 36100 to 36999 are reserved for settings descriptions
 
 #. Description of settings section "Appearance"
diff --git a/xbmc/cdrip/CDDARipper.cpp b/xbmc/cdrip/CDDARipper.cpp
index 09022ff3e8..3748484d7d 100644
--- a/xbmc/cdrip/CDDARipper.cpp
+++ b/xbmc/cdrip/CDDARipper.cpp
@@ -168,7 +168,7 @@ bool CCDDARipper::CreateAlbumDir(const MUSIC_INFO::CMusicInfoTag& infoTag, std::
     // no rip path has been set, show error
     CLog::Log(LOGERROR, "Error: CDDARipPath has not been set");
     g_graphicsContext.Lock();
-    CGUIDialogOK::ShowAndGetInput(257, 608, 609, 0);
+    CGUIDialogOK::ShowAndGetInput(257, 608);
     g_graphicsContext.Unlock();
     return false;
   }
diff --git a/xbmc/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp
index 0705abae63..6f73360158 100644
--- a/xbmc/dialogs/GUIDialogContextMenu.cpp
+++ b/xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -370,7 +370,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
         return false;
     }
     // prompt user if they want to really delete the source
-    if (!CGUIDialogYesNo::ShowAndGetInput(751, 0, 750, 0))
+    if (!CGUIDialogYesNo::ShowAndGetInput(751, 750, -1, -1))
       return false;
 
     // check default before we delete, as deletion will kill the share object
@@ -512,7 +512,7 @@ bool CGUIDialogContextMenu::OnContextButton(const std::string &type, const CFile
       if (!g_passwordManager.IsMasterLockUnlocked(true))
         return false;
 
-      if (!CGUIDialogYesNo::ShowAndGetInput(12335, 0, 750, 0))
+      if (!CGUIDialogYesNo::ShowAndGetInput(12335, 750, -1, -1))
         return false;
 
       share->m_iHasLock = 0;
diff --git a/xbmc/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp
index 31910039a7..b1b6744991 100644
--- a/xbmc/dialogs/GUIDialogFileBrowser.cpp
+++ b/xbmc/dialogs/GUIDialogFileBrowser.cpp
@@ -254,7 +254,7 @@ bool CGUIDialogFileBrowser::OnMessage(CGUIMessage& message)
           if (CDirectory::Create(strPath))
             Update(m_vecItems->GetPath());
           else
-            CGUIDialogOK::ShowAndGetInput(20069,20072,20073,0);
+            CGUIDialogOK::ShowAndGetInput(20069, 20072);
         }
       }
       else if (message.GetSenderId() == CONTROL_FLIP)
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
index 1d0ff87833..bd4b1e999b 100644
--- a/xbmc/interfaces/Builtins.cpp
+++ b/xbmc/interfaces/Builtins.cpp
@@ -1581,7 +1581,7 @@ int CBuiltins::Execute(const std::string& execString)
     if (params.size() > 1)
       singleFile = StringUtils::EqualsNoCase(params[1], "true");
     else
-      singleFile = CGUIDialogYesNo::ShowAndGetInput(iHeading,20426,20427,-1,20428,20429,cancelled);
+      singleFile = CGUIDialogYesNo::ShowAndGetInput(iHeading, 20426, -1, -1, 20428, 20429, cancelled);
 
     if (cancelled)
         return -1;
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp
index 464b8e56c7..b78b0fd334 100644
--- a/xbmc/music/windows/GUIWindowMusicBase.cpp
+++ b/xbmc/music/windows/GUIWindowMusicBase.cpp
@@ -1183,7 +1183,7 @@ void CGUIWindowMusicBase::OnInitWindow()
       g_infoManager.GetLibraryBool(LIBRARY_HAS_MUSIC))
   {
     // rescan of music library required
-    if (CGUIDialogYesNo::ShowAndGetInput(799, 800, 801, -1))
+    if (CGUIDialogYesNo::ShowAndGetInput(799, 800, -1, -1))
     {
       int flags = CMusicInfoScanner::SCAN_RESCAN;
       if (CSettings::Get().GetBool("musiclibrary.downloadinfo"))
diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp
index f5eb78dd85..289719583b 100644
--- a/xbmc/music/windows/GUIWindowMusicNav.cpp
+++ b/xbmc/music/windows/GUIWindowMusicNav.cpp
@@ -722,7 +722,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
       if (CGUIDialogContentSettings::Show(scraper, content))
       {
         m_musicdatabase.SetScraperForPath(path,scraper);
-        if (CGUIDialogYesNo::ShowAndGetInput(20442,20443,20444,20022))
+        if (CGUIDialogYesNo::ShowAndGetInput(20442, 20443, -1, -1))
         {
           OnInfoAll(itemNumber,true,true);
         }
diff --git a/xbmc/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp
index 1a6df4af81..9dd4b9387e 100644
--- a/xbmc/music/windows/GUIWindowMusicSongs.cpp
+++ b/xbmc/music/windows/GUIWindowMusicSongs.cpp
@@ -480,7 +480,7 @@ bool CGUIWindowMusicSongs::Update(const std::string &strDirectory, bool updateFi
 void CGUIWindowMusicSongs::OnRemoveSource(int iItem)
 {
   bool bCanceled;
-  if (CGUIDialogYesNo::ShowAndGetInput(522,20340,20341,20022,bCanceled))
+  if (CGUIDialogYesNo::ShowAndGetInput(522, 20340, -1, -1, bCanceled))
   {
     MAPSONGS songs;
     CMusicDatabase database;
diff --git a/xbmc/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp
index 4b531ceac9..e8411df764 100644
--- a/xbmc/network/NetworkServices.cpp
+++ b/xbmc/network/NetworkServices.cpp
@@ -203,7 +203,7 @@ bool CNetworkServices::OnSettingChanging(const CSetting *setting)
       // cannot disable 
       if (IsAirPlayServerRunning() || IsAirTunesServerRunning())
       {
-        CGUIDialogOK::ShowAndGetInput(g_localizeStrings.Get(1259), g_localizeStrings.Get(34303), g_localizeStrings.Get(34304), "");
+        CGUIDialogOK::ShowAndGetInput(1259, 34303);
         return false;
       }
 
@@ -412,7 +412,7 @@ void CNetworkServices::OnSettingChanged(const CSetting *setting)
   {
     // okey we really don't need to restart, only deinit samba, but that could be damn hard if something is playing
     // TODO - General way of handling setting changes that require restart
-    if (CGUIDialogYesNo::ShowAndGetInput(14038, 14039, 14040, -1, -1))
+    if (CGUIDialogYesNo::ShowAndGetInput(14038, 14039, -1, -1))
     {
       CSettings::Get().Save();
       CApplicationMessenger::Get().RestartApp();
@@ -755,8 +755,7 @@ bool CNetworkServices::StopEventServer(bool bWait, bool promptuser)
     if (server->GetNumberOfClients() > 0)
     {
       bool cancelled = false;
-      if (!CGUIDialogYesNo::ShowAndGetInput(13140, 13141, 13142, 20022,
-                                            -1, -1, cancelled, 10000)
+      if (!CGUIDialogYesNo::ShowAndGetInput(13140, 13141, cancelled, -1, -1, 10000)
           || cancelled)
       {
         CLog::Log(LOGNOTICE, "ES: Not stopping event server");
diff --git a/xbmc/osx/XBMCHelper.cpp b/xbmc/osx/XBMCHelper.cpp
index 2425a14a0b..23b030d1ac 100644
--- a/xbmc/osx/XBMCHelper.cpp
+++ b/xbmc/osx/XBMCHelper.cpp
@@ -114,7 +114,7 @@ bool XBMCHelper::OnSettingChanging(const CSetting *setting)
     if (IsRunning() && GetMode() != remoteMode)
     {
       bool cancelled;
-      if (!CGUIDialogYesNo::ShowAndGetInput(13144, 13145, 13146, 13147, -1, -1, cancelled, 10000))
+      if (!CGUIDialogYesNo::ShowAndGetInput(13144, 13145, cancelled, -1, -1, 10000))
         return false;
       // reload configuration
       else
diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
index 32f1e00eb4..9eb2eb6e8f 100644
--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
+++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp
@@ -396,11 +396,10 @@ void CPeripheralCecAdapter::Process(void)
       else if (timeout.GetElapsedSeconds() >= CEC_TV_PRESENT_CHECK_TIMEOUT)
       {
         /** no TV found for 30 seconds, ask if the user wants to disable CEC */
-        if (!CGUIDialogYesNo::ShowAndGetInput(g_localizeStrings.Get(36000), // Pulse-Eight CEC adaptor
-                                              g_localizeStrings.Get(36043), // No CEC capable TV detected.
-                                              "",
-                                              g_localizeStrings.Get(36044) // Disable polling for CEC capable devices?
-                                              ))
+        if (!CGUIDialogYesNo::ShowAndGetInput(36000, // Pulse-Eight CEC adaptor
+                                              36043, // No CEC capable TV detected. Disable polling for CEC capable devices?
+                                              -1,
+                                              -1))
         {
           SetSetting("enabled", false);
           m_bStop          = true;
diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
index 716d425c20..b5c6beb9e0 100644
--- a/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
+++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
@@ -106,7 +106,7 @@ void CGUIDialogPeripheralSettings::OnResetSettings()
   if (peripheral == NULL)
     return;
 
-  if (!CGUIDialogYesNo::ShowAndGetInput(10041, 0, 10042, 0))
+  if (!CGUIDialogYesNo::ShowAndGetInput(10041, 10042, -1, -1))
     return;
 
   // reset the settings in the peripheral
diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
index 1d5511a695..e3fadf396a 100644
--- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
@@ -142,7 +142,7 @@ bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool first
       CProfilesManager::Get().AddProfile(profile);
       bool exists = XFILE::CFile::Exists(URIUtils::AddFileToFolder("special://masterprofile/", dialog->m_directory + "/guisettings.xml"));
 
-      if (exists && !CGUIDialogYesNo::ShowAndGetInput(20058, 20104, 20105, 20022))
+      if (exists && !CGUIDialogYesNo::ShowAndGetInput(20058, 20104, -1, -1))
         exists = false;
 
       if (!exists)
@@ -150,7 +150,7 @@ bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool first
         // copy masterprofile guisettings to new profile guisettings
         // If the user selects 'start fresh', do nothing as a fresh
         // guisettings.xml will be created on first profile use.
-        if (CGUIDialogYesNo::ShowAndGetInput(20058,20048,20102,20022,20044,20064))
+        if (CGUIDialogYesNo::ShowAndGetInput(20058, 20048, -1, -1, 20044, 20064))
         {
           XFILE::CFile::Copy(URIUtils::AddFileToFolder("special://masterprofile/", "guisettings.xml"),
                               URIUtils::AddFileToFolder("special://masterprofile/", dialog->m_directory + "/guisettings.xml"));
@@ -158,7 +158,7 @@ bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool first
       }
 
       exists = XFILE::CFile::Exists(URIUtils::AddFileToFolder("special://masterprofile/", dialog->m_directory + "/sources.xml"));
-      if (exists && !CGUIDialogYesNo::ShowAndGetInput(20058, 20106, 20105, 20022))
+      if (exists && !CGUIDialogYesNo::ShowAndGetInput(20058, 20106, -1, -1))
         exists = false;
 
       if (!exists)
@@ -166,7 +166,7 @@ bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool first
         if ((dialog->m_sourcesMode & 2) == 2)
           // prompt user to copy masterprofile's sources.xml file
           // If 'start fresh' (no) is selected, do nothing.
-          if (CGUIDialogYesNo::ShowAndGetInput(20058, 20071, 20102, 20022, 20044, 20064))
+          if (CGUIDialogYesNo::ShowAndGetInput(20058, 20071, -1, -1, 20044, 20064))
           {
             XFILE::CFile::Copy(URIUtils::AddFileToFolder("special://masterprofile/", "sources.xml"),
                                 URIUtils::AddFileToFolder("special://masterprofile/", dialog->m_directory + "/sources.xml"));
@@ -175,7 +175,7 @@ bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool first
     }
 
     /*if (!dialog->m_bIsNewUser)
-      if (!CGUIDialogYesNo::ShowAndGetInput(20067,20103,20022,20022))
+      if (!CGUIDialogYesNo::ShowAndGetInput(20067, 20103, -1, -1))
         return false;*/
 
     CProfile *profile = CProfilesManager::Get().GetProfile(iProfile);
@@ -277,7 +277,7 @@ void CGUIDialogProfileSettings::OnSettingAction(const CSetting *setting)
     {
       if (CProfilesManager::Get().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE && !m_isDefault)
       {
-        if (CGUIDialogYesNo::ShowAndGetInput(20066, 20118, 20119, 20022))
+        if (CGUIDialogYesNo::ShowAndGetInput(20066, 20118, -1, -1))
           g_passwordManager.SetMasterLockMode(false);
         if (CProfilesManager::Get().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
           return;
diff --git a/xbmc/pvr/addons/PVRClient.cpp b/xbmc/pvr/addons/PVRClient.cpp
index 78face68bb..0eb3684ac0 100644
--- a/xbmc/pvr/addons/PVRClient.cpp
+++ b/xbmc/pvr/addons/PVRClient.cpp
@@ -1800,9 +1800,8 @@ bool CPVRClient::Autoconfigure(void)
 
         if (!CGUIDialogYesNo::ShowAndGetInput(g_localizeStrings.Get(19688), // Scanning for PVR services
                                               strLogLine,
-                                              "",
-                                              g_localizeStrings.Get(19690) // Do you want to use this service?
-                                              ))
+                                              g_localizeStrings.Get(19690), // Do you want to use this service?
+                                              ""))
         {
           CLog::Log(LOGDEBUG, "%s - %s service found but not enabled by the user", __FUNCTION__, (*it).GetName().c_str());
           m_rejectedAvahiHosts.push_back(*it);
diff --git a/xbmc/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp
index 20b5a2f755..1bdc79b562 100644
--- a/xbmc/pvr/addons/PVRClients.cpp
+++ b/xbmc/pvr/addons/PVRClients.cpp
@@ -1269,7 +1269,7 @@ void CPVRClients::ShowDialogNoClientsEnabled(void)
   if (!g_PVRManager.IsStarted() && !g_PVRManager.IsInitialising())
     return;
 
-  CGUIDialogOK::ShowAndGetInput(19240, 19241, 19242, 19243);
+  CGUIDialogOK::ShowAndGetInput(19240, 19241);
 
   std::vector<std::string> params;
   params.push_back("addons://disabled/xbmc.pvrclient");
@@ -1323,7 +1323,7 @@ bool CPVRClients::UpdateAddons(void)
     // You need a tuner, backend software, and an add-on for the backend to be able to use PVR.
     // Please visit http://kodi.wiki/view/PVR to learn more.
     m_bNoAddonWarningDisplayed = true;
-    CGUIDialogOK::ShowAndGetInput(19271, 19272, 19273, 19274);
+    CGUIDialogOK::ShowAndGetInput(19271, 19272);
     CSettings::Get().SetBool("pvrmanager.enabled", false);
     CGUIMessage msg(GUI_MSG_UPDATE, WINDOW_SETTINGS_MYPVR, 0);
     g_windowManager.SendThreadMessage(msg, WINDOW_SETTINGS_MYPVR);
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
index 26167df592..68ad946cac 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
@@ -192,7 +192,7 @@ bool CGUIDialogPVRGroupManager::ActionButtonUngroupedChannels(CGUIMessage &messa
     {
       if (m_channelGroups->GetFolderCount() == 0)
       {
-        CGUIDialogOK::ShowAndGetInput(19033,19137,0,19138);
+        CGUIDialogOK::ShowAndGetInput(19033, 19137);
       }
       else if (m_ungroupedChannels->GetFileCount() > 0)
       {
diff --git a/xbmc/pvr/timers/PVRTimerInfoTag.cpp b/xbmc/pvr/timers/PVRTimerInfoTag.cpp
index 9c480f951f..c150e6b03a 100644
--- a/xbmc/pvr/timers/PVRTimerInfoTag.cpp
+++ b/xbmc/pvr/timers/PVRTimerInfoTag.cpp
@@ -314,7 +314,7 @@ bool CPVRTimerInfoTag::DeleteFromClient(bool bForce /* = false */) const
   if (error == PVR_ERROR_RECORDING_RUNNING)
   {
     // recording running. ask the user if it should be deleted anyway
-    if (!CGUIDialogYesNo::ShowAndGetInput(122,0,19122,0))
+    if (!CGUIDialogYesNo::ShowAndGetInput(122, 19122, -1, -1))
       return false;
 
     error = g_PVRClients->DeleteTimer(*this, true);
diff --git a/xbmc/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp
index 666645cae8..7349104561 100644
--- a/xbmc/settings/DisplaySettings.cpp
+++ b/xbmc/settings/DisplaySettings.cpp
@@ -254,7 +254,7 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting)
       if (!m_resolutionChangeAborted)
       {
         bool cancelled = false;
-        if (!CGUIDialogYesNo::ShowAndGetInput(13110, 13111, 20022, 20022, -1, -1, cancelled, 10000))
+        if (!CGUIDialogYesNo::ShowAndGetInput(13110, 13111, cancelled, -1, -1, 10000))
         {
           m_resolutionChangeAborted = true;
           return false;
@@ -275,7 +275,7 @@ bool CDisplaySettings::OnSettingChanging(const CSetting *setting)
     if (!m_resolutionChangeAborted)
     {
       bool cancelled = false;
-      if (!CGUIDialogYesNo::ShowAndGetInput(13110, 13111, 20022, 20022, -1, -1, cancelled, 10000))
+      if (!CGUIDialogYesNo::ShowAndGetInput(13110, 13111, cancelled, -1, -1, 10000))
       {
         m_resolutionChangeAborted = true;
         return false;
diff --git a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
index 47e63db1a7..cf3f3ae89a 100644
--- a/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
+++ b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp
@@ -753,7 +753,7 @@ void CGUIDialogSettingsBase::SetDescription(const CVariant &label)
 
 void CGUIDialogSettingsBase::OnResetSettings()
 {
-  if (CGUIDialogYesNo::ShowAndGetInput(10041, 0, 10042, 0))
+  if (CGUIDialogYesNo::ShowAndGetInput(10041, 10042, -1, -1))
   {
     for(vector<BaseSettingControlPtr>::iterator it = m_settingControls.begin(); it != m_settingControls.end(); ++it)
     {
diff --git a/xbmc/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp
index 2c97492aa9..d05194642e 100644
--- a/xbmc/video/VideoInfoScanner.cpp
+++ b/xbmc/video/VideoInfoScanner.cpp
@@ -2037,7 +2037,7 @@ namespace VIDEO
       CGUIDialogOK::ShowAndGetInput(20448, 20449);
       return false;
     }
-    return CGUIDialogYesNo::ShowAndGetInput(20448,20449,20450,20022);
+    return CGUIDialogYesNo::ShowAndGetInput(20448, 20450, -1, -1);
   }
 
   bool CVideoInfoScanner::ProgressCancelled(CGUIDialogProgress* progress, int heading, const std::string &line1)
diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
index f3392095aa..d5e3ba7ef2 100644
--- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp
@@ -116,7 +116,7 @@ bool CGUIDialogVideoInfo::OnMessage(CGUIMessage& message)
         if (m_movieItem->GetVideoInfoTag()->m_type == MediaTypeTvShow)
         {
           bool bCanceled=false;
-          if (CGUIDialogYesNo::ShowAndGetInput(20377,20378,-1,-1,bCanceled))
+          if (CGUIDialogYesNo::ShowAndGetInput(20377, 20378, -1, -1, bCanceled))
           {
             m_bRefreshAll = true;
             CVideoDatabase db;
diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp
index ac9eb1e7c1..21a9772a36 100644
--- a/xbmc/video/windows/GUIWindowVideoBase.cpp
+++ b/xbmc/video/windows/GUIWindowVideoBase.cpp
@@ -437,7 +437,7 @@ bool CGUIWindowVideoBase::ShowIMDB(CFileItem *item, const ScraperPtr &info2, boo
         bHasInfo = true;
         if (!info->IsNoop() && (nfoResult == CNfoFile::URL_NFO || nfoResult == CNfoFile::COMBINED_NFO || nfoResult == CNfoFile::FULL_NFO))
         {
-          if (CGUIDialogYesNo::ShowAndGetInput(13346,20446,20447,20022))
+          if (CGUIDialogYesNo::ShowAndGetInput(13346, 20446, -1, -1))
           {
             hasDetails = false;
             ignoreNfo = true;
@@ -1888,7 +1888,7 @@ bool CGUIWindowVideoBase::OnUnAssignContent(const std::string &path, int label1,
   bool bCanceled;
   CVideoDatabase db;
   db.Open();
-  if (CGUIDialogYesNo::ShowAndGetInput(label1,label2,label3,20022,bCanceled))
+  if (CGUIDialogYesNo::ShowAndGetInput(label1, label2, label3, -1, bCanceled))
   {
     CGUIDialogProgress *progress = (CGUIDialogProgress *)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
     db.RemoveContentForPath(path, progress);