diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-08-29 06:30:45 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-08-29 06:30:45 +0000 |
| commit | 5e7ee74e78ee8a31b372386d660c193c80ae0b2a (patch) | |
| tree | 7c8f31f0510d26318d758679eeb98d765c01f35d /language | |
| parent | 049bb412b1db739bf3f57bca1a0f54c721e6f859 (diff) | |
merged: r33289,r33290,r33294-r33298 from trunk
changed: ScraperInUse to take the ID rather than the ScraperPtr
added: Addon::IsInUse() to check for in-use addons. (cherry picked from commit c023d657d3f733257b1b9ecfeebf9bf295a1dd79)
changed: Sort the addon selection dialog by label. Ticket #10013 thanks to Hc232. (cherry picked from commit 65aa1a43dab39a4c769b7b47b731b56396dcc75d)
changed: Re-add the "Addon Settings" option to the context menu both on and within media addons. (cherry picked from commit 4035c3d319244bd401b953e261b5f129e0aef498)
fixed: Missing a few distinct calls means double ups in actors returned via search. Fixes #10009. (cherry picked from commit a2ae873ec0cc83ffc66431e7704b3cc5c8b40e30)
fixed: Ticket #10015 - invalid .cue sheet could cause a segfault. (cherry picked from commit 71784c7a2b79ab7c700002ab722b67f0325ef4f7)
fixed: Ticket #10016 - Negative start/stop value in a JSON request crashes XBMC. (cherry picked from commit 0897ae47a65b228aa118849f305c3fd48b31e4c0)
changed: Disallow currently in-use addons to be disabled or uninstalled (cherry picked from commit e7f56aa8739d68c1f8216c5fbbd10056d2fe098b)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33299 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'language')
| -rw-r--r-- | language/English/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/language/English/strings.xml b/language/English/strings.xml index 165d9be4a0..bf3ae19d45 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -732,7 +732,7 @@ <string id="1042">Retrieved %i of %i items</string> <string id="1043">Program Add-ons</string> <string id="1044">Set plugin thumb</string> - <string id="1045">Plugin settings</string> + <string id="1045">Addon settings</string> <string id="1046">Access points</string> <string id="1047">Other...</string> <string id="1048">- Username</string> |