Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=遞擇芁䞊茉的盞片
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/zh-hk/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -46,6 +44,8 @@
 <!ENTITY photos.sort.revert "按拍攝日期重新排序盞片">
 <!ENTITY photos.init "將盞片拖曳至歀處即可開始。">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "或è€
+按䞀䞋 ">
+<!ENTITY photos.init.text.2 " 圚䜠的電è
+ŠäžŠå°‹æ‰Ÿç›žç‰‡ã€‚">
 <!ENTITY photos.new "該批次正圚䞊茉䜠可以開始新批次。">
 
@@ -145,5 +145,5 @@
 <!ENTITY help "提瀺和ç«
 門">
-<!ENTITY help.offline "䜠可以。">
+<!ENTITY help.offline "^^拖攟^^是䜠的奜幫手。">
 <!ENTITY help.offline.text.first "Uploadr 旚圚讓䜠可以圚離線狀æ
 ‹äž‹åŸ·è¡Œå€§éƒšåˆ†çš„盞片管理和加暙籀的工䜜。䞊茉至 Flickr 的準備工䜜做奜埌請登å
@@ -153,12 +153,8 @@
 ‹ã€‚ç™»å
 ¥åŸŒïŒŒäœ å¯ä»¥ç®¡ç†ç›žç‰‡çµ„成盞片集。">
-<!ENTITY help.drag "是䜠的奜幫手。">
+<!ENTITY help.drag "^^拖攟^^是䜠的奜幫手。">
 <!ENTITY help.drag.text "盞片䞊茉埌䜠可以將å
 ¶æŒ‰ç
 §äœ æƒ³èŠå®ƒå€‘圚盞片頁面䞊顯瀺的順序拖曳以進行排列。劂果需芁的話䜠還可以重新蚭定所做的任䜕排列方匏以䜿盞片恢埩為按拍攝日期排序。">
 <!ENTITY help.faq "劂果䜠還有å
-¶ä»–問題請蚪問我們的">
-
-<!ENTITY photos.init.text.joined "或è€
-按䞀䞋  圚䜠的電è
-ŠäžŠå°‹æ‰Ÿç›žç‰‡ã€‚">
+¶ä»–問題請蚪問我們的^^Uploadr 垞芋問題^^">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=ì—
 로드할 사진 선택
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/ko-kr/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -47,6 +45,6 @@
 <!ENTITY photos.sort.revert "쎬영 날짜 순윌로 사진 재정렬">
 <!ENTITY photos.init "사진을 여Ʞ로 끌얎서 시작하십시였.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "또는 ">
+<!ENTITY photos.init.text.2 " 을 큎늭하여 컎퓚터에서 사진을 찟습니닀.">
 <!ENTITY photos.new "ê·ž 배치륌 ì—
 로드하는 쀑에 새로욎 배치륌 시작할 수 있습니닀.">
@@ -146,14 +144,13 @@
 
 <!ENTITY help "팁곌 튾멭">
-<!ENTITY help.offline "할 수 있습니닀.">
+<!ENTITY help.offline "^^였프띌읞윌로 작ì—
+^^할 수 있습니닀.">
 <!ENTITY help.offline.text.first "Uploadr는 많은 사진 ꎀ늬 및 태귞 붙읎Ʞ륌 였프띌읞윌로 할 수 있게 되얎 있습니닀.  Flickr에 ì—
 로드할 쀀비가 되었윌멎, 계정에 로귞읞하여 컀닀란 사진 ì—
 로드 닚추륌 누륎십시였.">
 <!ENTITY help.offline.text.second "원하는 겜우 얞제든지 로귞읞할 수 있습니닀.  로귞읞하멎 사진을 섞튞로 ꎀ늬할 수 있습니닀.">
-<!ENTITY help.drag "는 펞늬한 Ʞ능ìž
+<!ENTITY help.drag "^^끌얎닀 놓Ʞ^^는 펞늬한 Ʞ능ìž
 니닀.">
 <!ENTITY help.drag.text "사진을 ì—
 로드할 때 사진 페읎지에 표시되Ꞟ 원하는 순서로 사진을 끌얎올 수 있습니닀.  또한 필요하멎 정렬 Ʞ쀀을 재섀정하여 쎬영 날짜 순윌로 사진읎 정렬되도록 되돌멮 수도 있습니닀.">
-<!ENTITY help.faq "더 궁ꞈ하신 것읎 있윌시닀멎 륌 방묞핎 볎섞요.">
-
-<!ENTITY photos.init.text.joined "또는 을 큎늭하여 컎퓚터에서 사진을 찟습니닀.">
+<!ENTITY help.faq "더 궁ꞈ하신 것읎 있윌시닀멎 ^^Uploadr FAQ^^륌 방묞핎 볎섞요.">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Selecione as fotos para upload
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/pt-br/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -42,6 +40,6 @@
 <!ENTITY photos.sort.revert "Reclassificar fotos pela data em que foram tiradas">
 <!ENTITY photos.init "Arraste as fotos aqui para começar.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "Ou clique em ">
+<!ENTITY photos.init.text.2 " para procurar fotos em seu computador.">
 <!ENTITY photos.new "Você pode iniciar um novo lote enquanto este lote está sendo enviado.">
 
@@ -116,10 +114,8 @@
 
 <!ENTITY help "Dicas e truques">
-<!ENTITY help.offline "Você pode .">
+<!ENTITY help.offline "Você pode ^^trabalhar off-line^^.">
 <!ENTITY help.offline.text.first "O Uploadr foi criado para que você possa fazer a maior parte do trabalho de organização e adição de tags em suas fotos off-line.  Quando estiver pronto para enviá-las ao Flickr, entre em sua conta e pressione o botão enorme Fazer upload de fotos.">
 <!ENTITY help.offline.text.second "Você pode ficar conectado o tempo todo, se desejar.  Você pode organizar suas fotos em álbuns depois de entrar.">
-<!ENTITY help.drag " é muito útil.">
+<!ENTITY help.drag "^^Arrastar e soltar^^ é muito útil.">
 <!ENTITY help.drag.text "Quando enviar as fotos, arraste-as na ordem em que deseja que apareçam na página de fotos.  Se for necessário, você também pode redefinir qualquer organização que tenha feito, para que as fotos voltem a ser ordenadas pela data em que foram tiradas.">
-<!ENTITY help.faq "Se houver mais alguma dúvida, por favor, visite as .">
-
-<!ENTITY photos.init.text.joined "Ou clique em  para procurar fotos em seu computador.">
+<!ENTITY help.faq "Se houver mais alguma dúvida, por favor, visite as ^^perguntas mais freqÌentes sobre o Uploadr^^.">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Seleziona le foto da caricare
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/it-it/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -42,6 +40,6 @@
 <!ENTITY photos.sort.revert "Riordina foto per data di scatto">
 <!ENTITY photos.init "Trascina le foto qui per iniziare.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "Oppure fai clic su ">
+<!ENTITY photos.init.text.2 " per trovare foto sul tuo computer.">
 <!ENTITY photos.new "Mentre il batch viene caricato, puoi iniziarne uno nuovo.">
 
@@ -116,10 +114,8 @@
 
 <!ENTITY help "Trucchi e suggerimenti">
-<!ENTITY help.offline "Puoi .">
+<!ENTITY help.offline "Puoi ^^lavorare offline^^.">
 <!ENTITY help.offline.text.first "L’Uploadr Ú studiato per consentirti di effettuare la maggior parte delle operazioni di organizzazione e di inserimento dei tag offline.  Quando sei pronto per il caricamento su Flickr, accedi al tuo account e fai clic su Inserisci una foto.">
 <!ENTITY help.offline.text.second "Puoi restare connesso in permanenza, se lo desideri.  Una volta effettuato l'accesso, puoi organizzare le tue foto in set.">
-<!ENTITY help.drag "Il  Ú tuo amico.">
+<!ENTITY help.drag "Il ^^drag-and-drop^^ Ú tuo amico.">
 <!ENTITY help.drag.text "Puoi trascinare le foto nell’ordine in cui desideri che vengano visualizzate sulla pagina delle tue foto mentre le carichi.  All’occorrenza, puoi anche annullare qualsiasi impostazione applicata in modo che le foto tornino a essere ordinate per data di scatto.">
-<!ENTITY help.faq "Se hai altri dubbi, leggi le .">
-
-<!ENTITY photos.init.text.joined "Oppure fai clic su  per trovare foto sul tuo computer.">
+<!ENTITY help.faq "Se hai altri dubbi, leggi le ^^FAQ su Uploadr^^.">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:17
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Select photos to upload
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/en-US/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:17
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -116,10 +114,8 @@
 
 <!ENTITY help "Tips and Tricks">
-<!ENTITY help.offline "You can .">
+<!ENTITY help.offline "You can ^^work offline^^.">
 <!ENTITY help.offline.text.first "The Uploadr is designed to let you do much of your photo organization and tagging offline.  Once you're ready to upload to Flickr, sign in to your account, and press the enormous Upload Photos button.">
 <!ENTITY help.offline.text.second "You can be signed in all the time, if you like.  When you're signed in, you can organize your photos into sets.">
-<!ENTITY help.drag " is your friend.">
+<!ENTITY help.drag "^^Drag and drop^^ is your friend.">
 <!ENTITY help.drag.text "You can drag photos into the order that you'd like them to appear on your photos page when they're uploaded.  If you need to, you can also reset any arrangement you make so the photos go back to being ordered by the date they were taken.">
-<!ENTITY help.faq "If you have more questions, please visit our ">
-
-<!ENTITY photos.init.text.joined "Or, click  to find photos on your computer.">
+<!ENTITY help.faq "If you have more questions, please visit our ^^Uploadr FAQ^^">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Selecciona fotos para cargar
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/es-us/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Uploadr de Flickr">
 
@@ -42,6 +40,6 @@
 <!ENTITY photos.sort.revert "Reordenar fotos por fecha en que se tomaron">
 <!ENTITY photos.init "Arrastra fotos aquí para comenzar.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "O bien, haz clic en ">
+<!ENTITY photos.init.text.2 " para buscar fotos en tu computadora.">
 <!ENTITY photos.new "Mientras ese lote se carga, puedes comenzar uno nuevo.">
 
@@ -116,10 +114,8 @@
 
 <!ENTITY help "Trucos y sugerencias">
-<!ENTITY help.offline "Puedes .">
+<!ENTITY help.offline "Puedes ^^trabajar sin conexión^^.">
 <!ENTITY help.offline.text.first "El Uploadr está diseñado para permitirte realizar gran parte de tus actividades de organización y etiquetado de fotos sin conexión.  Cuando estés listo para cargar a Flickr, inicia sesión en tu cuenta y presiona el enorme botón Cargar fotos.">
 <!ENTITY help.offline.text.second "Si lo deseas, puedes mantener la sesión abierta todo el tiempo.  Cuando hayas iniciado sesión, puedes organizar tus fotos en álbumes.">
-<!ENTITY help.drag " es tu amigo.">
+<!ENTITY help.drag "^^Arrastrar y colocar^^ es tu amigo.">
 <!ENTITY help.drag.text "Puedes arrastrar fotos en el orden que desees que aparezcan en tu página de fotos cuando estén cargadas.  Si necesitas hacerlo, también puedes restablecer la organización de modo que las fotos vuelvan a estar ordenadas por la fecha en que se tomaron.">
-<!ENTITY help.faq "Si tienes alguna duda más, visita nuestra ">
-
-<!ENTITY photos.init.text.joined "O bien, haz clic en  para buscar fotos en tu computadora.">
+<!ENTITY help.faq "Si tienes alguna duda más, visita nuestra ^^pregunta frecuente sobre Uploadr^^">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Sélectionnez les photos à importer.
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/fr-fr/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -42,6 +40,6 @@
 <!ENTITY photos.sort.revert "Retrier les photos dans l'ordre où vous les avez prises.">
 <!ENTITY photos.init "Faites glisser les photos ici pour démarrer.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "Ou cliquez sur ">
+<!ENTITY photos.init.text.2 " pour rechercher des photos sur votre ordinateur.">
 <!ENTITY photos.new "Vous pouvez lancer un nouveau lot pendant le chargement de celui-ci.">
 
@@ -116,10 +114,8 @@
 
 <!ENTITY help "Conseils et astuces">
-<!ENTITY help.offline "Vous avez la possibilité de travailler .">
+<!ENTITY help.offline "Vous avez la possibilité de travailler ^^hors ligne^^.">
 <!ENTITY help.offline.text.first "Uploadr a été conçu pour vous permettre d'organiser vous-même vos photos et d'ajouter des tags hors ligne.  Lorsque vous êtes prêt pour l'importation sur Flickr, connectez-vous à votre compte, et cliquez sur l'énorme bouton Importer les photos.">
 <!ENTITY help.offline.text.second "Vous pouvez rester connecté tout le temps si vous le souhaitez.  Lorsque vous êtes connecté, vous pouvez organiser vos photos en albums.">
-<!ENTITY help.drag " est votre allié.">
+<!ENTITY help.drag "^^Glissez-déposez^^ est votre allié.">
 <!ENTITY help.drag.text "Vous pouvez faire glisser les photos dans l'ordre dans lequel vous souhaitez les afficher sur la page photos au moment de l'importation.  Le cas échéant, vous pouvez réinitialiser vos classements pour reclasser les photos dans l'ordre où elles ont été prises.">
-<!ENTITY help.faq "Si vous avez d'autres questions, n'hésitez pas à consulter nos ">
-
-<!ENTITY photos.init.text.joined "Ou cliquez sur  pour rechercher des photos sur votre ordinateur.">
+<!ENTITY help.faq "Si vous avez d'autres questions, n'hésitez pas à consulter nos ^^FAQ Uploadr^^">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.properties
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.properties (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.properties (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.properties.txt */ ?>
 dialog.add=Fotos zum Hochladen auswÀhlen
 
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.dtd
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.dtd (revision 150)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/locale/de-de/main.dtd (revision 153)
@@ -1,4 +1,2 @@
-<?php /* Smarty version 2.6.6, created on 2007-12-06 14:07:19
-         compiled from ext_uploadr3_main.dtd.txt */ ?>
 <!ENTITY title "Flickr Uploadr">
 
@@ -14,5 +12,5 @@
 <!ENTITY menu.help "Hilfe">
 <!ENTITY menu.help.about "Infos zu Flickr Uploadr">
-<!ENTITY menu.help.tips "Tipps & Tricks">
+<!ENTITY menu.help.tips "Tipps und Tricks">
 <!ENTITY menu.help.faq "FAQ">
 <!ENTITY menu.help.update "Auf Updates prÃŒfen...">
@@ -42,6 +40,6 @@
 <!ENTITY photos.sort.revert "Fotos wieder nach Aufnahmedatum sortieren">
 <!ENTITY photos.init "Fotos hier ziehen, um loszulegen.">
-<!ENTITY photos.init.text.1 "Or, click ">
-<!ENTITY photos.init.text.2 " to find photos on your computer.">
+<!ENTITY photos.init.text.1 "Sie können auch auf ">
+<!ENTITY photos.init.text.2 " klicken, um Fotos auf Ihrem Computer zu suchen.">
 <!ENTITY photos.new "WÀhrend diese Serie hochgeladen wird, können Sie eine neue beginnen.">
 
@@ -115,11 +113,9 @@
 <!ENTITY dialog.about.code "Quellcode verfÃŒgbar unter http://flickr.com/tools/uploadr/.">
 
-<!ENTITY help "Tipps & Tricks">
-<!ENTITY help.offline "Sie können .">
-<!ENTITY help.offline.text.first "Uploadr ist so konzipiert, dass Sie das Organisieren und Tagging Ihrer Fotos zum großen Teil offline durchfÃŒhren können.  Wenn Sie bereit zum Hochladen auf Flickr sind, melden Sie sich bei Ihrem Konto an, und klicken Sie auf die SchaltflÀche "Fotos hochladen".">
+<!ENTITY help "Tipps und Tricks">
+<!ENTITY help.offline "Sie können ^^offline arbeiten^^.">
+<!ENTITY help.offline.text.first "Uploadr ist so konzipiert, dass Sie das Organisieren und Tagging Ihrer Fotos zum großen Teil offline durchfÃŒhren können.  Wenn Sie bereit zum Hochladen auf Flickr sind, melden Sie sich bei Ihrem Konto an, und klicken Sie auf die SchaltflÀche &#34;Fotos hochladen&#34;.">
 <!ENTITY help.offline.text.second "Wenn Sie möchten, können Sie die ganze Zeit angemeldet bleiben.  Wenn Sie angemeldet sind, können Sie Ihre Fotos in Serien organisieren.">
-<!ENTITY help.drag " ist einfach praktisch.">
+<!ENTITY help.drag "^^Mit der Maus ziehen und ablegen^^ ist einfach praktisch.">
 <!ENTITY help.drag.text "Sie können Fotos in die Reihenfolge ziehen, in der sie nach dem Hochladen auf Ihrer Fotoseite angezeigt werden sollen.  Sie können jede Sortierung auch wieder rÌckgÀngig machen, sodass die Fotos wieder nach Aufnahmedatum sortiert werden.">
-<!ENTITY help.faq "Wenn Sie weitere Fragen haben, besuchen Sie bitte unsere ">
-
-<!ENTITY photos.init.text.joined "Sie können auch auf  klicken, um Fotos auf Ihrem Computer zu suchen.">
+<!ENTITY help.faq "Wenn Sie weitere Fragen haben, besuchen Sie bitte unsere ^^Uploadr FAQ^^">
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest (revision 95)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest (revision 153)
@@ -12,5 +12,13 @@
 
 locale branding en-US file:locale/branding/
+
+locale uploadr de-de file:locale/de-de/
 locale uploadr en-US file:locale/en-US/
+locale uploadr es-US file:locale/es-us/
+locale uploadr fr-FR file:locale/fr-fr/
+locale uploadr it-IT file:locale/it-it/
+locale uploadr ko-KR file:locale/ko-kr/
+locale uploadr pt-BR file:locale/pt-br/
+locale uploadr zh-HK file:locale/zh-hk/
 
 skin uploadr default file:skin/uploadr/
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/skin/uploadr/main.css
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/skin/uploadr/main.css (revision 136)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/skin/uploadr/main.css (revision 153)
@@ -378,11 +378,11 @@
 }
 #photos_init h1, #photos_new h1 {
-	margin: 150px 50px 0 50px;
+	margin: 150px 50px 5px 50px;
 }
 #photos_init h2, #photos_new h2 {
-	margin: 10px 50px;
+	margin: 10px 50px 0 50px;
 }
 #photos_init hbox {
-	margin: 5px;
+	margin: 0;
 }
 #photos_init hbox box h2 {
@@ -505,5 +505,5 @@
 
 /* No meta has disabled fields and lots of grey */
-#no_meta label {
+#no_meta label, #no_meta p {
 	color: #bbb;
 }
@@ -523,5 +523,8 @@
 	vertical-align: top;
 }
-#meta label, #batch_meta label, #no_meta label {
+#meta label, #batch_meta label, #no_meta label,
+#meta p, #batch_meta p, #no_meta p {
+	margin: 4px 0 0 0;
+	padding: 0 0 0 4px;
 	display: block;
 }
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod (revision 95)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/chrome.manifest.prod (revision 153)
@@ -12,3 +12,11 @@
 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/
 skin uploadr default jar:uploadr.jar!/skin/uploadr/
Index: /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/photos.xul
===================================================================
--- /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/photos.xul (revision 149)
+++ /trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/photos.xul (revision 153)
@@ -64,4 +64,8 @@
 						<box><html:div class="button" onclick="photos.add();"
 						><html:div>&tools.add;</html:div></html:div></box>
+						<spacer flex="1" />
+					</hbox>
+					<hbox flex="1">
+						<spacer flex="1" />
 						<box><html:h2>&photos.init.text.2;</html:h2></box>
 						<spacer flex="1" />
@@ -87,14 +91,13 @@
 					<hbox>
 						<vbox class="column">
-							<label control="single_title" value="&meta.single.title;" />
+							<html:p>&meta.single.title;</html:p>
 							<textbox id="single_title" tabindex="1"
 							onfocus="keyboard.select_all_text(this);"
 							onblur="keyboard.select_all_photos();" />
-							<label control="single_description" value="&meta.single.description;" />
+							<html:p>&meta.single.description;</html:p>
 							<textbox id="single_description" multiline="true" rows="3" tabindex="2"
 							onfocus="keyboard.select_all_text(this);"
 							onblur="keyboard.select_all_photos();" />
-							<label control="single_tags" value="&meta.single.tags;"
-							tooltiptext="&meta.tags.tooltip;" />
+							<html:p title="&meta.tags.tooltip;">&meta.single.tags;</html:p>
 							<textbox id="single_tags" multiline="true" rows="2" tabindex="3"
 							onfocus="keyboard.select_all_text(this);"
@@ -103,5 +106,5 @@
 						</vbox>
 						<vbox class="column">
-							<label control="single_is_public" value="&meta.single.who;" />
+							<html:p>&meta.single.who;</html:p>
 							<radiogroup id="single_is_public" value="1" tabindex="5"
 							oncommand="meta.is_public(this.value);">
@@ -113,6 +116,6 @@
 								<radio value="1" label="&settings.privacy.public;" />
 							</radiogroup>
-							<html:p> </html:p>
-							<label control="single_hidden" value="&settings.hidden;" />
+							<html:p style="margin: 16px 0 0 0;"> </html:p>
+							<html:p>&settings.hidden;</html:p>
 							<menulist id="single_hidden" tabindex="8">
 								<menupopup>
@@ -125,5 +128,5 @@
 					<hbox>
 						<vbox class="column">
-							<label control="single_safety_level" value="&meta.safety_level;" />
+							<html:p>&meta.safety_level;</html:p>
 							<menulist id="single_safety_level" tabindex="4">
 								<menupopup>
@@ -138,5 +141,5 @@
 						</vbox>
 						<vbox class="column">
-							<label control="single_content_type" value="&meta.content_type;" />
+							<html:p>&meta.content_type;</html:p>
 							<menulist id="single_content_type" tabindex="9">
 								<menupopup>
@@ -154,5 +157,5 @@
 					<hbox id="hide_single_sets">
 						<vbox>
-							<label value="&meta.single.sets.add;" />
+							<html:p>&meta.single.sets.add;</html:p>
 							<html:ul id="single_sets_add" onclick="meta.add_to_set(event);"
 							></html:ul>
@@ -161,5 +164,5 @@
 						</vbox>
 						<vbox>
-							<label value="&meta.single.sets.added;" />
+							<html:p>&meta.single.sets.added;</html:p>
 							<html:ul id="single_sets_added" onclick="meta.remove_from_set(event);">
 								<html:li class="sets_none">&meta.sets.added.none;</html:li>
@@ -173,18 +176,16 @@
 					<hbox>
 						<vbox class="column">
-							<label control="batch_title" value="&meta.batch.title;"
-							tooltiptext="&meta.batch.title.tooltip;" />
+							<html:p title="&meta.batch.title.tooltip;">&meta.batch.title;</html:p>
 							<textbox id="batch_title" tabindex="1"
 							onfocus="keyboard.select_all_text(this);"
 							onblur="keyboard.select_all_photos();"
 							tooltiptext="&meta.batch.title.tooltip;" />
-							<label control="batch_description" value="&meta.batch.description;"
-							tooltiptext="&meta.batch.description.tooltip;" />
+							<html:p title="&meta.batch.description.tooltip;"
+							>&meta.batch.description;</html:p>
 							<textbox id="batch_description" multiline="true" rows="3" tabindex="2"
 							onfocus="keyboard.select_all_text(this);"
 							onblur="keyboard.select_all_photos();"
 							tooltiptext="&meta.batch.description.tooltip;" />
-							<label control="batch_tags" value="&meta.batch.tags;"
-							tooltiptext="&meta.tags.tooltip;" />
+							<html:p title="&meta.tags.tooltip;">&meta.batch.tags;</html:p>
 							<textbox id="batch_tags" multiline="true" rows="2" tabindex="3"
 							onfocus="keyboard.select_all_text(this);"
@@ -193,5 +194,5 @@
 						</vbox>
 						<vbox class="column">
-							<label control="batch_is_public" value="&meta.batch.who;" />
+							<html:p>&meta.batch.who;</html:p>
 							<radiogroup id="batch_is_public" value="2" tabindex="5"
 							oncommand="meta.is_public(this.value);">
@@ -204,6 +205,6 @@
 								<radio value="2" label="" style="display: none;" />
 							</radiogroup>
-							<html:p> </html:p>
-							<label control="batch_hidden" value="&settings.hidden;" />
+							<html:p style="margin: 16px 0 0 0;"> </html:p>
+							<html:p>&settings.hidden;</html:p>
 							<menulist id="batch_hidden" tabindex="8">
 								<menupopup>
@@ -217,5 +218,5 @@
 					<hbox>
 						<vbox class="column">
-							<label control="batch_safety_level" value="&meta.safety_level;" />
+							<html:p>&meta.safety_level;</html:p>
 							<menulist id="batch_safety_level" tabindex="4">
 								<menupopup>
@@ -230,5 +231,5 @@
 						</vbox>
 						<vbox class="column">
-							<label control="batch_content_type" value="&meta.content_type;" />
+							<html:p>&meta.content_type;</html:p>
 							<menulist id="batch_content_type" tabindex="9">
 								<menupopup>
@@ -246,5 +247,5 @@
 					<hbox id="hide_batch_sets">
 						<vbox>
-							<label value="&meta.batch.sets.add;" />
+							<html:p>&meta.batch.sets.add;</html:p>
 							<html:ul id="batch_sets_add" onclick="meta.add_to_set(event);"
 							></html:ul>
@@ -253,5 +254,5 @@
 						</vbox>
 						<vbox>
-							<label value="&meta.batch.sets.added;" />
+							<html:p>&meta.batch.sets.added;</html:p>
 							<html:ul id="batch_sets_added" onclick="meta.remove_from_set(event);">
 								<html:li class="sets_none">&meta.sets.added.none;</html:li>
@@ -265,13 +266,13 @@
 					<hbox>
 						<vbox class="column">
-							<label value="&meta.single.title;" />
+							<html:p>&meta.single.title;</html:p>
 							<textbox disabled="true" />
-							<label value="&meta.single.description;" />
+							<html:p>&meta.single.description;</html:p>
 							<textbox multiline="true" rows="3" disabled="true" />
-							<label value="&meta.single.tags;" />
+							<html:p>&meta.single.tags;</html:p>
 							<textbox multiline="true" rows="2" disabled="true" />
 						</vbox>
 						<vbox class="column">
-							<label value="&meta.single.who;" />
+							<html:p>&meta.single.who;</html:p>
 							<radiogroup id="no_is_public" value="2" disabled="true">
 								<radio value="0" label="&settings.privacy.private;" />
@@ -281,6 +282,6 @@
 								<radio value="2" label="" style="display: none;" />
 							</radiogroup>
-							<html:p> </html:p>
-							<label value="&settings.hidden;" />
+							<html:p style="margin: 16px 0 0 0;"> </html:p>
+							<html:p>&settings.hidden;</html:p>
 							<menulist disabled="true">
 								<menupopup />
@@ -290,5 +291,5 @@
 					<hbox>
 						<vbox class="column">
-							<label value="&meta.safety_level;" />
+							<html:p>&meta.safety_level;</html:p>
 							<menulist disabled="true">
 								<menupopup />
@@ -296,5 +297,5 @@
 						</vbox>
 						<vbox class="column">
-							<label value="&meta.content_type;" />
+							<html:p>&meta.content_type;</html:p>
 							<menulist disabled="true">
 								<menupopup />
@@ -304,5 +305,5 @@
 					<hbox id="no_meta_sets">
 						<vbox>
-							<label value="&meta.single.sets.add;" />
+							<html:p>&meta.single.sets.add;</html:p>
 							<html:ul></html:ul>
 							<box><html:div id="no_sets_create" class="disabled_button"><html:div
@@ -310,5 +311,5 @@
 						</vbox>
 						<vbox>
-							<label value="&meta.single.sets.added;" />
+							<html:p>&meta.single.sets.added;</html:p>
 							<html:ul></html:ul>
 						</vbox>