--- a/components/visual-panels/apache/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/apache/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -39,6 +39,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/apache/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/apache/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/apache/src/cmd/applications/vp-apache.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Apache Web Server
-Comment=Share files using the Apache HTTP Server
-Exec=/usr/bin/vp apache
-Icon=/usr/share/vpanels/pixmaps/apache.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/apache/system-management-visual-panels-panel-apache-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/apache/system-management-visual-panels-panel-apache-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-apache.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/apache/client/swing/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/apache/client/swing/help/apache-vhosts-general.html
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/apache/client/swing/help/target.xml

--- a/components/visual-panels/coreadm/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/coreadm/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/coreadm/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/coreadm/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/coreadm/src/cmd/applications/vp-coreadm.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Core Files
-Comment=Configure where core files are stored
-Exec=/usr/bin/vp coreadm
-Icon=/usr/share/vpanels/pixmaps/coreadm.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-coreadm.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/coreadm/client/swing/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/coreadm/client/swing/path/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/coreadm/client/swing/help/vispanelht.html

--- a/components/visual-panels/firewall/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/firewall/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/firewall/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/firewall/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/firewall/src/cmd/applications/vp-firewall.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=System Firewall
-Comment=Configure which system services are accessible from the network
-Exec=/usr/bin/vp firewall
-Icon=/usr/share/vpanels/pixmaps/firewall.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/firewall/system-management-visual-panels-panel-firewall-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/firewall/system-management-visual-panels-panel-firewall-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-firewall.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/firewall/client/swing/help/firewall.html
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/firewall/client/swing/help/toc.xml
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/firewall/client/swing/help/map.jhm

--- a/components/visual-panels/make-rules/Makefile.env	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/make-rules/Makefile.env	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 VP_LOCALE         = $(VP_DIR)/locale
 
 PROTO_APPS        = $(ROOT)/usr/share/applications
+PROTO_APPS_PO     = $(ROOT)/usr/share/applications/po
 PROTO_AUTOSTART   = $(ROOT)/usr/share/gnome/autostart
 PROTO_BIN         = $(ROOT)/usr/bin
 PROTO_DOC         = $(ROOT)/usr/share/lib/java/javadoc
@@ -121,6 +122,9 @@
 TRUE = /usr/bin/true
 CTFMERGE = /opt/onbld/bin/$(ISA)/ctfmerge
 CTFCONVERT = /opt/onbld/bin/$(ISA)/ctfconvert
+INTLTOOL_EXTRACT = /usr/bin/intltool-extract
+INTLTOOL_UPDATE = /usr/bin/intltool-update
+INTLTOOL_MERGE = /usr/bin/intltool-merge
 
 # Set here explicitly to avoid compiling with newer class version
 JDK_HOME = /usr/jdk/instances/jdk1.6.0

--- a/components/visual-panels/make-rules/Makefile.targ	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/make-rules/Makefile.targ	Fri Jun 22 01:56:30 2012 -0400
@@ -62,6 +62,7 @@
 
 # Proto files
 $(PROTO_APPS)/% \
+	$(PROTO_APPS_PO)/% \
 	$(PROTO_AUTOSTART)/% \
 	$(PROTO_LIB)/% \
 	$(PROTO_MDB)/%: %

--- a/components/visual-panels/smf/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/smf/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/smf/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/smf/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/smf/src/cmd/applications/vp-svcs.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-[Desktop Entry]
-Name=SMF Services
-Name[ar]=الخدمات
-Name[az]=Xidmətlər
-Name[bg]=Услуги
-Name[bn]=পরিসেবা
-Name[ca]=Serveis
-Name[cs]=Služby
-Name[cy]=Gwasanaethau
-Name[da]=Tjenester
-Name[de]=Dienste
-Name[el]=Υπηρεσίες
-Name[en_CA]=Services
-Name[en_GB]=Services
-Name[es]=Servicios
-Name[et]=Teenused
-Name[eu]=Zerbitzuak
-Name[fi]=Palvelut
-Name[fr]=Services
-Name[gl]=Servizos
-Name[gu]=સેવાઓ
-Name[hi]=सेवाएँ
-Name[hr]=Servisi
-Name[hu]=Szolgáltatások
-Name[id]=Layanan
-Name[it]=Servizi
-Name[ja]=サービスの管理
-Name[ko]=서비스
-Name[lt]=Paslaugų nustatymai
-Name[mk]=Сервиси
-Name[mn]=Үйлчилгээ
-Name[ms]=Servis
-Name[nb]=Tjenester
-Name[ne]=सेवाहरु
-Name[nl]=Services
-Name[no]=Tjenester
-Name[pa]=ਸੇਵਾਵਾਂ
-Name[pl]=Usługi
-Name[pt]=Serviços
-Name[pt_BR]=Serviços
-Name[ro]=Servicii
-Name[ru]=Службы
-Name[sk]=Služby
-Name[sq]=Shërbimet
-Name[sr]=Услужни програми
-Name[sr@Latn]=Uslužni programi
-Name[sv]=Tjänster
-Name[ta]=சேவைகள்
-Name[th]=บริการระบบ
-Name[tr]=Hizmetler
-Name[uk]=Служби
-Name[vi]=Dịch vụ
-Name[wa]=Siervices
-Name[xh]=Iinkonzo
-Name[zh_CN]=服务
-Name[zh_HK]=服務
-Name[zh_TW]=服務
-Comment=Configure and maintain Services Management Facility (SMF) services
-Comment[ar]=إعداد أي الخدمات ستشغّل عند بدء النّظام
-Comment[bg]=Настройка на услугите, които ще се стартират, при стартиране на системата
-Comment[bn]=সিস্টেম আরম্ভ কালে চালনার উদ্দেশ্যে পরিসেবাগুলি কনফিগার করুন
-Comment[ca]=Configureu els serveis que s'executaran quan s'inici�sistema
-Comment[cs]=Nastavit, které služby budou spuštěny při startu systému
-Comment[cy]=Cyflunio pa wasanaethau caiff eu rhedeg pan fo'r system yn dechrau
-Comment[da]=Konfigurér hvilke tjenester der vil blive kørt når systemet starter
-Comment[de]=Festlegen, welche Dienste beim Systemstart ausgeführt werden sollen
-Comment[el]=Ρύθμιση των υπηρεσιών που θα εκτελούνται κατά την εκκίνηση του συστήματος
-Comment[en_CA]=Configure which services will be run when the system starts
-Comment[en_GB]=Configure which services will be run when the system starts
-Comment[es]=Configurar qué servicios serán ejecutados cuando el sistema se inicie
-Comment[et]=Süsteemi käivitamisel käivitatavate teenuste valimine
-Comment[eu]=Konfiguratu zein zerbitzu exekutatuko diren sistema abiatzen denean
-Comment[fi]=Määrittele mitä palveluita suoritetaan järjestelmän käynnistyessä
-Comment[fr]=Configurer les services à lancer au démarrage du système
-Comment[gl]=Configurar qué servizos serán executados cando o sistema se inicie
-Comment[gu]=જ્યારે સિસ્ટમ શરુ થાય ત્યારે કઈ સેવા ચાલુ થાય તે રુપરેખાંકિત કરો
-Comment[hi]=विन्यस्त करें कौन सेवायें चलेगी जब सिस्टम शुरू होगा
-Comment[hr]=Podesite koji uslužni programi se pokreću pri pokretanju sustava
-Comment[hu]=A rendszer indításakor futtatandó szolgáltatások beállítása
-Comment[id]=Atur layanan yang akan dijalankan saat komputer dinyalakan
-Comment[it]=Configura i servizi che verranno lanciati alla partenza del sistema
-Comment[ja]=システムの起動時に実行するサービスを設定します
-Comment[ko]=시스템이 시작할 때 실행할 서비스를 설정합니다
-Comment[lt]=Konfigūruojama paslaugos paleidžiamos startuojant sistemai
-Comment[mk]=Конфигурирај кои сервиси да бидат извршени при подигнување на системот
-Comment[ms]=Konfigurasi servis yang mana akan dilaksanakan bila sistem bermula
-Comment[nb]=Konfigurer hvilke tjenester som skal kjøres når systemet starter
-Comment[ne]=प्रणाली शुरु हुँदा कुन सेवाहरु सञ्चालन गर्ने हो कन्फिगर गर्नुहोस्
-Comment[nl]=Configureren welke services bij starten van de computer geactiveerd worden
-Comment[no]=Konfigurer hvilke tjenester som skal kjøres når systemet starter
-Comment[pa]=ਸਿਸਟਮ ਦੇ ਚਾਲੂ ਹੋਣ ਸਮੇਂ ਕਿਹੜੀ ਸੇਵਾ ਚਲਾਈ ਜਾਵੇ, ਦੀ ਸੰਰਚਨਾ ਕਰੋ
-Comment[pl]=Konfiguracja usług uruchamianych podczas rozruchu systemu
-Comment[pt]=Configurar que serviços serão executados ao iniciar o sistema
-Comment[pt_BR]=Configure quais serviços serão executados quando o sistema iniciar
-Comment[ro]=Configurarea serviciilor ce vor fi pornite la iniţializarea sistemului
-Comment[ru]=Установить какие службы будут запущенны при загрузке системы
-Comment[sk]=Nastavenie služieb, ktoré sa budú pri štarte systému spúšťať
-Comment[sq]=Konfigurimi i shërbimeve që duhen filluar kur niset sistemi
-Comment[sr]=Подесите који услужни програми се покрећу при покретању система
-Comment[sr@Latn]=Podesite koji uslužni programi se pokreću pri pokretanju sistema
-Comment[sv]=Konfigurera vilka tjänster som körs då systemet startar
-Comment[ta]=கணினி துவங்கும் போது இயக்கப்பட வேண்டிய சேவைகளை அமைக்கவும்
-Comment[th]=ตั้งค่าบริการระบบที่จะเปิดเมื่อเปิดเครื่อง
-Comment[tr]=Sistem açıldığında hangi hizmetlerin çalıştırılacağını seçin
-Comment[uk]=Визначення служб, що запускатимуться із запуском системи
-Comment[vi]=Cấu hình sẽ chạy những dịch vụ nào khi hệ thống khởi động.
-Comment[wa]=Apontyîz les siervices a-z enonder cwand l' sistinme est enondé
-Comment[xh]=Misa ukuba zeziphi na iinkonzo eziya kusebenza xa inkqubo iqalisa
-Comment[zh_CN]=配置要在系统启动时使用哪些服务
-Comment[zh_HK]=設定當系統啟動時要執行哪項服務
-Comment[zh_TW]=設定當系統啟動時要執行哪項服務
-Exec=/usr/bin/vp svcs
-Icon=/usr/share/vpanels/pixmaps/svcs.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/smf/system-management-visual-panels-panel-smf-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/smf/system-management-visual-panels-panel-smf-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-svcs.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/smf/client/swing/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/svcs/client/swing/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/svcs/client/swing/help/smf.html

--- a/components/visual-panels/sysmon/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/sysmon/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/sysmon/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/sysmon/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -34,5 +34,16 @@
 
 INSTAUTOSTART=$(AUTOSTART:%=$(PROTO_AUTOSTART)/%)
 
-install: $(INSTAPPS) $(INSTAUTOSTART)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS) $(INSTAUTOSTART)
+
+build: extract merge
 
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/sysmon/src/cmd/applications/vp-sysmon.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=System Monitor
-Comment=Monitor the System
-Exec=/usr/bin/vp sysmon
-Icon=/usr/share/vpanels/pixmaps/sysmon.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,6 +33,9 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-sysmon.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/sysmon/client/swing/resources/Resources.properties

--- a/components/visual-panels/time/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/time/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/time/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/time/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/time/src/cmd/applications/vp-time.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Time/Date
-Comment=Set time/date
-Exec=/usr/bin/vp time
-Icon=/usr/share/vpanels/pixmaps/time.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/time/system-management-visual-panels-panel-time-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/time/system-management-visual-panels-panel-time-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-time.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/time/client/swing/resources/Resources.properties
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/time/client/swing/help/app.hs
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/time/client/swing/help/timeanddate.html

--- a/components/visual-panels/usermgr/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/usermgr/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -40,6 +40,7 @@
 COMPONENT_BUILD_ENV +=		WS_JAVA=$(BUILD_DIR_32)/java
 COMPONENT_BUILD_ENV +=		JAVA_HOME=/usr/java
 COMPONENT_BUILD_ENV +=		PATH=$(dir $(CC)):/usr/bin
+COMPONENT_BUILD_ENV +=		XGETTEXT=/usr/lib/intltool/gettext-tools/xgettext
 COMPONENT_BUILD_ENV +=		MACH32=$(MACH32)
 
 COMPONENT_INSTALL_TARGETS =	install

--- a/components/visual-panels/usermgr/src/cmd/applications/Makefile	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/usermgr/src/cmd/applications/Makefile	Fri Jun 22 01:56:30 2012 -0400
@@ -30,4 +30,16 @@
 
 INSTAPPS=$(APPS:%=$(PROTO_APPS)/%)
 
-install: $(INSTAPPS)
+CLEAN_FILES=$(APPS) $(APPS).in.h
+
+install: build $(INSTAPPS)
+
+build: extract merge
+
+extract:
+	$(INTLTOOL_EXTRACT) --type=gettext/ini $(APPS).in
+
+merge: po
+	$(INTLTOOL_MERGE) ./po $(APPS).in $(APPS) -d -u
+
+po: extract

--- a/components/visual-panels/usermgr/src/cmd/applications/vp-usermgr.desktop	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=User Manager
-Comment=Manage users on this computer
-Exec=/usr/bin/vp usermgr
-Icon=/usr/share/vpanels/pixmaps/usermgr.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8

--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/build.xml~	Fri Jun 22 03:52:09 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-1;2c<?xml version="1.0"?>
-<!--
-  CDDL HEADER START
-
-  The contents of this file are subject to the terms of the
-  Common Development and Distribution License (the "License").
-  You may not use this file except in compliance with the License.
-
-  You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-  or http://www.opensolaris.org/os/licensing.
-  See the License for the specific language governing permissions
-  and limitations under the License.
-
-  When distributing Covered Code, include this CDDL HEADER in each
-  file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-  If applicable, add the following below this CDDL HEADER, with the
-  fields enclosed by brackets "[]" replaced with your own identifying
-  information: Portions Copyright [yyyy] [name of copyright owner]
-
-  CDDL HEADER END
-
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
--->
-
-<project name="vpanels-panels-usermgr" default="jar">
-	<property environment="env" />
-	<import file="${env.SRC}/ant-rules/build-panels.xml" />
-
-	<target name="install_project" depends="install_icon" />
-
-	<path id="classpath.javac">
-		<fileset refid="proj.extlibs" />
-		<path refid="classpath.panels" />
-		<pathelement location="${abs.rad.java}/rad.jar" />
-		<pathelement location="${abs.rad.java}/adr.jar" />
-	</path>
-
-	<property name="panel.panel" value="usermgr" />
-	<property name="panel.class"
-	    value="com.oracle.solaris.vp.panels.usermgr.client.swing.UserMgrPanelDescriptor" />
-	<property name="panel.name" value="User Manager" />
-	<property name="panel.icon.src"
-	    value="com/oracle/solaris/vp/panels/usermgr/client/swing/images/usermgr-32.png" />
-	<property name="panel.icon.dst" value="usermgr.png" />
-
-	<target name="generate_project" depends="panelsdef.generate_project">
-		<generate.adrimpl api="usermgr.xml" />
-        <generate.struct/>
-	</target>
-</project>

--- a/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr-message-files.p5m	Fri Jun 22 03:52:09 2012 -0700
+++ b/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr-message-files.p5m	Fri Jun 22 01:56:30 2012 -0400
@@ -33,8 +33,11 @@
 
 dir path=usr
 dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/applications/po
 dir path=usr/share/vpanels
 dir path=usr/share/vpanels/__LOCALE__
+file path=usr/share/applications/po/vp-usermgr.pot
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-createuser.html
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-moduser.html
 file path=usr/share/vpanels/__LOCALE__/com/oracle/solaris/vp/panels/usermgr/client/swing/help/usermgr-admgrp.html