Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod (revision 153)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod (revision 154)
@@ -10,13 +10,5 @@
 
 content uploadr jar:uploadr.jar!/content/uploadr/
-locale branding en-US jar:uploadr.jar!/locale/branding/
-locale uploadr en-US jar:uploadr.jar!/locale/en-US/
-locale uploadr de-de jar:uploadr.jar!/locale/de-de/
-locale uploadr en-US jar:uploadr.jar!/locale/en-US/
-locale uploadr es-US jar:uploadr.jar!/locale/es-us/
-locale uploadr fr-FR jar:uploadr.jar!/locale/fr-fr/
-locale uploadr it-IT jar:uploadr.jar!/locale/it-it/
-locale uploadr ko-KR jar:uploadr.jar!/locale/ko-kr/
-locale uploadr pt-BR jar:uploadr.jar!/locale/pt-br/
-locale uploadr zh-HK jar:uploadr.jar!/locale/zh-hk/
+locale branding INTL jar:uploadr.jar!/locale/branding/
+locale uploadr INTL jar:uploadr.jar!/locale/INTL/
 skin uploadr default jar:uploadr.jar!/skin/uploadr/
Index: /trunk/uploadr/Makefile
===================================================================
--- /trunk/uploadr/Makefile (revision 115)
+++ /trunk/uploadr/Makefile (revision 154)
@@ -14,7 +14,33 @@
 GM_VER := 1.1.10
 
+INTL := $(filter de-de en-US es-us fr-fr it-it ko-kr pt-br zh-hk, $(MAKECMDGOALS))
+
 all:
 	@echo "This target doesn't do anything!  Specify one of these:"
 	@echo "  build     Copy everything of interest to ~/Desktop/build/"
+
+de-de:
+	@echo "Building German (de-de)"
+
+en-US:
+	@echo "Building English (en-US)"
+
+es-us:
+	@echo "Building Spanish (es-us)"
+
+fr-fr:
+	@echo "Building French (fr-fr)"
+
+it-it:
+	@echo "Building Italian (it-it)"
+
+ko-kr:
+	@echo "Building Korean (ko-kr)"
+
+pt-br:
+	@echo "Building Portuguese (pt-br)"
+
+zh-hk:
+	@echo "Building Chinese (zh-hk)"
 
 build:
@@ -47,4 +73,5 @@
 
 	# Chrome
+	mkdir $(BUILD)/Resources/chrome
 	mkdir content
 	mkdir content/uploadr
@@ -53,6 +80,8 @@
 	mkdir locale/branding
 	cp $(SRC)/Resources/chrome/locale/branding/*.* locale/branding/
-	mkdir locale/en-US
-	cp $(SRC)/Resources/chrome/locale/en-US/*.* locale/en-US/
+	mkdir locale/$(INTL)
+	cp $(SRC)/Resources/chrome/locale/$(INTL)/*.* locale/$(INTL)/
+	sed 's/INTL/$(INTL)/g' $(SRC)/Resources/chrome/chrome.manifest.prod > \
+		$(BUILD)/Resources/chrome/chrome.manifest
 	mkdir skin
 #	mkdir skin/hacks
@@ -69,8 +98,5 @@
 	zip uploadr -r content locale skin
 	rm -rf content locale skin
-	mkdir $(BUILD)/Resources/chrome
-	mv uploadr.zip $(SRC)/Resources/chrome/uploadr.jar
-	cp $(SRC)/Resources/chrome/uploadr.jar $(BUILD)/Resources/chrome/
-	cp $(SRC)/Resources/chrome/chrome.manifest.prod $(BUILD)/Resources/chrome/chrome.manifest	
+	mv uploadr.zip $(BUILD)/Resources/chrome/uploadr.jar
 
 	# XPCOM