social_stream 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (188) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +5 -2
  3. data/LICENSE +1 -1
  4. data/base/Rakefile +3 -17
  5. data/base/app/assets/images/flags/de.png +0 -0
  6. data/base/app/assets/images/flags/fr.png +0 -0
  7. data/base/app/assets/images/flags/hu.png +0 -0
  8. data/base/app/assets/images/flags/nl.png +0 -0
  9. data/base/app/assets/javascripts/social_stream/actor.js +34 -0
  10. data/base/app/assets/javascripts/social_stream/contact.js +40 -5
  11. data/base/app/assets/javascripts/social_stream/flash.js +6 -1
  12. data/base/app/assets/javascripts/social_stream/group.js +6 -5
  13. data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
  14. data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
  15. data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
  16. data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
  17. data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
  18. data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
  19. data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
  20. data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
  21. data/base/app/controllers/actors_controller.rb +25 -0
  22. data/base/app/controllers/contacts_controller.rb +38 -8
  23. data/base/app/controllers/groups_controller.rb +2 -21
  24. data/base/app/controllers/profiles_controller.rb +4 -0
  25. data/base/app/controllers/settings_controller.rb +12 -2
  26. data/base/app/controllers/users_controller.rb +0 -8
  27. data/base/app/helpers/contacts_helper.rb +8 -0
  28. data/base/app/models/activity.rb +19 -6
  29. data/base/app/models/actor.rb +49 -11
  30. data/base/app/models/contact.rb +12 -5
  31. data/base/app/models/group.rb +13 -11
  32. data/base/app/models/permission.rb +30 -0
  33. data/base/app/models/relation.rb +17 -7
  34. data/base/app/models/relation/custom.rb +2 -40
  35. data/base/app/models/relation/follow.rb +8 -2
  36. data/base/app/models/relation/owner.rb +10 -0
  37. data/base/app/models/relation/single.rb +7 -4
  38. data/base/app/models/site.rb +1 -1
  39. data/base/app/models/tie.rb +8 -4
  40. data/base/app/views/contacts/_add_button.html.erb +9 -0
  41. data/base/app/views/contacts/_button.html.erb +3 -3
  42. data/base/app/views/contacts/_button_multiple.html.erb +4 -0
  43. data/base/app/views/contacts/_button_simple.html.erb +17 -0
  44. data/base/app/views/contacts/_new_modal.html.erb +22 -0
  45. data/base/app/views/contacts/destroy.js.erb +5 -4
  46. data/base/app/views/contacts/update.js.erb +5 -4
  47. data/base/app/views/devise/confirmations/new.html.erb +14 -9
  48. data/base/app/views/frontpage/_presentation.html.erb +2 -2
  49. data/base/app/views/groups/_form.html.erb +20 -20
  50. data/base/app/views/groups/show.html.erb +5 -5
  51. data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
  52. data/base/app/views/layouts/_header_signed_in.erb +3 -3
  53. data/base/app/views/layouts/_logo_in.html.erb +1 -1
  54. data/base/app/views/layouts/application.html.erb +2 -0
  55. data/base/app/views/permissions/_list.html.erb +1 -1
  56. data/base/app/views/profiles/_avatar.html.erb +1 -5
  57. data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
  58. data/base/app/views/profiles/_comunication-info.html.erb +2 -36
  59. data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
  60. data/base/app/views/profiles/_edit_icon.html.erb +0 -1
  61. data/base/app/views/profiles/_experience.html.erb +1 -6
  62. data/base/app/views/profiles/_experience_edit.html.erb +5 -0
  63. data/base/app/views/profiles/_personal.html.erb +1 -39
  64. data/base/app/views/profiles/_personal_edit.html.erb +31 -0
  65. data/base/app/views/profiles/_profile_edit.html.erb +7 -0
  66. data/base/app/views/profiles/_tags.html.erb +1 -4
  67. data/base/app/views/profiles/_tags_edit.html.erb +4 -0
  68. data/base/app/views/profiles/edit.html.erb +24 -0
  69. data/base/app/views/settings/_notifications.html.erb +12 -4
  70. data/base/app/views/users/show.html.erb +5 -5
  71. data/base/config/locales/de.yml +654 -0
  72. data/base/config/locales/en.yml +20 -9
  73. data/base/config/locales/es.yml +151 -140
  74. data/base/config/locales/fr.yml +656 -0
  75. data/base/config/locales/hu.yml +653 -0
  76. data/base/config/locales/nl.yml +656 -0
  77. data/base/config/locales/pt.yml +250 -239
  78. data/base/config/locales/rails.de.yml +203 -0
  79. data/base/config/locales/rails.fr.yml +222 -0
  80. data/base/config/locales/rails.hu.yml +199 -0
  81. data/base/config/locales/rails.nl.yml +199 -0
  82. data/base/config/locales/zh.yml +214 -202
  83. data/base/config/routes.rb +22 -30
  84. data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
  85. data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
  86. data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
  87. data/base/lib/rails/social_stream.rb +2 -0
  88. data/base/lib/social_stream/base.rb +27 -7
  89. data/base/lib/social_stream/base/ability.rb +3 -5
  90. data/base/lib/social_stream/base/autoload.rb +1 -0
  91. data/base/lib/social_stream/base/version.rb +1 -1
  92. data/base/lib/social_stream/controllers/authorship.rb +18 -0
  93. data/base/lib/social_stream/controllers/helpers.rb +18 -4
  94. data/base/lib/social_stream/controllers/objects.rb +2 -8
  95. data/base/lib/social_stream/controllers/subjects.rb +9 -2
  96. data/base/lib/social_stream/models/supertype.rb +2 -0
  97. data/base/lib/social_stream/population/activity_object.rb +6 -8
  98. data/base/lib/social_stream/routing/mapper.rb +52 -0
  99. data/base/social_stream-base.gemspec +4 -7
  100. data/base/spec/controllers/groups_controller_spec.rb +19 -8
  101. data/base/spec/controllers/posts_controller_spec.rb +114 -147
  102. data/base/spec/models/post_authorization_spec.rb +190 -204
  103. data/base/spec/models/post_spec.rb +17 -63
  104. data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
  105. data/documents/Rakefile +1 -6
  106. data/documents/config/locales/de.yml +93 -0
  107. data/documents/config/locales/es.yml +2 -2
  108. data/documents/config/locales/fr.yml +93 -0
  109. data/documents/config/locales/hu.yml +93 -0
  110. data/documents/config/locales/nl.yml +93 -0
  111. data/documents/config/locales/zh.yml +4 -4
  112. data/documents/config/routes.rb +7 -9
  113. data/documents/lib/social_stream/documents/version.rb +1 -1
  114. data/documents/social_stream-documents.gemspec +4 -4
  115. data/events/Rakefile +1 -6
  116. data/events/config/locales/es.yml +3 -3
  117. data/events/config/locales/zh.yml +3 -3
  118. data/events/lib/social_stream/events/models/actor.rb +2 -1
  119. data/events/lib/social_stream/events/version.rb +1 -1
  120. data/events/social_stream-events.gemspec +1 -1
  121. data/lib/generators/social_stream/install_generator.rb +1 -0
  122. data/lib/social_stream.rb +1 -0
  123. data/lib/social_stream/version.rb +1 -1
  124. data/lib/tasks/i18n.rake +22 -2
  125. data/linkser/Rakefile +1 -6
  126. data/linkser/config/locales/de.yml +17 -0
  127. data/linkser/config/locales/es.yml +2 -2
  128. data/linkser/config/locales/fr.yml +17 -0
  129. data/linkser/config/locales/hu.yml +17 -0
  130. data/linkser/config/locales/nl.yml +17 -0
  131. data/linkser/config/locales/zh.yml +2 -2
  132. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  133. data/linkser/social_stream-linkser.gemspec +1 -1
  134. data/oauth2_server/Rakefile +1 -6
  135. data/oauth2_server/app/assets/images/step_1.png +0 -0
  136. data/oauth2_server/app/assets/images/step_2.png +0 -0
  137. data/oauth2_server/app/assets/images/step_3.png +0 -0
  138. data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
  139. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
  140. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
  141. data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
  142. data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
  143. data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
  144. data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
  145. data/oauth2_server/app/models/relation/manager.rb +1 -10
  146. data/oauth2_server/app/models/site/client.rb +4 -2
  147. data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
  148. data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
  149. data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
  150. data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
  151. data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
  152. data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
  153. data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
  154. data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
  155. data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
  156. data/oauth2_server/config/locales/en.yml +19 -0
  157. data/oauth2_server/config/locales/es.yml +23 -4
  158. data/oauth2_server/config/locales/zh.yml +32 -13
  159. data/oauth2_server/config/routes.rb +3 -1
  160. data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
  161. data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
  162. data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
  163. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  164. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  165. data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
  166. data/ostatus/Rakefile +1 -6
  167. data/ostatus/config/locales/zh.yml +8 -8
  168. data/ostatus/lib/social_stream-ostatus.rb +3 -0
  169. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  170. data/ostatus/social_stream-ostatus.gemspec +1 -1
  171. data/places/config/locales/es.yml +51 -51
  172. data/presence/config/locales/es.yml +48 -48
  173. data/presence/config/locales/zh.yml +48 -48
  174. data/presence/lib/social_stream/presence/version.rb +1 -1
  175. data/presence/social_stream-presence.gemspec +1 -1
  176. data/social_stream.gemspec +8 -7
  177. metadata +60 -29
  178. data/base/app/assets/javascripts/social_stream/follow.js +0 -28
  179. data/base/app/controllers/followers_controller.rb +0 -34
  180. data/base/app/helpers/followers_helper.rb +0 -5
  181. data/base/app/views/contacts/_link_follow.html.erb +0 -16
  182. data/base/app/views/followers/destroy.js.erb +0 -1
  183. data/base/app/views/followers/index.html.erb +0 -30
  184. data/base/app/views/followers/update.js.erb +0 -3
  185. data/base/app/views/frontpage/_characteristics.html.erb +0 -23
  186. data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
  187. data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
  188. data/base/spec/controllers/followers_controller_spec.rb +0 -37
@@ -0,0 +1,199 @@
1
+ nl:
2
+ date:
3
+ abbr_day_names:
4
+ - zon
5
+ - maa
6
+ - din
7
+ - woe
8
+ - don
9
+ - vri
10
+ - zat
11
+ abbr_month_names:
12
+ -
13
+ - jan
14
+ - feb
15
+ - mar
16
+ - apr
17
+ - mei
18
+ - jun
19
+ - jul
20
+ - aug
21
+ - sep
22
+ - okt
23
+ - nov
24
+ - dec
25
+ day_names:
26
+ - zondag
27
+ - maandag
28
+ - dinsdag
29
+ - woensdag
30
+ - donderdag
31
+ - vrijdag
32
+ - zaterdag
33
+ formats:
34
+ default: ! '%d/%m/%Y'
35
+ long: ! '%e %B %Y'
36
+ short: ! '%e %b'
37
+ month_names:
38
+ -
39
+ - januari
40
+ - februari
41
+ - maart
42
+ - april
43
+ - mei
44
+ - juni
45
+ - juli
46
+ - augustus
47
+ - september
48
+ - oktober
49
+ - november
50
+ - december
51
+ order:
52
+ - :day
53
+ - :month
54
+ - :year
55
+ datetime:
56
+ distance_in_words:
57
+ about_x_hours:
58
+ one: ongeveer een uur
59
+ other: ongeveer %{count} uur
60
+ about_x_months:
61
+ one: ongeveer een maand
62
+ other: ongeveer %{count} maanden
63
+ about_x_years:
64
+ one: ongeveer een jaar
65
+ other: ongeveer %{count} jaar
66
+ almost_x_years:
67
+ one: bijna een jaar
68
+ other: bijna %{count} jaar
69
+ half_a_minute: een halve minuut
70
+ less_than_x_minutes:
71
+ one: minder dan een minuut
72
+ other: minder dan %{count} minuten
73
+ less_than_x_seconds:
74
+ one: minder dan een seconde
75
+ other: minder dan %{count} seconden
76
+ over_x_years:
77
+ one: meer dan een jaar
78
+ other: meer dan %{count} jaar
79
+ x_days:
80
+ one: 1 dag
81
+ other: ! '%{count} dagen'
82
+ x_minutes:
83
+ one: 1 minuut
84
+ other: ! '%{count} minuten'
85
+ x_months:
86
+ one: 1 maand
87
+ other: ! '%{count} maanden'
88
+ x_seconds:
89
+ one: 1 seconde
90
+ other: ! '%{count} seconden'
91
+ prompts:
92
+ day: dag
93
+ hour: uur
94
+ minute: minuut
95
+ month: maand
96
+ second: seconde
97
+ year: jaar
98
+ errors: &errors
99
+ format: ! '%{attribute} %{message}'
100
+ messages:
101
+ accepted: moet worden geaccepteerd
102
+ blank: moet opgegeven zijn
103
+ confirmation: komt niet met de bevestiging overeen
104
+ empty: moet opgegeven zijn
105
+ equal_to: moet gelijk zijn aan %{count}
106
+ even: moet even zijn
107
+ exclusion: is niet beschikbaar
108
+ greater_than: moet groter zijn dan %{count}
109
+ greater_than_or_equal_to: moet groter dan of gelijk zijn aan %{count}
110
+ inclusion: is niet in de lijst opgenomen
111
+ invalid: is ongeldig
112
+ less_than: moet minder zijn dan %{count}
113
+ less_than_or_equal_to: moet minder dan of gelijk zijn aan %{count}
114
+ not_a_number: is geen getal
115
+ not_an_integer: moet een geheel getal zijn
116
+ odd: moet oneven zijn
117
+ record_invalid: ! 'Validatie mislukt: %{errors}'
118
+ taken: is al in gebruik
119
+ too_long: is te lang (maximaal %{count} tekens)
120
+ too_short: is te kort (minimaal %{count} tekens)
121
+ wrong_length: heeft onjuiste lengte (moet %{count} tekens lang zijn)
122
+ template:
123
+ body: ! 'Controleer de volgende velden:'
124
+ header:
125
+ one: ! '%{model} niet opgeslagen: 1 fout gevonden'
126
+ other: ! '%{model} niet opgeslagen: %{count} fouten gevonden'
127
+ helpers:
128
+ select:
129
+ prompt: Selecteer
130
+ submit:
131
+ create: ! '%{model} toevoegen'
132
+ submit: ! '%{model} opslaan'
133
+ update: ! '%{model} bewaren'
134
+ number:
135
+ currency:
136
+ format:
137
+ delimiter: .
138
+ format: ! '%u%n'
139
+ precision: 2
140
+ separator: ! ','
141
+ significant: false
142
+ strip_insignificant_zeros: false
143
+ unit: €
144
+ format:
145
+ delimiter: .
146
+ precision: 2
147
+ separator: ! ','
148
+ significant: false
149
+ strip_insignificant_zeros: false
150
+ human:
151
+ decimal_units:
152
+ format: ! '%n %u'
153
+ units:
154
+ billion: miljard
155
+ million: miljoen
156
+ quadrillion: biljard
157
+ thousand: duizend
158
+ trillion: biljoen
159
+ unit: ''
160
+ format:
161
+ delimiter: ''
162
+ precision: 3
163
+ significant: true
164
+ strip_insignificant_zeros: true
165
+ storage_units:
166
+ format: ! '%n %u'
167
+ units:
168
+ byte:
169
+ one: Byte
170
+ other: Bytes
171
+ gb: GB
172
+ kb: KB
173
+ mb: MB
174
+ tb: TB
175
+ percentage:
176
+ format:
177
+ delimiter: ''
178
+ precision:
179
+ format:
180
+ delimiter: ''
181
+ support:
182
+ array:
183
+ last_word_connector: ! ' en '
184
+ two_words_connector: ! ' en '
185
+ words_connector: ! ', '
186
+ time:
187
+ am: ! '''s ochtends'
188
+ formats:
189
+ default: ! '%a %d %b %Y %H:%M:%S %Z'
190
+ long: ! '%d %B %Y %H:%M'
191
+ short: ! '%d %b %H:%M'
192
+ pm: ! '''s middags'
193
+ # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
194
+ activemodel:
195
+ errors:
196
+ <<: *errors
197
+ activerecord:
198
+ errors:
199
+ <<: *errors
@@ -1,11 +1,6 @@
1
1
  ---
2
2
  zh:
3
3
  language_name: 中文
4
- actor:
5
- name: 姓名
6
- action:
7
- send: 送出
8
- accept: 接收
9
4
  account:
10
5
  cancel: 取消帐号
11
6
  edit: 编辑帐号
@@ -18,10 +13,15 @@ zh:
18
13
  change: 修改密码
19
14
  new: 新密码
20
15
  retype: 再次输入新密码
16
+ action:
17
+ accept: 接收
18
+ send: 送出
21
19
  activerecord:
22
20
  attributes:
23
21
  contact:
24
22
  relation_ids: 联系方式
23
+ profile:
24
+ name: Name
25
25
  relation/custom:
26
26
  name: 姓名
27
27
  user:
@@ -33,15 +33,15 @@ zh:
33
33
  activity:
34
34
  audience:
35
35
  hidden:
36
- summary: 禁止
37
36
  full: 连接分享 %{audience}
37
+ summary: 禁止
38
38
  public:
39
- summary: 公开
40
39
  full: 分享给网络
40
+ summary: 公开
41
41
  show: 展示
42
42
  visible:
43
- summary: 禁止
44
43
  full: 分享 %{audience}
44
+ summary: 禁止
45
45
  confirm_delete: 刪除活动?
46
46
  delete: 删除
47
47
  last: 次前活动
@@ -63,6 +63,8 @@ zh:
63
63
  one: '%{count} 小组group'
64
64
  other: '%{count} 多个小组groups'
65
65
  sending: 传送中
66
+ share: 分享Share
67
+ share_loading: Sharing...
66
68
  stream:
67
69
  atom_title: '%{subject}的活动流'
68
70
  title:
@@ -76,33 +78,31 @@ zh:
76
78
  unlike: 我不再喜欢了
77
79
  verb:
78
80
  follow:
79
- User:
81
+ Group:
82
+ message: '%{name} 已加您作为联络.'
80
83
  title: '%{subject} 已加 %{contact} 作为联络.'
84
+ User:
81
85
  message: '%{name} 已加您作为联系人.'
82
- Group:
83
86
  title: '%{subject} 已加 %{contact} 作为联络.'
84
- message: '%{name} 已加您作为联络.'
87
+ join:
88
+ one: '%{sender} 加入了joined the %{title} %{thing}.'
85
89
  like:
86
- User:
87
- title: '%{subject} 已成为粉丝 %{contact}.'
88
- message: '%{name} 已成为你的粉丝.'
89
90
  Group:
91
+ message: '%{name} 已成为你的粉丝.'
90
92
  title: '%{subject} 已成为粉丝 %{contact}.'
93
+ User:
91
94
  message: '%{name} 已成为你的粉丝.'
95
+ title: '%{subject} 已成为粉丝 %{contact}.'
92
96
  make-friend:
93
- User:
94
- title: '%{subject} 和 %{contact} 现已連结.'
95
- message: '%{姓名} 已加您作为联系人.'
96
97
  Group:
97
- title: '%{subject} 已加 %{contact} 联络.'
98
98
  message: '%{name} 已加您作为联系人.'
99
+ title: '%{subject} 已加 %{contact} 联络.'
100
+ User:
101
+ message: '%{姓名} 已加您作为联系人.'
102
+ title: '%{subject} 和 %{contact} 现已連结.'
99
103
  post:
100
104
  title:
101
105
  other_wall: '%{sender} → %{receiver}'
102
- join:
103
- one: '%{sender} 加入了joined the %{title} %{thing}.'
104
- share: 分享Share
105
- share_loading: Sharing...
106
106
  activity_action:
107
107
  follow: 关注
108
108
  sentence:
@@ -113,6 +113,12 @@ zh:
113
113
  one: '%{count} 一个人'
114
114
  other: '%{count} 再多些人'
115
115
  unfollow: 不再关注
116
+ actor:
117
+ name: 姓名
118
+ title:
119
+ other: Actors
120
+ ajax:
121
+ error: 远程服务器中存在错误There was an error in the remote server
116
122
  browse: 浏览
117
123
  button:
118
124
  cancel: 取消
@@ -135,87 +141,129 @@ zh:
135
141
  select:
136
142
  hint: 点击图片以便选择
137
143
  comment:
138
- input: 请填写评论...
139
144
  confirm_delete: 删除评论?
145
+ input: 请填写评论...
140
146
  name: 评论
141
147
  one: 一篇评论
148
+ other: 评论comments
142
149
  title:
143
150
  one: 评论
144
151
  other: 所有评论
145
152
  view_all: '查看所有评论 '
146
- other: 评论comments
147
153
  contact:
148
154
  all_n: 所有联系(%{count})
149
155
  confirm_delete: 刪除联系?
150
156
  current: 近期
151
157
  delete: 刪除
152
158
  edit:
153
- title: 编辑联络 %{name}
154
159
  submit: 编辑联络
160
+ title: 编辑联络 %{name}
161
+ empty: 您还没有添加任何人。You have not added anybody yet. What about <a href="%{explore}">随便看看exploring</a>怎么样?
155
162
  error_count:
156
163
  one: '一个错误导致不能保存这个联络 :'
157
164
  other: '%{count} 有一些错误导致不能保存这个联络:'
158
165
  follow: 关注
159
166
  following: 关注中
160
167
  graph:
161
- one: 图片
162
168
  empty: 对不起, 您沒有任何联系人. 您可以通过查找功能去查找可能认识的朋友!
169
+ one: 图片
163
170
  in_common:
164
171
  one: 一个共同联系人
165
172
  other: '%{count} 共同联系人'
173
+ n:
174
+ one: '%{count} 联系人contact'
175
+ other: '%{count} 多个联系人contacts'
166
176
  new:
167
- link: + 加入联络
168
- title: 加入 %{name} 到您的联系人列表
169
- menu: 加入联络
170
- submit: 加入联络
177
+ added:
178
+ other: '%{actors} successfully added as %{relations}'
171
179
  button:
172
- zero: 添加Add
173
180
  one: '%{count} 关系role'
174
181
  other: '%{count} 多个关系roles'
182
+ zero: 添加Add
183
+ link: + 加入联络
184
+ menu: 加入联络
185
+ modal:
186
+ button: Add
187
+ title: Add contacts
188
+ submit: 加入联络
189
+ title: 加入 %{name} 到您的联系人列表
175
190
  one: 联络
176
191
  other: 联系
177
192
  pending:
178
- other: 暂缓
179
193
  all: 所有
180
194
  all_n: 查看所有暂缓申请 (%{count})
195
+ other: 暂缓
196
+ received: 已收到Received
181
197
  relation:
182
- one: 联络类别
183
198
  new: 新类别
199
+ one: 联络类别
184
200
  reply:
185
201
  link: + 回复联系人
186
- title: 回复联络申请至 %{name}
187
202
  submit: 回复
203
+ title: 回复联络申请至 %{name}
204
+ saving: 保存中...Saving...
205
+ sent: 已经添加Added
188
206
  suggestion:
207
+ all: 所有
189
208
  one: 建议
190
209
  other: 建议
191
- all: 所有
192
210
  type:
193
211
  new: + 新类别
194
212
  unfollow: 不再关注
195
- empty: 您还没有添加任何人。You have not added anybody yet. What about <a href="%{explore}">随便看看exploring</a>怎么样?
196
- n:
197
- one: '%{count} 联系人contact'
198
- other: '%{count} 多个联系人contacts'
199
- received: 已收到Received
200
- saving: 保存中...Saving...
201
- sent: 已经添加Added
202
213
  view_all: 查看所有...View all...
203
214
  copyright: 2010 版权 - 版权所有
215
+ counter:
216
+ like:
217
+ one: <span class="counter">%{count}</span> 喜欢like
218
+ other: <span class="counter">%{count}</span> 喜欢likes
219
+ view:
220
+ one: <span class="counter">%{count}</span> view
221
+ other: <span class="counter">%{count}</span> views
204
222
  delete:
205
223
  confirm: 刪除 %{element}}?
206
224
  devise:
207
225
  links:
226
+ confirmation_instructions: 还没收到激活指引吗?
227
+ forgot_password: 忘了您的密码?
208
228
  sign_in: 登录
229
+ sign_in_with: 以 %{provider} 登录
209
230
  sign_up: 注册
210
- forgot_password: 忘了您的密码?
211
- confirmation_instructions: 还没收到激活指引吗?
212
231
  unlock_instructions: 还没收到解锁指引吗?
213
- sign_in_with: 以 %{provider} 登录
214
232
  passwords:
215
233
  confirm: 确认密码
216
234
  forgot: 忘了?
217
235
  instructions: '请输入你的帐号关联的邮箱, 以便我们给您发送更改指示:'
218
236
  update: 更改您的密码
237
+ dropdown:
238
+ notifications: 通知Notifications
239
+ privacy: 隐私Privacy
240
+ settings: 设置Settings
241
+ explore:
242
+ explore:
243
+ most_followed: 最多关注Most followed
244
+ most_popular: 最流行Most popular
245
+ header:
246
+ explore: 浏览Explore
247
+ participants: 参与者Participants
248
+ resources: 资源Resources
249
+ search: 搜索Search
250
+ tags: 标签Tags
251
+ timeline: 时间轴Timeline
252
+ link: 浏览Explore
253
+ or: 或者浏览or Explore
254
+ participants:
255
+ last_active: 最近上线Last active
256
+ last_registered: 最新注册Last registered
257
+ most_members: 最多成员Most members
258
+ registered_since: 从since %{time} 开始
259
+ resources:
260
+ last_uploaded: 最新上传Last uploaded
261
+ most_visited: 最多查看Most viewed
262
+ uploaded_since: 从since %{time} 开始
263
+ search:
264
+ placeholder: 寻找...looking for...
265
+ submit: 搜索Search
266
+ title: 高级搜索Advanced search
219
267
  follower:
220
268
  follower:
221
269
  title: 粉丝
@@ -226,61 +274,67 @@ zh:
226
274
  other: '%{count} 粉丝'
227
275
  forgot_password: 忘了您的密码吗?
228
276
  frontpage:
229
- stats: '%{users} 用户 %{groups} 已注册的群组'
277
+ main_title: Social Stream, a framework for building distributed social network
278
+ websites.
230
279
  presentation:
231
- modular:
232
- header: 模块Modular
233
- p: 可用的Available <a href="https://github.com/ging/social_stream#social-stream-components">Social
234
- Stream配件Social Stream components</a> 只为您提供您社交网络所需要的功能。只需添加您喜欢的Gems到您的Gemfile.provide
235
- your application only with the features you need in your social network.
236
- Just add your desired gems to your Gemfile
237
- flexible:
238
- header: 灵活灵便Flexible
239
- p: 完全地个性化定制您的社交网络Completely customize your social network <a href="https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales">更改任何一个Scial
240
- Stream组建changing any Social Stream component</a>, <a href="https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects">添加新的活动对象adding
241
- new activity objects</a> 或者使用CSS更改Sass.or changing the CSS using <a href="http://sass-lang.com/">Sass</a>
242
280
  community:
243
281
  header: 社区Community
244
282
  p: Social Stream的开发者社区正在茁壮成长。如果您有什么问题,可以在<a href="http://groups.google.com/group/social-stream">Social
245
283
  Stream's Google group</a> 或者 <a href="http://stackoverflow.com/questions/tagged/social-stream">StackOverflow</a>给我们留言。
246
284
  如果您发现有缺陷<a href="https://github.com/ging/social_stream/issues/new">提交一个问题</a>.
247
285
  随时欢迎各种请求Pull request are very welcomed!
248
- main_title: Social Stream, a framework for building distributed social network
249
- websites.
286
+ flexible:
287
+ header: 灵活灵便Flexible
288
+ p: 完全地个性化定制您的社交网络Completely customize your social network <a href="https://github.com/ging/social_stream/wiki/How-to-change-controllers%2C-models%2C-views%2C-assets-and-locales">更改任何一个Scial
289
+ Stream组建changing any Social Stream component</a>, <a href="https://github.com/ging/social_stream/wiki/How-to-add-new-activity-objects">添加新的活动对象adding
290
+ new activity objects</a> 或者使用CSS更改Sass.or changing the CSS using <a href="http://sass-lang.com/">Sass</a>
291
+ modular:
292
+ header: 模块Modular
293
+ p: 可用的Available <a href="https://github.com/ging/social_stream#social-stream-components">Social
294
+ Stream配件Social Stream components</a> 只为您提供您社交网络所需要的功能。只需添加您喜欢的Gems到您的Gemfile.provide
295
+ your application only with the features you need in your social network.
296
+ Just add your desired gems to your Gemfile
297
+ stats: '%{users} 用户 和 %{groups} 已注册的群组'
250
298
  group:
251
- one: 群组
252
- other: 群组
253
299
  all: 所有群组
254
300
  all_n: 所有群组 (%{count})
255
301
  by: 被群组
302
+ cloud: 群组标记云
256
303
  destroy:
257
- one: 删除群组
258
304
  explanation: 所有和这个群组相关的活动的资料和联系会被删除!
259
305
  go_ahead: 是, 我肯定. 删除所有東西!
260
306
  last_confirm: 这是您最后机会. 您肯定吗?
307
+ one: 删除群组
261
308
  form:
262
309
  title: 群组
263
310
  input: 这个群组叫什么名称?
264
311
  last: 最後的群组
312
+ most:
313
+ followed: 最多人关注
314
+ liked: 最受欢迎
265
315
  my: 我的群组
316
+ n:
317
+ one: '%{count} 群group'
318
+ other: '%{count} 多个群groups'
266
319
  new:
320
+ description: 描述
267
321
  link: 新群组
268
322
  name: 名称
269
- description: 描述
270
323
  participants: 参与者
271
324
  title: 新群组
272
- cloud: 群组标记云
273
- most:
274
- followed: 最多人关注
275
- liked: 最受欢迎
325
+ one: 群组
326
+ other: 群组
276
327
  tags: 标记
277
328
  title:
278
329
  one: 群组
279
330
  other: 群组们
280
- n:
281
- one: '%{count} 群group'
282
- other: '%{count} 多个群groups'
283
331
  view_all: 查看所有...View all...
332
+ header:
333
+ icon:
334
+ contacts: 联系人Contacts
335
+ home: 主页Home
336
+ messages: 消息Messages
337
+ repository: 栈UnsureRepository
284
338
  help: 帮助
285
339
  helpers:
286
340
  submit:
@@ -298,16 +352,21 @@ zh:
298
352
  join_me: 跟我一起在 %{site}!
299
353
  one: 邀请
300
354
  other: 邀请
301
- toolbar: 邀请
302
355
  success: 您的邀请已成功发送
303
356
  text: 写上您的讯息
357
+ toolbar: 邀请
358
+ lang:
359
+ browser: 自动搜查浏览器语言
360
+ none: 语言自主內容
361
+ layout:
362
+ more: 查看更多See more (%{count})
304
363
  like:
305
364
  n:
306
365
  one: 一个粉丝
307
366
  other: '%{count} 粉丝们'
308
367
  location:
309
- message: 您在此 > %{location}
310
368
  base: 您在此
369
+ message: 您在此 > %{location}
311
370
  separator: ' > '
312
371
  mailboxer:
313
372
  delete: 刪除
@@ -334,8 +393,8 @@ zh:
334
393
  send: 发送讯息
335
394
  sent: 您的讯息已发送
336
395
  menu:
337
- options: 菜單选择
338
396
  information: 个人资料
397
+ options: 菜單选择
339
398
  wall: 最新發佈
340
399
  message:
341
400
  answer: 写上答案
@@ -385,57 +444,6 @@ zh:
385
444
  whose:
386
445
  group: '%{receiver} 的'
387
446
  user: 您的
388
- post:
389
- confirm_delete: 删除近況吗?
390
- form:
391
- title: 近況
392
- input: 您有什么近況?
393
- name: 近況
394
- one: 一条近況
395
- title:
396
- one: 近況
397
- other: 近況
398
- other: 多个状态posts
399
- preposition:
400
- and: 和
401
- true: 在上
402
- profile:
403
- one: 个人背景资料
404
- age: 年齡
405
- is_on: 有效
406
- must_be_signed_id: 您必须持有有效证件
407
- group:
408
- about: 关于我们
409
- birthday: 周年
410
- experience: 经验范畴
411
- info: 群组资料
412
- tags: 群组标记
413
- user:
414
- about: 关于我
415
- birthday: 生日
416
- experience: 经验
417
- info: 个人资料
418
- tags: 标记
419
- actualcity: 上课城市
420
- address: 地址
421
- contact: 联络资料
422
- country: 国家
423
- email: 邮箱
424
- empty: 这些空格未填上. 请更新.
425
- fax: 传真
426
- mobile: 手机
427
- organization: 组织
428
- phone: 电话
429
- profile: 编辑个人背景资料
430
- tags:
431
- default: 社交, 视频,
432
- other: 标记
433
- website: 网站
434
- update:
435
- error: '请重组您的个人背景资料:'
436
- success: 您的个人背景资料已更新
437
- public:
438
- other: 大家
439
447
  permission:
440
448
  description:
441
449
  default:
@@ -444,53 +452,110 @@ zh:
444
452
  activity: 贴到您的最新发布
445
453
  follow:
446
454
  nil: 关注他们的活动
455
+ notify:
456
+ nil: 通知
447
457
  read:
448
458
  activity: 阅读您的最新发布
449
459
  represent:
450
460
  nil: 管理
451
- notify:
452
- nil: 通知
453
461
  detailed:
454
462
  create:
455
463
  activity:
456
- positive: 他们将会在您的最新发布标贴新的活动
457
464
  negative: 他们不能在您的最新发布标贴新的活动
465
+ positive: 他们将会在您的最新发布标贴新的活动
458
466
  follow:
459
467
  nil:
460
- positive: 已有联系的活动 %{relation} 将出现在您主页的最新发布上
461
468
  negative: 已有联系的活动 %{relation} 将不会出现在您主页的最新发布上
469
+ positive: 已有联系的活动 %{relation} 将出现在您主页的最新发布上
470
+ notify:
471
+ nil:
472
+ negative: 活动将不会通知 %{name} 的联系
473
+ positive: 活动将会通知 %{name} 的联系
462
474
  read:
463
475
  activity:
464
- positive: 他们能夠阅读在您的最新发布的內容, 除了那些有特別联系的分享
465
476
  negative: 他们能夠阅读在您的最新发布的內容, 除了那些被标识为公开
477
+ positive: 他们能夠阅读在您的最新发布的內容, 除了那些有特別联系的分享
466
478
  represent:
467
479
  nil:
468
- positive: 他们将更改环节及作为 %{subject}
469
480
  negative: 他们不能更改环节及作为 %{subject}
470
- notify:
471
- nil:
472
- positive: 活动将会通知 %{name} 的联系
473
- negative: 活动将不会通知 %{name} 的联系
481
+ positive: 他们将更改环节及作为 %{subject}
474
482
  of_relation:
475
483
  choose: 2. <strong>%{name}</strong>圈內的权限
476
484
  postit: 管理您联系人的权限和创建新的关系Manage the permissions of your contacts and create new
477
485
  roles
486
+ post:
487
+ confirm_delete: 删除近況吗?
488
+ form:
489
+ title: 近況
490
+ input: 您有什么近況?
491
+ name: 近況
492
+ one: 一条近況
493
+ other: 多个状态posts
494
+ title:
495
+ one: 近況
496
+ other: 近況
478
497
  privacy:
479
498
  intro: '拥有 <strong>%{relation}</strong>级别的联系只容许作出以下行为:'
480
499
  rule:
481
500
  add: 加上
482
- title: 私隐规则
483
501
  saved: 私隐规则己保存
502
+ title: 私隐规则
503
+ profile:
504
+ actualcity: 上课城市
505
+ address: 地址
506
+ age: 年齡
507
+ contact: 联络资料
508
+ country: 国家
509
+ email: 邮箱
510
+ empty: 这些空格未填上. 请更新.
511
+ fax: 传真
512
+ group:
513
+ about: 关于我们
514
+ birthday: 周年
515
+ experience: 经验范畴
516
+ info: 群组资料
517
+ tags: 群组标记
518
+ is_on: 有效
519
+ mobile: 手机
520
+ must_be_signed_id: 您必须持有有效证件
521
+ one: 个人背景资料
522
+ organization: 组织
523
+ phone: 电话
524
+ profile: 编辑个人背景资料
525
+ tags:
526
+ default: 社交, 视频,
527
+ other: 标记
528
+ update:
529
+ error: '请重组您的个人背景资料:'
530
+ success: 您的个人背景资料已更新
531
+ user:
532
+ about: 关于我
533
+ birthday: 生日
534
+ experience: 经验
535
+ info: 个人资料
536
+ tags: 标记
537
+ website: 网站
538
+ public:
539
+ other: 大家
484
540
  relation_custom:
485
541
  confirm_delete: 删除这个圈子?
486
542
  delete: 刪除
487
543
  edit: 更改名称
488
- new: + 新圈子
489
- title: 私隐和內容
490
544
  list:
491
545
  title: 关系Roles
546
+ new: + 新圈子
547
+ title: 私隐和內容
548
+ relation_owner:
549
+ name: Owner
492
550
  relation_public:
493
551
  name: 公众
552
+ repository:
553
+ filter: 过滤器filter
554
+ order:
555
+ by: 排序Order by
556
+ last_modified: 最近更新Last modified
557
+ most_popular: 最流行Most popular
558
+ title: 栈UnsureRepository
494
559
  representation:
495
560
  notice: 您的环节已更改. 现在您以%{subject}的身份行动. 请使用右上角菜单回到您的环节
496
561
  switch: 转换环节
@@ -501,10 +566,10 @@ zh:
501
566
  one: 至少填写Write at least %{count}个字符 character
502
567
  other: 至少填写Write at least %{count}个字符 characters
503
568
  global:
504
- name: 全球搜查
505
569
  first_result:
506
570
  more: 展示首回 %{count} 结果.
507
571
  one: 首回结果展示中.
572
+ name: 全球搜查
508
573
  query: 查看更多结果 %{query} >
509
574
  name: 搜索
510
575
  no_subject_found: 沒有搜索到关于 %{subject} 的结果.
@@ -525,23 +590,29 @@ zh:
525
590
  briefing: 让您注销帐号
526
591
  email_change:
527
592
  briefing: 更改您的邮箱
593
+ error: 当您保存更改时, 出现一些错误
594
+ for: 为....设定
528
595
  lang_change:
529
596
  briefing: 更改您的语言
530
597
  name: 更改您的语言
531
- error: 当您保存更改时, 出现一些错误
532
- for: 为....设定
533
598
  main: 设定
534
599
  manage:
535
- name: 行政联络
536
600
  briefing: 联系设定
537
601
  explanation: 更改联系允许
602
+ name: 行政联络
603
+ notification_settings:
604
+ prefix: Send me an email
605
+ someone_adds_me_as_a_contact: when someone adds me as a contact
606
+ someone_comments_on_my_post: when someone comments on my post
607
+ someone_confirms_my_contact_request: when someone confirms my contact request
608
+ someone_likes_my_post: when someone likes my post
538
609
  notifications:
539
610
  briefing: 关于通知行为和邮件提示的设定
540
- name: 通知
541
611
  by_email:
542
- name: 当我收到通知时发邮件给我
543
612
  always: 经常
613
+ name: 当我收到通知时发邮件给我
544
614
  never: 永不
615
+ name: 通知
545
616
  one: 设定
546
617
  password_change:
547
618
  briefing: 更改密码
@@ -572,62 +643,3 @@ zh:
572
643
  one: 用户
573
644
  other: 用户们
574
645
  welcome: 欢迎来到 %{site}!
575
- lang:
576
- browser: 自动搜查浏览器语言
577
- none: 语言自主內容
578
- ajax:
579
- error: 远程服务器中存在错误There was an error in the remote server
580
- counter:
581
- like:
582
- one: <span class="counter">%{count}</span> 喜欢like
583
- other: <span class="counter">%{count}</span> 喜欢likes
584
- view:
585
- one: <span class="counter">%{count}</span> view
586
- other: <span class="counter">%{count}</span> views
587
- dropdown:
588
- notifications: 通知Notifications
589
- privacy: 隐私Privacy
590
- settings: 设置Settings
591
- explore:
592
- explore:
593
- most_followed: 最多关注Most followed
594
- most_popular: 最流行Most popular
595
- header:
596
- explore: 浏览Explore
597
- participants: 参与者Participants
598
- resources: 资源Resources
599
- timeline: 时间轴Timeline
600
- tags: 标签Tags
601
- search: 搜索Search
602
- link: 浏览Explore
603
- or: 或者浏览or Explore
604
- participants:
605
- last_active: 最近上线Last active
606
- last_registered: 最新注册Last registered
607
- most_members: 最多成员Most members
608
- registered_since: 从since %{time} 开始
609
- resources:
610
- last_uploaded: 最新上传Last uploaded
611
- most_visited: 最多查看Most viewed
612
- uploaded_since: 从since %{time} 开始
613
- search:
614
- title: 高级搜索Advanced search
615
- placeholder: 寻找...looking for...
616
- submit: 搜索Search
617
- header:
618
- icon:
619
- contacts: 联系人Contacts
620
- home: 主页Home
621
- messages: 消息Messages
622
- repository: 栈UnsureRepository
623
- layout:
624
- more: 查看更多See more (%{count})
625
- repository:
626
- filter: 过滤器filter
627
- title: 栈UnsureRepository
628
- order:
629
- by: 排序Order by
630
- last_modified: 最近更新Last modified
631
- most_popular: 最流行Most popular
632
- relation_manager:
633
- name: Manager