Increase version to 1281

Updated spanish.lang to r1280

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+    "name": "devkitPPC",
+    "image": "mcr.microsoft.com/devcontainers/base:jammy",
+    "settings": {
+        "workbench.colorTheme": "Default Dark+",
+        "files.exclude": {
+            "Dockerfile": true
+        }
+    },
+    "onCreateCommand": "bash .devcontainer/on-create.sh",
+    "containerEnv": {
+        "DEVKITPRO": "/opt/devkitpro",
+        "DEVKITPPC": "/opt/devkitpro/devkitPPC",
+        "PATH": "${localEnv:PATH}:/opt/devkitpro/devkitPPC/bin"
+    },
+    "remoteUser": "root",
+    "extensions": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

.devcontainer/on-create.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Install some essentials
+apt-get update && apt-get install make xz-utils -y
+
+# Download and extract
+cd /opt
+wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz"
+wget "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz"
+wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz"
+wget "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz"
+wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz"
+for f in *.pkg.tar.xz; do tar xf "$f" --strip-components=1; done
+
+# Clean up
+rm *.pkg.tar.xz
+
+# Set environment variables
+export DEVKITPRO=/opt/devkitpro
+export DEVKITPPC=/opt/devkitpro/devkitPPC

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: blackb0x

.github/workflows/main.yml

@@ -0,0 +1,108 @@
+name: Build binaries
+
+on:
+  push:
+    branches:
+      - "**"
+    paths-ignore:
+      - '**.md'
+      - '.devcontainer/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/FUNDING.yml'
+      - '.github/**/*.md'
+      - '.vscode/**'
+      - 'HBC/**'
+      - 'Languages/**'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '.devcontainer/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/FUNDING.yml'
+      - '.github/**/*.md'
+      - '.vscode/**'
+      - 'HBC/**'
+      - 'Languages/**'
+
+jobs:
+  download-build-tools:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Restore cache
+        id: cache-1
+        uses: actions/cache@v3
+        with:
+          path: cache
+          key: ${{ runner.os }}-cache-1
+
+      - name: Download devkitPPC r41, libogc 2.3.1 and required tools
+        if: steps.cache-1.outputs.cache-hit != 'true'
+        # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol & gcdsptool
+        run: | 
+          mkdir cache && cd cache
+          wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz"
+          wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz"
+          cd ..
+
+      - name: Verify checksums
+        run: |
+          sha256sum -c <<EOF
+          f8bdbabd7e30ebc87dc129c092d1fa85e38d726de78befad3dc6714568431076  cache/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz
+          0118f06fff938c3d4913fdc004d5edd2f72e3a16c544fb5699b0e97552529d29  cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz
+          b10553cced35ab8d3d0c48ee44cdb345f46be5e8f82496dd308f699db4f8d490  cache/libogc-2.3.1-1-any.pkg.tar.xz
+          3348e521e48f27912d0bca05eac73b4365c8c7006b637c95850f4feabe5dd2e9  cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz
+          e7ea6a13ca5a5e9d6a5b8e1616afcc92a81255aa6fee436ed81c812b62e112af  cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz
+          EOF
+  
+  build:
+    runs-on: ubuntu-latest
+    needs: download-build-tools
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Restore cache
+        id: cache-1
+        uses: actions/cache@v3
+        with:
+          path: cache
+          key: ${{ runner.os }}-cache-1
+
+      - name: Check cache
+        if: steps.cache-1.outputs.cache-hit != 'true'
+        run: exit 1
+
+      - name: Extract downloaded files
+        run: |
+          tar -xf cache/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz --strip-components=1
+          tar -xf cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz --strip-components=1
+          tar -xf cache/libogc-2.3.1-1-any.pkg.tar.xz --strip-components=1
+          tar -xf cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz --strip-components=1
+          tar -xf cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz --strip-components=1
+
+      - name: Compile USB Loader GX
+        run: |
+          PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro make
+
+      - name: Package
+        run: |
+          mkdir -p upload/apps/usbloader_gx
+          cp boot.dol upload/apps/usbloader_gx
+          cp HBC/icon.png upload/apps/usbloader_gx
+          cp HBC/meta.xml upload/apps/usbloader_gx
+          echo "sha=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v3
+        with: 
+          name: usbloadergx_${{ env.sha }}
+          path: upload
+
+      - name: Upload debug binary
+        uses: actions/upload-artifact@v3
+        with: 
+          name: usbloadergx_${{ env.sha }}_debug
+          path: boot.elf

.gitignore

@@ -0,0 +1,13 @@
+*.dol
+*.elf
+*.exe
+*.bat
+.vscode/
+build/
+usbloader_gx/
+/HBC/meta.xml
+/source/themes/filelist.h
+/source/gitver.c
+/source/svnrev.c
+/usbloader_gx.zip
+/wiiload

.vscode/c_cpp_properties.json

@@ -0,0 +1,50 @@
+{
+    "configurations": [
+        {
+            "name": "Win32",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "C:/devkitPro/libogc/include/**"
+            ],
+            "defines": [
+                "HW_RVL",
+                "GEKKO"
+            ],
+            "compilerPath": "C:/devkitPro/devkitPPC/bin/powerpc-eabi-gcc.exe",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-x86"
+        },
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${env:DEVKITPRO}/libogc/include/**"
+            ],
+            "defines": [
+                "HW_RVL",
+                "GEKKO"
+            ],
+            "compilerPath": "${env:DEVKITPRO}/devkitPPC/bin/powerpc-eabi-gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-x86"
+        },
+        {
+            "name": "Mac",
+            "includePath": [
+                "${workspaceFolder}/**",
+                "${env:DEVKITPRO}/libogc/include/**"
+            ],
+            "defines": [
+                "HW_RVL",
+                "GEKKO"
+            ],
+            "compilerPath": "${env:DEVKITPRO}/devkitPPC/bin/powerpc-eabi-gcc",
+            "cStandard": "gnu17",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-x86"
+        }
+    ],
+    "version": 4
+}

.vscode/tasks.json

@@ -0,0 +1,32 @@
+{
+    "version": "2.0.0",
+    "options": {
+        "env": {
+            "WIILOAD": "tcp:192.168.1.5"
+        }
+    },
+    "tasks": [
+        {
+            "label": "make",
+            "type": "shell",
+            "command": "make",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "clean",
+            "type": "shell",
+            "command": "make clean",
+            "problemMatcher": []
+        },
+        {
+            "label": "deploy",
+            "type": "shell",
+            "command": "make deploy",
+            "problemMatcher": []
+        }
+    ]
+}

Dockerfile

@@ -0,0 +1,39 @@
+# Build: 
+# DOCKER_BUILDKIT=1 docker build -o output .
+# for Windows, use 
+# { "features": { "buildkit": true } }
+# instead of the environment variable
+
+# Build a Debian base container
+FROM debian:buster as usbloader
+ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
+RUN apt-get update -y && apt-get install -y \ 
+    xz-utils make git
+
+ADD https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r41-2-linux_x86_64.pkg.tar.xz /
+ADD https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz /
+ADD https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz /
+ADD https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz /
+ADD https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz /
+
+
+RUN tar -xf /devkitPPC-r41-2-linux_x86_64.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \
+    tar -xf /libogc-2.3.1-1-any.pkg.tar.xz opt/devkitpro/libogc --strip-components=1 && \
+    tar -xf /devkitppc-rules-1.1.1-1-any.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \
+    tar -C /usr/local/bin -xf /general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/bin2s --strip-components=4 && \
+    tar -C /usr/local/bin -xf /gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/elf2dol --strip-components=4 && \
+    mkdir /projectroot 
+
+ENV DEVKITPRO=/devkitpro
+ENV DEVKITPPC=/devkitpro/devkitPPC
+
+
+# Now we have a container that has the dev environment set up. 
+# Copy current folder into container, then compile
+COPY . /projectroot/
+RUN cd /projectroot && make
+
+
+# Copy the DOL and ELF out of the container
+FROM scratch AS export-stage
+COPY --from=usbloader /projectroot/boot.* /

HBC/META.XML

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-	<app version="1">
-		<name> USB Loader GX</name>
-		<coder>USB Loader GX Team</coder>
-		<version>2.0 r1069</version>
-		<release_date>201102061836</release_date>
-		<no_ios_reload/>
-		<short_description>Loads games from USB-devices</short_description>
-		<long_description>USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times.
-The interactive GUI is completely controllable with WiiMote, Classic Controller or GC Controller.
-Features are automatic widescreen detection, coverdownload, parental control, theme support and many more.
-
-Credits:
-Coding: Dimok, nIxx, giantpune, ardi, Hungyip84, DrayX7, Lustar, r-win, WiiShizzza
-Artworks: cyrex, NeoRame
-WiiTDB / Hosting covers: Lustar
-Hosting updates files: CorneliousJD
-USBLoader sources: Waninkoko, Kwiirk, Hermes
-Languages files updates: Kinyo and translaters
-Hosting themes: Deak Phreak
-
-Libwiigui: Tantric
-Libogc/Devkit: Shagkur and Wintermute
-FreeTypeGX: Armin Tamzarian.
-
-Links:
-USB Loader GX Project Page and Support Site:
-http://code.google.com/p/usbloader-gui/
-Help Website:
-http://usbloadergx.koureio.net/
-WiiTDB Site:
-http://wiitdb.com
-Themes Site:
-http://wii.spiffy360.com
-Languages Translaters Page:
-http://gbatemp.net/index.php?showtopic=155252
-
-Libwiigui Website:
-http://wiibrew.org/wiki/Libwiigui/
-FreeTypeGX Project Page:
-http://code.google.com/p/freetypegx/
-Gettext Official Page:
-http://www.gnu.org/software/gettext/gettext.html
-		</long_description>
-	</app>

Languages/index.html

@@ -0,0 +1,32 @@
+<html>
+<head>
+    <title>Languages</title>
+</head>
+<body>
+    <ul>
+        <li><a href="czech.lang">czech.lang</a></li>
+        <li><a href="danish.lang">danish.lang</a></li>
+        <li><a href="dutch.lang">dutch.lang</a></li>
+        <li><a href="english.lang">english.lang</a></li>
+        <li><a href="finnish.lang">finnish.lang</a></li>
+        <li><a href="french.lang">french.lang</a></li>
+        <li><a href="german.lang">german.lang</a></li>
+        <li><a href="greek.lang">greek.lang</a></li>
+        <li><a href="hungarian.lang">hungarian.lang</a></li>
+        <li><a href="italian.lang">italian.lang</a></li>
+        <li><a href="japanese.lang">japanese.lang</a></li>
+        <li><a href="korean.lang">korean.lang</a></li>
+        <li><a href="norwegian.lang">norwegian.lang</a></li>
+        <li><a href="polish.lang">polish.lang</a></li>
+        <li><a href="portuguese_br.lang">portuguese_br.lang</a></li>
+        <li><a href="portuguese_pt.lang">portuguese_pt.lang</a></li>
+        <li><a href="russian.lang">russian.lang</a></li>
+        <li><a href="schinese.lang">schinese.lang</a></li>
+        <li><a href="spanish.lang">spanish.lang</a></li>
+        <li><a href="swedish.lang">swedish.lang</a></li>
+        <li><a href="tchinese.lang">tchinese.lang</a></li>
+        <li><a href="thai.lang">thai.lang</a></li>
+        <li><a href="turkish.lang">turkish.lang</a></li>
+    </ul>
+</body>
+</html>

Make.config.default

@@ -1,12 +0,0 @@
-#
-# to use this file rename Make.config.default to Make.config
-# or create a new Make.config
-#
-# you can here add defines
-#
-# in example i have included a switch to diseble
-# the gecko-debug stuff. so also in source gecko.c+gecko.h
-#
-# NOTE when add, remove or change a define here then a "make clean" is needed
-#
-CFLAGS += -DNO_DEBUG DDEBUG_WBFS

Makefile

@@ -17,13 +17,11 @@ include $(DEVKITPPC)/wii_rules
 TARGET		:=	boot
 BUILD		:=	build
 SOURCES		:=	source \
-				source/libwiigui \
-				source/images \
-				source/fonts \
-				source/sounds \
+				source/GUI \
 				source/Controls \
 				source/system \
 				source/libs/libwbfs \
+				source/libs/libruntimeiospatch \
 				source/language \
 				source/mload \
 				source/mload/modules \
@@ -36,7 +34,9 @@ SOURCES		:=	source \
 				source/prompts \
 				source/wad \
 				source/banner \
+				source/Channels \
 				source/BoxCover \
+				source/GameCube \
 				source/cheats \
 				source/homebrewboot \
 				source/themes \
@@ -45,31 +45,41 @@ SOURCES		:=	source \
 				source/FileOperations \
 				source/ImageOperations \
 				source/SoundOperations \
+				source/SystemMenu \
 				source/utils \
 				source/utils/minizip \
-				source/usbloader/wbfs
-DATA		:=	data
+				source/usbloader/wbfs \
+				source/cache
+DATA		:=	data \
+				data/images \
+				data/fonts \
+				data/sounds \
+				data/binary
 INCLUDES	:=	source
 
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
+CFLAGS		=	-g -ggdb -O2 -Wall -Wno-multichar -Wno-unused-parameter -Wextra $(MACHDEP) $(INCLUDE) -D_GNU_SOURCE
+CXXFLAGS	=	$(CFLAGS)
+LDFLAGS		=	-g -ggdb $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size,-wrap,time
 
-CFLAGS		=	-g -O3 -Wall -Wno-multichar -Wno-unused-parameter -Wextra $(MACHDEP) $(INCLUDE)
-CXXFLAGS	=	-Xassembler -aln=$@.lst $(CFLAGS)
-LDFLAGS		=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00000,-wrap,malloc,-wrap,free,-wrap,memalign,-wrap,calloc,-wrap,realloc,-wrap,malloc_usable_size
--include $(PROJECTDIR)/Make.config
+ifeq ($(BUILDMODE),channel)
+CFLAGS += -DFULLCHANNEL
+CXXFLAGS += -DFULLCHANNEL
+endif
 
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS :=  -lpngu -lpng -lgd -lm -lz -lwiiuse -lbte -lasnd -logc -lfreetype -lvorbisidec \
-		-lmad -lmxml -ljpeg -lzip -lcustomfat -lcustomntfs -lcustomext2fs
+LIBS := -lwolfssl -lcustomfat -lcustomntfs -lcustomext2fs -lvorbisidec -logg \
+		-lmad -lfreetype -lgd -ljpeg -lpng -lm -lz -lwiiuse -lwiidrc \
+		-lbte -lasnd -logc
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(DEVKITPPC)/lib $(CURDIR)
+LIBDIRS	:= $(CURDIR)/portlibs
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
 # rules for different file extensions
@@ -86,19 +96,22 @@ export DEPSDIR	:=	$(CURDIR)/$(BUILD)
 # automatically build a list of object files for our project
 #---------------------------------------------------------------------------------
 SVNREV		:=	$(shell bash ./svnrev.sh)
+GITVER		:=	$(shell bash ./gitver.sh)
+IMPORTFILES	:=  $(shell bash ./filelist.sh)
 export CFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
 export CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
 sFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
 SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
-ELFFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.elf)))
+ELFFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.elf)))
 BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.bin)))
-TTFFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ttf)))
-PNGFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.png)))
-OGGFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ogg)))
-PCMFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.pcm)))
-WAVFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.wav)))
+TTFFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ttf)))
+PNGFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.png)))
+OGGFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ogg)))
+PCMFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.pcm)))
+WAVFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.wav)))
 DOLFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.dol)))
-MP3FILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.mp3)))
+MP3FILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.mp3)))
+BNRFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.bnr)))
 
 #---------------------------------------------------------------------------------
 # use CXX for linking C++ projects, CC for standard C
@@ -109,27 +122,27 @@ else
 	export LD	:=	$(CXX)
 endif
 
-export OFILES	:=	$(addsuffix .o,$(BINFILES)) \
-					$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
+export OFILES	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
 					$(sFILES:.s=.o) $(SFILES:.S=.o) \
-					$(TTFFILES:.ttf=.ttf.o) $(PNGFILES:.png=.png.o) $(addsuffix .o,$(DOLFILES))\
+					$(TTFFILES:.ttf=.ttf.o) $(PNGFILES:.png=.png.o) $(addsuffix .o,$(DOLFILES)) \
 					$(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) $(MP3FILES:.mp3=.mp3.o) \
-					$(WAVFILES:.wav=.wav.o) $(addsuffix .o,$(ELFFILES)) $(CURDIR)/data/magic_patcher.o
+					$(WAVFILES:.wav=.wav.o) $(addsuffix .o,$(ELFFILES)) $(addsuffix .o,$(BINFILES)) \
+					$(BNRFILES:.bnr=.bnr.o) $(CURDIR)/data/magic_patcher.o
 
 #---------------------------------------------------------------------------------
 # build a list of include paths
 #---------------------------------------------------------------------------------
 export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
 					$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
-					-I$(CURDIR)/$(BUILD) \
-					-I$(LIBOGC_INC)
+					-I$(CURDIR)/$(BUILD) -I$(LIBOGC_INC)
 
 #---------------------------------------------------------------------------------
 # build a list of library paths
 #---------------------------------------------------------------------------------
-export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(CURDIR)/source/libs/libfat/ \
-					-L$(CURDIR)/source/libs/libntfs/ -L$(CURDIR)/source/libs/libext2fs/ \
-					-L$(LIBOGC_LIB)
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib) -L$(CURDIR)/source/libs/libdrc/ \
+					-L$(CURDIR)/source/libs/libext2fs -L$(CURDIR)/source/libs/libfat \
+					-L$(CURDIR)/source/libs/libntfs \
+					-L$(CURDIR)/source/libs/libwolfssl -L$(LIBOGC_LIB)
 
 export OUTPUT	:=	$(CURDIR)/$(TARGET)
 .PHONY: $(BUILD) lang all clean
@@ -137,21 +150,17 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@/bin/bash ./buildtype.sh
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-#	@echo debug...
-#	start geckoreader.exe
 
 channel:
 	@[ -d build ] || mkdir -p build
-	@/bin/bash ./buildtype.sh FULLCHANNEL
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@$(MAKE) BUILDMODE=channel --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
 
 #---------------------------------------------------------------------------------
 lang:
 	@[ -d build ] || mkdir -p build
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
-	
+
 #---------------------------------------------------------------------------------
 theme:
 	@[ -d build ] || mkdir -p build
@@ -159,22 +168,24 @@ theme:
 
 #---------------------------------------------------------------------------------
 all:
-	@[ -d build ] || mkdir -p build
-	@./buildtype.sh
 	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
-	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile language
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile lang
 
 #---------------------------------------------------------------------------------
 clean:
-	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
-#---------------------------------------------------------------------------------
-run:
-	$(MAKE)
-	@echo Done building ...
-	@echo Now Run That Shit ...
+	@echo Cleaning...
+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol usbloader_gx.zip usbloader_gx
 
-	wiiload $(OUTPUT).dol
+#---------------------------------------------------------------------------------
+deploy:
+	$(MAKE)
+	@echo Deploying...
+	@[ -d usbloader_gx ] || mkdir -p usbloader_gx
+	@cp $(TARGET).dol usbloader_gx/
+	@cp HBC/icon.png usbloader_gx/
+	@cp HBC/meta.xml usbloader_gx/
+	@zip usbloader_gx.zip usbloader_gx/*
+	wiiload usbloader_gx.zip
 
 #---------------------------------------------------------------------------------
 reload:
@@ -185,7 +196,6 @@ release:
 	$(MAKE)
 	cp boot.dol ./hbc/boot.dol
 
-
 #---------------------------------------------------------------------------------
 else
 
@@ -253,8 +263,10 @@ language: $(wildcard $(PROJECTDIR)/Languages/*.lang) $(wildcard $(PROJECTDIR)/Th
 %.tmd.o	:	%.tmd
 	@echo $(notdir $<)
 	@bin2s -a 32 $< | $(AS) -o $(@)
-
-
+	
+%.bnr.o	:	%.bnr
+	@echo $(notdir $<)
+	@bin2s -a 32 $< | $(AS) -o $(@)
 
 export PATH		:=	$(PROJECTDIR)/gettext-bin:$(PATH)
 
@@ -264,7 +276,7 @@ export PATH		:=	$(PROJECTDIR)/gettext-bin:$(PATH)
 	@xgettext -C -cTRANSLATORS --from-code=utf-8 --sort-output --no-wrap --no-location -ktr -ktrNOOP -o$(PROJECTDIR)/Languages/$(TARGET).pot -p $@ $^
 	@echo Updating Themefiles ...
 	@touch $(PROJECTDIR)/Themes/$(TARGET).pot
-	@xgettext -C -cTRANSLATORS --from-code=utf-8 -F --no-wrap --add-location -kthInt -kthColor -kthAlign -o$(PROJECTDIR)/Themes/$(TARGET).pot -p $@ $^
+	@xgettext -C -cTRANSLATORS --from-code=utf-8 -F --no-wrap --add-location -kthInt -kthFloat -kthColor -kthAlign -o$(PROJECTDIR)/Themes/$(TARGET).pot -p $@ $^
 
 %.lang: $(PROJECTDIR)/Languages/$(TARGET).pot
 	@msgmerge -U -N --no-wrap --no-location --backup=none -q $@ $<

README.md

@@ -0,0 +1,31 @@
+<p align="center"><a href="https://github.com/wiidev/usbloadergx/" title="USB Loader GX"><img src="data/web/logo.png"></a></p>
+<p align="center">
+<a href="https://github.com/wiidev/usbloadergx/releases" title="Releases"><img src="https://img.shields.io/github/v/release/wiidev/usbloadergx?logo=github"></a>
+<a href="https://github.com/wiidev/usbloadergx/actions" title="Actions"><img src="https://img.shields.io/github/actions/workflow/status/wiidev/usbloadergx/main.yml?branch=enhanced&logo=github"></a>
+</p>
+
+## Description
+USB Loader GX allows you to play Wii and GameCube games from a USB storage device or an SD card, launch other homebrew apps, create backups, use cheats in games and a whole lot more.
+
+## Installation
+1. Extract the apps folder to the root of your SD card and replace any existing files.
+2. Install the [d2x v11 cIOS](https://github.com/wiidev/d2x-cios/releases).
+3. Optional: Download wiitdb.xml by selecting the update option within the loaders settings menu.
+4. Optional: Install the loaders forwarder channel ([Wii](https://github.com/wiidev/usbloadergx/raw/updates/USBLoaderGX_forwarder%5BUNEO%5D_Wii.wad) or [vWii](https://github.com/wiidev/usbloadergx/raw/updates/USBLoaderGX_forwarder%5BUNEO%5D_vWii.wad)) and then set the return to setting to `UNEO`.
+
+## cIOS guide
+The first configuration is the optimal one for the Wii, but the second configuration should improve compatibility.
+
+**For Wii**
+````
+Slot 249 base 56
+Slot 250 base 57
+Slot 251 base 38
+````
+**For vWii and Wii**
+````
+Slot 248 base 38 (Wii only)
+Slot 249 base 56
+Slot 250 base 57
+Slot 251 base 58
+````

Themes/Default.them

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 15:51+0100\n"
+"POT-Creation-Date: 2012-05-19 12:24+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -19,19 +19,43 @@ msgstr ""
 "Theme-Team: Example\n"
 "Theme-Version: Example\n"
 
-msgid "r=0 g=0 b=0 a=255 - prompt windows text color"
+msgid "0 - game bannergrid layout pos x"
 msgstr ""
 
-msgid "r=0 g=0 b=0 a=255 - settings text color"
+msgid "-50 - game bannergrid layout pos y"
 msgstr ""
 
-msgid "9 - game list browser page size"
+msgid "r=237 g=237 b=237 a=255 - banner icon frame color"
 msgstr ""
 
-msgid "r=0 g=0 b=0 a=255 - game browser list text color"
+msgid "r=52 g=190 b=237 a=255 - banner icon highlite color"
 msgstr ""
 
-msgid "r=0 g=0 b=0 a=255 - game browser list text color over"
+msgid "r=130 g=130 b=130 a=0 - banner icon frame edge tev color 1"
+msgstr ""
+
+msgid "r=180 g=180 b=180 a=255 - banner icon frame edge tev color 2"
+msgstr ""
+
+msgid "r=255 g=255 b=255 a=255 - banner icon frame edge tev color 3"
+msgstr ""
+
+msgid "255 - tooltip alpha"
+msgstr ""
+
+msgid "right - checkbox browser scrollbar align hor"
+msgstr ""
+
+msgid "top - checkbox browser scrollbar align ver"
+msgstr ""
+
+msgid "0 - checkbox browser scrollbar pos x"
+msgstr ""
+
+msgid "5 - checkbox browser scrollbar pos y"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - checkbox browser text color"
 msgstr ""
 
 msgid "left - carousel layout left arrow align hor"
@@ -67,7 +91,55 @@ msgstr ""
 msgid "20 - game grid layout pos y"
 msgstr ""
 
-msgid "255 - tooltip alpha"
+msgid "9 - game list browser page size"
+msgstr ""
+
+msgid "right - game browser scrollbar align hor"
+msgstr ""
+
+msgid "top - game browser scrollbar align ver"
+msgstr ""
+
+msgid "0 - game browser scrollbar pos x"
+msgstr ""
+
+msgid "5 - game browser scrollbar pos y"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game browser list text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game browser list text color over"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - keyboard text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - keyboard key text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - numpad text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - numpad key text color"
+msgstr ""
+
+msgid "right - options browser scrollbar align hor"
+msgstr ""
+
+msgid "top - options browser scrollbar align ver"
+msgstr ""
+
+msgid "0 - options browser scrollbar pos x"
+msgstr ""
+
+msgid "5 - options browser scrollbar pos y"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - settings text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - prompt windows button text color"
 msgstr ""
 
 msgid "r=55 g=190 b=237 a=255 - hdd info color"
@@ -151,6 +223,9 @@ msgstr ""
 msgid "r=138 g=138 b=138 a=240 - clock color"
 msgstr ""
 
+msgid "1.0 - Overrided clock scale factor. 1.0=allow user setting"
+msgstr ""
+
 msgid "left - clock align hor"
 msgstr ""
 
@@ -163,73 +238,100 @@ msgstr ""
 msgid "335 - clock pos y"
 msgstr ""
 
-msgid "260 - list layout favorite btn pos x"
+msgid "168 - list layout favorite btn pos x"
 msgstr ""
 
-msgid "288 - list layout favorite btn pos x widescreen"
+msgid "214 - list layout favorite btn pos x widescreen"
 msgstr ""
 
 msgid "13 - list layout favorite btn pos y"
 msgstr ""
 
-msgid "300 - list layout search btn pos x"
+msgid "208 - list layout search btn pos x"
 msgstr ""
 
-msgid "320 - list layout search btn pos x widescreen"
+msgid "246 - list layout search btn pos x widescreen"
 msgstr ""
 
 msgid "13 - list layout search btn pos y"
 msgstr ""
 
-msgid "340 - list layout abc/sort btn pos x"
+msgid "248 - list layout abc/sort btn pos x"
 msgstr ""
 
-msgid "352 - list layout abc/sort btn pos x widescreen"
+msgid "278 - list layout abc/sort btn pos x widescreen"
 msgstr ""
 
 msgid "13 - list layout abc/sort btn pos y"
 msgstr ""
 
-msgid "380 - list layout list btn pos x"
+msgid "288 - list layout loadermode btn pos x"
 msgstr ""
 
-msgid "384 - list layout list btn pos x widescreen"
+msgid "310 - list layout loadermode btn pos x widescreen"
+msgstr ""
+
+msgid "13 - list layout loadermode btn pos y"
+msgstr ""
+
+msgid "328 - list layout category btn pos x"
+msgstr ""
+
+msgid "342 - list layout category btn pos x widescreen"
+msgstr ""
+
+msgid "13 - list layout category btn pos y"
+msgstr ""
+
+msgid "368 - list layout list btn pos x"
+msgstr ""
+
+msgid "374 - list layout list btn pos x widescreen"
 msgstr ""
 
 msgid "13 - list layout list btn pos y"
 msgstr ""
 
-msgid "416 - list layout grid btn pos x widescreen"
+msgid "406 - list layout grid btn pos x widescreen"
 msgstr ""
 
-msgid "420 - list layout grid btn pos x"
+msgid "408 - list layout grid btn pos x"
 msgstr ""
 
 msgid "13 - list layout grid btn pos y"
 msgstr ""
 
-msgid "448 - list layout carousel btn pos x widescreen"
+msgid "438 - list layout carousel btn pos x widescreen"
 msgstr ""
 
-msgid "460 - list layout carousel btn pos x"
+msgid "448 - list layout carousel btn pos x"
 msgstr ""
 
 msgid "13 - list layout carousel btn pos y"
 msgstr ""
 
-msgid "480 - list layout lock btn pos x widescreen"
+msgid "470 - list layout bannergrid btn pos x widescreen"
 msgstr ""
 
-msgid "500 - list layout lock btn pos x"
+msgid "488 - list layout bannergrid btn pos x"
+msgstr ""
+
+msgid "13 - list layout bannergrid btn pos y"
+msgstr ""
+
+msgid "502 - list layout lock btn pos x widescreen"
+msgstr ""
+
+msgid "528 - list layout lock btn pos x"
 msgstr ""
 
 msgid "13 - list layout lock btn pos y"
 msgstr ""
 
-msgid "512 - list layout dvd btn pos x widescreen"
+msgid "534 - list layout dvd btn pos x widescreen"
 msgstr ""
 
-msgid "540 - list layout dvd btn pos x"
+msgid "568 - list layout dvd btn pos x"
 msgstr ""
 
 msgid "13 - list layout dvd btn pos y"
@@ -247,73 +349,100 @@ msgstr ""
 msgid "49 - game list layout pos y"
 msgstr ""
 
-msgid "200 - grid layout favorite btn pos x"
+msgid "100 - grid layout favorite btn pos x"
 msgstr ""
 
-msgid "224 - grid layout favorite btn pos x widescreen"
+msgid "144 - grid layout favorite btn pos x widescreen"
 msgstr ""
 
 msgid "13 - grid layout favorite btn pos y"
 msgstr ""
 
-msgid "240 - grid layout search btn pos x"
+msgid "140 - grid layout search btn pos x"
 msgstr ""
 
-msgid "256 - grid layout search btn pos x widescreen"
+msgid "176 - grid layout search btn pos x widescreen"
 msgstr ""
 
 msgid "13 - grid layout search btn pos y"
 msgstr ""
 
-msgid "280 - grid layout abc/sort btn pos x"
+msgid "180 - grid layout abc/sort btn pos x"
 msgstr ""
 
-msgid "288 - grid layout abc/sort btn pos x widescreen"
+msgid "208 - grid layout abc/sort btn pos x widescreen"
 msgstr ""
 
 msgid "13 - grid layout abc/sort btn pos y"
 msgstr ""
 
-msgid "320 - grid layout list btn pos x"
+msgid "220 - grid layout loadermode btn pos x"
 msgstr ""
 
-msgid "320 - grid layout list btn pos x widescreen"
+msgid "240 - grid layout loadermode btn pos x widescreen"
+msgstr ""
+
+msgid "13 - grid layout loadermode btn pos y"
+msgstr ""
+
+msgid "260 - grid layout category btn pos x"
+msgstr ""
+
+msgid "272 - grid layout category btn pos x widescreen"
+msgstr ""
+
+msgid "13 - grid layout category btn pos y"
+msgstr ""
+
+msgid "300 - grid layout list btn pos x"
+msgstr ""
+
+msgid "304 - grid layout list btn pos x widescreen"
 msgstr ""
 
 msgid "13 - grid layout list btn pos y"
 msgstr ""
 
-msgid "352 - grid layout grid btn pos x widescreen"
+msgid "336 - grid layout grid btn pos x widescreen"
 msgstr ""
 
-msgid "360 - grid layout grid btn pos x"
+msgid "340 - grid layout grid btn pos x"
 msgstr ""
 
 msgid "13 - grid layout grid btn pos y"
 msgstr ""
 
-msgid "384 - grid layout carousel btn pos x widescreen"
+msgid "368 - grid layout carousel btn pos x widescreen"
 msgstr ""
 
-msgid "400 - grid layout carousel btn pos x"
+msgid "380 - grid layout carousel btn pos x"
 msgstr ""
 
 msgid "13 - grid layout carousel btn pos y"
 msgstr ""
 
-msgid "416 - grid layout lock btn pos x widescreen"
+msgid "400 - grid layout bannergrid btn pos x widescreen"
 msgstr ""
 
-msgid "440 - grid layout lock btn pos x"
+msgid "420 - grid layout bannergrid btn pos x"
+msgstr ""
+
+msgid "13 - grid layout bannergrid btn pos y"
+msgstr ""
+
+msgid "432 - grid layout lock btn pos x widescreen"
+msgstr ""
+
+msgid "460 - grid layout lock btn pos x"
 msgstr ""
 
 msgid "13 - grid layout lock btn pos y"
 msgstr ""
 
-msgid "448 - grid layout dvd btn pos x widescreen"
+msgid "464 - grid layout dvd btn pos x widescreen"
 msgstr ""
 
-msgid "480 - grid layout dvd btn pos x"
+msgid "500 - grid layout dvd btn pos x"
 msgstr ""
 
 msgid "13 - grid layout dvd btn pos y"
@@ -325,73 +454,100 @@ msgstr ""
 msgid "640 - game grid layout width"
 msgstr ""
 
-msgid "200 - carousel layout favorite btn pos x"
+msgid "100 - carousel layout favorite btn pos x"
 msgstr ""
 
-msgid "224 - carousel layout favorite btn pos x widescreen"
+msgid "144 - carousel layout favorite btn pos x widescreen"
 msgstr ""
 
 msgid "13 - carousel layout favorite btn pos y"
 msgstr ""
 
-msgid "240 - carousel layout search btn pos x"
+msgid "140 - carousel layout search btn pos x"
 msgstr ""
 
-msgid "256 - carousel layout search btn pos x widescreen"
+msgid "176 - carousel layout search btn pos x widescreen"
 msgstr ""
 
 msgid "13 - carousel layout search btn pos y"
 msgstr ""
 
-msgid "280 - carousel layout abc/sort btn pos x"
+msgid "180 - carousel layout abc/sort btn pos x"
 msgstr ""
 
-msgid "288 - carousel layout abc/sort btn pos x widescreen"
+msgid "208 - carousel layout abc/sort btn pos x widescreen"
 msgstr ""
 
 msgid "13 - carousel layout abc/sort btn pos y"
 msgstr ""
 
-msgid "320 - carousel layout list btn pos x"
+msgid "220 - carousel layout loadermode btn pos x"
 msgstr ""
 
-msgid "320 - carousel layout list btn pos x widescreen"
+msgid "240 - carousel layout loadermode btn pos x widescreen"
+msgstr ""
+
+msgid "13 - carousel layout loadermode btn pos y"
+msgstr ""
+
+msgid "260 - carousel layout category btn pos x"
+msgstr ""
+
+msgid "272 - carousel layout category btn pos x widescreen"
+msgstr ""
+
+msgid "13 - carousel layout category btn pos y"
+msgstr ""
+
+msgid "300 - carousel layout list btn pos x"
+msgstr ""
+
+msgid "304 - carousel layout list btn pos x widescreen"
 msgstr ""
 
 msgid "13 - carousel layout list btn pos y"
 msgstr ""
 
-msgid "352 - carousel layout grid btn pos x widescreen"
+msgid "336 - carousel layout grid btn pos x widescreen"
 msgstr ""
 
-msgid "360 - carousel layout grid btn pos x"
+msgid "340 - carousel layout grid btn pos x"
 msgstr ""
 
 msgid "13 - carousel layout grid btn pos y"
 msgstr ""
 
-msgid "384 - carousel layout carousel btn pos x widescreen"
+msgid "368 - carousel layout carousel btn pos x widescreen"
 msgstr ""
 
-msgid "400 - carousel layout carousel btn pos x"
+msgid "380 - carousel layout carousel btn pos x"
 msgstr ""
 
 msgid "13 - carousel layout carousel btn pos y"
 msgstr ""
 
-msgid "416 - carousel layout lock btn pos x widescreen"
+msgid "400 - carousel layout bannergrid btn pos x widescreen"
 msgstr ""
 
-msgid "440 - carousel layout lock btn pos x"
+msgid "420 - carousel layout bannergrid btn pos x"
+msgstr ""
+
+msgid "13 - carousel layout bannergrid btn pos y"
+msgstr ""
+
+msgid "432 - carousel layout lock btn pos x widescreen"
+msgstr ""
+
+msgid "460 - carousel layout lock btn pos x"
 msgstr ""
 
 msgid "13 - carousel layout lock btn pos y"
 msgstr ""
 
-msgid "448 - carousel layout dvd btn pos x widescreen"
+msgid "464 - carousel layout dvd btn pos x widescreen"
 msgstr ""
 
-msgid "480 - carousel layout dvd btn pos x"
+msgid "500 - carousel layout dvd btn pos x"
 msgstr ""
 
 msgid "13 - carousel layout dvd btn pos y"
@@ -409,12 +565,123 @@ msgstr ""
 msgid "0 - game carousel layout pos x"
 msgstr ""
 
+msgid "100 - bannergrid layout favorite btn pos x"
+msgstr ""
+
+msgid "144 - bannergrid layout favorite btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout favorite btn pos y"
+msgstr ""
+
+msgid "140 - bannergrid layout search btn pos x"
+msgstr ""
+
+msgid "176 - bannergrid layout search btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout search btn pos y"
+msgstr ""
+
+msgid "180 - bannergrid layout abc/sort btn pos x"
+msgstr ""
+
+msgid "208 - bannergrid layout abc/sort btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout abc/sort btn pos y"
+msgstr ""
+
+msgid "220 - bannergrid layout loadermode btn pos x"
+msgstr ""
+
+msgid "240 - bannergrid layout loadermode btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout loadermode btn pos y"
+msgstr ""
+
+msgid "260 - bannergrid layout category btn pos x"
+msgstr ""
+
+msgid "272 - bannergrid layout category btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout category btn pos y"
+msgstr ""
+
+msgid "300 - bannergrid layout list btn pos x"
+msgstr ""
+
+msgid "304 - bannergrid layout list btn pos x widescreen"
+msgstr ""
+
+msgid "13 - bannergrid layout list btn pos y"
+msgstr ""
+
+msgid "336 - bannergrid layout grid btn pos x widescreen"
+msgstr ""
+
+msgid "340 - bannergrid layout grid btn pos x"
+msgstr ""
+
+msgid "13 - bannergrid layout grid btn pos y"
+msgstr ""
+
+msgid "368 - bannergrid layout carousel btn pos x widescreen"
+msgstr ""
+
+msgid "380 - bannergrid layout carousel btn pos x"
+msgstr ""
+
+msgid "13 - bannergrid layout carousel btn pos y"
+msgstr ""
+
+msgid "400 - bannergrid layout bannergrid btn pos x widescreen"
+msgstr ""
+
+msgid "420 - bannergrid layout bannergrid btn pos x"
+msgstr ""
+
+msgid "13 - bannergrid layout bannergrid btn pos y"
+msgstr ""
+
+msgid "432 - bannergrid layout lock btn pos x widescreen"
+msgstr ""
+
+msgid "460 - bannergrid layout lock btn pos x"
+msgstr ""
+
+msgid "13 - bannergrid layout lock btn pos y"
+msgstr ""
+
+msgid "464 - bannergrid layout dvd btn pos x widescreen"
+msgstr ""
+
+msgid "500 - bannergrid layout dvd btn pos x"
+msgstr ""
+
+msgid "13 - bannergrid layout dvd btn pos y"
+msgstr ""
+
 msgid "1 - show hdd info: 1 for on and 0 for off"
 msgstr ""
 
 msgid "1 - show game count: 1 for on and 0 for off"
 msgstr ""
 
+msgid "center - category switch prompt align hor"
+msgstr ""
+
+msgid "middle - category switch prompt align ver"
+msgstr ""
+
+msgid "0 - category switch prompt pos x"
+msgstr ""
+
+msgid "0 - category switch prompt pos y"
+msgstr ""
+
 msgid "r=55 g=190 b=237 a=255 - game id text color"
 msgstr ""
 
@@ -427,5 +694,248 @@ msgstr ""
 msgid "68 - region info text pos x"
 msgstr ""
 
+msgid "r=0 g=0 b=0 a=255 - banner window playcount text color"
+msgstr ""
+
+msgid "0 - banner window play count pos x"
+msgstr ""
+
+msgid "215 - banner window play count pos y"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - category prompt title text color"
+msgstr ""
+
+msgid "center - category prompt title text align hor"
+msgstr ""
+
+msgid "top - category prompt title text align ver"
+msgstr ""
+
+msgid "0 - category prompt title text pos x"
+msgstr ""
+
+msgid "10 - category prompt title text pos y"
+msgstr ""
+
+msgid "center - category prompt browser align hor"
+msgstr ""
+
+msgid "top - category prompt browser align ver"
+msgstr ""
+
+msgid "0 - category prompt browser pos x"
+msgstr ""
+
+msgid "45 - category prompt browser pos y"
+msgstr ""
+
+msgid "left - category prompt add button text align hor"
+msgstr ""
+
+msgid "top - category prompt add button text align ver"
+msgstr ""
+
+msgid "10 - category prompt add button text pos x"
+msgstr ""
+
+msgid "6 - category prompt add button text pos y"
+msgstr ""
+
+msgid "left - category prompt add button align hor"
+msgstr ""
+
+msgid "top - category prompt add button align ver"
+msgstr ""
+
+msgid "180 - category prompt add button pos x"
+msgstr ""
+
+msgid "330 - category prompt add button pos y"
+msgstr ""
+
+msgid "left - category prompt delete button text align hor"
+msgstr ""
+
+msgid "top - category prompt delete button text align ver"
+msgstr ""
+
+msgid "10 - category prompt delete button text pos x"
+msgstr ""
+
+msgid "6 - category prompt delete button text pos y"
+msgstr ""
+
+msgid "left - category prompt delete button align hor"
+msgstr ""
+
+msgid "top - category prompt delete button align ver"
+msgstr ""
+
+msgid "330 - category prompt delete button pos y"
+msgstr ""
+
+msgid "5 - category prompt delete button pos x"
+msgstr ""
+
+msgid "left - category prompt edit button text align hor"
+msgstr ""
+
+msgid "top - category prompt edit button text align ver"
+msgstr ""
+
+msgid "10 - category prompt edit button text pos x"
+msgstr ""
+
+msgid "6 - category prompt edit button text pos y"
+msgstr ""
+
+msgid "left - category prompt edit button align hor"
+msgstr ""
+
+msgid "top - category prompt edit button align ver"
+msgstr ""
+
+msgid "180 - category prompt edit button pos x"
+msgstr ""
+
+msgid "362 - category prompt edit button pos y"
+msgstr ""
+
+msgid "bottom - category prompt save button align ver"
+msgstr ""
+
+msgid "center - category prompt save button align hor"
+msgstr ""
+
+msgid "-110 - category prompt save button pos x"
+msgstr ""
+
+msgid "0 - category prompt save button pos y"
+msgstr ""
+
+msgid "bottom - category prompt back button align ver"
+msgstr ""
+
+msgid "center - category prompt back button align hor"
+msgstr ""
+
+msgid "0 - category prompt back button pos y"
+msgstr ""
+
+msgid "110 - category prompt back button pos x"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - check box browser prompt title text color"
+msgstr ""
+
+msgid "center - check box browser prompt title text align hor"
+msgstr ""
+
+msgid "top - check box browser prompt title text align ver"
+msgstr ""
+
+msgid "0 - check box browser prompt title text pos x"
+msgstr ""
+
+msgid "10 - check box browser prompt title text pos y"
+msgstr ""
+
+msgid "center - check box browser prompt browser align hor"
+msgstr ""
+
+msgid "top - check box browser prompt browser align ver"
+msgstr ""
+
+msgid "0 - check box browser prompt browser pos x"
+msgstr ""
+
+msgid "45 - check box browser prompt browser pos y"
+msgstr ""
+
+msgid "bottom - check box browser prompt install button align ver"
+msgstr ""
+
+msgid "center - check box browser prompt install button align hor"
+msgstr ""
+
+msgid "-110 - check box browser prompt install button pos x"
+msgstr ""
+
+msgid "0 - check box browser prompt install button pos y"
+msgstr ""
+
+msgid "bottom - check box browser prompt back button align ver"
+msgstr ""
+
+msgid "center - check box browser prompt back button align hor"
+msgstr ""
+
+msgid "0 - check box browser prompt back button pos y"
+msgstr ""
+
+msgid "110 - check box browser prompt back button pos x"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - prompt windows text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game window name text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game window size text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game window playcount text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - game window details button text color"
+msgstr ""
+
+msgid "r=30 g=30 b=240 a=255 - game window details button over text color"
+msgstr ""
+
+msgid "r=0 g=0 b=0 a=255 - settings title text color"
+msgstr ""
+
+msgid "center - category game prompt align hor"
+msgstr ""
+
+msgid "middle - category game prompt align ver"
+msgstr ""
+
+msgid "0 - category game prompt pos x"
+msgstr ""
+
+msgid "0 - category game prompt pos y"
+msgstr ""
+
+msgid "center - settings option browser align hor"
+msgstr ""
+
+msgid "top - settings option browser align ver"
+msgstr ""
+
+msgid "0 - settings option browser pos x"
+msgstr ""
+
+msgid "90 - settings option browser pos y"
+msgstr ""
+
+msgid "center - settings title text align hor"
+msgstr ""
+
+msgid "top - settings title text align ver"
+msgstr ""
+
+msgid "0 - settings title text pos x"
+msgstr ""
+
+msgid "40 - settings title text pos y"
+msgstr ""
+
+msgid "310 - settings title text max width"
+msgstr ""
+
 msgid "1 - Enable tooltips: 0 for off and 1 for on"
 msgstr ""

buildtype.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ ! -z "$1" ];
-then
-	if [ ! -s source/buildtype.h ];
-	then
-		echo "#define $1" > source/buildtype.h
-	fi
-else
-	if [[ ! -f source/buildtype.h || -s source/buildtype.h ]];
-	then
-		cp /dev/null source/buildtype.h
-	fi 
-fi