diff --git a/.rubocop.yml b/.rubocop.yml
index 36e1043e33c9585841a69b5a83290c74d0f45c10..2ebb26cfff391479893f3540937a9f583acac201 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -164,16 +164,6 @@ Lint/Debugger:
Style/NumericPredicate:
EnforcedStyle: comparison
-# Old defaults from rubocop < 0.48.1
-Style/PercentLiteralDelimiters:
- PreferredDelimiters:
- default: '()'
- '%i': '()'
- '%I': '()'
- '%r': '{}'
- '%w': '()'
- '%W': '()'
-
# Reset some HoundCI changes back to Rubocop defaults
Style/DotPosition:
EnforcedStyle: leading
diff --git a/Changelog.md b/Changelog.md
index af4994a014e3f7cad23bb7bcda2df61b0bcc5083..dad01e1dd3fc52cc6308a509a0eb32b45f55223c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+# 0.6.7.0
+
+## Refactor
+* Cleanup some translations [#7465](https://github.com/diaspora/diaspora/pull/7465)
+
+## Features
+* Change email without confirmation when mail is disabled [#7455](https://github.com/diaspora/diaspora/pull/7455)
+* Warn users if they leave the profile editing page with unsaved changes [#7473](https://github.com/diaspora/diaspora/pull/7473)
+* Add admin pages to the mobile interface [#7295](https://github.com/diaspora/diaspora/pull/7295)
+* Add links to discourse to footer and sidebar [#7446](https://github.com/diaspora/diaspora/pull/7446)
+
# 0.6.6.0
## Refactor
@@ -12,7 +23,6 @@
* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
## Features
-
* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)
# 0.6.5.0
diff --git a/Gemfile b/Gemfile
index 2dbce35e2c4e21ba4e9bb76fa1c341fcf79c6450..a8e4f3e5bf52d1d0960497c0699cacdb948b7f02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,6 +112,7 @@ source "https://rails-assets.org" do
gem "rails-assets-autosize", "3.0.20"
gem "rails-assets-blueimp-gallery", "2.25.0"
+ gem "rails-assets-jquery.are-you-sure", "1.9.0"
gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.16"
diff --git a/Gemfile.lock b/Gemfile.lock
index 499e6582cfa0c501fbb759f44006bc51ed40d8ec..2012458cb8f55e1f9547b6c6c7a6439d0d8133f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -529,6 +529,8 @@ GEM
rails-assets-jquery (>= 1.6)
rails-assets-jquery-textchange (0.2.3)
rails-assets-jquery
+ rails-assets-jquery.are-you-sure (1.9.0)
+ rails-assets-jquery (>= 1.4.2)
rails-assets-jquery.slimscroll (1.3.8)
rails-assets-jquery.ui (1.11.4)
rails-assets-jquery (>= 1.6)
@@ -847,6 +849,7 @@ DEPENDENCIES
rails-assets-jquery (= 2.2.4)!
rails-assets-jquery-placeholder (= 2.3.1)!
rails-assets-jquery-textchange (= 0.2.3)!
+ rails-assets-jquery.are-you-sure (= 1.9.0)!
rails-assets-markdown-it (= 8.3.0)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
rails-assets-markdown-it-diaspora-mention (= 1.1.1)!
diff --git a/app/assets/javascripts/app/pages/settings.js b/app/assets/javascripts/app/pages/settings.js
index 3bbfaeb6ae7936e64e924660f3b05a82eb5aa7eb..d342260167a4bf6e7d4dddf56fd415cd491d8836 100644
--- a/app/assets/javascripts/app/pages/settings.js
+++ b/app/assets/javascripts/app/pages/settings.js
@@ -14,6 +14,7 @@ app.pages.Settings = Backbone.View.extend({
el: $(".aspect_dropdown"),
form: $("#post-default-aspects")
});
+ $("#update_profile_form").areYouSure();
}
});
// @license-end
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index c754c56862dcfc0a19730f63e64788449225c442..dccddf0149b227763fb0092a4c897eae5ca8df7c 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -41,5 +41,6 @@
//= require blueimp-gallery/blueimp-gallery-indicator
//= require leaflet
//= require api/authorization_page
-// = require bootstrap-markdown/bootstrap-markdown
-// = require helpers/markdown_editor
+//= require bootstrap-markdown/bootstrap-markdown
+//= require helpers/markdown_editor
+//= require jquery.are-you-sure
diff --git a/app/assets/javascripts/mobile/mobile_drawer.js b/app/assets/javascripts/mobile/mobile_drawer.js
index 7a96a37d45515c15171d25756f6b6abb588e53cc..f20cb5bf314223bdfe6192ebcf574c9672bfa25d 100644
--- a/app/assets/javascripts/mobile/mobile_drawer.js
+++ b/app/assets/javascripts/mobile/mobile_drawer.js
@@ -1,17 +1,11 @@
-(function(){
+(function() {
Diaspora.Mobile.Drawer = {
- initialize: function(){
- $("#all_aspects").bind("tap click", function(evt){
- evt.preventDefault();
- $(this).find("+ li").toggleClass("hide");
- });
-
- $("#menu-badge").bind("tap click", function(evt){
+ initialize: function() {
+ $("#menu-badge").bind("tap click", function(evt) {
evt.preventDefault();
$("#app").toggleClass("draw");
});
-
- $("#followed_tags").bind("tap click", function(evt){
+ $("#all_aspects, #followed_tags, #admin").bind("tap click", function(evt) {
evt.preventDefault();
$(this).find("+ li").toggleClass("hide");
});
diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index ea933e6e63d518ffd8dcb20a4bca4dafb4982016..078edf674db17aafb4a6c30fac119e473124101a 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -2,9 +2,9 @@
@import 'bootstrap-variables';
@import 'animations';
-/** ADMIN STYlES **/
-/** user search **/
+// ADMIN STYlES
+// user search
.users {
li.user {
border-bottom: 1px solid $light-grey;
@@ -16,15 +16,14 @@
.avatar {
width: 50px;
height: 50px;
+ max-width: none;
}
- .actions{ width: 150px; }
-
.pull-right .label{ display: inline-block; }
}
}
-/** Invites panel **/
+// Invites panel
.more_invites{
#add-invites-section{
line-height: 34px;
@@ -32,12 +31,49 @@
}
}
-/** reported posts **/
+.invite-emails {
+ margin-bottom: 10px;
+}
-@import 'report';
+// Weekly stats
+.week-selector {
+ margin-top: 10px;
+}
-/** pod list **/
+// Pod stats
+.segment-selection {
+ select,
+ [type=submit] {
+ margin-top: 10px;
+ }
+}
+
+.percent-change {
+ &.increase {
+ color: $increase;
+ }
+
+ &.decrease {
+ color: $decrease;
+ }
+}
+
+// reported posts
+.reports {
+ .reason-label {
+ font-weight: bold;
+ }
+
+ .content {
+ padding-bottom: 20px;
+ }
+
+ .panel-body .btn-info {
+ margin-right: 5px;
+ }
+}
+// pod list
#pod-list {
.pod-title {
max-width: 200px;
diff --git a/app/assets/stylesheets/color-variables.scss b/app/assets/stylesheets/color-variables.scss
index 40acec470f6fe0e5f63ad8e6783cf5fe1e866a56..e69540df5bd517022d6bef67d1e607bd1496693a 100644
--- a/app/assets/stylesheets/color-variables.scss
+++ b/app/assets/stylesheets/color-variables.scss
@@ -32,3 +32,6 @@ $left-navbar-drawer-background: darken($white, 6%) !default;
$hovercard-background: $white !default;
$card-shadow: 0 1px 2px 0 rgba(0, 0, 0, .16), 0 2px 10px 0 rgba(0, 0, 0, .12) !default;
+
+$increase: #008000;
+$decrease: #fe0000;
diff --git a/app/assets/stylesheets/footer.scss b/app/assets/stylesheets/footer.scss
index ad1c398a2ab8d8b2f9b127749c9620003ac138ac..99bb28158154bd63480a251b1f18161dc42268bc 100644
--- a/app/assets/stylesheets/footer.scss
+++ b/app/assets/stylesheets/footer.scss
@@ -5,6 +5,11 @@ html {
body { margin-bottom: 150px; }
+.powered-by-diaspora a {
+ color: $link-grey;
+ font-weight: bold;
+}
+
footer.footer {
background-color: $background-grey;
border-top: 1px solid $border-grey;
@@ -15,11 +20,6 @@ footer.footer {
position: absolute;
width: 100%;
- .powered-by-diaspora {
- color: $link-grey;
- font-weight: bold;
- }
-
ul#footer_nav {
margin: 0;
padding: 0;
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 54d01870e40df648e95217eae9a0030a736dc11f..e9d61299164ef4423ddf91ff9dc0ddc5f2db6929 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -885,3 +885,9 @@ select#aspect_ids_ {
.form-control:active, .form-control:focus { border-color: #999999; }
.tag_following_action { margin: 5px 0 10px 0; }
+
+// --- Admin pages ---
+.pod-version {
+ // The fetching of the pod version is not done on mobile currently so we hide this alert.
+ display: none;
+}
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 498b4fde5713f6f9d9aadbe64c95723e16eb89e6..b523d789a8dcbbebb47310cddf8b9b0b275263ce 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -114,13 +114,15 @@
padding: 10px 20px 0;
.excellence-box,
- .info-links {
+ .info-links,
+ .powered-box {
border-top: 1px solid $border-grey;
padding: 5px;
}
.excellence-box {
margin-top: 10px;
+ text-align: center;
.content {
font-size: $font-size-base;
@@ -175,7 +177,6 @@
ul {
list-style: none;
- margin-bottom: 5px;
padding-left: 0;
}
diff --git a/app/assets/stylesheets/report.scss b/app/assets/stylesheets/report.scss
deleted file mode 100644
index c3a5f62eb713535c0f92692dbf54e9ea4ff6d2bd..0000000000000000000000000000000000000000
--- a/app/assets/stylesheets/report.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-#reports {
- .reason-label {
- font-weight: bold;
- }
-
- .content {
- padding-bottom: 20px;
- }
- form input {
- margin-right: 5px;
- }
-}
diff --git a/app/controllers/admin/pods_controller.rb b/app/controllers/admin/pods_controller.rb
index 1b4d2bf2f0c513688f16c5bfa72f55171f4e92fc..309ee386101fff95b9927f59b0f243ba8ca47450 100644
--- a/app/controllers/admin/pods_controller.rb
+++ b/app/controllers/admin/pods_controller.rb
@@ -1,7 +1,7 @@
module Admin
class PodsController < AdminController
- respond_to :html, :json
+ respond_to :html, :json, :mobile
def index
pods_json = PodPresenter.as_collection(Pod.all)
@@ -15,6 +15,7 @@ module Admin
render "admins/pods"
end
+ format.mobile { render "admins/pods" }
format.json { render json: pods_json }
end
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 958353e28548fc7d78c96e42e52d97affc1a3fdf..262d0bb16ba4080d0fa03ce8d2d42ea9565a800d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -220,15 +220,23 @@ class UsersController < ApplicationController
end
def change_email(user_data)
- @user.unconfirmed_email = user_data[:email]
- if @user.save
- @user.send_confirm_email
- if @user.unconfirmed_email
+ if AppConfig.mail.enable?
+ @user.unconfirmed_email = user_data[:email]
+ if @user.save
+ @user.send_confirm_email
flash.now[:notice] = t("users.update.unconfirmed_email_changed")
+ else
+ @user.reload # match user object with the database
+ flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
end
else
- @user.reload # match user object with the database
- flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
+ @user.email = user_data[:email]
+ if @user.save
+ flash.now[:notice] = t("users.update.settings_updated")
+ else
+ @user.reload
+ flash.now[:error] = t("users.update.unconfirmed_email_not_changed")
+ end
end
end
diff --git a/app/views/admins/_admin_bar.haml b/app/views/admins/_admin_bar.haml
index 43ab0a8a4eaf4b7403779006854b928f67b8d022..698fd2da9bb9e0fd1b1d5c9a1c770845132d8f2d 100644
--- a/app/views/admins/_admin_bar.haml
+++ b/app/views/admins/_admin_bar.haml
@@ -1,9 +1,5 @@
-- content_for :head do
- = stylesheet_link_tag :admin
-
%h2= t(".pages")
-
-%ul#admin_nav.nav.nav-pills.nav-stacked
+%ul.nav.nav-pills.nav-stacked#admin-nav
%li{role: "presentation", class: current_page?(admin_dashboard_path) && "active"}
= link_to t(".dashboard"), admin_dashboard_path
%li{role: "presentation", class: current_page?(user_search_path) && "active"}
@@ -22,4 +18,3 @@
= link_to t(".pod_network"), admin_pods_path
%li{role: "presentation", class: current_page?(sidekiq_path) && "active"}
= link_to t(".sidekiq_monitor"), sidekiq_path
-
diff --git a/app/views/admins/_dashboard.haml b/app/views/admins/_dashboard.haml
new file mode 100644
index 0000000000000000000000000000000000000000..503162dbe7227c2f0c11ea13f979abc05cfed16e
--- /dev/null
+++ b/app/views/admins/_dashboard.haml
@@ -0,0 +1,11 @@
+#pod-status
+ %h2
+ = t(".pod_status")
+ .alert.alert-info.pod-version{role: "alert"}
+ = t(".fetching_diaspora_version")
+ - if unreviewed_reports_count > 0
+ .alert.alert-warning.reports-warning{role: "alert"}
+ = t("report.unreviewed_reports", count: unreviewed_reports_count)
+ - else
+ %p
+ = t("report.unreviewed_reports", count: 0)
diff --git a/app/views/admins/_stats.haml b/app/views/admins/_stats.haml
new file mode 100644
index 0000000000000000000000000000000000000000..ad74a7ab6b585a72665f202524bd029411cf22c1
--- /dev/null
+++ b/app/views/admins/_stats.haml
@@ -0,0 +1,52 @@
+- content_for :head do
+ = stylesheet_link_tag :admin
+
+.container-fluid
+ .row
+ .col-sm-9
+ %h1= t(".usage_statistic")
+ .col-sm-3
+ = form_tag("/admins/stats", method: "get", class: "row form-inline segment-selection") do
+ .col-sm-8
+ %select.form-control{name: "range"}
+ - %w(daily week 2weeks month).each do |range|
+ %option{value: range, selected: ("selected" if params[:range] == range)}
+ = t(".#{range}")
+ .col-sm-4
+ = submit_tag t(".go"), class: "btn btn-primary btn-block"
+
+ .row
+ .col-xs-12
+ %h4
+ != t("admins.stats.display_results", segment: content_tag(:strong, segment))
+
+ .row
+ - %i(posts comments aspect_memberships users).each do |name|
+ :ruby
+ model = instance_variable_get("@#{name}")
+ count = model[:yesterday]
+ label_with_count = name == :aspect_memberships ? t(".shares", count: count) : t(".#{name}", count: count)
+
+ .col-md-3
+ %h2{style: "font-weight:bold;"}
+ = label_with_count
+ %h4
+ = model[:day_before]
+ %span.percent-change{class: (model[:change] > 0 ? "increase" : "decrease")}
+ = "(#{model[:change]}%)"
+
+ .row
+ %p.col-md-12.alert.alert-info.text-center{role: "alert"}
+ != t("admins.stats.current_segment",
+ post_yest: content_tag(:strong, posts[:yesterday] / user_count),
+ post_day: content_tag(:strong, posts[:day_before] / user_count))
+
+ .row
+ .col-md-12
+ %h3= t(".50_most")
+ %ul
+ - @popular_tags.each do |name, count|
+ %li
+ != t("admins.stats.tag_name",
+ name_tag: content_tag(:strong, name),
+ count_tag: content_tag(:strong, count))
diff --git a/app/views/admins/_user_entry.haml b/app/views/admins/_user_entry.haml
index 13ac091b03d4c417f9e98f70edc8c2942ac10abf..3ab517836ed8e96143513d0a39315d8b4d345e96 100644
--- a/app/views/admins/_user_entry.haml
+++ b/app/views/admins/_user_entry.haml
@@ -1,70 +1,81 @@
-
%li.user.media
- %div.pull-left
+ .media-left
- if user.person
- %span.media-object
+ .media-object
= person_image_tag(user.person, size: :thumb_small)
-
- %div.media-body.row
- %div.pull-right
- %span.label.label-default
- = t('.id')
- = user.id
- %span.label.label-info
- = t('.guid')
- = user.person.guid if user.person
-
- %h4.media-heading
- = user.person.name if user.person
-
- %div.pull-right
- .unstyled.text-right.actions
- = link_to t('admins.user_search.view_profile'), person_path(user.person), class: 'btn btn-default btn-block btn-xs'
- = link_to t('admins.user_search.add_invites'), add_invites_path(user.invitation_code), class: 'btn btn-info btn-block btn-xs'
- - unless user.person.closed_account
- = link_to t('admins.user_search.close_account'), admin_close_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure') }, class: 'btn btn-danger btn-block btn-xs'
-
- - unless user.closed_account?
- - unless user.access_locked?
- = link_to t('admins.user_search.lock_account'), admin_lock_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure_lock_account') }, class: 'btn btn-danger btn-block btn-xs'
- - else
- = link_to t('admins.user_search.unlock_account'), admin_unlock_account_path(user), method: :post, data: { confirm: t('admins.user_search.are_you_sure_unlock_account') }, class: 'btn btn-danger btn-block btn-xs'
-
- %div.row
- %div.col-md-5
+ .media-body
+ .row
+ .col-sm-7
+ %h4.media-heading
+ = user.try(:person).try(:name)
+ .col-sm-5
+ .pull-right
+ %span.label.label-default
+ = t(".id")
+ = user.id
+ %span.label.label-info
+ = t(".guid")
+ = user.try(:person).try(:guid)
+ .row
+ .col-sm-8
%dl.dl-horizontal
- %dt= t('username')
+ %dt= t("username")
%dd= user.username
- %dt= t('.email')
+ %dt= t(".email")
%dd= user.email
- %dt= t('.diaspora_handle')
+ %dt= t(".diaspora_handle")
%dd= user.person.diaspora_handle
- %dt= t('.last_seen')
- %dd= user.last_seen || t('.unknown')
- -if user.invited_by.present?
- %dt= t('.invite_token')
+ %dt= t(".last_seen")
+ %dd= user.last_seen || t(".unknown")
+ - if user.invited_by.present?
+ %dt= t(".invite_token")
%dd= invite_code_url(user.invited_by.invitation_code)
- %dt= t('.account_closed')
+ %dt= t(".account_closed")
%dd
- if user.person.closed_account
- %span.label.label-warning= t('.yes')
+ %span.label.label-warning= t(".yes")
- else
- %span.label.label-success= t('.no')
- %dt= t('.nsfw')
+ %span.label.label-success= t(".no")
+ %dt= t(".nsfw")
%dd
- if user.person.profile.nsfw
- %span.label.label-warning= t('.yes')
+ %span.label.label-warning= t(".yes")
- else
- %span.label.label-success= t('.no')
+ %span.label.label-success= t(".no")
- %h4= t('layouts.header.profile')
+ %h4= t("layouts.header.profile")
%dl.dl-horizontal
- %dt= t('people.profile_sidebar.born')
+ %dt= t("people.profile_sidebar.born")
%dd= user.person.profile.birthday
- %dt= t('people.profile_sidebar.gender')
+ %dt= t("people.profile_sidebar.gender")
%dd= user.person.profile.gender
- %dt= t('people.profile_sidebar.location')
+ %dt= t("people.profile_sidebar.location")
%dd= user.person.profile.location
- %dt= t('people.profile_sidebar.bio')
+ %dt= t("people.profile_sidebar.bio")
%dd= user.person.profile.bio
+
+ .col-sm-4
+ = link_to t("admins.user_search.view_profile"),
+ person_path(user.person),
+ class: "btn btn-default btn-block"
+ = link_to t("admins.user_search.add_invites"),
+ add_invites_path(user.invitation_code),
+ class: "btn btn-info btn-block"
+ - unless user.person.closed_account
+ = link_to t("admins.user_search.close_account"),
+ admin_close_account_path(user),
+ method: :post, data: {confirm: t("admins.user_search.are_you_sure")},
+ class: "btn btn-danger btn-block"
+ - if user.access_locked?
+ = link_to t("admins.user_search.unlock_account"),
+ admin_unlock_account_path(user),
+ method: :post,
+ data: {confirm: t("admins.user_search.are_you_sure_unlock_account")},
+ class: "btn btn-danger btn-block"
+ - else
+ = link_to t("admins.user_search.lock_account"),
+ admin_lock_account_path(user),
+ method: :post,
+ data: {confirm: t("admins.user_search.are_you_sure_lock_account")},
+ class: "btn btn-danger btn-block"
diff --git a/app/views/admins/_user_search.haml b/app/views/admins/_user_search.haml
new file mode 100644
index 0000000000000000000000000000000000000000..33e02cee85afecb89d0a8afa4ebafeee3b3a912c
--- /dev/null
+++ b/app/views/admins/_user_search.haml
@@ -0,0 +1,57 @@
+- content_for :head do
+ = stylesheet_link_tag :admin
+
+.row
+ .user_search.col-md-12
+ %h3= t("admins.admin_bar.user_search")
+ = form_for @search, url: {action: "user_search"}, html: {method: :get, class: "form-horizontal"} do |f|
+ .form-group
+ = f.label :username, t("username"), class: "col-sm-2 control-label"
+ .col-sm-10
+ = f.text_field :username, class: "form-control"
+
+ .form-group
+ = f.label :email, t("email"), class: "col-sm-2 control-label"
+ .col-sm-10
+ = f.text_field :email, class: "form-control"
+
+ .form-group
+ = f.label :guid, t("admins.user_entry.guid"), class: "col-sm-2 control-label"
+ .col-sm-10
+ = f.text_field :guid, class: "form-control"
+
+ .form-group
+ .col-md-offset-2.col-md-8.col-sm-12
+ = f.label :under13 do
+ = f.check_box :under13
+ = t(".under_13")
+ .col-md-2.col-sm-12
+ = submit_tag t("admins.stats.go"), class: "btn btn-block btn-primary"
+
+.row
+ .col-md-12
+ .alert.alert-info.text-center{role: "alert"}
+ = t(".users", count: nb_users)
+
+.row
+ .users.col-md-12
+ %ul.media-list
+ - @users.each do |user|
+ = render partial: "user_entry", locals: {user: user}
+
+.row
+ .more_invites.col-md-12
+ %h3= t("shared.invitations.invites")
+ .clearfix#add-invites-section
+ != t(".you_currently", count: current_user.invitation_code.count,
+ link: link_to(t(".add_invites"), add_invites_path(current_user.invitation_code),
+ class: "btn btn-link pull-right block-admin"))
+
+ = form_tag "admin_inviter", method: :get, class: "form-horizontal" do
+ .form-group
+ %label.col-xs-12.col-md-2.control-label
+ = t(".email_to")
+ .col-xs-12.col-md-8
+ = text_field_tag "identifier", nil, class: "form-control invite-emails"
+ .col-xs-12.col-md-2
+ = submit_tag t(".invite"), class: "btn btn-block btn-primary"
diff --git a/app/views/admins/_weekly_user_stats.haml b/app/views/admins/_weekly_user_stats.haml
new file mode 100644
index 0000000000000000000000000000000000000000..a3a9eff0770a5b6d7b1a361bbefe0431addd11d6
--- /dev/null
+++ b/app/views/admins/_weekly_user_stats.haml
@@ -0,0 +1,21 @@
+- content_for :head do
+ = stylesheet_link_tag :admin
+
+.row
+ .col-md-9.col-xs-12
+ %h2
+ = t(".current_server", date: Time.zone.now.to_date)
+
+ .col-md-3.col-xs-12
+ = form_tag("/admins/weekly_user_stats", method: "get", class: "form-inline week-selector row") do
+ .col-xs-9.center
+ = select_tag(:week,
+ options_for_select(created_users_by_week.keys.reverse, selected_week),
+ class: "form-control")
+ .col-xs-3.center
+ = submit_tag t("admins.stats.go"), class: "btn btn-primary"
+
+= t(".amount_of", count: counter)
+%br
+- created_users_by_week[selected_week].each do |m|
+ = link_to m, "/u/#{m}"
diff --git a/app/views/admins/dashboard.html.haml b/app/views/admins/dashboard.html.haml
index 326758301123268fe8c453e1fced8f4cf8618751..13f0f70d6907f07b20ddc9e164c777fd68964d35 100644
--- a/app/views/admins/dashboard.html.haml
+++ b/app/views/admins/dashboard.html.haml
@@ -3,11 +3,4 @@
.col-md-3
= render partial: "admins/admin_bar"
.col-md-9
- #pod-status
- %h2
- = t(".pod_status")
- .alert.alert-info.pod-version{role: "alert"}
- = t(".fetching_diaspora_version")
- - if unreviewed_reports_count > 0
- .alert.alert-warning.reports-warning{role: "alert"}
- = t("report.unreviewed_reports", count: unreviewed_reports_count)
+ = render partial: "admins/dashboard"
diff --git a/app/views/admins/dashboard.mobile.haml b/app/views/admins/dashboard.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..0dbc94e97eb5dfc669dab1c0c2d8cf57f68b0beb
--- /dev/null
+++ b/app/views/admins/dashboard.mobile.haml
@@ -0,0 +1 @@
+= render partial: "admins/dashboard"
diff --git a/app/views/admins/pods.html.haml b/app/views/admins/pods.html.haml
index cb70585438e0dd418f06ac703527c44f1cb9e4c0..d37e6e1dbfeffc0a006f894e558b463035385486 100644
--- a/app/views/admins/pods.html.haml
+++ b/app/views/admins/pods.html.haml
@@ -1,3 +1,6 @@
+- content_for :head do
+ = stylesheet_link_tag :admin
+
.container
.row
.col-md-3
diff --git a/app/views/admins/pods.mobile.haml b/app/views/admins/pods.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..97a3ceeb7b8b551f64774d2a8ab42013d78869a5
--- /dev/null
+++ b/app/views/admins/pods.mobile.haml
@@ -0,0 +1,5 @@
+%h2
+ = t(".pod_network")
+
+.alert.alert-warning
+ != t(".pod_desktop_view", desktop_link: link_to(t(".pod_desktop_link"), toggle_mobile_path))
diff --git a/app/views/admins/stats.html.haml b/app/views/admins/stats.html.haml
index d2d5fcc5e520ccdc1e8588353bcf307b415c8359..afa0980d20c2c67dde523ddb4313868732c40ee9 100644
--- a/app/views/admins/stats.html.haml
+++ b/app/views/admins/stats.html.haml
@@ -3,58 +3,4 @@
.col-md-3
= render partial: "admins/admin_bar"
.col-md-9
- %h1= t('.usage_statistic')
-
- .pull-right
- = form_tag('/admins/stats', :method => 'get', class: 'form-inline') do
- %select.form-control{name: "range"}
- %option{:value => 'daily', :selected => ('selected' if params[:range] == 'daily')}
- = t('.daily')
- %option{:value => 'week', :selected => ('selected' if params[:range] == 'week')}
- = t('.week')
- %option{:value => '2weeks', :selected => ('selected' if params[:range] == '2weeks')}
- = t('.2weeks')
- %option{:value => 'month', :selected => ('selected' if params[:range] == 'month')}
- = t('.month')
-
- = submit_tag t('.go'), class: 'btn btn-primary'
-
- %h3
- != t("admins.stats.display_results", segment: content_tag(:strong, @segment))
-
- .row
- - [:posts, :comments, :aspect_memberships, :users].each do |name|
- - model = eval("@#{name.to_s}")
- - if name == :aspect_memberships
- - name = t('.shares', :count => model[:yesterday])
- - if name == :posts
- - name = t('.posts', :count => model[:yesterday])
- - if name == :comments
- - name = t('.comments', :count => model[:yesterday])
- - if name == :users
- - name = t('.users', :count => model[:yesterday])
-
- .col-md-3
- %h2{:style => 'font-weight:bold;'}
- = name.to_s
- %h4
- = model[:day_before]
- %span.percent_change{:class => (model[:change] > 0 ? "green" : "red")}
- = "(#{model[:change]}%)"
-
- .row
- .col-md-12
- %p.alert.alert-info.text-center{role: "alert"}
- != t("admins.stats.current_segment",
- post_yest: content_tag(:strong, @posts[:yesterday] / @user_count.to_f),
- post_day: content_tag(:strong, @posts[:day_before] / @user_count.to_f))
-
- .row
- .col-md-12
- %h3= t('.50_most')
- %ul
- - @popular_tags.each do |name,count|
- %li
- != t("admins.stats.tag_name",
- name_tag: content_tag(:strong, name),
- count_tag: content_tag(:strong, count))
+ = render partial: "admins/stats", locals: {segment: @segment, posts: @posts, user_count: @user_count.to_f}
diff --git a/app/views/admins/stats.mobile.haml b/app/views/admins/stats.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..cbd77fa6a8642bf564df7bd244e3bc610687f6f8
--- /dev/null
+++ b/app/views/admins/stats.mobile.haml
@@ -0,0 +1 @@
+= render partial: "admins/stats", locals: {segment: @segment, posts: @posts, user_count: @user_count.to_f}
diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml
index 4be69152fd4ae8455cb32d90c37d399b38a62aeb..9bc5154ffa60b55b4a9ed3969a41113f6e4fea87 100644
--- a/app/views/admins/user_search.html.haml
+++ b/app/views/admins/user_search.html.haml
@@ -3,58 +3,4 @@
.col-md-3
= render partial: "admins/admin_bar"
.col-md-9
- .row
- .user_search.col-md-8
- %h3= t('admins.admin_bar.user_search')
- = form_for @search, url: {action: 'user_search'}, html: {method: :get, class: 'form-horizontal'} do |f|
- .form-group
- = f.label :username, t('username'), class: 'col-sm-2 control-label'
- .col-sm-10
- = f.text_field :username, class: "form-control"
-
- .form-group
- = f.label :email, t('email'), class: 'col-sm-2 control-label'
- .col-sm-10
- = f.text_field :email, class: "form-control"
-
- .form-group
- = f.label :guid, t('admins.user_entry.guid'), class: 'col-sm-2 control-label'
- .col-sm-10
- = f.text_field :guid, class: "form-control"
-
- .form-group
- .col-sm-offset-2.col-sm-10
- = f.label :under13 do
- = f.check_box :under13
- = t(".under_13")
- .form-group
- .clearfix.col-sm-12
- = submit_tag t("admins.stats.go"), class: "btn btn-primary pull-right"
-
- .more_invites.col-md-4
- %h3= t("shared.invitations.invites")
- #add-invites-section.clearfix
- != t(".you_currently", count: current_user.invitation_code.count,
- link: link_to(t(".add_invites"), add_invites_path(current_user.invitation_code),
- class: "btn btn-link pull-right"))
-
- = form_tag "admin_inviter", method: :get, class: "form-horizontal" do
- .form-group
- %label.col-sm-4.control-label
- = t(".email_to")
- .col-sm-8
- = text_field_tag "identifier", nil, class: "form-control"
- .form-group
- .clearfix.col-md-12
- = submit_tag t(".invite"), class: "btn btn-default pull-right"
-
- .row
- .col-md-12
- .alert.alert-info.text-center{role: "alert"}
- = t(".users", count: @users.count)
-
- .row
- .users.col-md-12
- %ul.media-list
- - @users.each do |user|
- = render partial: 'user_entry', locals: { user: user }
+ = render partial: "admins/user_search", locals: {nb_users: @users.count}
diff --git a/app/views/admins/user_search.mobile.haml b/app/views/admins/user_search.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..6aae225d00deb025e1022e3c5431d2e5066508f9
--- /dev/null
+++ b/app/views/admins/user_search.mobile.haml
@@ -0,0 +1,6 @@
+- flash.each do |name, msg|
+ .expose#flash-container
+ .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
+ = msg
+
+= render partial: "admins/user_search", locals: {nb_users: @users.count}
diff --git a/app/views/admins/weekly_user_stats.haml b/app/views/admins/weekly_user_stats.haml
index fe2f88e35deba4a5a7e12b76b0a0bcae57879052..264f27eaaf7ec03d0ad238e52904b3cebb50d636 100644
--- a/app/views/admins/weekly_user_stats.haml
+++ b/app/views/admins/weekly_user_stats.haml
@@ -3,16 +3,5 @@
.col-md-3
= render partial: "admins/admin_bar"
.col-md-9
- %h2
- = t('.current_server', date: Time.now.to_date)
-
- .pull-right
- = form_tag('/admins/weekly_user_stats', method: 'get', class: 'form-inline') do
- = select_tag(:week, options_for_select(@created_users_by_week.keys.reverse, @selected_week), class: "form-control")
- = submit_tag t('admins.stats.go'), class: 'btn btn-primary'
-
- = t('.amount_of', count: @counter)
- %br
- - @created_users_by_week[@selected_week].each do |m|
- = link_to m, "/u/#{m}"
- %br
+ = render partial: "admins/weekly_user_stats",
+ locals: {created_users_by_week: @created_users_by_week, selected_week: @selected_week, counter: @counter}
diff --git a/app/views/admins/weekly_user_stats.mobile.haml b/app/views/admins/weekly_user_stats.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..054f1468fc1d5b1e86b8ac6927a87f1a2ee31b24
--- /dev/null
+++ b/app/views/admins/weekly_user_stats.mobile.haml
@@ -0,0 +1,2 @@
+= render partial: "admins/weekly_user_stats",
+ locals: {created_users_by_week: @created_users_by_week, selected_week: @selected_week, counter: @counter}
diff --git a/app/views/layouts/_drawer.mobile.haml b/app/views/layouts/_drawer.mobile.haml
index c6d48424ceec4fadac05f72d1ab5e12147a4dc3f..1f248a9766369c0b0ce30ec14788816977010d6b 100644
--- a/app/views/layouts/_drawer.mobile.haml
+++ b/app/views/layouts/_drawer.mobile.haml
@@ -35,5 +35,29 @@
= person_image_tag(current_user, size: :thumb_small)
%li= link_to t("_contacts"), contacts_path
%li= link_to t("layouts.header.settings"), edit_user_path
+ - if current_user.admin?
+ %li#admin
+ = link_to t("streams.admin.title"), "#"
+ %li.no-border.hide
+ %ul
+ %li= link_to t("admins.admin_bar.dashboard"), admin_dashboard_path
+ %li= link_to t("admins.admin_bar.user_search"), user_search_path
+ %li= link_to t("admins.admin_bar.weekly_user_stats"), weekly_user_stats_path
+ %li= link_to t("admins.admin_bar.pod_stats"), pod_stats_path
+ %li
+ %a{href: report_index_path}
+ - if unreviewed_reports_count > 0
+ .pull-right.badge
+ = unreviewed_reports_count
+ = t("admins.admin_bar.report")
+ %li= link_to t("admins.admin_bar.pod_network"), admin_pods_path
+ %li= link_to t("admins.admin_bar.sidekiq_monitor"), sidekiq_path
+ - elsif current_user.moderator?
+ %li
+ %a{href: report_index_path}
+ - if unreviewed_reports_count > 0
+ .pull-right.badge
+ = unreviewed_reports_count
+ = t("admins.admin_bar.report")
%li= link_to t("layouts.application.toggle"), toggle_mobile_path
%li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index ab8263507269361d69971bb227a76ba97a7a0947..cfa2f167a20ec5fb33f7dfa5bca1283e047784a6 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,7 +1,6 @@
%footer.footer
.container
- .pull-left
- .powered-by-diaspora
- =t("layouts.application.powered_by")
+ .powered-by-diaspora.pull-left
+ = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
%ul#footer_nav.pull-right
- = render :partial =>'shared/links'
+ = render partial: "shared/links"
diff --git a/app/views/report/_reports.haml b/app/views/report/_reports.haml
new file mode 100644
index 0000000000000000000000000000000000000000..fafe6bad0523ffdcf8f326d599da638f00ff4059
--- /dev/null
+++ b/app/views/report/_reports.haml
@@ -0,0 +1,44 @@
+- content_for :head do
+ = stylesheet_link_tag :admin
+
+.reports
+ %h1
+ = t("report.title")
+ - if @reports.empty?
+ %p
+ = t("report.unreviewed_reports", count: 0)
+ - @reports.each do |report|
+ - if report.item
+ .panel.panel-default
+ - username = report.user.username
+ .panel-heading
+ .reporter.pull-right
+ != t("report.reported_label", person: link_to(username, user_profile_path(username)))
+ .reason
+ %span.reason-label
+ = t("report.reason_label")
+ %span
+ = report.text
+ .panel-body
+ .content
+ = report_content(report)
+ .segment-selection
+ = button_to t("report.reported_user_details"),
+ user_search_path(admins_controller_user_search: {guid: report.reported_author.guid}),
+ class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :post
+ = button_to t("report.review_link"), report_path(report.id, type: report.item_type),
+ class: "btn pull-left btn-info btn-small col-md-3 col-xs-12", method: :put
+ = button_to t("report.delete_link"), report_path(report.id, type: report.item_type),
+ data: {confirm: t("report.confirm_deletion")},
+ class: "btn pull-right btn-danger btn-small col-md-3 col-xs-12", method: :delete
+ - else
+ .panel.panel-default
+ - username = report.user.username
+ .panel-heading
+ .reporter.pull-right
+ != t("report.reported_label", person: link_to(username, user_profile_path(username)))
+ .title
+ = report_content(report)
+ .panel-body
+ = button_to t("report.review_link"), report_path(report.id, type: report.item_type),
+ class: "btn pull-left btn-info btn-small", method: :put
diff --git a/app/views/report/index.html.haml b/app/views/report/index.html.haml
index 219ad34ba1cc5dcbd768ef1df4853a6973345376..d96304603df8f023db5e5a4df1f4f8c1e9973acc 100644
--- a/app/views/report/index.html.haml
+++ b/app/views/report/index.html.haml
@@ -1,47 +1,7 @@
-- content_for :head do
- = stylesheet_link_tag :admin
-
.container
.row
.col-md-3
- if current_user.admin?
= render partial: "admins/admin_bar"
.col-md-9
- #reports
- %h1
- = t("report.title")
- - @reports.each do |report|
- - if report.item
- .panel.panel-default
- - username = report.user.username
- .panel-heading
- .reporter.pull-right
- = raw t("report.reported_label", person: link_to(username, user_profile_path(username)))
- .reason
- %span.reason-label
- = t("report.reason_label")
- %span
- = report.text
- .panel-body
- .content
- = report_content(report)
-
- = button_to t("report.reported_user_details"),
- user_search_path(admins_controller_user_search: {guid: report.reported_author.guid}),
- class: "btn pull-left btn-info btn-small", method: :post
- = button_to t("report.review_link"), report_path(report.id, type: report.item_type),
- class: "btn pull-left btn-info btn-small", method: :put
- = button_to t("report.delete_link"), report_path(report.id, type: report.item_type),
- data: {confirm: t("report.confirm_deletion")},
- class: "btn pull-right btn-danger btn-small", method: :delete
- - else
- .panel.panel-default
- - username = report.user.username
- .panel-heading
- .reporter.pull-right
- = raw t("report.reported_label", person: link_to(username, user_profile_path(username)))
- .title
- = report_content(report)
- .panel-body
- = button_to t("report.review_link"), report_path(report.id, type: report.item_type),
- class: "btn pull-left btn-info btn-small", method: :put
+ = render partial: "report/reports"
diff --git a/app/views/report/index.mobile.haml b/app/views/report/index.mobile.haml
new file mode 100644
index 0000000000000000000000000000000000000000..6f28a776d26cc528dc66a9d0f9e228717959a901
--- /dev/null
+++ b/app/views/report/index.mobile.haml
@@ -0,0 +1 @@
+= render partial: "report/reports"
diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml
index 1567e01594693d9de92e8a19172fc71ab7dcf73f..2032d6197b54e61997f0caaeb60205ae05134abb 100644
--- a/app/views/shared/_links.haml
+++ b/app/views/shared/_links.haml
@@ -1,8 +1,9 @@
-%li= link_to 'diasporafoundation.org', "https://diasporafoundation.org"
-%li= link_to 'Wiki', "https://wiki.diasporafoundation.org"
-%li= link_to t('layouts.application.whats_new'), changelog_url
-%li= link_to t('layouts.header.code') + " " + pod_version, "#{source_url}", {:title => t('layouts.application.source_package')}
+%li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org"
+%li= link_to t("layouts.application.whats_new"), changelog_url
+%li= link_to t("layouts.header.code") + " " + pod_version,
+ source_url.to_s,
+ title: t("layouts.application.source_package")
%li= link_to t("layouts.application.statistics_link"), statistics_path
-%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
+%li= link_to t("layouts.application.toggle"), toggle_mobile_path
- if AppConfig.settings.terms.enable?
- %li= link_to(t('_terms'), terms_path)
+ %li= link_to t("_terms"), terms_path
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index da6c31f759135e48040cccb8b4bd5d8453e95bbf..3a8b0225aad254c016454502cb8ef3c7d6397513 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -91,8 +91,8 @@
"https://wiki.diasporafoundation.org/How_to_report_a_bug"))
%li
!= t("aspects.index.help.feature_suggestion",
- link: link_to("#" + t("aspects.index.help.tag_feature"),
- tag_path(name: t("aspects.index.help.tag_feature"))))
+ link: link_to(t("aspects.index.help.tag_feature"),
+ "https://discourse.diasporafoundation.org/c/features-and-ideas"))
%p
!= t("aspects.index.help.tutorials_and_wiki",
faq: link_to(t("_help"), help_path),
@@ -102,6 +102,11 @@
target: "_blank"),
target: "_blank")
+ %p
+ != t("aspects.index.help.support_forum",
+ support_forum: link_to(t("aspects.index.help.support_forum_link"),
+ "https://discourse.diasporafoundation.org/c/support", target: "_blank"))
+
- unless AppConfig.configured_services.blank? || all_services_connected?
.section.collapsed
.title
@@ -165,6 +170,11 @@
%ul
= render "shared/links"
+ .powered-box
+ .content
+ .powered-by-diaspora.text-center
+ = link_to t("layouts.application.powered_by"), "https://diasporafoundation.org"
+
.col-md-9
.stream_container#aspect_stream_container
= render "aspects/aspect_stream", stream: @stream
diff --git a/config/defaults.yml b/config/defaults.yml
index d6462d3f6a21226c81d4481f0bbcd9004a6d33c8..9d8a29108683464169a704b30fb11f27ef7cf7fe 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
defaults:
version:
- number: "0.6.6.0" # Do not touch unless doing a release, do not backport the version number that's in master
+ number: "0.6.7.0" # Do not touch unless doing a release, do not backport the version number that's in master
heroku: false
environment:
url: "http://localhost:3000/"
diff --git a/config/locales/devise/devise.ia.yml b/config/locales/devise/devise.ia.yml
index bde47d17f8fa1779f653b6ef4ef9a93e49fa98d7..a136688b216b24fc9272a220cfe4825a02e436c0 100644
--- a/config/locales/devise/devise.ia.yml
+++ b/config/locales/devise/devise.ia.yml
@@ -7,22 +7,22 @@
ia:
devise:
confirmations:
- confirmed: "Conto confirmate con successo. Tu ha aperite session."
+ confirmed: "Le adresse de e-mail ha essite confirmate con successo."
new:
resend_confirmation: "Reinviar instructiones pro confirmar"
- send_instructions: "Tu recipera in pauc minutas un message de e-mail con instructiones pro confirmar tu conto."
+ send_instructions: "Tu recipera in pauc minutas un message de e-mail con instructiones pro confirmar tu adresse de e-mail."
send_paranoid_instructions: "Si tu adresse de e-mail existe in nostre base de datos, tu recipera in pauc minutas un e-mail con instructiones pro confirmar tu adresse de e-mail."
failure:
already_authenticated: "Tu ha jam aperite session."
inactive: "Tu conto non ha ancora essite activate."
- invalid: "Nomine de usator o contrasigno invalide."
+ invalid: "%{authentication_keys} o contrasigno invalide."
invalid_token: "Indicio de authentication invalide."
last_attempt: "Tu pote tentar solmente un altere vice ante que le conto es blocate."
locked: "Tu conto es blocate."
- not_found_in_database: "E-mail o contrasigno invalide."
+ not_found_in_database: "%{authentication_keys} o contrasigno invalide."
timeout: "Le session ha expirate. Per favor aperi session de novo pro continuar."
unauthenticated: "Tu debe aperir session o crear un conto ante de continuar."
- unconfirmed: "Tu debe confirmar tu conto ante de continuar."
+ unconfirmed: "Tu debe confirmar tu adresse de e-mail ante de continuar."
invitations:
invitation_token_invalid: "Excusa nos! Iste indicio de invitation non es valide."
send_instructions: "Le invitation ha essite inviate."
@@ -77,7 +77,7 @@ ia:
signed_up_but_locked: "Le creation de tu conto ha succedite. Totevia, nos non ha potite aperir tu session perque tu conto es blocate."
signed_up_but_unconfirmed: "Un message con un ligamine de confirmation ha essite inviate a tu adresse de e-mail. Per favor, seque le ligamine pro activar tu conto."
update_needs_confirmation: "Tu ha actualisate tu conto, ma nos debe verificar tu nove adresse de e-mail. Per favor, lege tu e-mail e seque le ligamine de confirmation pro confirmar tu nove adresse de e-mail."
- updated: "Conto actualisate con successo."
+ updated: "Le conto ha essite actualisate con successo."
sessions:
already_signed_out: "Le session ha essite claudite."
new:
@@ -95,17 +95,17 @@ ia:
receive_confirmation: "Instructiones pro confirmar non recipite?"
receive_unlock: "Instructiones pro disblocar non recipite?"
sign_in: "Aperir session"
- sign_up: "Crear un conto"
+ sign_up: "Crear conto"
sign_up_closed: "Le creation de contos es claudite al publico in iste momento."
unlocks:
new:
resend_unlock: "Reinviar instructiones pro disblocar"
send_instructions: "Tu recipera in pauc minutas un message de e-mail con instructiones pro disblocar tu conto."
send_paranoid_instructions: "Si tu conto existe, tu recipera in pauc minutas un e-mail con instructiones pro disblocar lo."
- unlocked: "Conto disblocate con successo. Tu ha aperite session."
+ unlocked: "Le conto ha essite disblocate con successo. Per favor, aperi session pro continuar."
errors:
messages:
- already_confirmed: "ha jam essite confirmate"
+ already_confirmed: "ha jam essite confirmate; essaya aperir session"
confirmation_period_expired: "debe esser confirmate intra %{period}, per favor requesta un altere"
expired: "ha expirate, per favor requesta un altere"
not_found: "non trovate"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index cbb3fb95887cd54c1376eea4a812c7873f9753b7..1f3c7f51779a109bb8acb16beb86dfaededc1126 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -21,10 +21,6 @@ ar:
attributes:
diaspora_handle:
taken: "مأخوذ بالÙعل."
- request:
- attributes:
- from_id:
- taken: "مكرّر لطلب موجود مسبقًا."
reshare:
attributes:
root_guid:
@@ -140,7 +136,6 @@ ar:
commenting: "جارى التعليق..."
contacts:
index:
- add_a_new_aspect: "أض٠Ùئة جديدة"
all_contacts: "كل جهات الاتصال"
community_spotlight: "ضوء المجتمع"
my_contacts: "جهات الاتصال الخاصة بي"
@@ -274,7 +269,6 @@ ar:
other: "%{actors} أشاروا إليك ÙÙŠ مشاركة Ù…ØذوÙØ©."
two: "%{actors} أشارا إليك ÙÙŠ مشاركة Ù…ØذوÙØ©."
zero: "%{actors} أشار إليك ÙÙŠ مشاركة Ù…ØذوÙØ©."
- post: "مشاركة"
private_message:
few: "%{actors} راسلوك."
many: "%{actors} راسلوك."
diff --git a/config/locales/diaspora/art-nvi.yml b/config/locales/diaspora/art-nvi.yml
index 73b06abe022fe150125e5df18a2fed0455803efc..f334189191063747d60b569afe84f922b93756d6 100644
--- a/config/locales/diaspora/art-nvi.yml
+++ b/config/locales/diaspora/art-nvi.yml
@@ -48,7 +48,6 @@ art-nvi:
cancel: "Ftang"
contacts:
index:
- add_a_new_aspect: "Ngop ponguti amip"
all_contacts: "Nìwotx Eylan"
my_contacts: "Oeyä Eylan"
start_a_conversation: "Ngal sngä'i tìpängkxoti"
diff --git a/config/locales/diaspora/ast.yml b/config/locales/diaspora/ast.yml
index 564036220dee3b78e7dad254bfeeee96f18be97b..54d3425aaa777b6f1a3fecdd14b26e9bcae4547f 100644
--- a/config/locales/diaspora/ast.yml
+++ b/config/locales/diaspora/ast.yml
@@ -20,10 +20,6 @@ ast:
attributes:
diaspora_handle:
taken: "yá ta ocupáu."
- request:
- attributes:
- from_id:
- taken: "ye un duplicáu d'una solicitú preesistente."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/az.yml b/config/locales/diaspora/az.yml
index f3584d8791537d312a3f2da59ddbe8ea378ca6e4..0eed1c9932d712cdea150e2211de2dc3cef57b65 100644
--- a/config/locales/diaspora/az.yml
+++ b/config/locales/diaspora/az.yml
@@ -16,10 +16,6 @@ az:
attributes:
diaspora_handle:
taken: ""
- request:
- attributes:
- from_id:
- taken: ""
user:
attributes:
email:
@@ -65,7 +61,6 @@ az:
tag_bug: ""
tag_feature: ""
tag_question: ""
- introduce_yourself: ""
new_here:
follow: ""
learn_more: ""
diff --git a/config/locales/diaspora/be.yml b/config/locales/diaspora/be.yml
index 78c4506d4f4e4844e9af002541bd734e96cef3b0..bea5c87587462d32816f5807c44bb0a8593b29b2 100644
--- a/config/locales/diaspora/be.yml
+++ b/config/locales/diaspora/be.yml
@@ -20,10 +20,6 @@ be:
attributes:
diaspora_handle:
taken: "ужо Ñ–Ñнуе."
- request:
- attributes:
- from_id:
- taken: "было аднойчы ўжо запатрабавана."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index cb7fd1ec094bcb1d9408a33612860a4a77b5ff3d..1107cade72511fe24fb645b229de4d9e45727e60 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -16,10 +16,6 @@ bg:
attributes:
diaspora_handle:
taken: "вече е зает."
- request:
- attributes:
- from_id:
- taken: "е дубликат на вече ÑъщеÑтвуваща заÑвка."
reshare:
attributes:
root_guid:
@@ -111,7 +107,6 @@ bg:
commenting: "Коментиране..."
contacts:
index:
- add_a_new_aspect: "Създаване на аÑпект"
all_contacts: "Ð’Ñички контакти"
my_contacts: "Моите контакти"
no_contacts: "Изглежда Ñ‚Ñ€Ñбва да добавите контакти!"
@@ -219,7 +214,6 @@ bg:
one: "%{actors} Ви Ñпомена в изтрита публикациÑ."
other: "%{actors} Ви Ñпомена в изтрита публикациÑ."
zero: "%{actors} Ви Ñпомена в изтрита публикациÑ."
- post: "публикациÑ"
private_message:
one: "%{actors} Ви изпрати Ñъобщение."
other: "%{actors} Ви изпратиха Ñъобщение."
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index c5efa942a940dd84d53bab004b02781107a981f9..5d4a65d89cc3678a398efb24f3c6818ec97c4ce6 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -29,10 +29,6 @@ br:
attributes:
poll:
already_participated: "Kemeret hoc'h eus perzh er votadeg-mañ c'hoazh !"
- request:
- attributes:
- from_id:
- taken: "a zo un eilad eus ur reked a oa bet savet c'hoazh"
reshare:
attributes:
root_guid:
@@ -186,7 +182,6 @@ br:
commenting: "Oc'h embann..."
contacts:
index:
- add_a_new_aspect: "Ouzhpennañ ur strollad nevez"
all_contacts: "An holl zarempredoù"
community_spotlight: "Nevezenti ar rouedad"
my_contacts: "Ma darempredoù"
@@ -394,7 +389,6 @@ br:
one: "Meneget e oac'h bet en un destenn diverket gant %{actors}."
other: "Meneget e oac'h bet en un destenn diverket gant %{actors}."
zero: "Meneget e oac'h bet en un destenn diverket gant %{actors}."
- post: "embann"
private_message:
one: "Kaset ez eus bet ur gemennadenn deoc'h gant %{actors}."
other: "Kaset ez eus bet ur gemennadenn deoc'h gant %{actors}."
diff --git a/config/locales/diaspora/bs.yml b/config/locales/diaspora/bs.yml
index 14b85e4a9ba2e99211206dd8bb77ae4fe9b7712f..a2549c2bdca8b330d9a0c4c9cc15adb9003b388b 100644
--- a/config/locales/diaspora/bs.yml
+++ b/config/locales/diaspora/bs.yml
@@ -21,10 +21,6 @@ bs:
attributes:
diaspora_handle:
taken: "je već uzeto."
- request:
- attributes:
- from_id:
- taken: "je duplikat već postojećeg zahtjeva."
reshare:
attributes:
root_guid:
@@ -186,7 +182,6 @@ bs:
commenting: "Komentarišem..."
contacts:
index:
- add_a_new_aspect: "Dodaj novi aspekt"
all_contacts: "Svi Kontakti"
community_spotlight: "U Centru Pažnje"
my_contacts: "Moji Kontakti"
@@ -373,7 +368,6 @@ bs:
one: "%{actors} vas je spomenulo u izbrisanoj objavi."
other: "%{actors} su vas spomenuli u izbrisanoj objavi."
zero: "%{actors} vas je spomenulo u izbrisanoj objavi."
- post: "objava"
private_message:
few: "%{actors} vam je poslalo poruku."
many: "%{actors} vam je poslalo poruku."
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 863f295a130980da13af9df8acb078b5ece47b4b..17d8a215c9cccf3bfacecafd68e7ffdbc4a8aa9e 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -31,10 +31,6 @@ cs:
attributes:
poll:
already_participated: "Této ankety jste se již úÄastnil."
- request:
- attributes:
- from_id:
- taken: "je duplicitnà k dÅ™Ãve existujÃcà žádosti."
reshare:
attributes:
root_guid:
@@ -274,7 +270,6 @@ cs:
commenting: "KomentovánÃ..."
contacts:
index:
- add_a_new_aspect: "Přidat nový aspekt"
add_contact: "Přidej kontakt"
all_contacts: "VÅ¡echny kontakty"
community_spotlight: "Aktuality z komunity"
@@ -658,7 +653,6 @@ cs:
one: "%{actors} vás zmÃnil(a) ve smazaném pÅ™ÃspÄ›vku."
other: "%{actors} vás zmÃnili ve smazaném pÅ™ÃspÄ›vku."
zero: "%{actors} vás zmÃnili ve smazaném pÅ™ÃspÄ›vku."
- post: "pÅ™ÃspÄ›vek"
private_message:
few: "%{actors} vám poslali zprávu."
one: "%{actors} vám poslal(a) zprávu."
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 3f8cef5375c96a69621351a4110d2fe42dca10f8..4d1de038b08db7629cb73b8455e8056180f824de 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -54,7 +54,6 @@ cy:
comment: "Sylw"
contacts:
index:
- add_a_new_aspect: "Ychwanegwch agwedd newydd"
all_contacts: "Cysylltiadau i gÅ·d"
my_contacts: "Fy nghysylltiadau"
no_contacts: "No contacts."
@@ -137,7 +136,6 @@ cy:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "bost"
private_message:
few: "Mae %{actors} wedi anfon neges iddych chi."
many: "Mae %{actors} wedi anfon neges iddych chi."
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 57e892f201d12ecbbb52bb2efe636fc870bc24d2..f8cd218aa51c4ed603f8969e0315e5da95f9e6d0 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -31,10 +31,6 @@ da:
attributes:
poll:
already_participated: "Du har allerede deltaget i denne afstemning!"
- request:
- attributes:
- from_id:
- taken: "er en kopi af en allerede eksisterende forespørgsel."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ da:
fetching_diaspora_version: "Bestem seneste Diaspora version ..."
pod_status: "Pod status"
pods:
+ pod_desktop_link: "skrivebordsvisning"
+ pod_desktop_view: "Denne side er ikke tilgængelig på mobil-visning, skift til %{desktop_link}."
pod_network: "Pod netværk"
stats:
2weeks: "2 uger"
@@ -92,7 +90,7 @@ da:
week: "Uge"
user_entry:
account_closed: "Konto lukket"
- diaspora_handle: "Dit Diaspora-navn"
+ diaspora_handle: "Diaspora ID"
email: "E-mail"
guid: "GUID"
id: "ID"
@@ -230,6 +228,8 @@ da:
here_to_help: "Diaspora-samfundet er lige her!"
mail_podmin: "Podmins e-mail"
need_help: "Brug for hjælp?"
+ support_forum: "Du kan også gå ind på %{support_forum}"
+ support_forum_link: "support forum"
tag_bug: "fejl"
tag_feature: "feature"
tag_question: "spørgsmål"
@@ -279,7 +279,6 @@ da:
commenting: "Kommenterer ..."
contacts:
index:
- add_a_new_aspect: "Tilføj nyt aspekt"
add_contact: "Tilføj kontakt"
all_contacts: "Alle kontakter"
community_spotlight: "Community Spotlight"
@@ -609,6 +608,7 @@ da:
application:
back_to_top: "Tilbage til toppen"
be_excellent: "Vær gode ved hinanden! ♥"
+ discourse: "Projekt diskussion og support"
powered_by: "Kører på Diaspora"
public_feed: "Offentligt Diaspora-nyhedsfeed for %{name}"
source_package: "Download kildekoden"
@@ -688,7 +688,6 @@ da:
one: "%{actors} har nævnt dig i et slettet indlæg."
other: "%{actors} har nævnt dig i et slettet indlæg."
zero: "%{actors} har nævnt dig i et slettet indlæg."
- post: "indlæg"
private_message:
few: "%{actors} har sendt dig en besked."
many: "%{actors} har sendt dig en besked."
@@ -1103,6 +1102,8 @@ da:
streams:
activity:
title: "Min aktivitet"
+ admin:
+ title: "Admin"
aspects:
all: "Alle aspekter"
title: "Dine aspekter"
@@ -1230,7 +1231,7 @@ da:
follow_settings_not_changed: "Ændring af følgeskabsindstillinger mislykkedes."
language_changed: "Sprog ændret"
language_not_changed: "Kunne ikke ændre sprog"
- password_changed: "Adgangskode ændret"
+ password_changed: "Adgangskode ændret. Du kan nu logge ind med din nye adgangskode."
password_not_changed: "Kunne ikke ændre adgangskode"
settings_not_updated: "Der opstod en fejl ved opdatering af indstillinger"
settings_updated: "Indstillingerne blev opdateret"
diff --git a/config/locales/diaspora/de-CH.yml b/config/locales/diaspora/de-CH.yml
index 8f0629975e1e066ac667e3af80870671eb39f705..5b835e6c11d6386922ba47c6bcdfb63e66962c41 100644
--- a/config/locales/diaspora/de-CH.yml
+++ b/config/locales/diaspora/de-CH.yml
@@ -31,10 +31,6 @@ de-CH:
attributes:
poll:
already_participated: "Du hesch bi dere Umfrog scho mitgmacht!"
- request:
- attributes:
- from_id:
- taken: "isch es duplikat vonere scho existierende aafrog."
reshare:
attributes:
root_guid:
@@ -127,6 +123,7 @@ de-CH:
updating: "wird gänderet..."
index:
donate: "Spende"
+ donate_liberapay: "A liberapay spende"
help:
any_problem: "Git's es Problem?"
contact_podmin: "Kontaktier de Admin vo dim Pod!"
@@ -183,7 +180,6 @@ de-CH:
commenting: "Wird kommentiert..."
contacts:
index:
- add_a_new_aspect: "en neue Aspekt mache"
add_contact: "Kontakt hinzuefüege"
all_contacts: "Ali Kontäkt"
community_spotlight: "Intressanti Lüt"
@@ -318,6 +314,9 @@ de-CH:
logout: "Abmelde"
profile: "Profil"
settings: "Iistellige"
+ likes:
+ destroy:
+ error: "Gfallt mer nüme isch fehlgschlage."
limited: "Begrenzt"
more: "Meh"
no_results: "Kei Ergebnis gfunde"
@@ -367,7 +366,6 @@ de-CH:
mentioned_deleted:
one: "%{actors} het dich imene glöschte Biitrag erwähnt."
other: "%{actors} hend dich imene glöschte Biitrag erwähnt."
- post: "Biitrag"
private_message:
one: "%{actors} het dir e Nochricht gschickt."
other: "%{actors} hend dir e Nochricht gschickt."
@@ -576,6 +574,8 @@ de-CH:
title: "Meldigsübersicht"
reshares:
comment_email_subject: "%{resharer} Reshare vo %{author}'s Biitrag"
+ create:
+ error: "Wiitersägä isch fehlgschlage"
reshare:
deleted: "Originalbiitrag isch vom Verfasser glöscht worde."
reshare_confirmation: "%{author}'s Biitrag wiitersägä?"
@@ -671,18 +671,24 @@ de-CH:
activity:
title: "Mini Aktivitätä"
aspects:
+ all: "Ali Aspekt"
title: "Mini Aspekt"
aspects_stream: "Aspekt"
comment_stream:
title: "Kommentierti Biiträg"
+ commented:
+ title: "Komentierti Biiträg"
community_spotlight_stream: "Kommunity Schiiwörferliecht"
followed_tag:
add_a_tag: "En Tag hinzuefüege"
+ all: "Ali Tags"
follow: "Folge"
title: "#tags dene du folgsch"
followed_tags_stream: "#tags dene du folgsch"
like_stream:
title: "\"gfallt mer\"-Stream"
+ liked:
+ title: "Biiträg wo dir gfalled"
mentioned_stream: "@Erwähnige"
mentions:
title: "@Erwähnige"
diff --git a/config/locales/diaspora/de-moo.yml b/config/locales/diaspora/de-moo.yml
index d9956ae65b9836ba3485bdfb35843fb1fd189efb..3902af533c29dde08d4f7884952d81c4d134e1d2 100644
--- a/config/locales/diaspora/de-moo.yml
+++ b/config/locales/diaspora/de-moo.yml
@@ -20,10 +20,6 @@ de-moo:
attributes:
diaspora_handle:
taken: "wird schon benutzt."
- request:
- attributes:
- from_id:
- taken: "wurde schon einmal angefordert."
reshare:
attributes:
root_guid:
@@ -170,7 +166,6 @@ de-moo:
commenting: "Kommentieren …"
contacts:
index:
- add_a_new_aspect: "Eine neue Herde hinzufügen"
all_contacts: "Alle Mitkühe"
community_spotlight: "Gemeinschafts-Focus"
my_contacts: "Meine Herden"
@@ -305,7 +300,6 @@ de-moo:
other: "%{actors} haben dich in einem gelöschten Beitrag erwähnt."
two: "%{actors} hat dich in einem bereits gelöschten Beitrag erwähnt."
zero: "Niemand hat dich in einem gelöschten Beitrag erwähnt."
- post: "Beitrag"
private_message:
few: "%{actors} haben dir eine Nachricht gesendet."
many: "%{actors} haben dir eine Nachricht gesendet."
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index e0acb6df2fe535747d1936fb5d4b409fb6cfe69c..f082500212c04460fe34f1c610ebb77e4161d606 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -31,10 +31,6 @@ de:
attributes:
poll:
already_participated: "Du hast an dieser Umfrage bereits teilgenommen!"
- request:
- attributes:
- from_id:
- taken: "wurde schon einmal angefordert."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ de:
fetching_diaspora_version: "Ermittle neueste diaspora*-Version"
pod_status: "Pod-Status"
pods:
+ pod_desktop_link: "Desktop-Ansicht"
+ pod_desktop_view: "Diese Seite ist in der mobilen Ansicht nicht verfügbar, bitte wechsele zur %{desktop_link}."
pod_network: "Pod-Netzwerk"
stats:
2weeks: "2 Wochen"
@@ -233,6 +231,8 @@ de:
here_to_help: "Die diaspora*-Gemeinschaft ist für dich da!"
mail_podmin: "Podmin-E-Mail"
need_help: "Benötigst du Hilfe?"
+ support_forum: "Du kannst auch dem %{support_forum} beitreten."
+ support_forum_link: "Hilfe-Forum"
tag_bug: "Problem"
tag_feature: "Verbesserung"
tag_question: "Frage"
@@ -282,7 +282,6 @@ de:
commenting: "Kommentieren …"
contacts:
index:
- add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
add_contact: "Kontakt hinzufügen"
all_contacts: "Alle Kontakte"
community_spotlight: "Gemeinschafts-Schaukasten"
@@ -612,6 +611,7 @@ de:
application:
back_to_top: "Zurück zum Anfang"
be_excellent: "Seid nett zueinander! ♥"
+ discourse: "Projektdiskussionen und Hilfe"
powered_by: "Betrieben mit diaspora*"
public_feed: "Öffentlicher diaspora* Feed von %{name}"
source_package: "Quelltextpaket runterladen"
@@ -661,7 +661,7 @@ de:
zero: "und niemand sonst"
comment_on_post: "Einen Beitrag Kommentiert"
liked: "Gefällt"
- mark_all_as_read: "Markiere alle als gelesen"
+ mark_all_as_read: "Alle als gelesen markieren"
mark_all_shown_as_read: "Alle angezeigten als gelesen markieren"
mark_read: "Als gelesen markieren"
mark_unread: "als ungelesen markieren"
@@ -691,7 +691,6 @@ de:
one: "%{actors} hat dich in einem gelöschten Beitrag erwähnt."
other: "%{actors} haben dich in einem gelöschten Beitrag erwähnt."
zero: "%{actors} haben dich in einem gelöschten Beitrag erwähnt."
- post: "Beitrag"
private_message:
few: "%{actors} haben dir eine Nachricht gesendet."
many: "%{actors} haben dir eine Nachricht gesendet."
@@ -1105,6 +1104,8 @@ de:
streams:
activity:
title: "Meine Aktivitäten"
+ admin:
+ title: "Administration"
aspects:
all: "Alle Aspekte"
title: "Meine Aspekte"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 9ca6f1c1e5f1062450831852a49f2772633346d6..3c7b6a33a611ff46000257d0bb81d777ca178737 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -31,10 +31,6 @@ de_formal:
attributes:
poll:
already_participated: "Sie haben an dieser Umfrage bereits teilgenommen!"
- request:
- attributes:
- from_id:
- taken: "wurde schon einmal angefordert."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ de_formal:
fetching_diaspora_version: "Ermittle neueste diaspora*-Version"
pod_status: "Pod-Status"
pods:
+ pod_desktop_link: "Desktop-Ansicht"
+ pod_desktop_view: "Diese Seite ist in der mobilen Ansicht nicht verfügbar, bitte wechseln Sie zur %{desktop_link}."
pod_network: "Pod-Netzwerk"
stats:
2weeks: "2 Wochen"
@@ -224,7 +222,7 @@ de_formal:
donate: "Spenden"
donate_liberapay: "An liberapay spenden"
help:
- any_problem: "Gibt es ein Problem?"
+ any_problem: "Sie sind auf ein Problem gestoßen?"
contact_podmin: "Kontaktieren Sie den Administrator Ihres Pods!"
do_you: "Haben Sie:"
feature_suggestion: "… einen %{link} Vorschlag?"
@@ -233,17 +231,19 @@ de_formal:
here_to_help: "Die diaspora*-Gemeinschaft ist für Sie da!"
mail_podmin: "Podmin E-Mail"
need_help: "Benötigen Sie Hilfe?"
+ support_forum: "Sie können auch dem %{support_forum} beitreten."
+ support_forum_link: "Hilfe-Forum"
tag_bug: "#bug"
tag_feature: "#feature"
tag_question: "#question"
tutorial_link_text: "Anleitungen"
tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: Hilfe für Ihre ersten Schritte."
introduce_yourself: "Das ist ihr Stream. Legen Sie los und stellen Sie sich vor."
- keep_pod_running: "Helfen Sie %{pod} schneller zu arbeiten und kaufen Sie unseren Servern ihren monatlichen Schuss Kaffee!"
+ keep_pod_running: "Mit einer monatlichen Spende helfen Sie %{pod} dabei, leistungsfähig zu bleiben und die Server mit ausreichend Kaffee zu versorgen!"
new_here:
- follow: "Folgen Sie %{link} und heißen Sie neue Benutzer auf diaspora* willkommen!"
+ follow: "Folgen Sie %{link} und begrüßen Sie neue Benutzer auf diaspora*!"
learn_more: "Mehr erfahren"
- title: "Heißen Sie neue Benutzer willkommen"
+ title: "Begrüßen Sie neue Benutzer"
services:
content: "Sie können die folgenden Dienste mit diaspora* verbinden:"
heading: "Dienste verbinden"
@@ -282,7 +282,6 @@ de_formal:
commenting: "Kommentieren …"
contacts:
index:
- add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
add_contact: "Kontakt hinzufügen"
all_contacts: "Alle Kontakte"
community_spotlight: "Gemeinschafts-Schaukasten"
@@ -291,7 +290,7 @@ de_formal:
no_contacts_in_aspect: "Sie haben noch keine Kontakte in diesem Aspekt. Unten befindet sich eine Liste Ihrer bestehenden Kontakte, die Sie zu diesem Aspekt hinzufügen können."
no_contacts_message: "Erkunden Sie den %{community_spotlight}"
only_sharing_with_me: "Nur mit Ihnen Teilende"
- start_a_conversation: "Starten Sie eine Unterhaltung"
+ start_a_conversation: "Beginnen Sie eine Unterhaltung"
title: "Kontakte"
user_search: "Kontaktsuche"
spotlight:
@@ -605,13 +604,14 @@ de_formal:
comma_separated_plz: "Sie können mehrere E-Mail-Adressen, getrennt durch Kommas, eingeben."
invite_someone_to_join: "Laden Sie jemanden zu diaspora* ein!"
language: "Sprache"
- paste_link: "Teilen Sie diesen Link mit Ihren Freunden, um sie zu diaspora* einzuladen oder schicken Sie ihnen den Link direkt per E-Mail."
+ paste_link: "Teilen Sie diesen Link mit Ihren Freunden, um sie zu diaspora* einzuladen, oder schicken Sie Ihnen den Link direkt per E-Mail."
send_an_invitation: "Eine Einladung senden"
sending_invitation: "Sende Einladung..."
layouts:
application:
back_to_top: "Nach oben"
be_excellent: "Seien Sie nett zueinander! ♥"
+ discourse: "Projektdiskussionen und Hilfe"
powered_by: "Betrieben mit diaspora*"
public_feed: "Öffentlicher diaspora* Feed von %{name}"
source_package: "Quelltextpaket herunterladen"
@@ -691,7 +691,6 @@ de_formal:
one: "%{actors} hat Sie in einem gelöschten Beitrag erwähnt."
other: "%{actors} haben Sie in einem gelöschten Beitrag erwähnt."
zero: "%{actors} haben Sie in einem gelöschten Beitrag erwähnt."
- post: "Beitrag"
private_message:
few: "%{actors} haben Ihnen eine Nachricht gesendet."
many: "%{actors} haben Ihnen eine Nachricht gesendet."
@@ -1034,10 +1033,10 @@ de_formal:
one: "In einem Aspekt"
other: "In %{count} Aspekten"
invitations:
- by_email: "Lade Leute per E-Mail ein"
+ by_email: "Leute per E-Mail einladen"
invite_your_friends: "Laden Sie Ihre Freunde ein"
invites: "Einladungen"
- share_this: "Teilen Sie diesen Link per E-Mail, Blog oder soziale Netzwerke!"
+ share_this: "Teilen Sie diesen Link per E-Mail, Blog oder über die sozialen Netzwerke!"
public_explain:
atom_feed: "Atom-Feed"
control_your_audience: "Kontrollieren Sie Ihre Zielgruppe"
@@ -1098,6 +1097,8 @@ de_formal:
streams:
activity:
title: "Ihre Aktivitäten"
+ admin:
+ title: "Administration"
aspects:
all: "Alle Aspekte"
title: "Ihre Aspekte"
@@ -1180,14 +1181,14 @@ de_formal:
export_in_progress: "Vorbereitung Ihrer Daten läuft - schauen Sie etwas später noch mal vorbei."
export_photos_in_progress: "Ihre Fotos werden derzeit verarbeitet. Bitte sehen Sie in wenigen Augenblicken erneut nach."
following: "Teilen-Einstellungen"
- last_exported_at: "(Zuletzt aktualisiert um %{timestamp})"
+ last_exported_at: "(Zuletzt aktualisiert am %{timestamp})"
liked: "wenn jemandem Ihr Beitrag gefällt"
mentioned: "Sie in einem Beitrag erwähnt werden"
new_password: "Neues Passwort"
private_message: "Sie eine private Nachricht erhalten"
receive_email_notifications: "E-Mail-Benachrichtigungen empfangen, wenn:"
request_export: "Meine Profildaten anfordern"
- request_export_photos: "Meine Fotos anfragen"
+ request_export_photos: "Meine Fotos anfordern"
request_export_photos_update: "Meine Fotos aktualisieren"
request_export_update: "Meine Profildaten aktualisieren"
reshared: "jemand Ihren Beitrag weitersagt"
@@ -1213,7 +1214,7 @@ de_formal:
ignored_users: "Ignorierte Benutzer"
no_user_ignored_message: "Sie ignorieren momentan keine anderen Benutzer"
stop_ignoring: "Ignorieren beenden"
- strip_exif: "Entferne Metadaten z.B. Ort, Autor und Kameramodell von hochgeladenen Bildern (empfohlen)"
+ strip_exif: "Metadaten (z. B. Ort, Autor oder Kameramodell) von hochgeladenen Bildern entfernen (empfohlen)"
title: "Privatsphäre-Einstellungen"
public:
does_not_exist: "Benutzer %{username} existiert nicht!"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index cce763ee18b7bb2c625963c0522fee2ac736c5e0..4b26f54e71fa0744a09074820ece7b80d037e5e4 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -21,10 +21,6 @@ el:
attributes:
diaspora_handle:
taken: "είναι ήδη σε χÏήση"
- request:
- attributes:
- from_id:
- taken: "είναι αντίγÏαφο ενός Ï€ÏοϋπάÏχοντος αιτήματος."
reshare:
attributes:
root_guid:
@@ -182,7 +178,6 @@ el:
commenting: "Σχολιάζει..."
contacts:
index:
- add_a_new_aspect: "Î Ïόσθεσε μια νÎα πτυχή"
all_contacts: "Όλες οι επαφÎÏ‚"
community_spotlight: "ΔημοσιεÏσεις κοινότητας"
my_contacts: "Οι επαφÎÏ‚ μου"
@@ -352,7 +347,6 @@ el:
one: "Ο/Η %{actors} σου ανÎφεÏε σε μια διαγÏαμμÎνη δημοσίευση."
other: "Οι %{actors} σου ανÎφεÏαν σε μια διαγÏαμμÎνη δημοσίευση."
zero: "Ο/Η %{actors} σου ανÎφεÏε σε μια διαγÏαμμÎνη δημοσίευση."
- post: "ανάÏτηση"
private_message:
one: "Ο/Η %{actors} σου Îστειλε Îνα μήνυμα."
other: "Οι %{actors} σου Îστειλαν Îνα μήνυμα."
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 3116e0c1927b33771351f03c115a1b47270cd547..be2a06f99263323d00b0c25091be14de2f29b005 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -55,14 +55,10 @@ en:
attributes:
person_id:
taken: "must be unique among this user’s contacts."
- request:
- attributes:
- from_id:
- taken: "is a duplicate of a pre-existing request."
reshare:
attributes:
root_guid:
- taken: "That good, eh? You've already reshared that post!"
+ taken: "That good, eh? You've already reshared that post!"
poll:
attributes:
poll_answers:
@@ -117,7 +113,7 @@ en:
id: "ID"
guid: "GUID"
email: "Email"
- diaspora_handle: "diaspora* handle"
+ diaspora_handle: "diaspora* ID"
last_seen: "Last seen"
account_closed: "Account closed"
nsfw: "#nsfw"
@@ -160,6 +156,8 @@ en:
tag_name: "Tag name: %{name_tag} Count: %{count_tag}"
pods:
pod_network: "Pod network"
+ pod_desktop_view: "This page is not available on mobile view, please switch to %{desktop_link}."
+ pod_desktop_link: "desktop view"
aspects:
edit:
confirm_remove_aspect: "Are you sure you want to delete this aspect?"
@@ -172,7 +170,7 @@ en:
you_should_add_some_more_contacts: "You should add some more contacts!"
try_adding_some_more_contacts: "You can search or %{invite_link} more contacts."
invite_link_text: "invite"
- or_spotlight: "Or you can share with %{link}"
+ or_spotlight: "Or you can share with %{link}"
community_spotlight: "Community spotlight"
aspect_listings:
add_an_aspect: "+ Add an aspect"
@@ -196,7 +194,7 @@ en:
keep_pod_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
donate_liberapay: "Donate to liberapay"
welcome_to_diaspora: "Welcome to diaspora*, %{name}!"
- introduce_yourself: "This is your stream. Jump in and introduce yourself."
+ introduce_yourself: "This is your stream. Jump in and introduce yourself."
new_here:
title: "Welcome new users"
@@ -215,6 +213,8 @@ en:
tag_feature: "feature"
tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: help for your first steps."
tutorial_link_text: "Tutorials"
+ support_forum: "You can also join the %{support_forum}."
+ support_forum_link: "support forum"
any_problem: "Got a problem?"
contact_podmin: "Contact the administrator of your pod!"
mail_podmin: "Podmin email"
@@ -250,7 +250,6 @@ en:
contacts:
index:
start_a_conversation: "Start a conversation"
- add_a_new_aspect: "Add a new aspect"
title: "Contacts"
no_contacts: "Looks like you need to add some contacts!"
no_contacts_message: "Check out %{community_spotlight}"
@@ -568,9 +567,9 @@ en:
sending_invitation: "Sending invitation..."
paste_link: "Share this link with your friends to invite them to diaspora*, or email them the link directly."
codes_left:
- zero: "No invites left on this code"
- one: "One invite left on this code"
- other: "%{count} invites left on this code"
+ zero: "No invites left on this code"
+ one: "One invite left on this code"
+ other: "%{count} invites left on this code"
layouts:
header:
@@ -583,6 +582,7 @@ en:
powered_by: "Powered by diaspora*"
whats_new: "What’s new?"
statistics_link: "Pod statistics"
+ discourse: "Project discussions and support"
toggle: "Toggle mobile"
public_feed: "Public diaspora* feed for %{name}"
back_to_top: "Back to top"
@@ -624,7 +624,6 @@ en:
zero: "%{actors} have reshared your post %{post_link}."
one: "%{actors} has reshared your post %{post_link}."
other: "%{actors} have reshared your post %{post_link}."
- post: "post"
also_commented_deleted:
zero: "%{actors} commented on a deleted post."
one: "%{actors} commented on a deleted post."
@@ -908,9 +907,9 @@ en:
photos:
create:
- runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
- integrity_error: "Photo upload failed. Are you sure that was an image?"
- type_error: "Photo upload failed. Are you sure an image was added?"
+ runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?"
+ integrity_error: "Photo upload failed. Are you sure that was an image?"
+ type_error: "Photo upload failed. Are you sure an image was added?"
destroy:
notice: "Photo deleted."
new_profile_photo:
@@ -1075,8 +1074,8 @@ en:
share_this: "Share this link via email, blog, or social networks!"
public_explain:
control_your_audience: "Control your audience"
- new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions"
- visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)"
+ new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests. Call out awesome people with @Mentions"
+ visibility_dropdown: "Use this dropdown to change visibility of your post. (We suggest you make this first one public.)"
title: "Set up connected services"
share: "Share"
outside: "Public messages will be available for others outside of diaspora* to see."
@@ -1132,6 +1131,9 @@ en:
follow: "Follow"
all: "All tags"
+ admin:
+ title: "Admin"
+
tags:
title: "Posts tagged: %{tags}"
@@ -1226,11 +1228,11 @@ en:
connect_to_facebook: "We can speed things up a bit by %{link} to diaspora*. This will pull your name and photo, and enable cross-posting."
connect_to_facebook_link: "Hooking up your Facebook account"
what_are_you_in_to: "What are you into?"
- hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They’re also a great way to find new people on diaspora*."
+ hashtag_explanation: "Hashtags allow you to talk about and follow your interests. They’re also a great way to find new people on diaspora*."
hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
update:
- password_changed: "Password changed. You can now log in with your new password."
+ password_changed: "Password changed. You can now log in with your new password."
password_not_changed: "Password change failed"
language_changed: "Language changed"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 0d361dcf441626ab3f765ba1ae4ad7a1cf655ffd..dfb4d483c12dfdbc5bf5b3d65317f2c659b2259c 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -21,10 +21,6 @@ en_1337:
attributes:
diaspora_handle:
taken: "41r34dy pwnd"
- request:
- attributes:
- from_id:
- taken: "dup1!c473 -> d0n7 5p4m"
reshare:
attributes:
root_guid:
@@ -168,7 +164,6 @@ en_1337:
commenting: "5P4MM1NG..."
contacts:
index:
- add_a_new_aspect: "4DD 4 N3W 45P3C7!"
all_contacts: "4LL N00B5"
community_spotlight: "C0MMUN17Y 5P07L1GH7"
my_contacts: "Y0UR N00B5"
@@ -303,7 +298,6 @@ en_1337:
other: "%{actors} M3N710N3D U 1N 4 D3L373D P057."
two: "%{actors} M3N710N3D U 1N 4 D3L373D P057."
zero: "%{actors} M3N710N3D U 1N 4 D3L373D P057."
- post: "5p4mz"
private_message:
few: "%{actors} 53N7 U 4 M3554G3."
many: "%{actors} 53N7 U 4 M3554G3."
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index e122b0598e3be34bc06f73a0f5b1cadfa3e3e8d4..2f47a4b00817cf583a8b071a3457d49ed328ec11 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -21,10 +21,6 @@ en_pirate:
attributes:
diaspora_handle:
taken: "has been hornswaggled!"
- request:
- attributes:
- from_id:
- taken: "is a another one of something that already exists ye scallywag!"
reshare:
attributes:
root_guid:
@@ -129,7 +125,6 @@ en_pirate:
commenting: "Commentin'"
contacts:
index:
- add_a_new_aspect: "Add a new crew"
add_contact: "Add matey"
all_contacts: "All yer mateys"
community_spotlight: "Crew spotlight"
@@ -270,7 +265,6 @@ en_pirate:
other: "%{actors} mentioned you in a scuttled post."
two: "%{actors} mentioned you in a scuttled post."
zero: "%{actors} mentioned you in a scuttled post."
- post: "post"
private_message:
few: "%{actors} sent you a message."
many: "%{actors} sent you a message."
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index a5441825c37507ff6d7fc59ddd64452e3ae59488..e89763e610e14773f91137e2010b78193b61eac8 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -19,10 +19,6 @@ en_shaw:
attributes:
diaspora_handle:
taken: "ð‘¦ð‘Ÿ ð‘·ð‘¤ð‘®ð‘§ð‘›ð‘¦ ð‘‘ð‘±ð‘’ð‘©ð‘¯"
- request:
- attributes:
- from_id:
- taken: "ð‘¦ð‘Ÿ ð‘›ð‘µð‘ð‘¤ð‘¦ð‘’ð‘©ð‘‘ ð‘ ð‘© ð‘ð‘®ð‘¦-ð‘§ð‘œð‘Ÿð‘¦ð‘•ð‘‘ð‘¦ð‘™ ð‘®ð‘¦ð‘’ð‘¢ð‘§ð‘•ð‘‘."
reshare:
attributes:
root_guid:
@@ -90,7 +86,6 @@ en_shaw:
commenting: "ð‘’ð‘ªð‘¥ð‘©ð‘¯ð‘‘ð‘¦ð‘™..."
contacts:
index:
- add_a_new_aspect: "ð‘¨ð‘› ð‘¯ð‘¿ ð‘¨ð‘•ð‘ð‘§ð‘’ð‘‘"
all_contacts: "ð‘·ð‘¤ ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•"
my_contacts: "ð‘¥ð‘² ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•"
no_contacts: "ð‘¯ð‘´ ð‘’ð‘ªð‘¯ð‘‘ð‘¨ð‘’ð‘‘ð‘•."
@@ -201,7 +196,6 @@ en_shaw:
other: "%{actors} ð‘¥ð‘§ð‘¯ð‘–ð‘©ð‘¯ð‘› ð‘¿ ð‘¦ð‘¯ ð‘© ð‘›ð‘¦ð‘¤ð‘°ð‘‘ð‘©ð‘› ð‘ð‘´ð‘•ð‘‘."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} ð‘¥ð‘§ð‘¯ð‘–ð‘©ð‘¯ð‘› ð‘¿ ð‘¦ð‘¯ ð‘© ð‘›ð‘¦ð‘¤ð‘°ð‘‘ð‘©ð‘› ð‘ð‘´ð‘•ð‘‘."
- post: "ð‘ð‘´ð‘•ð‘‘"
private_message:
few: "%{actors} ð‘•ð‘§ð‘¯ð‘‘ ð‘¿ ð‘© ð‘¥ð‘§ð‘•ð‘©ð‘¡."
many: "%{actors} ð‘•ð‘§ð‘¯ð‘‘ ð‘¿ ð‘© ð‘¥ð‘§ð‘•ð‘©ð‘¡."
diff --git a/config/locales/diaspora/en_valspeak.yml b/config/locales/diaspora/en_valspeak.yml
index 04651f1b7a5f220c360ac9577ddf4550bff7c564..7bcd8ba3ac9070c6830d6b807f06be8979a0ebc3 100644
--- a/config/locales/diaspora/en_valspeak.yml
+++ b/config/locales/diaspora/en_valspeak.yml
@@ -31,10 +31,6 @@ en_valspeak:
attributes:
poll:
already_participated: "uve like... already voted on this poll!! derp."
- request:
- attributes:
- from_id:
- taken: "is like... the same as another thing.."
reshare:
attributes:
root_guid:
@@ -209,7 +205,6 @@ en_valspeak:
commenting: "sayin somethin"
contacts:
index:
- add_a_new_aspect: "add a new aspect!"
add_contact: "Add BFF <3"
all_contacts: "All BFFs!!"
community_spotlight: "d* celebz <33"
@@ -570,7 +565,6 @@ en_valspeak:
one: "%{actors} like... mentioned u in a trashed postie."
other: "%{actors} like... mentioned u in a trashed postie."
zero: "%{actors} like... mentioned u in a trashed postie."
- post: "postie!!"
private_message:
one: "%{actors} sent u a txt"
other: "%{actors} sent u a txt"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 8cec5a7d33936790b056c13e823cf8bef73966d8..a1a29b5a1c66c37ed1be8b6ad3452616db53281e 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -21,10 +21,6 @@ eo:
attributes:
diaspora_handle:
taken: "estas jam prenita."
- request:
- attributes:
- from_id:
- taken: "estas duoblo de jam ekzistanta peto."
reshare:
attributes:
root_guid:
@@ -173,7 +169,6 @@ eo:
commenting: "Komentanta..."
contacts:
index:
- add_a_new_aspect: "Aldoni novan aspekton"
all_contacts: "Ĉiuj kontaktoj"
community_spotlight: "En la ĉeflumo de la komunumo"
my_contacts: "Miaj kontaktoj"
@@ -318,7 +313,6 @@ eo:
other: "%{actors} menciis vin en forigita afiÅo."
two: "%{actors} menciis vin en foritan afiÅon."
zero: "%{actors} menciis vin en forigita afiÅo."
- post: "afiÅo"
private_message:
few: "%{actors} sendis al vi poÅton."
many: "%{actors} sendis al vi poÅton."
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 6c62ac632822fa6cd78bbbd93ad87eb0f2a219b3..db4df5fcd4542d95f44a26713e61b89805793a99 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -31,10 +31,6 @@ es-AR:
attributes:
poll:
already_participated: "¡Ya has participado en esta encuesta!"
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud preexistente."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ es-AR:
fetching_diaspora_version: "Determinando la última versión de diaspora*..."
pod_status: "Estado del pod"
pods:
+ pod_desktop_link: "vista de escritorio"
+ pod_desktop_view: "Esta página no está disponible en la versión móvil, por favor cambia a %{desktop_link}."
pod_network: "Red de pods"
stats:
2weeks: "2 semanas"
@@ -92,7 +90,7 @@ es-AR:
week: "Semana"
user_entry:
account_closed: "Cuenta de usuario cerrada"
- diaspora_handle: "Dirección diaspora*"
+ diaspora_handle: "Tu ID de diaspora*"
email: "Correo electrónico"
guid: "GUID"
id: "Identificador ID"
@@ -233,12 +231,14 @@ es-AR:
here_to_help: "¡La comunidad de diaspora* está aquà para ayudarte!"
mail_podmin: "Correo electrónico del administrador del pod"
need_help: "¿Necesitás ayuda?"
+ support_forum: "También puedes acceder al %{support_forum}."
+ support_forum_link: "foro de ayuda"
tag_bug: "error"
tag_feature: "idea"
tag_question: "pregunta"
tutorial_link_text: "Tutoriales"
tutorials_and_wiki: "%{faq}, %{tutorial} y %{wiki}: Ayuda para tus primeros pasos en diaspora*."
- introduce_yourself: "Este es tu stream. Zambullite en el y presentate."
+ introduce_yourself: "Esta es tu Entrada. Zambúllete en ella y preséntate ante la comunidad de diaspora*."
keep_pod_running: "¡Haz que %{pod} siga corriendo rápido, y compra a nuestros servidores su dosis de café con una donación mensual!"
new_here:
follow: "Sigue la etiqueta %{link} y da la bienvenida a los nuevos usuarios de Diaspora*!"
@@ -282,7 +282,6 @@ es-AR:
commenting: "Comentando..."
contacts:
index:
- add_a_new_aspect: "Añadir un nuevo aspecto"
add_contact: "Agregar contacto"
all_contacts: "Todos los contactos"
community_spotlight: "Comunidad Creativa"
@@ -612,6 +611,7 @@ es-AR:
application:
back_to_top: "Volver al inicio"
be_excellent: "¡La cruzada por una red social Libre! ♥"
+ discourse: "Discusión y soporte del proyecto"
powered_by: "Impulsado por diaspora*"
public_feed: "Canal público para %{name}"
source_package: "Descargar el paquete con el código fuente"
@@ -691,7 +691,6 @@ es-AR:
one: "%{actors} te mencionó en una publicación eliminada."
other: "%{actors} te mencionaron en una publicación eliminada."
zero: "%{actors} te mencionaron en una publicación eliminada."
- post: "publicación"
private_message:
few: "%{actors} te enviaron un mensaje."
many: "%{actors} te enviaron un mensaje."
@@ -1046,11 +1045,11 @@ es-AR:
control_your_audience: "Controlá tu audiencia"
logged_in: "Conectado a %{service}"
manage: "Gestionar servicios conectados"
- new_user_welcome_message: "Usa #hashtags para clasificar tus publicaciones y encontrar gente que comparte tus intereses. Llama a gente interesante usando las @Menciones"
+ new_user_welcome_message: "Usa las #etiquetas para clasificar tus publicaciones y encontrar gente que comparte tus intereses. Llama la atención de gente interesante usando las @Menciones"
outside: "Las publicaciones públicas podrán ser vistas por otros fuera de diaspora*."
share: "Comparte"
title: "Gestioná los servicios conectados"
- visibility_dropdown: "Usa este menú para cambiar la visibilidad de tu publicación. (Sugerimos hacer público el primero.)"
+ visibility_dropdown: "Utiliza este menú para cambiar la visibilidad de tu publicación. (Sugerimos hacer pública la primera)"
publisher:
discard_post: "Descartar publicación"
formatWithMarkdown: "Puedes usar %{markdown_link} para darle formato a tu publicación"
@@ -1101,6 +1100,8 @@ es-AR:
streams:
activity:
title: "Mi actividad"
+ admin:
+ title: "Administrar"
aspects:
all: "Todos los aspectos"
title: "Mis aspectos"
@@ -1228,7 +1229,7 @@ es-AR:
follow_settings_not_changed: "Error al cambiar la configuración de seguimiento."
language_changed: "El idioma se ha cambiado"
language_not_changed: "No pudo cambiarse el idioma"
- password_changed: "Tu contraseña se cambió. Ya podés conectarte con tu nueva contraseña."
+ password_changed: "Tu contraseña se cambió. Ya podés conectarte con tu nueva contraseña."
password_not_changed: "No pudo cambiarse tu contraseña"
settings_not_updated: "Error actualizando la configuración"
settings_updated: "Configuración actualizada"
diff --git a/config/locales/diaspora/es-BO.yml b/config/locales/diaspora/es-BO.yml
index 47048b491bfa2a497f95f0130d2f00d7bd1e62d0..e2c1509a020665e546d80c84c9b88cea7f73b7d5 100644
--- a/config/locales/diaspora/es-BO.yml
+++ b/config/locales/diaspora/es-BO.yml
@@ -20,10 +20,6 @@ es-BO:
attributes:
diaspora_handle:
taken: "ya está ocupado."
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud preexistente."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 39aad1c4c8f7bfc76ab2e5f7aca361ff32b95613..b35d92f5a8f73168d8abf5ea102e942c1f461a72 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -21,10 +21,6 @@ es-CL:
attributes:
diaspora_handle:
taken: "Ya está siendo ocupado."
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud que ya existe."
reshare:
attributes:
root_guid:
@@ -174,7 +170,6 @@ es-CL:
commenting: "Comentando..."
contacts:
index:
- add_a_new_aspect: "Agregar un nuevo aspecto"
all_contacts: "Todos los Contactos"
community_spotlight: "Comunidad Creativa"
my_contacts: "Mis Contactos"
@@ -454,7 +449,6 @@ es-CL:
other: "%{actors} te mencionó en un post eliminado."
two: "%{actors} te mencionaron en un post eliminado."
zero: "%{actors} te mencionó en un post eliminado."
- post: "publicación"
private_message:
one: "%{actors} te envió un mensaje."
other: "%{actors} te enviaron mensajes"
diff --git a/config/locales/diaspora/es-CO.yml b/config/locales/diaspora/es-CO.yml
index 8806c28f37fbebaaedab142b357daf1ac6d2addf..4194004dc8a8766dac603b56058b8bb2f4f6eeb5 100644
--- a/config/locales/diaspora/es-CO.yml
+++ b/config/locales/diaspora/es-CO.yml
@@ -20,10 +20,6 @@ es-CO:
attributes:
diaspora_handle:
taken: "ya está ocupado."
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud preexistente."
reshare:
attributes:
root_guid:
@@ -109,7 +105,6 @@ es-CO:
commenting: "Comentando…"
contacts:
index:
- add_a_new_aspect: "Añade un nuevo aspecto"
all_contacts: "Todos los Contactos"
community_spotlight: "Comunidad Creativa"
my_contacts: "Mis Contactos"
@@ -192,7 +187,6 @@ es-CO:
one: "%{actors} te mencionó en una %{post_link}"
other: "%{actors} te mencionaron en una %{post_link}"
zero: "%{actors} te ha mencionado en una %{post_link}"
- post: "publicación"
private_message:
one: "%{actors} te envió un mensaje"
other: "%{actors} te enviaron mensajes"
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index c27d2a0ab82473a3ec0ef1c99e26876f2149a6fb..f4e29a8abbc3b3f4e0f4ccd7b82fc5fa38a9b3ee 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -21,10 +21,6 @@ es-MX:
attributes:
diaspora_handle:
taken: "ya está ocupado."
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud preexistente."
reshare:
attributes:
root_guid:
@@ -174,7 +170,6 @@ es-MX:
commenting: "Comentando…"
contacts:
index:
- add_a_new_aspect: "Añade un nuevo aspecto"
all_contacts: "Todos los contactos"
community_spotlight: "Lo más destacado de la comunidad"
my_contacts: "Mis contactos"
@@ -461,7 +456,6 @@ es-MX:
one: "%{actors} te mencionó en una publicación eliminada."
other: "%{actors} te mencionaron en una publicación eliminada."
zero: "%{actors} te mencionó en una publicación eliminada."
- post: "publicación"
private_message:
one: "%{actors} te envió un mensaje."
other: "%{actors} te enviaron un mensaje."
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index b54fc25c96e35d879dd8da3e0615caba52ae2b63..a366bc7bb02ccb224287ad10e30e527ba6a6d263 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -30,10 +30,6 @@ es:
attributes:
poll:
already_participated: "¡Ya has participado en esta encuesta!"
- request:
- attributes:
- from_id:
- taken: "es un duplicado de una solicitud que ya existe."
reshare:
attributes:
root_guid:
@@ -61,6 +57,8 @@ es:
fetching_diaspora_version: "Averiguando la última versión de diaspora*..."
pod_status: "Estado del pod"
pods:
+ pod_desktop_link: "vista de escritorio"
+ pod_desktop_view: "Esta página no está disponible en la vista movil, por favor cambia a %{desktop_link}"
pod_network: "Red POD"
stats:
2weeks: "2 semanas"
@@ -221,6 +219,8 @@ es:
here_to_help: "¡La comunidad Diaspora* está aquÃ!"
mail_podmin: "Correo del administrador"
need_help: "¿Necesitas ayuda?"
+ support_forum: "También puedes acceder al %{support_forum}"
+ support_forum_link: "foro de soporte"
tag_bug: "error"
tag_feature: "idea"
tag_question: "pregunta"
@@ -270,7 +270,6 @@ es:
commenting: "Comentando..."
contacts:
index:
- add_a_new_aspect: "Añade un nuevo aspecto"
add_contact: "Añadir contacto"
all_contacts: "Todos los contactos"
community_spotlight: "Lo más destacado"
@@ -598,6 +597,7 @@ es:
application:
back_to_top: "Volver arriba"
be_excellent: "¡Sed buenos! ♥"
+ discourse: "Discusión y soporte del proyecto"
powered_by: "Impulsado por Diaspora*"
public_feed: "Canal público de %{name} "
source_package: "Descargar el paquete del código fuente"
@@ -666,7 +666,6 @@ es:
one: "%{actors} te ha mencionado en una publicación eliminada."
other: "%{actors} te han mencionado en una publicación eliminada."
zero: "%{actors} te han mencionado en una publicación eliminada."
- post: "publicación"
private_message:
one: "%{actors} te ha escrito"
other: "%{actors} te han escrito."
@@ -1040,6 +1039,8 @@ es:
streams:
activity:
title: "Mi actividad"
+ admin:
+ title: "Administrador"
aspects:
all: "Todos los aspectos"
title: "Mis aspectos"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index ce619143596541d87772715d5386b81ce6501414..0f76decfc112c5af4a36827633fa2902a317e020 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -20,10 +20,6 @@ eu:
attributes:
diaspora_handle:
taken: "erabilpenean dago jada."
- request:
- attributes:
- from_id:
- taken: "lehenago egindako eskaera baten bikoizketa bat da."
reshare:
attributes:
root_guid:
@@ -166,7 +162,6 @@ eu:
commenting: "Iruzkintzen..."
contacts:
index:
- add_a_new_aspect: "Arlo berria gehitu"
all_contacts: "Adiskide Guztiak"
community_spotlight: "Komunitateko nabarmenduak"
my_contacts: "Nire Adiskideak"
@@ -297,7 +292,6 @@ eu:
other: "%{actors}(e)k mezu ezabatu batean aipatu zaitu(zte)."
two: "%{actors}(e)k mezu ezabatu batean aipatu zaitu(zte)."
zero: "%{actors}(e)k mezu ezabatu batean aipatu zaitu(zte)."
- post: "mezua"
private_message:
few: "%{actors}(e)k mezu bat bidali dizu(te)."
many: "%{actors}(e)k mezu bat bidali dizu(te)."
diff --git a/config/locales/diaspora/fa.yml b/config/locales/diaspora/fa.yml
index f488d69e12550707d6048db06708fec19755c9fb..02d2ba8070ba19d0ab10a0ece3a7c437a36bf603 100644
--- a/config/locales/diaspora/fa.yml
+++ b/config/locales/diaspora/fa.yml
@@ -20,10 +20,6 @@ fa:
attributes:
diaspora_handle:
taken: "درØال Øاظر گرÙته‌شده."
- request:
- attributes:
- from_id:
- taken: "با درخواست قبلی تکراری هست."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 00e7b4bc25b3c13622377b7210f35cf3b9ac1bd2..3c832b4f74eda62265c2054a1edb802d77ed0d0a 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -31,10 +31,6 @@ fi:
attributes:
poll:
already_participated: "Olet jo osallistunut tähän kyselyyn."
- request:
- attributes:
- from_id:
- taken: "on jo tehdyn pyynnön kaksoiskappale."
reshare:
attributes:
root_guid:
@@ -211,7 +207,6 @@ fi:
commenting: "Kommentoidaan..."
contacts:
index:
- add_a_new_aspect: "Lisää näkymä"
add_contact: "Lisää kontakti"
all_contacts: "Kaikki kontaktit"
community_spotlight: "Yhteisön valokeila"
@@ -569,7 +564,6 @@ fi:
one: "%{actors} mainitsi sinut poistetussa julkaisussa."
other: "%{actors} mainitsivat sinut poistetussa julkaisussa."
zero: "%{actors} mainitsi sinut poistetussa julkaisussa."
- post: "viesti"
private_message:
one: "%{actors} lähetti sinulle viestin."
other: "%{actors} lähettivät sinulle viestin."
diff --git a/config/locales/diaspora/fil.yml b/config/locales/diaspora/fil.yml
index 4310a75f818bcd44df867b236eb039dd32670390..e3ceebe9912a3a254cff668ea0c6c54174962bad 100644
--- a/config/locales/diaspora/fil.yml
+++ b/config/locales/diaspora/fil.yml
@@ -20,10 +20,6 @@ fil:
attributes:
diaspora_handle:
taken: "ay mayroon ng nagmamay-ari."
- request:
- attributes:
- from_id:
- taken: "ay kaparis na ng huling kahilingan."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index ba60ed525b6de29c284ed0d7857c9928d711be8b..6f6f7099b45e110fb0c00c45348401972fdbd4ad 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -31,10 +31,6 @@ fr:
attributes:
poll:
already_participated: "Vous avez déjà participé à ce sondage !"
- request:
- attributes:
- from_id:
- taken: "est un doublon d'une requête déjà existante."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ fr:
fetching_diaspora_version: "Entrain de déterminer la dernière version de diaspora*..."
pod_status: "État du pod"
pods:
+ pod_desktop_link: "Voir en mode ordinateur de bureau"
+ pod_desktop_view: "Cette page n'est pas disponible pour un affichage sur appareil mobile, veuillez choisir la version %{desktop_link}."
pod_network: "Réseau du pod"
stats:
2weeks: "Deux semaines"
@@ -229,6 +227,8 @@ fr:
here_to_help: "La communauté diaspora* est là !"
mail_podmin: "E-mail du podmin"
need_help: "Besoin d'aide ?"
+ support_forum: "Vous pouvez également parcourir le %{support_forum}."
+ support_forum_link: "Forum d'assistance"
tag_bug: "bug"
tag_feature: "suggestion"
tag_question: "question"
@@ -278,7 +278,6 @@ fr:
commenting: "Commentaire en cours d'envoi..."
contacts:
index:
- add_a_new_aspect: "Ajouter un nouvel aspect"
add_contact: "Ajouter ce contact"
all_contacts: "Tous les contacts"
community_spotlight: "Actualités de la communauté"
@@ -338,13 +337,13 @@ fr:
find_people: "Rechercher des personnes ou des #tags"
help:
account_and_data_management:
- close_account_a: "Rendez-vous en bas de la page de vos paramètres et cliquez sur le bouton \"Clôturer le compte\". Votre mot de passe vous sera demandé pour achever le processus. Nous vous rappelons que si vous fermez votre compte, vous ne pourrez plus en recréer sur ce pod avec ce nom d'utilisateur."
+ close_account_a: "Rendez-vous en bas de la page de vos paramètres et cliquez sur le bouton « Clôturer le compte ». Votre mot de passe vous sera demandé pour achever le processus. Nous vous rappelons que si vous fermez votre compte, vous ne pourrez plus en recréer sur ce pod avec ce nom d'utilisateur."
close_account_q: "Comment puis-je supprimer mon compte ?"
data_other_podmins_a: "Une fois que vous avez partagé avec des personnes d'un autre pod, chacun des messages que vous partagez avec eux ainsi qu'une copie des informations de votre profil sont stockées (mises en cache) sur leur pod, et accessibles à l'administrateur de la base de données de ce pod. Quand vous supprimez un message ou des informations de votre profil, ces données sont supprimées de votre pod et une demande de suppression est envoyée à tous les autres pods sur lesquels elles étaient stockées. Vos images ne sont jamais stockées sur un autre pod que le vôtre, seuls les liens y menant leur sont transmis."
data_other_podmins_q: "Est-ce que les administrateurs des autres pods peuvent voir mes informations ?"
- data_visible_to_podmin_a: "En bref : tout. La communication *entre* les pods est toujours chiffrée (en utilisant SSL et le propre chiffrage d'échange de diaspora*), mais le stockage des données sur les pods n'est pas chiffré. S'il le veut, l'administrateur de la base de données de votre pod (généralement la personne qui gère le pod) peut accéder à toutes les données de votre profil et à tout ce que vous avez publié (comme c'est le cas pour la plupart des sites web qui stockent des données d'utilisateurs). C'est pourquoi nous vous permettons de choisir le pod sur lequel vous vous inscrivez. Vous pouvez ainsi choisir un pod dont l'administrateur vous inspire confiance vis-à -vis de vos données. Utiliser votre propre pod garantit plus de confidentialité parce que vous avez le contrôle de l'accès à la base de données."
+ data_visible_to_podmin_a: "En bref : tout. La communication entre les pods est toujours chiffrée (en utilisant SSL et le propre chiffrage d'échange de diaspora*), mais le stockage des données sur les pods n'est pas chiffré. S'il le veut, l'administrateur de la base de données de votre pod (généralement la personne qui gère le pod) peut accéder à toutes les données de votre profil et à tout ce que vous avez publié (comme c'est le cas pour la plupart des sites web qui stockent des données d'utilisateurs). C'est pourquoi nous vous permettons de choisir le pod sur lequel vous vous inscrivez. Vous pouvez ainsi choisir un pod dont l'administrateur vous inspire confiance vis-à -vis de vos données. Utiliser votre propre pod garantit plus de confidentialité parce que vous avez le contrôle de l'accès à la base de données."
data_visible_to_podmin_q: "Quelle quantité de mes informations l'administrateur du pod peut-il voir ?"
- download_data_a: "Oui. En bas de l'onglet 'Compte' de votre page de paramètres il y a deux boutons : l'un pour télécharger vos données, l'autre pour télécharger vos photos."
+ download_data_a: "Oui. En bas de l'onglet 'Compte' de votre page de paramètres, il y a deux boutons : l'un pour télécharger vos données, l'autre pour télécharger vos photos."
download_data_q: "Puis-je télécharger une copie de toutes les données contenues dans mon compte ?"
move_pods_a: "Dans le futur vous pourrez exporter votre compte provenant d'un pod et l'importer dans un autre, mais ce n'est pas possible pour l'instant. Vous pouvez toujours ouvrir un nouveau compte et ajouter les contacts de vos aspects dans celui-ci, et leur demander d'ajouter le nouveau compte à leurs aspects."
move_pods_q: "Comment déplacer mon compte d'un pod à un autre ?"
@@ -393,7 +392,7 @@ fr:
getting_started_a: "Vous avez de la chance. Essayez la %{tutorial_series} sur le site web du projet. Elle vous guidera pas à pas dans les étapes d'inscription et vous apprendra toutes les bases concernant l'utilisation de diaspora*."
getting_started_q: "Aidez-moi ! J'ai besoin d'un peu d'aide pour débuter !"
title: "Obtenir de l'aide"
- getting_started_tutorial: "Série de tutoriels \"Mes premiers pas\""
+ getting_started_tutorial: "Série de tutoriels « Mes premiers pas »"
here: "ici"
irc: "IRC"
keyboard_shortcuts:
@@ -610,6 +609,7 @@ fr:
application:
back_to_top: "Retour en haut"
be_excellent: "Soyez bienveillant envers chacun ! ♥"
+ discourse: "Discussions sur le projet et assistance"
powered_by: "Propulsé par diaspora*"
public_feed: "Flux diaspora* public de %{name}"
source_package: "Téléchargez le code source"
@@ -683,7 +683,6 @@ fr:
one: "%{actors} vous a mentionné dans un message supprimé."
other: "%{actors} vous ont mentionné dans un message supprimé."
zero: "Personne ne vous a mentionné dans un message supprimé."
- post: "message"
private_message:
one: "%{actors} vous a envoyé un message."
other: "%{actors} vous ont envoyé un message."
@@ -784,7 +783,7 @@ fr:
message: |-
Bonjour !
- Vous avez été invité par %{diaspora_id} à rejoindre diaspora* !
+ Vous avez été invité·e par %{diaspora_id} à rejoindre diaspora* !
Cliquez sur ce lien pour vous lancer dans l'aventure :
@@ -792,6 +791,7 @@ fr:
Ou si vous avez déjà un compte, vous pouvez ajouter %{diaspora_id} à vos contacts.
+
Amicalement,
Le messager automatique de diaspora*
@@ -954,7 +954,7 @@ fr:
enter_username: "Choisissez un nom d'utilisateur (uniquement des lettres, chiffres et caractères de soulignement)"
password: "Mot de passe"
password_confirmation: "Confirmation du mot de passe"
- sign_up: "Inscrivez-vous"
+ sign_up: "Créer un compte"
submitting: "Envoi en cours…"
terms: "En créant un compte, vous acceptez les %{terms_link}"
terms_link: "conditions d'utilisation"
@@ -1025,7 +1025,7 @@ fr:
by_email: "Par courriel"
invite_your_friends: "Invitez vos amis"
invites: "Invitations"
- share_this: "Partagez ce lien par courriel, sur un blog ou via votre réseau social favori !"
+ share_this: "Partagez ce lien par courriel, sur un blog ou via les réseaux sociaux !"
public_explain:
atom_feed: "Flux Atom"
control_your_audience: "Contrôlez votre audience"
@@ -1086,6 +1086,8 @@ fr:
streams:
activity:
title: "Mon activité"
+ admin:
+ title: "Admin"
aspects:
all: "Tous les aspects"
title: "Mes aspects"
diff --git a/config/locales/diaspora/fy.yml b/config/locales/diaspora/fy.yml
index d7fedb053f7200357473c80a844e5e130011c47a..cbef18e01c1a758abdfcd585728835698a7f528a 100644
--- a/config/locales/diaspora/fy.yml
+++ b/config/locales/diaspora/fy.yml
@@ -73,8 +73,6 @@ fy:
settings: "Ynstellingen"
more: "Mear"
no_results: "Gjin Risseltaten Fûn"
- notifications:
- post: "berjocht"
notifier:
a_post_you_shared: "in berjocht."
click_here: "klik hjirre"
diff --git a/config/locales/diaspora/gd.yml b/config/locales/diaspora/gd.yml
index 87be78cd8d165f69309f4b9916235e9aa2f602d5..5df4a12f2421bc62fa35d5a379e21b3a0018b551 100644
--- a/config/locales/diaspora/gd.yml
+++ b/config/locales/diaspora/gd.yml
@@ -21,10 +21,6 @@ gd:
attributes:
diaspora_handle:
taken: "’s e aig cuideigin eile mu thrà th."
- request:
- attributes:
- from_id:
- taken: "’s e ’na dhùblachadh air iarrtas a tha ann mu thrà th."
reshare:
attributes:
root_guid:
@@ -128,7 +124,6 @@ gd:
notifications:
index:
and: "agus"
- post: "brath"
private_message:
one: "Tha %{actors} air teachdaireachd a chur thugad."
other: "Tha %{actors} air teachdaireachd a chur thugad."
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 03b55cb808198f53b8b4dd1666f23acb795bcba1..39ecf8b31b702c611422303197c5c0da53e93ff4 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -29,10 +29,6 @@ he:
attributes:
poll:
already_participated: "כבר השתתפת בסקר זה!"
- request:
- attributes:
- from_id:
- taken: "×–×”×” לבקשה שהתקבלה קוד×."
reshare:
attributes:
root_guid:
@@ -184,7 +180,6 @@ he:
commenting: "התגובה × ×©×œ×—×ª..."
contacts:
index:
- add_a_new_aspect: "הוספת היבט חדש"
all_contacts: "כל ×× ×©×™ הקשר"
community_spotlight: "×¤×¨×¡×•×ž×™× ×—×©×•×‘×™× ×‘×§×”×™×œ×”"
my_contacts: "×× ×©×™ הקשר שלי"
@@ -344,7 +339,6 @@ he:
one: "%{actors} הזכיר/×” ×ותך בהודעה ×©× ×ž×—×§×”."
other: "%{actors} הזכירו ×ותך בהודעה ×©× ×ž×—×§×”."
zero: "%{actors} הזכירו ×ותך בהודעה ×©× ×ž×—×§×”."
- post: "הודעה"
private_message:
one: "%{actors} שלח/ה לך הודעה."
other: "%{actors} שלחו לך הודעה."
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index a35696a0a6dad19f728b7eec89dabd16d3f51f13..e0dcd1b17bffffb50a4d904dd5a893d23b374c3c 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -31,10 +31,6 @@ hu:
attributes:
poll:
already_participated: "Már részt vettél ebben a körkérdésben!"
- request:
- attributes:
- from_id:
- taken: "már létező kérés."
reshare:
attributes:
root_guid:
@@ -214,7 +210,6 @@ hu:
commenting: "Hozzászólok.."
contacts:
index:
- add_a_new_aspect: "Új csoport"
add_contact: "Ismerős hozzáadása"
all_contacts: "Összes ismerős"
community_spotlight: "A figyelem középpontjában"
@@ -417,6 +412,7 @@ hu:
be_who_you_want_to_be_info: "Sok közösségi hálózat ragaszkodik ahhoz, hogy a valódi identitásod használd. A diaspora* nem. Itt az lehetsz, aki csak akarsz, és te döntöd el, hogy mennyi információt osztasz meg magadról. Itt tényleg rajtad áll a döntés, hogyan lépsz kapcsolatba másokkal."
byline: "Az online közösség, ahol tiéd az irányÃtás."
choose_your_audience: "Válaszd meg közönséged"
+ headline: "Üdvözöl a(z) %{pod_name}"
invitation_codes:
not_valid: "Ez a meghÃvó kód már nem érvényes"
invitations:
@@ -510,7 +506,6 @@ hu:
other: "%{actors} megemlÃtett téged egy, már törölt bejegyzésben."
two: "%{actors} megemlÃtett téged egy törölt bejegyzésben."
zero: "%{actors} megemlÃtett téged egy, már törölt bejegyzésben."
- post: "bejegyzés"
private_message:
few: "%{actors} üzenetet küldött neked."
many: "%{actors} üzenetet küldött neked."
diff --git a/config/locales/diaspora/hy.yml b/config/locales/diaspora/hy.yml
index d5cbdd905499e61d35888dc93e576139f70e242c..6f9a8318869d00ef872e7495f068ffd82b319a2f 100644
--- a/config/locales/diaspora/hy.yml
+++ b/config/locales/diaspora/hy.yml
@@ -31,14 +31,10 @@ hy:
attributes:
poll:
already_participated: "Ô±Ö€Õ¤Õ¥Õ¶ Õ´Õ¡Õ½Õ¶Õ¡Õ¯ÖÕ¥Õ¬ Õ¥Õ½ Õ¡ÕµÕ½ Õ°Õ¡Ö€ÖÕ´Õ¡Õ¶Õ¨Ö‰"
- request:
- attributes:
- from_id:
- taken: "Õ¡Ö€Õ¤Õ¥Õ¶ Õ£Õ¸ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¸Ö‚Õ¶Õ¥ÖÕ¸Õ² Õ°Õ¡ÕµÕ¿Õ« Õ¯Ö€Õ¯Õ¶Ö…Ö€Õ«Õ¶Õ¡Õ¯ Õ§Ö‰"
reshare:
attributes:
root_guid:
- taken: "Էդքան լա՞վն ա։  Արդեն տարածել ես այս գրառումը։"
+ taken: "Էդքան լա՞վն ա․․․ Արդեն տարածել ես այս գրառումը։"
user:
attributes:
email:
@@ -70,9 +66,9 @@ hy:
one: "%{count} Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
other: "%{count} Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
zero: "%{count} Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
- current_segment: "ÕÕ¾ÕµÕ¡Õ¬ Õ°Õ¡Õ¿Õ¸Ö‚ÕµÕ©Õ¸Ö‚Õ´ ÕµÕ¸Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹ÕµÕ¸Ö‚Ö€ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨ Õ´Õ«Õ»Õ«Õ¶Õ¸Ö‚Õ´ Õ°Õ¡Õ½Õ¶Õ¸Ö‚Õ´ Õ§ <b>%{post_yest}</b> Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´, Õ½Õ¯Õ½Õ¡Õ®` <b>%{post_day}</b>"
+ current_segment: "ÕÕ¾ÕµÕ¡Õ¬ Õ°Õ¡Õ¿Õ¸Ö‚ÕµÕ©Õ¸Ö‚Õ´ ÕµÕ¸Ö‚Ö€Õ¡Ö„Õ¡Õ¶Õ¹ÕµÕ¸Ö‚Ö€ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ¨ Õ´Õ«Õ»Õ«Õ¶Õ¸Ö‚Õ´ Õ°Õ¡Õ½Õ¶Õ¸Ö‚Õ´ Õ§ %{post_yest} Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´, Õ½Õ¯Õ½Õ¡Õ®` %{post_day}"
daily: "Õ•Ö€Õ¡Õ¯Õ¡Õ¶"
- display_results: "Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¾Õ¡Õ® Õ¥Õ¶ <b>%{segment}</b> ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ« Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨"
+ display_results: "Õ†Õ¥Ö€Õ¯Õ¡ÕµÕ¡ÖÕ¾Õ¡Õ® Õ¥Õ¶ %{segment} ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ« Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€Õ¨"
go: "Ô±Õ¼Õ¡Õ›Õ»"
month: "Ô±Õ´Õ«Õ½"
posts:
@@ -83,7 +79,7 @@ hy:
one: "%{count} Õ¯Õ«Õ½Õ¾Õ¸Õ²"
other: "%{count} Õ¯Õ«Õ½Õ¾Õ¸Õ²"
zero: "%{count} Õ¯Õ«Õ½Õ¾Õ¸Õ²"
- tag_name: "ÕŠÕ«Õ¿Õ¡Õ¯Õ¨Õ <b>%{name_tag}</b> Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¥Õ¬ Õ§` <b>%{count_tag}</b> Õ¡Õ¶Õ£Õ¡Õ´"
+ tag_name: "ÕŠÕ«Õ¿Õ¡Õ¯Õ %{name_tag} Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ¾Õ¥Õ¬ Õ§` <b>%{count_tag}</b> Õ¡Õ¶Õ£Õ¡Õ´"
usage_statistic: "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ¶ Õ¾Õ«Õ³Õ¡Õ¯Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶"
users:
one: "%{count} Ö…Õ£Õ¡Õ¿Õ¡Õ¿Õ¥Ö€"
@@ -274,7 +270,6 @@ hy:
commenting: "Մեկնաբանվում է…"
contacts:
index:
- add_a_new_aspect: "Õ†Õ¸Ö€ ÕÕ¸Ö‚Õ´Õ¢ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬"
add_contact: "Ô±Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬"
all_contacts: "Ô²Õ¸Õ¬Õ¸Ö€Õ¨"
community_spotlight: "Õ€Õ¡Õ´Õ¡ÕµÕ¶Ö„Õ« Õ¡Õ¯Õ¶Õ¡Õ¼Õ¸Ö‚ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€"
@@ -664,10 +659,11 @@ hy:
mentioned:
one: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ§ Ö„Õ¥Õ¦ %{post_link} Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
other: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ¥Õ¶ Ö„Õ¥Õ¦ %{post_link} Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
+ zero: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ§ Ö„Õ¥Õ¦ %{post_link} Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
mentioned_deleted:
one: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ§ Ö„Õ¥Õ¦ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
other: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ¥Õ¶ Ö„Õ¥Õ¦ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
- post: "Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´"
+ zero: "%{actors} Õ¶Õ·Õ¥Õ¬ Õ§ Ö„Õ¥Õ¦ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ¶ Õ´Õ¥Õ»Ö‰"
private_message:
one: "%{actors} Ö„Õ¥Õ¦ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ§ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬Ö‰"
other: "%{actors} Ö„Õ¥Õ¦ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¥Õ¶ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬Ö‰"
@@ -843,9 +839,9 @@ hy:
has_not_shared_with_you_yet: "%{name} Õ¤Õ¥Õ¼ Õ¹Õ« Õ¯Õ«Õ½Õ¾Õ¥Õ¬ Ö„Õ¸ Õ°Õ¥Õ¿ Õ¸Ö€Ö‡Õ§ Õ£Ö€Õ¡Õ¼Õ´Õ¡Õ´Õ¢Ö‰"
photos:
create:
- integrity_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥Ö։  Համոզվա՞ծ Õ¥Õ½, Õ¸Ö€ Õ¤Õ¡ Õ¶Õ¯Õ¡Ö€ Õ§Ö€Ö‰"
- runtime_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥ÖÖ‰ Õ€Õ¡Õ´Õ¸Õ¦Õ¾Õ¡ÕžÕ® Õ¥Õ½, Õ¸Ö€ Õ¡Õ´Ö€Õ¡Õ£Õ¸Õ¿Õ«Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡ÕºÕ¥Õ¬ Õ§Õ«Ö€Ö‰"
- type_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥Ö։  Համոզված Õ¥ÕžÕ½, Õ¸Ö€ Õ°Õ¥Õ¶Ö Õ¶Õ¯Õ¡Ö€ Õ§Õ«Ö€ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÖ€Õ¥Õ¬Ö‰"
+ integrity_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥Ö։ Համոզվա՞ծ Õ¥Õ½, Õ¸Ö€ Õ¤Õ¡ Õ¶Õ¯Õ¡Ö€ Õ§Ö€Ö‰"
+ runtime_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥ÖÖ‰ Õ€Õ¡Õ´Õ¸Õ¦Õ¾Õ¡ÕžÕ® Õ¥Õ½, Õ¸Ö€ Õ¡Õ´Ö€Õ¡Õ£Õ¸Õ¿Õ«Õ¶Õ¥Ö€Õ¨ Õ¯Õ¡ÕºÕ¥Õ¬ Õ§Õ«Ö€Ö‰"
+ type_error: "Õ†Õ¯Õ¡Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¨ Õ¿Õ¡ÕºÕ¡Õ¬Õ¾Õ¥Ö։ Համոզված Õ¥ÕžÕ½, Õ¸Ö€ Õ°Õ¥Õ¶Ö Õ¶Õ¯Õ¡Ö€ Õ§Õ«Ö€ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÖ€Õ¥Õ¬Ö‰"
destroy:
notice: "Õ†Õ¯Õ¡Ö€Õ¨ Õ»Õ¶Õ»Õ¾Õ¡Õ® Õ§Ö‰"
new_profile_photo:
@@ -918,11 +914,11 @@ hy:
terms_link: "Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ´Õ¡Õ¶ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ¨"
username: "Õ•Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶"
report:
- comment_label: "<b>Մեկնաբանություն</b>․<br>%{data}"
+ comment_label: "<b>Մեկնաբանություն</b>․ %{data}"
confirm_deletion: "Õ€Õ¡Õ´Õ¸Õ¦Õ¾Õ¡ÕžÕ® Õ¥Õ½, Õ¸Ö€ ÕºÕ¥Õ¿Ö„ Õ§ Õ»Õ¶Õ»Õ¥Õ¬ Õ½Õ¡Ö‰"
delete_link: "Õ‹Õ¶Õ»Õ¥Õ¬ Õ½Õ¡"
not_found: "Ô³Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨/Õ´Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¹Õ£Õ¿Õ¶Õ¾Õ¥ÖÖ‰ Ô¿Õ¡Ö€Õ®Õ¥Õ½ Õ©Õ¥ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¨ Õ»Õ¶Õ»Õ¥Õ¬ Õ§ Õ¤Õ¡Ö‰"
- post_label: "<b>Գրառում</b>․ %{title}"
+ post_label: "<b>Գրառում</b>․ %{content}"
reason_label: "ÕŠÕ¡Õ¿Õ³Õ¡Õ¼Õ¡Õ¢Õ¡Õ¶Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨Õ"
reported_label: "<b>Ô²Õ¸Õ²Õ¸Ö„Õ¸Õ²Õ¨Õ</b> %{person}"
review_link: "Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ¥Õ½ Õ½Õ¿Õ¸Ö‚Õ£Õ¾Õ¡Õ®"
@@ -982,7 +978,7 @@ hy:
control_your_audience: "ÕŽÕ¥Ö€Õ¡Õ°Õ½Õ¯Õ«Õ›Ö€ Õ¬Õ½Õ¡Ö€Õ¡Õ¶Õ¤"
logged_in: "Õ„Õ¸Ö‚Õ¿Ö„ Õ§ Õ£Õ¸Ö€Õ®Õ¾Õ¡Õ® %{service}"
manage: "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÖÕ¾Õ¡Õ® Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨"
- new_user_welcome_message: "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ #ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¤ Õ¤Õ¡Õ½Õ¡Õ¯Õ¡Ö€Õ£Õ¥Õ¬Õ¸Ö‚ Ö‡ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¤ Õ¯Õ«Õ½Õ¸Õ² Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ համար։ Ներառիր Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¤ Õ´Õ¥Õ»` @Õ¶Õ·Õ¥Õ¬Õ¸Õ¾ Õ¶Ö€Õ¡Õ¶ÖÖ‰"
+ new_user_welcome_message: "Õ•Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ #ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¤ Õ¤Õ¡Õ½Õ¡Õ¯Õ¡Ö€Õ£Õ¥Õ¬Õ¸Ö‚ Ö‡ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¤ Õ¯Õ«Õ½Õ¸Õ² Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ համար։ Ներառիր Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ«Õ¤ Õ´Õ¥Õ»` @Õ¶Õ·Õ¥Õ¬Õ¸Õ¾ Õ¶Ö€Õ¡Õ¶ÖÖ‰"
outside: "Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¿Õ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¬Õ«Õ¶Õ¥Õ¶ Õ¤Õ«Õ¡Õ½ÕºÕ¸Ö€Õ¡*ÕµÕ«Ö Õ¤Õ¸Ö‚Ö€Õ½Ö‰"
share: "Ô¿Õ«Õ½Õ¾Õ«Õ›Ö€"
title: "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Õ´Õ«Õ¡ÖÕ¾Õ¡Õ® Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨"
@@ -1038,18 +1034,24 @@ hy:
activity:
title: "Ô»Õ´ Õ£Õ¸Ö€Õ®Õ¸Ö‚Õ¶Õ¥Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨"
aspects:
+ all: "Ô²Õ¸Õ¬Õ¸Ö€ ÕÕ´Õ¢Õ¥Ö€Õ¨"
title: "Ô»Õ´ ÕÕ´Õ¢Õ¥Ö€Õ¨"
aspects_stream: "Ô½Õ´Õ¢Õ¥Ö€"
comment_stream:
title: "Õ„Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€"
+ commented:
+ title: "Õ„Õ¥Õ¯Õ¶Õ¡Õ¢Õ¡Õ¶Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€"
community_spotlight_stream: "Õ€Õ¡Õ´Õ¡ÕµÕ¶Ö„Õ« Õ¡Õ¯Õ¶Õ¡Õ¼Õ¸Ö‚ Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€"
followed_tag:
add_a_tag: "ÕŠÕ«Õ¿Õ¡Õ¯ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬"
+ all: "Ô²Õ¸Õ¬Õ¸Ö€ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¨"
follow: "Õ€Õ¥Õ¿Ö‡Õ¥Õ¬"
title: "#Õ€Õ¥Õ¿Ö‡Õ¾Õ¸Õ²_ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€"
followed_tags_stream: "#Õ€Õ¥Õ¿Ö‡Õ¾Õ¸Õ²_ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€"
like_stream:
title: "Õ€Õ¡Õ¾Õ¡Õ¶Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ°Õ¸Õ½Ö„Õ¨"
+ liked:
+ title: "Õ€Õ¡Õ¾Õ¡Õ¶Õ¡Õ® Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€"
mentioned_stream: "@Õ†Õ·Õ¾Õ¡Õ®Õ¶Õ¥Ö€Õ¨"
mentions:
title: "@Õ†Õ·Õ¾Õ¡Õ®Õ¶Õ¥Ö€Õ¨"
@@ -1136,7 +1138,7 @@ hy:
community_welcome: "Õ¤Õ«Õ¡Õ½ÕºÕ¸Ö€Õ¡*ÕµÕ« Õ°Õ¡Õ´Õ¡ÕµÕ¶Ö„Õ¨ Õ¸Ö‚Ö€Õ¡Õ Õ§ Õ¿Õ¥Õ½Õ¶Õ¥Õ¬ Ö„Õ¥Õ¦ Õ¡ÕµÕ½Õ¿Õ¥Õ²"
connect_to_facebook: "Ô¿Õ¡Ö€Õ¥Õ¬Õ« Õ§ Õ¡Õ´Õ¥Õ¶Õ¨ Õ´Õ« Ö„Õ«Õ¹ Õ¡Ö€Õ¡Õ£Õ¡ÖÕ¶Õ¥Õ¬Õ %{link} Õ¤Õ«Õ¡Õ½ÕºÕ¸Ö€Õ¡*ÕµÕ«Õ¶Ö‰ Ô´Õ¡ Õ¯Õ¶Õ¥Ö€Õ´Õ¸Ö‚Õ®Õ« Ö„Õ¸ Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨, Õ¶Õ¯Õ¡Ö€Õ¨ Ö‡ Õ°Õ¶Õ¡Ö€Õ¡Õ¾Õ¸Ö€ Õ¯Õ¤Õ¡Ö€Õ±Õ¶Õ« Õ£Ö€Õ¡Õ¼Õ¥Õ¬ Õ¥Ö€Õ¯Õ¸Ö‚ Õ¿Õ¥Õ²Õ¸Ö‚Õ´ Õ´Õ«Õ¡ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ (cross-posting)Ö‰"
connect_to_facebook_link: "Õ´Õ«Õ¡ÖÕ¶Õ¥Õ¬Õ¸Õ¾ Õ–Õ¥ÕµÕ½Õ¢Õ¸Ö‚Ö„ÕµÕ¡Õ¶ Õ°Õ¡Õ·Õ«Õ¾Õ¤"
- hashtag_explanation: "ÕŠÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¨ Õ©Õ¸Ö‚ÕµÕ¬ Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ ÕÕ¸Õ½Õ¥Õ¬ Ö„Õ¸ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶ Õ¸Ö‚ Õ°Õ¥Õ¿Ö‡Õ¥Õ¬ Õ¤Ö€Õ¡Õ¶Ö։  Ինչպես Õ¶Õ¡Ö‡ Õ·Õ¡Õ¿ Õ°Õ¡Ö€Õ´Õ¡Ö€ Õ¸Ö‚ Õ°Õ¡Õ¾Õ¥Õ½ Õ´Õ«Õ»Õ¸Ö Õ¥Õ¶ Õ¤Õ«Õ¡Õ½ÕºÕ¸Ö€Õ¡*ÕµÕ¸Ö‚Õ´ Õ¶Õ¸Ö€ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
+ hashtag_explanation: "ÕŠÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ¨ Õ©Õ¸Ö‚ÕµÕ¬ Õ¥Õ¶ Õ¿Õ¡Õ¬Õ«Õ½ ÕÕ¸Õ½Õ¥Õ¬ Ö„Õ¸ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ« Õ´Õ¡Õ½Õ«Õ¶ Õ¸Ö‚ Õ°Õ¥Õ¿Ö‡Õ¥Õ¬ Õ¤Ö€Õ¡Õ¶Ö։ Ինչպես Õ¶Õ¡Õ¥Ö‚ Õ·Õ¡Õ¿ Õ°Õ¡Ö€Õ´Õ¡Ö€ Õ¸Ö‚ Õ°Õ¡Õ¾Õ¥Õ½ Õ´Õ«Õ»Õ¸Ö Õ¥Õ¶ Õ¤Õ«Õ¡Õ½ÕºÕ¸Ö€Õ¡*ÕµÕ¸Ö‚Õ´ Õ¶Õ¸Ö€ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰"
hashtag_suggestions: "Ô¿Õ¡Ö€Õ¥Õ² Õ¥Õ½ Õ¨Õ¶Õ¿Ö€Õ¥Õ¬ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€, Õ«Õ¶Õ¹ÕºÕ«Õ½Õ«Ö„ Õ¥Õ¶, Ö…Ö€Õ«Õ¶Õ¡Õ¯, #Õ¡Ö€Õ¾Õ¥Õ½Õ¿ #Õ¯Õ«Õ¶Õ¸ #gif Ö‡ Õ¡ÕµÕ¬Õ¶Ö‰"
well_hello_there: "Դե ինչ, ողջո՜ւյն"
what_are_you_in_to: "Ô»Õ¶Õ¹Õ¸ÕžÕ¾ Õ¥Õ½ Õ°Õ¥Õ¿Õ¡Ö„Ö€Ö„Ö€Õ¾Õ¡Õ®"
@@ -1157,7 +1159,7 @@ hy:
follow_settings_not_changed: "Õ€Õ¥Õ¿Ö‡Õ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö"
language_changed: "Ô¼Õ¥Õ¦Õ¸Ö‚Õ¶ ÖƒÕ¸ÕÕ¾Õ¡Õ® Õ§"
language_not_changed: "Ô¼Õ¥Õ¦Õ¾Õ« ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö"
- password_changed: "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÕÕ¾Õ¡Õ® Õ§Ö‰ Ô±ÕµÕªÕ´ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Ö„Õ¸ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¸Õ¾Ö‰"
+ password_changed: "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¨ ÖƒÕ¸ÕÕ¾Õ¡Õ® Õ§Ö‰ Ô±ÕµÕªÕ´ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ´Õ¸Ö‚Õ¿Ö„ Õ£Õ¸Ö€Õ®Õ¥Õ¬ Ö„Õ¸ Õ¶Õ¸Ö€ Õ£Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ¸Õ¾Ö‰"
password_not_changed: "Ô³Õ¡Õ²Õ¿Õ¶Õ¡Õ¢Õ¡Õ¼Õ« ÖƒÕ¸ÖƒÕ¸ÕÕ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸Õ²Õ¾Õ¥Ö"
settings_not_updated: "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ©Õ¡Ö€Õ´Õ¡ÖÕ¸Ö‚Õ´Õ¨ Õ±Õ¡ÕÕ¸ÕÕ¾Õ¥Ö"
settings_updated: "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ©Õ¡Ö€Õ´Õ¡ÖÕ¾Õ¥ÖÕ«Õ¶"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 620723760d4161ef23166389e44f9d65fded4577..286dd0af4164e78ac8ef655fe61bcd0a19d53eb8 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -10,7 +10,7 @@ ia:
_help: "Adjuta"
_services: "Servicios"
_statistics: "Statisticas"
- _terms: "terminos"
+ _terms: "Terminos"
account: "Conto"
activerecord:
errors:
@@ -31,10 +31,6 @@ ia:
attributes:
poll:
already_participated: "Tu ha jam participate a iste sondage."
- request:
- attributes:
- from_id:
- taken: "es un duplicato de un requesta pre-existente."
reshare:
attributes:
root_guid:
@@ -66,28 +62,44 @@ ia:
stats:
2weeks: "2 septimanas"
50_most: "Le 50 etiquettas le plus popular"
- current_segment: "Le segmento actual ha un media de <b>%{post_yest}</b> entratas per usator, a partir de <b>%{post_day}</b>"
+ comments:
+ one: "%{count} commento"
+ other: "%{count} commentos"
+ zero: "%{count} commentos"
+ current_segment: "Le segmento actual ha un media de %{post_yest} entratas per usator, a partir del %{post_day}"
daily: "Quotidian"
- display_results: "Resultatos del segmento <b>%{segment}</b>"
+ display_results: "Resultatos del segmento %{segment}"
go: "Va"
month: "Mense"
- tag_name: "Nomine del etiquetta: <b>%{name_tag}</b> Occurrentias: <b>%{count_tag}</b>"
+ posts:
+ one: "%{count} entrata"
+ other: "%{count} entratas"
+ zero: "%{count} entratas"
+ shares:
+ one: "%{count} addition a un aspecto"
+ other: "%{count} additiones a aspectos"
+ zero: "%{count} additiones a aspectos"
+ tag_name: "Nomine del etiquetta: %{name_tag} Occurrentias: %{count_tag}"
usage_statistic: "Statisticas de uso"
+ users:
+ one: "%{count} usator"
+ other: "%{count} usatores"
+ zero: "%{count} usatores"
week: "Septimana"
user_entry:
- account_closed: "conto claudite"
- diaspora_handle: "Pseudonymo de Diaspora"
+ account_closed: "Conto claudite"
+ diaspora_handle: "identificator de diaspora*"
email: "E-mail"
guid: "GUID"
id: "ID"
invite_token: "Indicio de invitation"
- last_seen: "ultime visita"
+ last_seen: "Ultime session"
? "no"
- : "no"
+ : "No"
nsfw: "#nsfw"
- unknown: "incognite"
+ unknown: "Incognite"
? "yes"
- : si
+ : Si
user_search:
account_closing_scheduled: "Le conto de %{name} es planate a esser claudite. Illo essera processate in alcun momentos…"
account_locking_scheduled: "Le conto de %{name} es planate a esser blocate. Illo essera processate in alcun momentos…"
@@ -96,13 +108,17 @@ ia:
are_you_sure: "Es tu secur de voler clauder iste conto?"
are_you_sure_lock_account: "Es tu secur de voler blocar iste conto?"
are_you_sure_unlock_account: "Es tu secur de voler disblocar iste conto?"
- close_account: "clauder conto"
+ close_account: "Clauder conto"
email_to: "Adresse de e-mail a invitar"
invite: "Invitar"
lock_account: "Blocar conto"
under_13: "Monstrar usatores con minus de 13 annos (COPPA)"
unlock_account: "Disblocar conto"
- view_profile: "vider profilo"
+ users:
+ one: "Un usator trovate"
+ other: "%{count} usatores trovate"
+ zero: "Nulle usator trovate"
+ view_profile: "Vider profilo"
you_currently:
one: "Il te resta un invitation %{link}"
other: "Il te resta %{count} invitationes %{link}"
@@ -202,6 +218,7 @@ ia:
updating: "Actualisation in curso"
index:
donate: "Donar"
+ donate_liberapay: "Facer un donation a liberapay"
help:
any_problem: "Problema?"
contact_podmin: "Contacta le administrator de tu pod!"
@@ -231,7 +248,7 @@ ia:
community_spotlight: "Usatores in evidentia"
invite_link_text: "invitar"
or_spotlight: "O tu pote divider con %{link}"
- try_adding_some_more_contacts: "Tu pote cercar o %{invite_link} plus contactos."
+ try_adding_some_more_contacts: "Tu pote cercar o %{invite_link} altere contactos."
you_should_add_some_more_contacts: "Tu deberea adder plus contactos!"
seed:
acquaintances: "Cognoscitos"
@@ -247,7 +264,7 @@ ia:
success: "In ordine, tu non plus videra iste usator in tu fluxo. #silentio!"
destroy:
failure: "Impossibile cessar de ignorar iste usator a causa de un error. #evasion"
- success: "Vamos vider lo que iste usator ha a dicer! #salutes"
+ success: "Que nos vide lo que iste usator ha a dicer! #salutes"
bookmarklet:
explanation: "Invia cosas a diaspora* ab ubique con iste ligamine: %{link}"
heading: "Mini-marcapaginas"
@@ -261,7 +278,6 @@ ia:
commenting: "Commenta…"
contacts:
index:
- add_a_new_aspect: "Adder un nove aspecto"
add_contact: "Adder contacto"
all_contacts: "Tote le contactos"
community_spotlight: "Usatores in evidentia"
@@ -269,10 +285,10 @@ ia:
no_contacts: "Il pare que tu debe adder alcun contactos!"
no_contacts_in_aspect: "Tu non ha ancora contactos in iste aspecto. Infra es un lista de tu contactos existente le quales tu pote adder a iste aspecto."
no_contacts_message: "Visita %{community_spotlight}"
- only_sharing_with_me: "Solmente qui divide cosas con me"
+ only_sharing_with_me: "Divide con me, ma non vice versa"
start_a_conversation: "Initiar un conversation"
title: "Contactos"
- user_search: "Recerca de usatores"
+ user_search: "Recerca de contactos"
spotlight:
community_spotlight: "Usatores in evidentia"
no_members: "Il non ha ancora membros."
@@ -301,7 +317,7 @@ ia:
fail: "Message non valide"
show:
delete: "Deler conversation"
- hide: "celar e silentiar conversation"
+ hide: "Celar e silentiar le conversation"
last_message: "Ultime message recipite %{timeago}"
reply: "Responder"
replying: "Responde…"
@@ -379,14 +395,14 @@ ia:
irc: "IRC"
keyboard_shortcuts:
keyboard_shortcuts_a1: "In le vista de fluxo tu pote usar le sequente claves accelerator:"
- keyboard_shortcuts_li1: "j - saltar al proxime entrata"
- keyboard_shortcuts_li2: "k - saltar al previe entrata"
- keyboard_shortcuts_li3: "c - commentar le entrata actual"
- keyboard_shortcuts_li4: "l - appreciar le entrata actual"
- keyboard_shortcuts_li5: "r - Repeter iste entrata"
- keyboard_shortcuts_li6: "m - Displicar iste entrata"
- keyboard_shortcuts_li7: "o - Aperir le prime ligamine in iste entrata"
- keyboard_shortcuts_li8: "ctrl + enter - Inviar le message que tu ha scribite"
+ keyboard_shortcuts_li1: "j - Saltar al proxime entrata"
+ keyboard_shortcuts_li2: "k - Saltar al previe entrata"
+ keyboard_shortcuts_li3: "c - Commentar le entrata actual"
+ keyboard_shortcuts_li4: "l - Appreciar le entrata actual"
+ keyboard_shortcuts_li5: "r - Repeter le entrata actual"
+ keyboard_shortcuts_li6: "m - Displicar le entrata actual"
+ keyboard_shortcuts_li7: "o - Aperir le prime ligamine in le entrata actual"
+ keyboard_shortcuts_li8: "Ctrl+Enter – Inviar le message que tu ha scribite"
keyboard_shortcuts_q: "Qual claves accelerator es disponibile?"
title: "Claves accelerator"
markdown: "Markdown"
@@ -403,11 +419,11 @@ ia:
miscellaneous:
back_to_top_a: "Si. Post rolar a basso in un pagina, clicca sur le sagitta gris que appare in le angulo dextre al fundo de tu fenestra de navigator."
back_to_top_q: "Ha il un maniera rapide de retornar al cyma del pagina post que io rola a basso?"
- diaspora_app_a: "Il ha plure applicationes de Android in un stadio precoce de disveloppamento. Plures de iste projectos es abandonate e non functiona ben con le version actual de diaspora*. Non expecta troppo de iste apps in iste momento. Actualmente le melior maniera de acceder a diaspora* a partir de tu dispositivo mobile es per medio de un navigator web, perque nos ha designate un version mobile del sito que deberea functionar ben in tote le dispositivos. Actualmente il non ha un app pro iOS. De novo, diaspora* deberea functionar ben in tu navigator."
+ diaspora_app_a: "Il ha plure applicationes de Android disveloppate per membros del communitate. Plures de iste projectos es abandonate e non functiona ben con le version actual de diaspora*. Non expecta troppo de iste apps in iste momento. Actualmente il non ha un app pro iOS. Le melior maniera de acceder a diaspora* a partir de tu dispositivo mobile es per medio de un navigator web, perque nos ha concipite un version mobile del sito que deberea functionar ben in tote le dispositivos, ben que su functionalitate non es ancora complete."
diaspora_app_q: "Ha il un app diaspora* pro Android o iOS?"
- photo_albums_a: "No, non in iste momento. Nonobstante, tu pote vider un fluxo de su imagines incargate a partir del section Photos in le barra lateral de lor pagina de profilo."
+ photo_albums_a: "No, non in iste momento. Nonobstante, tu pote vider le imagines incargate per un persona in le scheda Photos de su pagina de profilo."
photo_albums_q: "Ha il albumes de photos o videos?"
- subscribe_feed_a: "Si, ma iste functionalitate non es ancora polite e le formato del resultato es assatis crude. Si tu vole essayar lo in omne caso, va al pagina de profilo de un persona e clicca sur le button de syndication in tu navigator, o tu pote copiar le URL del profilo (p.ex. https://joindiaspora.com/people/alcunnumero) e collar lo in un lector de syndication. Le adresse de syndication resultante ha iste aspecto: https://joindiaspora.com/public/nominedeusator.atom (diaspora* usa Atom, non RSS)."
+ subscribe_feed_a: "Si, ma iste functionalitate non es ancora polite e le formato del resultato es assatis crude. Si tu vole essayar lo in omne caso, va al pagina de profilo de un persona e clicca sur le button de syndication in tu navigator, o tu pote copiar le URL del profilo (p.ex. https://nominedelpod.org/people/alcunnumero) e collar lo in un lector de syndication. Le adresse de syndication resultante ha iste aspecto: https://nominedelpod.org/public/nominedeusator.atom (diaspora* usa Atom, non RSS)."
subscribe_feed_q: "Pote io subscriber me al entratas public de un persona con un lector de syndication?"
title: "Miscellanea"
pods:
@@ -473,7 +489,7 @@ ia:
public_posts:
can_comment_reshare_like_a: "Omne usator qui ha aperite session in diaspora* pote commentar, repeter o appreciar tu entrata public."
can_comment_reshare_like_q: "Qui pote commentar, repeter o appreciar mi entrata public?"
- deselect_aspect_posting_a: "Dismarcar aspectos non ha effecto sur un entrata public. Illo apparera como sempre in le fluxos de tote tu contactos. Pro render un entrata visibile solmente pro aspectos visibile, tu debe seliger iste aspectos ab le button sub le publicator."
+ deselect_aspect_posting_a: "Dismarcar aspectos non ha effecto sur un entrata public. Illo remanera public e apparera in le fluxos de tote tu contactos. Pro render un entrata visibile solmente pro certe aspectos, tu debe seliger ille aspectos usante le selector de aspectos sub le quadro de entrata."
deselect_aspect_posting_q: "Que eveni quando io dismarca un o plus aspectos quando io face un entrata public?"
find_public_post_a: "Tu entratas public apparera in le fluxos de quicunque te seque. Si tu ha includite #etiquettas in tu entrata public, quicunque seque iste etiquettas trovara tu entrata in su fluxo. Cata entrata public anque ha un adresse URL specific al qual omnes pote acceder, mesmo sin aperir session; assi, es possibile mitter ligamines a entratas public directemente in Twitter, blogs, etc. Le entratas public pote anque esser indexate per motores de recerca."
find_public_post_q: "Como pote altere personas trovar mi entrata public?"
@@ -486,7 +502,7 @@ ia:
title: "Profilos public"
what_do_tags_do_a: "Illes adjuta le gente a cognoscer te. Tu imagine de profilo apparera etiam in le latere sinistre de iste paginas de etiquetta, con illos del alteres qui los ha in lor profilos public."
what_do_tags_do_q: "Que face le etiquettas in mi profilo public?"
- whats_in_profile_a: "Tu nomine, le cinque etiquettas que tu ha eligite pro describer te, e tu photo. Il se tracta del cosas in le section superior del pagina \"Modificar profilo\". Tu pote render iste information de profilo tanto personal o tanto anonyme como tu vole. Tu pagina de profilo monstra etiam le entratas public que tu ha inviate."
+ whats_in_profile_a: "Le profilo public contine tu nomine, le cinque etiquettas que tu ha eligite pro describer te, e tu photo, si ti ha completate iste sectiones. Tote iste information es facultative; a te le decision de fornir lo o non. Tu pote render iste information de profilo tanto personal o tanto anonyme como tu vole. Tu pagina de profilo monstra etiam le entratas public que tu ha inviate."
whats_in_profile_q: "Que es in mi profilo public?"
who_sees_profile_a: "Omne usator de diapora* e del internet in general pote vider lo. Cata profilo ha un adresse URL directe, de sorta que on pote inserer ligamines a illo in sitos exterior. Le motores de recerca del web pote indexar lo."
who_sees_profile_q: "Qui vide mi profilo public?"
@@ -495,25 +511,25 @@ ia:
resharing_posts:
reshare_private_post_aspects_a: "No, il non es possibile repeter un entrata private. Isto es pro respectar le intentiones del autor original qui lo ha dividite solmente con un gruppo particular de personas."
reshare_private_post_aspects_q: "Pote io repeter un entrata private solmente a certe aspectos?"
- reshare_public_post_aspects_a: "No, quando tu repete un entrata public, illo deveni automaticamente un de tu entratas public. Pro divider lo con certe aspectos, copia e colla le contento del entrata in un entrata nove."
+ reshare_public_post_aspects_a: "No, quando tu repete un entrata public, illo deveni automaticamente un de tu entratas public. Pro divider lo con certe aspectos, copia e colla le contento del entrata in un entrata nove e limitate."
reshare_public_post_aspects_q: "Pote io repeter un entrata public solmente a certe aspectos?"
title: "Repeter entratas"
sharing:
add_to_aspect_a1: "Suppone que Julia adde Mario a un aspecto, ma Mario non ha (ancora) addite Julia a un aspecto:"
- add_to_aspect_a2: "Isto se appella diffusion asymmetric. Si e quando Ben adde Amy a un aspecto alora illo devenirea un intercambio reciproc: le entratas public e private de Amy e de Ben apparerea in le fluxos le un del altere, etc. "
- add_to_aspect_li1: "Mario recipera notification del facto que Julia a \"comenciate a divider\" con Mario."
+ add_to_aspect_a2: "Iste situation se appella communication asymmetric. Si e quando Mario adde Julia a un aspecto sue, alora le communication devenirea reciproc: le entratas public e private de Julia e de Mario apparerea in le fluxos le un del altere, e Julia poterea vider le profilo private de Mario. Illes poterea alora etiam inviar messages private inter se."
+ add_to_aspect_li1: "Mario recipera notification del facto que Julia ha \"comenciate a divider\" con Mario."
add_to_aspect_li2: "Julia videra ab iste momento in su fluxo le entratas public de Mario."
add_to_aspect_li3: "Julia non videra alcun entrata private de Mario."
add_to_aspect_li4: "Mario non videra in su fluxo le entratas public o private de Julia."
- add_to_aspect_li5: "Ma si Ben va al pagina de profilo de Amy, alora ille videra le entratas private de Amy que illa invia a su aspecto que le include (assi como le entratas public de illa que omnes pote vider)."
- add_to_aspect_li6: "Ben potera vider le profilo private de Amy (biographia, loco, sexo, die de nascentia)."
- add_to_aspect_li7: "Amy apparera sub \"Divide solmente con me\" in le pagina de contactos de Ben."
+ add_to_aspect_li5: "Ma si Mario visita le pagina de profilo de Julia, alora ille videra le entratas private que Julia invia al aspecto in le qual illa le ha includite. (Ille videra etiam le entratas public de illa que omnes pote vider.)"
+ add_to_aspect_li6: "Mario potera vider le profilo private de Julia (biographia, loco, genere, data de nascentia)."
+ add_to_aspect_li7: "Julia apparera sub \"Divide con me, ma non vice versa\" in le pagina de contactos de Mario."
add_to_aspect_li8: "Amy potera etiam @mentionar Ben in un entrata."
add_to_aspect_q: "Que eveni quando io adde un persona a un de mi aspectos, o quando un persona me adde a un de su aspectos?"
- list_not_sharing_a: "No, ma tu pote determinar si un persona divide cosas con te per visitar su pagina de profilo. Si le persona lo face, le barra sub su imagine de profilo es verde; si non, illo es gris. Tu recipe un notification cata vice que un persona comencia a divider cosas con te."
+ list_not_sharing_a: "No, ma tu pote determinar si un persona divide con te per visitar su pagina de profilo. Si le persona lo face, le button que monstra le aspecto(s) in le qual(es) tu la ha placiate es verde; si non, illo es gris."
list_not_sharing_q: "Ha il un lista de personas que io ha addite a un de mi aspectos, ma qui non me ha addite a un del lores?"
- only_sharing_a: "Se tracta del personas qui te ha addite a un de lor aspectos, ma qui non es (ancora) in alcun de tu aspectos. In altere parolas, illes divide cosas con te, ma tu non divide alcun cosa con illes (diffusion asymmetric). Si tu les adde a un aspecto, illes apparera sub ille aspecto e non sub \"divide solmente con me\". Vide hic supra."
- only_sharing_q: "Proque es le personas listate in \"Divide solmente con me\" in mi pagina de contactos?"
+ only_sharing_a: "Se tracta del personas qui te ha addite a un de lor aspectos, ma qui non es (ancora) in alcun de tu aspectos. In altere parolas, illes divide con te, ma tu non divide con illes: tu pote pensar de illes como \"sequitores\". Si tu les adde a un aspecto, illes apparera sub ille aspecto e non sub \"Divide con me, ma non vice versa\". Vide hic supra."
+ only_sharing_q: "Qui es le personas listate sub \"Divide con me, ma non vice versa\" in mi pagina de contactos?"
see_old_posts_a: "No. Ille potera vider solmente le entratas nove in ille aspecto. Ille (e tote le mundo) pote vider tu entratas public ancian in tu pagina de profilo, e ille los videra forsan in su fluxo."
see_old_posts_q: "Quando io adde un persona a un aspecto, pote ille vider le ancian entratas que io ha jam inviate a ille aspecto?"
sharing_notification_a: "Tu deberea reciper un notification cata vice que un persona comencia a divider con te."
@@ -522,11 +538,11 @@ ia:
tags:
filter_tags_a: "Iste functionalitate non es ancora disponibile directemente de diaspora*, ma alcun %{third_party_tools} ha essite scribite que pote fornir lo."
filter_tags_q: "Como pote io filtrar/excluder alcun etiquettas de mi fluxo?"
- followed_tags_a: "Post cercar un etiquetta tu pote cliccar sur le button al cyma del pagina del etiquetta pro \"sequer\" ille etiquetta. Illo apparera in le lista de etiquettas sequite al sinistra. Un clic sur un de tu etiquettas sequite te porta al pagina de ille etiquetta, de sorta que tu pote vider le entrata recente que contine ille etiquetta. Clicca sur \"#etiquettas sequite\" pro vider un fluxo de entratas que include qualcunque etiquetta que tu seque. "
+ followed_tags_a: "Post cercar un etiquetta, tu pote cliccar sur le button in le alto del pagina del etiquetta pro \"sequer\" ille etiquetta. Illo apparera in le lista de etiquettas sequite in le menu sinistre. Un clic sur un de tu etiquettas sequite te porta a un pagina que monstra le entratas recente que contine ille etiquetta. Clicca sur \"etiquettas #sequite\" pro vider un fluxo de entratas que include qualcunque etiquetta que tu seque."
followed_tags_q: "Que es \"etiquettas #sequite\" e como seque io un etiquetta?"
people_tag_page_a: "Illes es le personas qui ha listate ille etiquetta pro describer se in lor profilos public."
people_tag_page_q: "Qui es le personas listate al latere sinistre de un pagina de etiquetta?"
- tags_in_comments_a: "Un etiquetta addite a un entrata appare como ligamine al pagina de iste etiquetta, ma non face le message (o commento) in question apparer in iste pagina de etiquetta. Isto functiona solmente pro etiquettas in entratas."
+ tags_in_comments_a: "Un etiquetta addite a un commento appare como ligamine al pagina de iste etiquetta, ma non face le entrata (o commento) in question apparer in iste pagina. Isto functiona solmente pro etiquettas in le texto principal de un entrata."
tags_in_comments_q: "Pote io mitter etiquettas in commentos o solmente in messages?"
title: "Etiquettas"
what_are_tags_for_a: "Etiquettas servi a categorisar un entrata, normalmente per topico. Si tu cerca un etiquetta, es monstrate tote le entratas visibile pro te (public e private) con iste etiquetta. Isto permitte al personas interessate in un certe topico cercar le entratas public concernente lo."
@@ -577,6 +593,10 @@ ia:
rejected: "Le sequente adresses de e-mail habeva problemas: %{emails}"
sent: "Le sequente adresses ha recipite un invitation: %{emails}"
new:
+ codes_left:
+ one: "Un invitation resta pro iste codice"
+ other: "%{count} invitationes resta pro iste codice"
+ zero: "Il non resta invitationes pro iste codice"
comma_separated_plz: "Tu pote entrar plure adresses de e-mail separante los per commas."
invite_someone_to_join: "Invita qualcuno a unir se a diaspora*!"
language: "Lingua"
@@ -602,6 +622,8 @@ ia:
likes:
create:
error: "Appreciation fallite."
+ destroy:
+ error: "Le cancellation del appreciation ha fallite."
limited: "Limitate"
more: "Plus"
no_results: "Nulle resultato trovate"
@@ -610,6 +632,10 @@ ia:
one: "%{actors} etiam commentava le entrata %{post_link} de %{post_author}."
other: "%{actors} etiam commentava le entrata %{post_link} de %{post_author}."
zero: "Nemo altere commentava le entrata %{post_link} de %{post_author}."
+ also_commented_deleted:
+ one: "%{actors} ha commentate un entrata delite."
+ other: "%{actors} ha commentate un entrata delite."
+ zero: "Nemo ha commentate un entrata delite."
comment_on_post:
one: "%{actors} commentava tu entrata %{post_link}."
other: "%{actors} commentava tu entrata %{post_link}."
@@ -618,6 +644,10 @@ ia:
all_notifications: "Tote le notificationes"
also_commented: "Anque commentate"
and: "e"
+ and_others:
+ one: "e un altere"
+ other: "e %{count} alteres"
+ zero: "e nemo altere"
comment_on_post: "Commentar iste entrata"
liked: "Appreciate"
mark_all_as_read: "Marcar totes como legite"
@@ -628,20 +658,25 @@ ia:
no_notifications: "Tu non ha ancora notificationes."
notifications: "Notificationes"
reshared: "Repetite"
- show_all: "monstrar totes"
- show_unread: "monstrar non legite"
+ show_all: "Monstrar totes"
+ show_unread: "Monstrar non legite"
started_sharing: "Comenciate a divider"
liked:
one: "%{actors} ha appreciate tu entrata %{post_link}."
other: "%{actors} ha appreciate tu entrata %{post_link}."
zero: "%{actors} ha appreciate tu entrata %{post_link}."
+ liked_post_deleted:
+ one: "%{actors} apprecia tu entrata delite."
+ other: "%{actors} apprecia tu entrata delite."
+ zero: "Nemo apprecia tu entrata delite."
mentioned:
one: "%{actors} te ha mentionate in le entrata %{post_link}."
other: "%{actors} te ha mentionate in le entrata %{post_link}."
+ zero: "%{actors} te ha mentionate in le entrata %{post_link}."
mentioned_deleted:
one: "%{actors} te ha mentionate in un entrata delite."
other: "%{actors} te ha mentionate in un entrata delite."
- post: "entrata"
+ zero: "%{actors} te ha mentionate in un entrata delite."
private_message:
one: "%{actors} te ha inviate un message."
other: "%{actors} te ha inviate un message."
@@ -650,6 +685,10 @@ ia:
one: "%{actors} ha repetite tu entrata %{post_link}."
other: "%{actors} ha repetite tu entrata %{post_link}."
zero: "%{actors} ha repetite tu entrata %{post_link}."
+ reshared_post_deleted:
+ one: "%{actors} ha repetite tu entrata delite."
+ other: "%{actors} ha repetite tu entrata delite."
+ zero: "Nemo ha repetite tu entrata delite."
started_sharing:
one: "%{actors} ha comenciate a divider con te."
other: "%{actors} ha comenciate a divider con te."
@@ -663,7 +702,7 @@ ia:
click_here: "Clicca hic"
comment_on_post:
limited_subject: "Il ha un nove commento sur un de tu entratas"
- reply: "Responder o leger le message de %{name} >"
+ reply: "Responder o leger le entrata de %{name} >"
confirm_email:
click_link: "Pro activar tu nove adresse de e-mail %{unconfirmed_email}, seque iste ligamine:"
subject: "Per favor activa tu nove adresse de e-mail %{unconfirmed_email}"
@@ -770,17 +809,17 @@ ia:
body: |-
Salute,
- A causa de inactivitate in tu conto de diaspora* a %{pod_url}, nos regretta de informar te que le systema ha marcate iste conto pro elimination. Isto occurre automaticamente post un periodo de inactivitate de plus de %{after_days} dies.
+ Il sembla que tu non plus ha interesse in tu conto a %{pod_url}, viste que tu non lo ha usate durante %{after_days} dies. Pro assecurar que nostre usatores active recipe le melior prestationes sur iste pod de diaspora*, nos volerea eliminar le contos non desirate de nostre base de datos.
- Tu pote evitar le perdita de iste conto per aperir session ante le %{remove_after}, in le qual caso le elimination essera automaticamente cancellate.
+ Totevia, nos lo amarea si tu remane parte del communitate de diaspora*, e tu pote naturalmente retener tu conto si tu lo vole.
- Isto es pro assecurar que nostre usatores active pote efficacemente utilisar le ressources de iste servitor de diaspora*. Gratias pro tu comprension.
+ Pro mantener tu conto active, tote lo que tu debe facer es aperir session ante le %{remove_after}. Quando tu aperi session, prende un momento pro reguardar circa diaspora*; multe cosas ha cambiate post tu ultime visita, e nos pensa que te placera le meliorationes que nos ha apportate. Seque alcun #etiquettas pro cercar le contento que te interessa.
- Si tu vole retener tu conto, aperi session hic: %{login_url}
+ Aperi session hic: %{login_url}. Si tu ha oblidate le detalios de tu conto, tu pote demandar un rememoration sur iste pagina.
- Sperante de vider te de novo,
+ Sperante de revider te,
- Le robot de e-mail de diaspora*
+ Le messagero robotic de diaspora*
subject: "Tu conto de diaspora* ha essite marcate pro elimination a causa de inactivitate"
report_email:
body: |-
@@ -788,6 +827,8 @@ ia:
le %{type} con ID %{id} ha essite marcate como offensive.
+ Motivo: "%{reason}"
+
[%{url}][1]
Per favor revide isto le plus tosto possibile!
@@ -806,7 +847,7 @@ ia:
reshared: "%{name} ha repetite tu entrata"
view_post: "Vider entrata >"
single_admin:
- admin: "Le tue administrator de diaspora*"
+ admin: "Tu administrator de diaspora*"
subject: "Un message concernente tu conto de diaspora*:"
started_sharing:
sharing: "ha comenciate a divider con te!"
@@ -838,7 +879,7 @@ ia:
show:
closed_account: "Iste conto ha essite claudite."
does_not_exist: "Iste persona non existe!"
- has_not_shared_with_you_yet: "%{name} non ha ancora dividite alcun cosa con te!"
+ has_not_shared_with_you_yet: "%{name} non ha ancora dividite alcun entrata con te!"
photos:
create:
integrity_error: "Le incargamento del photo ha fallite. Es tu secur que iste file contine un imagine?"
@@ -859,6 +900,10 @@ ia:
show:
forbidden: "Tu non ha le permission de facer isto"
location: "Inviate ab: %{location}"
+ photos_by:
+ one: "Un photo per %{author}"
+ other: "%{count} photos per %{author}"
+ zero: "Il non ha photos per %{author}"
reshare_by: "Repetite per %{author}"
privacy: "Confidentialitate"
profile: "Profilo"
@@ -873,15 +918,15 @@ ia:
first_name: "Prenomine"
last_name: "Nomine de familia"
limited: "Limitate"
- nsfw_check: "Marcar toto que io divide como NSFW"
- nsfw_explanation: "NSFW (‘not safe for work’, non appropriate pro le travalio) es un standard communitari pro contento que poterea esser inappropriate a vider durante que on es al travalio. Si tu intende a frequentemente divider tal material, per favor, marca iste option, de sorta que tote le cosas que tu divide essera celate pro le personas qui non ha optate pro vider los."
+ nsfw_check: "Marcar tote lo que io divide como NSFW"
+ nsfw_explanation: "NSFW (‘not safe for work’, non appropriate pro le travalio) es un standard communitari pro contento que poterea esser inappropriate durante que on es al travalio. Si tu intende a divider frequentemente tal material, per favor, marca iste option, de maniera que tote le cosas que tu divide essera celate pro le personas qui non ha optate pro vider los."
nsfw_explanation2: "Si tu non selige iste option, per favor, adde le etiquetta #nsfw cata vice que tu divide tal material."
public: "Public"
settings: "Configuration de profilo"
update_profile: "Actualisar profilo"
your_bio: "Tu bio"
your_birthday: "Tu data de nascentia"
- your_gender: "Tu sexo"
+ your_gender: "Tu genere"
your_location: "Tu loco"
your_name: "Tu nomine"
your_photo: "Tu photo"
@@ -910,11 +955,11 @@ ia:
terms_link: "conditiones de servicio"
username: "Nomine de usator"
report:
- comment_label: "<b>Commento</b>:<br>%{data}"
+ comment_label: "<b>Commento</b>: %{data}"
confirm_deletion: "Es tu secur de voler deler le elemento?"
delete_link: "Deler elemento"
- not_found: "<u>Le entrata/commento non ha essite trovate. Pare que le usator lo ha delite.</u>"
- post_label: "<b>Entrata</b>: %{title}"
+ not_found: "Le entrata/commento non ha essite trovate. Pare que le usator lo ha delite."
+ post_label: "<b>Entrata</b>: %{content}"
reason_label: "Motivo:"
reported_label: "<b>Reportate per</b> %{person}"
reported_user_details: "Detalios sur le usator reportate"
@@ -977,7 +1022,7 @@ ia:
share_this: "Divide iste ligamine per e-mail, blog o rete social!"
public_explain:
atom_feed: "Syndication Atom"
- control_your_audience: "Controlar tu audientia"
+ control_your_audience: "Eliger tu audientia"
logged_in: "Session aperite in %{service}"
manage: "Gerer servicios connectite"
new_user_welcome_message: "Usa #etiquettas pro classificar tu messages e trovar personas con interesses in commun. Commenda personas extraordinari con @Mentiones."
@@ -993,7 +1038,7 @@ ia:
hello: "Salute, io es #%{new_user_tag}. "
i_like: "Io me interessa in %{tags}. "
invited_by: "Gratias pro le invitation, "
- newhere: "NewHere"
+ newhere: "novicio"
poll:
add_a_poll: "Adder un sondage"
posting: "Invio in curso…"
@@ -1036,18 +1081,24 @@ ia:
activity:
title: "Mi activitate"
aspects:
+ all: "Tote le aspectos"
title: "Mi aspectos"
aspects_stream: "Aspectos"
comment_stream:
title: "Messages commentate"
+ commented:
+ title: "Entratas commentate"
community_spotlight_stream: "Usatores in evidentia"
followed_tag:
add_a_tag: "Adder un etiquetta"
+ all: "Tote le etiquettas"
follow: "Sequer"
title: "#Etiquettas sequite"
followed_tags_stream: "#Etiquettas sequite"
like_stream:
title: "Fluxo de entratas appreciate"
+ liked:
+ title: "Entratas appreciate"
mentioned_stream: "@Mentiones"
mentions:
title: "@Mentiones"
@@ -1097,7 +1148,7 @@ ia:
make_diaspora_better: "Nos amarea si tu remane e adjuta nos a meliorar diaspora* in vice de quitar. Nonobstante, si tu vermente vole quitar, ecce lo que evenira:"
mr_wiggles: "Sr. Wiggles essera triste de vider te partir"
no_turning_back: "Tu ha arrivate al puncto de non retorno! Si tu es vermente secur, scribe hic infra tu contrasigno."
- what_we_delete: "Nos va deler, le plus tosto possibile, tote le entratas e datos de profilo pertinente a te. Tu commentos sur le entratas de altere personas remanera, ma essera associate con tu ID de diaspora* in loco de tu nomine."
+ what_we_delete: "Nos va deler, le plus tosto possibile, tote le entratas e datos de profilo pertinente a te. Tu commentos sur le entratas de altere personas remanera, ma essera associate a tu ID de diaspora* in loco de tu nomine."
close_account_text: "Clauder conto"
comment_on_post: "un persona commenta un entrata tue"
current_password: "Contrasigno actual"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 65b3aa4730527df54d41a64d79a2fe3234d41cd3..30b2a84766999ce2d1c3d77670062c2c7bcb2a92 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -20,10 +20,6 @@ id:
attributes:
diaspora_handle:
taken: "sudah dipakai"
- request:
- attributes:
- from_id:
- taken: "ada duplikasi dengan permintaan sebelumnya."
reshare:
attributes:
root_guid:
@@ -111,7 +107,6 @@ id:
commenting: "Mengomentari"
contacts:
index:
- add_a_new_aspect: "Tambahkan aspek baru"
all_contacts: "Semua Kontak"
community_spotlight: "Sorotan komunitas"
my_contacts: "Kontakku"
@@ -236,7 +231,6 @@ id:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "kirim"
private_message:
few: "%{actors} sent you a message."
many: "%{actors} sent you a message."
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index f3bf7f78966523250cb98418965815f27d7ef3f6..0f8a680072ef982b77cf87946314bf4fa9456fd2 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -20,10 +20,6 @@ is:
attributes:
diaspora_handle:
taken: "er þegar à notkun."
- request:
- attributes:
- from_id:
- taken: "er afrit af fyrirliggjandi beiðni."
reshare:
attributes:
root_guid:
@@ -135,7 +131,6 @@ is:
commenting: "Athugasemd gerð..."
contacts:
index:
- add_a_new_aspect: "Bæta við nýrri ásýnd"
all_contacts: "Allir tengiliðir"
community_spotlight: "Efst á baugi à samfélaginu"
my_contacts: "Tengiliðirnir mÃnir"
@@ -275,7 +270,6 @@ is:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "setja inn"
private_message:
one: "%{actors} hefur sent þér skilaboð."
other: "%{actors} hafa sent þér skilaboð."
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 60ba3b39fe31b7790ac191dd0c79183ed441debf..033ef4613eef106dd7fe2d82bce5fa73912b237e 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -21,10 +21,6 @@ it:
attributes:
diaspora_handle:
taken: "è già stato preso."
- request:
- attributes:
- from_id:
- taken: "è un duplicato di una richiesta pre-esistente."
reshare:
attributes:
root_guid:
@@ -183,7 +179,6 @@ it:
commenting: "Invio commento in corso..."
contacts:
index:
- add_a_new_aspect: "Aggiungi un aspetto"
all_contacts: "Tutti i contatti"
community_spotlight: "In evidenza nella comunità "
my_contacts: "I miei contatti"
@@ -497,7 +492,6 @@ it:
one: "%{actors} ti ha menzionato in un post che è stato eliminato."
other: "%{actors} ti hanno menzionato in un post che è stato eliminato."
zero: "%{actors} ti ha menzionato in un post che è stato eliminato."
- post: "post"
private_message:
one: "%{actors} ti ha inviato un messaggio."
other: "%{actors} ti hanno inviato un messaggio."
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index bc2ecd0b1dc278860538a340021e99e77b639689..1818084795aa7eb527737073122dd2955d9d0131 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -31,10 +31,6 @@ ja:
attributes:
poll:
already_participated: "ã‚ãªãŸã¯ã™ã§ã«ã“ã®æŠ•ç¥¨ã«å‚åŠ ã—ã¾ã—ãŸï¼"
- request:
- attributes:
- from_id:
- taken: "æ—¢å˜ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¨é‡è¤‡ã—ã¦ã„ã¾ã™ã€‚"
reshare:
attributes:
root_guid:
@@ -275,7 +271,6 @@ ja:
commenting: "コメント投稿ä¸â€¦"
contacts:
index:
- add_a_new_aspect: "æ–°ã—ã„ã‚¢ã‚¹ãƒšã‚¯ãƒˆã‚’è¿½åŠ ã™ã‚‹"
add_contact: "é€£çµ¡å…ˆã‚’è¿½åŠ ã™ã‚‹"
all_contacts: "ã™ã¹ã¦ã®é€£çµ¡å…ˆ"
community_spotlight: "コミュニティスãƒãƒƒãƒˆãƒ©ã‚¤ãƒˆ"
@@ -666,7 +661,6 @@ ja:
mentioned_deleted:
other: "%{actors}ã•ã‚“ãŒå‰Šé™¤ã•ã‚ŒãŸæŠ•ç¨¿ã§ã‚ãªãŸã«ãƒ¡ãƒ³ã‚·ãƒ§ãƒ³ã—ã¾ã—ãŸã€‚"
zero: "%{actors}ã•ã‚“ãŒå‰Šé™¤ã•ã‚ŒãŸæŠ•ç¨¿ã§ã‚ãªãŸã«ãƒ¡ãƒ³ã‚·ãƒ§ãƒ³ã—ã¾ã—ãŸã€‚"
- post: "（投稿ã§ï¼‰"
private_message:
other: "%{actors}ã•ã‚“ãŒã€ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã—ã¾ã—ãŸã€‚"
zero: "%{actors}ã•ã‚“ãŒã€ã‚ãªãŸã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ä¿¡ã—ã¾ã—ãŸã€‚"
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index 4d7c9af214cbd9b6d16865458aa919a21a1d3251..86e49e9ffc943e7713368f6de16955d1e8e6d025 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -20,10 +20,6 @@ ka:
attributes:
diaspora_handle:
taken: "უკვე დáƒáƒ™áƒáƒ•áƒ”ბულიáƒ."
- request:
- attributes:
- from_id:
- taken: "áƒáƒ ის უკვე áƒáƒ სებული მáƒáƒ—ხáƒáƒ•áƒœáƒ˜áƒ¡ áƒáƒ¡áƒšáƒ˜."
reshare:
attributes:
root_guid:
@@ -116,7 +112,6 @@ ka:
commenting: "დáƒáƒ™áƒáƒ›áƒ”ნტáƒáƒ ებáƒ"
contacts:
index:
- add_a_new_aspect: "დáƒáƒáƒ›áƒáƒ¢áƒ” áƒáƒ®áƒáƒšáƒ˜ áƒáƒ¡áƒžáƒ”ქტი"
all_contacts: "ყველრკáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜"
community_spotlight: "სáƒáƒ–áƒáƒ’áƒáƒ“áƒáƒ”ბის ყურáƒáƒ“ღების ცენტრში"
my_contacts: "ჩემი კáƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ”ბი"
@@ -240,7 +235,6 @@ ka:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "გáƒáƒ›áƒáƒ¥áƒ•áƒ”ყნებáƒ"
private_message:
few: "%{actors} sent you a message."
many: "%{actors} sent you a message."
diff --git a/config/locales/diaspora/kn.yml b/config/locales/diaspora/kn.yml
index 0b07609c32cb59685a2419116e20e17813d385cd..e88d14df011aa6c15acae2f9f75ed2864484a668 100644
--- a/config/locales/diaspora/kn.yml
+++ b/config/locales/diaspora/kn.yml
@@ -16,10 +16,6 @@ kn:
attributes:
person_id:
taken: "ಈ ಬಳಕೆದಾರರ ಸಂಪರà³à²•à²—ಳ ನಡà³à²µà³† ಅನನà³à²¯ ಇರಬೇಕà³."
- request:
- attributes:
- from_id:
- taken: "ಒಂದೠಪೂರà³à²µ ಅಸà³à²¤à²¿à²¤à³à²µà²¦à²²à³à²²à²¿à²°à³à²µ ವಿನಂತಿಯ ನಕಲೠಇದೆ."
user:
attributes:
person:
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index aa3c581d9581e76b91bfb512f1ddde13ee6f16bd..f805c64f27cebb971c8b8ebd97198f81c16c4522 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -21,10 +21,6 @@ ko:
attributes:
diaspora_handle:
taken: ": ì´ë¯¸ ì“°ì´ê³ 있습니다."
- request:
- attributes:
- from_id:
- taken: ": ì´ë¯¸ 존재하는 ìš”ì²ê³¼ 중복입니다."
reshare:
attributes:
root_guid:
@@ -167,7 +163,6 @@ ko:
commenting: "댓글 다는 중···"
contacts:
index:
- add_a_new_aspect: "새 ì• ìŠ¤íŽ™ 추가"
all_contacts: "ëª¨ë“ ì»¨íƒ"
community_spotlight: "커뮤니티 스í¬íŠ¸ë¼ì´íŠ¸"
my_contacts: "ë‚´ 컨íƒ"
@@ -316,7 +311,6 @@ ko:
other: "%{actors}ë‹˜ì´ ì§€ì›Œì§„ 게시물ì—ì„œ 나를 멘션했습니다."
two: "%{actors}ë‹˜ì´ ì§€ì›Œì§„ 게시물ì—ì„œ 나를 멘션했습니다."
zero: "%{actors}ë‹˜ì´ ì§€ì›Œì§„ 게시물ì—ì„œ 나를 멘션했습니다."
- post: "게시물"
private_message:
few: "%{actors}ë‹˜ì´ ìª½ì§€ë¥¼ 보냈습니다."
many: "%{actors}ë‹˜ì´ ìª½ì§€ë¥¼ 보냈습니다."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 6beda68f05d1516f54138774ecf06a25106136ee..0b450f1f49873cbfdd91a5c2276578227fb00d78 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -20,10 +20,6 @@ lt:
attributes:
diaspora_handle:
taken: "Užimtas"
- request:
- attributes:
- from_id:
- taken: "Å is reikalavimas kartojasi"
reshare:
attributes:
root_guid:
@@ -109,7 +105,6 @@ lt:
commenting: "SiunÄiamas komentaras..."
contacts:
index:
- add_a_new_aspect: "Sukurti kategorijÄ…"
all_contacts: "Visi kontaktai"
community_spotlight: "BendruomenÄ—s dÄ—mesio centre"
my_contacts: "Mano kontaktai"
@@ -216,7 +211,6 @@ lt:
one: "%{actors} paminėjo Jus ištrintame įraše."
other: "%{actors} paminėjo Jus ištrintame įraše."
zero: "%{actors} paminėjo Jus ištrintame įraše."
- post: "Siųsti"
private_message:
few: "Atsiuntė %{actors} pranešimus"
one: "Atsiuntė %{actors} pranešimą"
diff --git a/config/locales/diaspora/lv.yml b/config/locales/diaspora/lv.yml
index bb238389199b6826eac31135e80b69f4ced46e38..3bcca34834750f02804694de670bae8292ebeb44 100644
--- a/config/locales/diaspora/lv.yml
+++ b/config/locales/diaspora/lv.yml
@@ -97,7 +97,6 @@ lv:
commenting: "Komentē..."
contacts:
index:
- add_a_new_aspect: "Pievienot jaunai grupai"
all_contacts: "Visi kontakti"
start_a_conversation: "SÄkt sarunu"
title: "Kontakti"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 7543a0497e79ef040d1c387a34ed6c3439d17c62..71b71fc2d3076281f228b1463056c9f0f3e58938 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -21,10 +21,6 @@ ml:
attributes:
diaspora_handle:
taken: "à´®àµàµ»à´ªàµ‡ ഉപയോഗതàµà´¤à´¿à´²àµà´£àµà´Ÿàµ."
- request:
- attributes:
- from_id:
- taken: "നിലവിലàµà´³àµà´³ ഒരൠഅപേകàµà´·à´¯àµà´Ÿàµ† പകരàµâ€à´ªàµà´ªà´¾à´£àµ."
reshare:
attributes:
root_guid:
@@ -174,7 +170,6 @@ ml:
commenting: "à´…à´à´¿à´ªàµà´°à´¾à´¯à´‚ രേഖപàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´¨àµà´¨àµ..."
contacts:
index:
- add_a_new_aspect: "à´ªàµà´¤à´¿à´¯ പരിചയം ചേരàµâ€à´•àµà´•àµ‚"
all_contacts: "à´Žà´²àµà´²à´¾ സമàµà´ªà´°àµâ€à´•àµà´•à´µàµà´‚"
community_spotlight: "സാമൂഹിക à´ªàµà´°à´¾à´§à´¾à´¨àµà´¯à´‚"
my_contacts: "à´Žà´¨àµà´±àµ† സമàµà´ªà´°àµâ€à´•àµà´•à´™àµà´™à´³àµâ€"
@@ -432,7 +427,6 @@ ml:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "à´•àµà´±à´¿à´ªàµà´ªàµ"
private_message:
one: "%{actors} താങàµà´•à´³àµâ€à´•àµà´•àµ ഒരൠസനàµà´¦àµ‡à´¶à´‚ അയചàµà´šàµ."
other: "%{actors} താങàµà´•à´³àµâ€à´•àµà´•àµ ഒരൠസനàµà´¦àµ‡à´¶à´‚ അയചàµà´šàµ."
diff --git a/config/locales/diaspora/ms.yml b/config/locales/diaspora/ms.yml
index 22be9052173d0993dd6261fda6a386b62a18a825..219d10f93908e2b1716ca55ecb295bd789e9728c 100644
--- a/config/locales/diaspora/ms.yml
+++ b/config/locales/diaspora/ms.yml
@@ -20,10 +20,6 @@ ms:
attributes:
diaspora_handle:
taken: "sudah diambil."
- request:
- attributes:
- from_id:
- taken: "adalah salinan permintaan yang sedia ada."
reshare:
attributes:
root_guid:
@@ -109,7 +105,6 @@ ms:
commenting: "Mengulas..."
contacts:
index:
- add_a_new_aspect: "Tambah aspek baru"
all_contacts: "Semua Kenalan"
my_contacts: "Kenalan Saya"
only_sharing_with_me: "Hanya berkongsi dengan saya"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 5db7190856199e80c45f4bb5b1d61576c75c70a7..5369d045d2615fdf0ee7c3c9d70b7f5f0a35301c 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -31,10 +31,6 @@ nb:
attributes:
poll:
already_participated: "Du har allerede deltatt i denne spørreundersøkelsen!"
- request:
- attributes:
- from_id:
- taken: "er en kopi av en pre-eksisterende forespørsel."
reshare:
attributes:
root_guid:
@@ -212,7 +208,6 @@ nb:
commenting: "Kommenterer ..."
contacts:
index:
- add_a_new_aspect: "Legg til nytt aspekt"
add_contact: "Legg til kontakt"
all_contacts: "Alle Kontakter"
community_spotlight: "Fremhevet av Fellesskapet"
@@ -583,7 +578,6 @@ nb:
other: "%{actors} nevnte deg i en slettet post."
two: "%{actors} nevnte deg i en slettet post."
zero: "%{actors} nevnte deg i en slettet post."
- post: "innlegg"
private_message:
few: "%{actors} sendte deg en melding."
many: "%{actors} sendte deg en melding."
diff --git a/config/locales/diaspora/nds.yml b/config/locales/diaspora/nds.yml
index a5d519e282d7adc2731dcce96a1c4e6d8e2fba79..ca3a2bd4d3152bb7fb9aa0e76cbea37006513139 100644
--- a/config/locales/diaspora/nds.yml
+++ b/config/locales/diaspora/nds.yml
@@ -31,10 +31,6 @@ nds:
attributes:
poll:
already_participated: "Du hest an disse Ãœmfroog schon deelnommen!"
- request:
- attributes:
- from_id:
- taken: "is een Dubbel von een Anfroog, de dat schon gift."
reshare:
attributes:
root_guid:
@@ -199,7 +195,6 @@ nds:
commenting: "Kommenteer..."
contacts:
index:
- add_a_new_aspect: "Dau een nee’en Kontakt dortau"
add_contact: "Kontakt schluten"
all_contacts: "Alle Kontakte"
community_spotlight: "vörstellten Gemeenschaftsmitglieder"
@@ -466,7 +461,6 @@ nds:
one: "%{actors} het di in een löschten Bidrag erwähnt."
other: "%{actors} hebbt di in een löschten Bidrag erwähnt."
zero: "Keener het di in een löschten Bidrag erwähnt."
- post: "Bidrag"
private_message:
one: "%{actors} het di eene Noricht schickt"
other: "%{actors} hebbt di eene Noricht schickt"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index e04f9927df00c0053308ae80878125a7a00d0187..1304f79c9b7d37230ab91a4be1073a85d3097717 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -31,10 +31,6 @@ nl:
attributes:
poll:
already_participated: "Je hebt al gestemd bij deze peiling!"
- request:
- attributes:
- from_id:
- taken: "is een duplicaat van een reeds bestaande aanvraag."
reshare:
attributes:
root_guid:
@@ -281,7 +277,6 @@ nl:
commenting: "Reageren..."
contacts:
index:
- add_a_new_aspect: "Voeg een aspect toe"
add_contact: "Toevoegen contactpersoon"
all_contacts: "Alle contacten"
community_spotlight: "Community aanrader"
@@ -689,7 +684,6 @@ nl:
one: "%{actors} heeft jou vermeld in een verwijderde post."
other: "%{actors} hebben jou vermeld in een verwijderde post."
zero: "%{actors} heeft jou vermeld in een verwijderde post."
- post: "bericht"
private_message:
one: "%{actors} heeft je een bericht gestuurd."
other: "%{actors} hebben je een bericht gestuurd."
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 0472d71fa6bb427c5f999d895e8d5bdd102be0fe..a2debbbc3bf69797edab685d6e9ad8df8da1caa4 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -21,10 +21,6 @@ nn:
attributes:
diaspora_handle:
taken: "er allereie i bruk"
- request:
- attributes:
- from_id:
- taken: "er ein kopi av førespurnad som finst frå før."
reshare:
attributes:
root_guid:
@@ -178,7 +174,6 @@ nn:
commenting: "Kommenterer …"
contacts:
index:
- add_a_new_aspect: "Legg til eit nytt aspekt"
all_contacts: "Alle kontaktane"
community_spotlight: "Kreative medlemer"
my_contacts: "Kontaktane mine"
@@ -337,7 +332,6 @@ nn:
other: "%{actors} nemnde deg i eit sletta innlegg."
two: "%{actors} nemnde deg i eit sletta innlegg."
zero: "%{actors} nemnde deg i eit sletta innlegg."
- post: "innlegg"
private_message:
few: "%{actors} sende deg ei melding."
many: "%{actors} sende deg ei melding."
diff --git a/config/locales/diaspora/oc.yml b/config/locales/diaspora/oc.yml
index 726baf2122e6e439464def31a9f842f2538a7391..2b623b04010503c9a750d0ad780cd71775128869 100644
--- a/config/locales/diaspora/oc.yml
+++ b/config/locales/diaspora/oc.yml
@@ -31,10 +31,6 @@ oc:
attributes:
poll:
already_participated: "Avètz ja paticipat a aquel sondatge !"
- request:
- attributes:
- from_id:
- taken: "es un doblon d'una requèsta qu'existÃs ja."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ oc:
fetching_diaspora_version: "A determinar la darrièra version de diaspora*..."
pod_status: "Estat del pod"
pods:
+ pod_desktop_link: "vista complèta"
+ pod_desktop_view: "Aquesta pagina es pas disponibla en vista pel mobil, mercés de cambiar per la %{desktop_link}."
pod_network: "Ret del pod"
stats:
2weeks: "2 setmanas"
@@ -233,6 +231,8 @@ oc:
here_to_help: "La comunautat diaspora* es aquà !"
mail_podmin: "Corrièl del podmin"
need_help: "Besonh d'ajuda ?"
+ support_forum: "Podètz tanben contactar lo %{support_forum}."
+ support_forum_link: "forum d’assisténcia"
tag_bug: "bug"
tag_feature: "suggestion"
tag_question: "question"
@@ -282,7 +282,6 @@ oc:
commenting: "Comentari en cors de mandadÃs..."
contacts:
index:
- add_a_new_aspect: "Apondre un aspècte novèl"
add_contact: "Apondre un contacte"
all_contacts: "Totes los contactes"
community_spotlight: "Actualitat de la comunautat"
@@ -616,6 +615,7 @@ oc:
application:
back_to_top: "Tornar amont"
be_excellent: "Siatz benvolent amb cadun !"
+ discourse: "Discutidas e assisténcia del projècte"
powered_by: "Propulsat per dispora*"
public_feed: "Flux diaspora* public per %{name}"
source_package: "Telecargatz lo còdi font"
@@ -686,7 +686,6 @@ oc:
one: "%{actors} vos a mencionat sus una publicacion suprimida."
other: "%{actors} vos an mencionat sus una publicacion suprimida."
zero: "%{actors} vos a mencionat sus una publicacion suprimida."
- post: "publicacion"
private_message:
one: "%{actors} vos a mandat un messatge."
other: "%{actors} vos an mandat un messatge."
@@ -1088,6 +1087,8 @@ oc:
streams:
activity:
title: "Mon activitat"
+ admin:
+ title: "Administracion"
aspects:
all: "Totes los aspèctes"
title: "Mos aspèctes"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 5ddcb4dc58293f45b149a146af1b8602de579f6d..7bf693c42856af8c6f4672d19cbfe13483797adc 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -117,7 +117,6 @@ pa:
other: "%{actors} mentioned you in a deleted post."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "ਪੋਸਟ"
private_message:
few: "%{actors} sent you a message."
many: "%{actors} sent you a message."
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 31ab69a4967b7797284206836d607dbfdcf9143a..10dadedea586a86ba0408490824eb700363bc2fc 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -31,10 +31,6 @@ pl:
attributes:
poll:
already_participated: "Ankieta już zawiera Twoją odpowiedź!"
- request:
- attributes:
- from_id:
- taken: "jest powieleniem istniejÄ…cego zapytania."
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ pl:
fetching_diaspora_version: "Ustalanie najnowszej wersji diaspory*"
pod_status: "Stan poda"
pods:
+ pod_desktop_link: "pełna wersja strony"
+ pod_desktop_view: "Ta strona nie jest dostępna w mobilnej wersji strony, proszę przełączyć się na %{desktop_link}."
pod_network: "Sieć poda"
stats:
2weeks: "2 tygodnie"
@@ -224,6 +222,8 @@ pl:
here_to_help: "Społeczność diaspory* jest tutaj!"
mail_podmin: "Adres e-mail administratora"
need_help: "Potrzebujesz pomocy?"
+ support_forum: "Możesz także dołączyć do %{support_forum}."
+ support_forum_link: "forum wsparcia technicznego"
tag_bug: "błąd"
tag_feature: "funkcja"
tag_question: "pytanie"
@@ -273,7 +273,6 @@ pl:
commenting: "Dodawanie komentarza..."
contacts:
index:
- add_a_new_aspect: "Dodaj aspekt"
add_contact: "Dodaj kontakt"
all_contacts: "Wszystkie kontakty"
community_spotlight: "W centrum uwagi"
@@ -675,7 +674,6 @@ pl:
one: "%{actors} wspomniał/ła o Tobie w usuniętym już wpisie."
other: "%{actors} wspomnieli/ły o Tobie w usuniętym już wpisie."
zero: "%{actors} wspomnieli o Tobie w usuniętym już wpisie."
- post: "wpis"
private_message:
few: "%{actors} wysłali/ły Ci wiadomość."
many: "%{actors} wysłali/ły Ci wiadomość."
@@ -1053,6 +1051,8 @@ pl:
streams:
activity:
title: "Moja aktywność"
+ admin:
+ title: "Administrator"
aspects:
all: "Wszystkie aspekty"
title: "Moje aspekty"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 74c8a9824d4d04381613785c5b883275a2d2b10f..947eb9e6867370c9ae7ce91bdeb94fb4c38d83d0 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -31,14 +31,10 @@ pt-BR:
attributes:
poll:
already_participated: "Você já participou desta enquete!"
- request:
- attributes:
- from_id:
- taken: "é uma duplicata de um pedido de pré-existentes."
reshare:
attributes:
root_guid:
- taken: "Que bom, hein? Mas você já recompartilhou esta publicação!"
+ taken: "Que bom, mas você já recompartilhou esta publicação!"
user:
attributes:
email:
@@ -62,6 +58,8 @@ pt-BR:
fetching_diaspora_version: "Buscando versão mais recente de diaspora*..."
pod_status: "Estado do servidor"
pods:
+ pod_desktop_link: "versão desktop"
+ pod_desktop_view: "Esta página não está disponÃvel na versão móvel. Por favor, mude para a %{desktop_link}."
pod_network: "Rede"
stats:
2weeks: "2 semanas"
@@ -233,6 +231,8 @@ pt-BR:
here_to_help: "A comunidade diaspora* está aqui!"
mail_podmin: "E-mail da administração"
need_help: "Precisa de ajuda?"
+ support_forum: "Você também pode entrar para o %{support_forum}."
+ support_forum_link: "fórum de suporte"
tag_bug: "bug"
tag_feature: "recurso"
tag_question: "pergunta"
@@ -282,7 +282,6 @@ pt-BR:
commenting: "Comentando..."
contacts:
index:
- add_a_new_aspect: "Adicione um novo aspecto"
add_contact: "Adicionar contato"
all_contacts: "Todos os Contatos"
community_spotlight: "Destaque da Comunidade"
@@ -612,6 +611,7 @@ pt-BR:
application:
back_to_top: "Voltar ao topo"
be_excellent: "Sejam uns amores! ♥"
+ discourse: "Discussão de projetos e suporte"
powered_by: "Desenvolvido por diaspora*"
public_feed: "Feed público de diaspora* para %{name}"
source_package: "Baixar pacote do código-fonte"
@@ -683,7 +683,6 @@ pt-BR:
mentioned_deleted:
one: "%{actors} mencionou você em uma publicação deletada."
other: "%{actors} mencionaram você em uma publicação deletada."
- post: "publicação"
private_message:
one: "%{actors} te enviou uma mensagem."
other: "%{actors} te enviaram uma mensagem."
@@ -1028,7 +1027,7 @@ pt-BR:
control_your_audience: "Controle seu público"
logged_in: "Entrou no %{service}"
manage: "Gerenciar serviços conectados"
- new_user_welcome_message: "Use #hashtags para classificar suas publicações e encontrar pessoas que compartilham de seus interesses. Chame as pessoas interessantes com @Menções"
+ new_user_welcome_message: "Use #hashtags para classificar suas publicações e encontrar pessoas que compartilham de seus interesses. Chame a atenção de pessoas interessantes com as @Menções"
outside: "Mensagens públicas estarão disponÃveis para serem visualizadas por pessoas que estão fora de diaspora*."
share: "Compartilhar"
title: "Configurar serviços conectados"
@@ -1083,6 +1082,8 @@ pt-BR:
streams:
activity:
title: "Minha Atividade"
+ admin:
+ title: "Admin"
aspects:
all: "Todos os aspectos"
title: "Meus Aspectos"
@@ -1189,7 +1190,7 @@ pt-BR:
community_welcome: "A comunidade diaspora* está feliz em ter você a bordo!"
connect_to_facebook: "Podemos acelerar um pouco as coisas %{link} a diaspora*. Seu nome e foto serão recuperados, e a publicação simultânea, habilitada."
connect_to_facebook_link: "Conectando seu Facebook"
- hashtag_explanation: "Hashtags permitem a você compartilhar e acompanhar seus interesses. Elas também são uma ótima maneira de conhecer novas pessoas."
+ hashtag_explanation: "Hashtags permitem que você compartilhe e acompanhe seus interesses. Elas também são uma ótima maneira de conhecer novas pessoas na diaspora*."
hashtag_suggestions: "Tente tags como #arte, #cinema, #gif, etc."
well_hello_there: "Bem, olá!"
what_are_you_in_to: "Onde você está?"
@@ -1210,7 +1211,7 @@ pt-BR:
follow_settings_not_changed: "A alteração das configurações de seguimento falhou."
language_changed: "Idioma alterado"
language_not_changed: "Alteração do idioma falhou!"
- password_changed: "Senha alterada com sucesso! Agora você poderá se conectar com a sua nova senha."
+ password_changed: "Senha alterada com sucesso! Agora você pode usar sua nova senha para entrar no sistema."
password_not_changed: "Alteração da senha falhou!"
settings_not_updated: "Atualização de configurações falhou"
settings_updated: "Configurações atualizadas"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 9b0eb6fcdeb5d1e10f08c9c07c61f979e95ee0a2..3a37506f67a259a0fc7c6af5cf82e20eeb316dfa 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -21,10 +21,6 @@ pt-PT:
attributes:
diaspora_handle:
taken: "já foi escolhido."
- request:
- attributes:
- from_id:
- taken: "é um duplicado de um pedido pré-existente."
reshare:
attributes:
root_guid:
@@ -176,7 +172,6 @@ pt-PT:
commenting: "A comentar..."
contacts:
index:
- add_a_new_aspect: "Adicionar um novo grupo"
all_contacts: "Todos os contactos"
community_spotlight: "Destaques da comunidade"
my_contacts: "Meus contactos"
@@ -447,7 +442,6 @@ pt-PT:
other: "%{actors} mencionaram-no numa publicação apagada."
two: "%{actors} mencionaram-no numa publicação apagada."
zero: "%{actors} mencionaram-no numa publicação apagada."
- post: "publicação"
private_message:
one: "%{actors} enviou-lhe uma mensagem."
other: "%{actors} enviaram-lhe uma mensagem."
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 4e28d651811fc71b36b973dfb708c739356a23ba..0525040c8d070ed1da16f8bdd7cdb33edb864703 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -21,10 +21,6 @@ ro:
attributes:
diaspora_handle:
taken: "e folosit deja."
- request:
- attributes:
- from_id:
- taken: "este o dublura a unei cereri pre-existente."
user:
attributes:
email:
@@ -123,7 +119,6 @@ ro:
commenting: "Comentând..."
contacts:
index:
- add_a_new_aspect: "Adaugă un aspect nou"
all_contacts: "Toate contactele"
community_spotlight: "reflectorul comunității"
my_contacts: "Contactele mele"
@@ -272,7 +267,6 @@ ro:
other: "%{actors} te-au amintit intro publicatie deja stearsa."
two: "%{actors} mentioned you in a deleted post."
zero: "%{actors} mentioned you in a deleted post."
- post: "publicaţie"
private_message:
few: "%{actors} sent you a message."
many: "%{actors} sent you a message."
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 089d9d855d9c67ab22a6710d8b4f04c1a213b8dc..0306aafa0acf62d3039145d6eb39108d8906bb44 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -31,10 +31,6 @@ ru:
attributes:
poll:
already_participated: "Ð’Ñ‹ уже учаÑтвовали в Ñтом опроÑе!"
- request:
- attributes:
- from_id:
- taken: "дубликат предыдущих запроÑов."
reshare:
attributes:
root_guid:
@@ -242,7 +238,6 @@ ru:
commenting: "Комментирование..."
contacts:
index:
- add_a_new_aspect: "Ðовый аÑпект"
add_contact: "Добавить контакт"
all_contacts: "Ð’Ñе контакты"
community_spotlight: "Рекомендованные пользователи"
@@ -650,7 +645,6 @@ ru:
one: "%{actors} упомÑнул(а) Ð²Ð°Ñ Ð² удаленной запиÑи."
other: "%{actors} упомÑнули Ð²Ð°Ñ Ð² удаленной запиÑи."
zero: "%{actors} упомÑнули Ð²Ð°Ñ Ð² удаленной запиÑи."
- post: "запиÑÑŒ"
private_message:
few: "%{actors} поÑлали вам Ñообщение."
many: "%{actors} поÑлали вам Ñообщение."
diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml
index 184d250bd3be01fc91288eed559b0d063448c022..16a0998b2d699cc3525fabbe6df0b245d6d22cc1 100644
--- a/config/locales/diaspora/sc.yml
+++ b/config/locales/diaspora/sc.yml
@@ -20,14 +20,10 @@ sc:
attributes:
diaspora_handle:
taken: "est giai istadu pigadu."
- request:
- attributes:
- from_id:
- taken: "est una còpia de un'à tera rechesta giai esistente."
reshare:
attributes:
root_guid:
- taken: "Bellu a beru, eh?  Ma as giai cumpartzidu cussu post!"
+ taken: "Bellu a beru, eh? Ma as giai cumpartzidu cussa publicatzione!"
user:
attributes:
email:
@@ -53,7 +49,7 @@ sc:
add_an_aspect: "+ Annanghe una cara"
aspect_stream:
stay_updated: "Abarra agiornadu"
- stay_updated_explanation: "In su flussu tuo bi sunt totu sos cuntatos tuos, sas etichetas chi sighis e sos messà gios pùblicos de sos membros prus creativos de sa comunidade."
+ stay_updated_explanation: "In su flussu tuo bi sunt totu sos cuntatos tuos, sas etichetas chi sighis e sas publicatziones de sos membros prus creativos de sa comunidade."
destroy:
failure: "No est istadu possìbile bogare %{name}."
success: "%{name} est istada bogada."
@@ -74,6 +70,7 @@ sc:
have_a_question: "fà ghere una %{link}?"
here_to_help: "Sa comunidade de diaspora* est inoghe!"
need_help: "Tenes bisòngiu de agiudu?"
+ support_forum_link: "forum de suportu"
tag_bug: "errore"
tag_feature: "funtzionalidade"
tag_question: "pregunta"
@@ -109,7 +106,6 @@ sc:
commenting: "Cummentende..."
contacts:
index:
- add_a_new_aspect: "Annanghe un'aspetu nou"
all_contacts: "Totu sos cuntatos"
community_spotlight: "In evidèntzia in sa comunidade"
my_contacts: "Cuntatos meos"
@@ -159,7 +155,9 @@ sc:
send_an_invitation: "Imbia un'invitu"
layouts:
application:
+ back_to_top: "Torra a s'incumintzu"
powered_by: "Suportadu dae diaspora*"
+ public_feed: "Flussu de diaspora* pùblicu de %{name}"
whats_new: "Ite b'est de nou?"
header:
code: "Còdighe"
@@ -170,15 +168,56 @@ sc:
more: "Àteru"
no_results: "Perunu resurtadu agatadu"
notifications:
+ also_commented:
+ one: "Fintzas %{actors} at cummentadu sa publicatzione %{post_link} de %{post_author}."
+ other: "Fintzas %{actors} ant cummentadu sa publicatzione %{post_link} de %{post_author}."
+ zero: "%{actors} at cummentadu sa publicatzione %{post_link} de %{post_author}."
+ also_commented_deleted:
+ one: "%{actors} at cummentadu una publicatzione chi est istada iscantzellada."
+ other: "%{actors} ant cummentadu una publicatzione chi est istada iscantzellada."
+ zero: "%{actors} at cummentadu una publicatzione chi est istada iscantzellada."
+ comment_on_post:
+ one: "%{actors} at cummentadu sa publicatzione tua %{post_link}."
+ other: "%{actors} ant cummentadu sa publicatzione tua %{post_link}."
+ zero: "%{actors} at cummentadu sa publicatzione tua %{post_link}."
+ index:
+ and: "e"
+ notifications: "Notìficas"
+ liked:
+ one: "A %{actors} agradat sa publicatzione tua %{post_link}."
+ other: "A %{actors} agradat sa publicatzione tua %{post_link}."
+ zero: "A %{actors} agradat sa publicatzione tua %{post_link}."
+ liked_post_deleted:
+ one: "A %{actors} l'agradaiat sa publicatzione chi as iscantzelladu."
+ other: "A %{actors} lis agradaiat sa publicatzione chi as iscantzelladu."
+ zero: "A %{actors} l'agradaiat sa publicatzione chi as iscantzelladu."
+ mentioned:
+ one: "%{actors} t'at numenadu in sa publicatzione %{post_link}."
+ other: "%{actors} t'ant numenadu in sa publicatzione %{post_link}."
+ zero: "%{actors} t'at numenadu in sa publicatzione %{post_link}."
+ mentioned_deleted:
+ one: "%{actors} t'at numenadu in una publicatzione chi est istada iscantzellada."
+ other: "%{actors} t'ant numenadu in una publicatzione chi est istada iscantzellada."
+ zero: "%{actors} t'at numenadu in una publicatzione chi est istada iscantzellada."
private_message:
one: "%{actors} t'at imbiadu unu messà giu."
other: "%{actors} t'ant imbiadu unu messà giu."
zero: "%{actors} t'at imbiadu unu messà giu."
+ reshared:
+ one: "%{actors} at cumpartzidu sa publicatzione tua %{post_link}."
+ other: "%{actors} ant cumpartzidu sa publicatzione tua %{post_link}."
+ zero: "%{actors} at cumpartzidu sa publicatzione tua %{post_link}."
+ reshared_post_deleted:
+ one: "%{actors} at cumpartzidu sa publicatzione chi as iscantzelladu."
+ other: "%{actors} ant cumpartzidu sa publicatzione chi as iscantzelladu."
+ zero: "%{actors} at cumpartzidu sa publicatzione chi as iscantzelladu."
started_sharing:
one: "%{actors} at incumintzadu a cumpartzire cun tie."
other: "%{actors} ant incumintzadu a cumpartzire cun tie."
zero: "%{actors} at incumintzadu a cumpartzire cun tie."
notifier:
+ a_post_you_shared: "una publicatzione."
+ click_here: "Incarca inoghe"
export_photos_email:
body: |-
Salude, %{name},
@@ -187,11 +226,24 @@ sc:
Saludos,
Su robot de sa posta eletrònica de diaspora*!
+ hello: "Salude %{name}!"
+ liked:
+ liked: "A %{name} l'agradat sa publicatzione tua"
private_message:
subject: "B'est unu messà giu privadu nou pro tie"
+ started_sharing:
+ view_profile: "Abbista su profilu de %{name}"
+ thanks: "Grà tzias,"
nsfw: "NSFW (no est adatu pro unu logu de traballu)"
ok: "AB"
+ people:
+ profile_sidebar:
+ born: "Die de nà schida"
+ gender: "Gènere"
+ location: "Logu"
photos:
+ destroy:
+ notice: "Fotografia iscantzellada."
new_profile_photo:
upload: "CÃ rriga una fotografia de profilu noa!"
privacy: "Privadesa"
@@ -200,10 +252,12 @@ sc:
search: "Chirca"
settings: "Impostatziones"
streams:
+ admin:
+ title: "Amministradore"
commented:
- title: "Messà gios pùblicos cummentados"
+ title: "Publicatziones cummentadas"
liked:
- title: "Messà gios pùblicos agradados"
+ title: "Publicatziones agradadas"
username: "Nùmene impitadore"
users:
edit:
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 7ccaa8d6554b7e761b0e7c4d837f89f33234f2fd..225dec5ba131c318321f50359b9bac2f41078764 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -21,10 +21,6 @@ sk:
attributes:
diaspora_handle:
taken: "je už obsadené."
- request:
- attributes:
- from_id:
- taken: "je duplikátom existujúcej požiadavky."
reshare:
attributes:
root_guid:
@@ -182,7 +178,6 @@ sk:
commenting: "Komentár sa posiela…"
contacts:
index:
- add_a_new_aspect: "Pridať novú kategóriu"
all_contacts: "VÅ¡etky kontakty"
community_spotlight: "Aktuality z komunity"
my_contacts: "Moje kontakty"
@@ -401,7 +396,6 @@ sk:
one: "%{actors} Å¥a spomenul(a) vo vymazanom prÃspevku."
other: "%{actors} Å¥a spomenuli vo vymazanom prÃspevku."
zero: "%{actors} Å¥a spomenulo vo vymazanom prÃspevku."
- post: "prÃspevok"
private_message:
few: "%{actors} ti poslali správu."
one: "%{actors} ti poslal(a) správu."
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 14b5fe1db102c7cd7aab1433575fdad3a8412a2d..b6469cab3dc314d0b60cb5400d3024f2a3b0f0a8 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -21,10 +21,6 @@ sl:
attributes:
diaspora_handle:
taken: "je že zaseden."
- request:
- attributes:
- from_id:
- taken: "je dvojnik vloge, ki že obstaja."
reshare:
attributes:
root_guid:
@@ -185,7 +181,6 @@ sl:
commenting: "Pisanje mnenja ..."
contacts:
index:
- add_a_new_aspect: "Dodaj nov vidik"
all_contacts: "Vsi stiki"
community_spotlight: "SrediÅ¡Äe pozornosti skupnosti"
my_contacts: "Moji stiki"
@@ -316,7 +311,6 @@ sl:
other: "%{actors} je omenilo vas v izbrisani objavi."
two: "%{actors} sta vas omenila v izbrisani objavi."
zero: "%{actors} vas je omenilo v izbrisani objavi."
- post: "objava"
private_message:
few: "%{actors} so vam poslali sporoÄilo."
one: "%{actors} vam je poslal sporoÄilo."
diff --git a/config/locales/diaspora/sr.yml b/config/locales/diaspora/sr.yml
index c1d622a8beeb15f8b449c3621f762f639cbc6311..0592d1d7fd624fcb9cae8e46298f8815760f6515 100644
--- a/config/locales/diaspora/sr.yml
+++ b/config/locales/diaspora/sr.yml
@@ -20,10 +20,6 @@ sr:
attributes:
diaspora_handle:
taken: "је већ заузето."
- request:
- attributes:
- from_id:
- taken: "је дупликат већ поÑтојећег захтева."
reshare:
attributes:
root_guid:
@@ -165,7 +161,6 @@ sr:
and: "и"
mark_all_as_read: "Означи Ñве као прочитано"
notifications: "Обавештења"
- post: "објава"
notifier:
a_post_you_shared: "објава"
click_here: "Кликните овде"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 40288aef0410095b35ddc2935e59ff02739d00ce..9c9ebe8f3c2df66437285397c0ee0564b0060dc8 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -31,10 +31,6 @@ sv:
attributes:
poll:
already_participated: "Du har redan deltagit i denna undersökning."
- request:
- attributes:
- from_id:
- taken: "är en kopia av en tidigare förfrågan."
reshare:
attributes:
root_guid:
@@ -282,7 +278,6 @@ sv:
commenting: "Kommenterar..."
contacts:
index:
- add_a_new_aspect: "Lägg till en ny aspekt"
add_contact: "Lägg till kontakt"
all_contacts: "Alla kontakter"
community_spotlight: "Gemenskapens rampljus"
@@ -685,7 +680,6 @@ sv:
one: "%{actors} har nämnt dig i ett raderat inlägg."
other: "%{actors} har nämnt dig i ett raderat inlägg."
zero: "inga inlägg där du är nämnd har raderats."
- post: "inlägg"
private_message:
one: "%{actors} har skickat dig ett meddelande."
other: "%{actors} har skickat dig ett meddelande."
diff --git a/config/locales/diaspora/ta.yml b/config/locales/diaspora/ta.yml
index f4402193641e7b4ea9db01d58cf0b58d1eb5d47d..90eccc9f8d60fcc2c9c19cd7ed4f12b7a76f2bdf 100644
--- a/config/locales/diaspora/ta.yml
+++ b/config/locales/diaspora/ta.yml
@@ -20,10 +20,6 @@ ta:
attributes:
diaspora_handle:
taken: "à®à®±à¯à®•à®©à®µà¯‡ எடà¯à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®µà®¿à®Ÿà¯à®Ÿà®¤à¯"
- request:
- attributes:
- from_id:
- taken: "இத௠மà¯à®©à¯ இரà¯à®•à¯à®•à¯à®®à¯ கோரிகà¯à®•à¯ˆà®¯à®¿à®©à¯ நகல௠ஆகà¯à®®à¯."
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index e8aead596626deded8bc0356febaba3fcfc5b4f1..9f517d98c7399b33fcb04a7c810e50f2d45ea81c 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -23,10 +23,6 @@ te:
attributes:
diaspora_handle:
taken: "ఇపà±à°ªà°Ÿà°¿à°•à±‡ తీసà±à°•à±‹à°¬à°¡à°¿à°¨à°¦à°¿."
- request:
- attributes:
- from_id:
- taken: "à°—à°¤ వినà±à°¨à°ªà°‚ యొకà±à°• నకిలీ"
reshare:
attributes:
root_guid:
@@ -207,7 +203,6 @@ te:
commenting: "à°µà±à°¯à°¾à°–à±à°¯à°¾à°¨à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°®à±..."
contacts:
index:
- add_a_new_aspect: "à°’à°• కొతà±à°¤ కోణానà±à°¨à°¿ జతచేయి"
add_contact: "పరిచయానà±à°¨à°¿ జతచేయి"
all_contacts: "à°…à°¨à±à°¨à°¿ పరిచయాలà±"
community_spotlight: "సంఘపౠసà±à°ªà°¾à°Ÿà±â€‹à°²à±ˆà°Ÿà±"
@@ -443,7 +438,6 @@ te:
one: "%{actors} మిమà±à°®à°²à±à°¨à°¿ à°’à°• తొలగించిన టపాలో à°ªà±à°°à°¸à±à°¤à°¾à°µà°¿à°‚చారà±."
other: "%{actors} మిమà±à°®à°²à±à°¨à°¿ à°’à°• తొలగించిన టపాలో à°ªà±à°°à°¸à±à°¤à°¾à°µà°¿à°‚చారà±."
zero: "%{actors} మిమà±à°®à°²à±à°¨à°¿ à°’à°• తొలగించిన టపాలో à°ªà±à°°à°¸à±à°¤à°¾à°µà°¿à°‚చారà±."
- post: "టపా"
private_message:
one: "%{actors} మీకొక సందేశానà±à°¨à°¿ పంపారà±."
other: "%{actors} మీకొక సందేశానà±à°¨à°¿ పంపారà±."
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5df3720472715890254b5d8ea6c8f0c113c05b5e..cde3970a07e81830af611bb7aa063e80768caea0 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -26,10 +26,6 @@ tr:
attributes:
poll:
already_participated: "Bu oylamada zaten oyunuz var!"
- request:
- attributes:
- from_id:
- taken: "çift ya da hâlihazırda mevcut bir istektir."
reshare:
attributes:
root_guid:
@@ -189,7 +185,6 @@ tr:
commenting: "Yorumlanıyor..."
contacts:
index:
- add_a_new_aspect: "Yeni yön ekle"
all_contacts: "Tüm Kişiler"
community_spotlight: "Topluluk Haberleri"
my_contacts: "KiÅŸilerim"
@@ -445,7 +440,6 @@ tr:
mentioned_deleted:
other: "%{actors} silinmiş gönderide senden bahsetti."
zero: "%{actors} silinmiş gönderide senden bahsetti."
- post: "gönderi"
private_message:
other: "%{actors} ileti gönderdi."
zero: "%{actors} ileti gönderdi."
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 6dfce7fcc9682c1bc2ed4c756b17bf42afcb7efb..05f558559de8d7feb35f28b4ca2264cf84efc169 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -31,14 +31,10 @@ uk:
attributes:
poll:
already_participated: "Ви вже брали учаÑÑ‚ÑŒ в цьому опитуванні!"
- request:
- attributes:
- from_id:
- taken: "дублікат попередніх запитів."
reshare:
attributes:
root_guid:
- taken: "Це ж добре, так? Ви вже поділилиÑÑ Ñ†Ð¸Ð¼ запиÑом!"
+ taken: "Ðж так добре? Ви вже поділилиÑÑ Ñ†Ð¸Ð¼ запиÑом!"
user:
attributes:
email:
@@ -54,7 +50,7 @@ uk:
pages: "Сторінки"
pod_network: "Мережа поду"
pod_stats: "СтатиÑтика Ñервера"
- report: "ДоноÑи"
+ report: "Скарги"
sidekiq_monitor: "Монітор Sidekiq"
user_search: "Пошук кориÑтувачів"
weekly_user_stats: "Щотижнева ÑтатиÑтика кориÑтувачів"
@@ -62,6 +58,8 @@ uk:
fetching_diaspora_version: "Ð’Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ñтанньої верÑÑ–Ñ— ДіаÑпори*..."
pod_status: "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾Ð´Ñƒ"
pods:
+ pod_desktop_link: "Ñтаціонарний виглÑд"
+ pod_desktop_view: "Ð¦Ñ Ñторінка недоÑтупна у мобільному виглÑді, будь лаÑка, перемкніть на %{desktop_link}"
pod_network: "Мережа поду"
stats:
2weeks: "2 тижні"
@@ -72,9 +70,9 @@ uk:
one: "коментарів: %{count}"
other: "коментарів: %{count}"
zero: "жодного коментарÑ"
- current_segment: "За цей період ÑÐµÑ€ÐµÐ´Ð½Ñ Ñ‰Ð¾Ð´ÐµÐ½Ð½Ð° кількіÑÑ‚ÑŒ запиÑів на кориÑтувача Ñклала <b>%{post_yest}</b>, від <b>%{post_day}</b>"
+ current_segment: "За цей період ÑÐµÑ€ÐµÐ´Ð½Ñ Ñ‰Ð¾Ð´ÐµÐ½Ð½Ð° кількіÑÑ‚ÑŒ запиÑів на кориÑтувача Ñклала %{post_yest}, від %{post_day}"
daily: "Щоденно"
- display_results: "Результати за такий період: <b>%{segment}</b>"
+ display_results: "Результати за такий період: %{segment}"
go: "Уперед"
month: "МіÑÑць"
posts:
@@ -89,7 +87,7 @@ uk:
one: "%{count} поширень"
other: "поширеннÑ"
zero: "немає поширень"
- tag_name: "Мітка: <b>%{name_tag}</b> КількіÑÑ‚ÑŒ: <b>%{count_tag}</b>"
+ tag_name: "Мітка: %{name_tag} КількіÑÑ‚ÑŒ: %{count_tag}"
usage_statistic: "СтатиÑтика викориÑтаннÑ"
users:
few: "кориÑтувачів: %{count}"
@@ -208,11 +206,11 @@ uk:
are_you_sure_delete_account: "Ви впевнені, що хочете закрити Ñвій обліковий запиÑ? Цю процедуру неможливо ÑкаÑувати!"
aspect_memberships:
destroy:
- failure: "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача з аÑпектів"
+ failure: "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ кориÑтувача з аÑпекту"
forbidden: "Вам не можна цього робити."
invalid_statement: "Знайдено подібний запиÑ."
no_membership: "Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ цього кориÑтувача в аÑпекті"
- success: "КориÑтувач уÑпішно видалений з аÑпектів"
+ success: "КориÑтувач уÑпішно видалений з аÑпекту"
aspects:
add_to_aspect:
failure: "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ друга в аÑпект."
@@ -224,7 +222,7 @@ uk:
stay_updated: "Будьте в курÑÑ–"
stay_updated_explanation: "Ваш оÑновний потік наповнюєтьÑÑ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ контактами, мітками, за Ñкими ви Ñтежите Ñ– запиÑами декількох популÑрних членів товариÑтва."
destroy:
- failure: "%{name} не порожній і не може бути вилучений."
+ failure: "ÐÑпект %{name} не може бути вилучений."
success: "%{name} уÑпішно видалений."
success_auto_follow_back: "%{name} було уÑпішно видалено. Ви викориÑтовували цей аÑпект, щоб автоматично Ñлідкувати за кориÑтувачами. Перевірте Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, щоб вибрати новий аÑпект Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ відÑлідковуваннÑ."
edit:
@@ -236,6 +234,7 @@ uk:
updating: "ОновленнÑ"
index:
donate: "Пожертвувати"
+ donate_liberapay: "Пожертвувати liberapay"
help:
any_problem: "Виникли проблеми?"
contact_podmin: "Зв'ÑжітьÑÑ Ð· адмініÑтратором вашого пода!"
@@ -246,6 +245,8 @@ uk:
here_to_help: "ТовариÑтво ДіаÑпори -- це тут!"
mail_podmin: "Email адмініÑтратора поду"
need_help: "Потрібна допомога?"
+ support_forum: "Ви також можете заглÑнути на %{support_forum}"
+ support_forum_link: "форум підтримки"
tag_bug: "помилка"
tag_feature: "функцію"
tag_question: "запитаннÑ"
@@ -262,7 +263,7 @@ uk:
heading: "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñлужб"
welcome_to_diaspora: "ЛаÑкаво проÑимо до ДіаÑпори*, %{name}!"
no_contacts_message:
- community_spotlight: "Рекомендовані кориÑтувачі"
+ community_spotlight: "У центрі уваги"
invite_link_text: "запрошеннÑ"
or_spotlight: "Чи ви можете ділитиÑÑ Ð· %{link}"
try_adding_some_more_contacts: "Ви можете знайти або запроÑити інших кориÑтувачів."
@@ -295,10 +296,9 @@ uk:
commenting: "КоментуваннÑ..."
contacts:
index:
- add_a_new_aspect: "Ðовий аÑпект"
add_contact: "Додати контакт"
all_contacts: "УÑÑ– контакти"
- community_spotlight: "Рекомендовані кориÑтувачі"
+ community_spotlight: "У центрі уваги"
my_contacts: "Мої контакти"
no_contacts: "Схоже, вам потрібно додати декілька контактів!"
no_contacts_in_aspect: "Ви не маєте жодного контакту у цьому аÑпекті. Ðижче наведено ÑпиÑок дійÑних контактів, Ñкі Ви можете долучити до цього аÑпекту."
@@ -334,7 +334,7 @@ uk:
new_conversation:
fail: "Ðевірне повідомленнÑ"
show:
- delete: "Видалити й заблокувати розмову"
+ delete: "Вилучити розмову"
hide: "заховати і німа розмова"
last_message: "ОÑтаннє Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð¾ %{timeago}"
reply: "ВідповіÑти"
@@ -476,7 +476,7 @@ uk:
post_notification_q: "Як мені підпиÑатиÑÑŒ або відпиÑатиÑÑŒ від повідомлень певного запиÑу?"
post_poll_a: "ÐатиÑніть на іконку з графіком. Потім введіть Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ– Ñк мінімум два варіанти відповіді. Ðе забудьте зробити Ð·Ð°Ð¿Ð¸Ñ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¼, Ñкщо хочете, щоб будь-хто міг взÑти учаÑÑ‚ÑŒ в опитуванні."
post_poll_q: "Як мені добавити Ð¾Ð¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾ запиÑу?"
- post_report_a: "Щоб повідомити про це адмініÑтратора вашого поду натиÑніть на іконкуі зі знаком оклику в правому верхньому кутку запиÑу. Потім в діалоговому вікні обґрунтуйте причину."
+ post_report_a: "Щоб повідомити про це адмініÑтратора вашого поду натиÑніть на значок зі знаком оклику в правому верхньому кутку запиÑу. Потім в діалоговому вікні обґрунтуйте причину."
post_report_q: "Як мені повідомити про образливий запиÑ?"
size_of_images_a: "ÐÑ–. Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ автоматично підігнано під ширину потоку. У Markdown немає коду, що підтримує розмір зображеннÑ."
size_of_images_q: "Чи можу Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ розміри зображень у поÑтах чи коментарÑÑ…?"
@@ -608,7 +608,7 @@ uk:
empty: "Будь-лаÑка, введіть хоча б одну електронну пошту."
no_more: "У Ð²Ð°Ñ Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð»Ð¸ÑÑ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ."
note_already_sent: "Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð²Ð¶Ðµ були надіÑлані на %{emails}"
- rejected: "Такі адреÑи електронної пошти мають проблеми: "
+ rejected: "Такі адреÑи електронної пошти мають проблеми: %{emails}"
sent: "Ваші Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ–: %{emails}"
new:
codes_left:
@@ -626,7 +626,8 @@ uk:
layouts:
application:
back_to_top: "Ðагору"
- be_excellent: "Будьте чудовими один до одного! ♥"
+ be_excellent: "Будьте чудовими одне до одного! ♥"
+ discourse: "ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ Ñ– підтримка"
powered_by: "ПідтримуєтьÑÑ Ð”Ñ–Ð°Ñпорою*"
public_feed: "Публічний канал діаÑпори підтримуєтьÑÑ Ð´Ð»Ñ %{name}"
source_package: "завантажити початковий код"
@@ -642,6 +643,8 @@ uk:
likes:
create:
error: "Ðе вдалоÑÑ Ð²Ð¿Ð¾Ð´Ð¾Ð±Ð°Ñ‚Ð¸."
+ destroy:
+ error: "Ðе вдалоÑÑ Ð·Ð½Ñти вподобаннÑ."
limited: "Обмежена"
more: "Ще"
no_results: "Результатів не знайдено"
@@ -713,7 +716,6 @@ uk:
one: "%{actors} згадали Ð²Ð°Ñ Ñƒ вилученому запиÑÑ–."
other: "%{actors} згадали Ð²Ð°Ñ Ñƒ вилученому запиÑÑ–."
zero: "%{actors} згадали Ð²Ð°Ñ Ñƒ вилученому запиÑÑ–."
- post: "запиÑ"
private_message:
few: "%{actors} надіÑлали вам повідомленнÑ."
many: "%{actors} надіÑлали вам повідомленнÑ."
@@ -749,7 +751,7 @@ uk:
click_here: "ÐатиÑніть Ñюди"
comment_on_post:
limited_subject: "Один з Ваших запиÑів прокоментували"
- reply: "ВідповіÑти або подивитиÑÑ %{name} Ð·Ð°Ð¿Ð¸Ñ >"
+ reply: "ВідповіÑти або подивитиÑÑ Ð·Ð°Ð¿Ð¸Ñ %{name} >"
confirm_email:
click_link: "Щоб активувати вашу адреÑу %{unconfirmed_email}, будь лаÑка, перейдіть на цим поÑиланнÑм:"
subject: "Будь лаÑка, активуйте вашу нову адреÑу %{unconfirmed_email}"
@@ -824,18 +826,21 @@ uk:
message: |-
Вітаємо!
- %{diaspora_id} запроÑив Ð’Ð°Ñ Ð´Ð¾ ДіаÑпори*!
+ %{diaspora_id} запроÑив/ла Ð’Ð°Ñ Ð´Ð¾ ДіаÑпори*!
- Щоб долучитиÑÑ, перейдіть за поÑиланнÑм [%{invite_url}
+ Щоб долучитиÑÑ, перейдіть за поÑиланнÑм [%{invite_url}][1]
- Ðбо Ви можете додати %{diaspora_id} до ÑпиÑку Ваших контактів, Ñкщо Ви вже маєте аккаунт
+ Ðбо Ви можете додати %{diaspora_id} до ÑпиÑку Ваших контактів, Ñкщо у Ð’Ð°Ñ ÑƒÐ¶Ðµ Ñ” обліковка.
З любов’ю,
Поштовий робот ДіаÑпори*.
- P.S.: ДізнатиÑÑ, що таке ДіаÑпора* Ви можете тут %{diasporafoundation_url}
+ P.S.: ДізнатиÑÑ (Ñкщо треба), що таке ДіаÑпора*, Ви можете [тут][2].
+
+ [1]%{invite_url}
+ [2]%{diasporafoundation_url}
invited_you: "%{name} запроÑив(-ла) Ð²Ð°Ñ Ð´Ð¾ ДіаÑпори*"
liked:
liked: "%{name} ÑподобалоÑÑ Ð’Ð°ÑˆÐµ повідомленнÑ"
@@ -866,16 +871,20 @@ uk:
body: |-
Вітаємо!
- Був отриманий Ð´Ð¾Ð½Ð¾Ñ Ð½Ð° %{type} з ID %{id}
+ Отримано Ñкаргу на %{type} з ID %{id}
+
+ Причина: %{reason}
- %{url}
+ [%{url}][1]
- Ðегайно прийміть заходи!
+ Будь лаÑка, переглÑньте Ñкнайшвидше!
З повагою,
- ПоліцейÑький робот ДіаÑпори*!
- subject: "Ð”Ð¾Ð½Ð¾Ñ Ð½Ð° %{type}"
+ Робот ДіаÑпори*!
+
+ [1]: %{url}
+ subject: "Скарга на %{type}"
type:
comment: "коментар"
post: "запиÑ"
@@ -888,7 +897,7 @@ uk:
started_sharing:
sharing: "почав(ла) ділитиÑÑ Ð· вами!"
subject: "КориÑтувач %{name} почав ділитиÑÑ Ð· вами в ДіаÑпорі*"
- view_profile: "ПодивитиÑÑ %{name} профіль"
+ view_profile: "ПодивитиÑÑ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ %{name}"
thanks: "СпаÑибі,"
to_change_your_notification_settings: "щоб змінити ваші Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ"
nsfw: "18+"
@@ -919,7 +928,7 @@ uk:
photos:
create:
integrity_error: "Помилка при завантаженні Ñвітлини. Ви впевнені, що це графічний файл?"
- runtime_error: "Збій при завантаженні Ñвітлини."
+ runtime_error: "Збій при завантаженні Ñвітлини. Ви заÑтебнули паÑок безпеки?"
type_error: "Збій при завантаженні Ñвітлини. Ви впевнені, що додали графічний файл?"
destroy:
notice: "Фотографію вилучено."
@@ -996,18 +1005,18 @@ uk:
username: "Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
report:
comment_label: "<b>Коментар</b>:<br>%{data}"
- confirm_deletion: "Ви упевнені, що вміÑÑ‚ Ñуперечить курÑу партії?"
+ confirm_deletion: "Ви упевнені, що хочете вилучити це?"
delete_link: "Видалити"
not_found: "<u>Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ Ð°Ð±Ð¾ коментар. Ðапевно вже видалено кориÑтувачем.</u>"
post_label: "<b>ЗапиÑ</b>: %{title}"
reason_label: "Причина:"
- reported_label: "<b>Ð”Ð¾Ð½Ð¾Ñ Ð²Ñ–Ð´</b> %{person}"
+ reported_label: "<b>Скарга від</b> %{person}"
reported_user_details: "Деталі про кориÑтувача"
review_link: "Відмітити Ñк проглÑнутий"
status:
destroyed: "Ð—Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ² знищений"
failed: "СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
- title: "ПереглÑд доноÑів"
+ title: "ПереглÑд Ñкарг"
unreviewed_reports:
few: "%{count} не переглÑнутих звітів."
many: "%{count} не переглÑнутих звітів."
@@ -1037,7 +1046,7 @@ uk:
connect: "Під'єднати"
disconnect: "роз'єднати"
edit_services: "Редагувати ÑервіÑи"
- logged_in_as: "Ви увійшли Ñк"
+ logged_in_as: "Ви увійшли Ñк %{nickname}"
no_services_available: "Ðа цьому поді ÑервіÑи недоÑтупні"
not_logged_in: "Ðа даний момент Ви не увійшли в ÑиÑтему."
really_disconnect: "відключити %{service}?"
@@ -1119,19 +1128,23 @@ uk:
status_messages:
new:
mentioning: "Згадати: %{person}"
- too_long: "{\"few\"=>\"Ñкоротіть, будь лаÑка, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %{count} Ñимволів\", \"many\"=>\"Ñкоротіть, будь лаÑка, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %{count} Ñимволів\", \"one\"=>\"Ñкоротіть, будь лаÑка, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %{count} Ñимволів\", \"other\"=>\"Ñкоротіть, будь лаÑка, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %{count} Ñимволів\", \"zero\"=>\"Ñкоротіть, будь лаÑка, ваше Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð¾ %{count} Ñимволів\"}"
+ too_long: "Скоротіть, будь лаÑка, ваше повідомленнÑ: Ñимволів має бути менше, ніж %{count}. Довжина Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ñ€Ð°Ð·: %{current_length}"
stream_helper:
no_more_posts: "Ви доÑÑгли ÐºÑ–Ð½Ñ†Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÑƒ."
no_posts_yet: "Ще немає жодного запиÑу."
streams:
activity:
title: "ÐœÐ¾Ñ Ð´Ñ–ÑльніÑÑ‚ÑŒ"
+ admin:
+ title: "Ðдмін"
aspects:
all: "УÑÑ– аÑпекти"
title: "Ваші аÑпекти"
aspects_stream: "ÐÑпекти"
comment_stream:
title: "Прокоментовані"
+ commented:
+ title: "Прокоментовані допиÑи"
community_spotlight_stream: "У центрі уваги"
followed_tag:
add_a_tag: "Додати мітку"
@@ -1141,6 +1154,8 @@ uk:
followed_tags_stream: "#ВідÑтежувані мітки"
like_stream:
title: "Вподобані"
+ liked:
+ title: "Вподобані допиÑи"
mentioned_stream: "@ЗгадуваннÑ"
mentions:
title: "@ЗгадуваннÑ"
@@ -1187,11 +1202,11 @@ uk:
character_minimum_expl: "щонайменьше шіÑÑ‚ÑŒ Ñимволів"
close_account:
dont_go: "Будь лаÑка, не йдіть!"
- lock_username: "Це зарезервує ваше ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача на випадок, Ñкщо ви захочете знову зареєÑтруватиÑÑ."
- locked_out: "Буде зроблено вихід , Ñ– ви будете відключені від вашого облікового запиÑу"
+ lock_username: "Ваше ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача буде недоÑтупним. Ðе можна буде Ñтворити новий обліковий Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° цьому вузлі з цим же ідентифікатором."
+ locked_out: "Буде здійÑнено вихід, Ñ– ви будете відключені від вашого облікового запиÑу, поки його не вилучать."
make_diaspora_better: "Ми хотіли б, щоб ви допомогли нам зробити ДіаÑпору* кращою заміÑÑ‚ÑŒ того, щоб проÑто піти звідÑи. Якщо ви дійÑно вирішили піти, ми хочемо, щоб ви знали, що ÑтанетьÑÑ Ð´Ð°Ð»Ñ–."
mr_wiggles: "МіÑтер Віглз буде заÑмучений, що ви пішли"
- no_turning_back: "Ðа даний Ñ‡Ð°Ñ Ð·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ð¾Ð³Ð¾ шлÑху немає."
+ no_turning_back: "Зворотного шлÑху немає! Якщо ви Ñправді впевнені, введіть Ñвій пароль унизу."
what_we_delete: "Ми вилучимо вÑÑ– ваші запиÑи Ñ– дані профілю так швидко, Ñк тільки зможемо. Ваші коментарі будуть Ñк Ñ– раніше доÑтупні, але вони не будуть прив'Ñзані до вашого ідентифікатора в ДіаÑпорі*."
close_account_text: "Закрити аккаунт"
comment_on_post: "хтоÑÑŒ прокоментував ваш запиÑ"
@@ -1219,7 +1234,7 @@ uk:
reshared: "хтоÑÑŒ ділитьÑÑ Ð²Ð°ÑˆÐ¸Ð¼ запиÑом"
show_community_spotlight: "Показувати рекомендованих кориÑтувачів у Потоці?"
show_getting_started: "Повернути інформацію Ð´Ð»Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑ–Ð²Ñ†Ñ–Ð²"
- someone_reported: "ХтоÑÑŒ приÑлав доноÑ"
+ someone_reported: "ХтоÑÑŒ приÑлав Ñкаргу"
started_sharing: "хтоÑÑŒ починає ділитиÑÑ Ð· вами"
stream_preferences: "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐŸÐ¾Ñ‚Ð¾ÐºÑƒ"
your_email: "Ваша адреÑа електронної пошти"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 520152fc1301ca1a4b62616a93e96054c2aeaf79..7fe908ea28e0d99757b3f496c14447b599b0ccdf 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -20,10 +20,6 @@ ur-PK:
attributes:
diaspora_handle:
taken: ".Ù¾ÛÙ„Û’ ÛÛŒ لیا جا چکا ÛÛ’"
- request:
- attributes:
- from_id:
- taken: ".Ù¾ÛÙ„Û’ سے موجود ایک درخواست Ú©ÛŒ نقل ÛÛ’"
reshare:
attributes:
root_guid:
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 36a943e2829b430601ed6e67748872f71db3853a..176d272c5085feec0bb4107a576ee59022fd0cb2 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -21,10 +21,6 @@ vi:
attributes:
diaspora_handle:
taken: "đã được thực hiện."
- request:
- attributes:
- from_id:
- taken: "là bản sao của một yêu cầu có trước."
reshare:
attributes:
root_guid:
@@ -161,7 +157,6 @@ vi:
commenting: "Äang gá»i bình luáºn..."
contacts:
index:
- add_a_new_aspect: "Thêm mối quan hệ mới"
all_contacts: "Tất cả liên lạc"
community_spotlight: "Nổi báºt từ cá»™ng đồng"
my_contacts: "Liên lạc của tôi"
@@ -276,7 +271,6 @@ vi:
mentioned_deleted:
other: "%{actors} nhắc đến bạn trong một bà i đăng đã bị xóa."
zero: "Không có ai nhắc đến bạn trong một bà i đăng đã bị xóa."
- post: "bà i đăng"
private_message:
other: "%{actors} Ä‘ã gá»i cho bạn má»™t tin nhắn."
zero: "Không coÌ ai gá»i tin nhắn cho baÌ£n."
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 7fc24f428528140fd34a1a57ec9cc2a36b8431a0..86a0121cc1b233caec861b37d76f7705f3112e0e 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -20,10 +20,6 @@ zh-CN:
attributes:
diaspora_handle:
taken: "已被注册。"
- request:
- attributes:
- from_id:
- taken: "与已å˜åœ¨çš„请求é‡å¤ã€‚"
reshare:
attributes:
root_guid:
@@ -160,7 +156,6 @@ zh-CN:
commenting: "回å¤ä¸â€¦â€¦"
contacts:
index:
- add_a_new_aspect: "åŠ å…¥æ–°åˆ†ç»„"
all_contacts: "所有好å‹"
community_spotlight: "社区çƒç‚¹"
my_contacts: "我的好å‹"
@@ -260,7 +255,6 @@ zh-CN:
mentioned_deleted:
other: "%{actors} åœ¨å·²åˆ é™¤çš„å†…å®¹ä¸æ到了您。"
zero: "%{actors} åœ¨å·²åˆ é™¤çš„å†…å®¹ä¸æ到了您。"
- post: "日志。"
private_message:
other: "%{actors} å‘您å‘了一æ¡ä¿¡æ¯ã€‚"
zero: "%{actors} å‘您å‘了一æ¡ä¿¡æ¯ã€‚"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 5982d466707dedaa3fe24559c61bb37a85020843..1aea8e6ff218b82dc3f13727dda15af0c0ed4875 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -31,10 +31,6 @@ zh-TW:
attributes:
poll:
already_participated: "ä½ å·²ç¶“åƒåŠ 這次票é¸äº†ï¼"
- request:
- attributes:
- from_id:
- taken: "與已經å˜åœ¨äº†çš„請求é‡è¤‡ã€‚"
reshare:
attributes:
root_guid:
@@ -62,6 +58,8 @@ zh-TW:
fetching_diaspora_version: "判斷 diaspora* 的最新版本ä¸..."
pod_status: "豆莢狀態"
pods:
+ pod_desktop_link: "æ¡Œé¢ç‰ˆ"
+ pod_desktop_view: "這個é é¢æ²’有行動版，請切æ›åˆ°%{desktop_link}。"
pod_network: "豆莢網路"
stats:
2weeks: "兩個禮拜"
@@ -226,6 +224,8 @@ zh-TW:
here_to_help: "diaspora* 社群來了ï¼"
mail_podmin: "莢主的電åä¿¡ç®±"
need_help: "è¦å¹«å¿™å—Žï¼Ÿ"
+ support_forum: "ä½ ä¹Ÿå¯ä»¥åƒèˆ‡%{support_forum}。"
+ support_forum_link: "支æ´è«–壇"
tag_bug: "è‡èŸ²"
tag_feature: "功能"
tag_question: "å•é¡Œ"
@@ -275,7 +275,6 @@ zh-TW:
commenting: "發表留言ä¸..."
contacts:
index:
- add_a_new_aspect: "åŠ å…¥æ–°ç¤¾äº¤é¢"
add_contact: "åŠ è¯çµ¡äºº"
all_contacts: "所有è¯çµ¡äºº"
community_spotlight: "社群焦點"
@@ -604,11 +603,12 @@ zh-TW:
application:
back_to_top: "回最上é¢"
be_excellent: "用最好的方å¼äº’相å°å¾…ï¼â™¥"
+ discourse: "專案討論與支æ´"
powered_by: "強力é…ç½® diaspora*"
public_feed: "%{name} 在 diaspora* 的公開資訊æº"
source_package: "下載æºç¢¼å°è£æª”"
statistics_link: "豆莢統計資料"
- toggle: "行動檢視切æ›"
+ toggle: "切æ›è¡Œå‹•ç‰ˆé é¢"
whats_new: "更新了什麼？"
header:
code: "æºç¢¼"
@@ -670,7 +670,6 @@ zh-TW:
mentioned_deleted:
other: "%{actors} 在已刪掉的貼文ä¸æåˆ°äº†ä½ ã€‚"
zero: "%{actors} 在已刪掉的貼文ä¸æåˆ°äº†ä½ ã€‚"
- post: "貼文"
private_message:
other: "%{actors} é€è¨Šæ¯çµ¦ä½ 。"
zero: "%{actors} é€è¨Šæ¯çµ¦ä½ 。"
@@ -1048,6 +1047,8 @@ zh-TW:
streams:
activity:
title: "我的活動"
+ admin:
+ title: "管ç†"
aspects:
all: "所有社交é¢"
title: "我的社交é¢"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index df5fe3c59b0491c66e4b701acf055aa7d23f6ac0..4b2592447b2814e9777f21885ce9bddc54741364 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -57,9 +57,6 @@ ar:
my_stream: "ساØØ© المشاركات"
photo_uploader:
looking_good: "يا إلهى , تبدو رائعاً !"
- publisher:
- limited: "Ù…Øدودة - مشاركتك ستكون متاØØ© لجهات إتصالك Ùقط"
- public: "عام - مشاركتك ستكون متاØØ© للجميع ومÙهرسة ÙÙŠ Ù…Øركات البØØ«"
remove_post: "أأزيل هذه التدوينة؟"
show_more: "المزيد"
stream:
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index eacbf1d026a698eacd665daf23ec80afaa839a9c..d85caeb576d54f54f33cd279b407df6ecf2c7d34 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -48,9 +48,6 @@ bg:
my_stream: "Поток"
photo_uploader:
looking_good: "Леле, изглеждате Ñтрахотно!"
- publisher:
- limited: "Ограничено - публикациÑта ще бъде видима Ñамо за хората, Ñ ÐºÐ¾Ð¸Ñ‚Ð¾ Ñ Ñподелите"
- public: "Публично - публикациÑта ще бъде видима за вÑеки, а Ñъдържанието Ñ Ñ‰Ðµ бъде налично за Ñ‚ÑŠÑ€Ñещите машини"
show_more: "покажи още"
stream:
comment: "Коментиране"
diff --git a/config/locales/javascript/javascript.bs.yml b/config/locales/javascript/javascript.bs.yml
index 00545875fcca5cfd88e5bc87b58950c2845de783..a880a1be214985aff2a83a1dfbb3f15a65ad6c29 100644
--- a/config/locales/javascript/javascript.bs.yml
+++ b/config/locales/javascript/javascript.bs.yml
@@ -67,9 +67,7 @@ bs:
looking_good: "Bože, izgledate fenomenalno!"
size_error: "{file} je prevelika, maksimalna veliÄina datoteke je {sizeLimit}."
publisher:
- limited: "OgraniÄeno - vaÅ¡a objava će biti vidljiva od ljudi s kojima dijelite"
near_from: "Objavljeno sa: <%= location %>"
- public: "Javno - vaÅ¡a objava će biti vidljiva svima i može biti pronaÄ‘ena od pretraživaÄa"
reshares:
post: "Ponovo dijeli objavu od <%= name %>?"
successful: "Objava je uspješno ponovo dijeljenja!"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 2f6f60f132550f557a4f18bccfa7bd55eddef3dc..7129e0ba7b1a8718e4057416022eb759f3c6165e 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -184,7 +184,6 @@ cs:
you_have_no_tags: "Nemáte žádné Å¡tÃtky"
publisher:
add_option: "PÅ™idejte odpovÄ›Ä"
- limited: "Omezený — váš pÅ™ÃspÄ›vek bude pÅ™Ãstupný pouze lidem, se kterými sdÃlÃte"
markdown_editor:
preview: "Náhled"
texts:
@@ -215,7 +214,6 @@ cs:
write: "Zápis"
near_from: "Odesláno z: <%= location %>"
option: "OdpovÄ›Ä"
- public: "VeÅ™ejný — váš pÅ™ÃspÄ›vek si bude moci pÅ™eÄÃst kdokoliv a může být nalezen vyhledávaÄi"
question: "Otázka"
remove_post: "Odstranit tento pÅ™ÃspÄ›vek?"
report:
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index b28b5ca904003b7a8c4ff78b0fcf5c5a9e8ad23b..32cc3a34479b284b20a95f010f230886a0d00759 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -59,7 +59,7 @@ da:
aspect_dropdown:
add_to_aspect: "Tilføj kontakt"
all_aspects: "Alle aspekter"
- error: "Kunne ikke begynde at dele med <%= name %>. Ignorerer du vedkommende?"
+ error: "Kunne ikke begynde at dele med <%= name %>. Ignorerer du vedkommende?"
error_remove: "Kunne ikke fjerne <%= name %> fra aspektet. :("
mobile_row_checked: "<%= name %> (fjern)"
mobile_row_unchecked: "<%= name %> (tilføj)"
@@ -119,7 +119,7 @@ da:
getting_started:
alright_ill_wait: "Okay, jeg venter."
hey: "Hej <%= name %>!"
- no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
+ no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
preparing_your_stream: "Forbereder din personlige strøm..."
header:
admin: "Admin"
@@ -198,7 +198,6 @@ da:
you_have_no_tags: "Du har ingen tags!"
publisher:
add_option: "Tilføj et svar"
- limited: "Begrænset - dit indlæg vil kun blive set af dem du deler med"
markdown_editor:
preview: "Forhåndsvisning"
texts:
@@ -230,7 +229,6 @@ da:
mention_success: "<%= names %> blev omtalt."
near_from: "Sendt fra: <%= location %>"
option: "Svar"
- public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner"
question: "Spørgsmål"
remove_post: "Fjern dette indlæg?"
report:
diff --git a/config/locales/javascript/javascript.de-CH.yml b/config/locales/javascript/javascript.de-CH.yml
index 1fcc5d65342f8d7d22e191fba163acac559f8703..6e2ecb16bb95f37241f3793caff1be5ca041cb87 100644
--- a/config/locales/javascript/javascript.de-CH.yml
+++ b/config/locales/javascript/javascript.de-CH.yml
@@ -102,10 +102,9 @@ de-CH:
posts: "Biiträg"
publisher:
add_option: "Antwort hinzuefüege"
- limited: "Limitiert: din post wird nur vo lüüt iisehbar sii mit dene du teilsch"
+ mention_success: "Erflogrich <%= names %> erwähnt"
near_from: "Gschickt i de Nöchi vo <%= location %>"
option: "Antwort"
- public: "Öffentlich: din biitrag wird für ali iisehbar si und vo suechmaschine gfunde werde."
question: "Frog"
report:
name: "Melde"
@@ -120,6 +119,9 @@ de-CH:
show_more: "Meh aazeige"
stream:
comment: "Kommentiere"
+ comments:
+ one: "ein Kommentar"
+ other: "<%= count %> Kommentär"
follow: "Folge"
followed_tag:
add_a_tag: "Täg hinzuefüge"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index e41eac08d552bf356886a773a3642e229d03816c..15b45970c0d6cb30e1fc514b594b65a4e3786f19 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -199,7 +199,6 @@ de:
you_have_no_tags: "Du hast keine Tags!"
publisher:
add_option: "Antwortmöglichkeit hinzufügen"
- limited: "Eingeschränkt - dein Beitrag wird nur Leuten sichtbar sein, mit denen du teilst"
markdown_editor:
preview: "Vorschau"
texts:
@@ -231,11 +230,10 @@ de:
mention_success: "Erfolgreich erwähnt: <%= names %>"
near_from: "Gesendet aus <%= location %>"
option: "Antwort"
- public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
question: "Frage"
remove_post: "Diesen Beitrag löschen?"
report:
- name: "Meldung"
+ name: "Beitrag melden"
prompt: "Bitte gib einen Grund an:"
prompt_default: "z.B. anstößiger Inhalt"
status:
@@ -267,7 +265,7 @@ de:
one: " Einer Person gefällt das"
other: "<%= count %> Personen gefällt das"
two: "<%= count %> Personen gefällt das"
- zero: "Keinem gefällt das"
+ zero: "Niemandem gefällt das"
limited: "Begrenzt"
more_comments:
one: "Zeige einen weiteren Kommentar"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index b72ad7d7a177ff550620e02e2f6cacc7835c8bb8..f73704580ce3c5e122ce97c41cb36222aa8cddc6 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -198,7 +198,6 @@ de_formal:
you_have_no_tags: "Sie haben keine Tags!"
publisher:
add_option: "Antwortmöglichkeit hinzufügen"
- limited: "Eingeschränkt: Ihr Beitrag wird nur von Leuten gesehen werden können, mit denen Sie teilen"
markdown_editor:
preview: "Vorschau"
texts:
@@ -230,7 +229,6 @@ de_formal:
mention_success: "Erfolgreich erwähnt: <%= names %>"
near_from: "In der Nähe von <%= location %>"
option: "Antwort"
- public: "Öffentlich: Ihr Beitrag wird von allen gesehen und von Suchmaschinen gefunden werden können"
question: "Frage"
remove_post: "Diesen Beitrag löschen?"
report:
@@ -273,7 +271,7 @@ de_formal:
original_post_deleted: "Originalbeitrag wurde vom Autor gelöscht"
permalink: "Permalink"
public: "Öffentlich"
- reshare: "Weitersagen"
+ reshare: "Teilen"
reshares:
one: "<%= count %> mal weitergeteilt"
other: "<%= count %> mal weitergeteilt"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index ec682cfaca61ec4b98ff5ca3b99e6d18630e272e..28511689ec4029916f7fc8727c69d93003ab40d8 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -84,9 +84,7 @@ el:
photos: "ΦωτογÏαφίες"
publisher:
add_option: "Î Ïόσθεσε μια απάντηση"
- limited: "ΠεÏιοÏισμÎνο - οι δημοσιεÏσεις σας θα είναι οÏατÎÏ‚ μόνο από τα άτομα με τα οποία διαμοιÏάζεστε"
near_from: "ΑναÏτήθηκε από: <%= location %>"
- public: "Δημόσιο - οι δημοσιεÏσεις σας θα είναι οÏατÎÏ‚ στον καθÎνα και θα μποÏοÏν να βÏεθοÏν από τις μηχανÎÏ‚ αναζήτησης"
question: "ΕÏώτηση"
report:
name: "ΑναφοÏά"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 5ef87d181479246a8206375c3a380dfd3e80907c..7c507176240a229979108908133dd1ad8533b653 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -135,8 +135,6 @@ en:
my_aspects: "My aspects"
publisher:
- limited: "Limited: your post will only be seen by people you are sharing with"
- public: "Public: your post will be visible to everyone and found by search engines"
near_from: "Posted from: <%= location %>"
option: "Answer"
add_option: "Add an answer"
@@ -184,7 +182,7 @@ en:
mobile_row_unchecked: "<%= name %> (add)"
stopped_sharing_with: "You have stopped sharing with <%= name %>."
started_sharing_with: "You have started sharing with <%= name %>!"
- error: "Couldn’t start sharing with <%= name %>. Are you ignoring them?"
+ error: "Couldn’t start sharing with <%= name %>. Are you ignoring them?"
error_remove: "Couldn’t remove <%= name %> from the aspect :("
toggle:
one: "In <%= count %> aspect"
@@ -206,7 +204,7 @@ en:
add_an_aspect: "+ Add an aspect"
getting_started:
hey: "Hey, <%= name %>!"
- no_tags: "Hey, you haven’t followed any tags! Continue anyway?"
+ no_tags: "Hey, you haven’t followed any tags! Continue anyway?"
alright_ill_wait: "All right, I’ll wait."
preparing_your_stream: "Preparing your personalized stream..."
photo_uploader:
diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml
index 81e7f33974912ea95a58cd94c594480c68209f97..83155ab34abe2757daa753135ec928651ccaadeb 100644
--- a/config/locales/javascript/javascript.en_1337.yml
+++ b/config/locales/javascript/javascript.en_1337.yml
@@ -30,9 +30,6 @@ en_1337:
preparing_your_stream: "Preparing your personialized stream..."
header:
search: "F1ND N00B5 0R #74G5"
- publisher:
- limited: "L1M173D - Y0UR 5P4M W1LL 0NLY B3 533N BY N00B5 U 4R3 5H4R1NG W17H!"
- public: "PUBL1C - Y0UR 5P4M W1LL B3 V151BL3 2 3V3RY0N3 4ND F0UND BY S34RCH 3NG1N35!"
show_more: "5H0W M0R3!"
stream:
likes:
diff --git a/config/locales/javascript/javascript.en_valspeak.yml b/config/locales/javascript/javascript.en_valspeak.yml
index dfc0a6bae7d52ab4484c707b4211f3ce4f7471bc..6b9e6a0ec4250fb3026c77ca78341f7dee9bd45f 100644
--- a/config/locales/javascript/javascript.en_valspeak.yml
+++ b/config/locales/javascript/javascript.en_valspeak.yml
@@ -127,7 +127,6 @@ en_valspeak:
you_have_no_tags: "u like... have no tagz!"
publisher:
add_option: "Like, add an ansah!"
- limited: "Limited - ur postie will only b seen by ppl u r sharin wit"
markdown_editor:
preview: "show!!"
texts:
@@ -155,7 +154,6 @@ en_valspeak:
write: "Type!!"
near_from: "Postie from: <%= location %>"
option: "Mah ansah<3"
- public: "Internetz - ur postie will b seen by any1 on the internet"
question: "Question!!!"
remove_post: "Remove the postie?"
report:
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index cf0061d19c2eb04dab2b7c74b70a272fbb1fd9fc..2e4a0e7274bc7c39edcec4d9235359d27d72c4fc 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -63,9 +63,6 @@ eo:
photo_uploader:
completed: "<%= file %> kompletita"
looking_good: "Diable, vi aspektas bonege!"
- publisher:
- limited: "Malpublika - via afiÅo nur videblos de homoj, al kiuj vi konigas aferojn"
- public: "Publika - via afiÅo videblos al ĉiuj kaj troveblos de retserĉprogramoj."
reshares:
post: "Ĉu vi deziras rekonigi la mesaÄon de <%= name %>?"
successful: "La afiÅo estis sukcese rekonigita!"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 26b70cf340a1a9f6ae549e7cb04a55beb6b5e354..269c56d79a471a750858601c7c0d958f424d62cb 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -171,6 +171,7 @@ es-AR:
invalid_ext: "El archivo {file} tiene una extensión inválida. Solo las extensiones {extensions} están permitidas."
looking_good: "¡Apa, te ves muy bien!"
size_error: "El archivo {file} es demasiado grande, el tamaño máximo permitido es {sizeLimit}."
+ upload_photos: "Subir fotos"
poll:
answer_count:
one: "1 voto"
@@ -198,7 +199,6 @@ es-AR:
you_have_no_tags: "¡No tenés etiquetas!"
publisher:
add_option: "Añadir respuesta"
- limited: "Limitada: tu publicación será vista solo por la gente con quien la compartes"
markdown_editor:
preview: "Vista previa"
texts:
@@ -230,7 +230,6 @@ es-AR:
mention_success: "Mencionados exitosamente: <%= names %>"
near_from: "Cerca de: <%= location %>"
option: "Respuesta"
- public: "Publica: tu publicación será visible para cualquiera en Internet y los buscadores podrán encontrarla"
question: "Pregunta"
remove_post: "¿Eliminar esta publicación?"
report:
diff --git a/config/locales/javascript/javascript.es-CL.yml b/config/locales/javascript/javascript.es-CL.yml
index 1c04a36762d7743bee8751bb9bd2a7fbabdf8ecd..989f38c8271b51782142a5dea64835f672a10bc8 100644
--- a/config/locales/javascript/javascript.es-CL.yml
+++ b/config/locales/javascript/javascript.es-CL.yml
@@ -52,9 +52,6 @@ es-CL:
not_found: "y nadie fue encontrado..."
photo_uploader:
looking_good: "¡Guau, te ves genial!"
- publisher:
- limited: "Limitada - tu publicación sólo será visto por gente con la que compartes"
- public: "Público - tu post será visible para todos y encontrado por mecanismos de búsqueda"
reshares:
successful: "¡La publicación se compartió correctamente!"
show_more: "mostrar más"
diff --git a/config/locales/javascript/javascript.es-MX.yml b/config/locales/javascript/javascript.es-MX.yml
index dddbdef48489fe5e6818f2a4222ded09694a798a..29a4ed3312621b86ab24d5890f01caf196f74842 100644
--- a/config/locales/javascript/javascript.es-MX.yml
+++ b/config/locales/javascript/javascript.es-MX.yml
@@ -68,9 +68,7 @@ es-MX:
looking_good: "¡Ah, te ves increÃble!"
size_error: "El archivo {file} es demasiado grande, el tamaño máximo de un archivo es {sizeLimit}."
publisher:
- limited: "Limitado – tu publicación solo será vista por ia gente con quien compartes"
near_from: "Publicado desde: <%= location %>"
- public: "Público – tu publicación será visible para todos, y encontrada por buscadores"
reshares:
post: "¿Compartir la publicación de <%= name %>?"
successful: "¡La publicación se compartió exitosamente!"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 726697f3ad0827b3a543dd1415961651992112ed..6bb1a8b291946e582feca3419476197e2bb4a3b7 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -190,7 +190,6 @@ es:
you_have_no_tags: "¡no tienes etiquetas!"
publisher:
add_option: "Añadir una respuesta"
- limited: "Limitado - tu publicación solo es visible para gente con quien compartes"
markdown_editor:
preview: "Previsualización"
texts:
@@ -222,7 +221,6 @@ es:
mention_success: "Mencionaste correctamente <%= names %>"
near_from: "Cerca de: <%= location %>"
option: "Respuesta"
- public: "Público - tu publicación es visible para todos, incluyendo buscadores"
question: "Pregunta"
remove_post: "Borrar esta publicación?"
report:
diff --git a/config/locales/javascript/javascript.et.yml b/config/locales/javascript/javascript.et.yml
index efcd6dbd9cd4d988429ffd3c8118b5baa6112c44..57ccdf050663402126c6778ab994996d9d7efccd 100644
--- a/config/locales/javascript/javascript.et.yml
+++ b/config/locales/javascript/javascript.et.yml
@@ -40,9 +40,6 @@ et:
my_stream: "Voog"
photo_uploader:
looking_good: "OMG, sa näed vinge välja!"
- publisher:
- limited: "Piiratud - sinu postitust näidatakse vaid neile inimestele kellega sa oled seda jaganud"
- public: "Avalik - sinu postitus on nähtav kõigile ja leitav otsingumootorite poolt"
show_more: "näita veel"
stream:
comment: "Kommenteeri"
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 00f348adaac7ed3de4acaa2e5ba3148493c7f014..df1419c6aa3bd5cdf4c94f86a1ab030264bea764 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -52,9 +52,6 @@ eu:
not_found: "eta ez da inor aurkitu..."
photo_uploader:
looking_good: "Ene bada, oso jatorra dirudizu!"
- publisher:
- limited: "Mugatua - zure mezua aukeratu duzun jendeak bakarrik ikusiko du"
- public: "Publikoa - zure mezua edonork ikusi ahalko du, bai eta bilaketa zerbitzuetan agertu ere"
reshares:
post: "Birpartekatu nahi al duzu <%= name %>(r)en mezua?"
successful: "Mezua arrakastaz birpartekatu da!"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index c8a0bac340e16dc52538f87df68b057bfbb26ad2..447a208dcc50f66400344af1013265ca83694cd7 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -137,10 +137,8 @@ fi:
you_have_no_tags: "Sinulla ei ole tageja!"
publisher:
add_option: "Lisää vastaus"
- limited: "Rajoitettu - julkaisusi näkyy vain ihmisille, joiden kanssa jaat"
near_from: "Lähetetty sijainnista: <%= location %>"
option: "Vastaus"
- public: "Julkinen - julkaisusi näkyvät kaikille mukaan lukien hakukoneet ja niiden tulokset"
question: "Kysymys"
remove_post: "Poista tämä julkaisu?"
report:
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 44c199cc9ef061d3e51fd0e514f594cd7ce0ab56..4e0a6856fcb9e22b147eb186685c0220875d710c 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -200,7 +200,6 @@ fr:
you_have_no_tags: "vous n'avez pas de tag !"
publisher:
add_option: "Ajouter un choix"
- limited: "Limité - votre message ne sera vu que par des gens avec qui vous partagez"
markdown_editor:
preview: "Aperçu"
texts:
@@ -232,7 +231,6 @@ fr:
mention_success: "Mentions réussies : <%= names %>"
near_from: "Posté à : <%= location %>"
option: "Choix"
- public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche"
question: "Question"
remove_post: "Supprimer ce message ?"
report:
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 379e2f44765fe39b2f4a09861c5790c90cc82e28..3624cc644dc7ca469910a07fc850592e007cb01b 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -81,10 +81,8 @@ he:
vote: "הצבעה"
publisher:
add_option: "הוספת ×פשרות"
- limited: "מוגבל - הודעתך תהיה גלויה רק ל×× ×©×™× ×©××™×ª× ×‘×—×¨×ª לשתף"
near_from: "×¤×•×¨×¡× ×ž<%= location %>"
option: "×פשרות <%= nr %>"
- public: "ציבורי - הודעתך תהיה גלויה ×œ×›×•×œ× ×•× ×™×ª×Ÿ ×™×”×™×” ×œ×ž×¦×•× ×ותה ×‘×ž× ×•×¢×™ חיפוש"
question: "ש×לה"
reshares:
post: "×”×× ×œ×©×ª×£ מחדש ×ת ההודעה של <%= name %>?"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index fada15de816a6ff7b9c4d97e02eb80695e74bf76..4c3254345f78c29f4789f6eda43701275e2bddcf 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -116,7 +116,6 @@ hu:
you_have_no_tags: "nincsenek cÃmkéid!"
publisher:
add_option: "Válasz hozzáadása"
- limited: "Korlátozott: csak azok láthatják, akikkel megosztasz tartalmakat"
markdown_editor:
preview: "Előnézet"
tooltips:
@@ -125,7 +124,6 @@ hu:
write: "Szöveg"
near_from: "<%= location %> közelében"
option: "Válasz"
- public: "Nyilvános: bárki láthatja és keresőrobotok is megtalálhatják"
question: "Kérdés"
remove_post: "Bejegyzés törlése?"
report:
diff --git a/config/locales/javascript/javascript.hy.yml b/config/locales/javascript/javascript.hy.yml
index 98aabb69c33834655b9dbc2c7af7bf21011b67ca..ef8627795964646c144fd276337700e39c99d43f 100644
--- a/config/locales/javascript/javascript.hy.yml
+++ b/config/locales/javascript/javascript.hy.yml
@@ -114,7 +114,7 @@ hy:
getting_started:
alright_ill_wait: "Ô´Õ¥ Õ¬Õ¡Õ¾, Õ¥Õ½ Õ¯Õ½ÕºÕ¡Õ½Õ¥Õ´Ö‰"
hey: "Հե՜յ, <%= name %>։"
- no_tags: "Հե՜յ, Õ¸Õ¹ Õ´Õ« ÕºÕ«Õ¿Õ¡Õ¯ Õ¹Õ¶Õ·Õ¥Öիր։  Շարունակե՞նք Õ¡Õ´Õ¥Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Ö‰"
+ no_tags: "Հե՜յ, Õ¸Õ¹ Õ´Õ« ÕºÕ«Õ¿Õ¡Õ¯ Õ¹Õ¶Õ·Õ¥Öիր։ Շարունակե՞նք Õ¡Õ´Õ¥Õ¶ Õ¤Õ¥ÕºÖ„Õ¸Ö‚Õ´Ö‰"
preparing_your_stream: "Õ†Õ¡ÕÕ¡ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Ö„Õ¸ Õ¡Õ¶Õ°Õ¡Õ¿Õ¡Õ¯Õ¡Õ¶ Õ¬Ö€Õ¡Õ°Õ¸Õ½Õ¨..."
header:
admin: "Ô±Õ¤Õ´Õ«Õ¶"
@@ -187,7 +187,6 @@ hy:
you_have_no_tags: "ÕˆÖ€Ö‡Õ§ ÕºÕ«Õ¿Õ¡Õ¯Õ¸Õ¾ Õ¹Õ¥Õ½ Õ¶Õ·Õ¥Õ¬ Ö„Õ¥Õ¦Ö‰"
publisher:
add_option: "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬"
- limited: "Õ“Õ¡Õ¯. Õ½Õ¡ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¤ Õ¿Õ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§ Õ¬Õ«Õ¶Õ¥Õ¬Õ¸Ö‚ Õ´Õ«Õ¡ÕµÕ¶ Õ¡ÕµÕ¶ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö, Õ¸Ö‚Õ´ Õ°Õ¥Õ¿ Õ¯Õ«Õ½Õ¾Õ¸Ö‚Õ´ Õ¥Õ½Ö‰"
markdown_editor:
preview: "Õ†Õ¡ÕÕ¡Õ¤Õ«Õ¿Õ¥Õ¬"
texts:
@@ -218,7 +217,6 @@ hy:
write: "Õ‡Õ¡Ö€Õ¡Õ¤Ö€Õ¥Õ¬"
near_from: "Ô³Ö€Õ¡Õ¼Õ¾Õ¡Õ® Õ§ <%= location %>Õ«Ö"
option: "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶"
- public: "Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶. Õ½Õ¡ Õ¶Õ·Õ¡Õ¶Õ¡Õ¯Õ¸Ö‚Õ´ Õ§, Õ¸Ö€ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¤ Õ¿Õ¥Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ§ Õ¬Õ«Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¢Õ¸Õ¬Õ¸Ö€Õ«Õ¶ Ö‡ Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¬Õ«Õ¶Õ« ÖƒÕ¶Õ¿Ö€Õ¸Õ² Õ°Õ¡Õ´Õ¡Õ¯Õ¡Ö€Õ£Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€"
question: "Õ€Õ¡Ö€Ö"
remove_post: "Õ‹Õ¶Õ»Õ¥ÕžÕ¬ Õ¡ÕµÕ½ Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¨Ö‰"
report:
diff --git a/config/locales/javascript/javascript.ia.yml b/config/locales/javascript/javascript.ia.yml
index bd34ea3888900efd06833fdba514c8e52935b2c5..d8a6884bbf770a0d0a7396105d8098a360807a5f 100644
--- a/config/locales/javascript/javascript.ia.yml
+++ b/config/locales/javascript/javascript.ia.yml
@@ -66,6 +66,9 @@ ia:
select_aspects: "Seliger aspectos"
started_sharing_with: "Tu ha comenciate a divider con <%= name %>!"
stopped_sharing_with: "Tu ha cessate de divider con <%= name %>."
+ toggle:
+ one: "In <%= count %> aspecto"
+ other: "In <%= count %> aspectos"
updating: "actualisa…"
aspect_navigation:
add_an_aspect: "+ Adder un aspecto"
@@ -86,9 +89,9 @@ ia:
cancel: "Cancellar"
comma: ","
comments:
- hide: "celar commentos"
+ hide: "Celar commentos"
no_comments: "Il non ha ancora commentos."
- show: "revelar tote le commentos"
+ show: "Monstrar tote le commentos"
confirm_dialog: "Es tu secur?"
confirm_unload: "Per favor, confirma que tu vole quitar iste pagina. Le datos que tu ha inserite non essera salveguardate."
contacts:
@@ -120,7 +123,7 @@ ia:
preparing_your_stream: "Fluxo personalisate in preparation..."
header:
admin: "Administration"
- close: "clauder"
+ close: "Clauder"
contacts: "Contactos"
conversations: "Conversationes"
help: "Adjuta"
@@ -158,7 +161,7 @@ ia:
is_sharing: "<%= name %> divide cosas con te"
mention: "Mention"
message: "Message"
- not_found: "e nemo ha essite trovate..."
+ not_found: "... e nemo ha essite trovate"
stop_ignoring: "Cessar de ignorar"
photo_uploader:
completed: "<%= file %> complete"
@@ -167,6 +170,7 @@ ia:
invalid_ext: "{file} ha un extension inadmissibile. Solmente {extensions} es permittite."
looking_good: "Oh, tu pare splendide!"
size_error: "{file} es troppo grande. Le dimension maxime es {sizeLimit}."
+ upload_photos: "Incargar photos"
poll:
answer_count:
one: "1 voto"
@@ -182,19 +186,18 @@ ia:
show_result: "Monstrar resultato"
vote: "Votar"
profile:
- add_some: "adder alcunes"
+ add_some: "Adder alcunes"
bio: "Bio"
born: "Data de nascentia"
contacts: "Contactos"
- edit: "modificar"
+ edit: "Modificar"
gender: "Sexo"
location: "Loco"
photos: "Photos"
posts: "Entratas"
- you_have_no_tags: "tu non ha etiquettas!"
+ you_have_no_tags: "Tu non ha etiquettas."
publisher:
add_option: "Adder un responsa"
- limited: "Limitate: le message es visibile solmente pro le personas con qui tu lo divide"
markdown_editor:
preview: "Previsualisar"
texts:
@@ -223,24 +226,28 @@ ia:
quote: "Inserer citation"
write: "Modificar message"
write: "Scriber"
+ mention_success: "Ha essite mentionate: <%= names %>"
near_from: "Inviate ab: <%= location %>"
option: "Responsa"
- public: "Public: le message es visibile pro tote le mundo e trovabile pro motores de recerca"
question: "Question"
remove_post: "Remover iste entrata?"
report:
name: "Reportar"
prompt: "Specifica un motivo:"
- prompt_default: "contento offensive"
+ prompt_default: "p.ex. contento offensive"
status:
created: "Le creation del reporto ha succedite"
exists: "Le reporto jam existe"
reshares:
post: "Repeter le entrata de <%= name %>?"
successful: "Le entrata ha essite repetite con successo."
- show_more: "monstrar plus"
+ show_more: "Monstrar plus"
stream:
comment: "Commentar"
+ comments:
+ one: "<%= count %> commento"
+ other: "<%= count %> commentos"
+ zero: "<%= count %> commentos"
disable_post_notifications: "Disactivar le notificationes pro iste entrata"
enable_post_notifications: "Activar le notificationes pro iste entrata"
follow: "Sequer"
@@ -253,7 +260,7 @@ ia:
like: "Appreciar"
limited: "Limitate"
no_posts_yet: "Il non ha ancora entratas a monstrar hic."
- original_post_deleted: "Le entrata original ha essite delite per le autor."
+ original_post_deleted: "Entrata original delite per autor"
permalink: "Permaligamine"
public: "Public"
reshare: "Repeter"
@@ -274,16 +281,20 @@ ia:
timeago:
day: "un die"
days:
+ one: "1 die"
other: "%d dies"
hour: "circa un hora"
hours:
+ one: "circa 1 hora"
other: "circa %d horas"
inPast: "a qualcunque momento"
minute: "circa un minuta"
minutes:
+ one: "1 minuta"
other: "%d minutas"
month: "circa un mense"
months:
+ one: "1 mense"
other: "%d menses"
prefixAgo: ""
prefixFromNow: ""
@@ -293,6 +304,7 @@ ia:
wordSeparator: " "
year: "circa un anno"
years:
+ one: "1 anno"
other: "%d annos"
unblock_failed: "Le action de disblocar iste usator ha fallite"
viewer:
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index a803cf236c1761d35caaf85a6f9d177f2db7623f..04e033a6c108261a7fbb77100f7df3902fbc911c 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -38,9 +38,6 @@ id:
my_stream: "Stream"
photo_uploader:
looking_good: "Puji Tuhan, anda terlihat luar biasa!"
- publisher:
- limited: "Di Limitasi - Apa yang anda publikasi hanya dapat di lihat oleh orang-orang yang berbagi dengan anda."
- public: "Publik - Apa yang anda publikasi dapat di lihat oleh siapa saja dan dapat di temukan oleh mesin pencari."
show_more: "Tampilkan lebih banyak lagi"
stream:
comment: "Komentar"
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 5dca7fb389a67524c57b781c9ae478559b01b758..5431dd72e04da77fc2db878a1cae0a36e7c80dcf 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -70,9 +70,7 @@ is:
result: "Niðurstaða"
show_result: "Birta niðurstöður"
publisher:
- limited: "Takmarkað - skeytið verður eingögnu sýnilegt þeim sem þú veitir leyfi"
near_from: "Sennt inn nálægt: <%= location %>"
- public: "Opinbert - skeytið verður sýnilegt öllum, leitarvélar geta einnig fundið póstinn"
reshares:
post: "Deila áfram færslu frá <%= name %>?"
successful: "Tókst að deila þessu skeyti áfram!"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 706cde2c003e2b83835e986ce41de3ed8c01bcf7..dc8f67dfba4cc72020fb23ae0c686a8f75892220 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -70,9 +70,7 @@ it:
looking_good: "Accidenti, sei in splendida forma!"
size_error: "{file} è troppo grande, la dimensione massima è {sizeLimit}."
publisher:
- limited: "Non pubblico - il tuo post sarà visibile solamente a coloro con cui lo condividi"
near_from: "Vicino a: <%= location %>"
- public: "Pubblico - il tuo post sarà visibile a tutti, inclusi i motori di ricerca"
reshares:
post: "Vuoi condividere il post di <%= name %>?"
successful: "Il post è stato condiviso!"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 06ae680fa7121cfc0c8ddba0e519866442441d8a..bfa725878bd8ece2c759ceafbc754602b152200f 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -190,7 +190,6 @@ ja:
you_have_no_tags: "ã‚¿ã‚°ãŒã‚ã‚Šã¾ã›ã‚“ï¼"
publisher:
add_option: "回ç”ã‚’è¿½åŠ "
- limited: "é™å®šå…¬é–‹ - 投稿ã¯ã‚ãªãŸãŒã‚·ã‚§ã‚¢ã—ã¦ã„る人ã ã‘ãŒè¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™"
markdown_editor:
preview: "プレビュー"
texts:
@@ -222,7 +221,6 @@ ja:
mention_success: "メンションã—ã¾ã—ãŸ: <%= names %>"
near_from: "<%= location %>ã‹ã‚‰ã®æŠ•ç¨¿"
option: "回ç”"
- public: "公開 - 投稿ã¯å…¨ã¦ã®äººã‹ã‚‰è¦‹ã‚‹ã“ã¨ãŒã§ãã€æ¤œç´¢ã‚¨ãƒ³ã‚¸ãƒ³ã§è¦‹ã¤ã‹ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™"
question: "質å•"
remove_post: "ã“ã®æŠ•ç¨¿ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ"
report:
diff --git a/config/locales/javascript/javascript.ka.yml b/config/locales/javascript/javascript.ka.yml
index 0460662bd78a1c63cafb5f67586dc7a7769a3025..deb4a4a9a8817c2bcc55a15480d0a9bb5ba68167 100644
--- a/config/locales/javascript/javascript.ka.yml
+++ b/config/locales/javascript/javascript.ka.yml
@@ -48,9 +48,6 @@ ka:
my_stream: "ნáƒáƒ™áƒáƒ“ი"
photo_uploader:
looking_good: "OMG, ძáƒáƒšáƒ˜áƒáƒœ კáƒáƒ გáƒáƒ“ გáƒáƒ›áƒáƒ˜áƒ§áƒ£áƒ ები!"
- publisher:
- limited: "შეზღუდული - თქვენს პáƒáƒ¡áƒ¢áƒ¡ დáƒáƒ˜áƒœáƒáƒ®áƒáƒ•áƒ¡ მხáƒáƒšáƒáƒ“ ის ხáƒáƒšáƒ®áƒ˜ რáƒáƒ›áƒ”ლთáƒáƒª გáƒáƒ£áƒ–იáƒáƒ ებთ"
- public: "სáƒáƒ¯áƒáƒ რ- თქვენს პáƒáƒ¡áƒ¢áƒ¡ დáƒáƒ˜áƒœáƒáƒ®áƒáƒ•áƒ¡ ყველრდრის გáƒáƒ›áƒáƒ©áƒœáƒ“ებრსáƒáƒ«áƒ˜áƒ”ბრსისტემáƒáƒ¨áƒ˜"
show_more: "მეტის ჩვენებáƒ"
stream:
comment: "კáƒáƒ›áƒ”ნტáƒáƒ ი"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 73abde04af010765c5526c0b942fc048c34dcfb1..9e737988e0de0eb97fb19e65f79634c832fe662a 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -72,9 +72,7 @@ ko:
result: "ê²°ê³¼"
publisher:
add_option: "ì„ íƒ ì‚¬í• ì¶”ê°€"
- limited: "ì œí•œë¨ - ë‚´ ê²Œì‹œë¬¼ì„ ë‚˜ì™€ ê³µìœ í•˜ê³ ìžˆëŠ” 사람들만 ë³¼ 수 있습니다"
near_from: "<%= location %> 근처"
- public: "공개 - ë‚´ ê²Œì‹œë¬¼ì„ ëˆ„êµ¬ë‚˜ ë³¼ 수 ìžˆê³ ê²€ìƒ‰ 엔진으로 ì°¾ì„ ìˆ˜ 있습니다"
question: "질문"
reshares:
post: "<%= name %>ë‹˜ì˜ ê²Œì‹œë¬¼ì„ ìž¬ê³µìœ í• ê¹Œìš”?"
diff --git a/config/locales/javascript/javascript.lt.yml b/config/locales/javascript/javascript.lt.yml
index 3e211df37942e30b8232b29311588219763dc594..f8405cb40cd83e78e6270e60b2785981ae106d75 100644
--- a/config/locales/javascript/javascript.lt.yml
+++ b/config/locales/javascript/javascript.lt.yml
@@ -50,9 +50,6 @@ lt:
my_stream: "Srautas"
photo_uploader:
looking_good: "Wow, JÅ«s atrodote nuostabiai!"
- publisher:
- limited: "Ribotas - Jūsų įrašą galės peržiūrėti tik žmonės, su kuriais Jūs dalijatės"
- public: "Viešas - Jūsų įrašus galės peržiūrėti visi, taip pat jie bus randami paieškos sistemose."
show_more: "Rodyti daugiau"
stream:
comment: "Komentuoti"
diff --git a/config/locales/javascript/javascript.ml.yml b/config/locales/javascript/javascript.ml.yml
index 37c9d4762b16b1faa634e5af1166477adfdc4600..0b9efdc6b429377d37006054ca60fbe4ee905376 100644
--- a/config/locales/javascript/javascript.ml.yml
+++ b/config/locales/javascript/javascript.ml.yml
@@ -66,9 +66,7 @@ ml:
looking_good: "താങàµà´•à´³àµ† കാണാൻ വളരെ നനàµà´¨à´¾à´¯à´¿à´Ÿàµà´Ÿàµà´£àµà´Ÿàµ!"
size_error: "{file} വളരെ വലàµà´¤à´¾à´£àµ, കൂടിയ ഫയലàµâ€ വലിപàµà´ªà´‚ {sizeLimit} ആകàµà´¨àµà´¨àµ."
publisher:
- limited: "പരിമിതം - താങàµà´•à´³àµà´Ÿàµ† à´•àµà´±à´¿à´ªàµà´ªàµ താങàµà´•àµ¾ പങàµà´•à´¿à´Ÿàµà´¨àµà´¨ ആൾകàµà´•à´¾àµ¼ മാതàµà´°à´®àµ‡ കാണൂ"
near_from: "<%= location %>à´²àµâ€ നിനàµà´¨àµà´‚ അയചàµà´šà´¤àµ"
- public: "പൊതàµà´µà´¾à´¯à´¤àµ - താങàµà´•à´³àµà´Ÿàµ† à´•àµà´±à´¿à´ªàµà´ªàµ à´Žà´²àµà´²à´¾à´µàµ¼à´•àµà´•àµà´‚ കാണാൻ സാധികàµà´•àµà´‚. കൂടാതെ തിരചàµà´šà´¿àµ½ യനàµà´¤àµà´°à´™àµà´™à´³à´¾àµ½ à´•à´£àµà´Ÿàµà´ªà´¿à´Ÿà´¿à´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´•à´¯àµà´‚ ചെയàµà´¯àµà´‚"
reshares:
post: "<%= name %>à´¨àµà´±àµ† à´•àµà´±à´¿à´ªàµà´ªàµ വീണàµà´Ÿàµà´‚ പങàµà´•à´¿à´Ÿà´£àµ‹?"
successful: "à´ˆ à´•àµà´±à´¿à´ªàµà´ªàµ വിജയകരമായി വീണàµà´Ÿàµà´‚ പങàµà´•àµà´µàµ†à´¯àµà´•àµà´•à´ªàµà´ªàµ†à´Ÿàµà´Ÿàµ!"
diff --git a/config/locales/javascript/javascript.ms.yml b/config/locales/javascript/javascript.ms.yml
index fc0fb62905c10fdc805757b140f06f6a060e2026..74b727a8d9c6ea9a49a6386546e56a4b305a2666 100644
--- a/config/locales/javascript/javascript.ms.yml
+++ b/config/locales/javascript/javascript.ms.yml
@@ -98,10 +98,8 @@ ms:
you_have_no_tags: "anda tidak mempunyai tag!"
publisher:
add_option: "Tambah jawapan"
- limited: "Terhad - catatan anda hanya akan dilihat oleh orang-orang yang berkongsi dengan anda"
near_from: "Dicatatkan dari: <%= location %>"
option: "Jawapan"
- public: "Awam - Pos anda akan dilihat oleh semua orang dan dijumpai oleh enjin carian"
question: "Soalan"
report:
name: "Lapor"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index a31618ca0b9812d6c3e7709445be550233443c86..ce481001d51f4c7e32abcd4ddbe717d7957a666c 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -135,7 +135,6 @@ nb:
you_have_no_tags: "Du har ingen tagger!"
publisher:
add_option: "Legg til valg"
- limited: "Begrenset - posten din vil bare være synlig for de du deler med"
markdown_editor:
preview: "Forhåndsvis"
texts:
@@ -165,7 +164,6 @@ nb:
write: "Skriv"
near_from: "Publisert fra: <%= location %>"
option: "Valg <%= nr %>"
- public: "Offentlig - posten din vil være synlig for alle og kan bli funnet av søkemotorer"
question: "Spørsmål"
remove_post: "Fjern dette innlegget?"
report:
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index e1819d632bd6dad72bcea8859c223891d4033f00..e7de2c6e5b8880086332761f8f2643e1214c299d 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -197,7 +197,6 @@ nl:
you_have_no_tags: "Je hebt geen tags!"
publisher:
add_option: "Keuzemogelijkheid toevoegen"
- limited: "Gelimiteerd - je bericht is alleen zichtbaar voor de mensen waarmee je hem deelt"
markdown_editor:
preview: "Voorbeeld"
texts:
@@ -224,7 +223,6 @@ nl:
write: "Schrijven"
near_from: "Geplaatst vanaf: <%= location %>"
option: "Keuze <%= nr %>"
- public: "Openbaar - je bericht is zichtbaar voor iedereen en kan gevonden worden door zoekmachines"
question: "Vraag"
remove_post: "Dit bericht verwijderen?"
report:
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index c85e8ce314d0b24eb2820d7beefe2751d935ecd1..2115add258f300e353cff1bd66bcfb275a168262 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -70,7 +70,6 @@ nn:
completed: "<%= file %> ferdig"
looking_good: "Du verda, du ser flott ut!"
publisher:
- limited: "Avgrensa - berre personar du deler med vil kunna sjå meldinga"
markdown_editor:
preview: "Førehandsvis"
texts:
@@ -93,7 +92,6 @@ nn:
quote: "Set inn sitat"
write: "Endre melding"
write: "Skriv"
- public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
reshares:
post: "Vil du dele <%= name %> sin post?"
successful: "Hurra, posten vart delt!"
diff --git a/config/locales/javascript/javascript.oc.yml b/config/locales/javascript/javascript.oc.yml
index a76385f06fa56eeb8277238af8197565685c5ad5..922b8cffda042eb83132a934aefdbc055bde89f7 100644
--- a/config/locales/javascript/javascript.oc.yml
+++ b/config/locales/javascript/javascript.oc.yml
@@ -201,7 +201,6 @@ oc:
you_have_no_tags: "Avètz pas d'etiquetas !"
publisher:
add_option: "Apondre una responsa"
- limited: "Limitat : vòstra publicacion serà solament vista pel mond amb qui partejatz"
markdown_editor:
preview: "Apercebut"
texts:
@@ -233,7 +232,6 @@ oc:
mention_success: "Es ben estat mencionat : <%= names %>"
near_from: "Postat a : <%= location %>"
option: "Responsa"
- public: "Public - vòstre messatge serà visible de totes e trobat pels motors de recèrca"
question: "Question"
remove_post: "Suprimir aqueste messatge ?"
report:
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 60e035ff26fc3cefa220ceda7329cde0865b96dc..e695f4a17b4f500928cd9098eef9d20abfd32dd3 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -183,7 +183,6 @@ pl:
you_have_no_tags: "nie masz tagów!"
publisher:
add_option: "Dodaj odpowiedź"
- limited: "Ograniczony - wpis będzie widoczny tylko dla wybranej grupy osób"
markdown_editor:
preview: "PodglÄ…d"
texts:
@@ -214,7 +213,6 @@ pl:
write: "Edycja"
near_from: "Blisko <%= location %>"
option: "Odpowiedź"
- public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki"
question: "Pytanie"
remove_post: "Usunąć ten wpis?"
report:
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index cc1800ea668ef33f3c5bdb9844010bed5d5a52ab..fac60e12a17aa70fc5cef4479d92418be005aa80 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -200,7 +200,6 @@ pt-BR:
you_have_no_tags: "Você não tem tags!"
publisher:
add_option: "Adicionar uma resposta"
- limited: "Limitada: a sua publicação será visÃvel apenas para as pessoas com quem você compartilha."
markdown_editor:
preview: "Pré-visualizar"
texts:
@@ -232,7 +231,6 @@ pt-BR:
mention_success: "Mencionados com sucesso: <%= names %>"
near_from: "Publicado de: <%= location %>"
option: "Resposta"
- public: "Pública: a sua publicação será totalmente visÃvel na Web e poderá ser encontrada por meio de mecanismos de buscas"
question: "Pergunta"
remove_post: "Remover esta publicação?"
report:
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 61fa78fcb152fd325a366ef1de6f4d63430fc912..b3de4295b29ccdfc39a2276d6c2df8c605d08fff 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -64,9 +64,7 @@ pt-PT:
looking_good: "OMD, tu estás fantástico(a)!"
size_error: "O {file} é muito grande, o tamanho máximo do ficheiro é {sizeLimit}."
publisher:
- limited: "Limitado - a sua publicação só será vista pelas pessoas com as quais está a partilhar"
near_from: "Publicado em: <%= location %>"
- public: "Público - A sua publicação será visÃvel para todos e encontrada por motores de busca"
reshares:
post: "Repartilhar a publicação de <%= name %>?"
successful: "A publicação foi repartilhada com sucesso!"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 19b2023360ca16bcee012ccb4b46265e76fcb88a..7ca33da3b367a5feddc629e2cdf04f6c20e5668a 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -65,9 +65,7 @@ ro:
profile:
posts: "Postări"
publisher:
- limited: "Limitat - publicatia va fi vazuta doar de catre persoanele cu care imparti publicatii"
near_from: "Publicat din <%= location %>"
- public: "Public - articolul tău va fi vizibil tuturor şi va fi accesibilă prin motoarele de căutare"
show_more: "arată mai mult"
stream:
comment: "Comentariu"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index be006be5a9132272bbfaf3e11530663a9b56d6ab..295f105f248f453c58a97f3fd52e0de30f7a94ed 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -150,7 +150,6 @@ ru:
you_have_no_tags: "у Ð²Ð°Ñ Ð½ÐµÑ‚ меток!"
publisher:
add_option: "Добавить вариант"
- limited: "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð°Ñ - ваша запиÑÑŒ будет видна только указанным вами людÑм"
markdown_editor:
preview: "ПредпроÑмотр"
texts:
@@ -180,7 +179,6 @@ ru:
write: "Редактировать Ñообщение"
near_from: "Отправлено из: <%= location %>"
option: "Вариант <%= nr %>"
- public: "ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð°Ñ - ваша запиÑÑŒ будет видна вÑем, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ð¾Ð¸Ñковые ÑиÑтемы"
question: "ВопроÑ"
remove_post: "ПеремеÑтить запиÑÑŒ?"
report:
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index cb66d1313715d3c01d83f04b91901f59b01c6e6f..d9d32173493516df1459d826f15f187d3dc0b5b5 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -85,10 +85,8 @@ sk:
vote: "Hlasovať"
publisher:
add_option: "Pridať možnosť"
- limited: "Vyhradený – tvoj prÃspevok uvidia len ľudia, s ktorými sa oň podelÃÅ¡"
near_from: "Odoslané z obce:<%= location %>"
option: "Možnosť <%= nr %>"
- public: "Verejný – tvoj prÃspevok pomocou vyhľadávaÄov uvidà a nájde každý"
question: "Otázka"
report:
name: "Správa"
diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml
index 74ede60049be6bcaa8d1a260da6bf4633f8e091a..9a235f72b07efc317de5f04b3541910a6750f80c 100644
--- a/config/locales/javascript/javascript.sl.yml
+++ b/config/locales/javascript/javascript.sl.yml
@@ -54,9 +54,6 @@ sl:
not_found: "nikogar ni bilo mogoÄe najti ..."
photo_uploader:
looking_good: "OMG, izgledaš super!"
- publisher:
- limited: "Omejeno - Vaša objava bo vidna le ljudem, s katerimi delite"
- public: "Javno - Vaša objava bo vidna vsem, prikazana bo tudi v spletnih iskalnikih"
reshares:
post: "Ponovno deli objavo osebe <%= name %>?"
successful: "Objavo ste uspešno ponovno delili!"
diff --git a/config/locales/javascript/javascript.sr.yml b/config/locales/javascript/javascript.sr.yml
index f6a9aa96c09b6a8a9438007692d020d1d3f10ae9..6abc2ea52d9a9bc32aa84e71db1ffbdea3c62e94 100644
--- a/config/locales/javascript/javascript.sr.yml
+++ b/config/locales/javascript/javascript.sr.yml
@@ -51,9 +51,6 @@ sr:
my_stream: "ВеÑти"
photo_uploader:
looking_good: "Човече, изгледаш одлично!"
- publisher:
- limited: "Ограничено - твоју објаву ће видети Ñамо људи Ñа којима је делиш"
- public: "Јавно - твоју објаву ће видети Ñви и биће је могуће тражити путем претраживача"
show_more: "прикажи још"
stream:
comment: "Коментариши"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 331d76656049c23a8ac58143cb8262179201e984..641a87ecad78a01b2bfe276dde58f5962eac25a2 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -199,7 +199,6 @@ sv:
you_have_no_tags: "Du har inga taggar!"
publisher:
add_option: "Lägg till alternativ"
- limited: "Begränsat: ditt inlägg visas endast för personer som du delar med"
markdown_editor:
preview: "Förhandsgranska"
texts:
@@ -231,7 +230,6 @@ sv:
mention_success: "Lyckades nämna: <%= names %>"
near_from: "Sänt från: <%= location %>"
option: "Alternativ"
- public: "Publikt: ditt inlägg visas för alla och i söktjänster"
question: "Fråga"
remove_post: "Vill du ta bort detta inlägg?"
report:
diff --git a/config/locales/javascript/javascript.te.yml b/config/locales/javascript/javascript.te.yml
index 95c6c1261adcc4a2e47a7dc84cb4a185aa20217f..8864f7e7f9ee58d0283296382097bf3ae7dfcacd 100644
--- a/config/locales/javascript/javascript.te.yml
+++ b/config/locales/javascript/javascript.te.yml
@@ -122,14 +122,12 @@ te:
you_have_no_tags: "మీరౠఠకొసలౠజతచేయలేదà±!"
publisher:
add_option: "à°’à°• సమాధానానà±à°¨à°¿ జతచేయి"
- limited: "పరిమితం: మీరౠఎవరితోనైతే పంచà±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à±‹ వారౠమాతà±à°°à°®à±‡ మీ టపానౠచూడగలరà±"
markdown_editor:
tooltips:
bold: "బొదà±à°¦à±"
italic: "వాలà±"
near_from: "ఇకà±à°•à°¡à°¿ à°¨à±à°‚à°¡à°¿ టపా వేసారà±: <%= location %>"
option: "సమాధానం"
- public: "బహిరంగం: మీ టపా అందరికీ కనిపిసà±à°¤à±à°‚ది మరియౠవెతà±à°•à±à°²à°¾à°Ÿ యంతà±à°°à°¾à°²à°²à±‹ కూడా కనపడà±à°¤à±à°‚ది"
question: "à°ªà±à°°à°¶à±à°¨"
remove_post: "ఈ టపానౠతీసివేయాలా?"
report:
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 097c138a2387d36b2a669f1f3e53a4a3f0ee5fe7..77a9b796c1655b1af883d553baef1bdb8c027465 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -53,7 +53,6 @@ tr:
photo_uploader:
looking_good: "OMG, harika görünüyorsun!"
publisher:
- limited: "Sınırlı - gönderi sadece paylaşılan kişiler tarafından görünür"
markdown_editor:
preview: "Önizle"
texts:
@@ -82,7 +81,6 @@ tr:
quote: "Ekle tırnak"
write: "düzenle mesajı"
write: "yazma"
- public: "Genel - gönderi herkes tarafından görünür ve arama motorları tarafından bulunur olacak"
reshares:
post: "<%= name %> kişisinin gönderisini yeniden paylaşamak istiyor musun?"
successful: "Gönderi başarıyla yeniden paylaşıldı!"
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 58f151a3db5a4764bc6b382a71da217a291495c6..60385bbcc1f926095f41e773a12913d6546064b9 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -183,6 +183,7 @@ uk:
invalid_ext: "{file} має неприпуÑтиме розширеннÑ. Дозволені тільки {extensions}."
looking_good: "Боже мій, ви виглÑдаєте приголомшливо!"
size_error: "{file} має занадто великий розмір, макÑимальний розмір файлу: {sizeLimit}."
+ upload_photos: "Завантажити фото"
poll:
answer_count:
few: "<%=count%> голоÑи"
@@ -215,7 +216,6 @@ uk:
you_have_no_tags: "у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” міток!"
publisher:
add_option: "Додати відповідь"
- limited: "Обмежена - ваш Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ´Ðµ видимий тільки вказаним вами людÑм"
markdown_editor:
preview: "Попередній переглÑд"
texts:
@@ -244,18 +244,18 @@ uk:
quote: "Ð’Ñтавити цитату"
write: "Редагувати повідомленнÑ"
write: "ЗапиÑати"
+ mention_success: "УÑпішно згадано: <%= names %>"
near_from: "Відправлено з: <%= location %>"
option: "Відповідь"
- public: "Публічна - ваш Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ´Ðµ видимий уÑім, зокрема пошуковим ÑиÑтемам"
question: "ПитаннÑ"
remove_post: "Видалити цей запиÑ?"
report:
- name: "ДонеÑти"
+ name: "ПоÑкаржитиÑÑ"
prompt: "Будь лаÑка, вкажіть причину:"
prompt_default: "образливий зміÑÑ‚"
status:
- created: "Ð”Ð¾Ð½Ð¾Ñ ÑƒÑпішно відправлений"
- exists: "Ð”Ð¾Ð½Ð¾Ñ Ð²Ð¶Ðµ відправлений"
+ created: "Скаргу надіÑлано"
+ exists: "Скарга вже надіÑлана"
reshares:
post: "Поширити Ð·Ð°Ð¿Ð¸Ñ <%= name %>?"
successful: "Ви уÑпішно поділилиÑÑ Ð·Ð°Ð¿Ð¸Ñом!"
diff --git a/config/locales/javascript/javascript.vi.yml b/config/locales/javascript/javascript.vi.yml
index 3813bf02c1f3fc416036ead50d56b210b7ad760f..e077040a14a8999233bb905664b463ac1c37e2d8 100644
--- a/config/locales/javascript/javascript.vi.yml
+++ b/config/locales/javascript/javascript.vi.yml
@@ -63,9 +63,7 @@ vi:
looking_good: "Ôi, trông bạn tháºt tuyệt!"
size_error: "Táºp tin {file} quá lá»›n, dung lượng tối Ä‘a là {sizeLimit}."
publisher:
- limited: "Giá»›i hạn - bà i đăng của bạn được những ngÆ°á»i chỉ định nhìn thấy"
near_from: "Gá»i từ: <%= location %>"
- public: "Công khai - baÌ€i đăng của bạn được má»i ngÆ°á»i và máy tìm kiếm nhìn thấy"
reshares:
post: "Chia sẻ lại bà i đăng của <%= name %>?"
successful: "Äã chia sẻ lại bà i đăng!"
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index 47ff47727c516c003bede0b50e64f7675981db41..54505f714ffd6b5aa1859b3dd9313be2f0998cfd 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -52,9 +52,6 @@ zh-CN:
not_found: "找ä¸åˆ°ä»»ä½•äººâ€¦"
photo_uploader:
looking_good: "天啊，您太棒了ï¼"
- publisher:
- limited: "é™åˆ¶ - åªæœ‰æ‚¨æƒ³åˆ†äº«çš„人æ‰çœ‹å¾—到您的内容"
- public: "公开 - 所有人都能看到您的内容，包括æœç´¢å¼•æ“Ž"
reshares:
post: "è¦è½¬å‘ <%= name %> 的内容å—？"
successful: "转å‘æˆåŠŸ"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 682c66c91e79ba3fce470e1b9ac69a35865db96a..29053b4657e9fcd1be01960a76901c9a460c6ca9 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -132,7 +132,7 @@ zh-TW:
recent_notifications: "最新消æ¯"
search: "æœå°‹"
settings: "è¨å®š"
- toggle_mobile: "行動檢視切æ›"
+ toggle_mobile: "切æ›è¡Œå‹•ç‰ˆé é¢"
toggle_navigation: "ç€è¦½æ¨¡å¼åˆ‡æ›"
view_all: "看全部"
hide_post: "è¦éš±è—貼文嗎？"
@@ -191,7 +191,6 @@ zh-TW:
you_have_no_tags: "ä½ æ²’æœ‰ä»»ä½•æ¨™ç±¤ï¼"
publisher:
add_option: "å¢žåŠ ç”案"
- limited: "è¨é™ - åªæœ‰ä½ 想分享的人æ‰çœ‹å¾—åˆ°ä½ çš„è²¼æ–‡"
markdown_editor:
preview: "é 覽"
texts:
@@ -223,7 +222,6 @@ zh-TW:
mention_success: "指指點點æˆåŠŸ: <%= names %>"
near_from: "貼文地點：<%= location %>"
option: "ç”案"
- public: "å…¬é–‹ï¼šæ‰€æœ‰äººéƒ½èƒ½çœ‹åˆ°ä½ çš„è²¼æ–‡ï¼ŒåŒ…æ‹¬æœå°‹å¼•æ“Ž"
question: "å•é¡Œ"
remove_post: "è¦ç§»é™¤è²¼æ–‡å—Žï¼Ÿ"
report:
diff --git a/features/desktop/activity_stream.feature b/features/desktop/activity_stream.feature
index f6a9d37462f7c4ce8159ea4c918079324ceaf80a..836ea0371d01e0274d8fa2f7b2d7ef1b045d701c 100644
--- a/features/desktop/activity_stream.feature
+++ b/features/desktop/activity_stream.feature
@@ -6,11 +6,11 @@ Feature: The activity stream
| Bob Jones | bob@bob.bob |
| Alice Smith | alice@alice.alice |
And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
- When "alice@alice.alice" has posted a status message with a photo
+ And "alice@alice.alice" has posted a status message with a photo
Scenario: delete a comment
- When "bob@bob.bob" has commented "is that a poodle?" on "Look at this dog"
- And I sign in as "bob@bob.bob"
+ Given "bob@bob.bob" has commented "is that a poodle?" on "Look at this dog"
+ When I sign in as "bob@bob.bob"
And I go to the activity stream page
Then I should see "Look at this dog"
And I should see "is that a poodle?"
diff --git a/features/desktop/edits_profile.feature b/features/desktop/edits_profile.feature
index 8eeb5bb9d095fc8c4d82002c36612e36e81d73c0..bf68ed972960afab272819d65227438fab64e5fc 100644
--- a/features/desktop/edits_profile.feature
+++ b/features/desktop/edits_profile.feature
@@ -33,6 +33,10 @@ Feature: editing your profile
And I should see "#starwars" within "ul#as-selections-tags"
And the "#profile_public_details" bootstrap-switch should be off
+ When I fill in "profile_bio" with "This is a new awesome bio"
+ And I reject the alert after I follow "My activity"
+ Then I should be on my edit profile page
+
When I fill in "profile[tag_string]" with "#kamino"
And I press the first ".as-result-item" within ".as-results"
And I toggle the "#profile_public_details" bootstrap-switch
diff --git a/features/mobile/drawer.feature b/features/mobile/drawer.feature
index aa845a08df0aedaf9efe70b6eeed4f6c3a14577b..42f9345816bdc5cd0fc1b514f341b03f464b2400 100644
--- a/features/mobile/drawer.feature
+++ b/features/mobile/drawer.feature
@@ -4,12 +4,7 @@ Feature: Navigate between pages using the header menu and the drawer
I want to be able navigate between the pages of the mobile version
Background:
- Given following users exist:
- | username | email |
- | Bob Jones | bob@bob.bob |
- | Alice Smith | alice@alice.alice |
-
- And a user with email "bob@bob.bob" is connected with "alice@alice.alice"
+ Given a user with email "alice@alice.alice"
And I sign in as "alice@alice.alice" on the mobile website
Scenario: navigate to the stream page
@@ -57,9 +52,9 @@ Feature: Navigate between pages using the header menu and the drawer
Then I should be on the mentioned stream page
Scenario: navigate to aspects pages
- Given "bob@bob.bob" has a public post with text "bob's text"
Given I have a limited post with text "Hi you!" in the aspect "Besties"
When I open the drawer
+ Then I should not see "All aspects" within "#drawer"
And I click on "My aspects" in the drawer
And I click on "All aspects" in the drawer
Then I should be on the aspects page
@@ -73,6 +68,7 @@ Feature: Navigate between pages using the header menu and the drawer
When I follow the "boss" tag
And I go to the stream page
And I open the drawer
+ Then I should not see "All tags" within "#drawer"
And I click on "#Followed tags" in the drawer
And I click on "All tags" in the drawer
Then I should be on the followed tags stream page
@@ -109,3 +105,44 @@ Feature: Navigate between pages using the header menu and the drawer
When I open the drawer
And I click on "Settings" in the drawer
Then I should be on my account settings page
+
+ Scenario: navigate to the moderation page
+ Given a moderator with email "bob@bob.bob"
+ And I sign in as "bob@bob.bob" on the mobile website
+ When I open the drawer
+ Then I should not see "Admin" within "#drawer"
+ And I should see "Reports" within "#drawer"
+ When I click on "Reports" in the drawer
+ Then I should see "Reports overview" within "#main h1"
+
+ Scenario: navigate to the admin pages
+ Given an admin with email "bob@bob.bob"
+ And I sign in as "bob@bob.bob" on the mobile website
+ When I open the drawer
+ Then I should not see "Reports" within "#drawer"
+ Then I should not see "Dashboard" within "#drawer"
+ When I click on "Admin" in the drawer
+ And I click on "Dashboard" in the drawer
+ Then I should see "Pod status" within "#main h2"
+ When I click on "Admin" in the drawer
+ And I click on "User search" in the drawer
+ Then I should see "User search" within "#main h3"
+ When I click on "Admin" in the drawer
+ And I click on "Weekly user stats" in the drawer
+ Then I should see "Current server date is " within "#main h2"
+ When I click on "Admin" in the drawer
+ And I click on "Pod stats" in the drawer
+ Then I should see "Usage statistics" within "#main h1"
+ When I click on "Admin" in the drawer
+ And I click on "Reports" in the drawer
+ Then I should see "Reports overview" within "#main h1"
+ When I click on "Admin" in the drawer
+ And I click on "Pod network" in the drawer
+ Then I should see "Pod network " within "#main h2"
+ When I click on "Admin" in the drawer
+ Then I should see "Sidekiq monitor" within "#drawer"
+
+ Scenario: users doesn't have access to the admin pages
+ When I open the drawer
+ Then I should not see "Admin" within "#drawer"
+ Then I should not see "Reports" within "#drawer"
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index 0bad1d6181e21a73f8416cd897c5e10d8638fdde..f01025a076de2da668eda0de0924b743bc57f902 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -25,6 +25,15 @@ Given /^a nsfw user with email "([^\"]*)"$/ do |email|
user.profile.update_attributes(:nsfw => true)
end
+Given /^a moderator with email "([^\"]*)"$/ do |email|
+ user = create_user(email: email)
+ Role.add_moderator(user)
+end
+
+Given /^an admin with email "([^\"]*)"$/ do |email|
+ user = create_user(email: email)
+ Role.add_admin(user)
+end
Given /^(?:|[tT]hat )?following user[s]?(?: exist[s]?)?:$/ do |table|
table.hashes.each do |hash|
@@ -38,7 +47,6 @@ Given /^(?:|[tT]hat )?following user[s]?(?: exist[s]?)?:$/ do |table|
end
end
-
Given /^I have been invited by an admin$/ do
admin = FactoryGirl.create(:user)
admin.invitation_code
diff --git a/features/support/env.rb b/features/support/env.rb
index 0fb5dede34ca194a6913801c54ac2e61b8ba20f4..393446b649b4d6512939be65a5dac2533fe785fe 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -23,7 +23,7 @@ Rails.application.routes.default_url_options[:host] = AppConfig.pod_uri.host
Rails.application.routes.default_url_options[:port] = AppConfig.pod_uri.port
Capybara.register_driver :poltergeist do |app|
- Capybara::Poltergeist::Driver.new(app, timeout: 60)
+ Capybara::Poltergeist::Driver.new(app, timeout: 80)
end
Capybara.javascript_driver = :poltergeist
diff --git a/features/support/user_cuke_helpers.rb b/features/support/user_cuke_helpers.rb
index 5043d0a0a4a4ae26bffd95482149e40453c14768..5ec5e3abb5d29aff17c390281e158db08eb6ecc8 100644
--- a/features/support/user_cuke_helpers.rb
+++ b/features/support/user_cuke_helpers.rb
@@ -32,7 +32,7 @@ module UserCukeHelpers
# integration_sessions controller (automatic)
def automatic_login
@me ||= FactoryGirl.create(:user_with_aspect, :getting_started => false)
- visit(new_integration_sessions_path(:user_id => @me.id))
+ visit(new_integration_sessions_path(user_id: @me.id))
click_button "Login"
end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 3277806077fc750a706be9e159fcc0e7cd3cc65a..ad8a2b70ef0fed2ecccdd292ee823cd149183308 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -203,6 +203,13 @@ describe UsersController, :type => :controller do
expect(Workers::Mail::ConfirmEmail).to receive(:perform_async).with(@user.id).once
put(:update, :id => @user.id, :user => { :email => "my@newemail.com"})
end
+
+ it "saves unconfirmed_email when podmail is disabled" do
+ AppConfig.mail.enable = false
+ put(:update, id: @user.id, user: {email: "my@newemail.com"})
+ @user.reload
+ expect(@user.email).to eql("my@newemail.com")
+ end
end
describe 'email settings' do