pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reordered settings profile and account blocks and updated translations for this change.

pull/107/head
Simon Eisenmann 12 years ago
parent
ced7f90e4c
commit
12e9a5da19
12 changed files with 176 additions and 167 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/i18n/messages-de.po
  2. 47
      src/i18n/messages-ja.po
  3. 47
      src/i18n/messages-ko.po
  4. 47
      src/i18n/messages-zh-cn.po
  5. 47
      src/i18n/messages-zh-tw.po
  6. 40
      src/i18n/messages.pot
  7. 55
      static/partials/settings.html
  8. 2
      static/translation/messages-de.json
  9. 2
      static/translation/messages-ja.json
  10. 2
      static/translation/messages-ko.json
  11. 2
      static/translation/messages-zh-cn.json
  12. 2
      static/translation/messages-zh-tw.json

50
src/i18n/messages-de.po
Unescape View File

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: 2014-09-02 12:13+0100\n" "PO-Revision-Date: 2014-09-04 14:39+0100\n"
"Last-Translator: Simon Eisenmann <simon@struktur.de>\n" "Last-Translator: Simon Eisenmann <simon@struktur.de>\n"
"Language-Team: struktur AG <opensource@struktur.de>\n" "Language-Team: struktur AG <opensource@struktur.de>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@ -212,27 +212,6 @@ msgstr "Bildschirm einpassen."
msgid "Profile" msgid "Profile"
msgstr "Profil" msgstr "Profil"
msgid "Your picture"
msgstr "Ihr Bild"
msgid "Your name"
msgstr "Ihr Name"
msgid "Name"
msgstr "Name"
msgid "Status message"
msgstr "Status Nachricht"
msgid "What's on your mind?"
msgstr "Was machen Sie gerade?"
msgid "Profile information is public."
msgstr "Das Profil ist öffentlich."
msgid "Account"
msgstr "Konto"
msgid "Your ID" msgid "Your ID"
msgstr "Ihre ID" msgstr "Ihre ID"
@ -258,6 +237,28 @@ msgstr "Abmelden"
msgid "Manage account" msgid "Manage account"
msgstr "Konto verwalten" msgstr "Konto verwalten"
msgid "Your picture"
msgstr "Ihr Bild"
msgid "Your name"
msgstr "Ihr Name"
msgid "Name"
msgstr "Name"
msgid "Status message"
msgstr "Status Nachricht"
msgid "What's on your mind?"
msgstr "Was machen Sie gerade?"
msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr ""
"Ihr Bild, Name und Status Nachricht repräsentiert Sie in Anrufen, Chats "
"und Räumen."
msgid "Contacts" msgid "Contacts"
msgstr "Kontakte" msgstr "Kontakte"
@ -285,6 +286,9 @@ msgstr "Hoch"
msgid "HD" msgid "HD"
msgstr "HD" msgstr "HD"
msgid "General"
msgstr "Allgemein"
msgid "Language" msgid "Language"
msgstr "Sprache" msgstr "Sprache"

47
src/i18n/messages-ja.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: 2014-04-23 22:25+0100\n" "PO-Revision-Date: 2014-04-23 22:25+0100\n"
"Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n" "Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n" "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -214,28 +214,6 @@ msgstr "画面に合わせる"
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "あなたの写真"
msgid "Your name"
msgstr "あなたの名前"
msgid "Name"
msgstr "名前"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
#, fuzzy
msgid "Profile information is public."
msgstr "さらなる情報が必要です"
msgid "Account"
msgstr ""
msgid "Your ID" msgid "Your ID"
msgstr "" msgstr ""
@ -259,6 +237,26 @@ msgstr ""
msgid "Manage account" msgid "Manage account"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "あなたの写真"
msgid "Your name"
msgstr "あなたの名前"
msgid "Name"
msgstr "名前"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr ""
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -286,6 +284,9 @@ msgstr "高い"
msgid "HD" msgid "HD"
msgstr "HD" msgstr "HD"
msgid "General"
msgstr ""
msgid "Language" msgid "Language"
msgstr "言語" msgstr "言語"

47
src/i18n/messages-ko.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: 2014-04-13 20:30+0900\n" "PO-Revision-Date: 2014-04-13 20:30+0900\n"
"Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n" "Last-Translator: Curt Frisemo <curt.frisemo@spreed.com>\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n" "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -214,28 +214,6 @@ msgstr "화면에 맟춤"
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "사용자 사진"
msgid "Your name"
msgstr "사용자 이름"
msgid "Name"
msgstr "이름"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
#, fuzzy
msgid "Profile information is public."
msgstr "더 많은 정보가 필요함"
msgid "Account"
msgstr ""
msgid "Your ID" msgid "Your ID"
msgstr "" msgstr ""
@ -259,6 +237,26 @@ msgstr ""
msgid "Manage account" msgid "Manage account"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "사용자 사진"
msgid "Your name"
msgstr "사용자 이름"
msgid "Name"
msgstr "이름"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr ""
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -286,6 +284,9 @@ msgstr "높음"
msgid "HD" msgid "HD"
msgstr "고화질" msgstr "고화질"
msgid "General"
msgstr ""
msgid "Language" msgid "Language"
msgstr "언어" msgstr "언어"

47
src/i18n/messages-zh-cn.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: 2014-05-21 09:54+0800\n" "PO-Revision-Date: 2014-05-21 09:54+0800\n"
"Last-Translator: Michael P.\n" "Last-Translator: Michael P.\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n" "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -214,28 +214,6 @@ msgstr "适合屏幕"
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "您的图片"
msgid "Your name"
msgstr "您的名字"
msgid "Name"
msgstr "名字"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
#, fuzzy
msgid "Profile information is public."
msgstr "需要更多信息"
msgid "Account"
msgstr ""
msgid "Your ID" msgid "Your ID"
msgstr "" msgstr ""
@ -259,6 +237,26 @@ msgstr ""
msgid "Manage account" msgid "Manage account"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "您的图片"
msgid "Your name"
msgstr "您的名字"
msgid "Name"
msgstr "名字"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr ""
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -286,6 +284,9 @@ msgstr "高"
msgid "HD" msgid "HD"
msgstr "高清" msgstr "高清"
msgid "General"
msgstr ""
msgid "Language" msgid "Language"
msgstr "语言" msgstr "语言"

47
src/i18n/messages-zh-tw.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: 2014-05-21 09:55+0800\n" "PO-Revision-Date: 2014-05-21 09:55+0800\n"
"Last-Translator: Michael P.\n" "Last-Translator: Michael P.\n"
"Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n" "Language-Team: Curt Frisemo <curt.frisemo@spreed.com>\n"
@ -214,28 +214,6 @@ msgstr "適合屏幕"
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "您的圖片"
msgid "Your name"
msgstr "您的名字"
msgid "Name"
msgstr "名字"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
#, fuzzy
msgid "Profile information is public."
msgstr "需要更多信息"
msgid "Account"
msgstr ""
msgid "Your ID" msgid "Your ID"
msgstr "" msgstr ""
@ -259,6 +237,26 @@ msgstr ""
msgid "Manage account" msgid "Manage account"
msgstr "" msgstr ""
msgid "Your picture"
msgstr "您的圖片"
msgid "Your name"
msgstr "您的名字"
msgid "Name"
msgstr "名字"
msgid "Status message"
msgstr ""
msgid "What's on your mind?"
msgstr ""
msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr ""
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
@ -286,6 +284,9 @@ msgstr "高"
msgid "HD" msgid "HD"
msgstr "高清" msgstr "高清"
msgid "General"
msgstr ""
msgid "Language" msgid "Language"
msgstr "語言" msgstr "語言"

40
src/i18n/messages.pot
Unescape View File

@ -9,7 +9,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Spreed WebRTC 1.0\n" "Project-Id-Version: Spreed WebRTC 1.0\n"
"Report-Msgid-Bugs-To: simon@struktur.de\n" "Report-Msgid-Bugs-To: simon@struktur.de\n"
"POT-Creation-Date: 2014-09-02 12:10+0200\n" "POT-Creation-Date: 2014-09-04 14:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -210,48 +210,47 @@ msgstr ""
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
msgid "Your picture" msgid "Your ID"
msgstr ""
msgid "Your name"
msgstr "" msgstr ""
msgid "Name" msgid "Register"
msgstr "" msgstr ""
msgid "Status message" msgid ""
"Authenticated by certificate. To log out you have to remove your "
"certificate from the browser."
msgstr "" msgstr ""
msgid "What's on your mind?" msgid "Sign in"
msgstr "" msgstr ""
msgid "Profile information is public." msgid "Create an account"
msgstr "" msgstr ""
msgid "Account" msgid "Sign out"
msgstr "" msgstr ""
msgid "Your ID" msgid "Manage account"
msgstr "" msgstr ""
msgid "Register" msgid "Your picture"
msgstr "" msgstr ""
msgid "" msgid "Your name"
"Authenticated by certificate. To log out you have to remove your "
"certificate from the browser."
msgstr "" msgstr ""
msgid "Sign in" msgid "Name"
msgstr "" msgstr ""
msgid "Create an account" msgid "Status message"
msgstr "" msgstr ""
msgid "Sign out" msgid "What's on your mind?"
msgstr "" msgstr ""
msgid "Manage account" msgid ""
"Your picture, name and status message identify yourself in calls, chats "
"and rooms."
msgstr "" msgstr ""
msgid "Contacts" msgid "Contacts"
@ -281,6 +280,9 @@ msgstr ""
msgid "HD" msgid "HD"
msgstr "" msgstr ""
msgid "General"
msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""

55
static/partials/settings.html
Unescape View File

@ -3,35 +3,9 @@
<div ng-form="settingsform" class="form-horizontal" on-enter="saveSettings(user)" on-escape="cancelSettings()" <div ng-form="settingsform" class="form-horizontal" on-enter="saveSettings(user)" on-escape="cancelSettings()"
<fieldset> <fieldset>
<settings-profile>
<legend>{{_('Profile')}}</legend>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Your picture')}}</label>
<div class="col-xs-8">
<buddy-picture-capture></buddy-picture-capture>
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Your name')}}</label>
<div class="col-xs-8">
<input type="text" class="form-control" ng-model="user.displayName" placeholder="{{_('Name')}}" />
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Status message')}}</label>
<div class="col-xs-8">
<input type="text" class="form-control" ng-model="user.message" placeholder="{{_('What\'s on your mind?')}}" />
</div>
</div>
<div class="form-group">
<div class="col-xs-8 col-xs-offset-4">
<p class="help-block">{{_('Profile information is public.')}}</p>
</div>
</div>
</settings-profile>
<settings-account ng-controller="UsersettingsController as usersettings"> <settings-account ng-controller="UsersettingsController as usersettings">
<legend>{{_('Profile')}}</legend>
<div ng-if="(withUsers && withUsersRegistration) || userid"> <div ng-if="(withUsers && withUsersRegistration) || userid">
<legend>{{_('Account')}}</legend>
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 control-label">{{_('Your ID')}}</label> <label class="col-xs-4 control-label">{{_('Your ID')}}</label>
<div ng-switch="withUsersMode"> <div ng-switch="withUsersMode">
@ -67,6 +41,31 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Your picture')}}</label>
<div class="col-xs-8">
<buddy-picture-capture></buddy-picture-capture>
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Your name')}}</label>
<div class="col-xs-8">
<input type="text" class="form-control" ng-model="user.displayName" placeholder="{{_('Name')}}" />
</div>
</div>
<div class="form-group">
<label class="col-xs-4 control-label">{{_('Status message')}}</label>
<div class="col-xs-8">
<input type="text" class="form-control" ng-model="user.message" placeholder="{{_('What\'s on your mind?')}}" />
</div>
</div>
<div class="form-group">
<div class="col-xs-8 col-xs-offset-4">
<p class="help-block">{{_('Your picture, name and status message identify yourself in calls, chats and rooms.')}}</p>
</div>
</div>
<div ng-if="(withUsers && withUsersRegistration) || userid">
<div class="form-group" ng-if="userid"> <div class="form-group" ng-if="userid">
<label class="col-xs-4 control-label">{{_('Contacts')}}</label> <label class="col-xs-4 control-label">{{_('Contacts')}}</label>
<div class="col-xs-8"> <div class="col-xs-8">
@ -103,7 +102,7 @@
</div> </div>
</settings-media> </settings-media>
<settings-settings> <settings-settings>
<legend>{{_('Settings')}}</legend> <legend>{{_('General')}}</legend>
<div class="form-group"> <div class="form-group">
<label class="col-xs-4 control-label">{{_('Language')}}</label> <label class="col-xs-4 control-label">{{_('Language')}}</label>
<div class="col-xs-8"> <div class="col-xs-8">

2
static/translation/messages-de.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-ja.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-ko.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-zh-cn.json
View File

File diff suppressed because one or more lines are too long

2
static/translation/messages-zh-tw.json
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save