combine split strings into a single string and only use the textbox in dialogs

1 files changed, 26 insertions, 26 deletions

diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 1e77e7222a..ea97270a52 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -3146,7 +3146,6 @@ msgid "Mirror image"
 msgstr ""
 
 #: xbmc/dialogs/GUIDialogContextMenu.cpp
-#: xbmc/video/dialogs/GUIDialogVideoSettings.cpp
 msgctxt "#750"
 msgid "Are you sure?"
 msgstr ""
@@ -3407,21 +3406,12 @@ msgctxt "#1001"
 msgid "Unable to connect"
 msgstr ""
 
-msgctxt "#1002"
-msgid "The connection to the network location couldn't be established."
-msgstr ""
-
 #: xbmc/dialogs/GUIDialogMediaSource.cpp
-msgctxt "#1003"
-msgid "This could be due to the network not being connected."
-msgstr ""
-
-#: xbmc/dialogs/GUIDialogMediaSource.cpp
-msgctxt "#1004"
-msgid "Would you like to add it anyway?"
+msgctxt "#1002"
+msgid "The connection to the network location couldn't be established. This could be due to the network not being connected. Would you like to add it anyway"
 msgstr ""
 
-#empty string with id 1005
+#empty string from id 1003 to 1005
 
 msgctxt "#1006"
 msgid "IP address"
@@ -3514,7 +3504,7 @@ msgstr ""
 
 #: xbmc/dialogs/GUIDialogMediaSource.cpp
 msgctxt "#1025"
-msgid "Couldn't retrieve directory information."
+msgid "Couldn't retrieve directory information. This could be due to the network not being connected. Would you like to add it anyway?"
 msgstr ""
 
 #: xbmc/dialogs/GUIDialogContextMenu.cpp
@@ -5001,15 +4991,10 @@ msgstr ""
 
 #: xbmc\GUIPassword.cpp
 msgctxt "#12367"
-msgid "Master code is not valid"
-msgstr ""
-
-#: xbmc\GUIPassword.cpp
-msgctxt "#12368"
-msgid "Please enter a valid master code"
+msgid "Master code is not valid. Please enter a valid master code."
 msgstr ""
 
-#empty strings from id 12369 to 12372
+#empty strings from id 12368 to 12372
 
 #: unknown
 msgctxt "#12373"
@@ -5027,7 +5012,7 @@ msgstr ""
 #: xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp
 #: xbmc\video\dialogs\GUIDialogVideoSettings.cpp
 msgctxt "#12377"
-msgid "This will reset any previously saved values"
+msgid "This will reset any previously saved values. Are you sure?"
 msgstr ""
 
 #: system/settings/settings.xml
@@ -7281,8 +7266,9 @@ msgctxt "#16026"
 msgid "Playback failed"
 msgstr ""
 
+#: xbmc/PlaylistPlayer.cpp
 msgctxt "#16027"
-msgid "One or more items failed to play."
+msgid "One or more items failed to play. Check the log for more information about this message."
 msgstr ""
 
 msgctxt "#16028"
@@ -7981,10 +7967,12 @@ msgid "Channel icons"
 msgstr ""
 
 #: xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19067"
 msgid "This event is already being recorded."
 msgstr ""
 
+#: xbmc/pvr/recording/PVRRecording.cpp
 msgctxt "#19068"
 msgid "This recording couldn't be deleted.[CR]Check the log for more information about this message."
 msgstr ""
@@ -8125,6 +8113,7 @@ msgctxt "#19101"
 msgid "Provider"
 msgstr ""
 
+#: xbmc/pvr/channels/PVRChannelGroupInternal.cpp
 msgctxt "#19102"
 msgid "Please switch to another channel."
 msgstr ""
@@ -8156,16 +8145,20 @@ msgctxt "#19108"
 msgid "Fallback framerate"
 msgstr ""
 
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
 #: xbmc/pvr/timers/PVRTimers.cpp
 msgctxt "#19109"
 msgid "Couldn't save timer.[CR]Check the log for more information about this message."
 msgstr ""
 
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19110"
 msgid "An unexpected error occurred.[CR]Try again later or check the log for more information."
 msgstr ""
 
 #: xbmc/pvr/addons/PVRClients.cpp
+#: xbmc/pvr/recording/PVRRecording.cpp
+#: xbmc/pvr/timers/PVRTimerInfoTag.cpp
 msgctxt "#19111"
 msgid "PVR backend error.[CR]Check the log for more information about this message."
 msgstr ""
@@ -8315,6 +8308,7 @@ msgctxt "#19146"
 msgid "Groups"
 msgstr ""
 
+#: xbmc/pvr/recording/PVRRecording.cpp
 msgctxt "#19147"
 msgid "The PVR backend does not support this action.[CR]Check the log for more information about this message."
 msgstr ""
@@ -8494,7 +8488,7 @@ msgid "Reset PVR database"
 msgstr ""
 
 msgctxt "#19186"
-msgid "All data in the PVR database is being erased"
+msgid "All data in the PVR database is being erased. Are you sure?"
 msgstr ""
 
 #: system/settings/settings.xml
@@ -8503,7 +8497,7 @@ msgid "Reset guide database"
 msgstr ""
 
 msgctxt "#19188"
-msgid "Guide is being reset"
+msgid "Guide is being reset. Are you sure?"
 msgstr ""
 
 #: system/settings/settings.xml
@@ -10582,6 +10576,8 @@ msgctxt "#20339"
 msgid "Director"
 msgstr ""
 
+#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 #: xbmc/music/windows/GUIWindowMusicSongs.cpp
 msgctxt "#20340"
 msgid "Do you want to remove all items within this path from your library?"
@@ -10746,6 +10742,8 @@ msgctxt "#20374"
 msgid "Downloading movie information"
 msgstr ""
 
+#: xbmc/video/windows/GUIWindowVideoBase.cpp
+#: xbmc/video/windows/GUIWindowVideoNav.cpp
 msgctxt "#20375"
 msgid "Unassign content"
 msgstr ""
@@ -11049,10 +11047,12 @@ msgctxt "#20441"
 msgid "Remote fanart"
 msgstr ""
 
+#: xbmc/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#20442"
 msgid "Change content"
 msgstr ""
 
+#: xbmc/video/windows/GUIWindowVideoBase.cpp
 msgctxt "#20443"
 msgid "Do you want to refresh information for all items within this path?"
 msgstr ""
@@ -13715,7 +13715,7 @@ msgstr ""
 
 #: xbmc/network/NetworkServices.cpp
 msgctxt "#34302"
-msgid "AirPlay requires Zeroconf to be enabled."
+msgid "Failed to start AirPlay as it requires Zeroconf to be enabled."
 msgstr ""
 
 #: xbmc/network/NetworkServices.cpp