UI: Put English resources into a resource file (like all other languages)

GUI.NET/Dependencies/resources.ca.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Personalitzada</Control>
 			<Control ID="mnuFullscreen">Pantalla completa</Control>
 			<Control ID="mnuVideoFilter">Filtre de vídeo</Control>
 			<Control ID="mnuNoneFilter">Cap</Control>
@@ -197,7 +196,6 @@
 			<Control ID="lblExpansionPort">Port d'expansió:</Control>
 			<Control ID="chkFourScore">Fes servir accesori per a 4 jugadors</Control>
 			<Control ID="chkAutoConfigureInput">Configura els comandaments automàticament quan es carregui un joc</Control>
-			<Control ID="tpgEmulatorKeys">Accessos directes</Control>
 
 			<Control ID="tpgAdvanced">Avançat</Control>
 			<Control ID="grpDisplayInput">Comandaments en pantalla</Control>
@@ -231,6 +229,7 @@
 			<Control ID="lblBottom">Avall</Control>
 			<Control ID="lblRight">Dreta</Control>
 			<Control ID="tpgPalette">Paleta de colors</Control>
+			<Control ID="chkShowColorIndexes">Show color indexes</Control>
 			<Control ID="mnuDefaultPalette">Per defecte (NTSC)</Control>
 			<Control ID="btnSelectPalette">Escollir una paleta...</Control>
 			<Control ID="btnExportPalette">Exportar fitxer .pal</Control>
@@ -262,7 +261,7 @@
 			<Control ID="btnResetPictureSettings">Restableix</Control>
 			<Control ID="mnuPresetComposite">Compost</Control>
 			<Control ID="mnuPresetSVideo">S-Video</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Monocrom</Control>
 
 			<Control ID="tpgAdvanced">Avançat</Control>
@@ -426,7 +425,6 @@
 			<Control ID="btnCancel">Cancel·la</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Configuració del servidor">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkPublicServer">Servidor públic</Control>
 			<Control ID="lblServerName">Nom del servidor:</Control>
@@ -437,7 +435,6 @@
 			<Control ID="btnCancel">Cancel·la</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Connexió a un servidor">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Servidor:</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkSpectator">Uneix-t'hi com a espectador</Control>
@@ -575,7 +572,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Opcions de la línia d'ordres">
 			<Control ID="grpExample">Exemple d'ús</Control>
-			<Control ID="tpgGeneral">General</Control>
+			<Control ID="tpgGeneralOptions">General</Control>
 			<Control ID="tpgVideoOptions">Opcions de vídeo</Control>
 			<Control ID="tpgAudioOptions">Opcions de so</Control>
 			<Control ID="tpgEmulationOptions">Opcions de l'emulació</Control>

GUI.NET/Dependencies/resources.es.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Personalizar</Control>
 			<Control ID="mnuFullscreen">Pantalla completa</Control>
 			<Control ID="mnuVideoFilter">Filtro de video</Control>
 			<Control ID="mnuNoneFilter">Ninguno</Control>
@@ -196,7 +195,6 @@
 			<Control ID="lblExpansionPort">Puerto de extensión:</Control>
 			<Control ID="chkFourScore">Utilizar accesorio para 4 jugadores</Control>
 			<Control ID="chkAutoConfigureInput">Configurar controles automáticamente al cargar un juego</Control>
-			<Control ID="tpgEmulatorKeys">Accesos directos</Control>
 
 			<Control ID="tpgAdvanced">Avanzado</Control>
 			<Control ID="grpDisplayInput">Controladores de pantalla</Control>
@@ -230,6 +228,7 @@
 			<Control ID="lblBottom">Abajo</Control>
 			<Control ID="lblRight">Derecha</Control>
 			<Control ID="tpgPalette">Paleta</Control>
+			<Control ID="chkShowColorIndexes">Show color indexes</Control>
 			<Control ID="mnuDefaultPalette">Por defecto (NTSC)</Control>
 			<Control ID="btnSelectPalette">Elegir una paleta...</Control>
 			<Control ID="btnExportPalette">Exportar archivo .pal</Control>
@@ -261,7 +260,7 @@
 			<Control ID="btnResetPictureSettings">Reiniciar</Control>
 			<Control ID="mnuPresetComposite">Compuesto</Control>
 			<Control ID="mnuPresetSVideo">S-Video</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Monocromo</Control>
 
 			<Control ID="tpgAdvanced">Avanzado</Control>
@@ -424,7 +423,6 @@
 			<Control ID="btnCancel">Cancelar</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Iniciar un servidor de juegos">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Puerto:</Control>
 			<Control ID="chkPublicServer">Servidor público</Control>
 			<Control ID="lblServerName">Nombre del servidor:</Control>
@@ -435,7 +433,6 @@
 			<Control ID="btnCancel">Cancelar</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Conexión a un servidor">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Servidor host:</Control>
 			<Control ID="lblPort">Puerto:</Control>
 			<Control ID="chkSpectator">Unirse como espectador</Control>
@@ -573,7 +570,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Opciones de linea de comandos">
 			<Control ID="grpExample">Ejemplo de uso</Control>
-			<Control ID="tpgGeneral">General</Control>
+			<Control ID="tpgGeneralOptions">General</Control>
 			<Control ID="tpgVideoOptions">Opciones de video</Control>
 			<Control ID="tpgAudioOptions">Opciones de audio</Control>
 			<Control ID="tpgEmulationOptions">Opciones de emulación</Control>

GUI.NET/Dependencies/resources.fr.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Personalisé</Control>
 			<Control ID="mnuFullscreen">Plein écran</Control>
 			<Control ID="mnuVideoFilter">Filtre vidéo</Control>
 			<Control ID="mnuNoneFilter">Aucun</Control>
@@ -197,7 +196,6 @@
 			<Control ID="lblExpansionPort">Port d'extension :</Control>
 			<Control ID="chkFourScore">Utiliser l'accessoire pour 4 joueurs</Control>
 			<Control ID="chkAutoConfigureInput">Configurer les manettes automatiquement au chargement d'un jeu</Control>
-			<Control ID="tpgEmulatorKeys">Raccourcis de l'émulateur</Control>
 
 			<Control ID="tpgAdvanced">Avancé</Control>
 			<Control ID="grpDisplayInput">Affichage des manettes</Control>
@@ -231,6 +229,7 @@
 			<Control ID="lblBottom">Bas</Control>
 			<Control ID="lblRight">Droite</Control>
 			<Control ID="tpgPalette">Palette</Control>
+			<Control ID="chkShowColorIndexes">Afficher l'indexe des couleurs</Control>
 			<Control ID="mnuDefaultPalette">Défaut (NTSC)</Control>
 			<Control ID="btnSelectPalette">Choisir une palette...</Control>
 			<Control ID="btnExportPalette">Exporter fichier .pal</Control>
@@ -262,7 +261,7 @@
 			<Control ID="btnResetPictureSettings">Réinitialiser</Control>
 			<Control ID="mnuPresetComposite">Composite</Control>
 			<Control ID="mnuPresetSVideo">S-Vidéo</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Monochrome</Control>
 
 			<Control ID="tpgAdvanced">Avancé</Control>
@@ -426,7 +425,6 @@
 			<Control ID="btnCancel">Annuler</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Démarrer un serveur de jeu">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkPublicServer">Serveur publique</Control>
 			<Control ID="lblServerName">Nom du serveur :</Control>
@@ -437,7 +435,6 @@
 			<Control ID="btnCancel">Annuler</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Connexion à un serveur">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Serveur hôte:</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkSpectator">Se joindre en tant que spectateur</Control>
@@ -585,7 +582,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Options de ligne de commande">
 			<Control ID="grpExample">Exemple d'utilisation</Control>
-			<Control ID="tpgGeneral">Général</Control>
+			<Control ID="tpgGeneralOptions">Général</Control>
 			<Control ID="tpgVideoOptions">Options vidéo</Control>
 			<Control ID="tpgAudioOptions">Options audio</Control>
 			<Control ID="tpgEmulationOptions">Options d'émulation</Control>

GUI.NET/Dependencies/resources.ja.xml

@@ -43,7 +43,6 @@
 			<Control ID="mnuScale4x">４倍</Control>
 			<Control ID="mnuScale5x">５倍</Control>
 			<Control ID="mnuScale6x">６倍</Control>
-			<Control ID="mnuScaleCustom">カスタム</Control>
 			<Control ID="mnuFullscreen">全画面表示</Control>
 			<Control ID="mnuVideoFilter">画面エフェクト</Control>
 			<Control ID="mnuNoneFilter">なし</Control>
@@ -197,7 +196,6 @@
 			<Control ID="lblNesType">ゲーム機:</Control>
 			<Control ID="lblExpansionPort">拡張ポート:</Control>
 			<Control ID="chkFourScore">Four Scoreを使う</Control>
-			<Control ID="tpgEmulatorKeys">ショートカットキー</Control>
 			<Control ID="chkAutoConfigureInput">ゲームをロードする時、自動的に一番適切なコントローラを選ぶ</Control>
 
 			<Control ID="tpgAdvanced">詳細設定</Control>
@@ -232,6 +230,7 @@
 			<Control ID="lblBottom">下</Control>
 			<Control ID="lblRight">右</Control>
 			<Control ID="tpgPalette">パレット</Control>
+			<Control ID="chkShowColorIndexes">色のインデックスを表示する</Control>
 			<Control ID="mnuDefaultPalette">デフォルト (NTSC)</Control>
 			<Control ID="btnSelectPalette">プリセットを選ぶ...</Control>
 			<Control ID="btnExportPalette">.palファイルにエクスポートする</Control>
@@ -263,7 +262,7 @@
 			<Control ID="btnResetPictureSettings">リセット</Control>
 			<Control ID="mnuPresetComposite">コンポジット</Control>
 			<Control ID="mnuPresetSVideo">S端子</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">モノクロ</Control>
 
 			<Control ID="tpgAdvanced">詳細設定</Control>
@@ -568,7 +567,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="コマンドラインオプション">
 			<Control ID="grpExample">使い方</Control>
-			<Control ID="tpgGeneral">全般</Control>
+			<Control ID="tpgGeneralOptions">全般</Control>
 			<Control ID="tpgVideoOptions">映像</Control>
 			<Control ID="tpgAudioOptions">音声</Control>
 			<Control ID="tpgEmulationOptions">エミュレーション</Control>

GUI.NET/Dependencies/resources.pt.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Personalizar</Control>
 			<Control ID="mnuFullscreen">Tela cheia</Control>
 			<Control ID="mnuVideoFilter">Filtro de vídeo</Control>
 			<Control ID="mnuNoneFilter">Nenhum</Control>
@@ -196,7 +195,6 @@
 			<Control ID="lblExpansionPort">Porta de expansão:</Control>
 			<Control ID="chkFourScore">Utilizar acessório para 4 jogadores</Control>
 			<Control ID="chkAutoConfigureInput">Configurar controles automaticamente ao carregar um jogo</Control>
-			<Control ID="tpgEmulatorKeys">Acessos diretos</Control>
 
 			<Control ID="tpgAdvanced">Avançado</Control>
 			<Control ID="grpDisplayInput">Controladores de tela</Control>
@@ -230,6 +228,7 @@
 			<Control ID="lblBottom">Abaixo</Control>
 			<Control ID="lblRight">Direita</Control>
 			<Control ID="tpgPalette">Paleta</Control>
+			<Control ID="chkShowColorIndexes">Show color indexes</Control>
 			<Control ID="mnuDefaultPalette">Por padrão (NTSC)</Control>
 			<Control ID="btnSelectPalette">Escolher uma paleta...</Control>
 			<Control ID="btnExportPalette">Exportar arquivo .pal</Control>
@@ -261,7 +260,7 @@
 			<Control ID="btnResetPictureSettings">Reiniciar</Control>
 			<Control ID="mnuPresetComposite">Composto</Control>
 			<Control ID="mnuPresetSVideo">S-Video</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Monocromo</Control>
 
 			<Control ID="tpgAdvanced">Avançado</Control>
@@ -422,7 +421,6 @@
 			<Control ID="btnCancel">Cancelar</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Iniciar um servidor de jogos">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkPublicServer">Servidor público</Control>
 			<Control ID="lblServerName">Nome do servidor:</Control>
@@ -433,7 +431,6 @@
 			<Control ID="btnCancel">Cancelar</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Conexão a um servidor">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Servidor host:</Control>
 			<Control ID="lblPort">Port:</Control>
 			<Control ID="chkSpectator">Entrar como espectador</Control>
@@ -571,7 +568,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Opções de linha de comando">
 			<Control ID="grpExample">Exemplo de uso</Control>
-			<Control ID="tpgGeneral">Geral</Control>
+			<Control ID="tpgGeneralOptions">Geral</Control>
 			<Control ID="tpgVideoOptions">Opções de vídeo</Control>
 			<Control ID="tpgAudioOptions">Opções de áudio</Control>
 			<Control ID="tpgEmulationOptions">Opções de emulação</Control>
@@ -979,25 +976,25 @@
 			<Value ID="Spanish">Español</Value>
 			<Value ID="Ukrainian">Українська</Value>
 			<Value ID="Catalan">Català</Value>
-    </Enum>
+		</Enum>
-    <Enum ID="RamPowerOnState">
+		<Enum ID="RamPowerOnState">
-      <Value ID="AllZeros">Todos os 0 (Padrão)</Value>
+			<Value ID="AllZeros">Todos os 0 (Padrão)</Value>
-      <Value ID="AllOnes">Todos os 1</Value>
+			<Value ID="AllOnes">Todos os 1</Value>
-      <Value ID="Random">Valores aleatórios</Value>
+			<Value ID="Random">Valores aleatórios</Value>
-    </Enum>
+		</Enum>
-    <Enum ID="CheatCurrentFilterType">
+		<Enum ID="CheatCurrentFilterType">
-      <Value ID="Smaller">Menor que</Value>
+			<Value ID="Smaller">Menor que</Value>
-      <Value ID="Equal">Igual a</Value>
+			<Value ID="Equal">Igual a</Value>
-      <Value ID="NotEqual">Não igual a</Value>
+			<Value ID="NotEqual">Não igual a</Value>
-      <Value ID="Greater">Maior que</Value>
+			<Value ID="Greater">Maior que</Value>
-    </Enum>
+		</Enum>
-    <Enum ID="CheatPrevFilterType">
+		<Enum ID="CheatPrevFilterType">
-      <Value ID="Smaller">Menor</Value>
+			<Value ID="Smaller">Menor</Value>
-      <Value ID="Equal">Igual</Value>
+			<Value ID="Equal">Igual</Value>
-      <Value ID="NotEqual">Não igual</Value>
+			<Value ID="NotEqual">Não igual</Value>
-      <Value ID="Greater">Maior</Value>
+			<Value ID="Greater">Maior</Value>
-    </Enum>
+		</Enum>
-    <Enum ID="VideoCodec">
+		<Enum ID="VideoCodec">
 
 			<Value ID="None">Nenhum (Sem comprimir)</Value>
 			<Value ID="ZMBV">Zip Motion Block Video (ZMBV)</Value>

GUI.NET/Dependencies/resources.ru.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Вручную</Control>
 			<Control ID="mnuFullscreen">Полный экран</Control>
 			<Control ID="mnuVideoFilter">Фильтр изображения</Control>
 			<Control ID="mnuNoneFilter">Нет</Control>
@@ -196,7 +195,6 @@
 			<Control ID="lblExpansionPort">Порт расширения :</Control>
 			<Control ID="chkFourScore">Использовать NES Four Score</Control>
 			<Control ID="chkAutoConfigureInput">Автоматически настраивать контроллеры при загрузке игры</Control>
-			<Control ID="tpgEmulatorKeys">Emulator Keys</Control>
 
 			<Control ID="tpgAdvanced">Расширенные</Control>
 			<Control ID="grpDisplayInput">Отображать ввод</Control>
@@ -230,6 +228,7 @@
 			<Control ID="lblBottom">Снизу</Control>
 			<Control ID="lblRight">Справа</Control>
 			<Control ID="tpgPalette">Палитра</Control>
+			<Control ID="chkShowColorIndexes">Show color indexes</Control>
 			<Control ID="mnuDefaultPalette">По умолчанию (NTSC)</Control>
 			<Control ID="btnSelectPalette">Выбрать палитру</Control>
 			<Control ID="btnExportPalette">Экспорт .pal</Control>
@@ -261,7 +260,7 @@
 			<Control ID="btnResetPictureSettings">Сброс</Control>
 			<Control ID="mnuPresetComposite">Composite</Control>
 			<Control ID="mnuPresetSVideo">S-Video</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Monochrome</Control>
 
 			<Control ID="tpgAdvanced">Advanced</Control>
@@ -423,7 +422,6 @@
 			<Control ID="btnCancel">Отмена</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Настройка сервера">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Порт:</Control>
 			<Control ID="chkPublicServer">Публичный сервер</Control>
 			<Control ID="lblServerName">Название :</Control>
@@ -434,7 +432,6 @@
 			<Control ID="btnCancel">Отмена</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Подключение к серверу">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Имя сервера:</Control>
 			<Control ID="lblPort">Порт:</Control>
 			<Control ID="chkSpectator">Войти как наблюдатель</Control>
@@ -573,7 +570,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Command-line Options">
 			<Control ID="grpExample">Usage example</Control>
-			<Control ID="tpgGeneral">General</Control>
+			<Control ID="tpgGeneralOptions">General</Control>
 			<Control ID="tpgVideoOptions">Video Options</Control>
 			<Control ID="tpgAudioOptions">Audio Options</Control>
 			<Control ID="tpgEmulationOptions">Emulation Options</Control>

GUI.NET/Dependencies/resources.uk.xml

@@ -41,7 +41,6 @@
 			<Control ID="mnuScale2x">2x</Control>
 			<Control ID="mnuScale3x">3x</Control>
 			<Control ID="mnuScale4x">4x</Control>
-			<Control ID="mnuScaleCustom">Вручну</Control>
 			<Control ID="mnuFullscreen">Повний екран</Control>
 			<Control ID="mnuVideoFilter">Фільтр зображення</Control>
 			<Control ID="mnuNoneFilter">Немає</Control>
@@ -196,7 +195,6 @@
 			<Control ID="lblExpansionPort">Порт розширення :</Control>
 			<Control ID="chkFourScore">Використовувати NES Four Score</Control>
 			<Control ID="chkAutoConfigureInput">Автоматично налаштовувати контролери при завантаженні гри</Control>
-			<Control ID="tpgEmulatorKeys">Емуляторні ключі</Control>
 
 			<Control ID="tpgAdvanced">Розширені</Control>
 			<Control ID="grpDisplayInput">Відображати введення</Control>
@@ -230,6 +228,7 @@
 			<Control ID="lblBottom">Знизу</Control>
 			<Control ID="lblRight">Справа</Control>
 			<Control ID="tpgPalette">Палiтра</Control>
+			<Control ID="chkShowColorIndexes">Show color indexes</Control>
 			<Control ID="mnuDefaultPalette">За замовчуванням (NTSC)</Control>
 			<Control ID="btnSelectPalette">Виберіть палітру...</Control>
 			<Control ID="btnExportPalette">Експортувати файл .pal</Control>
@@ -261,7 +260,7 @@
 			<Control ID="btnResetPictureSettings">Скидання</Control>
 			<Control ID="mnuPresetComposite">Композитний</Control>
 			<Control ID="mnuPresetSVideo">S-Video</Control>
-			<Control ID="menuPresetRgb">RGB</Control>
+			<Control ID="mnuPresetRgb">RGB</Control>
 			<Control ID="mnuPresetMonochrome">Монохромний</Control>
 
 			<Control ID="tpgAdvanced">Розширенi</Control>
@@ -423,7 +422,6 @@
 			<Control ID="btnCancel">Вiдмiна</Control>
 		</Form>
 		<Form ID="frmServerConfig" Title="Налаштування сервера">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblPort">Порт:</Control>
 			<Control ID="chkPublicServer">Публічний сервер</Control>
 			<Control ID="lblServerName">Назва :</Control>
@@ -434,7 +432,6 @@
 			<Control ID="btnCancel">Вiдмiна</Control>
 		</Form>
 		<Form ID="frmClientConfig" Title="Підключення до сервера">
-			<Control ID="txtPort">8888</Control>
 			<Control ID="lblHost">Iм'я сервера:</Control>
 			<Control ID="lblPort">Порт:</Control>
 			<Control ID="chkSpectator">Ввійти як спостерігач</Control>
@@ -573,7 +570,7 @@
 		</Form>
 		<Form ID="frmHelp" Title="Параметри командного рядка">
 			<Control ID="grpExample">Приклад використання</Control>
-			<Control ID="tpgGeneral">Загальний</Control>
+			<Control ID="tpgGeneralOptions">Загальний</Control>
 			<Control ID="tpgVideoOptions">Вiдео Опцiї</Control>
 			<Control ID="tpgAudioOptions">Аудiо Опцiї</Control>
 			<Control ID="tpgEmulationOptions">Опцiї Эмуляцiї</Control>

GUI.NET/Forms/Config/ctrlEmulatorShortcuts.Designer.cs

@@ -151,8 +151,7 @@
 			this.lblShortcutWarning.Name = "lblShortcutWarning";
 			this.lblShortcutWarning.Size = new System.Drawing.Size(418, 28);
 			this.lblShortcutWarning.TabIndex = 1;
-			this.lblShortcutWarning.Text = "Warning: Your current configuration contains conflicting key bindings. If this is" +
+			this.lblShortcutWarning.Text = "Warning: Your current configuration contains conflicting key bindings. If this is not intentional, please review and correct your key bindings.";
-    " not intentional, please review and correct your key bindings.";
 			// 
 			// ctrlEmulatorShortcuts
 			// 

GUI.NET/Forms/Config/frmEmulationConfig.Designer.cs

@@ -528,8 +528,7 @@ namespace Mesen.GUI.Forms.Config
 			this.chkAdaptiveSpriteLimit.Name = "chkAdaptiveSpriteLimit";
 			this.chkAdaptiveSpriteLimit.Size = new System.Drawing.Size(442, 17);
 			this.chkAdaptiveSpriteLimit.TabIndex = 10;
-			this.chkAdaptiveSpriteLimit.Text = "Automatically re-enable sprite limit as needed to prevent graphical glitches when" +
+			this.chkAdaptiveSpriteLimit.Text = "Automatically re-enable sprite limit as needed to prevent graphical glitches when possible";
-    " possible";
 			this.chkAdaptiveSpriteLimit.UseVisualStyleBackColor = true;
 			// 
 			// tpgOverclocking

GUI.NET/Forms/ResourceHelper.cs

@@ -32,7 +32,6 @@ namespace Mesen.GUI.Forms
 		private static Language _language;
 		private static XmlDocument _resources = new XmlDocument();
 		private static XmlDocument _enResources = new XmlDocument();
-		private static XmlDocument _originalEnglishResources = null;
 
 		public static Language GetCurrentLanguage()
 		{
@@ -135,16 +134,7 @@ namespace Mesen.GUI.Forms
 
 		public static void ApplyResources(Form form, string formName)
 		{
-			if(form is frmMain && _originalEnglishResources == null) {
+			XmlNode baseNode = _resources.SelectSingleNode("/Resources/Forms/Form[@ID='" + formName + "']");
-				_originalEnglishResources = BuildResourceFile(form);
-			}
-
-			XmlNode baseNode = null;
-			if(form is frmMain && _language == Language.English) {
-				baseNode = _originalEnglishResources.SelectSingleNode("/Resources/Forms/Form[@ID='" + formName + "']");
-			} else {
-				baseNode = _resources.SelectSingleNode("/Resources/Forms/Form[@ID='" + formName + "']");
-			}
 
 			if(baseNode != null) {
 				if(baseNode.Attributes["Title"] != null) {

GUI.NET/Forms/frmAbout.Designer.cs

@@ -166,8 +166,7 @@
 			this.lblDonate.Name = "lblDonate";
 			this.lblDonate.Size = new System.Drawing.Size(271, 26);
 			this.lblDonate.TabIndex = 30;
-			this.lblDonate.Text = "If you want to support Mesen, please consider donating.\r\nThank you for your suppo" +
+			this.lblDonate.Text = "If you want to support Mesen, please consider donating.\r\nThank you for your support!";
-    "rt!";
 			// 
 			// picDonate
 			// 

GUI.NET/Forms/frmHelp.Designer.cs

@@ -102,9 +102,7 @@
 			this.txtGeneralOptions.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
 			this.txtGeneralOptions.Size = new System.Drawing.Size(568, 210);
 			this.txtGeneralOptions.TabIndex = 3;
-			this.txtGeneralOptions.Text = "/fullscreen - Start Mesen in fullscreen mode\r\n/DoNotSaveSettings - Prevent settin" +
+			this.txtGeneralOptions.Text = "/fullscreen - Start Mesen in fullscreen mode\r\n/DoNotSaveSettings - Prevent settings from being saved to the disk (useful to prevent command line options from becoming the default settings)";
-    "gs from being saved to the disk (useful to prevent command line options from bec" +
-    "oming the default settings)";
 			// 
 			// grpExample
 			// 
@@ -142,8 +140,7 @@
 			this.lblExample.Name = "lblExample";
 			this.lblExample.Size = new System.Drawing.Size(556, 38);
 			this.lblExample.TabIndex = 0;
-			this.lblExample.Text = "Mesen C:\\Games\\MyGame.nes /fullscreen /VideoFilter=NTSC /VideoScale=2 /OverscanTo" +
+			this.lblExample.Text = "Mesen C:\\Games\\MyGame.nes /fullscreen /VideoFilter=NTSC /VideoScale=2 /OverscanTop=8 /OverscanBottom=8 /OverscanLeft=0 /OverscanRight=0 /DoNotSaveSettings";
-    "p=8 /OverscanBottom=8 /OverscanLeft=0 /OverscanRight=0 /DoNotSaveSettings";
 			// 
 			// lblExplanation
 			//