From c060020cdbc012985bca295dbb233e010bf87aff Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 19 Aug 2012 21:08:04 +0200
Subject: [PATCH] Added German translation for Flickr upload and a minor layout
 tweak for English version

---
 .../xui/de/exo_panel_flickr_settings.xml      | 30 +++++++++++++
 .../xui/de/exo_panel_snapshot_flickr.xml      | 44 +++++++++++++++++++
 .../skins/default/xui/de/floater_snapshot.xml | 12 ++++-
 .../skins/default/xui/de/notifications.xml    | 36 +++++++++++++++
 .../default/xui/de/panel_snapshot_options.xml |  1 +
 .../xui/en/exo_panel_flickr_settings.xml      |  4 +-
 6 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/exo_panel_flickr_settings.xml
 create mode 100644 indra/newview/skins/default/xui/de/exo_panel_snapshot_flickr.xml

diff --git a/indra/newview/skins/default/xui/de/exo_panel_flickr_settings.xml b/indra/newview/skins/default/xui/de/exo_panel_flickr_settings.xml
new file mode 100644
index 0000000000..49bbbb3b71
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/exo_panel_flickr_settings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_flickr_settings">
+	<combo_box label="Auflösung" name="flickr_size_combo">
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
+		<combo_box.item label="320x240" name="320x240"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
+		<combo_box.item label="1280x1024" name="1280x1024"/>
+		<combo_box.item label="1600x1200" name="1600x1200"/>
+		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
+	</combo_box>
+	<layout_stack name="flickr_image_params_ls">
+		<layout_panel name="flickr_image_size_lp">
+			<spinner label="Breite" name="flickr_snapshot_width"/>
+			<spinner label="Höhe" name="flickr_snapshot_height"/>
+			<check_box label="Seitenverhältnis beibehalten" name="flickr_keep_aspect_check"/>
+		</layout_panel>
+		<layout_panel name="flickr_image_format_quality_lp">
+			<combo_box label="Format" name="flickr_format_combo">
+				<combo_box.item label="PNG (verlustfrei)" name="PNG"/>
+				<combo_box.item label="JPEG" name="JPEG"/>
+			</combo_box>
+			<slider label="Bildqualität" name="image_quality_slider" label_width="65" width="165"/>
+			<text name="image_quality_level">
+				([QLVL])
+			</text>
+		</layout_panel>
+	</layout_stack>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/de/exo_panel_snapshot_flickr.xml b/indra/newview/skins/default/xui/de/exo_panel_snapshot_flickr.xml
new file mode 100644
index 0000000000..8d4ef2662f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/exo_panel_snapshot_flickr.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_snapshot_flickr">
+	<string name="upload_message">
+		Hochladen...
+	</string>
+	<!-- <FS:TS> Removing extraneous icon and text, since we use a tab bar -->
+	<!--
+	<text name="title">
+		Flickr
+	</text>
+    <button label="Metadaten" name="metadata_btn"/>
+	<button label="Einstellungen" name="settings_btn"/>
+	-->
+	<tab_container name="flickr_panel_container">
+		<panel label="Metadaten" name="panel_flickr_metadata">
+			<text name="title_label">
+				Titel:
+			</text>
+			<text name="tags_label">
+				Tags:
+			</text>
+			<text name="rating_label">
+				Einstuf.:
+			</text>
+			<icons_combo_box label="Moderat" name="rating_combo">
+				<icons_combo_box.item label="Generell" name="Safe"/>
+				<icons_combo_box.item label="Moderat" name="Moderate"/>
+				<icons_combo_box.item label="Adult" name="Restricted"/>
+			</icons_combo_box>
+			<check_box name="location_check" label="Ort hinzuf."/>
+			<!-- bottom_delta="23" -->
+			<text name="description_label">
+				Beschreibung (optional):
+			</text>
+			<!-- <FS:TS> We don't use a cancel button on any other panel. -->
+			<!--
+			<button label="Abbrechen" name="cancel_btn"/>
+			-->
+			<!-- </FS:TS> -->
+			<button label="Hochladen" name="upload_btn"/>
+		</panel>
+		<panel label="Einstellungen" name="exo_panel_flickr_settings"/>
+    </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index d6e4a0d1bc..ba7e24ec64 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -9,6 +9,9 @@
 	<string name="profile_progress_str">
 		Posten
 	</string>
+	<string name="flickr_progress_str">
+        Hochladen auf Flickr
+	</string>
 	<string name="inventory_progress_str">
 		Speichern im Inventar
 	</string>
@@ -18,6 +21,9 @@
 	<string name="profile_succeeded_str">
 		Bild hochgeladen
 	</string>
+	<string name="flickr_succeeded_str">
+		Bild auf Flickr hochgeladen
+	</string>
 	<string name="postcard_succeeded_str">
 		E-Mail gesendet!
 	</string>
@@ -39,6 +45,9 @@
 	<string name="local_failed_str">
 		Fehler beim Speichern auf dem Computer.
 	</string>
+	<string name="flickr_failed_str">
+		Hochladen auf Flickr fehlgeschlagen.
+	</string>
 	<button name="advanced_options_btn" tool_tip="Erweiterte Optionen"/>
 	<text name="image_res_text">
 		[WIDTH] x [HEIGHT] px
@@ -50,7 +59,8 @@
 		<panel label="Profil" name="panel_snapshot_profile"/>
 		<panel label="E-Mail" name="panel_snapshot_postcard"/>
 		<panel label="Inventar" name="panel_snapshot_inventory"/>
-		<panel label="Festplatte" name="panel_snapshot_local"/>
+		<panel label="Lokal" name="panel_snapshot_local"/>
+		<panel label="Flickr" name="panel_snapshot_flickr"/>
     </tab_container>
 	<panel name="advanced_options_panel">
 		<text name="advanced_options_label">
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index c0a0ee7783..d088fade08 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -3655,4 +3655,40 @@ Soll [REMOVE_GRID] wirklich aus der Grid-Liste entfernt werden?
 		<usetemplate name="okcancelignore" ignoretext="Warnung beim Versuch, ein verbundenes Grid zu entfernen." notext="Abbrechen" yestext="OK"/>
 	</notification>
 <!-- </FS:AW  grid management-->
+
+  <!-- <FS:TS> FIRE-5453: Flickr upload support (from Exodus) -->
+  <notification name="ExodusFlickrVerificationExplanation">
+Um die Flickr-Uploadfunktion nutzen zu können, muss [APP_NAME] Zugriff auf deinen Account gewährt werden. Beim Fortfahren wird die Flickr-Website im Webbrowser geöffnet, wo du dich einloggen und den Zugriff durch [APP_NAME] autorisieren musst. Der daraufhin angezeigte Code muss in [APP_NAME] eingetragen werden.
+
+Soll [APP_NAME] autorisiert werden, Fotos unter deinem Flickr-Konto zu posten?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Nein"
+     yestext="Ja"/>
+  </notification>
+
+  <notification name="ExodusFlickrVerificationPrompt">
+Bitte den Flickr-Zugriff im Webbrowser autorisieren und den angezeigen Code eingeben:
+    <form name="form">
+      <button
+       name="OK"
+       text="OK"/>
+      <button
+       name="Cancel"
+       text="Abbrechen"/>
+    </form>
+  </notification>
+
+  <notification name="ExodusFlickrVerificationFailed">
+Flickr-Verifikation fehlgeschlagen. Bitte erneut versuchen sowie den eingegebenen Code überprüfen.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification name="ExodusFlickrUploadComplete">
+Das Foto kann jetzt [http://www.flickr.com/photos/upload/edit/?ids=[ID] hier] betrachtet werden.
+  </notification>
+  <!-- </FS:TS> FIRE-5453 -->
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
index e1d8a5dc6d..831b330dca 100644
--- a/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_options.xml
@@ -4,4 +4,5 @@
 	<button label="E-Mail" name="save_to_email_btn"/>
 	<button label="In meinem Inventar speichern ([AMOUNT] L$)" name="save_to_inventory_btn"/>
 	<button label="Auf meinem Computer speichern" name="save_to_computer_btn"/>
+	<button label="Auf Flickr hochladen" name="save_to_flickr_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/exo_panel_flickr_settings.xml b/indra/newview/skins/default/xui/en/exo_panel_flickr_settings.xml
index 8022ce44e5..1fe4318e43 100644
--- a/indra/newview/skins/default/xui/en/exo_panel_flickr_settings.xml
+++ b/indra/newview/skins/default/xui/en/exo_panel_flickr_settings.xml
@@ -143,7 +143,7 @@
              label="Image quality"
              label_width="80"
              layout="topleft"
-             left="10"
+             left="0"
              max_val="100"
              name="image_quality_slider"
              top_pad="7"
@@ -159,7 +159,7 @@
              halign="left"
              name="image_quality_level"
              top_delta="0"
-             width="60">
+             width="80">
                ([QLVL])
             </text>
         </layout_panel>