Permalink
Browse files

Synced XBMC with xbianonpi/xbmc-nightly@afacd49

  • Loading branch information...
Koenkk committed Feb 20, 2013
1 parent 3a409e1 commit 90d712fe10b4525b4aded3f5b21d1a5f12f0ffc9
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
@@ -169,12 +169,12 @@
<onclick>ActivateWindow(SystemSettings)</onclick>
<icon>-</icon>
</item>
- <item id="10">
- <label>XBian</label>
- <label2>[B]CONFIGURE XBIAN[/B][CR][CR]If you have any questions,[CR]feel free to ask them on www.xbian.org</label2>
- <onclick>RunAddon(plugin.xbianconfig)</onclick>
- <icon>-</icon>
- </item>
+ <item id="10">
+ <label>XBian</label>
+ <label2>[B]CONFIGURE XBIAN[/B][CR][CR]If you have any questions,[CR]feel free to ask them on www.xbian.org</label2>
+ <onclick>RunAddon(plugin.xbianconfig)</onclick>
+ <icon>-</icon>
+ </item>
</content>
</control>
<control type="image">
@@ -284,7 +284,7 @@
<shadowcolor>black</shadowcolor>
<font>font13_title</font>
</control>
- <!--<control type="label">
+ <!--control type="label">
<description>CPU Text</description>
<posx>420</posx>
<posy>450</posy>
@@ -304,7 +304,7 @@
<width>320</width>
<height>16</height>
<info>System.CPUUsage</info>
- </control>-->
+ </control-->
<control type="label">
<description>Memory Text</description>
<posx>420</posx>
@@ -1,4 +1,5 @@
<window>
+ <onunload condition="!Player.Paused">PlayerControl(Play)</onunload>
<defaultcontrol>-</defaultcontrol>
<controls>
<!-- media infos -->
@@ -1,5 +1,5 @@
TARGET=Textures.xbt
-XBMCTEX=/opt/xbmc/tools/TexturePacker/TexturePacker
+XBMCTEX=/opt/xbmcfrodo/tools/TexturePacker/TexturePacker
IMAGES := $(shell find . -name "*jpg")
IMAGES += $(shell find . -name "*png")
@@ -17,7 +17,7 @@ else
endif
$(XBMCTEX): force
- $(MAKE) -C /opt/xbmc/tools/TexturePacker
+ $(MAKE) -C /opt/xbmcfrodo/tools/TexturePacker
clean:
rm -f $(TARGET)
@@ -4292,46 +4292,42 @@ msgid "Wake on Lan (%s)"
msgstr ""
msgctxt "#13028"
-msgid "Server already running"
+msgid "Waiting for network to connect..."
msgstr ""
msgctxt "#13029"
msgid "Failed to execute Wake on Lan!"
msgstr ""
msgctxt "#13030"
-msgid "Waiting for network to connect..."
-msgstr ""
-
-msgctxt "#13031"
msgid "Waiting for server to wake up..."
msgstr ""
-msgctxt "#13032"
+msgctxt "#13031"
msgid "Extended wait for server to wake up..."
msgstr ""
-msgctxt "#13033"
+msgctxt "#13032"
msgid "Waiting for services to launch..."
msgstr ""
-msgctxt "#13034"
+msgctxt "#13033"
msgid "MAC Discovery"
msgstr ""
-msgctxt "#13035"
+msgctxt "#13034"
msgid "Updated for %s"
msgstr ""
-msgctxt "#13036"
+msgctxt "#13035"
msgid "Found for %s"
msgstr ""
-msgctxt "#13037"
+msgctxt "#13036"
msgid "Failed for %s"
msgstr ""
-#empty strings from id 13038 to 13049
+#empty strings from id 13037 to 13049
msgctxt "#13050"
msgid "Running low on battery"
Oops, something went wrong.

0 comments on commit 90d712f

Please sign in to comment.