BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove merge conflict

Browse Source
This commit is contained in:
KDSBrowne 2017-03-21 07:17:53 -07:00
parent 79e1d0bcbe
commit 96212a1045
4 changed files with 0 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
bigbluebutton-html5/imports/locales/de.json
View File

@ -1,67 +0,0 @@
{
"app.home.greeting": "Willkommen {name}! Ihre Präsentation startet in Kürze...",
"app.userlist.participantsTitle": "Teilnehmer",
"app.userlist.messagesTitle": "Nachrichten",
"app.userlist.presenter": "Präsentator",
"app.userlist.you": "Sie",
"app.chat.submitLabel": "Nachricht senden",
"app.chat.inputLabel": "Chat-Nachricht eingeben für {name}",
"app.chat.titlePublic": "Öffentlicher Chat",
"app.chat.titlePrivate": "Privater Chat mit {name}",
"app.chat.partnerDisconnected": "{name} hat die Konferenz verlassen",
"app.chat.moreMessages": "Weitere Nachrichten",
"app.kickMessage": "Sie wurden aus der Konferenz entfernt",
"app.whiteboard.slideControls.prevSlideLabel": "Vorherige Folie",
"app.whiteboard.slideControls.prevSlideDescrip": "Präsentation zur vorherigen Folie wechseln",
"app.whiteboard.slideControls.nextSlideLabel": "Nächste Folie",
"app.whiteboard.slideControls.nextSlideDescrip": "Präsentation zur nächsten Folie wechseln",
"app.whiteboard.slideControls.skipSlideLabel": "Folie überspringen",
"app.whiteboard.slideControls.skipSlideDescrip": "Präsentation zu bestimmter Folie wechseln",
"app.whiteboard.slideControls.fitWidthLabel": "Breite anpassen",
"app.whiteboard.slideControls.fitWidthDescrip": "Die Folie in voller Breite anzeigen",
"app.whiteboard.slideControls.fitScreenLabel": "An Bildschirm anpassen",
"app.whiteboard.slideControls.fitScreenDescrip": "Die gesamte Folie darstellen",
"app.whiteboard.slideControls.zoomLabel": "Vergrößerung",
"app.whiteboard.slideControls.zoomDescrip": "Vergrößerung der Präsentation ändern",
"app.failedMessage": "Es gibt Verbindungsprobleme mit dem Server.",
"app.connectingMessage": "Verbinde...",
"app.waitingMessage": "Verbindung unterbrochen. Versuche neu zu verbinden in {seconds} Sekunden...",
"app.navBar.settingsDropdown.optionsLabel": "Optionen",
"app.navBar.settingsDropdown.fullscreenLabel": "Als Vollbild darstellen",
"app.navBar.settingsDropdown.settingsLabel": "Einstellungen öffnen",
"app.navBar.settingsDropdown.leaveSessionLabel": "Ausloggen",
"app.navBar.settingsDropdown.fullscreenDesc": "Das Einstellungsmenü als Vollbild darstellen",
"app.navBar.settingsDropdown.settingsDesc": "Basiseinstellungen verändern",
"app.navBar.settingsDropdown.leaveSessionDesc": "Konferenz verlassen",
"app.leaveConfirmation.title": "Sitzung verlassen",
"app.leaveConfirmation.message": "Wollen Sie die Konferenz verlassen?",
"app.leaveConfirmation.confirmLabel": "Verlassen",
"app.leaveConfirmation.confirmDesc": "Hier können Sie die Konferenz verlassen",
"app.leaveConfirmation.dismissLabel": "Abbrechen",
"app.leaveConfirmation.dismissDesc": "Schließt die Bestätigung zum Verlassen der Konferenz",
"app.actionsBar.muteLabel": "Stummschalten",
"app.actionsBar.camOffLabel": "Kamera aus",
"app.actionsBar.raiseLabel": "Erhöhen",
"app.actionsBar.actionsDropdown.actionsLabel": "Aktionen",
"app.actionsBar.actionsDropdown.presentationLabel": "Eine Präsentation hochladen",
"app.actionsBar.actionsDropdown.initPollLabel": "Eine Umfrage starten",
"app.actionsBar.actionsDropdown.desktopShareLabel": "Bildschirm freigeben",
"app.actionsBar.actionsDropdown.presentationDesc": "Präsentation hochladen",
"app.actionsBar.actionsDropdown.initPollDesc": "Eine Umfrage starten",
"app.actionsBar.actionsDropdown.desktopShareDesc": "Ihren Bildschirm mit anderen teilen",
"app.actionsBar.emojiMenu.statusTriggerLabel": "Status",
"app.actionsBar.emojiMenu.awayLabel": "Abwesend",
"app.actionsBar.emojiMenu.awayDesc": "Ihren Status auf abwesend setzen",
"app.actionsBar.emojiMenu.raiseLabel": "Hand heben",
"app.actionsBar.emojiMenu.raiseDesc": "Heben Sie Ihre Hand um eine Frage zu stellen",
"app.actionsBar.emojiMenu.undecidedLabel": "Unentschlossen",
"app.actionsBar.emojiMenu.undecidedDesc": "Ihren Status auf unentschlossen setzen",
"app.actionsBar.emojiMenu.confusedLabel": "Verwirrt",
"app.actionsBar.emojiMenu.confusedDesc": "Ihren Status auf verwirrt setzen",
"app.actionsBar.emojiMenu.sadLabel": "Traurig",
"app.actionsBar.emojiMenu.sadDesc": "Ihren Status auf traurig setzen",
"app.actionsBar.emojiMenu.happyLabel": "Glücklich",
"app.actionsBar.emojiMenu.happyDesc": "Ihren Status auf glücklich setzen",
"app.actionsBar.emojiMenu.clearLabel": "Löschen",
"app.actionsBar.emojiMenu.clearDesc": "Ihren aktuellen Status zurücksetzen"
}

99
bigbluebutton-html5/imports/locales/en.json
View File

@ -1,99 +0,0 @@
{
"app.home.greeting": "Welcome {name}! Your presentation will begin shortly...",
"app.userlist.usersTitle": "Users",
"app.userlist.participantsTitle": "Participants",
"app.userlist.messagesTitle": "Messages",
"app.userlist.presenter": "Presenter",
"app.userlist.you": "You",
"app.chat.submitLabel": "Send Message",
"app.chat.inputLabel": "Message input for chat {name}",
"app.chat.inputPlaceholder": "Message {name}",
"app.chat.titlePublic": "Public Chat",
"app.chat.titlePrivate": "Private Chat with {name}",
"app.chat.partnerDisconnected": "{name} has left the meeting",
"app.chat.moreMessages": "More messages below",
"app.kickMessage": "You have been kicked out of the meeting",
"app.whiteboard.slideControls.prevSlideLabel": "Previous slide",
"app.whiteboard.slideControls.prevSlideDescrip": "Change the presentation to the previous slide",
"app.whiteboard.slideControls.nextSlideLabel": "Next slide",
"app.whiteboard.slideControls.nextSlideDescrip": "Change the presentation to the next slide",
"app.whiteboard.slideControls.skipSlideLabel": "Skip slide",
"app.whiteboard.slideControls.skipSlideDescrip": "Change the presentation to a specific slide",
"app.whiteboard.slideControls.fitWidthLabel": "Fit to width",
"app.whiteboard.slideControls.fitWidthDescrip": "Display the whole width of the slide",
"app.whiteboard.slideControls.fitScreenLabel": "Fit to screen",
"app.whiteboard.slideControls.fitScreenDescrip": "Display the whole slide",
"app.whiteboard.slideControls.zoomLabel": "Zoom",
"app.whiteboard.slideControls.zoomDescrip": "Change the zoom level of the presentation",
"app.failedMessage": "Apologies, trouble connecting to the server.",
"app.connectingMessage": "Connecting...",
"app.waitingMessage": "Disconnected. Trying to reconnect in {seconds} seconds...",
"app.navBar.settingsDropdown.optionsLabel": "Options",
"app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
"app.navBar.settingsDropdown.settingsLabel": "Open settings",
"app.navBar.settingsDropdown.aboutLabel": "About",
"app.navBar.settingsDropdown.leaveSessionLabel": "Logout",
"app.navBar.settingsDropdown.fullscreenDesc": "Make the settings menu fullscreen",
"app.navBar.settingsDropdown.settingsDesc": "Change the general settings",
"app.navBar.settingsDropdown.aboutDesc": "Show information about the client",
"app.navBar.settingsDropdown.leaveSessionDesc": "Leave the meeting",
"app.navBar.settingsDropdown.exitFullScreenLabel": "Exit fullscreen",
"app.navBar.settingsDropdown.exitFullScreenDesc": "Exit fullscreen mode",
"app.leaveConfirmation.title": "Leave Session",
"app.leaveConfirmation.message": "Do you want to leave this meeting?",
"app.leaveConfirmation.confirmLabel": "Leave",
"app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
"app.leaveConfirmation.dismissLabel": "Cancel",
"app.leaveConfirmation.dismissDesc": "Closes and rejects the leave confirmation",
"app.about.title": "About",
"app.about.version": "Client Build:",
"app.about.copyright": "Copyright:",
"app.about.confirmLabel": "OK",
"app.about.confirmDesc": "OK",
"app.about.dismissLabel": "Cancel",
"app.about.dismissDesc": "Close about client information",
"app.actionsBar.muteLabel": "Mute",
"app.actionsBar.camOffLabel": "Cam Off",
"app.actionsBar.raiseLabel": "Raise",
"app.actionsBar.actionsDropdown.actionsLabel": "Actions",
"app.actionsBar.actionsDropdown.presentationLabel": "Upload a presentation",
"app.actionsBar.actionsDropdown.initPollLabel": "Initiate a poll",
"app.actionsBar.actionsDropdown.desktopShareLabel": "Share your screen",
"app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
"app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
"app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others",
"app.actionsBar.emojiMenu.statusTriggerLabel": "Status",
"app.actionsBar.emojiMenu.awayLabel": "Away",
"app.actionsBar.emojiMenu.awayDesc": "Change your status to away",
"app.actionsBar.emojiMenu.raiseLabel": "Raise",
"app.actionsBar.emojiMenu.raiseDesc": "Raise your hand to ask a question",
"app.actionsBar.emojiMenu.undecidedLabel": "Undecided",
"app.actionsBar.emojiMenu.undecidedDesc": "Change your status to undecided",
"app.actionsBar.emojiMenu.confusedLabel": "Confused",
"app.actionsBar.emojiMenu.confusedDesc": "Change your status to confused",
"app.actionsBar.emojiMenu.sadLabel": "Sad",
"app.actionsBar.emojiMenu.sadDesc": "Change your status to sad",
"app.actionsBar.emojiMenu.happyLabel": "Happy",
"app.actionsBar.emojiMenu.happyDesc": "Change your status to happy",
"app.actionsBar.emojiMenu.clearLabel": "Clear",
"app.actionsBar.emojiMenu.clearDesc": "Clear your status",
"app.actionsBar.emojiMenu.applauseLabel": "Applaud",
"app.actionsBar.emojiMenu.applauseDesc": "Change your status to applause",
"app.actionsBar.emojiMenu.thumbsupLabel": "Thumbs up",
"app.actionsBar.emojiMenu.thumbsupDesc": "Change your status to thumbs up",
"app.actionsBar.emojiMenu.thumbsdownLabel": "Thumbs down",
"app.actionsBar.emojiMenu.thumbsdownDesc": "Change your status to thumbs down",
"app.audioNotification.audioFailedMessage": "Your audio connection failed to connect. Try again.",
"app.audioNotification.mediaFailedMessage": "getUserMicMedia failed, Only secure origins are allowed",
"app.breakoutJoinConfirmation.title": "Join Breakout Room",
"app.breakoutJoinConfirmation.message": "Do you want to join",
"app.breakoutJoinConfirmation.confirmLabel": "Join",
"app.breakoutJoinConfirmation.confirmDesc": "Join you to the Breakout Room",
"app.breakoutJoinConfirmation.dismissLabel": "Cancel",
"app.breakoutJoinConfirmation.dismissDesc": "Closes and rejects Joining the Breakout Room",
"app.breakoutTimeRemainingMessage": "Breakout Room time remaining: {time}",
"app.breakoutWillCloseMessage": "Time ended. Breakout Room will close soon",
"app.calculatingBreakoutTimeRemaining": "Calculating remaining time...",
"app.audioModal.microphoneLabel": "Microphone",
"app.audioModal.listenOnlyLabel": "Listen Only"
}

10
bigbluebutton-html5/imports/locales/index.js
View File

@ -1,10 +0,0 @@
import en from './en.json';
import de from './de.json';
import ptBR from './pt-BR.json';
export default {
en: en,
'en-US': en,
de: de,
'pt-BR': ptBR,
};

17
bigbluebutton-html5/imports/locales/pt-BR.json
View File

@ -1,17 +0,0 @@
{
"app.home.greeting": "Bem-vindo {name}! Sua aprensentação começará em breve...",
"app.userlist.participantsTitle": "Participantes",
"app.userlist.messagesTitle": "Mensagens",
"app.userlist.presenter": "Apresentador",
"app.userlist.you": "Você",
"app.chat.submitLabel": "Enviar Mensagem",
"app.chat.inputLabel": "Campo de mensagem para conversa {name}",
"app.chat.titlePublic": "Conversa Publíca",
"app.chat.titlePrivate": "Conversa Privada com {name}",
"app.chat.partnerDisconnected": "{name} saiu da sala",
"app.chat.moreMessages": "Mais mensagens abaixo",
"app.kickMessage": "Você foi expulso da apresentação",
"app.failedMessage": "Desculpas, estamos com problemas para se conectar ao servidor.",
"app.connectingMessage": "Conectando...",
"app.waitingMessage": "Desconectado. Tentando reconectar em {seconds} segundos..."
}