aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorjenkins4kodi <jenkins4kodi@users.noreply.github.com>2016-11-13 02:59:14 +0100
committerGitHub <noreply@github.com>2016-11-13 02:59:14 +0100
commit24990b5b9f334a128be75710998c4edc343fd8de (patch)
treebf93c9ff6533b1960cc27bef9df903af3c82d9f9 /addons
parentae37dd618d91912749b3de5e749cac5b3bc05eb2 (diff)
parent921862eb77687291739e90f3850f33d7e35e62be (diff)
Merge pull request #10910 from garbear/fix-skipping
Diffstat (limited to 'addons')
-rw-r--r--addons/kodi.peripheral/addon.xml4
-rw-r--r--addons/resource.language.en_gb/resources/strings.po26
-rw-r--r--addons/skin.estuary/1080i/DialogGameControllers.xml5
3 files changed, 32 insertions, 3 deletions
diff --git a/addons/kodi.peripheral/addon.xml b/addons/kodi.peripheral/addon.xml
index 47ae0b84ef..7dbd763262 100644
--- a/addons/kodi.peripheral/addon.xml
+++ b/addons/kodi.peripheral/addon.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.peripheral" version="1.1.0" provider-name="Team-Kodi">
- <backwards-compatibility abi="1.1.0"/>
+<addon id="kodi.peripheral" version="1.2.0" provider-name="Team-Kodi">
+ <backwards-compatibility abi="1.2.0"/>
<requires>
<import addon="xbmc.core" version="0.1.0"/>
</requires>
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 7b6da409dd..fd225ac110 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -16032,7 +16032,31 @@ msgctxt "#35012"
msgid "A new controller has been detected. Configuration can be done at any time in \"Settings -> System Settings -> Input\". Would you like to configure it now?"
msgstr ""
-#empty strings from id 35013 to 35048
+#. Label of the button to fix the bug where buttons are skipped in the controller dialog
+#: addons/skin.estuary/1080i/DialogGameControllers.xml
+msgctxt "#35013"
+msgid "Fix skipping"
+msgstr ""
+
+#. Help text of the button to fix the bug where buttons are skipped in the controller dialog. %s - list of disabled buttons and axes
+#:
+msgctxt "#35014"
+msgid "Some controllers have buttons and axes that interfere with mapping. Press these now to disable them:[CR]%s"
+msgstr ""
+
+#. Name of a controller button, e.g. Button 1. %d - button index
+#:
+msgctxt "#35015"
+msgid "Button %d"
+msgstr ""
+
+#. Name of a controller axis, e.g. Axis 2. %d - axis index
+#:
+msgctxt "#35016"
+msgid "Axis %d"
+msgstr ""
+
+#empty strings from id 35017 to 35048
#. Name of game add-ons category
#: xbmc/filesystem/AddonsDirectory.cpp
diff --git a/addons/skin.estuary/1080i/DialogGameControllers.xml b/addons/skin.estuary/1080i/DialogGameControllers.xml
index db3c0f1535..37e6c13392 100644
--- a/addons/skin.estuary/1080i/DialogGameControllers.xml
+++ b/addons/skin.estuary/1080i/DialogGameControllers.xml
@@ -152,6 +152,11 @@
<param name="id" value="17" />
<param name="label" value="$LOCALIZE[10043]" />
</include>
+ <include content="DefaultDialogButton">
+ <param name="width" value="350" />
+ <param name="id" value="21" />
+ <param name="label" value="$LOCALIZE[35013]" />
+ </include>
</control>
</control>
</controls>