diff --git a/src/i18n/messages-de.po b/src/i18n/messages-de.po index f94ac622..3caef45b 100644 --- a/src/i18n/messages-de.po +++ b/src/i18n/messages-de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Spreed Speak Freely\n" "Report-Msgid-Bugs-To: simon@struktur.de\n" -"POT-Creation-Date: 2014-03-02 23:34+0100\n" -"PO-Revision-Date: 2014-03-03 13:23+0100\n" +"POT-Creation-Date: 2014-03-03 15:01+0100\n" +"PO-Revision-Date: 2014-03-03 15:03+0100\n" "Last-Translator: Simon Eisenmann \n" "Language-Team: de \n" "Plural-Forms: nplurals=1; plural=0\n" @@ -258,21 +258,17 @@ msgstr "Warte auf Kamera/Mikrofon Freigabe" msgid "Checking camera and microphone access." msgstr "Prüfe Zugriff auf Kamera und Mikrofon." -msgid "Select one of the users from the online list to start a video call." -msgstr "Wählen Sie einen Benutzer aus der Liste, um einen Video-Anruf zu starten." +msgid "Link:" +msgstr "Adresse:" -msgid "Hover over users in the list for more actions." -msgstr "" -"Halten Sie die Maus über die Benutzer in der Liste, um weitere Aktionen " -"anzuzeigen." +msgid "You are in this room." +msgstr "Sie befinden sich in diesem Raum." -msgid "Double click on video for fullscreen when in a call." -msgstr "Doppelklick auf ein Video für Vollbild-Modus." +msgid "Share this URL with the people you want to meet." +msgstr "Teilen Sie die Raum-Adresse mit anderen Kontakten." -msgid "Drag files into a chat window to share files with this room or person." -msgstr "" -"Ziehen Sie Dateien in ein Chat-Fenster, um Dateien mit diesem Raum oder " -"einer Person zu teilen." +msgid "You can use and re-use this room as many times as you want." +msgstr "Sie können diesen Raum so oft wieder benutzen wie Sie möchten." msgid "Create your room" msgstr "Erstellen Sie Ihren Raum" @@ -289,24 +285,14 @@ msgstr "Start" msgid "Just click start" msgstr "Klicken Sie auf Start" -msgid "Share this URL with the people you want to meet." -msgstr "Teilen Sie die Raum-Adresse mit anderen Kontakten." - -msgid "You can use and re-use this room as many times as you want." -msgstr "Sie konnen diesen Raum so oft wieder benutzen wie Sie möchten." - msgid "Please allow access to your camera and microphone." msgstr "Bitte gestatten Sie den Zugriff auf Ihre Kamera und Mikrofon." msgid "Camera / microphone access required." msgstr "Kamera / Mikrofon Zugriff wird benötigt." -msgid "" -"Please check your browser settings and allow camera and microphone access" -" for this site." -msgstr "" -"Bitte prüfen Sie Ihre Browser-Einstellungen und gestatten Sie den Zugriff" -" auf Kamera und Mikrofon für diese Seite." +msgid "Please check your browser settings and allow camera and microphone access for this site." +msgstr "Bitte prüfen Sie Ihre Browser-Einstellungen und gestatten Sie den Zugriff auf Kamera und Mikrofon für diese Seite." msgid "Skip check" msgstr "Überspringen" @@ -317,12 +303,8 @@ msgstr "Hier klicken für weitere Infos (Google Chrome)." msgid "Please set your user details and settings." msgstr "Bitte vervollständigen Sie Ihre Daten und Einstellungen." -msgid "" -"Please note that some settings require you to reload or to make a new " -"call to become effective." -msgstr "" -"Bitte beachten Sie, dass einige Einstellungen erst nach einem Reload oder" -" einem neuen Anruf aktiv werden." +msgid "Please note that some settings require you to reload or to make a new call to become effective." +msgstr "Bitte beachten Sie, dass einige Einstellungen erst nach einem Reload oder einem neuen Anruf aktiv werden." msgid "Peer to peer chat active." msgstr "Peer-to-peer Chat ist aktiv." @@ -346,9 +328,7 @@ msgid "Quit from Spreed Speak Freely?" msgstr "Spreed Speak Freely beenden?" msgid "Restart required to apply updates. Click ok to restart now." -msgstr "" -"Es stehen Updates zur Verfügung. Klicken Sie Ok um die Anwendung neu zu " -"starten." +msgstr "Es stehen Updates zur Verfügung. Klicken Sie Ok um die Anwendung neu zu starten." msgid "Failed to access camera/microphone." msgstr "Fehler beim Zugriff auf die Kamera / das Mikrofon." @@ -425,10 +405,6 @@ msgstr "Zugriff verweigert" msgid "Please provide a valid access code." msgstr "Bitte geben Sie einen gültigen Zugriffscode ein." -msgid "" -"Failed to verify access code. Check your Internet connection and try " -"again." -msgstr "" -"Der Zugriffscode konnte nicht überprueft werden. Bitte prüfen Sie Ihre " -"Internetverbindung." +msgid "Failed to verify access code. Check your Internet connection and try again." +msgstr "Der Zugriffscode konnte nicht überprueft werden. Bitte prüfen Sie Ihre Internetverbindung." diff --git a/src/i18n/messages.pot b/src/i18n/messages.pot index 0f08af32..6c5c0308 100644 --- a/src/i18n/messages.pot +++ b/src/i18n/messages.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Spreed Speak Freely 1.0\n" "Report-Msgid-Bugs-To: simon@struktur.de\n" -"POT-Creation-Date: 2014-03-02 23:34+0100\n" +"POT-Creation-Date: 2014-03-03 15:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -258,16 +258,16 @@ msgstr "" msgid "Checking camera and microphone access." msgstr "" -msgid "Select one of the users from the online list to start a video call." +msgid "Link:" msgstr "" -msgid "Hover over users in the list for more actions." +msgid "You are in this room." msgstr "" -msgid "Double click on video for fullscreen when in a call." +msgid "Share this URL with the people you want to meet." msgstr "" -msgid "Drag files into a chat window to share files with this room or person." +msgid "You can use and re-use this room as many times as you want." msgstr "" msgid "Create your room" @@ -285,12 +285,6 @@ msgstr "" msgid "Just click start" msgstr "" -msgid "Share this URL with the people you want to meet." -msgstr "" - -msgid "You can use and re-use this room as many times as you want." -msgstr "" - msgid "Please allow access to your camera and microphone." msgstr "" diff --git a/src/styles/components/_usability.scss b/src/styles/components/_usability.scss index 75cadecf..52c08f85 100644 --- a/src/styles/components/_usability.scss +++ b/src/styles/components/_usability.scss @@ -32,11 +32,8 @@ color:#aaa; padding:20px 0; color:#666; } -#help .fadetogglecontainer > div { -width:400px; -} @media only screen and (max-width: 800px) and (min-width: 400px) { - #help, #help .fadetogglecontainer > div { + #help { width:200px; } #help { diff --git a/src/styles/global/_animations.scss b/src/styles/global/_animations.scss index 9cd5dfa6..6632894d 100644 --- a/src/styles/global/_animations.scss +++ b/src/styles/global/_animations.scss @@ -20,6 +20,7 @@ */ .fadetogglecontainer > div { position:absolute; +width:100%; } .animate-show.ng-hide-add, diff --git a/static/js/services/mediastream.js b/static/js/services/mediastream.js index b63d5ecf..06c2d10f 100644 --- a/static/js/services/mediastream.js +++ b/static/js/services/mediastream.js @@ -80,7 +80,8 @@ define([ $rootScope.version = version; $rootScope.roomid = null; - $rootScope.roomstatus = false; + $rootScope.roomlink = null; + $rootScope.roomstatus = false; connector.e.on("closed error", _.bind(function(event, options) { var opts = $.extend({}, options); @@ -131,6 +132,7 @@ define([ connector.room(room); } $rootScope.roomid = room; + $rootScope.roomlink = mediaStream.url.room(room); }); $rootScope.$on("roomStatus", function(event, status) { diff --git a/static/partials/usability.html b/static/partials/usability.html index 4a4a5692..3ece16b7 100644 --- a/static/partials/usability.html +++ b/static/partials/usability.html @@ -1,13 +1,24 @@
-
+
{{_("Checking camera and microphone access.")}}
- -

{{_("Select one of the users from the online list to start a video call.")}}

-

{{_("Hover over users in the list for more actions.")}}

-

{{_("Double click on video for fullscreen when in a call.")}}

-

{{_("Drag files into a chat window to share files with this room or person.")}}

+
+

{{_("Room")}} {{roomid}}

+

{{_("Link:")}}

+

+

+ +
+

+

{{_("You are in this room.")}}

+ +
    +
  • {{_("Share this URL with the people you want to meet.")}}
    • +
  • {{_("You can use and re-use this room as many times as you want.")}}
    • +
+ +

{{_("Create your room")}}