Commit f0982731 authored by Dennis Schubert's avatar Dennis Schubert

Merge branch 'release/0.5.10.0'

parents 0bc8e54a 266ada3f
AllCops:
RunRailsCops: true
Exclude:
- "bin/**/*"
- "db/schema.rb"
Rails:
Enabled: true
# Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength:
Max: 120
......
# Contributor Code of Conduct
# Contributor Covenant Code of Conduct
As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating
documentation, submitting pull requests or patches, and other activities.
## Our Pledge
We are committed to making participation in this project a harassment-free
experience for everyone, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal appearance,
body size, race, ethnicity, age, religion, or nationality.
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, gender identity and expression, level of experience,
nationality, personal appearance, race, religion, or sexual identity and
orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment
include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or unprofessional conduct
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
......@@ -26,25 +43,32 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.
## Scope
This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer at [team@diasporafoundation.org](mailto:team@diasporafoundation.org). All
reported by contacting the project team at [team@diasporafoundation.org](mailto:team@diasporafoundation.org). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
[version]: http://contributor-covenant.org/version/1/4/
# 0.5.10.0
## Refactor
* Removed the publisher from a user's photo stream due to various issues [#6851](https://github.com/diaspora/diaspora/pull/6851)
* Don't implicitly ignore missing templateName in app.views.Base [#6877](https://github.com/diaspora/diaspora/pull/6877)
# 0.5.9.1
Update Nokogiri to 1.6.8, which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,
......
source "https://rubygems.org"
gem "rails", "4.2.5.2"
gem "rails", "4.2.6"
# Legacy Rails features, remove me!
# responders (class level)
gem "responders", "2.1.1"
gem "responders", "2.2.0"
# Appserver
gem "unicorn", "5.0.1", require: false
gem "unicorn", "5.1.0", require: false
# Federation
......@@ -18,13 +18,13 @@ gem "diaspora_federation-rails", "0.0.13"
gem "acts_as_api", "0.4.2"
gem "json", "1.8.3"
gem "json-schema", "2.6.0"
gem "json-schema", "2.6.2"
# Authentication
gem "devise", "3.5.6"
gem "devise_lastseenable", "0.0.6"
gem "devise-token_authenticatable", "~> 0.4.0"
gem "devise-token_authenticatable", "0.4.6"
# Captcha
......@@ -41,7 +41,7 @@ gem "sidetiq", "0.6.3"
# Compression
gem "uglifier", "2.7.2"
gem "uglifier", "3.0.0"
# Configuration
......@@ -56,22 +56,22 @@ gem "rack-cors", "0.4.0", require: "rack/cors"
gem "bootstrap-sass", "2.3.2.2"
gem "compass-rails", "2.0.5"
gem "sass-rails", "5.0.4"
gem "autoprefixer-rails", "6.3.3.1"
gem "autoprefixer-rails", "6.3.6.2"
# Database
ENV["DB"] ||= "mysql"
gem "mysql2", "0.4.3" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
gem "mysql2", "0.4.4" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
gem "pg", "0.18.4" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
gem "activerecord-import", "0.11.0"
gem "activerecord-import", "0.13.0"
# File uploading
gem "carrierwave", "0.10.0"
gem "fog", "1.37.0"
gem "mini_magick", "4.4.0"
gem "carrierwave", "0.11.2"
gem "fog", "1.38.0"
gem "mini_magick", "4.5.1"
gem "remotipart", "1.2.1"
# GUID generation
......@@ -85,29 +85,29 @@ gem "entypo-rails", "2.2.3"
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.23.0"
gem "jquery-rails", "4.1.0"
gem "jquery-rails", "4.1.1"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.1.0"
gem "js-routes", "1.2.4"
gem "js-routes", "1.2.6"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "6.0.0"
gem "rails-assets-markdown-it", "6.0.5"
gem "rails-assets-markdown-it-hashtag", "0.4.0"
gem "rails-assets-markdown-it-diaspora-mention", "0.4.0"
gem "rails-assets-markdown-it-sanitizer", "0.4.1"
gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.1"
gem "rails-assets-markdown-it-sub", "1.0.0"
gem "rails-assets-markdown-it-sup", "1.0.0"
gem "rails-assets-highlightjs", "9.1.0"
gem "rails-assets-highlightjs", "9.4.0"
# jQuery plugins
gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-perfect-scrollbar", "0.6.10"
gem "rails-assets-perfect-scrollbar", "0.6.11"
gem "rails-assets-jakobmattsson--jquery-elastic", "1.6.11"
end
......@@ -128,9 +128,9 @@ gem "messagebus_ruby_api", "1.0.3"
gem "nokogiri", "1.6.8"
gem "redcarpet", "3.3.4"
gem "twitter-text", "1.13.3"
gem "twitter-text", "1.13.4"
gem "roxml", "3.1.6"
gem "ruby-oembed", "0.9.0"
gem "ruby-oembed", "0.10.1"
gem "open_graph_reader", "0.6.1"
# Services
......@@ -144,11 +144,11 @@ gem "omniauth-wordpress", "0.2.2"
# Serializers
gem "active_model_serializers", "0.9.4"
gem "active_model_serializers", "0.9.5"
# XMPP chat dependencies
gem "diaspora-vines", "~> 0.2.0.develop"
gem "rails-assets-diaspora_jsxc", "~> 0.1.4", source: "https://rails-assets.org"
gem "diaspora-vines", "0.2.0.develop.4"
gem "rails-assets-diaspora_jsxc", "0.1.4", source: "https://rails-assets.org"
# Tags
......@@ -160,7 +160,7 @@ gem "addressable", "2.3.8", require: "addressable/uri"
gem "faraday", "0.9.2"
gem "faraday_middleware", "0.10.0"
gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "1.0.1"
gem "typhoeus", "1.0.2"
# Views
......@@ -176,7 +176,7 @@ gem "logging-rails", "0.5.0", require: "logging/rails"
# Reading and writing zip files
gem "rubyzip", "1.1.7", require: "zip"
gem "rubyzip", "1.2.0", require: "zip"
# Prevent occasions where minitest is not bundled in
# packaged versions of ruby. See following issues/prs:
......@@ -222,27 +222,26 @@ end
group :development do
# Automatic test runs
gem "guard-cucumber", "1.5.4"
gem "guard-jshintrb", "1.1.1"
gem "guard-rspec", "4.6.4"
gem "guard-rubocop", "1.2.0"
gem "guard", "2.13.0", require: false
gem "guard", "2.14.0", require: false
gem "listen", "~> 3.0.0", require: false
gem "guard-cucumber", "2.1.2", require: false
gem "guard-rspec", "4.7.2", require: false
gem "guard-rubocop", "1.2.0", require: false
gem "rb-fsevent", "0.9.7", require: false
gem "rb-inotify", "0.9.7", require: false
# Linters
gem "jshintrb", "0.3.0"
gem "rubocop", "0.35.1"
gem "rubocop", "0.40.0"
# Preloading environment
gem "spring", "1.6.3"
gem "spring", "1.7.1"
gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1"
# Debugging
gem "pry"
gem "pry-debundle"
gem "pry-byebug"
# test coverage
......@@ -256,20 +255,19 @@ group :test do
gem "fixture_builder", "0.4.1"
gem "fuubar", "2.0.0"
gem "rspec-instafail", "0.4.0", require: false
gem "test_after_commit", "0.4.2"
gem "test_after_commit", "1.0.0"
# Cucumber (integration tests)
gem "capybara", "2.6.2"
gem "database_cleaner" , "1.5.1"
gem "capybara", "2.7.1"
gem "database_cleaner", "1.5.3"
gem "selenium-webdriver", "2.47.1"
# General helpers
gem "factory_girl_rails", "4.6.0"
gem "timecop", "0.8.0"
gem "webmock", "1.22.6", require: false
gem "factory_girl_rails", "4.7.0"
gem "timecop", "0.8.1"
gem "webmock", "2.1.0", require: false
gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.0.13"
......
This diff is collapsed.
......@@ -22,8 +22,7 @@ guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: fals
end
guard(:cucumber,
command_prefix: "bin/spring",
bundler: false,
cmd: "bin/spring cucumber",
all_on_start: false,
all_after_pass: false) do
watch(/^features\/.+\.feature$/)
......@@ -37,9 +36,3 @@ guard :rubocop, all_on_start: false, keep_failed: false do
watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
end
guard :jshintrb do
watch(/^app\/assets\/javascripts\/.+\.js$/)
watch(/^lib\/assets\/javascripts\/.+\.js$/)
watch(/^spec\/javascripts\/.+\.js$/)
end
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
app.pages.Profile = app.views.Base.extend({
templateName: false,
events: {
'click #block_user_button': 'blockPerson',
'click #unblock_user_button': 'unblockPerson'
......@@ -85,7 +87,7 @@ app.pages.Profile = app.views.Base.extend({
});
app.stream.fetch();
if( this.model.get('is_own_profile') ) {
if( this.model.get("is_own_profile") && route !== "personPhotos" ) {
app.publisher = new app.views.Publisher({collection : app.stream.items});
}
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
......
......@@ -38,11 +38,19 @@ app.views.Base = Backbone.View.extend({
renderTemplate : function(){
var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter;
this.template = HandlebarsTemplates[this.templateName+"_tpl"];
if(!this.template) {
console.log(this.templateName ? ("no template for " + this.templateName) : "no templateName specified");
if (this.templateName === false) {
return;
}
if (!this.templateName) {
throw new Error("No templateName set, set to false to ignore.");
}
if (!this.template) {
throw new Error("Invalid templateName provided: " + this.templateName);
}
this.$el
.html(this.template(presenter))
.attr("data-template", _.last(this.templateName.split("/")));
......
......@@ -23,7 +23,7 @@
.stream_container
- if user_signed_in? && current_user.person.id == @person.id
- if user_signed_in? && current_user.person.id == @person.id && !current_page?(person_photos_path(@person))
= render 'publisher/publisher', publisher_aspects_for(nil)
#main_stream.stream
......
......@@ -4,7 +4,7 @@
defaults:
version:
number: "0.5.9.1" # Do not touch unless doing a release, do not backport the version number that's in master
number: "0.5.10.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/"
......
......@@ -663,7 +663,7 @@ configuration: ## Section
## OpenSSL verify mode used when connecting to a SMTP server with TLS.
## Set this to 'none' if you have a self-signed certificate. Possible
## values: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'.
## values: 'none', 'peer'.
#openssl_verify_mode: 'none'
## Ignore if method isn't 'sendmail'
......
......@@ -29,7 +29,8 @@ Diaspora::Application.configure do
port: AppConfig.mail.smtp.port.to_i,
domain: AppConfig.mail.smtp.domain.get,
enable_starttls_auto: false,
openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get
openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get,
ca_file: AppConfig.environment.certificate_authorities.get
}
if AppConfig.mail.smtp.authentication != "none"
......
......@@ -37,7 +37,7 @@ zh-TW:
reset_password_instructions:
change: "更改密碼"
ignore: "如果你沒有要求過,請不用管這封信。"
someone_requested: "如果你要求重設密碼,請點下方連結來重設密碼。"
someone_requested: "如果你有要求要重設密碼的話,請點下方連結進行。"
subject: "密碼重設步驟"
wont_change: "在按了以上連結,並且設定新的密碼後,你的密碼才會改變。"
unlock_instructions:
......
......@@ -222,7 +222,7 @@ da:
no_contacts_message:
community_spotlight: "Community Spotlight"
or_spotlight: "Eller du kan dele med %{link}"
try_adding_some_more_contacts: "Du kan søge (øverst) eller invitere flere kontakter (til højre)."
try_adding_some_more_contacts: "Du kan søge efter eller invitere flere kontakter."
you_should_add_some_more_contacts: "Du kan tilføje nogle flere kontakter!"
no_posts_message:
start_talking: "Ingen har sagt noget endnu. Start samtalen!"
......
......@@ -422,7 +422,7 @@ de:
diaspora_app_q: "Gibt es eine diaspora* App für Android oder iOS?"
photo_albums_a: "Nein, momentan nicht. Aber du kannst dir die hochgeladenen Bilder in der Fotosektion in der linke Leiste auf dem Profil ansehen."
photo_albums_q: "Gibt es Foto oder Videoalben?"
subscribe_feed_a: "Ja, allerdings ist diese Funktion noch immer nicht ganz ausgereift und das Ergebnis wird nicht ganz richtig formatiert. Wenn du die Funktion dennoch benutzen willst, gehe einfach zu der Profilseite der Person und klicke auf die Feed-Schaltfläche deines Browsers oder kopiere die Profil-URL (z.B. https://joindiaspora.com/people/irgendeinenummer) und füge sie in einen Feedreader ein. Die resultierenden Feed-Adressen sehen z.B. so aus: https://joindiaspora.com/public/benutzername.atom diaspora* benutzt Atom anstelle von RSS."
subscribe_feed_a: "Ja, allerdings ist diese Funktion noch immer nicht ganz ausgereift und das Ergebnis wird nicht ganz richtig formatiert. Wenn du die Funktion dennoch benutzen willst, gehe einfach zu der Profilseite der Person und klicke auf die Feed-Schaltfläche deines Browsers oder kopiere die Profil-URL (z.B. https://podname.org/people/irgendeinenummer) und füge sie in einen Feedreader ein. Die resultierenden Feed-Adressen sehen z.B. so aus: https://podname.org/public/benutzername.atom diaspora* benutzt Atom anstelle von RSS."
subscribe_feed_q: "Kann ich die öffentlichen Beiträge einer Person mit einem Feedreader verfolgen?"
title: "Diverses"
pods:
......@@ -976,7 +976,7 @@ de:
destroy: "Löschen"
forbidden: "Du bist nicht berechtigt, das zu tun"
not_found: "Entschuldige, wir konnten den Beitrag leider nicht finden."
permalink: "Permanentlink"
permalink: "Permalink"
photos_by:
few: "%{count} Fotos von %{author}"
many: "%{count} Fotos von %{author}"
......
......@@ -103,6 +103,8 @@ en_valspeak:
account_closing_scheduled: "So like, the account of %{name} is waitin 2 b closed. it will b done in a few min, kay?"
add_invites: "add invites!! <3"
are_you_sure: "R u like... totally sure u wanna trash this account?"
are_you_sure_lock_account: "So like, u totes sure u wanna lock this ppl?"
are_you_sure_unlock_account: "So like, u totes sure u wanna unlock this ppl?"
close_account: "trash account"
email_to: "Email for the ppl 2 invite <3"
under_13: "show ppl undah 13 (COPPA)"
......@@ -133,6 +135,7 @@ en_valspeak:
aspect_memberships:
destroy:
failure: "The person was not like... removed... sry bout that :\\"
forbidden: "So like, ur not allowed to do tht..."
no_membership: "like... we couldnt find the ppl u picked in that aspect... sry bout tht :\\"
success: "The person was like... removed.. n stuff..."
aspects:
......@@ -161,6 +164,7 @@ en_valspeak:
aspect_list_is_not_visible: "Ppl in this aspect r like.. not able 2 c each other."
aspect_list_is_visible: "Ppl in this aspect r like.. able 2 c each other."
confirm_remove_aspect: "R u sure u want 2 like... remove this aspect?"
grant_contacts_chat_privilege: "Give the ppl in this aspect chat privies?"
make_aspect_list_visible: "make ppl in this group like... able 2 see each other?"
remove_aspect: "Git rid of this aspect"
rename: "bag this name.."
......@@ -296,6 +300,7 @@ en_valspeak:
send: "txt"
sending: "txtin..."
subject: "topic"
subject_default: "No subjieeee"
to: "2"
new_conversation:
fail: "Bad txt"
......@@ -357,6 +362,10 @@ en_valspeak:
what_is_an_aspect_q: "Wat is an aspect er group er whatev?"
who_sees_post_a: "so like, if u like... make a postie thats like... limited, it will only like, b seen by the ppl u have in ur aspect or group or groups err whatever. BFFs u have that like... arent in the aspect have like... no way of seein the postie, unless u set it 2 like... internet or public n junk. like, only like... posties that r set 2 public can b seen by ppl who u havent like... place in 1 of ur aspects. totally weird, right?"
who_sees_post_q: "when i like... make a postie 2 a aspect er whatever.. who can like.. see it?"
chat:
add_contact_roster_q: "So like, how do I cht with ppl in d*?"
contacts_page: "ppl page"
title: "Chttt"
faq: "FACK"
foundation_website: "d* foundation site! i lurve it!! <3"
getting_help:
......@@ -380,6 +389,7 @@ en_valspeak:
keyboard_shortcuts_li4: "l - <3 the current postie"
keyboard_shortcuts_li5: "r - reshar the current postie"
keyboard_shortcuts_li6: "like, make the current postie bigger"
keyboard_shortcuts_li7: "o - Open the first linkie in the current postie"
keyboard_shortcuts_q: "What key shorties r available?(:"
title: "Keypad shorties!!!"
markdown: "markydown"
......@@ -629,6 +639,7 @@ en_valspeak:
mark_read: "i liek, read this"
mark_unread: "umm, HELLO, i havent read this"
mentioned: "Mentioned"
no_notifications: "U dont have any noties yet :S"
notifications: "Noties!"
reshared: "Reshared! <3"
show_all: "show like, all"
......@@ -679,7 +690,19 @@ en_valspeak:
subject: "Plz like... confirm ur new email %{unconfirmed_email}. K thx!!! <3"
email_sent_by_diaspora: "This email was like... sent by %{pod_name}. If u'd like... to like... stop gettin emails like this,"
export_email:
body: |-
Hai %{name}!!
So like, we got ur data, and its totally ready for dl by [clicking here!!!!:D](%{url}).
Deuces!
The d* robo!!
subject: "u can dl ur personal data nao!!!!, %{name} :D"
export_failure_email:
subject: "So like, totally sry, but like... there was a problem with your stuff %{name}"
export_photos_failure_email:
subject: "So like, there was an issue with ur photos, %{name}... so sry bout tht..."
hello: "OMG HEY! %{name}"
invite:
message: |-
......@@ -864,6 +887,7 @@ en_valspeak:
title: "A postie from %{name}"
show:
destroy: "Trash ur pic"
forbidden: "So like, ur not allowed to do tht..."
not_found: "Sry, but we like... couldnt find that postie. :\\"
permalink: "like... permalink"
photos_by:
......@@ -1004,6 +1028,8 @@ en_valspeak:
click_link_to_accept_invitation: "so like... follow this link 2 like... accept ur invite"
join_me_on_diaspora: "Chill wit me on diaspora*!"
provider:
facebook: "fb"
tumblr: "tmblr"
twitter: "Twittar<333"
wordpress: "WurdPress"
remote_friend:
......@@ -1108,9 +1134,20 @@ en_valspeak:
user: "The secret pic n code werent the same D:"
placeholder: "like, enter in the stuff in the pic"
statistics:
active_users_halfyear: "Active ppl half yr"
active_users_monthly: "Active ppl monthly"
closed: "Closed"
disabled: "Not availab"
enabled: "Availab"
local_comments: "Local commentz"
local_posts: "Local posties"
name: "Nameee"
network: "Da network"
open: "Open"
registrations: "Reggies"
services: "Serviez!!!! :3"
total_users: "Total ppl"
version: "Ver"
status_messages:
create:
success: "YAY! %{names} has been mentioned!! :D"
......@@ -1207,13 +1244,17 @@ en_valspeak:
edit_account: "Edit ur account <3"
email_awaiting_confirmation: "So we like... sent u a link 2 like activate %{unconfirmed_email}. Until u like... follow this link && activate this new addy, we will continue 2 like.. use ur original addy %{email}. Kay?"
export_data: "dl data!!!"
export_in_progress: "We're gettin ur data... bbl!!!! <3"
export_photos_in_progress: "So like, we're currently gettin ur photos and junk. Bbl! <3"
following: "Sharin settins"
getting_started: "New user prefies"
last_exported_at: "(So like, last updated @ %{timestamp})"
liked: "some1 likes ur postie"
mentioned: "u r mentioned in a postie"
new_password: "New passwerd(;"
private_message: "u receive a sext :o"
receive_email_notifications: "Receive email noties when like:"
request_export: "Get my pro dats."
request_export_photos: "make a request for my pics"
request_export_photos_update: "Refresh my pics"
request_export_update: "Refresh my wall data"
......
......@@ -222,7 +222,7 @@ es-AR:
no_contacts_message:
community_spotlight: "Comunidad creativa"
or_spotlight: "O lo podés compartir con %{link}"
try_adding_some_more_contacts: "Podés buscar o invitar más contactos."
try_adding_some_more_contacts: "Podés buscar o invitar a más contactos."
you_should_add_some_more_contacts: "¡Deberías agregar más contactos!"
no_posts_message:
start_talking: "Nadie dijo nada todavía. ¡Inicia una conversación!"
......@@ -1378,7 +1378,7 @@ es-AR:
privacy_settings:
ignored_users: "Usuarios ignorados"
no_user_ignored_message: "En este momento no estás ignorando a ningún otro usuario"
stop_ignoring: "Dejar de ignorar"
stop_ignoring: "dejar de ignorar"
strip_exif: "Evita metadatos como la ubicación, autor y modelo de cámara de fotos en las imágenes subidas (recomendado)"
title: "Configuración de Privacidad"
public:
......
This diff is collapsed.
......@@ -674,7 +674,7 @@ fr:
mark_read: "Marquer comme lu"
mark_unread: "Marquer comme non lu"
mentioned: "Vous mentionnant"
no_notifications: "Vous ne avez pas encore de notifications."
no_notifications: "Vous n'avez pas encore de notifications."
notifications: "Notifications"
reshared: "Repartagé"
show_all: "montrer tout"
......
This diff is collapsed.
......@@ -94,6 +94,7 @@ ja:
index:
diaspora_id:
content_1: "あなたのダイアスポラIDは:"
content_2: "誰かに渡すと、その人は diaspora* であなたを見つけることができます。"
heading: "ダイアスポラID"
donate: "寄付"
handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
......@@ -243,6 +244,7 @@ ja:
sent: "次の人々に招待を送信しました:"
edit:
accept_your_invitation: "招待を受ける"
your_account_awaits: "アカウントをお待ちしています!"
new:
already_invited: "招待済み"
aspect: "アスペクト"
......@@ -267,6 +269,7 @@ ja:
whats_new: "更新履歴"
your_aspects: "アスペクト"
header:
admin: "管理"
blog: "ブログ"
code: "ソース"
login: "ログイン"
......@@ -422,6 +425,8 @@ ja:
mentioned:
mentioned: "さんは投稿であなたをメンションしました。"
subject: "%{name}さんはダイアスポラ*であなたをメンションしました。"
private_message:
reply_to_or_view: "この会話に返信、または表示 >"
report_email:
subject: "%{type}が新しく攻撃的だとマークされました"
reshared:
......
......@@ -222,7 +222,7 @@ nl:
no_contacts_message:
community_spotlight: "Community aanrader"
or_spotlight: "Of je kan delen met %{link}\n"
try_adding_some_more_contacts: "Je kunt zoeken of %{invite_link} meer contacten uitnodigen."
try_adding_some_more_contacts: "Je kunt zoeken en meer contacten uitnodigen."
you_should_add_some_more_contacts: "Voeg wat meer contacten toe!"
no_posts_message:
start_talking: "Nog niemand heeft iets gezegd!"
......@@ -823,16 +823,15 @@ nl:
Hallo,
het %{type} met ID %{id} werd als aanstootgevend gemarkeerd.
Reden: "%{reason}"
[%{url}][1]
Beoordeel het zo snel mogelijk.
Beoordeel het zo snel mogelijk!
Groetjes,
De diaspora* e-mailrobot!
[1]: %{url}