From 5e7bdb8a7e8b46ab9628db10b45d2ff12897052e Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 21 Jul 2010 10:32:07 +0200
Subject: [PATCH] clock: Move from a per resource to a global LANGUAGE setting.

---
 programs/clock/Da.rc | 6 ++++--
 programs/clock/De.rc | 6 ++++--
 programs/clock/Fi.rc | 6 ++++--
 programs/clock/Hu.rc | 6 ++++--
 programs/clock/Sk.rc | 6 ++++--
 programs/clock/Wa.rc | 6 ++++--
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/programs/clock/Da.rc b/programs/clock/Da.rc
index 860f7232aed..cc3a08b743c 100644
--- a/programs/clock/Da.rc
+++ b/programs/clock/Da.rc
@@ -22,7 +22,9 @@
 
 #include "clock_res.h"
 
-MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Instillinger" {
   MENUITEM "&Analog", IDM_ANALOG
@@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Ur"
 }
diff --git a/programs/clock/De.rc b/programs/clock/De.rc
index 59a804d8be1..8368d544d87 100644
--- a/programs/clock/De.rc
+++ b/programs/clock/De.rc
@@ -21,9 +21,11 @@
 
 #include "clock_res.h"
 
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
 #pragma code_page(65001)
 
-MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+MAIN_MENU MENU
 {
  POPUP "&Einstellungen" {
   MENUITEM "Ana&log", IDM_ANALOG
@@ -43,7 +45,7 @@ MAIN_MENU MENU LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Uhr"
 }
diff --git a/programs/clock/Fi.rc b/programs/clock/Fi.rc
index fd222f47137..03228009cd4 100644
--- a/programs/clock/Fi.rc
+++ b/programs/clock/Fi.rc
@@ -21,7 +21,9 @@
 
 #include "clock_res.h"
 
-MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Ominaisuudet" {
   MENUITEM "&Analoginen", IDM_ANALOG
@@ -41,7 +43,7 @@ MAIN_MENU MENU LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Kello"
 }
diff --git a/programs/clock/Hu.rc b/programs/clock/Hu.rc
index b6cb24f4ec9..5b97146785c 100644
--- a/programs/clock/Hu.rc
+++ b/programs/clock/Hu.rc
@@ -22,7 +22,9 @@
 
 #include "clock_res.h"
 
-MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Beállítások" {
   MENUITEM "Ana&lóg", IDM_ANALOG
@@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Óra"
 }
diff --git a/programs/clock/Sk.rc b/programs/clock/Sk.rc
index 6ddfc1b6254..9f43a775903 100644
--- a/programs/clock/Sk.rc
+++ b/programs/clock/Sk.rc
@@ -22,7 +22,9 @@
 
 #include "clock_res.h"
 
-MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Vlastnosti" {
   MENUITEM "Ana&lógové", IDM_ANALOG
@@ -42,7 +44,7 @@ MAIN_MENU MENU LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Hodiny"
 }
diff --git a/programs/clock/Wa.rc b/programs/clock/Wa.rc
index 06f0acc9993..9a413c226b9 100644
--- a/programs/clock/Wa.rc
+++ b/programs/clock/Wa.rc
@@ -27,7 +27,9 @@
 
 #ifdef LANG_WALON
 
-MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+
+MAIN_MENU MENU
 {
  POPUP "&Propietés" {
   MENUITEM "&Analodjike", IDM_ANALOG
@@ -47,7 +49,7 @@ MAIN_MENU MENU LANGUAGE LANG_WALON, SUBLANG_DEFAULT
  }
 }
 
-STRINGTABLE DISCARDABLE LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+STRINGTABLE DISCARDABLE
 {
 IDS_CLOCK, "Ôrlodje"
 }