From 65ecfafc4e39c2a305c638a0d666b54387eb22b3 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 13 May 2011 12:35:26 -0700 Subject: [PATCH 01/38] add PGP public key to readme --- README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/README.md b/README.md index 5eb073867..bbbc45e47 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,46 @@ Also, be sure to join the official [mailing list](http://eepurl.com/Vebk). If you wish to contact us privately about any exploits in Diaspora you may find, you can email [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com). + +Here is the PGP key for exploits@joindiaspora.com: +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (Darwin) + +mQMuBE2eS7URCADDiwlmtp81djidWn4O9dNiymhOTIBFusc0gcGCS3rSnBWhoyeO +DpW1B8mYvcwOoccJLz5XCzXQnOJrkpkcKska/VR+f41o+JgUcnM6N5vIgepH5k1r +O8U626nWsLH26jECFgkUQebw8Vb80yLxQGvTsOYilGrdKuF+lgahc4qDmGAl6Lcf +Qnrx2V70qqTzi5vKPtOTwZHcME5+H622vegpMGoKlir+AA2SuYiieJEg8tKEV5BJ +3tC6rIW6AH4YzWwRmqH+VbHKQCdNN6QYzksk4DgCC7KkzD4lXj3I/ka+gi53hVrh +wNK2Li+87yuROgJpn0A+bHCBGcdUy+LtGIjnAQD/+RjOFOonl8mGE6mA0atqgsYd +wvgh173xbrBYHgIyWwf7Bh7l/mONRG063CRqxAcQK+m2NS7zpIwibNvDT9p3l95D +wGIhGOD8fRcmYMSZ7V8ESsEc0gruK50Hpt7XyvQsI4An1G+hh9msOHHY8vJZATfV +bV5ccRkkGXsM7LuUq7A0YxfmdVUaovDPO9tyoPepk03efkx62PgSmPN6KedVgoGG +nBaAhvG/Gt2GxfHpbVU/IPXiq39KNwI+AX4u9mYFhlrWQ6zJM6YSNJVA/WlC+Z7O +vUhmaPbfb3YN9pRteoARlVgSvKYHb7wq4EbQ/XbqwiFW3vWvKNLjNFyqWJVu59Fv +bEmo0AJAthQV8ao9eH3F6vkXIaQWfrPjNjbOM66BqQf8CR5hUF4SXS6IcJfr7teu +Lu9/6QSIpJaV1rYoX16oK0gMXuaO0GDoh/eNv9Vrd3z+B7iCwt6fuqxuMsxMR/yb +TNyukTG2271bYCiKKLqBb3u/q7ge1MLQwvCuRkmsTNAb/GN/NpU3VfvmUfHRce3+ +h3UQn6qoB2zbibCr0GGiY6MFE4CWEjQf1urigb0IffKuxdv5D/CaCykbJxPzD6vP +Z94fpUi0gPxXvkk8P57rmZFv6K9n8L+6qr2tzJGC+zG/uTUDrHqB5LYimUqFYnAu +EurBUEnSbcSlENfpwlvRpiPgbzkwsP1dY5+X+Gy0e5v/USExGYbfl/PVnsTcVCnF +gLRGUmFwaGFlbCBTb2ZhZXIgKERpYXNwb3JhIEV4cGxvaXRzIFBHUCBLZXkpIDxl +eHBsb2l0c0Bqb2luZGlhc3BvcmEuY29tPoiABBMRCAAoBQJNnku1AhsDBQkB4TOA +BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDMbK7Zd0hQZILNAPoDte9JmvGO +Gtp5IAJxOJl3+4iA3OpLTCVpNsPe4v+V2wD9EiFwHp2E419s92EXGQD4ZabKRVeK +Xnsvz0P8xDOK+f25Ag0ETZ5LtRAIANRhqORdQnuwtgws+b1jRVnYX5GE/cqQWd8v +vQ6ETKvQzq9ZHObtdxnl7No8dKeZeyWstL8OpbdSTMQ8XySdnojHiAVm3HaOt238 +kob1W0RIqdqsSAsiZO5xMAIrUzcuSZr1JplISLbZ0lv+6xjFD8l9T71U08odUGzD +AX5RBsCJw9yB7dgTJggLE1rXPe/vxxfYRw/1VdpIpW2XkMLjWTK1t55o2yMRaYmH +OnbcHe0CUYzSTpkUw2LDTHif2T4NJrOpG97LTQhzBbxbWChCmUaue+NPaclK7Pzy +NFlepPKqa7DCAeP+h+oi5etS77aKeMHz8Ujk2yZaDrztnmhwKtcAAwUIALOlALCO +r1H1QLQmRPq+qcJu9f6rf5Jp1zNhN1jgFA5Hm4thCN8nX9bW/94FFMxoH9hhr7T1 +7npwgIjkiNB119+fFHtPgkHAPueiEwS7wkuSWbfOAR24IubPlK53KctXtLD5TEiw +o5hw06SM27A2J6VS5+r1DH8Av/UY5Jg891Xg95gzBfp/h6tMfYm8ConB8FB4twv5 +Tit8IaVB/Zp7jMJqIcSEqMi2SVdXqjuWLlA5RK+xdp1LvOust+SX/w7XaC/aqbO7 +j7q2lanAzGtUL8wDA3uOIOxeR9kLHRC1bXJ4Ow/fbynYBsEdIZsb43Mjt7KGsKuq +cGAKsasmKhhs7qCIZwQYEQgADwUCTZ5LtQIbDAUJAeEzgAAKCRDMbK7Zd0hQZPIK +AQDADhHB2SPO5BPuq7nhicR3izRiuyJie4seXMf1TfF9PgEAuJNzGN/MAQzEj0Mr +mnv9hQc6McLTP15uISdt5hIXBLs= +=6qWa +-----END PGP PUBLIC KEY BLOCK----- + From cd4c792908c086ebc3e141ae5fd41a7b1f809b7a Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Fri, 13 May 2011 14:34:45 -0700 Subject: [PATCH 02/38] clear tmp image uploads after you run tests --- spec/spec_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a617782e2..ddea02d78 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -44,6 +44,10 @@ RSpec.configure do |config| config.before(:each, :type => :controller) do self.class.render_views end + + config.after(:all) do + `rm -rf #{Rails.root}/tmp/uploads/*` + end end disable_typhoeus From b7540ba6abfa2734ec4528b1c8c8b123bb02a979 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sat, 14 May 2011 00:04:43 +0200 Subject: [PATCH 03/38] updated locales --- config/locales/devise/devise.ko.yml | 2 +- config/locales/diaspora/ar.yml | 41 +++++++++++-------- config/locales/diaspora/bg.yml | 7 ++++ config/locales/diaspora/br.yml | 7 ++++ config/locales/diaspora/cs.yml | 9 +++- config/locales/diaspora/cy.yml | 7 ++++ config/locales/diaspora/da.yml | 7 ++++ config/locales/diaspora/de.yml | 7 ++++ config/locales/diaspora/el.yml | 9 +++- config/locales/diaspora/en_shaw.yml | 7 ++++ config/locales/diaspora/eo.yml | 7 ++++ config/locales/diaspora/es-CL.yml | 9 +++- config/locales/diaspora/es.yml | 31 ++++++++------ config/locales/diaspora/eu.yml | 21 ++++++---- config/locales/diaspora/fi.yml | 29 ++++++++----- config/locales/diaspora/fr.yml | 7 ++++ config/locales/diaspora/ga.yml | 7 ++++ config/locales/diaspora/he.yml | 7 ++++ config/locales/diaspora/hu.yml | 7 ++++ config/locales/diaspora/id.yml | 7 ++++ config/locales/diaspora/is.yml | 7 ++++ config/locales/diaspora/it.yml | 7 ++++ config/locales/diaspora/ja.yml | 7 ++++ config/locales/diaspora/ko.yml | 9 +++- config/locales/diaspora/lt.yml | 7 ++++ config/locales/diaspora/mk.yml | 7 ++++ config/locales/diaspora/nb.yml | 11 ++++- config/locales/diaspora/nl.yml | 35 +++++++++------- config/locales/diaspora/pa.yml | 7 ++++ config/locales/diaspora/pl.yml | 7 ++++ config/locales/diaspora/pt-BR.yml | 7 ++++ config/locales/diaspora/pt-PT.yml | 7 ++++ config/locales/diaspora/ro.yml | 7 ++++ config/locales/diaspora/ru.yml | 33 +++++++++------ config/locales/diaspora/sk.yml | 7 ++++ config/locales/diaspora/sl.yml | 7 ++++ config/locales/diaspora/sv.yml | 7 ++++ config/locales/diaspora/tr.yml | 7 ++++ config/locales/diaspora/zh-CN.yml | 7 ++++ config/locales/diaspora/zh-TW.yml | 33 +++++++++------ config/locales/javascript/javascript.ar.yml | 8 ++-- config/locales/javascript/javascript.fi.yml | 4 +- config/locales/javascript/javascript.nl.yml | 4 +- .../locales/javascript/javascript.zh-TW.yml | 2 +- config/locales/rails-i18n/cs.rb | 20 ++++----- 45 files changed, 386 insertions(+), 113 deletions(-) diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml index 06a080848..a76db5934 100644 --- a/config/locales/devise/devise.ko.yml +++ b/config/locales/devise/devise.ko.yml @@ -84,7 +84,7 @@ ko: sign_up: "가입하기" sign_up_closed: "공개 가입이 닫혀있습니다." mail_signup_form: - sign_up_for_an_invite: "초대받고 싶으면 이메일 주소를 등록해두세오!" + sign_up_for_an_invite: "초대받고 싶으면 이메일 주소를 등록해두세요!" unlocks: new: resend_unlock: "풀기 메일 다시 보내기" diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml index 29ec52cbb..8222fdefe 100644 --- a/config/locales/diaspora/ar.yml +++ b/config/locales/diaspora/ar.yml @@ -8,7 +8,7 @@ ar: _home: "الرئيسية" _photos: "صور" _services: "خدمات" - account: "حساب" + account: "الحساب الشخصي" activerecord: errors: models: @@ -36,7 +36,7 @@ ar: all_aspects: "كل الفئات" application: helper: - diaspora_alpha: "DIASPORA* ALPHA" + diaspora_alpha: "دياسبرا* ألفا" unknown_person: "شخص غير معروف" video_title: unknown: "عنوان فيديو غير محدد" @@ -70,7 +70,7 @@ ar: aspect_list_is_visible: "قائمة الفئة مرئية للأعضاء الآخرين في الفئة" confirm_remove_aspect: "تأكيد حذف هذه الفئة؟" done: "تم بنجاح" - make_aspect_list_visible: "تريدها فئة مرئية؟" + make_aspect_list_visible: "فئة مرئية" remove_aspect: "حذف هذه الفئة" rename: "إعادة تسمية" update: "تحديث" @@ -222,7 +222,7 @@ ar: application: have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا" powered_by: "بدعم DIASPORA*" - public_feed: "Public Diaspora Feed for %{name}" + public_feed: "فيد دياسبرا العام لـ for %{name}" toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة" whats_new: "ما الجديد؟" your_aspects: "فئاتك" @@ -231,7 +231,7 @@ ar: code: "شيفرة" login: "لُج" logout: "خروج" - profile: "الحساب الشخصي" + profile: "الصفحة الشخصية" settings: "إعدادات" likes: likes: @@ -267,6 +267,7 @@ ar: and_others: "و %{number} آخرين" mark_all_as_read: "وضع الجميع كمقروء" notifications: "تنبيهات" + liked: "أعجبه منشورك:" mentioned: "قام بذكرك في" new_request: "عرض المشاركة معك" post: "منشور" @@ -274,15 +275,19 @@ ar: request_accepted: "وافق على عرضك للمشاركة" notifier: also_commented: - commented: "أيضا على مشاركة %{post_author}:" + commented: "علق أيضا على مشاركة %{post_author}:" sign_in: "لُج لمشاهدته" - subject: "%{name} أيضا علق" + subject: "%{name} على أيضا على منشور %{post_author}." comment_on_post: commented: "علق على مشاركتك" - sign_in: "لُج لمشاهدته\"" + sign_in: "لُج لمشاهدته" subject: "%{name} علق على مشاركتك" - diaspora: "البريد الآلي لدياسبرا\"" + diaspora: "البريد الآلي لدياسبرا" hello: "مرحبا %{name}!" + liked: + liked: "%{name} أعجبه منشورك: " + sign_in: "لج لمشاهدته" + subject: "%{name} أعجبه منشورك" love: "كل الود," manage_your_email_settings: "إدارة إعدادات بريدك الإلكتروني" mentioned: @@ -310,7 +315,7 @@ ar: ok: "حسنا" or: "أو" password: "كلمة المرور" - password_confirmation: "تأكيد كلمة المرور" + password_confirmation: "تأكيد كلمة المرور الجديدة" people: add_contact_small: add_contact_from_tag: "إضافة مراسل من tag" @@ -335,10 +340,10 @@ ar: thats_you: "هذا أنت" profile_sidebar: bio: "سيرة" - born: "ولد" + born: "تاريخ الميلاد" cannot_remove: "استحالة حذف %{name} من الفئة" edit_my_profile: "تحرير صفحتي الشخصية" - gender: "جنس" + gender: "الجنس" in_aspects: "في الفئة" location: "المكان" remove_contact: "حذف العضو" @@ -413,8 +418,8 @@ ar: update_profile: "تحديث الصفحة الشخصية" your_bio: "سيرتك الشخصية" your_birthday: "تاريخ الميلاد" - your_gender: "جنسك" - your_location: "مكانك" + your_gender: "الجنس" + your_location: "المكان" your_name: "إسمك" your_photo: "صورتك" your_private_profile: "صفحتك الخاصة" @@ -484,7 +489,7 @@ ar: connect_to_twitter: "إتصل بتويتر" disconnect: "فصل الإتصال" edit_services: "تعديل الخدمات" - logged_in_as: "ولوج بـ" + logged_in_as: "متصل بحساب" really_disconnect: "فصل إتصال %{service}?" inviter: click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك" @@ -530,7 +535,7 @@ ar: make_public: "عممها" post_a_message_to: "انشر رسالة إلى %{aspect}" posting: "نشر..." - public: "عام" + public: "العالم" publishing_to: "نشر إلى: " share: "مشاركة" share_with: "مشاركة مع %{aspect}" @@ -540,6 +545,7 @@ ar: stream_element: dislike: "لم يعجبني هذا" like: "أعجبني هذا" + unlike: "إلغاء إعجابي" status_messages: create: success: "ذكرت بنجاح: %{names}" @@ -568,7 +574,7 @@ ar: destroy: "تم إغلاق الحساب بنجاح" edit: also_commented: "...علق أحدهم على منشور مراسلك" - change: "Change" + change: "تغيير" change_language: "تغيير اللعة" change_password: "تغيير كلمة المرور" close_account: "غلق الحساب" @@ -578,6 +584,7 @@ ar: download_xml: "تحميل xml خاصتي" edit_account: "تعديل الحساب" export_data: "تصدير البيانات" + liked: "...أعجب أحدهم بمنشورك" mentioned: "...تم ذكرك في رسالة" new_password: "كلمة مرور جديدة" private_message: "...وصلتك راسلة خاصة" diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml index d22d85a7e..a90fd84a3 100644 --- a/config/locales/diaspora/bg.yml +++ b/config/locales/diaspora/bg.yml @@ -267,6 +267,7 @@ bg: and_others: "и %{number} други" mark_all_as_read: "Маркиране на всички като прочетени" notifications: "Известия" + liked: "has just liked your post" mentioned: "ви спомена в" new_request: "ви предложи да споделяте." post: "публикация." @@ -283,6 +284,10 @@ bg: subject: "%{name} коментира ваша публикация." diaspora: "the diaspora email robot" hello: "Здравейте %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ bg: stream_element: dislike: "Не ми харесва" like: "Харесва ми" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ bg: download_xml: "данните ви (XML формат)" edit_account: "Редактиране на акаунта" export_data: "Сваляне на..." + liked: "...someone likes your post?" mentioned: "...бъдете споменат в публикация?" new_password: "Нова парола" private_message: "...получите лично съобщение?" diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml index e6eaa1357..6cb0e7d2b 100644 --- a/config/locales/diaspora/br.yml +++ b/config/locales/diaspora/br.yml @@ -267,6 +267,7 @@ br: and_others: "ha %{number} reoù all" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "en deus meneget ac'hanoc'h e-barzh ur skrid" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ br: subject: "%{name} has commented on your post." diaspora: "the diaspora email robot" hello: "Hello %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ br: stream_element: dislike: "Ne blij ket din" like: "Plij' ra din" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ br: download_xml: "download my xml" edit_account: "Edit account" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Ger-Kuzh Nevez" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index 13e5a6bb8..f76238153 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -123,7 +123,7 @@ cs: few: "%{count} komentáře" many: "%{count} komentářů" new_comment: - comment: "komentář" + comment: "Komentář" commenting: "Komentování..." one: "1 komentář" other: "%{count} komentářů" @@ -267,6 +267,7 @@ cs: and_others: "a %{number} dalších" mark_all_as_read: "Označit vše jako přečtené" notifications: "Oznámení" + liked: "si právě oblíbil váš příspěvek" mentioned: "vás zmínil v příspěvku" new_request: "nabídnul vám sdílení." post: "zpráva" @@ -283,6 +284,10 @@ cs: subject: "%{name} komentoval váš příspěvek." diaspora: "diaspora email robot" hello: "Vítej %{name}!" + liked: + liked: "%{name} si právě oblíbil váš příspěvek: " + sign_in: "Přihlaste se pro zobrazení" + subject: "%{name} si právě oblíbil váš příspěvek" love: "s láskou," manage_your_email_settings: "spravovat nastavení emailu" mentioned: @@ -540,6 +545,7 @@ cs: stream_element: dislike: "to se mi nelíbí" like: "to se mi líbí" + unlike: "to se mi už nelíbí" status_messages: create: success: "Úspěšně zmíněno: %{names}" @@ -578,6 +584,7 @@ cs: download_xml: "stáhnout moje xml" edit_account: "Upravit účet" export_data: "Exportovat data" + liked: "...někomu se líbí váš příspěvek?" mentioned: "...jste zmíněn v příspěvku?" new_password: "Nové heslo" private_message: "...obdržíte soukromou zprávu?" diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml index 933867708..5f7842dc3 100644 --- a/config/locales/diaspora/cy.yml +++ b/config/locales/diaspora/cy.yml @@ -267,6 +267,7 @@ cy: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ cy: subject: "%{name} has commented on your post." diaspora: "the diaspora email robot" hello: "Hello %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ cy: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ cy: download_xml: "download my xml" edit_account: "Edit account" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "New Password" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml index f12cb97c6..1940e4adc 100644 --- a/config/locales/diaspora/da.yml +++ b/config/locales/diaspora/da.yml @@ -267,6 +267,7 @@ da: and_others: "og %{number} andre" mark_all_as_read: "Marker alle som læst" notifications: "Notifikationer" + liked: "has just liked your post" mentioned: "har omtalt dig i deres" new_request: "tilbød at dele med dig." post: "indlæg" @@ -283,6 +284,10 @@ da: subject: "%{name} har kommenteret på din post!" diaspora: "Diaspora e-mail robotten" hello: "Hej %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "Hilsen," manage_your_email_settings: "rediger dine email indstillinger" mentioned: @@ -540,6 +545,7 @@ da: stream_element: dislike: "Jeg kan ikke lide det" like: "Jeg kan lide det" + unlike: "Unlike" status_messages: create: success: "%{names} nævnet med succes" @@ -578,6 +584,7 @@ da: download_xml: "Download min XML" edit_account: "Rediger konto" export_data: "Exportér data" + liked: "...someone likes your post?" mentioned: "...du er nævnt i en post?" new_password: "Ny adgangskode" private_message: "...du har modtaget en besked?" diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 485979056..769fc36d8 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -267,6 +267,7 @@ de: and_others: "und %{number} andere" mark_all_as_read: "Markiere alle als gelesen" notifications: "Benachrichtigungen" + liked: "gefällt dein Beitrag" mentioned: "hat dich erwähnt in einem" new_request: "hat angeboten mit dir zu teilen." post: "Beitrag" @@ -283,6 +284,10 @@ de: subject: "%{name} hat deinen Beitrag kommentiert." diaspora: "der Diaspora E-Mail-Roboter" hello: "Hallo %{name}!" + liked: + liked: "%{name} gefällt dein Beitrag: " + sign_in: "Melde dich an um es zu sehen" + subject: "%{name} gefällt dein Beitrag" love: "Gruß," manage_your_email_settings: "E-Mail Einstellungen" mentioned: @@ -540,6 +545,7 @@ de: stream_element: dislike: "Gefällt mir nicht" like: "Gefällt mir" + unlike: "Gefällt mir nicht mehr" status_messages: create: success: "Erfolgreich erwähnt: %{names}" @@ -578,6 +584,7 @@ de: download_xml: "Daten herunterladen (XML)" edit_account: "Konto bearbeiten" export_data: "Daten exportieren" + liked: "...wenn jemandem dein Beitrag gefällt?" mentioned: "… du in einem Beitrag erwähnt wirst?" new_password: "Neues Passwort" private_message: "… du eine private Nachricht erhältst?" diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index f07345b5e..2a4de1316 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -246,7 +246,7 @@ el: many: "Αρέσει σε %{count} άτομα" one: "Αρέσει σε 1 άτομο" other: "Αρέσει σε %{count} άτομα" - zero: "σε κανέναν δεν αρέσει" + zero: "δεν αρέσει σε κανέναν" more: "Περισσότερα" next: "επόμενο" no_results: "Δεν βρέθηκαν αποτελέσματα" @@ -267,6 +267,7 @@ el: and_others: "και %{number} άλλοι" mark_all_as_read: "Σήμανση όλων ως διαβασμένα" notifications: "Ειδοποιήσεις" + liked: "μόλις του/της άρεσε η δημοσίευση σας" mentioned: "σας ανέφερε σε" new_request: "προσφέρθηκε να μοιραστεί μαζί σας." post: "δημοσίευση." @@ -283,6 +284,10 @@ el: subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας." diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.." hello: "Γειά σου %{name}!" + liked: + liked: "στον %{name} αρέσει η δημοσίευση σας: " + sign_in: "Sign to view it" + subject: "στον %{name} αρέσει η δημοσίευση σας" love: "Με αγάπη," manage_your_email_settings: "διαχείριση των ρυθμίσεων ηλεκτρονικού ταχυδρομείου" mentioned: @@ -540,6 +545,7 @@ el: stream_element: dislike: "Δεν μ' αρέσει" like: "Μου αρέσει" + unlike: "Δεν μου αρέσει" status_messages: create: success: "Αναφέρθηκαν επιτυχώς: %{names}" @@ -578,6 +584,7 @@ el: download_xml: "κατέβασε το xml μου" edit_account: "Επεξεργασία λογαριασμού" export_data: "Εξαγωγή Δεδομένων" + liked: "...σε κάποιον αρέσει η δημοσίευση σας;" mentioned: "...επισημανθήκατε σε μία φωτογραφία?" new_password: "Νέος κωδικός πρόσβασης" private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?" diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml index 700c1c204..e841ee588 100644 --- a/config/locales/diaspora/en_shaw.yml +++ b/config/locales/diaspora/en_shaw.yml @@ -267,6 +267,7 @@ en_shaw: and_others: "𐑯 %{number} 𐑳𐑞𐑼𐑟" mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛" notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟" + liked: "has just liked your post" mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩" new_request: "𐑪𐑓𐑼𐑛 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿." post: "𐑐𐑴𐑕𐑑" @@ -283,6 +284,10 @@ en_shaw: subject: "%{name} 𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑." diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑" hello: "𐑣𐑧𐑤𐑴 %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "𐑤𐑳𐑝," manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟" mentioned: @@ -540,6 +545,7 @@ en_shaw: stream_element: dislike: "𐑲 𐑛𐑦𐑕𐑤𐑲𐑒 𐑞𐑦𐑕" like: "𐑲 𐑤𐑲𐑒 𐑞𐑦𐑕" + unlike: "Unlike" status_messages: create: success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}" @@ -578,6 +584,7 @@ en_shaw: download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤." edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑" export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩" + liked: "...someone likes your post?" mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?" new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛" private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?" diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml index 290288f68..1ff8e0526 100644 --- a/config/locales/diaspora/eo.yml +++ b/config/locales/diaspora/eo.yml @@ -267,6 +267,7 @@ eo: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ eo: subject: "%{name} has commented on your post." diaspora: "the diaspora email robot" hello: "Saluton %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ eo: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ eo: download_xml: "download my xml" edit_account: "Edit account" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "New Password" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml index 40916f602..7c22a138b 100644 --- a/config/locales/diaspora/es-CL.yml +++ b/config/locales/diaspora/es-CL.yml @@ -123,7 +123,7 @@ es-CL: few: "%{count} comentarios" many: "%{count} comentarios" new_comment: - comment: "Comentario" + comment: "Comentar" commenting: "Comentando..." one: "1 comentario" other: "%{count} comentarios" @@ -267,6 +267,7 @@ es-CL: and_others: "y otros %{number}" mark_all_as_read: "Marcar todo como leido" notifications: "Notificaciones" + liked: "le gustó tu post" mentioned: "te mencionó en un" new_request: "quiere compartir contigo." post: "post." @@ -283,6 +284,10 @@ es-CL: subject: "%{name} comentó en tu post." diaspora: "correo robot de diaspora" hello: "¡Hola %{name}!" + liked: + liked: "a %{name} le gustó tu post: " + sign_in: "Entra para verlo" + subject: "a %{name} le gustó tu post" love: "cariño," manage_your_email_settings: "maneja tus configuraciones de email" mentioned: @@ -540,6 +545,7 @@ es-CL: stream_element: dislike: "No me gusta esto" like: "Me gusta esto" + unlike: "No me gusta" status_messages: create: success: "Se ha mencionado con éxito a: %{names}" @@ -578,6 +584,7 @@ es-CL: download_xml: "descargar mi xml" edit_account: "Editar cuenta" export_data: "Exportar Datos" + liked: "...a alguien le gusta tu post?" mentioned: "...te mencionan en un post?" new_password: "Nueva Contraseña" private_message: "...recibes un mensaje privado?" diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index 12a77f035..8e7d61ee5 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -236,17 +236,17 @@ es: likes: likes: people_dislike_this: - few: "%{count} personas no les gusta esto" - many: "%{count} personas no les gusta esto" - one: "1 persona no le gusta esto" - other: "%{count} personas no les gusta esto" - zero: "a nadie le disgusta esto" + few: "A %{count} no les gusta" + many: "A %{count} no les gusta" + one: "A 1 no le gusta" + other: "A %{count} no les gusta" + zero: "A nadie le disgusta" people_like_this: - few: "%{count} personas les gusta eso" - many: "%{count} personas les gusta esto" - one: "1 persona le gusta esto" - other: "%{count} personas les gusta esto" - zero: "a nadie le gusta esto" + few: "A %{count} les gusta" + many: "A %{count} les gusta" + one: "A 1 le gusta" + other: "A %{count} les gusta" + zero: "A nadie le gusta" more: "Más" next: "Siguiente" no_results: "No hay resultados" @@ -267,6 +267,7 @@ es: and_others: "y otros %{number}" mark_all_as_read: "Marcar todo como leído" notifications: "Notificaciones" + liked: "le gustó tu publicación" mentioned: "te mencionó en una" new_request: "quisiera compartir contigo." post: "publicación." @@ -283,6 +284,10 @@ es: subject: "%{name} escribió en tu publicación." diaspora: "Email robot de Diaspora*" hello: "¡Hola %{name}!" + liked: + liked: "a %{name} le gustó tu publicación:" + sign_in: "Conéctate para poder verlo" + subject: "a %{name} le gustó tu publicación" love: "¡Qué pasa!" manage_your_email_settings: "configura tu correo" mentioned: @@ -538,8 +543,9 @@ es: reshare: reshare: "Publicar en..." stream_element: - dislike: "No me gusta esto" - like: "Me gusta esto" + dislike: "No me gusta" + like: "Me gusta" + unlike: "No me gusta" status_messages: create: success: "Se ha mencionado con éxito a: %{names}" @@ -578,6 +584,7 @@ es: download_xml: "descargar mi xml" edit_account: "Editar cuenta" export_data: "Exportar datos" + liked: "...a alguien le gusta tu publicación?" mentioned: "...eres mencionado en una publicación?" new_password: "Nueva contraseña" private_message: "...recibes un mensaje privado?" diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index 94f9160f5..b924fd010 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -123,7 +123,7 @@ eu: few: "%{count} iruzkin" many: "%{count} iruzkin" new_comment: - comment: "iruzkindu" + comment: "Iruzkindu" commenting: "Iruzkintzen..." one: "iruzkin 1" other: "%{count} iruzkin" @@ -231,22 +231,22 @@ eu: code: "kodea" login: "sartu" logout: "irten" - profile: "Profila" - settings: "Lehentasunak" + profile: "profila" + settings: "lehentasunak" likes: likes: people_dislike_this: few: "%{count} pertsonek ez dute hau gustuko" many: "%{count} pertsonek ez dute hau gustuko" - one: "pertsona batek ez du hau gustuko" + one: "%{count}ek ez du hau gustuko" other: "%{count} pertsonek ez dute hau gustuko" - zero: "gusoko ez duen pertsonarik ez dago" + zero: "gustoko ez duen pertsonarik ez" people_like_this: few: "%{count} pertsonek gustoko dute hau" many: "%{count} pertsonek gustoko dute hau" - one: "pertsona batek gustoko du hau" + one: "%{count}ek du gustoko" other: "%{count} pertsonek gustoko dute hau" - zero: "hau ez du inork gustoko" + zero: "oraindik ez du inork gustoko" more: "Gehiago" next: "hurrengoa" no_results: "Ez Da Ezer Aurkitu" @@ -267,6 +267,7 @@ eu: and_others: "eta beste %{number}(e)k" mark_all_as_read: "Guztiak irakurrita" notifications: "Jakinarazpenak" + liked: "(e)k zure mezua gustoko du" mentioned: "(e)k zu aipatu zaitu hemen:" new_request: "(e)k zurekin partekatu nahi du." post: "mezua." @@ -283,6 +284,10 @@ eu: subject: "%{name}(e)k zure mezua iruzkindu du." diaspora: "diasporaren e-posta robota" hello: "Kaixo, %{name}!" + liked: + liked: "%{name}(e)k zure mezua gustoko du:" + sign_in: "Sartu zaitez ikusteko" + subject: "%{name}(e)k zure mezua atsegin du" love: "ikusi arte," manage_your_email_settings: "kudeatu zure e-posta ezarpenak" mentioned: @@ -540,6 +545,7 @@ eu: stream_element: dislike: "Ez dut gustoko" like: "Gustoko dut" + unlike: "Ez dut gustoko" status_messages: create: success: "Arrakastaz aipatu dituzu: %{names}" @@ -578,6 +584,7 @@ eu: download_xml: "nire xml jaitsi" edit_account: "Kontua aldatu" export_data: "Datuak esportatu" + liked: "...norbaitek zure mezu bat gustoko duenean?" mentioned: "...mezu batean aipatzen zaituztenean?" new_password: "Pasahitz Berria" private_message: "...mezu pribatu bat jasotzen duzunean?" diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml index dcaaf8e2d..848b13f77 100644 --- a/config/locales/diaspora/fi.yml +++ b/config/locales/diaspora/fi.yml @@ -236,17 +236,17 @@ fi: likes: likes: people_dislike_this: - few: "%{count} people disliked this" - many: "%{count} people disliked this" - one: "1 person disliked this" + few: "%{count} ei tykkää" + many: "%{count} ei tykkää" + one: "%{count} ei tykkää" other: "%{count} people disliked this" zero: "no people disliked this" people_like_this: - few: "%{count} people liked this" - many: "%{count} ihmistä tykkää tästä" - one: "1 person liked this" - other: "%{count} people liked this" - zero: "no people liked this" + few: "%{count} tykkää" + many: "%{count} tykkää" + one: "%{count} tykkää" + other: "%{count} tykkää" + zero: "ei tykkäyksiä" more: "Lisää" next: "seuraava" no_results: "Tuloksia ei löytynyt" @@ -263,10 +263,11 @@ fi: other: "%{count} uutta ilmoitusta" zero: "ei uusia ilmoituksia" index: - and: "and" - and_others: "and %{number} others" + and: "ja" + and_others: "ja %{number} muuta" mark_all_as_read: "Merkitse kaikki luetuiksi" notifications: "Ilmoitukset" + liked: "has just liked your post" mentioned: "on maininnut sinut " new_request: "haluaa jakaa kanssasi." post: "viesti." @@ -283,6 +284,10 @@ fi: subject: "%{name} on kommentoinut viestiisi." diaspora: "Diasporan sähköpostirobotti" hello: "Hei %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "Terveisin," manage_your_email_settings: "manage your email settings" mentioned: @@ -539,7 +544,8 @@ fi: reshare: "Jaa uudelleen" stream_element: dislike: "En tykkää" - like: "Tykkään" + like: "Tykkää" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ fi: download_xml: "Lataa tiedot XML-muodossa" edit_account: "Muokkaa käyttäjätiliä" export_data: "Vie tietoja" + liked: "...someone likes your post?" mentioned: "...sinut mainitaan viestissä?" new_password: "Uusi salasana" private_message: "...saat uuden viestin?" diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml index cf805386a..348bc2dd6 100644 --- a/config/locales/diaspora/fr.yml +++ b/config/locales/diaspora/fr.yml @@ -267,6 +267,7 @@ fr: and_others: "et %{number} autres" mark_all_as_read: "Tout marquer comme lu" notifications: "Notifications" + liked: "has just liked your post" mentioned: "vous a mentionné(e) dans un" new_request: "a proposé de partager avec vous." post: "message." @@ -283,6 +284,10 @@ fr: subject: "%{name} a commenté votre message." diaspora: "le robot de messagerie électronique de Diaspora" hello: "Bonjour %{name} !" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "affectueusement," manage_your_email_settings: "modifier vos paramètres de courriel" mentioned: @@ -540,6 +545,7 @@ fr: stream_element: dislike: "Je n'aime pas" like: "J'aime" + unlike: "Unlike" status_messages: create: success: "Mention de : %{names}" @@ -578,6 +584,7 @@ fr: download_xml: "télécharger mon XML" edit_account: "Modifier le compte" export_data: "Exporter des données" + liked: "...someone likes your post?" mentioned: "…vous êtes mentionné(e) dans une publication ?" new_password: "Nouveau mot de passe" private_message: "…vous recevez un message privé ?" diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml index 8aa68b4e0..96837ee7b 100644 --- a/config/locales/diaspora/ga.yml +++ b/config/locales/diaspora/ga.yml @@ -267,6 +267,7 @@ ga: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Fograí" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "ofráiladh chun roint leant" post: "póst" @@ -283,6 +284,10 @@ ga: subject: "%{name} has commented on your post." diaspora: "an róbat ríomhpost diaspora" hello: "Haileo %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "le meas," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ ga: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ ga: download_xml: "íoslódáil mo xml" edit_account: "Athraigh cúntas" export_data: "Easpórtáil Sonraí" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Pasfhocal nua" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml index 21901896f..4916d3655 100644 --- a/config/locales/diaspora/he.yml +++ b/config/locales/diaspora/he.yml @@ -267,6 +267,7 @@ he: and_others: "ו־%{number} אחרים" mark_all_as_read: "סימון הכול כלאחר קריאה" notifications: "התרעות" + liked: "has just liked your post" mentioned: "הזכיר/ה אותך ב" new_request: "הציע/ה לשתף אתך." post: "רשומה." @@ -283,6 +284,10 @@ he: subject: "%{name} הגיב/ה על הרשומה שלך." diaspora: "רובוט הדוא״ל של דיאספורה" hello: "שלום %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "באהבה," manage_your_email_settings: "ניהול הגדרות הדוא״ל שלך" mentioned: @@ -540,6 +545,7 @@ he: stream_element: dislike: "לא אהבתי את זה" like: "אהבתי" + unlike: "Unlike" status_messages: create: success: "אוזכרו בהצלחה: %{names}" @@ -578,6 +584,7 @@ he: download_xml: "הורדת ה־xml שלי" edit_account: "עריכת החשבון" export_data: "יצוא הנתונים" + liked: "...someone likes your post?" mentioned: "...מישהו הזכיר אותך ברשומה?" new_password: "ססמה חדשה" private_message: "...קיבלת הודעה פרטית?" diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml index c3ccf6de8..6aa3c5bca 100644 --- a/config/locales/diaspora/hu.yml +++ b/config/locales/diaspora/hu.yml @@ -267,6 +267,7 @@ hu: and_others: "és %{number} másik" mark_all_as_read: "Mind megjelölése olvasottként" notifications: "Értesítések" + liked: "has just liked your post" mentioned: "megemlített téged egy" new_request: "megosztást ajánlott neked." post: "bejegyzésben." @@ -283,6 +284,10 @@ hu: subject: "%{name} hozzászólt a bejegyzésedhez." diaspora: "A diaspora email robot" hello: "Szia %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "Szeretettel," manage_your_email_settings: "Kezeld az email beállításaidat" mentioned: @@ -540,6 +545,7 @@ hu: stream_element: dislike: "Nem tetszik" like: "Tetszik" + unlike: "Unlike" status_messages: create: success: "Megemlítetted: %{names}" @@ -578,6 +584,7 @@ hu: download_xml: "Saját XML letöltése" edit_account: "Fiók szerkesztése" export_data: "Adatok exportálása" + liked: "...someone likes your post?" mentioned: "...meg vagy említve egy bejegyzésben?" new_password: "Új jelszó" private_message: "...privát üzenetet kaptál?" diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml index 5484c5235..f771ab664 100644 --- a/config/locales/diaspora/id.yml +++ b/config/locales/diaspora/id.yml @@ -267,6 +267,7 @@ id: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ id: subject: "%{name} has commented on your post." diaspora: "the diaspora email robot" hello: "Hello %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ id: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ id: download_xml: "download my xml" edit_account: "Edit account" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "New Password" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml index 739d70511..2850c7cc4 100644 --- a/config/locales/diaspora/is.yml +++ b/config/locales/diaspora/is.yml @@ -267,6 +267,7 @@ is: and_others: "and %{number} others" mark_all_as_read: "Merkja allt sem lesið" notifications: "Tilkynningar" + liked: "has just liked your post" mentioned: "hefur getið þín í þeirra" new_request: "bauð þér samnýtingu." post: "setja inn" @@ -283,6 +284,10 @@ is: subject: "%{name} hefur gert atugasemd við þína færslu." diaspora: "the diaspora email robot" hello: "Halló %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "ást," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ is: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ is: download_xml: "download my xml" edit_account: "Breyta notandastillingum" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Nýtt lykilorð" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index e75f09d5b..3f6ce297c 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -267,6 +267,7 @@ it: and_others: "e altri %{number}" mark_all_as_read: "Segna Tutti come Letti" notifications: "Notifiche" + liked: "has just liked your post" mentioned: "ti ha menzionato in un " new_request: "vuole condividere con te." post: "post." @@ -283,6 +284,10 @@ it: subject: "%{name} ha commentato il tuo post." diaspora: "l'email robot di diaspora" hello: "Ciao %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "amore," manage_your_email_settings: "gestisci le tue impostazioni email" mentioned: @@ -540,6 +545,7 @@ it: stream_element: dislike: "Non mi piace" like: "Mi piace" + unlike: "Unlike" status_messages: create: success: "Menzionati con successo: %{names}" @@ -578,6 +584,7 @@ it: download_xml: "scarica il mio xml" edit_account: "Modifica account" export_data: "Esporta Dati" + liked: "...someone likes your post?" mentioned: "...sei menzionato in un post?" new_password: "Nuova Password" private_message: "...hai ricevuto un messaggio privato?" diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml index 6700c141d..c057ce3ca 100644 --- a/config/locales/diaspora/ja.yml +++ b/config/locales/diaspora/ja.yml @@ -267,6 +267,7 @@ ja: and_others: "他%{number}件" mark_all_as_read: "全件を既読にする" notifications: "通知" + liked: "has just liked your post" mentioned: "さんはあなたをメンションしました。" new_request: "さんは共有の許可を求めました。" post: "（投稿で）" @@ -283,6 +284,10 @@ ja: subject: "%{name}は投稿にコメントしました。" diaspora: "ダイアスポラ＊メールロボット" hello: "%{name}さん、こんにちは！" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "それでは、" manage_your_email_settings: "メール設定を管理する" mentioned: @@ -540,6 +545,7 @@ ja: stream_element: dislike: "これ嫌い！" like: "これ好き！" + unlike: "Unlike" status_messages: create: success: "%{names}を参照するのに成功しました。" @@ -578,6 +584,7 @@ ja: download_xml: "XMLをダウンロードする" edit_account: "アカウント編集" export_data: "データ出力" + liked: "...someone likes your post?" mentioned: "投稿に自分がメンションされたとき" new_password: "新しいパスワード" private_message: "非公開メッセージが届いたとき" diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml index 5485fadfc..59163bbc6 100644 --- a/config/locales/diaspora/ko.yml +++ b/config/locales/diaspora/ko.yml @@ -186,7 +186,7 @@ ko: show: already_account: "이미 계정을 가지고 있습니까?" choice: "선택" - choice_explanation: "디아스포라에서는 애스펙이라는 모둠으로 관계를 관리합니다. 디아스포라만의 독특함인 애스펙은 나의 사진, 이야기, 농담이 내가 의도한 사람들과만 공유되도록 보장합니다." + choice_explanation: "디아스포라에서는 애스펙이라는 그룹으로 관계를 관리합니다. 디아스포라만의 독특함인 애스펙은 나의 사진, 이야기, 농담이 내가 의도한 사람들과만 공유되도록 보장합니다." learn_about_host: "디아스포라 서버를 직접 운영하는 방법" login_here: "로그인" ownership: "소유권" @@ -267,6 +267,7 @@ ko: and_others: "나머지 %{number}개" mark_all_as_read: "모두 읽음으로 표시" notifications: "알림" + liked: "님이 내 공유물을 좋아합니다" mentioned: " 님이 귀하를 멘션하였습니다." new_request: " 님이 공유를 요청하였습니다." post: "공유물" @@ -283,6 +284,10 @@ ko: subject: "%{name} 님이 귀하의 공유물에 댓글을 달았습니다." diaspora: "디아스포라 자동 이메일" hello: "%{name} 님!" + liked: + liked: "%{name} 님이 내 공유물을 좋아합니다:" + sign_in: "Sign to view it" + subject: "%{name} 님이 내 공유물을 좋아합니다." love: "" manage_your_email_settings: "이메일 설정 관리" mentioned: @@ -540,6 +545,7 @@ ko: stream_element: dislike: "싪어요" like: "좋아요" + unlike: "좋아요 취소" status_messages: create: success: "%{names} 님을 성공적으로 멘션했습니다." @@ -578,6 +584,7 @@ ko: download_xml: "내 xml 다운로드" edit_account: "계정 고치기" export_data: "자료 뽑아내기" + liked: "누군가가 내 공유물을 좋아할 때" mentioned: "내가 멘션되었을 때" new_password: "새 암호" private_message: "쪽지를 받았을 때" diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml index e4e4e3e57..10c4de90f 100644 --- a/config/locales/diaspora/lt.yml +++ b/config/locales/diaspora/lt.yml @@ -267,6 +267,7 @@ lt: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ lt: subject: "%{name} has commented on your post." diaspora: "Diasporos pašto robotas" hello: "Labas, %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "su meile," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ lt: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ lt: download_xml: "atsisiųsti mano duomenis xml formatu" edit_account: "Edit account" export_data: "Eksportuoti duomenis" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Naujas slaptažodis" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml index 88ac70896..b584d442d 100644 --- a/config/locales/diaspora/mk.yml +++ b/config/locales/diaspora/mk.yml @@ -267,6 +267,7 @@ mk: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ mk: subject: "%{name} has commented on your post." diaspora: "diaspora е-маил робот" hello: "Здраво %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "со љубов," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ mk: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ mk: download_xml: "симни го мојот xml" edit_account: "Edit account" export_data: "Изнеси податоци" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Нова лозинка" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml index bf4be313e..2e1f7bb31 100644 --- a/config/locales/diaspora/nb.yml +++ b/config/locales/diaspora/nb.yml @@ -267,6 +267,7 @@ nb: and_others: "og %{number} andre" mark_all_as_read: "Merk alle som leste" notifications: "Varsler" + liked: "has just liked your post" mentioned: "har nevnt deg i sin" new_request: "spør om å få dele med deg." post: "innlegg" @@ -283,6 +284,10 @@ nb: subject: "%{name} har kommentert på ditt innlegg." diaspora: "diasporas epostrobot" hello: "Hei %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "vennlig hilsen," manage_your_email_settings: "administrer e-postinnstillingene" mentioned: @@ -538,8 +543,9 @@ nb: reshare: reshare: "Del på nytt" stream_element: - dislike: "Jeg misliker dette" - like: "Jeg liker dette" + dislike: "Liker ikke" + like: "Liker" + unlike: "Unlike" status_messages: create: success: "Nevnte :%{navn}" @@ -578,6 +584,7 @@ nb: download_xml: "last ned min xml" edit_account: "Endre konto" export_data: "Eksporter Data" + liked: "...someone likes your post?" mentioned: " du nevnes i et innlegg?" new_password: "Nytt Passord" private_message: " du mottar en privat melding?" diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml index b123007e2..47a033a84 100644 --- a/config/locales/diaspora/nl.yml +++ b/config/locales/diaspora/nl.yml @@ -123,7 +123,7 @@ nl: few: "%{count} reacties" many: "%{count} reacties" new_comment: - comment: "reactie" + comment: "Reactie" commenting: "Reageren..." one: "1 reactie" other: "%{count} reacties" @@ -236,23 +236,23 @@ nl: likes: likes: people_dislike_this: - few: "%{count} personen vinden dit niet leuk" - many: "%{count} personen vinden dit niet leuk" - one: "1 persoon vindt dit niet leuk" - other: "%{count} personen vinden dit niet leuk" + few: "%{count} mensen vinden dit niet leuk" + many: "%{count} mensen vinden dit niet leuk" + one: "%{count} persoon vindt dit niet leuk" + other: "%{count} mensen vinden dit niet leuk" zero: "niemand vindt dit niet leuk" people_like_this: - few: "%{count} personen vinden dit leuk" - many: "%{count} personen vinden dit leuk" - one: "1 persoon vindt dit leuk" - other: "%{count} personen vinden dit leuk" + few: "%{count} mensen vinden dit leuk" + many: "%{count} mensen vinden dit leuk" + one: "%{count} persoon vindt dit leuk" + other: "%{count} mensen vinden dit leuk" zero: "niemand vindt dit leuk" more: "Meer" next: "volgende" no_results: "Geen resultaten gevonden" notifications: also_commented: "heeft ook gereageerd %{post_author}'s" - also_commented_deleted: "reageerde op een verwijderde post" + also_commented_deleted: "reageerde op een verwijderde post." comment_on_post: "reageerde op jouw" deleted: "verwijderde" helper: @@ -267,9 +267,10 @@ nl: and_others: "en %{number} anderen" mark_all_as_read: "Markeer alles gelezen" notifications: "Notificaties" - mentioned: "heeft je genoemd in een post" + liked: "vind je post leuk" + mentioned: "heeft je genoemd in een" new_request: "bood aan om met jou te delen." - post: "post" + post: "post." private_message: "heeft je een bericht gestuurd." request_accepted: "heeft je verzoek geaccepteerd." notifier: @@ -283,6 +284,10 @@ nl: subject: "%{name} heeft op jouw post gereageerd." diaspora: "de diaspora email robot" hello: "Hoi %{name}!" + liked: + liked: "%{name} vind je post leuk: " + sign_in: "Sign to view it" + subject: "%{name} vind jou post leuk" love: "liefs," manage_your_email_settings: "beheer je e-mail instellingen" mentioned: @@ -538,8 +543,9 @@ nl: reshare: reshare: "Herdeel" stream_element: - dislike: "Ik vind dit niet leuk" - like: "Ik vind dit leuk" + dislike: "Vind ik niet meer leuk" + like: "Vind ik leuk" + unlike: "vind ik niet meer leuk" status_messages: create: success: "Succesvol genoemd: %{names}" @@ -578,6 +584,7 @@ nl: download_xml: "download mijn xml" edit_account: "Bewerk account" export_data: "Exporteer data" + liked: "... iemand je post leuk vind?" mentioned: "...je genoemd word in een post?" new_password: "Nieuw wachtwoord" private_message: "...je een privébericht ontvangt?" diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml index 1c2cf8fb5..40f69f57a 100644 --- a/config/locales/diaspora/pa.yml +++ b/config/locales/diaspora/pa.yml @@ -267,6 +267,7 @@ pa: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "ਪੋਸਟ" @@ -283,6 +284,10 @@ pa: subject: "%{name} has commented on your post." diaspora: "the diaspora email robot" hello: "ਹੈਲੋ %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ pa: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ pa: download_xml: "download my xml" edit_account: "Edit account" export_data: "Export Data" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "New Password" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index d138878d0..307592642 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -267,6 +267,7 @@ pl: and_others: "i %{number} innych" mark_all_as_read: "Oznacz wszystkie jako przeczytane" notifications: "Powiadomienia" + liked: "has just liked your post" mentioned: "wspomniał o tobie we wpisie" new_request: "chce zostać twoim znajomym." post: "wpis" @@ -283,6 +284,10 @@ pl: subject: "Użytkownik %{name} skomentował Twój wpis." diaspora: "robot e-mailowy diaspory" hello: "Cześć %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "uściski," manage_your_email_settings: "zarządzaj ustawieniami emaila" mentioned: @@ -540,6 +545,7 @@ pl: stream_element: dislike: "Nie lubię tego" like: "Lubię to" + unlike: "Unlike" status_messages: create: success: "Pomyślnie wspomniano o: %{names}" @@ -578,6 +584,7 @@ pl: download_xml: "pobierz mój xml" edit_account: "Edytuj konto" export_data: "Eksportowanie danych" + liked: "...someone likes your post?" mentioned: "...zostałeś wspomniany(a) we wpisie?" new_password: "Nowe hasło" private_message: "...otrzymasz prywatną wiadomość?" diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index 9511ebff4..642834bea 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -267,6 +267,7 @@ pt-BR: and_others: "and %{number} others" mark_all_as_read: "Marcar Tudo como Lido" notifications: "Notificações" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "deseja partilhar com você." post: "post" @@ -283,6 +284,10 @@ pt-BR: subject: "%{name} comentou sua postagem." diaspora: "o robô de email da Diaspora*" hello: "Olá, %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "Com carinho," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ pt-BR: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ pt-BR: download_xml: "Baixar meu XML" edit_account: "Alterar conta" export_data: "Exportar dados" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Nova Senha" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 641419bbb..d7438a7b5 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -267,6 +267,7 @@ pt-PT: and_others: "e %{number} outros" mark_all_as_read: "Marcar Tudo como Lido" notifications: "Notificações" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "deseja partilhar consigo." post: "post" @@ -283,6 +284,10 @@ pt-PT: subject: "%{name} comentou no seu post." diaspora: "o robot de email do diaspora" hello: "Olá %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "com carinho," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ pt-PT: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ pt-PT: download_xml: "descarregar o meu xml" edit_account: "Editar conta" export_data: "Exportar Dados" + liked: "...someone likes your post?" mentioned: "...você é mencionado num post?" new_password: "Nova Palavra-chave" private_message: "...você recebe uma mensagem privada?" diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml index 9e46661f8..bc5eead37 100644 --- a/config/locales/diaspora/ro.yml +++ b/config/locales/diaspora/ro.yml @@ -267,6 +267,7 @@ ro: and_others: "and %{number} others" mark_all_as_read: "Marchează-le pe toate ca citite" notifications: "Notificări" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ ro: subject: "%{name} has commented on your post." diaspora: "robotul e-mail Diaspora" hello: "Bună %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "cu dragoste," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ ro: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ ro: download_xml: "descarcă datele mele (xml)" edit_account: "Edit account" export_data: "Exportare de date" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Parolă nouă" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index 1e108b2be..a0e51a30a 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -123,7 +123,7 @@ ru: few: "%{count} комментариев" many: "%{count} комментариев" new_comment: - comment: "комментировать" + comment: "комментарий" commenting: "Комментирование ..." one: "1 комментарий" other: "%{count} комментариев" @@ -236,17 +236,17 @@ ru: likes: likes: people_dislike_this: - few: "%{count} персонам не понравилось" - many: "%{count} персонам не понравилось" - one: "1 пользователю это не понравилось" - other: "%{count} пользователям это не понравилось " - zero: "это никому не понравилось " + few: "%{count} не понравилось" + many: "%{count} не понравилось" + one: "%{count} не понравилось" + other: "%{count} не понравилось " + zero: "никому не понравилось" people_like_this: - few: "%{count} персонам это понравилось" - many: "%{count} персонам это понравилось" - one: "1 человеку это понравилось" - other: "%{count} персонам это понравилось" - zero: "это никому не понравилось" + few: "%{count} понравилось" + many: "%{count} понравилось" + one: "%{count} понравилось" + other: "%{count} понравилось" + zero: "никому не понравилось" more: "Подробнее" next: "далее" no_results: "Результатов не найдено" @@ -267,6 +267,7 @@ ru: and_others: "и %{number} других" mark_all_as_read: "Отметить все как прочитанные" notifications: "Уведомления" + liked: "понравилось Ваше сообщение" mentioned: "упомянул вас в" new_request: "предлагает поделиться с вами." post: "сообщение." @@ -283,6 +284,10 @@ ru: subject: "%{name} прокомментировал ваше сообщение." diaspora: "почтовый робот Диаспоры" hello: "Привет %{name}!" + liked: + liked: "%{name} понравилось Ваше сообщение:" + sign_in: "Войдите в систему, чтобы увидеть это" + subject: "%{name} понравилось Ваше сообщение" love: "С уважением," manage_your_email_settings: "администрировать настройки электронной почты" mentioned: @@ -538,8 +543,9 @@ ru: reshare: reshare: "Поделиться повторно" stream_element: - dislike: "Мне это не нравится" - like: "Мне это нравится " + dislike: "Не нравится" + like: "Нравится" + unlike: "В отличие от" status_messages: create: success: "Успешно упомянут: %{names}" @@ -578,6 +584,7 @@ ru: download_xml: "Скачать мою информацию в xml" edit_account: "Редактировать аккаунт" export_data: "Экспорт информации" + liked: "... кому-нибудь нравится ваше сообщение?" mentioned: "... Вы упомянуты в сообщении?" new_password: "Новый пароль" private_message: "... Вы получаете личное сообщение?" diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index 0254aca0b..f818d3827 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -267,6 +267,7 @@ sk: and_others: "and %{number} others" mark_all_as_read: "Všetko označiť ako prečítané" notifications: "Notifikácie" + liked: "has just liked your post" mentioned: "ťa spomenuli v ich" new_request: "offered to share with you." post: "príspevok" @@ -283,6 +284,10 @@ sk: subject: "Užívateľ %{name} komentoval Váš príspevok." diaspora: "e-mail robot Diaspory" hello: "Ahoj %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "miluje," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ sk: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ sk: download_xml: "stiahnuť moje xml" edit_account: "Upraviť účet" export_data: "Exportovať dáta" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Nové heslo" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml index 1cb1d22d3..f1c949776 100644 --- a/config/locales/diaspora/sl.yml +++ b/config/locales/diaspora/sl.yml @@ -267,6 +267,7 @@ sl: and_others: "and %{number} others" mark_all_as_read: "Označi vse kot prebrano" notifications: "Sporočila" + liked: "has just liked your post" mentioned: "bili ste omenjeni v objavi" new_request: "nekdo želi deliti z vami." post: "prispevek" @@ -283,6 +284,10 @@ sl: subject: "Oseba %{name} je komentirala vašo objavo." diaspora: "diaspora email robot" hello: "Pozdravljeni %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "vas pozdravlja," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ sl: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ sl: download_xml: "prenesi v xml" edit_account: "Uredi uporabniški račun" export_data: "Izvozi podatke" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Novo geslo" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 5aba71c97..557f01ffc 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -267,6 +267,7 @@ sv: and_others: "och %{number} andra" mark_all_as_read: "Markera alla som läst" notifications: "Notifieringar" + liked: "has just liked your post" mentioned: "har nämnt dig i deras" new_request: "erbjöd sig att dela med dig." post: "meddelande" @@ -283,6 +284,10 @@ sv: subject: "%{name} har kommenterat ditt inlägg." diaspora: "Diasporas mailrobot" hello: "Hej %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "hälsningar," manage_your_email_settings: "administrera dina epost-inställningar" mentioned: @@ -540,6 +545,7 @@ sv: stream_element: dislike: "Jag ogillar dethär" like: "Jag gillar dethär" + unlike: "Unlike" status_messages: create: success: "Lyckades omnämna: %{names}" @@ -578,6 +584,7 @@ sv: download_xml: "Ladda ner min xml" edit_account: "Ändra konto" export_data: "Exportera data" + liked: "...someone likes your post?" mentioned: "...du är omnämnd i en post?" new_password: "Nytt lösenord" private_message: "...du mottar ett privat meddelande?" diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index c2d58bce1..777191fa4 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -267,6 +267,7 @@ tr: and_others: "and %{number} others" mark_all_as_read: "Mark All as Read" notifications: "Notifications" + liked: "has just liked your post" mentioned: "has mentioned you in their" new_request: "offered to share with you." post: "post" @@ -283,6 +284,10 @@ tr: subject: "%{name} has commented on your post." diaspora: "Diaspora e-posta robotu" hello: "Merhaba %{name}!" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -540,6 +545,7 @@ tr: stream_element: dislike: "I dislike this" like: "I like this" + unlike: "Unlike" status_messages: create: success: "Successfully mentioned: %{names}" @@ -578,6 +584,7 @@ tr: download_xml: "xml dosyamı kaydet" edit_account: "Edit account" export_data: "Bilgilerimi Dışarı taşı" + liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" new_password: "Yeni Şifre" private_message: "...you receive a private message?" diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml index 2103b78a6..246ef565e 100644 --- a/config/locales/diaspora/zh-CN.yml +++ b/config/locales/diaspora/zh-CN.yml @@ -267,6 +267,7 @@ zh-CN: and_others: "和其他%{number}个人" mark_all_as_read: "全部标示为已读" notifications: "消息" + liked: "has just liked your post" mentioned: "在他发布的内容中提到了你" new_request: "想要与您分享。" post: "日志。" @@ -283,6 +284,10 @@ zh-CN: subject: "%{name} 评论了您发布的内容。" diaspora: "diaspora邮件机器人" hello: "您好 %{name}！" + liked: + liked: "%{name} has just liked your post: " + sign_in: "Sign to view it" + subject: "%{name} has just liked your post" love: "衷心祝福，" manage_your_email_settings: "管理邮件设置" mentioned: @@ -540,6 +545,7 @@ zh-CN: stream_element: dislike: "不喜欢" like: "喜欢" + unlike: "Unlike" status_messages: create: success: "成功推荐了: %{names}" @@ -578,6 +584,7 @@ zh-CN: download_xml: "下载我的 xml" edit_account: "编辑帐号" export_data: "资料导出" + liked: "...someone likes your post?" mentioned: "……当贴文中提到您时？" new_password: "新密码" private_message: "……当收到私人信息时？" diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index c70cfc523..508ee7745 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -36,7 +36,7 @@ zh-TW: all_aspects: "所有面向" application: helper: - diaspora_alpha: "DIASPORA* ALPHA" + diaspora_alpha: "DIASPORA* 預覽版" unknown_person: "不明聯絡人" video_title: unknown: "影片標題不明" @@ -236,23 +236,23 @@ zh-TW: likes: likes: people_dislike_this: - few: "有%{count}個人說遜" - many: "有%{count}個人說遜" - one: "有1個人說遜" - other: "有%{count}個人說遜" - zero: "沒有人說遜" + few: "有%{count}個遜" + many: "有%{count}個遜" + one: "有%{count}個遜" + other: "有%{count}個遜" + zero: "沒有遜" people_like_this: - few: "有%{count}個人說讚" - many: "有%{count}個人說讚" - one: "有1個人說讚" - other: "有%{count}個人說讚" - zero: "沒有人說讚" + few: "有%{count}個讚" + many: "有%{count}個讚" + one: "有%{count}個讚" + other: "有%{count}個讚" + zero: "沒有讚" more: "更多" next: "後面" no_results: "搜尋沒有結果" notifications: also_commented: "也在別處發表了意見, 在 %{post_author} 的" - also_commented_deleted: "對已刪除的貼文發表意見" + also_commented_deleted: "對已刪除的貼文發表意見." comment_on_post: "發表了意見, 在你的" deleted: "已刪除" helper: @@ -267,9 +267,10 @@ zh-TW: and_others: "和其他%{number}個人" mark_all_as_read: "全部標示為已讀" notifications: "消息" + liked: "剛剛對你的貼文說讚" mentioned: "在貼文中提到了你" new_request: "想要跟你分享." - post: "貼文" + post: "貼文." private_message: "寫了一則訊息給你." request_accepted: "已同意和你分享." notifier: @@ -283,6 +284,10 @@ zh-TW: subject: "%{name} 對你的貼文發表意見." diaspora: "diaspora 電郵機器人" hello: "%{name}你好!" + liked: + liked: "%{name}剛剛說你的貼文讚: " + sign_in: "登入來看看" + subject: "%{name}剛剛說你的貼文讚" love: "衷心祝福," manage_your_email_settings: "管理電郵設定" mentioned: @@ -540,6 +545,7 @@ zh-TW: stream_element: dislike: "遜" like: "讚" + unlike: "收回讚" status_messages: create: success: "成功推薦了: %{names}" @@ -578,6 +584,7 @@ zh-TW: download_xml: "下載我的 xml" edit_account: "編輯帳號" export_data: "資料匯出" + liked: "...有人對你的貼文說讚時?" mentioned: "...當貼文中提到你時?" new_password: "新的密碼" private_message: "...當收到私人訊息時?" diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml index 5495b261e..1f546f8ba 100644 --- a/config/locales/javascript/javascript.ar.yml +++ b/config/locales/javascript/javascript.ar.yml @@ -23,9 +23,9 @@ ar: minutes: "منذ %d دقائق" month: "منذ شهر" months: "منذ %d شهور" - prefixAgo: "منذ" - prefixFromNow: "منذ الآن" - seconds: "منذ أقل من دقيقة" + prefixAgo: "" + prefixFromNow: "من الآن" + seconds: "منذ ثواني" suffixAgo: "" suffixFromNow: "" year: "منذ عام" @@ -34,4 +34,4 @@ ar: unknown: "نوع فيديو غير معروف" watch: "مشاهدة هذا الفيديو عبر {{provider}}" web_sockets: - disconnected: "The websocket is closed; posts will no longer be streamed live." + disconnected: "الـ websocket مغلق; الرسائل لن تنشر بعد الآن" diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml index 9e2aaf553..d251057f3 100644 --- a/config/locales/javascript/javascript.fi.yml +++ b/config/locales/javascript/javascript.fi.yml @@ -7,9 +7,9 @@ fi: javascripts: confirm_dialog: "Oletko varma?" infinite_scroll: - no_more: "No more posts." + no_more: "Ei enempää viestejä." publisher: - at_least_one_aspect: "You must publish to at least one aspect" + at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle." search_for: "Etsi nimellä {{name}}" shared: contact_list: diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml index f8a4f01dc..78361cc09 100644 --- a/config/locales/javascript/javascript.nl.yml +++ b/config/locales/javascript/javascript.nl.yml @@ -7,7 +7,7 @@ nl: javascripts: confirm_dialog: "Weet je het zeker?" infinite_scroll: - no_more: "No more posts." + no_more: "Geen posts meer." publisher: at_least_one_aspect: "Je moet op zijn minst één aspect publiceren" search_for: "Zoek naar {{name}}" @@ -34,4 +34,4 @@ nl: unknown: "Onbekend video type" watch: "Bekijk deze video op {{provider}}" web_sockets: - disconnected: "The websocket is closed; posts will no longer be streamed live." + disconnected: "De websocket is gesloten; posts worden niet langer live gestreamd." diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index 01c27fd3f..0a17e0656 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -34,4 +34,4 @@ zh-TW: unknown: "不明的影片類別" watch: "從 {{provider}} 看這部影片" web_sockets: - disconnected: "The websocket is closed; posts will no longer be streamed live." + disconnected: "Websocket 已斷線; 貼文不會再即時更新了." diff --git a/config/locales/rails-i18n/cs.rb b/config/locales/rails-i18n/cs.rb index 8218b34a2..d36394d33 100644 --- a/config/locales/rails-i18n/cs.rb +++ b/config/locales/rails-i18n/cs.rb @@ -11,10 +11,10 @@ unless defined?(CzechLocaleI18n::ERROR_MESSAGES) :invalid => "není platná hodnota", :confirmation => "nebylo potvrzeno", :accepted => "musí být potvrzeno", - :empty => "nesmí být prázdný/é", + :empty => "nesmí být prázdný/á/é", :blank => "je povinná položka", # alternate formulation: "is required" - :too_long => "je příliš dlouhá/ý (max. %{count} znaků)", - :too_short => "je příliš krátký/á (min. %{count} znaků)", + :too_long => "je příliš dlouhý/á/é (max. %{count} znaků)", + :too_short => "je příliš krátký/á/é (min. %{count} znaků)", :wrong_length => "nemá správnou délku (očekáváno %{count} znaků)", :not_a_number => "není číslo", :greater_than => "musí být větší než %{count}", @@ -143,16 +143,16 @@ end :distance_in_words => { :half_a_minute => 'půl minutou', :less_than_x_seconds => { - :one => 'asi před sekundou', - :other => 'asi před %{count} sekundami' + :one => 'necelou sekundou', + :other => 'ani ne %{count} sekundami' }, :x_seconds => { :one => 'sekundou', :other => '%{count} sekundami' }, :less_than_x_minutes => { - :one => 'před necelou minutou', - :other => 'před ani ne %{count} minutami' + :one => 'necelou minutou', + :other => 'ani ne %{count} minutami' }, :x_minutes => { :one => 'minutou', @@ -179,12 +179,12 @@ end :other => 'asi %{count} roky' }, :over_x_years => { - :one => 'více než před rokem', + :one => 'více než rokem', :other => 'více než %{count} roky' }, :almost_x_years => { - :one => 'téměř před rokem', - :other => 'téměř před %{count} roky' + :one => 'téměř rokem', + :other => 'téměř %{count} roky' } } }, From a46ff394b12304988a697999b68b52c1db7a245c Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Thu, 12 May 2011 14:46:19 -0700 Subject: [PATCH 04/38] update devise_invitable and devise --- Gemfile | 4 +-- Gemfile.lock | 25 ++++++++----------- app/models/invitation.rb | 3 ++- ...haml => invitation_instructions.html.haml} | 0 config/locales/devise/devise.en.yml | 2 +- spec/models/invitation_spec.rb | 4 +-- 6 files changed, 18 insertions(+), 20 deletions(-) rename app/views/devise/mailer/{invitation.html.haml => invitation_instructions.html.haml} (100%) diff --git a/Gemfile b/Gemfile index a92a25eca..cb6d11592 100644 --- a/Gemfile +++ b/Gemfile @@ -11,8 +11,8 @@ gem 'ohai', '0.5.8', :require => false #Chef dependency gem 'nokogiri', '1.4.3.1' #Security -gem 'devise', '1.1.3' -gem 'devise_invitable', :git => 'git://github.com/zhitomirskiyi/devise_invitable.git', :branch => '0.3.5' +gem 'devise', '1.3.1' +gem 'devise_invitable', '0.5.0' #Authentication gem 'omniauth', '0.1.6' diff --git a/Gemfile.lock b/Gemfile.lock index be193e65b..1312cdc57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,14 +50,6 @@ GIT multi_xml (~> 0.2.0) simple_oauth (~> 0.1.2) -GIT - remote: git://github.com/zhitomirskiyi/devise_invitable.git - revision: 85abb5fef4ab4f74db818ed3d8104c2f7d24b94e - branch: 0.3.5 - specs: - devise_invitable (0.3.5) - devise (~> 1.1.0) - PATH remote: vendor/gems/jasmine specs: @@ -166,9 +158,13 @@ GEM culerity (0.2.15) daemons (1.1.2) database_cleaner (0.6.0) - devise (1.1.3) + devise (1.3.1) bcrypt-ruby (~> 2.1.2) - warden (~> 0.10.7) + orm_adapter (~> 0.0.3) + warden (~> 1.0.3) + devise_invitable (0.5.0) + devise (~> 1.3.1) + rails (>= 3.0.0, <= 3.2) diff-lcs (1.1.2) erubis (2.6.6) abstract (>= 1.0.0) @@ -301,6 +297,7 @@ GEM oa-oauth (= 0.1.6) oa-openid (= 0.1.6) open4 (1.0.1) + orm_adapter (0.0.5) polyglot (0.3.1) pyu-ruby-sasl (0.0.3.2) rack (1.2.2) @@ -391,8 +388,8 @@ GEM uuidtools (2.1.2) vegas (0.1.8) rack (>= 1.0.0) - warden (0.10.7) - rack (>= 1.0.0) + warden (1.0.4) + rack (>= 1.0) webmock (1.6.2) addressable (>= 2.2.2) crack (>= 0.1.7) @@ -418,8 +415,8 @@ DEPENDENCIES cloudfiles (= 1.4.10) cucumber-rails (= 0.3.2) database_cleaner (= 0.6.0) - devise (= 1.1.3) - devise_invitable! + devise (= 1.3.1) + devise_invitable (= 0.5.0) em-websocket! excon (= 0.2.4) factory_girl_rails diff --git a/app/models/invitation.rb b/app/models/invitation.rb index 0463bc08b..0ac394dba 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -74,7 +74,8 @@ class Invitation < ActiveRecord::Base opts[:from].save! invitee.reload end - invitee.invite!(:email => (opts[:service] == 'email')) + invitee.skip_invitation = (opts[:service] != 'email') + invitee.invite! log_string = "event=invitation_sent to=#{opts[:identifier]} service=#{opts[:service]} " log_string << "inviter=#{opts[:from].diaspora_handle} inviter_uid=#{opts[:from].id} inviter_created_at_unix=#{opts[:from].created_at.to_i}" if opts[:from] Rails.logger.info(log_string) diff --git a/app/views/devise/mailer/invitation.html.haml b/app/views/devise/mailer/invitation_instructions.html.haml similarity index 100% rename from app/views/devise/mailer/invitation.html.haml rename to app/views/devise/mailer/invitation_instructions.html.haml diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml index 4af406233..c3c86413b 100644 --- a/config/locales/devise/devise.en.yml +++ b/config/locales/devise/devise.en.yml @@ -72,7 +72,7 @@ en: account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts." click_to_unlock: "Click the link below to unlock your account:" unlock: "Unlock my account" - invitation: + invitation_instructions: subject: "You've been invited to join Diaspora!" accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." diff --git a/spec/models/invitation_spec.rb b/spec/models/invitation_spec.rb index 004fd6612..93a412b14 100644 --- a/spec/models/invitation_spec.rb +++ b/spec/models/invitation_spec.rb @@ -225,10 +225,10 @@ describe Invitation do }.should_not change { @invitee.reload.serialized_private_key } end - it "changes the invitation token" do + it "does not change the invitation token" do old_token = @invitee.invitation_token Invitation.create_invitee(@valid_params) - @invitee.reload.invitation_token.should_not == old_token + @invitee.reload.invitation_token.should == old_token end end context 'with an inviter' do From 5f531f14f198dedb47a38aee6ea4bba78e1464e2 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Thu, 12 May 2011 15:15:56 -0700 Subject: [PATCH 05/38] Don't use rails case_sensitive false, it is very slow. --- app/models/person.rb | 6 +++--- app/models/user.rb | 7 ++++--- db/migrate/20110512220310_downcase_usernames_again.rb | 10 ++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 db/migrate/20110512220310_downcase_usernames_again.rb diff --git a/app/models/person.rb b/app/models/person.rb index 6ab4a9109..45128e3db 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -20,7 +20,7 @@ class Person < ActiveRecord::Base has_one :profile delegate :last_name, :to => :profile - before_save :downcase_diaspora_handle + before_validation :downcase_diaspora_handle def downcase_diaspora_handle diaspora_handle.downcase! end @@ -39,7 +39,7 @@ class Person < ActiveRecord::Base before_validation :clean_url validates_presence_of :url, :profile, :serialized_public_key - validates_uniqueness_of :diaspora_handle, :case_sensitive => false + validates_uniqueness_of :diaspora_handle scope :searchable, joins(:profile).where(:profiles => {:searchable => true}) @@ -230,7 +230,7 @@ class Person < ActiveRecord::Base def remove_all_traces Notification.joins(:notification_actors).where(:notification_actors => {:person_id => self.id}).all.each{ |n| n.destroy} end - + def fix_profile Webfinger.new(self.diaspora_handle).fetch self.reload diff --git a/app/models/user.rb b/app/models/user.rb index 93e0cce1b..8707c4f6d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -19,7 +19,7 @@ class User < ActiveRecord::Base before_validation :set_current_language, :on => :create validates_presence_of :username - validates_uniqueness_of :username, :case_sensitive => false + validates_uniqueness_of :username validates_format_of :username, :with => /\A[A-Za-z0-9_]+\z/ validates_length_of :username, :maximum => 32 validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES @@ -76,12 +76,13 @@ class User < ActiveRecord::Base self.language = I18n.locale.to_s if self.language.blank? end - def self.find_for_authentication(conditions={}) + def self.find_for_database_authentication(conditions={}) + conditions = conditions.dup conditions[:username] = conditions[:username].downcase if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex conditions[:email] = conditions.delete(:username) end - super(conditions) + where(conditions).first end def can_add?(person) diff --git a/db/migrate/20110512220310_downcase_usernames_again.rb b/db/migrate/20110512220310_downcase_usernames_again.rb new file mode 100644 index 000000000..02eeed8eb --- /dev/null +++ b/db/migrate/20110512220310_downcase_usernames_again.rb @@ -0,0 +1,10 @@ +require 'db/migrate/20110421120744_downcase_usernames' +class DowncaseUsernamesAgain < ActiveRecord::Migration + def self.up + DowncaseUsernames.up + end + + def self.down + DowncaseUsernames.down + end +end From f8b73074413d6a29932096ca0f6f28dab3b8e1ac Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 13 May 2011 12:14:55 -0700 Subject: [PATCH 06/38] Downcase emails upon inviting --- app/controllers/users_controller.rb | 2 +- app/models/invitation.rb | 1 + app/models/user.rb | 2 +- config/deploy.rb | 1 + ...20110512220310_downcase_usernames_again.rb | 10 ------- ...0513175000_eliminate_stray_user_records.rb | 29 +++++++++++++++++++ spec/models/invitation_spec.rb | 2 +- 7 files changed, 34 insertions(+), 13 deletions(-) delete mode 100644 db/migrate/20110512220310_downcase_usernames_again.rb create mode 100644 db/migrate/20110513175000_eliminate_stray_user_records.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 431259e51..a0e0f2f51 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -32,7 +32,7 @@ class UsersController < ApplicationController if u[:email_preferences] @user.update_user_preferences(u[:email_preferences]) flash[:notice] = I18n.t 'users.update.email_notifications_changed' - # change passowrd + # change password elsif u[:current_password] && u[:password] && u[:password_confirmation] if @user.update_with_password(u) flash[:notice] = I18n.t 'users.update.password_changed' diff --git a/app/models/invitation.rb b/app/models/invitation.rb index 0ac394dba..a0527977f 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -11,6 +11,7 @@ class Invitation < ActiveRecord::Base validates_presence_of :sender, :recipient, :aspect def self.invite(opts = {}) + opts[:identifier].downcase! return false if opts[:identifier] == opts[:from].email existing_user = self.find_existing_user(opts[:service], opts[:identifier]) diff --git a/app/models/user.rb b/app/models/user.rb index 8707c4f6d..23894a777 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -15,7 +15,7 @@ class User < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable, :timeoutable - before_validation :strip_and_downcase_username, :on => :create + before_validation :strip_and_downcase_username before_validation :set_current_language, :on => :create validates_presence_of :username diff --git a/config/deploy.rb b/config/deploy.rb index 39052bb6c..2069cec3c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -17,6 +17,7 @@ set :use_sudo, false set :scm_verbose, true set :repository_cache, "remote_cache" set :deploy_via, :checkout +set :branch, 'devise_invitable-update' namespace :deploy do task :symlink_config_files do diff --git a/db/migrate/20110512220310_downcase_usernames_again.rb b/db/migrate/20110512220310_downcase_usernames_again.rb deleted file mode 100644 index 02eeed8eb..000000000 --- a/db/migrate/20110512220310_downcase_usernames_again.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'db/migrate/20110421120744_downcase_usernames' -class DowncaseUsernamesAgain < ActiveRecord::Migration - def self.up - DowncaseUsernames.up - end - - def self.down - DowncaseUsernames.down - end -end diff --git a/db/migrate/20110513175000_eliminate_stray_user_records.rb b/db/migrate/20110513175000_eliminate_stray_user_records.rb new file mode 100644 index 000000000..856d36ab7 --- /dev/null +++ b/db/migrate/20110513175000_eliminate_stray_user_records.rb @@ -0,0 +1,29 @@ +class EliminateStrayUserRecords < ActiveRecord::Migration + def self.up + duplicated_emails = execute("SELECT LOWER(email) from users GROUP BY LOWER(email) HAVING COUNT(*) > 1").to_a + duplicated_emails.each do |email| + records = execute("SELECT users.id, users.username, users.created_at from users WHERE LOWER(users.email) = '#{email}'").to_a + with_username = records.select { |r| !r[1].blank? } + if with_username.length == 1 + execute("DELETE FROM users WHERE LOWER(users.email) = '#{email}' AND users.username IS NULL") + end + if with_username.length == 0 + newest_record = records.sort_by{|r| r[2].to_i}.last + execute("DELETE FROM users WHERE LOWER(users.email) = '#{email}' AND users.id != #{newest_record[0]}") + end + end + execute < Date: Fri, 13 May 2011 14:21:17 -0700 Subject: [PATCH 07/38] Don't delete facebook invitations --- db/migrate/20110513175000_eliminate_stray_user_records.rb | 4 ++-- db/schema.rb | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/db/migrate/20110513175000_eliminate_stray_user_records.rb b/db/migrate/20110513175000_eliminate_stray_user_records.rb index 856d36ab7..7bd1ee00a 100644 --- a/db/migrate/20110513175000_eliminate_stray_user_records.rb +++ b/db/migrate/20110513175000_eliminate_stray_user_records.rb @@ -1,13 +1,13 @@ class EliminateStrayUserRecords < ActiveRecord::Migration def self.up - duplicated_emails = execute("SELECT LOWER(email) from users GROUP BY LOWER(email) HAVING COUNT(*) > 1").to_a + duplicated_emails = execute("SELECT LOWER(email) from users WHERE users.email != '' GROUP BY LOWER(email) HAVING COUNT(*) > 1").to_a duplicated_emails.each do |email| records = execute("SELECT users.id, users.username, users.created_at from users WHERE LOWER(users.email) = '#{email}'").to_a with_username = records.select { |r| !r[1].blank? } if with_username.length == 1 execute("DELETE FROM users WHERE LOWER(users.email) = '#{email}' AND users.username IS NULL") end - if with_username.length == 0 + if with_username.length == 0 && !email.blank? newest_record = records.sort_by{|r| r[2].to_i}.last execute("DELETE FROM users WHERE LOWER(users.email) = '#{email}' AND users.id != #{newest_record[0]}") end diff --git a/db/schema.rb b/db/schema.rb index 7a87f0dda..6170e86b9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20110507212759) do +ActiveRecord::Schema.define(:version => 20110513175000) do create_table "aspect_memberships", :force => true do |t| t.integer "aspect_id", :null => false @@ -357,9 +357,11 @@ ActiveRecord::Schema.define(:version => 20110507212759) do t.string "language" t.string "email", :default => "", :null => false t.string "encrypted_password", :limit => 128, :default => "", :null => false - t.string "password_salt", :default => "", :null => false - t.string "invitation_token", :limit => 20 + t.string "invitation_token", :limit => 60 t.datetime "invitation_sent_at" + t.integer "invitation_limit" + t.integer "invited_by_id" + t.string "invited_by_type" t.string "reset_password_token" t.string "remember_token" t.datetime "remember_created_at" From a4f81c6410e257ff18d6373dc95b2f0dade795af Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 13 May 2011 16:29:54 -0700 Subject: [PATCH 08/38] Finish fixing password changing and keeping emails downcased --- app/controllers/users_controller.rb | 8 +++++++- app/models/invitation.rb | 2 +- app/models/person.rb | 2 +- config/locales/diaspora/en.yml | 2 +- features/change_password.feature | 7 +++---- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a0e0f2f51..b0001ad64 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,6 +21,7 @@ class UsersController < ApplicationController def update + password_changed = false u = params[:user] @user = current_user @@ -35,6 +36,7 @@ class UsersController < ApplicationController # change password elsif u[:current_password] && u[:password] && u[:password_confirmation] if @user.update_with_password(u) + password_changed = true flash[:notice] = I18n.t 'users.update.password_changed' else flash[:error] = I18n.t 'users.update.password_not_changed' @@ -58,7 +60,11 @@ class UsersController < ApplicationController render :nothing => true, :status => 204 } format.all{ - redirect_to edit_user_path + if password_changed + redirect_to new_user_session_path + else + redirect_to edit_user_path + end } end end diff --git a/app/models/invitation.rb b/app/models/invitation.rb index a0527977f..80336c405 100644 --- a/app/models/invitation.rb +++ b/app/models/invitation.rb @@ -11,7 +11,7 @@ class Invitation < ActiveRecord::Base validates_presence_of :sender, :recipient, :aspect def self.invite(opts = {}) - opts[:identifier].downcase! + opts[:identifier].downcase! if opts[:identifier] return false if opts[:identifier] == opts[:from].email existing_user = self.find_existing_user(opts[:service], opts[:identifier]) diff --git a/app/models/person.rb b/app/models/person.rb index 45128e3db..511c0ccad 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -22,7 +22,7 @@ class Person < ActiveRecord::Base before_validation :downcase_diaspora_handle def downcase_diaspora_handle - diaspora_handle.downcase! + diaspora_handle.downcase! unless diaspora_handle.blank? end has_many :contacts #Other people's contacts for this person diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 68dc49ff7..1c33450bf 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -645,7 +645,7 @@ en: find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?" skip: "Skip" update: - password_changed: "Password Changed" + password_changed: "Password Changed. You can now log in with your new password." password_not_changed: "Password Change Failed" language_changed: "Language Changed" language_not_changed: "Language Change Failed" diff --git a/features/change_password.feature b/features/change_password.feature index d93f2c725..aeb80bad2 100644 --- a/features/change_password.feature +++ b/features/change_password.feature @@ -10,8 +10,7 @@ Feature: Change password And I fill in "user_password" with "newsecret" And I fill in "user_password_confirmation" with "newsecret" And I press "Change Password" - Then I should see "Password Changed" - When I sign out - Then I should be on the home page - And I sign in with password "newsecret" + Then I should see "Password Changed" + Then I should be on the new user session page + When I sign in with password "newsecret" Then I should be on the aspects page From 32ceb278bfe792963b134fe245c37587340047a5 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 13 May 2011 16:35:55 -0700 Subject: [PATCH 09/38] Restore deploy.rb --- config/deploy.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index 2069cec3c..39052bb6c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -17,7 +17,6 @@ set :use_sudo, false set :scm_verbose, true set :repository_cache, "remote_cache" set :deploy_via, :checkout -set :branch, 'devise_invitable-update' namespace :deploy do task :symlink_config_files do From 70fd2e916a37d45471efc518cda840014afb0417 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Fri, 13 May 2011 17:47:15 -0700 Subject: [PATCH 10/38] Update rspec --- Gemfile.lock | 20 ++++++++++---------- lib/tasks/rspec.rake | 2 +- spec/models/user/posting_spec.rb | 2 +- spec/spec_helper.rb | 8 ++++---- spec/support/fixture_generation.rb | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1312cdc57..84362325e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,20 +333,20 @@ GEM vegas (~> 0.1.2) rest-client (1.6.1) mime-types (>= 1.16) - rspec (2.5.0) - rspec-core (~> 2.5.0) - rspec-expectations (~> 2.5.0) - rspec-mocks (~> 2.5.0) - rspec-core (2.5.1) - rspec-expectations (2.5.0) + rspec (2.6.0) + rspec-core (~> 2.6.0) + rspec-expectations (~> 2.6.0) + rspec-mocks (~> 2.6.0) + rspec-core (2.6.0) + rspec-expectations (2.6.0) diff-lcs (~> 1.1.2) rspec-instafail (0.1.7) - rspec-mocks (2.5.0) - rspec-rails (2.5.0) + rspec-mocks (2.6.0) + rspec-rails (2.6.0) actionpack (~> 3.0) activesupport (~> 3.0) railties (~> 3.0) - rspec (~> 2.5.0) + rspec (~> 2.6.0) ruby-debug (0.10.4) columnize (>= 0.1) ruby-debug-base (~> 0.10.4.0) @@ -384,7 +384,7 @@ GEM typhoeus (0.2.4) mime-types mime-types - tzinfo (0.3.26) + tzinfo (0.3.27) uuidtools (2.1.2) vegas (0.1.8) rack (>= 1.0.0) diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake index bcc7e0311..adf6b776c 100644 --- a/lib/tasks/rspec.rake +++ b/lib/tasks/rspec.rake @@ -16,7 +16,7 @@ begin RSpec::Core::RakeTask.new(:spec => spec_prereq) desc "Run the specs with rcov" - Rspec::Core::RakeTask.new(:rcov => spec_prereq) do |t| + RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t| t.rcov = true t.rcov_opts = ['-Ispec', '--exclude', 'spec', '--exclude', 'gems'] end diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb index 3b013233d..e9693af48 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_spec.rb @@ -48,7 +48,7 @@ describe User do it 'returns a list of all valid aspects a user can post to' do aspect_ids = Aspect.all.map(&:id) user.aspects_from_ids(aspect_ids).map{|a| a}.should == - user.aspects.map{|a| a} #Rspec matchers ftw + user.aspects.map{|a| a} #RSpec matchers ftw end it "lets you post to your own aspects" do user.aspects_from_ids([aspect.id]).should == [aspect] diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ddea02d78..4abb41cb1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -24,10 +24,6 @@ support_files = Dir["#{File.dirname(__FILE__)}/support/**/*.rb"] - [fixture_buil support_files.each {|f| require f } require fixture_builder_file -Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f| - require f -end - RSpec.configure do |config| config.include Devise::TestHelpers, :type => :controller config.mock_with :rspec @@ -50,6 +46,10 @@ RSpec.configure do |config| end end +Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f| + require f +end + disable_typhoeus ProcessedImage.enable_processing = false diff --git a/spec/support/fixture_generation.rb b/spec/support/fixture_generation.rb index f79dc4987..d0961589e 100644 --- a/spec/support/fixture_generation.rb +++ b/spec/support/fixture_generation.rb @@ -1,4 +1,4 @@ -Rspec::Rails::ControllerExampleGroup.class_eval do +RSpec::Rails::ControllerExampleGroup.class_eval do # Saves the markup to a fixture file using the given name def save_fixture(markup, name, fixture_path=nil ) From 0e72a91d1ba37b997d812e2f98423d48c605aa90 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 13 May 2011 22:05:35 -0700 Subject: [PATCH 11/38] update login page --- Gemfile.lock | 2 +- app/views/layouts/application.html.haml | 3 + app/views/sessions/new.haml | 99 ++++++++++++------- public/images/asterisk.png | Bin 0 -> 2353 bytes public/stylesheets/sass/_mixins.scss | 14 +++ public/stylesheets/sass/application.sass | 63 ------------ public/stylesheets/sass/login.sass | 89 +++++++++++++++++ public/stylesheets/sass/login.scss | 118 +++++++++++++++++++++++ 8 files changed, 288 insertions(+), 100 deletions(-) create mode 100644 public/images/asterisk.png create mode 100644 public/stylesheets/sass/login.sass create mode 100644 public/stylesheets/sass/login.scss diff --git a/Gemfile.lock b/Gemfile.lock index 84362325e..4c14681c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM warden (~> 1.0.3) devise_invitable (0.5.0) devise (~> 1.3.1) - rails (>= 3.0.0, <= 3.2) + rails (<= 3.2, >= 3.0.0) diff-lcs (1.1.2) erubis (2.6.6) abstract (>= 1.0.0) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 57beb0da9..f2f777690 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -21,6 +21,9 @@ = stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "blueprint/print", :media => 'print' + + = stylesheet_link_tag "login", :media => 'screen' + = include_stylesheets :default, :media => 'all' - if rtl? = include_stylesheets :rtl, :media => 'all' diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index a567c9ec0..9dea73bce 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -5,63 +5,90 @@ = content_for :head do :css header{ display:none; } - footer{ position: absolute; bottom: 12px; } + footer{ position: absolute; bottom: 6px; } :javascript + jQuery.fn.center = function () { + this.css("position","absolute"); + this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px"); + this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px"); + return this; + } + $(document).ready( function(){ - $("#user_username").focus(); - $("form").submit(function(){ - $(this).fadeOut(200, function(){ - $('#logo').animate({ - 'margin-top': '+=80' - }, 250, function(){ - $("#spinner").fadeIn(300); - }); - }); - $(".login_error").remove(); + + var username = $("#user_username"), + password = $("#user_password"), + forgotPass = $("#forgot_password_link"), + controls = $("#controls"); + + $("#login").center(); + $(window).resize(function(){ + $("#login").center(); }); + + username.focus(); + $("form").submit(function(){ + $('#asterisk').addClass('rideSpinners'); + forgotPass.addClass('hidden'); + controls.addClass('hidden'); + }); + + $(document).keydown(function(){ + if($('#user_username').val() != "" && $('#user_password').val() != ""){ + controls.removeClass('hidden'); + }else{ + controls.addClass('hidden'); + } + }); + + password + .focus(function(){ + forgotPass.removeClass('hidden'); + }) + .blur(function(){ + forgotPass.addClass('hidden'); + }); }); .container{:style => 'text-align:center;'} #login - = image_tag('logo_caps.png', :id => 'logo', :width => 143, :height => 21) - %br - %br + %p + = image_tag('asterisk.png', :id => 'asterisk', :class => 'logo', :height => 154, :width => 154) + %p + = image_tag('logo_caps.png', :id => 'logo', :width => 98, :height => 14) - flash.each do |name, msg| = content_tag :p, msg, :class => "login_error" = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| + %p = f.label :username , t('username') - = f.text_field :username - %span.pod_location - ="@#{AppConfig[:pod_uri].host}" - %br - %br + = f.text_field :username, :tabindex => 1 + %br %p = f.label :password , t('password') - = f.password_field :password - %span - - if devise_mapping.recoverable? && controller_name != 'passwords' - = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name) - - else - \. - %br - - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations' - = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) - - else - \. + = f.password_field :password, :tabindex => 2 - %p.submit - = f.submit t('devise.sessions.new.sign_in') + - if devise_mapping.recoverable? && controller_name != 'passwords' + = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :class => 'hidden', :tabindex => 5 + + %br + %p#controls.hidden %span#remember_me - if devise_mapping.rememberable? - = f.check_box :remember_me + = f.check_box :remember_me, :tabindex => 3 = f.label :remember_me, t('devise.sessions.new.remember_me') - - else - \. + = f.submit 'Log in', :tabindex => 4 - = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden" + + - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations' + %br + %br + %br + %br + = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) + diff --git a/public/images/asterisk.png b/public/images/asterisk.png new file mode 100644 index 0000000000000000000000000000000000000000..0aac946d0c5b150e9bd7b5c2bf4f199967cff5b5 GIT binary patch literal 2353 zcmcJR`9Bkk1IKr`@5u2W=cBm_5sfw}_gIe2@g;^B%~2U9$ILNDo;)Gf97T?DB|<}+ z9$F=mo@Ni3eUV$VM+~v2?{DAlAMpL*^Zxwsetmxb7KaLbH1RXs9 zTVk88cTU1*6KfU@KPB%bO-?l*RBl!dObTgc%3KurFQiW_MQNOACTUl~B!KD(I~vN1 zshm*kz&N2;bYe5=0v;@1k&`awYHO2qviAN(Id``Qxw=i`w#QN7T4MTU#{~axT2p*O znS-OhOe1;@g~GQIISR5HLYBfxVJ*%74opMSZ&Wv&abqx2pvt{UJZC9`Ga~>Idm>19E`swfjv?k6rhULC-1ABEOEe3u^>DHel+^kTuq81n`8Jj=$!dXW zr_BcFbpa!H0yC~iR&1}O07L+dvN35wBnqhjB#hpkUc5-j8|6+0ccvQB6uq`pikrWw zwD@(@MTgznn(n?xA&o9t0Nz{f9il~Pzl}TalG62+LFS+ufkoupbIGiD8FSoh{^%S# zHCuPL26_$>TE=CHY~doQ*606-eVk=3PN}k3-%E%on2$q}m%@{+7$|*Z!6Sgbfa-Hb ztaFyRA|=ZrxRcz|p4+A1(7jORj7|VwKFJADqQp7KZh4?G=y=t0-RZuMX7)ACHtoOY zV3y{2dEnkPw?X&ip7f3>-e!I?iw}hQfB6F)*0tC4n)+Ik-q)Pk>-?a#X+N~~JL*NU zm!8>7OZ$U}`~^FGpaM~cL*{Gr=l7GN+d6u+l7 zYOt610a-m{4sHdf-Z_30aAqn24(V8Q%>xBei^CG+9zRN2VB?GDs?_fpeD1U?DpFNY5 z3+oq}b~`Yg_}p4WC6ip~ifNOj?^3W(8C*11j-&TO*aUqj%+q5&#l+XU-1cTkuAntPQaH-5yUmHL_K#5b9ng$g+ZO zk_uXbTE4uSpR59gyT<&Qx-@0dD#IiZ;w4Ib`$3`F< zT$vXS%4WW8dcDBlNk?Csax!P(>;)S=2vXB8BK-z#DM154K z9Q!lUV0Mr=&h3)p;X!aNJ}xUcq0sZmf#fD|WI}}bizp{g;K#yB{!P72wQPX&ytP{* zHPWd4Amq@n9~QbYORs$CyQyI@XYH7{FL)6BIR(rFy`A)j8AXj7tf$`$ z$B^{E>anVGUuNdx=%zermlASXg6ka76$J0xR$bNK7CU5R*l*gr`8X^XTt@z`_4iIi z{cO?BrM+G7 z6*@cl1luZ~0erTyyHP8_hQl2#ebkYz^0GK!6he&zN0*4Ajc8ig6X?i+ad=J}(j zshXEeTB3;{FN)k=Mpd64V|{cHZX1LQ*7+#L#N45e$!z8D#Uiajus%}fk)Lhb@5uU^ zlpM3zVJwd)jeS$K@2@$eIJR34e;LY6flbNVsmBLL7eS;p0Rbuo_hr`$p2fxJf3@Lw zeyEKQjj1n>+tsEgX}@wWsf!33VZ&I7-?cIxvHouTU6g<8Pm#yRZjP{Z=?Iyk_Qla=8d@@)9p$)9AOSeN$TTnvo6TlT zg4?-fpU`6=>x<77YtjO9hP%aaYdWgF0RPpfS{pB*Ln7sWuSTXWg9yBr$;o*+RwwZD P3IUw#khX0XG3oyRN10)s literal 0 HcmV?d00001 diff --git a/public/stylesheets/sass/_mixins.scss b/public/stylesheets/sass/_mixins.scss index 74ffd8db6..df3bdbf09 100644 --- a/public/stylesheets/sass/_mixins.scss +++ b/public/stylesheets/sass/_mixins.scss @@ -1,3 +1,10 @@ +$blue: #3f8fba; +$red: red; +$background: rgb(252, 252, 252); + +$speed: 0.1s; +$easing: linear; + @mixin mobile-box { margin: 10px; padding: 0 15px; @@ -34,3 +41,10 @@ -khtml-opacity: $val; opacity: $val; } + +@mixin transition($type, $speed:$speed, $easing:$easing){ + -webkit-transition: $type $speed $easing; + -moz-transition: $type $speed $easing; + -o-transition: $type $speed $easing; + transition: $type $speed $easing; +} diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 957abc475..32d580f74 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -4,10 +4,6 @@ @import 'mixins' -$blue: #3F8FBA -$red: #FF0000 -$background: rgb(252,252,252) - body :padding 2em :margin 0 @@ -2441,66 +2437,7 @@ ul.show_comments, :right 4px :top 5px -#login - :width 600px - :padding - :top 10% - :bottom 20% - :text - :align center - :display inline-block - form - input, - label - :font - :size 21px - :display inline - - label - :top 13px - :text-shadow 0 1px 1px #ccc - - input[type='text'], - input[type='password'] - :-webkit-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :-moz-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :width 180px - :max-width 180px - - p - :display inline-block - :position relative - :width 200px - - &:last-child - :margin - :left 3px - - span - :display block - :color #fff - &.pod_location - :color #888 - - &.submit - :width auto - :bottom 15px - - input - :width auto - :position relative - :height 40px - :top 0px - :color #666 - :margin - :bottom 10px - &:hover - :color #444 - -#logo - :position relative #email_invitation input diff --git a/public/stylesheets/sass/login.sass b/public/stylesheets/sass/login.sass new file mode 100644 index 000000000..1a0532bcc --- /dev/null +++ b/public/stylesheets/sass/login.sass @@ -0,0 +1,89 @@ +// Copyright (c) 2010, Diaspora Inc. This file is +// licensed under the Affero General Public License version 3 or later. See +// the COPYRIGHT file. + +@import 'mixins' + +$blue: #3F8FBA +$red: #FF0000 +$background: rgb(252,252,252) + +body + :background-color $background + +.hidden + :display none + +#login + :width 600px + :padding + :top 10% + :bottom 20% + :text + :align center + :display inline-block + + form + input, + label + :font + :size 14px + :display inline + + label + :top 10px + :left 12px + :text-shadow none + + input[type='text'], + input[type='password'] + :-webkit-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 + :-moz-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 + :box-shadow 0 1px 0px #fff, 0 -1px 0px #888 + :width 180px + :max-width 180px + + p + :display inline-block + :position relative + :width 200px + + span + :display inline-block + + &.submit + :width auto + :bottom 15px + + input + :width auto + :position relative + :height 40px + :top 0px + :color #666 + :margin + :bottom 10px + &:hover + :color #444 + + #forgot_password_link + :text-align left + :position absolute + :left 205px + :top 12px + :width 150px + :color #999 + + .controls.hidden + :display none + + #remember_me + :position absolute + :top 0 + :left 4px + + #user_submit + :position absolute + :top -6px + :right 5px + diff --git a/public/stylesheets/sass/login.scss b/public/stylesheets/sass/login.scss new file mode 100644 index 000000000..7deb19a6b --- /dev/null +++ b/public/stylesheets/sass/login.scss @@ -0,0 +1,118 @@ +// Copyright (c) 2010, Diaspora Inc. This file is +// licensed under the Affero General Public License version 3 or later. See +// the COPYRIGHT file. + +@import "mixins"; + +#login { + width: 400px; + text: { + align: center; + }; + + display: inline-block; + + form { + input, + label { + font: { + size: 14px; + }; + display: inline; + } + + label { + top: 10px; + left: 12px; + text-shadow: none; + } + + input[type='text'], + input[type='password'] { + -webkit-box-shadow: 0 1px 0px white, 0 -1px 0px #888888; + -moz-box-shadow: 0 1px 0px white, 0 -1px 0px #888888; + box-shadow: 0 1px 0px white, 0 -1px 0px #888888; + width: 180px; + max-width: 180px; + } + + p { + display: inline-block; + position: relative; + width: 200px; + + span { + display: inline-block; + } + + &.submit { + width: auto; + bottom: 15px; + input { + width: auto; + position: relative; + height: 40px; + top: 0px; + color: #666666; + margin: { + bottom: 10px; + }; + &:hover { + color: #444444; + } + } + } + } + + #forgot_password_link { + @include transition(opacity, 0.2s); + &.hidden { + display: block; + @include opacity(0); + } + text-align: left; + position: absolute; + left: 205px; + top: 12px; + width: 150px; + color: #aaa; + } + + #controls { + @include transition(opacity); + &.hidden { + @include opacity(0); + } + } + + #remember_me { + position: absolute; + top: 0; + left: 4px; + } + + #user_submit { + position: absolute; + top: -6px; + right: 5px; + } + } +} + +@-webkit-keyframes rotate { + from { + -webkit-transform: rotate(0deg); + } + to { + -webkit-transform: rotate(360deg); + } +} + +.rideSpinners +{ + -webkit-animation-name: rotate; + -webkit-animation-duration: 5s; + -webkit-animation-iteration-count: infinite; +} + + From 666fb76bfc8eaa5d0bea7b96b71fd72e6734209c Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 13 May 2011 22:27:08 -0700 Subject: [PATCH 12/38] login as its own js file. accounted for the autofil state --- app/views/sessions/new.haml | 46 ++-------------------------------- config/assets.yml | 2 ++ public/javascripts/login.js | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 public/javascripts/login.js diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 9dea73bce..5799b1bd2 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -3,54 +3,12 @@ -# the COPYRIGHT file. = content_for :head do + = include_javascripts :login + :css header{ display:none; } footer{ position: absolute; bottom: 6px; } - :javascript - jQuery.fn.center = function () { - this.css("position","absolute"); - this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px"); - this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px"); - return this; - } - - $(document).ready( function(){ - - var username = $("#user_username"), - password = $("#user_password"), - forgotPass = $("#forgot_password_link"), - controls = $("#controls"); - - $("#login").center(); - $(window).resize(function(){ - $("#login").center(); - }); - - username.focus(); - $("form").submit(function(){ - $('#asterisk').addClass('rideSpinners'); - forgotPass.addClass('hidden'); - controls.addClass('hidden'); - }); - - $(document).keydown(function(){ - if($('#user_username').val() != "" && $('#user_password').val() != ""){ - controls.removeClass('hidden'); - }else{ - controls.addClass('hidden'); - } - }); - - password - .focus(function(){ - forgotPass.removeClass('hidden'); - }) - .blur(function(){ - forgotPass.addClass('hidden'); - }); - }); - .container{:style => 'text-align:center;'} #login %p diff --git a/config/assets.yml b/config/assets.yml index 0b7d8a1d0..635149437 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -37,6 +37,8 @@ javascripts: - public/javascripts/stream.js - public/javascripts/content-updater.js - public/javascripts/search.js + login: + - public/javascripts/login.js mobile: - public/javascripts/vendor/jquery152.min.js - public/javascripts/custom-mobile-scripting.js diff --git a/public/javascripts/login.js b/public/javascripts/login.js new file mode 100644 index 000000000..8f5c8297d --- /dev/null +++ b/public/javascripts/login.js @@ -0,0 +1,50 @@ +jQuery.fn.center = function () { + this.css("position","absolute"); + this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px"); + this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px"); + return this; +} + +$(document).ready( function(){ + var username = $("#user_username"), + password = $("#user_password"), + forgotPass = $("#forgot_password_link"), + controls = $("#controls"); + + var contentFilled = function(){ + return($('#user_username').val() != "" && $('#user_password').val() != ""); + } + + $("#login").center(); + $(window).resize(function(){ + $("#login").center(); + }); + + username.focus(); + $("form").submit(function(){ + $('#asterisk').addClass('rideSpinners'); + forgotPass.addClass('hidden'); + controls.addClass('hidden'); + }); + + $(document).keydown(function(){ + if(contentFilled()){ + controls.removeClass('hidden'); + }else{ + controls.addClass('hidden'); + } + }); + + if(contentFilled()){ + controls.removeClass('hidden'); + } + + password + .focus(function(){ + forgotPass.removeClass('hidden'); + }) + .blur(function(){ + forgotPass.addClass('hidden'); + }); +}); + From b89dd900ccdc0a34c34e2ff7180098b817b313c7 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 13 May 2011 23:33:16 -0700 Subject: [PATCH 13/38] misc visual cleanup on mobile --- app/views/aspects/index.mobile.haml | 4 +- app/views/layouts/application.mobile.haml | 6 +-- public/stylesheets/sass/mobile.sass | 54 +++++++++-------------- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml index 8def29594..caea84c34 100644 --- a/app/views/aspects/index.mobile.haml +++ b/app/views/aspects/index.mobile.haml @@ -7,9 +7,9 @@ = t('all_aspects') - else = @aspect - -%h1 = link_to t('.post_a_message'), '#publisher_page', :id => 'publisher_button' + + #main_stream.stream = render 'shared/stream', :posts => @posts -if @posts.length > 0 diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 85ef0d523..f1ce75905 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -51,12 +51,10 @@ #content{:data => {:role => 'page', :theme => 'c'}} #header - if current_user - .left - = link_to(image_tag('icons/list_white.png'), '#menu', :id => "menu_button") - .right + = link_to(image_tag('icons/list_white.png'), '#menu', :id => "menu_button") = link_to(image_tag('icons/search_white.png'), people_path) - = link_to(image_tag('white@2x.png', :height => 22, :width => 136), aspects_path) + = link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path) = yield diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass index 9676302fb..9d2314de5 100755 --- a/public/stylesheets/sass/mobile.sass +++ b/public/stylesheets/sass/mobile.sass @@ -85,24 +85,27 @@ a .avatar :float left - :height 40px - :width 40px + :height 48px + :width 48px .from a + :margin + :left -2px :color #000 !important :font :weight bold !important + :margin-bottom 2px + .content :padding - :left 45px + :left 58px :border :bottom 1px solid #eee - :padding 4px 4px - :right 8px + :padding 10px .info :margin @@ -118,7 +121,8 @@ a :font :weight normal p - :margin 0 + :margin 0 auto + :line-height 1.4em .comment :padding @@ -301,41 +305,26 @@ ul :align left #header - :background - :color #111 - :text - :align center - :padding 12px 0 - :border - :bottom 1px solid #000 + @include linear-gradient(#222, #000) - img - :padding - :top 2px - :margin - :bottom -2px + :padding 11px 5px + :bottom 7px + :border + :bottom 1px solid #444 .right :position absolute - :top 0 + :top 0px :padding 6px - :top 5px + :top 4px :right 0 -.left - :position absolute - :top 0 - :padding 6px - :left 0 - - #footer :background :color #ccc .inset :padding 10px - .notification_day_header :padding 6px :background @@ -348,13 +337,12 @@ ul :color #666 #aspect_header - :text - :align center - :padding 4px + :padding 4px 7px + :bottom 7px :font :weight bold :text :shadow none :background - :color #333 - :color #ccc + :color #eee + :color #999 From 01be909e38a0894a88ec9834249f34753feb6cb4 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sat, 14 May 2011 00:58:39 -0700 Subject: [PATCH 14/38] well, that was dumb. (fix cucumber) --- app/views/sessions/new.haml | 2 +- public/javascripts/login.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 5799b1bd2..37d0ee01b 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -39,7 +39,7 @@ - if devise_mapping.rememberable? = f.check_box :remember_me, :tabindex => 3 = f.label :remember_me, t('devise.sessions.new.remember_me') - = f.submit 'Log in', :tabindex => 4 + = f.submit t('devise.sessions.new.sign_in'), :tabindex => 4 - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations' diff --git a/public/javascripts/login.js b/public/javascripts/login.js index 8f5c8297d..7a9c4f766 100644 --- a/public/javascripts/login.js +++ b/public/javascripts/login.js @@ -27,7 +27,7 @@ $(document).ready( function(){ controls.addClass('hidden'); }); - $(document).keydown(function(){ + $(document).keyup(function(){ if(contentFilled()){ controls.removeClass('hidden'); }else{ From da6769cbbfb328a9e231d12a8c4348c0c0e5f9f0 Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Sat, 14 May 2011 11:32:01 -0700 Subject: [PATCH 15/38] Devise invitable changed the meaning of t.invitable --- db/migrate/0000_create_schema.rb | 5 ++++- .../20110514182918_update_devise_invitable.rb | 13 +++++++++++++ db/schema.rb | 8 ++++---- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20110514182918_update_devise_invitable.rb diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb index ff1469b6e..a683aed2c 100644 --- a/db/migrate/0000_create_schema.rb +++ b/db/migrate/0000_create_schema.rb @@ -154,7 +154,10 @@ class CreateSchema < ActiveRecord::Migration t.string :email t.database_authenticatable - t.invitable + + t.string :invitation_token, :limit => 60 + t.datetime :invitation_sent_at + t.recoverable t.rememberable t.trackable diff --git a/db/migrate/20110514182918_update_devise_invitable.rb b/db/migrate/20110514182918_update_devise_invitable.rb new file mode 100644 index 000000000..7efdb3992 --- /dev/null +++ b/db/migrate/20110514182918_update_devise_invitable.rb @@ -0,0 +1,13 @@ +class UpdateDeviseInvitable < ActiveRecord::Migration + def self.up + add_column(:users, :invitation_limit, :integer) + add_column(:users, :invited_by_id, :integer) + add_column(:users, :invited_by_type, :string) + end + + def self.down + remove_column(:users, :invited_by_type) + remove_column(:users, :invited_by_id) + remove_column(:users, :invitation_limit) + end +end diff --git a/db/schema.rb b/db/schema.rb index 6170e86b9..18bebf38a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20110513175000) do +ActiveRecord::Schema.define(:version => 20110514182918) do create_table "aspect_memberships", :force => true do |t| t.integer "aspect_id", :null => false @@ -359,9 +359,6 @@ ActiveRecord::Schema.define(:version => 20110513175000) do t.string "encrypted_password", :limit => 128, :default => "", :null => false t.string "invitation_token", :limit => 60 t.datetime "invitation_sent_at" - t.integer "invitation_limit" - t.integer "invited_by_id" - t.string "invited_by_type" t.string "reset_password_token" t.string "remember_token" t.datetime "remember_created_at" @@ -375,6 +372,9 @@ ActiveRecord::Schema.define(:version => 20110513175000) do t.string "mongo_id" t.string "invitation_service", :limit => 127 t.string "invitation_identifier", :limit => 127 + t.integer "invitation_limit" + t.integer "invited_by_id" + t.string "invited_by_type" end add_index "users", ["email"], :name => "index_users_on_email" From 3b3ae861256721fc9cb9627469419f0566107b87 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 12:52:53 -0700 Subject: [PATCH 16/38] Get rid of annoying app_config.yml warning in test and development --- lib/app_config.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/app_config.rb b/lib/app_config.rb index 3b2648d0d..7fefcf93d 100644 --- a/lib/app_config.rb +++ b/lib/app_config.rb @@ -27,7 +27,9 @@ class AppConfig all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml" all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" unless all_envs else - $stderr.puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help." + unless Rails.env == "development" || Rails.env == "test" + $stderr.puts "WARNING: No config/app_config.yml found! Look at config/app_config.yml.example for help." + end all_envs = load_config_yaml "#{Rails.root}/config/app_config.yml.example" end @@ -64,7 +66,7 @@ class AppConfig def self.downcase_admins self.config_vars[:admins] ||= [] - self.config_vars[:admins].collect! {|admin| admin.downcase} + self.config_vars[:admins].collect! { |admin| admin.downcase } end def self.load_config_yaml filename From c8e9225dfb4186ce0f91c772138d95819fc33323 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 13:29:54 -0700 Subject: [PATCH 17/38] For the love of god, normal Rails logs in test & development. There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere. --- config/app_config.yml.example | 7 ++++++- config/application.rb | 1 - config/initializers/_splunk_logger.rb | 4 ++++ spec/shared_behaviors/log_override.rb | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/config/app_config.yml.example b/config/app_config.yml.example index c22764da9..8d3c1ec47 100644 --- a/config/app_config.yml.example +++ b/config/app_config.yml.example @@ -92,11 +92,16 @@ default: #s3_secret: 'secret' #s3_bucket: 'my_photos' - + # If you want normal Rails logs, set this to false in the appropriate environment. + # It is false by default in development and test. + enable_splunk_logging: true + development: + enable_splunk_logging: false test: pod_url: "http://example.org/" socket_port: 8081 + enable_splunk_logging: false production: diff --git a/config/application.rb b/config/application.rb index 16c16a120..08ae3ba54 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,6 @@ require 'rails/all' # you've limited to :test, :development, or :production. Bundler.require(:default, Rails.env) if defined?(Bundler) -require File.expand_path('../../lib/log_overrider', __FILE__) require File.expand_path('../../lib/fake', __FILE__) module Diaspora diff --git a/config/initializers/_splunk_logger.rb b/config/initializers/_splunk_logger.rb index b2d45248a..5cb075836 100644 --- a/config/initializers/_splunk_logger.rb +++ b/config/initializers/_splunk_logger.rb @@ -1 +1,5 @@ +if AppConfig[:enable_splunk_logging] + require File.expand_path('../../../lib/log_overrider', __FILE__) +end + Rails.logger.class.send(:include, SplunkLogging) diff --git a/spec/shared_behaviors/log_override.rb b/spec/shared_behaviors/log_override.rb index 96cdd3c09..4a768395f 100644 --- a/spec/shared_behaviors/log_override.rb +++ b/spec/shared_behaviors/log_override.rb @@ -1,3 +1,5 @@ +require File.expand_path('../../../lib/log_overrider', __FILE__) + class FakeLogger attr_accessor :infos attr_accessor :lines From fbf486dae68988e33d8c77b2a4e1ebdcc51620dc Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 14:58:52 -0700 Subject: [PATCH 18/38] Users can log in on their phones again. Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable). --- app/controllers/sessions_controller.rb | 12 +++++++++++- spec/controllers/sessions_controller_spec.rb | 19 +++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 47ac32530..32a864238 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -5,6 +5,17 @@ class SessionsController < Devise::SessionsController after_filter :enqueue_update, :only => :create + + def create + resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new") + set_flash_message(:notice, :signed_in) if is_navigational_format? + sign_in(resource_name, resource) + redirect_loc = redirect_location(resource_name, resource) + respond_with resource, :location => redirect_loc do |format| + format.mobile { redirect_to root_path } + end + end + protected def enqueue_update if current_user @@ -13,5 +24,4 @@ class SessionsController < Devise::SessionsController } end end - end diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 2b8467482..e46ac0457 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -17,17 +17,28 @@ describe SessionsController do before do @request.env["devise.mapping"] = Devise.mappings[:user] - @user = alice + @user = alice @user.password = "evankorth" @user.password_confirmation = "evankorth" - @service = Services::Facebook.new(:access_token => "yeah") - @user.services << @service @user.save end describe "#create" do + it "redirects to / for a normal user" do + post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} + response.should redirect_to root_path + end + it "redirects to / for a mobile user" do + @request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7' + post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} + response.should redirect_to root_path + end it 'queues up an update job' do - Resque.should_receive(:enqueue).with(Job::UpdateServiceUsers, @service.id) + service = Services::Facebook.new(:access_token => "yeah") + @user.services << service + @user.save + + Resque.should_receive(:enqueue).with(Job::UpdateServiceUsers, service.id) post :create, {"user"=>{"remember_me"=>"0", "username"=> @user.username, "password"=>"evankorth"}} end From 4b21585231e461f3049fa468887ddb2ed1268ec6 Mon Sep 17 00:00:00 2001 From: Ilya Zhitomirskiy Date: Sat, 14 May 2011 15:35:41 -0700 Subject: [PATCH 19/38] Moved the public key --- README.md | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/README.md b/README.md index bbbc45e47..1589a1f91 100644 --- a/README.md +++ b/README.md @@ -73,47 +73,4 @@ Also, be sure to join the official [mailing list](http://eepurl.com/Vebk). If you wish to contact us privately about any exploits in Diaspora you may find, you can email -[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com). - -Here is the PGP key for exploits@joindiaspora.com: ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.11 (Darwin) - -mQMuBE2eS7URCADDiwlmtp81djidWn4O9dNiymhOTIBFusc0gcGCS3rSnBWhoyeO -DpW1B8mYvcwOoccJLz5XCzXQnOJrkpkcKska/VR+f41o+JgUcnM6N5vIgepH5k1r -O8U626nWsLH26jECFgkUQebw8Vb80yLxQGvTsOYilGrdKuF+lgahc4qDmGAl6Lcf -Qnrx2V70qqTzi5vKPtOTwZHcME5+H622vegpMGoKlir+AA2SuYiieJEg8tKEV5BJ -3tC6rIW6AH4YzWwRmqH+VbHKQCdNN6QYzksk4DgCC7KkzD4lXj3I/ka+gi53hVrh -wNK2Li+87yuROgJpn0A+bHCBGcdUy+LtGIjnAQD/+RjOFOonl8mGE6mA0atqgsYd -wvgh173xbrBYHgIyWwf7Bh7l/mONRG063CRqxAcQK+m2NS7zpIwibNvDT9p3l95D -wGIhGOD8fRcmYMSZ7V8ESsEc0gruK50Hpt7XyvQsI4An1G+hh9msOHHY8vJZATfV -bV5ccRkkGXsM7LuUq7A0YxfmdVUaovDPO9tyoPepk03efkx62PgSmPN6KedVgoGG -nBaAhvG/Gt2GxfHpbVU/IPXiq39KNwI+AX4u9mYFhlrWQ6zJM6YSNJVA/WlC+Z7O -vUhmaPbfb3YN9pRteoARlVgSvKYHb7wq4EbQ/XbqwiFW3vWvKNLjNFyqWJVu59Fv -bEmo0AJAthQV8ao9eH3F6vkXIaQWfrPjNjbOM66BqQf8CR5hUF4SXS6IcJfr7teu -Lu9/6QSIpJaV1rYoX16oK0gMXuaO0GDoh/eNv9Vrd3z+B7iCwt6fuqxuMsxMR/yb -TNyukTG2271bYCiKKLqBb3u/q7ge1MLQwvCuRkmsTNAb/GN/NpU3VfvmUfHRce3+ -h3UQn6qoB2zbibCr0GGiY6MFE4CWEjQf1urigb0IffKuxdv5D/CaCykbJxPzD6vP -Z94fpUi0gPxXvkk8P57rmZFv6K9n8L+6qr2tzJGC+zG/uTUDrHqB5LYimUqFYnAu -EurBUEnSbcSlENfpwlvRpiPgbzkwsP1dY5+X+Gy0e5v/USExGYbfl/PVnsTcVCnF -gLRGUmFwaGFlbCBTb2ZhZXIgKERpYXNwb3JhIEV4cGxvaXRzIFBHUCBLZXkpIDxl -eHBsb2l0c0Bqb2luZGlhc3BvcmEuY29tPoiABBMRCAAoBQJNnku1AhsDBQkB4TOA -BgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDMbK7Zd0hQZILNAPoDte9JmvGO -Gtp5IAJxOJl3+4iA3OpLTCVpNsPe4v+V2wD9EiFwHp2E419s92EXGQD4ZabKRVeK -Xnsvz0P8xDOK+f25Ag0ETZ5LtRAIANRhqORdQnuwtgws+b1jRVnYX5GE/cqQWd8v -vQ6ETKvQzq9ZHObtdxnl7No8dKeZeyWstL8OpbdSTMQ8XySdnojHiAVm3HaOt238 -kob1W0RIqdqsSAsiZO5xMAIrUzcuSZr1JplISLbZ0lv+6xjFD8l9T71U08odUGzD -AX5RBsCJw9yB7dgTJggLE1rXPe/vxxfYRw/1VdpIpW2XkMLjWTK1t55o2yMRaYmH -OnbcHe0CUYzSTpkUw2LDTHif2T4NJrOpG97LTQhzBbxbWChCmUaue+NPaclK7Pzy -NFlepPKqa7DCAeP+h+oi5etS77aKeMHz8Ujk2yZaDrztnmhwKtcAAwUIALOlALCO -r1H1QLQmRPq+qcJu9f6rf5Jp1zNhN1jgFA5Hm4thCN8nX9bW/94FFMxoH9hhr7T1 -7npwgIjkiNB119+fFHtPgkHAPueiEwS7wkuSWbfOAR24IubPlK53KctXtLD5TEiw -o5hw06SM27A2J6VS5+r1DH8Av/UY5Jg891Xg95gzBfp/h6tMfYm8ConB8FB4twv5 -Tit8IaVB/Zp7jMJqIcSEqMi2SVdXqjuWLlA5RK+xdp1LvOust+SX/w7XaC/aqbO7 -j7q2lanAzGtUL8wDA3uOIOxeR9kLHRC1bXJ4Ow/fbynYBsEdIZsb43Mjt7KGsKuq -cGAKsasmKhhs7qCIZwQYEQgADwUCTZ5LtQIbDAUJAeEzgAAKCRDMbK7Zd0hQZPIK -AQDADhHB2SPO5BPuq7nhicR3izRiuyJie4seXMf1TfF9PgEAuJNzGN/MAQzEj0Mr -mnv9hQc6McLTP15uISdt5hIXBLs= -=6qWa ------END PGP PUBLIC KEY BLOCK----- - +[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com), [corresponding public key](http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0xCC6CAED977485064). \ No newline at end of file From 832fcc891fa47ff9d78684135a65e379dd57d190 Mon Sep 17 00:00:00 2001 From: Ilya Zhitomirskiy Date: Sat, 14 May 2011 15:37:57 -0700 Subject: [PATCH 20/38] Edited README.md via GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1589a1f91..3770c2d47 100644 --- a/README.md +++ b/README.md @@ -73,4 +73,4 @@ Also, be sure to join the official [mailing list](http://eepurl.com/Vebk). If you wish to contact us privately about any exploits in Diaspora you may find, you can email -[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com), [corresponding public key](http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0xCC6CAED977485064). \ No newline at end of file +[exploits@joindiaspora.com](mailto:exploits@joindiaspora.com), [corresponding public key (keyID: 77485064)](http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0xCC6CAED977485064). \ No newline at end of file From 43ab8cfcfa3d1c6809a0f9e6771e96436ac67519 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 15:44:01 -0700 Subject: [PATCH 21/38] Tell devise that :mobile is a navigational format. --- app/controllers/sessions_controller.rb | 14 ++--------- config/initializers/devise.rb | 18 +++++++++++--- spec/controllers/sessions_controller_spec.rb | 26 ++++++++++++++++---- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 32a864238..1b29378c9 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -6,22 +6,12 @@ class SessionsController < Devise::SessionsController after_filter :enqueue_update, :only => :create - def create - resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new") - set_flash_message(:notice, :signed_in) if is_navigational_format? - sign_in(resource_name, resource) - redirect_loc = redirect_location(resource_name, resource) - respond_with resource, :location => redirect_loc do |format| - format.mobile { redirect_to root_path } - end - end - protected def enqueue_update if current_user - current_user.services.each{|s| + current_user.services.each do |s| Resque.enqueue(Job::UpdateServiceUsers, s.id) if s.respond_to? :save_friends - } + end end end end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 387642b0c..1e1771d3e 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -4,6 +4,15 @@ # Use this hook to configure devise mailer, warden hooks and so forth. The first # four configuration values can also be set straight in your models. + +class ActionController::Responder + def to_mobile + default_render + rescue ActionView::MissingTemplate => e + navigation_behavior(e) + end +end + Devise.setup do |config| # Configure the e-mail address which will be shown in DeviseMailer. if AppConfig[:smtp_sender_address] @@ -11,9 +20,9 @@ Devise.setup do |config| else unless Rails.env == 'test' Rails.logger.warn("No smtp sender address set, mail may fail.") - puts "WARNING: No smtp sender address set, mail may fail." + puts "WARNING: No smtp sender address set, mail may fail." end - config.mailer_sender = "please-change-me@config-initializers-devise.com" + config.mailer_sender = "please-change-me@config-initializers-devise.com" end # ==> ORM configuration @@ -27,7 +36,7 @@ Devise.setup do |config| # authenticating an user, both parameters are required. Remember that those # parameters are used only when authenticating and not when retrieving from # session. If you need permissions, you should implement that in a before filter. - config.authentication_keys = [ :username ] + config.authentication_keys = [:username] # Tell if authentication through request.params is enabled. True by default. # config.params_authenticatable = true @@ -56,7 +65,7 @@ Devise.setup do |config| # Time interval where the invitation token is valid (default: 0). # If invite_for is 0 or nil, the invitation will never expire. # config.invite_for = 2.weeks - + # ==> Configuration for :confirmable # The time you want to give your user to confirm his account. During this time # he will be able to access your application without confirming. Default is nil. @@ -130,6 +139,7 @@ Devise.setup do |config| # If you have any extra navigational formats, like :iphone or :mobile, you # should add them to the navigational formats lists. Default is [:html] # config.navigational_formats = [:html, :iphone] + config.navigational_formats = [:"*/*", "*/*", :html, :mobile] # ==> Warden configuration # If you want to use other strategies, that are not (yet) supported by Devise, diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index e46ac0457..3337787e5 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -24,23 +24,39 @@ describe SessionsController do end describe "#create" do - it "redirects to / for a normal user" do + it "redirects to / for a non-mobile user" do post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} response.should redirect_to root_path end + it "redirects to / for a mobile user" do @request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7' post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} response.should redirect_to root_path end + it 'queues up an update job' do service = Services::Facebook.new(:access_token => "yeah") @user.services << service - @user.save - Resque.should_receive(:enqueue).with(Job::UpdateServiceUsers, service.id) - post :create, {"user"=>{"remember_me"=>"0", "username"=> @user.username, - "password"=>"evankorth"}} + + post :create, {"user" => {"remember_me" => "0", "username" => @user.username, "password" => "evankorth"}} + end + end + + describe "#destroy" do + before do + sign_in :user, @user + end + it "redirects to / for a non-mobile user" do + delete :destroy + response.should redirect_to root_path + end + + it "redirects to / for a mobile user" do + @request.env['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7' + delete :destroy + response.should redirect_to root_path end end end \ No newline at end of file From f916f3a3e05216945ec4fb788ed3e2384f616b32 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sun, 15 May 2011 00:49:35 +0200 Subject: [PATCH 22/38] remove the width from the share button, thanks artem --- public/stylesheets/sass/application.sass | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 32d580f74..9d40cb319 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -876,8 +876,6 @@ label :top 6px :margin :bottom -2px - input[type='submit'] - :width 75px input :display inline From d59e44f90608599cca18c626f68507f93be354bb Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Sat, 14 May 2011 16:25:31 -0700 Subject: [PATCH 23/38] first crack at OSX newb rake task. wip --- INSTALL_ON_OSX | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 INSTALL_ON_OSX diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX new file mode 100644 index 000000000..2b7a5f704 --- /dev/null +++ b/INSTALL_ON_OSX @@ -0,0 +1,76 @@ +#to make this work, run +#rake install --rakefile INSTALL_ON_OSX + +require 'rake' + +task :install_on_osx do + puts "this currently is untested, prepare for tragedy" + BREW_INSTALLED = installed?('brew') + CURL_INSTALLED = installed?('curl') + MYSQL_INSTALLED = installed?('mysql') + REDIS_INSTALLED = installed?('redis-server') + IMAGEMAGICK_INSTALLED = installed?('mogrify') + + unless BREW_INSTALLED + open 'https://github.com/mxcl/homebrew' + puts "you need homebrew for easy setup. checkout out https://github.com/mxcl/homebrew for more info" + puts 'or copy and paste this one liner' + puts 'ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)' + puts "(afterwords, install xcode)" + Process.exit + end + + puts "updating brew. please wait." + puts `brew update` + + unless CURL_INSTALLED + puts 'you need curl, so we are installing that. please wait...' + puts `brew install curl` + end + + puts 'curl is installed, Great Job!' + + unless IMAGEMAGICK_INSTALLED + puts 'you need imagemagick. please wait' + puts `brew install imagemagick` + end + + puts 'imagemagick is installed, Great Job!' + + unless MYSQL_INSTALLED + puts 'you need mysql, so we are installing that. please wait...' + puts `brew install mysql` + puts 'configuring for first time use. you need to type in your password' + puts `unset TMPDIR` + puts `sudo mysql_install_db --verbose --user=\`whoami\` --basedir="$(brew --prefix mysql)" --datadir=/usr/local/var/mysql --tmpdir=/tmp` + end + + puts 'mysql is installed, Great Job!' + + unless REDIS_INSTALLED + puts 'you need redis, so we are installing that. please wait...' + puts `brew install redis` + end + + puts 'redis is installed, Great Job!' + + unless REDIS_INSTALLED + puts 'you need redis, so we are installing that. please wait...' + puts `brew install redis` + end + + puts 'you need bundler, so we are installing that. please wait...' + puts `gem install bundler` + + puts 'bundler is installed, Great Job!' + + puts 'bundling... please wait...' + puts `bundle` + + puts 'assuming there was no errors run script/server and you should be good to go!' + +end + +def installed?(program) + `which #{program}`=='' ? false : true +end From 7e6cae9f96449b1b5dff2fa8904c00a0dd8e3e9a Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sun, 15 May 2011 01:32:06 +0200 Subject: [PATCH 24/38] updated locales --- config/locales/devise/devise.ar.yml | 2 +- config/locales/devise/devise.bg.yml | 2 +- config/locales/devise/devise.br.yml | 2 +- config/locales/devise/devise.cs.yml | 2 +- config/locales/devise/devise.cy.yml | 2 +- config/locales/devise/devise.da.yml | 2 +- config/locales/devise/devise.de.yml | 2 +- config/locales/devise/devise.el.yml | 2 +- config/locales/devise/devise.en_shaw.yml | 2 +- config/locales/devise/devise.eo.yml | 2 +- config/locales/devise/devise.es-CL.yml | 2 +- config/locales/devise/devise.es.yml | 2 +- config/locales/devise/devise.eu.yml | 2 +- config/locales/devise/devise.fi.yml | 2 +- config/locales/devise/devise.fr.yml | 2 +- config/locales/devise/devise.ga.yml | 2 +- config/locales/devise/devise.he.yml | 2 +- config/locales/devise/devise.hu.yml | 2 +- config/locales/devise/devise.id.yml | 2 +- config/locales/devise/devise.is.yml | 2 +- config/locales/devise/devise.it.yml | 2 +- config/locales/devise/devise.ja.yml | 2 +- config/locales/devise/devise.ko.yml | 2 +- config/locales/devise/devise.lt.yml | 2 +- config/locales/devise/devise.mk.yml | 2 +- config/locales/devise/devise.nb.yml | 2 +- config/locales/devise/devise.nl.yml | 2 +- config/locales/devise/devise.pa.yml | 2 +- config/locales/devise/devise.pl.yml | 2 +- config/locales/devise/devise.pt-BR.yml | 2 +- config/locales/devise/devise.pt-PT.yml | 2 +- config/locales/devise/devise.ro.yml | 2 +- config/locales/devise/devise.ru.yml | 2 +- config/locales/devise/devise.sk.yml | 2 +- config/locales/devise/devise.sl.yml | 2 +- config/locales/devise/devise.sv.yml | 2 +- config/locales/devise/devise.tr.yml | 2 +- config/locales/devise/devise.zh-CN.yml | 2 +- config/locales/devise/devise.zh-TW.yml | 2 +- config/locales/diaspora/ar.yml | 2 +- config/locales/diaspora/bg.yml | 2 +- config/locales/diaspora/br.yml | 2 +- config/locales/diaspora/cs.yml | 2 +- config/locales/diaspora/cy.yml | 2 +- config/locales/diaspora/da.yml | 2 +- config/locales/diaspora/de.yml | 4 ++-- config/locales/diaspora/el.yml | 2 +- config/locales/diaspora/en_shaw.yml | 2 +- config/locales/diaspora/eo.yml | 2 +- config/locales/diaspora/es-CL.yml | 2 +- config/locales/diaspora/es.yml | 2 +- config/locales/diaspora/eu.yml | 2 +- config/locales/diaspora/fi.yml | 2 +- config/locales/diaspora/fr.yml | 2 +- config/locales/diaspora/ga.yml | 2 +- config/locales/diaspora/he.yml | 2 +- config/locales/diaspora/hu.yml | 2 +- config/locales/diaspora/id.yml | 2 +- config/locales/diaspora/is.yml | 2 +- config/locales/diaspora/it.yml | 2 +- config/locales/diaspora/ja.yml | 2 +- config/locales/diaspora/ko.yml | 2 +- config/locales/diaspora/lt.yml | 2 +- config/locales/diaspora/mk.yml | 2 +- config/locales/diaspora/nb.yml | 2 +- config/locales/diaspora/nl.yml | 2 +- config/locales/diaspora/pa.yml | 2 +- config/locales/diaspora/pl.yml | 22 +++++++++---------- config/locales/diaspora/pt-BR.yml | 2 +- config/locales/diaspora/pt-PT.yml | 2 +- config/locales/diaspora/ro.yml | 2 +- config/locales/diaspora/ru.yml | 2 +- config/locales/diaspora/sk.yml | 2 +- config/locales/diaspora/sl.yml | 2 +- config/locales/diaspora/sv.yml | 2 +- config/locales/diaspora/tr.yml | 2 +- config/locales/diaspora/zh-CN.yml | 2 +- config/locales/diaspora/zh-TW.yml | 2 +- config/locales/javascript/javascript.ar.yml | 2 +- config/locales/javascript/javascript.bg.yml | 2 +- config/locales/javascript/javascript.br.yml | 2 +- config/locales/javascript/javascript.cs.yml | 2 +- config/locales/javascript/javascript.da.yml | 2 +- config/locales/javascript/javascript.de.yml | 2 +- config/locales/javascript/javascript.el.yml | 2 +- .../locales/javascript/javascript.en_shaw.yml | 2 +- config/locales/javascript/javascript.eo.yml | 2 +- config/locales/javascript/javascript.es.yml | 2 +- config/locales/javascript/javascript.eu.yml | 2 +- config/locales/javascript/javascript.fi.yml | 2 +- config/locales/javascript/javascript.fr.yml | 2 +- config/locales/javascript/javascript.he.yml | 2 +- config/locales/javascript/javascript.hu.yml | 2 +- config/locales/javascript/javascript.id.yml | 2 +- config/locales/javascript/javascript.is.yml | 2 +- config/locales/javascript/javascript.it.yml | 2 +- config/locales/javascript/javascript.ja.yml | 2 +- config/locales/javascript/javascript.ko.yml | 2 +- config/locales/javascript/javascript.nb.yml | 2 +- config/locales/javascript/javascript.nl.yml | 2 +- config/locales/javascript/javascript.pl.yml | 2 +- .../locales/javascript/javascript.pt-BR.yml | 2 +- .../locales/javascript/javascript.pt-PT.yml | 2 +- config/locales/javascript/javascript.ro.yml | 2 +- config/locales/javascript/javascript.ru.yml | 2 +- config/locales/javascript/javascript.sk.yml | 2 +- config/locales/javascript/javascript.sl.yml | 2 +- config/locales/javascript/javascript.sv.yml | 2 +- config/locales/javascript/javascript.tr.yml | 2 +- .../locales/javascript/javascript.zh-CN.yml | 2 +- .../locales/javascript/javascript.zh-TW.yml | 2 +- 111 files changed, 122 insertions(+), 122 deletions(-) diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml index 5877f16b3..85537a70a 100644 --- a/config/locales/devise/devise.ar.yml +++ b/config/locales/devise/devise.ar.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml index e3462e307..59429ea99 100644 --- a/config/locales/devise/devise.bg.yml +++ b/config/locales/devise/devise.bg.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml index 413ddebb3..8f14b357e 100644 --- a/config/locales/devise/devise.br.yml +++ b/config/locales/devise/devise.br.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml index 542446cf9..7626cdf5f 100644 --- a/config/locales/devise/devise.cs.yml +++ b/config/locales/devise/devise.cs.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml index 33ae923d9..24169fee2 100644 --- a/config/locales/devise/devise.cy.yml +++ b/config/locales/devise/devise.cy.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml index f8b00e21f..dde119d25 100644 --- a/config/locales/devise/devise.da.yml +++ b/config/locales/devise/devise.da.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml index 01afc72ad..6155c34ba 100644 --- a/config/locales/devise/devise.de.yml +++ b/config/locales/devise/devise.de.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml index 91aba34dc..6e522d188 100644 --- a/config/locales/devise/devise.el.yml +++ b/config/locales/devise/devise.el.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml index c21959a55..2a848f919 100644 --- a/config/locales/devise/devise.en_shaw.yml +++ b/config/locales/devise/devise.en_shaw.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml index 1d36425f5..0a7dc96e2 100644 --- a/config/locales/devise/devise.eo.yml +++ b/config/locales/devise/devise.eo.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml index 35a7f1102..64080b40f 100644 --- a/config/locales/devise/devise.es-CL.yml +++ b/config/locales/devise/devise.es-CL.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml index 46df18487..f13b9096f 100644 --- a/config/locales/devise/devise.es.yml +++ b/config/locales/devise/devise.es.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml index c93926650..d063250a5 100644 --- a/config/locales/devise/devise.eu.yml +++ b/config/locales/devise/devise.eu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml index 08f86c1d8..31b69de52 100644 --- a/config/locales/devise/devise.fi.yml +++ b/config/locales/devise/devise.fi.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml index 8e082f3b7..657e43cdf 100644 --- a/config/locales/devise/devise.fr.yml +++ b/config/locales/devise/devise.fr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml index 1ad97750a..c4dc09bf8 100644 --- a/config/locales/devise/devise.ga.yml +++ b/config/locales/devise/devise.ga.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml index 9823a00ae..ec4347e46 100644 --- a/config/locales/devise/devise.he.yml +++ b/config/locales/devise/devise.he.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml index 693a7a732..bddaef793 100644 --- a/config/locales/devise/devise.hu.yml +++ b/config/locales/devise/devise.hu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml index 69ecec76b..6f6a5ca89 100644 --- a/config/locales/devise/devise.id.yml +++ b/config/locales/devise/devise.id.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml index bc369c1eb..1a7017d04 100644 --- a/config/locales/devise/devise.is.yml +++ b/config/locales/devise/devise.is.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml index 881385883..efdc7978c 100644 --- a/config/locales/devise/devise.it.yml +++ b/config/locales/devise/devise.it.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml index 9c40979cf..53feed14c 100644 --- a/config/locales/devise/devise.ja.yml +++ b/config/locales/devise/devise.ja.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml index a76db5934..37cdfc8c2 100644 --- a/config/locales/devise/devise.ko.yml +++ b/config/locales/devise/devise.ko.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml index 647e5503e..385732cb3 100644 --- a/config/locales/devise/devise.lt.yml +++ b/config/locales/devise/devise.lt.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml index 6613ab06e..3672a0f2f 100644 --- a/config/locales/devise/devise.mk.yml +++ b/config/locales/devise/devise.mk.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml index 8b6b94954..8cd021810 100644 --- a/config/locales/devise/devise.nb.yml +++ b/config/locales/devise/devise.nb.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml index 5d887ac1e..4235abca2 100644 --- a/config/locales/devise/devise.nl.yml +++ b/config/locales/devise/devise.nl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml index df3756916..f517962e8 100644 --- a/config/locales/devise/devise.pa.yml +++ b/config/locales/devise/devise.pa.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml index 21776eb18..311e6604d 100644 --- a/config/locales/devise/devise.pl.yml +++ b/config/locales/devise/devise.pl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml index 0a3e6df13..0129548b4 100644 --- a/config/locales/devise/devise.pt-BR.yml +++ b/config/locales/devise/devise.pt-BR.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml index f4096bfda..ad5f66253 100644 --- a/config/locales/devise/devise.pt-PT.yml +++ b/config/locales/devise/devise.pt-PT.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml index 358db9b68..b87d1a402 100644 --- a/config/locales/devise/devise.ro.yml +++ b/config/locales/devise/devise.ro.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml index 4d5eeb08d..aa2c9c93a 100644 --- a/config/locales/devise/devise.ru.yml +++ b/config/locales/devise/devise.ru.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml index 5be7aafe5..d51f746f4 100644 --- a/config/locales/devise/devise.sk.yml +++ b/config/locales/devise/devise.sk.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml index 203f6f0ee..1861279bc 100644 --- a/config/locales/devise/devise.sl.yml +++ b/config/locales/devise/devise.sl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml index 6fa71bd22..65cf81dae 100644 --- a/config/locales/devise/devise.sv.yml +++ b/config/locales/devise/devise.sv.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml index eace106be..1640c0b6f 100644 --- a/config/locales/devise/devise.tr.yml +++ b/config/locales/devise/devise.tr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml index 0f87631d2..955c6d3f5 100644 --- a/config/locales/devise/devise.zh-CN.yml +++ b/config/locales/devise/devise.zh-CN.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml index 07a0589ad..03d864568 100644 --- a/config/locales/devise/devise.zh-TW.yml +++ b/config/locales/devise/devise.zh-TW.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml index 8222fdefe..5db8cfb22 100644 --- a/config/locales/diaspora/ar.yml +++ b/config/locales/diaspora/ar.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml index a90fd84a3..ffd6ef832 100644 --- a/config/locales/diaspora/bg.yml +++ b/config/locales/diaspora/bg.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml index 6cb0e7d2b..b43d7cb62 100644 --- a/config/locales/diaspora/br.yml +++ b/config/locales/diaspora/br.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index f76238153..b330f0d12 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml index 5f7842dc3..7683b853b 100644 --- a/config/locales/diaspora/cy.yml +++ b/config/locales/diaspora/cy.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml index 1940e4adc..d242581f2 100644 --- a/config/locales/diaspora/da.yml +++ b/config/locales/diaspora/da.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 769fc36d8..9a53f85e9 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. @@ -584,7 +584,7 @@ de: download_xml: "Daten herunterladen (XML)" edit_account: "Konto bearbeiten" export_data: "Daten exportieren" - liked: "...wenn jemandem dein Beitrag gefällt?" + liked: "... wenn jemandem dein Beitrag gefällt?" mentioned: "… du in einem Beitrag erwähnt wirst?" new_password: "Neues Passwort" private_message: "… du eine private Nachricht erhältst?" diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index 2a4de1316..a24ab02ca 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml index e841ee588..7710fff2d 100644 --- a/config/locales/diaspora/en_shaw.yml +++ b/config/locales/diaspora/en_shaw.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml index 1ff8e0526..32dc26b0f 100644 --- a/config/locales/diaspora/eo.yml +++ b/config/locales/diaspora/eo.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml index 7c22a138b..408cda635 100644 --- a/config/locales/diaspora/es-CL.yml +++ b/config/locales/diaspora/es-CL.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index 8e7d61ee5..0dff3beb8 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index b924fd010..9f53fcc1a 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml index 848b13f77..b30739718 100644 --- a/config/locales/diaspora/fi.yml +++ b/config/locales/diaspora/fi.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml index 348bc2dd6..5aac0cf36 100644 --- a/config/locales/diaspora/fr.yml +++ b/config/locales/diaspora/fr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml index 96837ee7b..cb79b258c 100644 --- a/config/locales/diaspora/ga.yml +++ b/config/locales/diaspora/ga.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml index 4916d3655..c6913792b 100644 --- a/config/locales/diaspora/he.yml +++ b/config/locales/diaspora/he.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml index 6aa3c5bca..4cc6cf767 100644 --- a/config/locales/diaspora/hu.yml +++ b/config/locales/diaspora/hu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml index f771ab664..d8408ff5a 100644 --- a/config/locales/diaspora/id.yml +++ b/config/locales/diaspora/id.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml index 2850c7cc4..8d2df34a2 100644 --- a/config/locales/diaspora/is.yml +++ b/config/locales/diaspora/is.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index 3f6ce297c..4ecf55a59 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml index c057ce3ca..3c7f2552a 100644 --- a/config/locales/diaspora/ja.yml +++ b/config/locales/diaspora/ja.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml index 59163bbc6..7f88cb3ec 100644 --- a/config/locales/diaspora/ko.yml +++ b/config/locales/diaspora/ko.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml index 10c4de90f..b9e2ad6d0 100644 --- a/config/locales/diaspora/lt.yml +++ b/config/locales/diaspora/lt.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml index b584d442d..3e41c0575 100644 --- a/config/locales/diaspora/mk.yml +++ b/config/locales/diaspora/mk.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml index 2e1f7bb31..d58d8beae 100644 --- a/config/locales/diaspora/nb.yml +++ b/config/locales/diaspora/nb.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml index 47a033a84..5f6599d61 100644 --- a/config/locales/diaspora/nl.yml +++ b/config/locales/diaspora/nl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml index 40f69f57a..623f5839c 100644 --- a/config/locales/diaspora/pa.yml +++ b/config/locales/diaspora/pa.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index 307592642..a6585a4e6 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. @@ -36,7 +36,7 @@ pl: all_aspects: "Wszystkie aspekty" application: helper: - diaspora_alpha: "DIASPORA* ALPHA" + diaspora_alpha: "DIASPORA* ALFA" unknown_person: "nieznana osoba" video_title: unknown: "Wideo bez nazwy" @@ -123,7 +123,7 @@ pl: few: "%{count} komentarze" many: "%{count} komentarzy" new_comment: - comment: "Skomentuj…" + comment: "Skomentuj" commenting: "Komentowanie…" one: "1 komentarz" other: "%{count} komentarzy" @@ -252,7 +252,7 @@ pl: no_results: "Nie znaleziono niczego" notifications: also_commented: "skomentował również użytkownika %{post_author}" - also_commented_deleted: "commented on a deleted post" + also_commented_deleted: "skomentował usunięty wpis" comment_on_post: "komentuje twój" deleted: "usunięte" helper: @@ -267,10 +267,10 @@ pl: and_others: "i %{number} innych" mark_all_as_read: "Oznacz wszystkie jako przeczytane" notifications: "Powiadomienia" - liked: "has just liked your post" + liked: "polubił twój wpis" mentioned: "wspomniał o tobie we wpisie" new_request: "chce zostać twoim znajomym." - post: "wpis" + post: "wpis." private_message: "wysłał(a) ci wiadomość." request_accepted: "zaakceptował Twoje zaproszenie." notifier: @@ -285,9 +285,9 @@ pl: diaspora: "robot e-mailowy diaspory" hello: "Cześć %{name}!" liked: - liked: "%{name} has just liked your post: " - sign_in: "Sign to view it" - subject: "%{name} has just liked your post" + liked: "użytkownik %{name} polubił twój post: " + sign_in: "Zaloguj się, aby zobaczyć" + subject: "użytkownik %{name} polubił twój wpis" love: "uściski," manage_your_email_settings: "zarządzaj ustawieniami emaila" mentioned: @@ -545,7 +545,7 @@ pl: stream_element: dislike: "Nie lubię tego" like: "Lubię to" - unlike: "Unlike" + unlike: "Odwołaj \"Lubię to\"" status_messages: create: success: "Pomyślnie wspomniano o: %{names}" @@ -584,7 +584,7 @@ pl: download_xml: "pobierz mój xml" edit_account: "Edytuj konto" export_data: "Eksportowanie danych" - liked: "...someone likes your post?" + liked: "...ktoś polubił twój wpis?" mentioned: "...zostałeś wspomniany(a) we wpisie?" new_password: "Nowe hasło" private_message: "...otrzymasz prywatną wiadomość?" diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index 642834bea..c5264ad2f 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index d7438a7b5..96ebab9cf 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml index bc5eead37..604c5277e 100644 --- a/config/locales/diaspora/ro.yml +++ b/config/locales/diaspora/ro.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index a0e51a30a..246c59b31 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index f818d3827..cfa687fa3 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml index f1c949776..462ab9a6d 100644 --- a/config/locales/diaspora/sl.yml +++ b/config/locales/diaspora/sl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 557f01ffc..a63707a26 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index 777191fa4..80de1c4aa 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml index 246ef565e..fb0873329 100644 --- a/config/locales/diaspora/zh-CN.yml +++ b/config/locales/diaspora/zh-CN.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index 508ee7745..b782bacfc 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml index 1f546f8ba..81eb708d5 100644 --- a/config/locales/javascript/javascript.ar.yml +++ b/config/locales/javascript/javascript.ar.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml index ee7df8824..bab4489c3 100644 --- a/config/locales/javascript/javascript.bg.yml +++ b/config/locales/javascript/javascript.bg.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml index 49b0e006a..5d3310d7e 100644 --- a/config/locales/javascript/javascript.br.yml +++ b/config/locales/javascript/javascript.br.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml index 0ae0f31b4..2add81b7a 100644 --- a/config/locales/javascript/javascript.cs.yml +++ b/config/locales/javascript/javascript.cs.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml index cfa4f0bc7..5b66554e9 100644 --- a/config/locales/javascript/javascript.da.yml +++ b/config/locales/javascript/javascript.da.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index fda3cdbc3..8f9e4726c 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml index 1d387f405..476a74882 100644 --- a/config/locales/javascript/javascript.el.yml +++ b/config/locales/javascript/javascript.el.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml index 6aaf680ce..9a36db766 100644 --- a/config/locales/javascript/javascript.en_shaw.yml +++ b/config/locales/javascript/javascript.en_shaw.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml index 16faceb1c..e81098bb5 100644 --- a/config/locales/javascript/javascript.eo.yml +++ b/config/locales/javascript/javascript.eo.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml index 0d8f42b7f..a496ef7a6 100644 --- a/config/locales/javascript/javascript.es.yml +++ b/config/locales/javascript/javascript.es.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml index 6ac6b55f2..55c6debf8 100644 --- a/config/locales/javascript/javascript.eu.yml +++ b/config/locales/javascript/javascript.eu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml index d251057f3..28813845c 100644 --- a/config/locales/javascript/javascript.fi.yml +++ b/config/locales/javascript/javascript.fi.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml index 433532bb0..730b4de1b 100644 --- a/config/locales/javascript/javascript.fr.yml +++ b/config/locales/javascript/javascript.fr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml index 8b6e2db0c..7735e04d7 100644 --- a/config/locales/javascript/javascript.he.yml +++ b/config/locales/javascript/javascript.he.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml index 8ebb64e26..dae43a0cb 100644 --- a/config/locales/javascript/javascript.hu.yml +++ b/config/locales/javascript/javascript.hu.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml index 74a1b23b1..0a070d34e 100644 --- a/config/locales/javascript/javascript.id.yml +++ b/config/locales/javascript/javascript.id.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml index 1fbb83ba0..79804922d 100644 --- a/config/locales/javascript/javascript.is.yml +++ b/config/locales/javascript/javascript.is.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml index 4881176ba..6a9ce17fc 100644 --- a/config/locales/javascript/javascript.it.yml +++ b/config/locales/javascript/javascript.it.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml index 5625b4988..80821fbc7 100644 --- a/config/locales/javascript/javascript.ja.yml +++ b/config/locales/javascript/javascript.ja.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml index 363eaa5b0..38415a586 100644 --- a/config/locales/javascript/javascript.ko.yml +++ b/config/locales/javascript/javascript.ko.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml index 3e1962e14..d334ff08f 100644 --- a/config/locales/javascript/javascript.nb.yml +++ b/config/locales/javascript/javascript.nb.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml index 78361cc09..6fc64c4ed 100644 --- a/config/locales/javascript/javascript.nl.yml +++ b/config/locales/javascript/javascript.nl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml index f0628ffe6..0814fc995 100644 --- a/config/locales/javascript/javascript.pl.yml +++ b/config/locales/javascript/javascript.pl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml index a91ccdf6c..735483ae3 100644 --- a/config/locales/javascript/javascript.pt-BR.yml +++ b/config/locales/javascript/javascript.pt-BR.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml index 5b7ccc7da..af2b8a767 100644 --- a/config/locales/javascript/javascript.pt-PT.yml +++ b/config/locales/javascript/javascript.pt-PT.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml index 7dd18f508..89040d3a8 100644 --- a/config/locales/javascript/javascript.ro.yml +++ b/config/locales/javascript/javascript.ro.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml index 60aa6aede..134637755 100644 --- a/config/locales/javascript/javascript.ru.yml +++ b/config/locales/javascript/javascript.ru.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml index afcdc24c2..35279b65f 100644 --- a/config/locales/javascript/javascript.sk.yml +++ b/config/locales/javascript/javascript.sk.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml index bb3d86b80..76f966939 100644 --- a/config/locales/javascript/javascript.sl.yml +++ b/config/locales/javascript/javascript.sl.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index 48002e2b7..b20179afd 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml index 64a32f6cc..07af2acb4 100644 --- a/config/locales/javascript/javascript.tr.yml +++ b/config/locales/javascript/javascript.tr.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml index 5601ec70a..dd0df953f 100644 --- a/config/locales/javascript/javascript.zh-CN.yml +++ b/config/locales/javascript/javascript.zh-CN.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index 0a17e0656..dd9eb1278 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Diaspora Inc. This file is +# Copyright (c) 2011, Diaspora Inc. This file is # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. From 00d89b0207e2a05e5a449c4ed2c59ba38c17c3ad Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 16:58:37 -0700 Subject: [PATCH 25/38] Small updates to infinite scroll feature --- features/infinite_scroll.feature | 2 +- features/step_definitions/custom_web_steps.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/features/infinite_scroll.feature b/features/infinite_scroll.feature index c0afdd52a..7982715c0 100644 --- a/features/infinite_scroll.feature +++ b/features/infinite_scroll.feature @@ -72,7 +72,7 @@ Feature: infinite scroll Then I should see "No more" Scenario: On a tag page - And I am on the tag page for "seeded" + When I go to the tag page for "seeded" Then I should see 15 posts And I should see "alice - 15 - #seeded" diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index 7a8377a34..aecc3fe8e 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -198,3 +198,7 @@ And /^I scroll down$/ do sleep 1 wait_until(10) { evaluate_script('$("#infscr-loading:visible").length') == 0 } end + +When /^I wait for (\d+) seconds$/ do |seconds| + sleep seconds.to_i +end \ No newline at end of file From 3986a0d6d708ed829a3539a610d40306a480c115 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 18:42:15 -0700 Subject: [PATCH 26/38] OS X installer installs homebrew & rvm & ree. --- INSTALL_ON_OSX | 92 ++++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 44 deletions(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 2b7a5f704..7b0a4adb4 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -3,72 +3,76 @@ require 'rake' -task :install_on_osx do +task :install do puts "this currently is untested, prepare for tragedy" + BREW_INSTALLED = installed?('brew') - CURL_INSTALLED = installed?('curl') + RVM_INSTALLED = installed?('rvm') MYSQL_INSTALLED = installed?('mysql') REDIS_INSTALLED = installed?('redis-server') IMAGEMAGICK_INSTALLED = installed?('mogrify') unless BREW_INSTALLED - open 'https://github.com/mxcl/homebrew' - puts "you need homebrew for easy setup. checkout out https://github.com/mxcl/homebrew for more info" - puts 'or copy and paste this one liner' - puts 'ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)' - puts "(afterwords, install xcode)" - Process.exit + puts "Installing homebrew..." + `ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)` + `brew update` end - puts "updating brew. please wait." - puts `brew update` - - unless CURL_INSTALLED - puts 'you need curl, so we are installing that. please wait...' - puts `brew install curl` + puts "homebrew is installed. Great job!" + + unless RVM_INSTALLED + puts "Installing rvm..." + system("bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)") + system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile") + system("source ~/.bash_profile") + if `type rvm | head -1` != "rvm is a function" + puts "meh, rvm install failed." + Process.exit + end end - - puts 'curl is installed, Great Job!' + + puts "rvm is installed. Great job!" + + puts "Installing ruby enterprise edition (ree)..." + system("rvm install ree") + $stdout.flush + + puts "Setting up your gemset and .rvmrc..." + system("rvm use ree") + system("rvm gemset create diaspora") + system("echo 'rvm use ree@diaspora' >> .rvmrc") + system("cd config && cd ..") + puts "Done installing ree, creating gemset, and setting up .rvmrc!" unless IMAGEMAGICK_INSTALLED - puts 'you need imagemagick. please wait' - puts `brew install imagemagick` + puts 'Installing imagemagick...' + system("brew install imagemagick") end - - puts 'imagemagick is installed, Great Job!' + puts 'imagemagick is installed. Great job!' unless MYSQL_INSTALLED - puts 'you need mysql, so we are installing that. please wait...' - puts `brew install mysql` - puts 'configuring for first time use. you need to type in your password' - puts `unset TMPDIR` - puts `sudo mysql_install_db --verbose --user=\`whoami\` --basedir="$(brew --prefix mysql)" --datadir=/usr/local/var/mysql --tmpdir=/tmp` + puts 'Installing mysql...' + system("brew install mysql") + puts 'Configuring for first time use. Type in your Mac password when it asks.' + system("unset TMPDIR") + system("sudo mysql_install_db --verbose --user=`whoami` --basedir=\"$(brew --prefix mysql)\" --datadir=/usr/local/var/mysql --tmpdir=/tmp") end - - puts 'mysql is installed, Great Job!' + puts 'mysql is installed. Great job!' unless REDIS_INSTALLED - puts 'you need redis, so we are installing that. please wait...' - puts `brew install redis` + puts 'Installing redis...' + system("brew install redis") end + puts 'redis is installed. Great job!' - puts 'redis is installed, Great Job!' + puts 'Installing bundler...' + system("gem install bundler") + puts 'bundler is installed. Great Job!' - unless REDIS_INSTALLED - puts 'you need redis, so we are installing that. please wait...' - puts `brew install redis` - end - - puts 'you need bundler, so we are installing that. please wait...' - puts `gem install bundler` - - puts 'bundler is installed, Great Job!' - - puts 'bundling... please wait...' - puts `bundle` - - puts 'assuming there was no errors run script/server and you should be good to go!' + puts 'Installing diaspora gems...' + system("bundle install") + puts 'Assuming there were no errors, run script/server and you should be good to go!' end def installed?(program) From ce290211c65718320de7047315a842742d1fdb83 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 20:37:38 -0700 Subject: [PATCH 27/38] Various fixes for OS X installer: now installs ree the right way, adds mysql to launchctl, creates & migrates the db, and copies app_config.yml --- INSTALL_ON_OSX | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 7b0a4adb4..0dc735c29 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -12,36 +12,35 @@ task :install do REDIS_INSTALLED = installed?('redis-server') IMAGEMAGICK_INSTALLED = installed?('mogrify') + # TODO: check for xcode install + unless BREW_INSTALLED puts "Installing homebrew..." - `ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)` - `brew update` + system("ruby -e \"$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)\"") + system("brew update") end - puts "homebrew is installed. Great job!" unless RVM_INSTALLED puts "Installing rvm..." - system("bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)") + system("curl -s https://rvm.beginrescueend.com/install/rvm -o rvm-installer ; chmod +x rvm-installer ; ./rvm-installer") system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile") - system("source ~/.bash_profile") - if `type rvm | head -1` != "rvm is a function" + if `. ~/.bash_profile; type rvm | head -1` != "rvm is a function\n" puts "meh, rvm install failed." Process.exit + else + system("rm rvm-installer") end end - puts "rvm is installed. Great job!" puts "Installing ruby enterprise edition (ree)..." - system("rvm install ree") + system(". ~/.bash_profile; rvm install ree") $stdout.flush puts "Setting up your gemset and .rvmrc..." - system("rvm use ree") - system("rvm gemset create diaspora") + system(". ~/.bash_profile; rvm use ree; rvm gemset create diaspora") system("echo 'rvm use ree@diaspora' >> .rvmrc") - system("cd config && cd ..") puts "Done installing ree, creating gemset, and setting up .rvmrc!" unless IMAGEMAGICK_INSTALLED @@ -56,6 +55,9 @@ task :install do puts 'Configuring for first time use. Type in your Mac password when it asks.' system("unset TMPDIR") system("sudo mysql_install_db --verbose --user=`whoami` --basedir=\"$(brew --prefix mysql)\" --datadir=/usr/local/var/mysql --tmpdir=/tmp") + system("mkdir -p ~/Library/LaunchAgents") + system("cp /usr/local/Cellar/mysql/5.5.10/com.mysql.mysqld.plist ~/Library/LaunchAgents/") + system("launchctl load -w ~/Library/LaunchAgents/com.mysql.mysqld.plist") end puts 'mysql is installed. Great job!' @@ -66,13 +68,19 @@ task :install do puts 'redis is installed. Great job!' puts 'Installing bundler...' - system("gem install bundler") + system(". ~/.bash_profile; rvm use ree@diaspora; gem install bundler") puts 'bundler is installed. Great Job!' puts 'Installing diaspora gems...' - system("bundle install") + system(". ~/.bash_profile; rvm use ree@diaspora; bundle install") - puts 'Assuming there were no errors, run script/server and you should be good to go!' + puts "Creating and migrating your database..." + system(". ~/.bash_profile; rvm use ree@diaspora; rake db:create; rake db:migrate") + + puts "Setting up your default app configuration..." + system("cp config/app_config.yml.example config/app_config.yml") + + puts 'Run script/server to start it up! Then visit it in your browser at http://localhost:3000' end def installed?(program) From e9b4257a22a1e951ff29ecc438aff063453cc215 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 22:00:01 -0700 Subject: [PATCH 28/38] Various fixes for OS X installer: always remove rvm installer file. Better instructions at the end. --- INSTALL_ON_OSX | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 0dc735c29..1a819f32e 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -25,11 +25,10 @@ task :install do puts "Installing rvm..." system("curl -s https://rvm.beginrescueend.com/install/rvm -o rvm-installer ; chmod +x rvm-installer ; ./rvm-installer") system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile") + system("rm rvm-installer") if `. ~/.bash_profile; type rvm | head -1` != "rvm is a function\n" puts "meh, rvm install failed." Process.exit - else - system("rm rvm-installer") end end puts "rvm is installed. Great job!" @@ -80,7 +79,20 @@ task :install do puts "Setting up your default app configuration..." system("cp config/app_config.yml.example config/app_config.yml") - puts 'Run script/server to start it up! Then visit it in your browser at http://localhost:3000' + puts "****************************************************************************" + puts "***************************** CONGRATS! ***********************************" + puts "****************************************************************************" + puts "" + puts "Everything is installed! How was that beer?" + puts "Run the following commands to start up the Diaspora server:" + puts "" + puts "source ~/.bash_profile" + puts "cd .." + puts "cd diaspora" + puts "script/server" + puts "" + puts "Next time, all you'll need to do is script/server." + puts "Once you've started script/server, visit your local Diaspora in your browser at http://localhost:3000" end def installed?(program) From e41c8f5887befb76b07c521031d27dbc300c9cff Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 22:17:23 -0700 Subject: [PATCH 29/38] OSX installer now does not assume mysql will always be v5.5.10. --- INSTALL_ON_OSX | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 1a819f32e..a32388631 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -55,7 +55,8 @@ task :install do system("unset TMPDIR") system("sudo mysql_install_db --verbose --user=`whoami` --basedir=\"$(brew --prefix mysql)\" --datadir=/usr/local/var/mysql --tmpdir=/tmp") system("mkdir -p ~/Library/LaunchAgents") - system("cp /usr/local/Cellar/mysql/5.5.10/com.mysql.mysqld.plist ~/Library/LaunchAgents/") + plist_file = `brew list mysql | grep plist`.strip + system("cp #{plist_file} ~/Library/LaunchAgents/com.mysql.mysqld.plist") system("launchctl load -w ~/Library/LaunchAgents/com.mysql.mysqld.plist") end puts 'mysql is installed. Great job!' From 8a6b9796dd54a73c76fb3ad178839d704e2f907b Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sat, 14 May 2011 22:31:59 -0700 Subject: [PATCH 30/38] OSX installer has friendlier instructions at the beginning --- INSTALL_ON_OSX | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index a32388631..7d44ac8bf 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -6,6 +6,15 @@ require 'rake' task :install do puts "this currently is untested, prepare for tragedy" + puts "****************************************************************************" + puts "****************************** HELLO! *************************************" + puts "****************************************************************************" + puts "" + puts "We're going to install a ton of stuff to get Diaspora running on your box." + puts "Grab a beer and let's get started." + print "Hit enter to continue! " + input = STDIN.gets + BREW_INSTALLED = installed?('brew') RVM_INSTALLED = installed?('rvm') MYSQL_INSTALLED = installed?('mysql') From 5b5fb7c599185b6830ae4a81ccff5b656e2a4589 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Sun, 15 May 2011 01:59:34 -0700 Subject: [PATCH 31/38] check for gcc as xcode test --- INSTALL_ON_OSX | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 7d44ac8bf..661f9f0d2 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -14,15 +14,22 @@ task :install do puts "Grab a beer and let's get started." print "Hit enter to continue! " input = STDIN.gets + BREW_INSTALLED = installed?('brew') RVM_INSTALLED = installed?('rvm') MYSQL_INSTALLED = installed?('mysql') REDIS_INSTALLED = installed?('redis-server') IMAGEMAGICK_INSTALLED = installed?('mogrify') - + XCODE_INSTALLED = installed?('gcc') # TODO: check for xcode install + unless XCODE_INSTALLED + puts "you need to install XCode before running this script" + puts "you can get it from your OSX install cd, or from Apple's developer page" + Process.exit + end + unless BREW_INSTALLED puts "Installing homebrew..." system("ruby -e \"$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)\"") From 0fd15107ab0aae228a30416ab704c9990d1d1f7f Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Sun, 15 May 2011 02:01:08 -0700 Subject: [PATCH 32/38] set up database files in osx script --- INSTALL_ON_OSX | 3 +++ 1 file changed, 3 insertions(+) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index 661f9f0d2..a77c72739 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -96,6 +96,9 @@ task :install do puts "Setting up your default app configuration..." system("cp config/app_config.yml.example config/app_config.yml") + puts "Setting up your default database configuration..." + system("cp config/database.yml.example config/database.yml") + puts "****************************************************************************" puts "***************************** CONGRATS! ***********************************" puts "****************************************************************************" From a9292df2758fc31e0aa1b8359467b63d87874cdf Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 15 May 2011 11:47:29 -0700 Subject: [PATCH 33/38] OSX installer tweaks: everyone does brew update, add link to irc when rvm install fails --- INSTALL_ON_OSX | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index a77c72739..b7c09b066 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -22,19 +22,19 @@ task :install do REDIS_INSTALLED = installed?('redis-server') IMAGEMAGICK_INSTALLED = installed?('mogrify') XCODE_INSTALLED = installed?('gcc') - # TODO: check for xcode install unless XCODE_INSTALLED - puts "you need to install XCode before running this script" - puts "you can get it from your OSX install cd, or from Apple's developer page" + puts "You need to install XCode before running this script. :(" + puts "You can get it from your OSX install DVD, or from Apple's developer page." Process.exit end + puts "Hooray! You have XCode already!" unless BREW_INSTALLED puts "Installing homebrew..." system("ruby -e \"$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)\"") - system("brew update") end + system("brew update") puts "homebrew is installed. Great job!" unless RVM_INSTALLED @@ -43,7 +43,7 @@ task :install do system("echo '[[ -s \"$HOME/.rvm/scripts/rvm\" ]] && . \"$HOME/.rvm/scripts/rvm\" # Load RVM function' >> ~/.bash_profile") system("rm rvm-installer") if `. ~/.bash_profile; type rvm | head -1` != "rvm is a function\n" - puts "meh, rvm install failed." + puts "Meh, rvm install failed. Come talk to us in irc, at http://webchat.freenode.net/?channels=diaspora" Process.exit end end From 983b83ac68f4d70b631f6ddec4f3ebdd08cff0d6 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Sun, 15 May 2011 12:27:44 -0700 Subject: [PATCH 34/38] osx installer updates to the voice --- INSTALL_ON_OSX | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/INSTALL_ON_OSX b/INSTALL_ON_OSX index b7c09b066..3d1efc03a 100644 --- a/INSTALL_ON_OSX +++ b/INSTALL_ON_OSX @@ -11,11 +11,10 @@ task :install do puts "****************************************************************************" puts "" puts "We're going to install a ton of stuff to get Diaspora running on your box." - puts "Grab a beer and let's get started." - print "Hit enter to continue! " + puts "Grab a tasty beverage - this might take a while. Then let's get started!" + print "Hit enter once you have a drink! " input = STDIN.gets - BREW_INSTALLED = installed?('brew') RVM_INSTALLED = installed?('rvm') MYSQL_INSTALLED = installed?('mysql') @@ -24,8 +23,8 @@ task :install do XCODE_INSTALLED = installed?('gcc') unless XCODE_INSTALLED - puts "You need to install XCode before running this script. :(" - puts "You can get it from your OSX install DVD, or from Apple's developer page." + puts "Sadly, you need to install XCode before running this script. :(" + puts "You can get it from your OSX install DVD, or download it from Apple's developer page." Process.exit end puts "Hooray! You have XCode already!" From 20231891d2a3717d10d479b66231f69a00f718b9 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sun, 15 May 2011 22:57:08 +0200 Subject: [PATCH 35/38] updated locales --- config/locales/devise/devise.ar.yml | 10 +- config/locales/devise/devise.bg.yml | 10 +- config/locales/devise/devise.br.yml | 10 +- config/locales/devise/devise.cs.yml | 10 +- config/locales/devise/devise.cy.yml | 4 +- config/locales/devise/devise.da.yml | 10 +- config/locales/devise/devise.de.yml | 10 +- config/locales/devise/devise.el.yml | 10 +- config/locales/devise/devise.en_shaw.yml | 10 +- config/locales/devise/devise.eo.yml | 6 +- config/locales/devise/devise.es-CL.yml | 10 +- config/locales/devise/devise.es.yml | 10 +- config/locales/devise/devise.eu.yml | 10 +- config/locales/devise/devise.fi.yml | 10 +- config/locales/devise/devise.fr.yml | 10 +- config/locales/devise/devise.ga.yml | 8 +- config/locales/devise/devise.he.yml | 10 +- config/locales/devise/devise.hu.yml | 10 +- config/locales/devise/devise.id.yml | 4 +- config/locales/devise/devise.is.yml | 10 +- config/locales/devise/devise.it.yml | 6 +- config/locales/devise/devise.ja.yml | 10 +- config/locales/devise/devise.ko.yml | 2 +- config/locales/devise/devise.lt.yml | 10 +- config/locales/devise/devise.mk.yml | 10 +- config/locales/devise/devise.nb.yml | 10 +- config/locales/devise/devise.nl.yml | 10 +- config/locales/devise/devise.pa.yml | 2 +- config/locales/devise/devise.pl.yml | 10 +- config/locales/devise/devise.pt-BR.yml | 10 +- config/locales/devise/devise.pt-PT.yml | 104 ++++++++++---------- config/locales/devise/devise.ro.yml | 10 +- config/locales/devise/devise.ru.yml | 10 +- config/locales/devise/devise.sk.yml | 10 +- config/locales/devise/devise.sl.yml | 10 +- config/locales/devise/devise.sv.yml | 8 +- config/locales/devise/devise.tr.yml | 10 +- config/locales/devise/devise.zh-CN.yml | 10 +- config/locales/devise/devise.zh-TW.yml | 10 +- config/locales/diaspora/cs.yml | 2 +- config/locales/diaspora/eu.yml | 2 +- config/locales/diaspora/it.yml | 32 +++--- config/locales/diaspora/pt-PT.yml | 76 +++++++------- config/locales/diaspora/sv.yml | 50 +++++----- config/locales/javascript/javascript.sv.yml | 4 +- 45 files changed, 305 insertions(+), 305 deletions(-) diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml index 85537a70a..da6c3bf25 100644 --- a/config/locales/devise/devise.ar.yml +++ b/config/locales/devise/devise.ar.yml @@ -28,11 +28,11 @@ ar: subject: "تعليمات التأكيد" you_can_confirm: "يمكنك تأكيد حسابك عبر الرابط التالي" hello: "مرحبا %{email}!" - invitation: - accept: "قبول الدعوة" - ignore: "إذا كنت لا تريد قبول الدعوة, رجاء تجاهل هذه الرسالة" - no_account_till: "لن يتم إنشاء حسابك حتى تنقر على الرابط أعلاه وتسجل دخولك" - subject: "دعوة من صديق للإنضمام إلى دياسبرا" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", at %{url}, يمكنك قبولها عبر الرابط التالي." has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا" diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml index 59429ea99..6b2cb6779 100644 --- a/config/locales/devise/devise.bg.yml +++ b/config/locales/devise/devise.bg.yml @@ -28,11 +28,11 @@ bg: subject: "Инструкции за потвърждаване" you_can_confirm: "Можете да потвърдите акаунта си чрез линка по-долу:" hello: "Здравейте %{email}!" - invitation: - accept: "Приеман поканата" - ignore: "Ако не желаете да приемете поканата, моля игнорирайте писмото." - no_account_till: "Акаунтът няма да бъде създаден докато не посетите връзката по-горе и не се регистрирате." - subject: "Поканени сте да се присъедините към Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", на адрес %{url}. Можете да приемете поканата чрез линка по-долу." has_invited_you: "%{name} ви кани да се присъедините към Diaspora" diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml index 8f14b357e..791518ca5 100644 --- a/config/locales/devise/devise.br.yml +++ b/config/locales/devise/devise.br.yml @@ -28,11 +28,11 @@ br: subject: "Titouroù-kadarnaat" you_can_confirm: "Moaien zo deoc'h kadarnaat ho kont gant al liamm dindan:" hello: "Demat, %{email}!" - invitation: - accept: "Roit ho asant da'r bedadenn" - ignore: "M'ho peus ket c'hoant bezañ pedet n'ho peus ket nemet leuskel ar postel-mañ a-gostez." - no_account_till: "Ne vo ket krouet ho hont keit ma n'ho po ket kliket war al liamm dindan ha lakaet hoc'h anv." - subject: "Pedet oc'h bet da vont davet Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", e %{url}, moaien zo deoc'h asantiñ dre al liamm a zo dindan." has_invited_you: "%{name} en deus pedet ac'hanoc'h da vont davet Diaspora" diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml index 7626cdf5f..e7a006afc 100644 --- a/config/locales/devise/devise.cs.yml +++ b/config/locales/devise/devise.cs.yml @@ -28,11 +28,11 @@ cs: subject: "Informace o potvrzení" you_can_confirm: "Váš účet můžete potvrdit kliknutím na tento odkaz:" hello: "Zdravím %{email}!" - invitation: - accept: "Potvrdit pozvánku" - ignore: "Pokud nechcete potvrdit pozvání, tento e-mail prosím ignorujte." - no_account_till: "Pro dokončení registrace klikněte prosím na odkaz uvedený níže." - subject: "Byl jste pozván na Diasporu!" + invitation_instructions: + accept: "Přijmout pozvání" + ignore: "Pokud nechcete přijmout pozvání, prosím ignorujte tento e-mail." + no_account_till: "Váš účet nebude vytvořen dokud nepřistoupíte na uvedený odkaz a zaregistrujete se." + subject: "Byli jste pozváni na Diasporu!" inviters: accept_at: ", na %{url}, akceptujte kliknutím na odkaz." has_invited_you: "%{name} Vás pozval na Diasporu" diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml index 24169fee2..591ac932b 100644 --- a/config/locales/devise/devise.cy.yml +++ b/config/locales/devise/devise.cy.yml @@ -28,11 +28,11 @@ cy: subject: "Confirmation instructions" you_can_confirm: "You can confirm your account through the link below:" hello: "Hello %{email}!" - invitation: + invitation_instructions: accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." no_account_till: "Your account won't be created until you access the link above and sign up." - subject: "A friend wants you to join Diaspora!" + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", at %{url}, you can accept it through the link below." has_invited_you: "%{name} has invited you to join Diaspora" diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml index dde119d25..0c3845589 100644 --- a/config/locales/devise/devise.da.yml +++ b/config/locales/devise/devise.da.yml @@ -28,11 +28,11 @@ da: subject: "Bekræftelsesinstruktioner" you_can_confirm: "Du kan bekræfte din konto via nedenstående link:" hello: "Hej %{email}!" - invitation: - accept: "Acceptér invitation" - ignore: "Hvis du ikke ønsker at acceptere invitationen, bedes du ignorere denne e-mail." - no_account_till: "Din konto vil ikke blive oprettet før du klikker på linket ovenfor og logger ind." - subject: "Du er blevet inviteret til Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", på %{url}, kan du acceptere via linket nedenfor." has_invited_you: "%{name} har inviteret dig til Diaspora" diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml index 6155c34ba..74c7d7b88 100644 --- a/config/locales/devise/devise.de.yml +++ b/config/locales/devise/devise.de.yml @@ -28,11 +28,11 @@ de: subject: "Bestätigung deines Diaspora-Kontos" you_can_confirm: "Du kannst dein Konto über den nachfolgenden Link bestätigen:" hello: "Hallo %{email}!" - invitation: - accept: "Einladung annehmen" - ignore: "Wenn du die Einladung nicht annehmen willst, dann ignoriere diese E-Mail." - no_account_till: "Dein Konto wird erst erstellt, wenn du dich über den Link registrierst." - subject: "Du wurdest zu Diaspora eingeladen!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: "%{url} teilzunehmen. Du kannst die Einladung durch den Link unten annehmen." has_invited_you: "%{name} hat dich dazu eingeladen, bei Diaspora auf" diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml index 6e522d188..a8233900c 100644 --- a/config/locales/devise/devise.el.yml +++ b/config/locales/devise/devise.el.yml @@ -28,11 +28,11 @@ el: subject: "Οδηγίες επιβεβαίωσης" you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:" hello: "Γειά σου %{email}!" - invitation: - accept: "Αποδοχή πρόσκλησης" - ignore: "Εάν δεν θέλετε να αποδεχθείτε την πρόσκληση, αγνοήστε αυτό το μήνυμα." - no_account_till: "Ο λογαριασμός σας δεν θα δημιουργηθεί μέχρι να επισκεφθείτε τον παραπάνω σύνδεσμο και να εγγραφείτε." - subject: "Έχετε λάβει πρόσκληση για να γίνετε μέλος του Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", στο %{url}, μπορείτε να το αποδεχτείτε, μέσω του επόμενου συνδέσμου." has_invited_you: "Ο χρήστης %{name} σας προσκάλεσε να γίνετε μέλος του Diaspora" diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml index 2a848f919..f1108fe63 100644 --- a/config/locales/devise/devise.en_shaw.yml +++ b/config/locales/devise/devise.en_shaw.yml @@ -28,11 +28,11 @@ en_shaw: subject: "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟" you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:" hello: "𐑣𐑧𐑤𐑴 %{email}!" - invitation: - accept: "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑥𐑝𐑦𐑑𐑱𐑖𐑩𐑯" - ignore: "𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤." - no_account_till: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑴𐑯𐑑 𐑚𐑰 𐑒𐑮𐑦𐑱𐑑𐑩𐑛 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑕𐑲𐑯 𐑳𐑐." - subject: "𐑿𐑝 𐑚𐑧𐑯 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", 𐑨𐑑 %{url}, 𐑿 𐑒𐑨𐑯 𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑑 𐑔𐑮𐑵 𐑔 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴." has_invited_you: "%{name} 𐑣𐑨𐑟 𐑦𐑥𐑝𐑲𐑑𐑩𐑛 𐑿 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩" diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml index 0a7dc96e2..cd493387f 100644 --- a/config/locales/devise/devise.eo.yml +++ b/config/locales/devise/devise.eo.yml @@ -28,11 +28,11 @@ eo: subject: "Instrukcioj por konfirmi" you_can_confirm: "Vi povas konfirmi vian konton per la suba ligilo:" hello: "Saluton, %{email}!" - invitation: - accept: "Akcepti inviton" + invitation_instructions: + accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." no_account_till: "Your account won't be created until you access the link above and sign up." - subject: "Iu invitis vin aligi al Diaspora!" + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", ĉe %{url}, vi povas akcepti ĝin per la suba ligilo." has_invited_you: "%{name} invitis vin aliĝi al Diaspora" diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml index 64080b40f..575a50f64 100644 --- a/config/locales/devise/devise.es-CL.yml +++ b/config/locales/devise/devise.es-CL.yml @@ -28,11 +28,11 @@ es-CL: subject: "Instrucciones de confirmación" you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:" hello: "Hola %{email}!" - invitation: - accept: "Aceptar la invitación" - ignore: "Si no quieres aceptar la invitación, por favor, ignora este correo." - no_account_till: "Tu cuenta no será creada hasta que accedas al enlace de arriba y te registres." - subject: "¡Has sido invitado a unirte a Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", en %{url}, puedes aceptar a través del siguiente enlace." has_invited_you: "%{name} te ha invitado a unirte a Diaspora" diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml index f13b9096f..3d297013a 100644 --- a/config/locales/devise/devise.es.yml +++ b/config/locales/devise/devise.es.yml @@ -28,11 +28,11 @@ es: subject: "Instrucciones de confirmación" you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:" hello: "Hola %{email}!" - invitation: - accept: "Aceptar la invitación" - ignore: "Si no deseas aceptar la invitación, por favor ignora este mensaje." - no_account_till: "Tu cuenta no será creada hasta que accedas al enlace de arriba y te identifiques." - subject: "¡Has sido invitado a participar en Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", en %{url}, puedes aceptar en el siguiente enlace." has_invited_you: "%{name} te ha invitado a unirte a Diaspora" diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml index d063250a5..ffd0e3238 100644 --- a/config/locales/devise/devise.eu.yml +++ b/config/locales/devise/devise.eu.yml @@ -28,11 +28,11 @@ eu: subject: "Baieztapen argibideak" you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:" hello: "Kaixo %{email}!" - invitation: - accept: "Gonbidapena onartu" - ignore: "Ez baduzu gonbidapena onartu nahi, gutxietsi mezu hau." - no_account_till: "Zure kontua ez da sortua izango goiko esteka jarraitzen duzun arte." - subject: "Diasporara gonbidatua izan zara!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ",%{url}(e)n, onartu dezakezu honako estekaren bidez." has_invited_you: "%{name} Diasporara gonbidatu zaitu" diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml index 31b69de52..ac546c105 100644 --- a/config/locales/devise/devise.fi.yml +++ b/config/locales/devise/devise.fi.yml @@ -28,11 +28,11 @@ fi: subject: "Vahvistamisohjeet" you_can_confirm: "Voit vahvistaa käyttäjätilisi alla olevan linkin kautta:" hello: "Hei, %{email}!" - invitation: - accept: "Hyväksy kutsu" - ignore: "Jos et halua hyväksyä kutsua, voit jättää tämän viestin huomioimatta." - no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. " - subject: "Sinut on kutsuttu käyttämään Diasporaa!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", osoitteessa %{url}, voit hyväksyä sen alla olevan linkin kautta." has_invited_you: "%{name} on kutsunut sinut liittymään Diasporaan" diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml index 657e43cdf..4d241ee34 100644 --- a/config/locales/devise/devise.fr.yml +++ b/config/locales/devise/devise.fr.yml @@ -28,11 +28,11 @@ fr: subject: "Instructions de confirmation" you_can_confirm: "Vous pouvez confirmer votre compte à travers le lien ci-dessous :" hello: "Bonjour %{email} !" - invitation: - accept: "Accepter l'invitation" - ignore: "Si vous ne souhaitez pas accepter l'invitation, merci d'ignorer cet e-mail." - no_account_till: "Votre compte ne sera pas créé avant que vous ne vous inscriviez en accédant au lien ci-dessus." - subject: "Vous avez été invité à rejoindre Diaspora !" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", sur %{url}, vous pouvez accepter à travers le lien ci-dessous." has_invited_you: "%{name} vous a invité à rejoindre Diaspora" diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml index c4dc09bf8..aa2bde530 100644 --- a/config/locales/devise/devise.ga.yml +++ b/config/locales/devise/devise.ga.yml @@ -28,11 +28,11 @@ ga: subject: "Treoiracha deimhniú" you_can_confirm: "Tá tú ábalta do cúntas a deimhniú tríd an nasc faoi:" hello: "Haileo %{email}!" - invitation: - accept: "Ghlacadh leis an cuireadh" + invitation_instructions: + accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." - no_account_till: "Ní bheidh do cúntas déanta roimh a rochtain tú an nasc thar agus síníonn tú suas." - subject: "Tá cuireadh seolta chugat chun páirt a ghlacadh i Diaspora!" + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", ag %{url}, is féidir leat ghlacadh leis an cuireadh tríd an nasc faoi." has_invited_you: "Tá %{name} tar éis cuireadh a sheoladh chugat chun páirt a ghlacadh i Diaspora" diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml index ec4347e46..ae8d077ec 100644 --- a/config/locales/devise/devise.he.yml +++ b/config/locales/devise/devise.he.yml @@ -28,11 +28,11 @@ he: subject: "הנחיות לאימות" you_can_confirm: "באפשרותך לאמת את החשבון שלך באמצעות הקישור שלהלן:" hello: "שלום %{email}!" - invitation: - accept: "קבלת ההזמנה" - ignore: "אם אין ברצונך לאשר את ההזמנה ניתן להתעלם מהודעה זו." - no_account_till: "החשבון שלך לא ייווצר עד הרישום דרך קישור זה." - subject: "הוזמנת על ידי אחד מחבריך להצטרף לדיאספורה!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", בכתובת %{url}, ניתן לקבל אותה דרך הקישור שלהלן." has_invited_you: "התקבלה הזמנה מאת %{name} להצטרף לדיאספורה" diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml index bddaef793..9a2299c3e 100644 --- a/config/locales/devise/devise.hu.yml +++ b/config/locales/devise/devise.hu.yml @@ -28,11 +28,11 @@ hu: subject: "Megerősítési utasítások" you_can_confirm: "Megerősítheted a fiókod ezen a linken keresztül:" hello: "Szia %{email}!" - invitation: - accept: "Elfogadom a meghívót" - ignore: "Ha nem akarod elfogadni a meghívást, hagyd figyelmen kívül ezt a levelet." - no_account_till: "A fiókod addig nem hozható létre, amíg nem regisztrálsz a fenti linken keresztül." - subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálózathoz!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", ezen a linken keresztül tudod elfogadni: %{url}." has_invited_you: "%{name} meghívott téged, hogy csatlakozz a Diaspora* közösségi hálózathoz" diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml index 6f6a5ca89..4ef7428d1 100644 --- a/config/locales/devise/devise.id.yml +++ b/config/locales/devise/devise.id.yml @@ -28,11 +28,11 @@ id: subject: "Confirmation instructions" you_can_confirm: "You can confirm your account through the link below:" hello: "Hello %{email}!" - invitation: + invitation_instructions: accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." no_account_till: "Your account won't be created until you access the link above and sign up." - subject: "A friend wants you to join Diaspora!" + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", at %{url}, you can accept it through the link below." has_invited_you: "%{name} has invited you to join Diaspora" diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml index 1a7017d04..51f70976d 100644 --- a/config/locales/devise/devise.is.yml +++ b/config/locales/devise/devise.is.yml @@ -28,11 +28,11 @@ is: subject: "Staðfestingarleiðbeiningar" you_can_confirm: "Þú getur staðfest aðgang þinn með því að elta hlekkinn hér fyrir neðan:" hello: "Halló %{email}!" - invitation: - accept: "Taka boðinu" - ignore: "Ef þú vilt ekki taka boðinu, vinsamlegast gefðu þá þessum tölvupósti engan gaum." - no_account_till: "Aðgangur þinn mun ekki verða búinn til fyrr en þú eltir hlekkinn hér fyrir ofan og skráir þig." - subject: "Þér hefur verið boðið að taka þátt í Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", Á% {url}, getur þú samþykkt það í gegnum hlekkinn hér fyrir neðan." has_invited_you: "%{name} hefur boðið þér að taka þátt í Díaspora" diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml index efdc7978c..751994764 100644 --- a/config/locales/devise/devise.it.yml +++ b/config/locales/devise/devise.it.yml @@ -28,10 +28,10 @@ it: subject: "Istruzioni di conferma" you_can_confirm: "Puoi confermare il tuo account attraverso il link sottostante:" hello: "Ciao %{email}!" - invitation: + invitation_instructions: accept: "Accetta l'invito" - ignore: "se non vuoi accettare l' invito, perfavore ignora questa email." - no_account_till: "Il tuo account non sarà creato finchè non cliccherai sul link qui sopra e ti registrerai." + ignore: "Se non vuoi accettare l'invito, perfavore ignora questa email." + no_account_till: "Il tuo account non sarà creato finché non cliccherai sul link qui sopra e ti registrerai." subject: "Hai un invito per iscriverti a Diaspora!" inviters: accept_at: ", a %{url}, lo puoi accettare tramite il link sottostante." diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml index 53feed14c..01dda7353 100644 --- a/config/locales/devise/devise.ja.yml +++ b/config/locales/devise/devise.ja.yml @@ -28,11 +28,11 @@ ja: subject: "認証手続き" you_can_confirm: "次のリンクからアカウントが認証できます。" hello: "%{email}さん、こんにちは！" - invitation: - accept: "招待を承諾する" - ignore: "招待にご興味がない場合は、このメールを無視してください。" - no_account_till: "上のリンクへアクセスして新規登録するまではアカウントが作成されません。" - subject: "ダイアスポラへ参加しませんか！" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: "、%{url}。下のリンクから承諾できます。" has_invited_you: "%{name}さんはダイアスポラへの参加を招待しています。" diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml index 37cdfc8c2..67f0c977a 100644 --- a/config/locales/devise/devise.ko.yml +++ b/config/locales/devise/devise.ko.yml @@ -28,7 +28,7 @@ ko: subject: "확인 안내" you_can_confirm: "아래 링크로 계정을 확인할 수 있습니다:" hello: "%{email} 님 환영합니다!" - invitation: + invitation_instructions: accept: "초대 수락하기" ignore: "초대를 수락하지 않으려면 이 메일을 무시하세요." no_account_till: "계정은 가입하지 않는 한 만들어지지 않습니다." diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml index 385732cb3..3b9fca46f 100644 --- a/config/locales/devise/devise.lt.yml +++ b/config/locales/devise/devise.lt.yml @@ -28,11 +28,11 @@ lt: subject: "Patvirtinimo nurodymai" you_can_confirm: "Paskyrą galima patvirtinti žemiau pateikta nuoroda:" hello: "Labas, %{email}!" - invitation: - accept: "Priimti pakvietimą" - ignore: "Jei nenori priimti pakvietimo, ignoruok šį laišką." - no_account_till: "Paskyra nebus sukurta, kol nebus pasinaudota aukščiau esančia nuoroda ir užregistruotas naujas vartotojas." - subject: "Draugas nori prisijungti prie Diasporos!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", adresu %{url} kurį galima priimti naudojantis žemiau pateikta nuoroda." has_invited_you: "%{name} kviečia prisijungti prie Diasporos" diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml index 3672a0f2f..41e2a3ff7 100644 --- a/config/locales/devise/devise.mk.yml +++ b/config/locales/devise/devise.mk.yml @@ -28,11 +28,11 @@ mk: subject: "Инструкции за потврдување" you_can_confirm: "Можете да ја потврдите вашата корисничка сметка на долниот линк:" hello: "Здраво %{email}!" - invitation: - accept: "Прифати покана" - ignore: "Ако не сакате да ја прифатите поканата, ве молиме игнорирајте го овој е-маил." - no_account_till: "Вашата корисничка сметка нема да биде креирана пред да се регистрирате на горниот линк." - subject: "Поканети сте за приклучување кон Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", на %{url}, можете да ја прифатите преку линкот подолу." has_invited_you: "%{name} ве покани да се приклучите кон Diaspora" diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml index 8cd021810..f604752dc 100644 --- a/config/locales/devise/devise.nb.yml +++ b/config/locales/devise/devise.nb.yml @@ -28,11 +28,11 @@ nb: subject: "Confirmation instructions" you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:" hello: "Hei %{email}!" - invitation: - accept: "Godta invitasjon" - ignore: "Hvis du ikke vil godta invitasjonen, kan du overse denne e-posten." - no_account_till: "Kontoen din vil ikke bli opprettet før du åpner linken ovenfor og registrerer deg." - subject: "A friend wants you to join Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", at %{url}, you can accept it through the link below." has_invited_you: "%{name} har invitert deg til å bli med på Diaspora" diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml index 4235abca2..1795751f3 100644 --- a/config/locales/devise/devise.nl.yml +++ b/config/locales/devise/devise.nl.yml @@ -28,11 +28,11 @@ nl: subject: "Bevestigingsinstructies" you_can_confirm: "Je kunt je account bevestigen via onderstaande link:" hello: "Hallo %{email}!" - invitation: - accept: "Accepteer uitnodiging" - ignore: "Indien je de uitnodiging niet wilt accepteren kun je deze mail gewoon negeren." - no_account_till: "Je account zal niet worden aangemaakt totdat je jezelf via bovenstaande link registreert." - subject: "Je bent uitgenodigd om lid te worden van Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", op %{url}, je kunt het accepteren via onderstaande link." has_invited_you: "%{name} heeft je uitgenodigd om lid te worden van Diaspora" diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml index f517962e8..de485a90e 100644 --- a/config/locales/devise/devise.pa.yml +++ b/config/locales/devise/devise.pa.yml @@ -28,7 +28,7 @@ pa: subject: "ਪੁਸ਼ਟੀ ਹਦਾਇਤਾਂ" you_can_confirm: "You can confirm your account through the link below:" hello: "Hello %{email}!" - invitation: + invitation_instructions: accept: "Accept invitation" ignore: "If you don't want to accept the invitation, please ignore this email." no_account_till: "Your account won't be created until you access the link above and sign up." diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml index 311e6604d..d804b142c 100644 --- a/config/locales/devise/devise.pl.yml +++ b/config/locales/devise/devise.pl.yml @@ -28,11 +28,11 @@ pl: subject: "Instrukcje aktywacji" you_can_confirm: "Możesz aktywować swoje konto klikając poniższy odnośnik:" hello: "Cześć %{email}!" - invitation: - accept: "Zaakceptuj zaproszenie" - ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten e-mail." - no_account_till: "Twoje konto nie zostanie założone dopóki nie klikniesz odnośnika powyżej i nie zarejestrujesz się." - subject: "Masz zaproszenie do Diaspory!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", pod adresem %{url}, możesz przyjąć zaproszenie używając poniższego odnośnika." has_invited_you: "Użytkownik %{name} zaprosił Cię do Diaspory" diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml index 0129548b4..3659e9040 100644 --- a/config/locales/devise/devise.pt-BR.yml +++ b/config/locales/devise/devise.pt-BR.yml @@ -28,11 +28,11 @@ pt-BR: subject: "Instruções para confirmação" you_can_confirm: "Você pode confirmar a sua conta através do link abaixo:" hello: "Oi %{email}!" - invitation: - accept: "Aceitar o convite" - ignore: "Se você não quer aceitar o convite, por favor ignore este email." - no_account_till: "Você somente criará sua conta ao acessar o link acima e se cadastrar." - subject: "Um amigo quer que você se junte à Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", no endereço %{url}. Para aceitá-lo, basta acessar o link abaixo." has_invited_you: "%{name} lhe convidou para entrar na Diaspora" diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml index ad5f66253..2ab7b3e40 100644 --- a/config/locales/devise/devise.pt-PT.yml +++ b/config/locales/devise/devise.pt-PT.yml @@ -6,90 +6,90 @@ pt-PT: devise: confirmations: - confirmed: "A tua conta foi confirmada com sucesso. Estás online." + confirmed: "A sua conta foi confirmada com sucesso. A sessão foi iniciada." new: resend_confirmation: "Reenviar instruções de confirmação" - send_instructions: "Vais receber um email com instruções sobre como confirmar a tua conta dentro de alguns minutos." + send_instructions: "Receberá um email com instruções sobre como confirmar a sua conta dentro de alguns minutos." failure: - inactive: "A tua conta ainda não foi activada." - invalid: "Endereço de correio ou senha inválida." - invalid_token: "Token de autenticação inválido." - locked: "A tua conta foi bloqueada." - timeout: "A sua sessão expirou, por favor faça login novamente para continuar." - unauthenticated: "Faça login ou registe-se antes de continuar." - unconfirmed: "Confirma a tua conta antes de continuar." + inactive: "A sua conta ainda não foi activada." + invalid: "Endereço de email ou senha inválidos." + invalid_token: "Código de de autentificação inválido." + locked: "A sua conta foi bloqueada." + timeout: "A sua sessão expirou, por favor inicie sessão novamente para continuar." + unauthenticated: "É necessário iniciar sessão ou registar-se antes de continuar." + unconfirmed: "Precisa confirmar a sua conta antes de continuar." invitations: - invitation_token_invalid: "O código de convite que introduziste não é válido!" - send_instructions: "O teu convite foi enviado." - updated: "A tua senha foi definida com sucesso. Estás online." + invitation_token_invalid: "O código de convite que introduziu não é válido!" + send_instructions: "O seu convite foi enviado." + updated: "A sua palavra-passe foi definida com sucesso. A sessão foi iniciada." mailer: confirmation_instructions: confirm: "Confirmar a minha conta" subject: "Instruções de confirmação" - you_can_confirm: "Podes confirmar a tua conta através do seguinte link:" + you_can_confirm: "Pode confirmar a sua conta através da seguinte hiperligação:" hello: "Olá, %{email}!" - invitation: + invitation_instructions: accept: "Aceitar o convite" - ignore: "Se não pretenderes aceitar este convite, por favor ignora este email." - no_account_till: "A tua conta não será criada até que acedas ao link acima e te registes" - subject: "Foste convidado(a) para te juntares ao Diaspora!" + ignore: "Se não deseja aceitar o convite, por favor ignore este email." + no_account_till: "A sua conta não será criada até que aceda à hiperligação acima e se registe." + subject: "Foi convidado para se juntar ao Diaspora!" inviters: - accept_at: ", em %{url}, pode aceitar através do seguinte link:" - has_invited_you: "%{name} convidou-te para o Diaspora" - have_invited_you: "%{names} convidaram-te para o Diaspora" + accept_at: ", em %{url}, pode aceitar através da seguinte hiperligação:" + has_invited_you: "%{name} convidou-o para se juntar ao Diaspora" + have_invited_you: "%{names} convidaram-no para se juntar ao Diaspora" reset_password_instructions: - change: "Alterar a minha senha" - ignore: "Se não fizeste este pedido, por favor ignora este email." - someone_requested: "Alguém pediu para alterar a tua senha, e podes alterar a mesma através do seguinte link" + change: "Alterar a minha palavra-passe" + ignore: "Se não fez este pedido, por favor ignore este email." + someone_requested: "Alguém pediu para alterar a sua palavra-passe, isso pode ser feito através da hiperligação abaixo." subject: "Instruções de reposição da palavra-passe" - wont_change: "A tua senha não será modificada até clicares no link acima e criares uma nova senha. " + wont_change: "A sua palavra-passe não será alterada até que aceda à hiperligação acima e crie uma nova palavra-passe. " unlock_instructions: - account_locked: "A tua conta foi bloqueada devido a um número excessivo de tentativas de login falhadas." - click_to_unlock: "Clica no link abaixo para desbloquear a tua conta:" + account_locked: "A sua conta foi bloqueada devido a um número excessivo de tentativas de inicio de sessão falhadas." + click_to_unlock: "Clique na hiperligação abaixo para desbloquear a sua conta:" subject: "Instruções de Desbloqueio" unlock: "Desbloquear a minha conta" welcome: "Bem-vindo(a), %{email}!" passwords: edit: - change_password: "Alterar a minha senha" + change_password: "Alterar a minha palavra-passe" new: - forgot_password: "Esqueceste-te da tua senha?" - no_account: "No account with this email exsists. If you are waiting for an invite, we are rolling them out as soon as possible" - send_password_instructions: "Enviem-me as instruções para modificar a minha senha" - send_instructions: "Vais receber um email com instruções sobre como alterar a senha dentro de alguns minutos." - updated: "A tua senha foi alterada com sucesso. Estás online." + forgot_password: "Esqueceu-se da sua palavra-passe?" + no_account: "Não existe nenhuma conta com este endereço de email. Se está a esperar por um convite, estamos a distribuí-los tão rapidamente quanto é possível" + send_password_instructions: "Enviem-me as instruções para modificar a minha palavra-passe" + send_instructions: "Vai receber um email com instruções sobre como alterar a sua palavra-passe dentro de alguns minutos." + updated: "A sua palavra-passe foi alterada com sucesso. A sessão foi iniciada." registrations: - destroyed: "Adeus! A sua tua foi cancelada com sucesso. Esperamos ver-te de novo brevemente." - signed_up: "Registo bem sucedido. Se assim escolheste, uma confirmação foi enviada para o teu email." - updated: "Actualizaste a tua conta com sucesso." + destroyed: "Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente." + signed_up: "Foi registado com sucesso. Caso tenha seleccionado essa opção, uma confirmação foi enviada para o seu endereço de email." + updated: "Actualizou a sua conta com sucesso." sessions: new: - alpha_software: "Estás preste a utilizar um programa em fase \"alpha\"." - bugs_and_feedback: "Tem em atenção que irão ocorrer erros. Encorajamos-te a usar o botão de Feedback na margem direita do teu navegador para reportar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que denunciares." - bugs_and_feedback_mobile: "Be advised, you will experience bugs. We encourage you to report any hiccups! We will work as fast as we can to resolve any issues you report." - login: "Login" + alpha_software: "Está prestes a utilizar software em fase \"alfa\"." + bugs_and_feedback: "Tenha em conta que irão ocorrer erros. Encorajamo-lo a usar o botão de Feedback na margem direita do seu navegador para relatar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que relatar." + bugs_and_feedback_mobile: "Tenha em conta que irão ocorrer erros. Encorajamo-lo a relatar quaisquer anomalias! Trabalharemos tão rapidamente quanto possível para resolver quaisquer problemas que relate." + login: "Iniciar sessão" modern_browsers: "apenas suporta navegadores modernos." password: "Palavra-passe" - remember_me: "Recordar-me" - sign_in: "Entrar" - username: "Nome de utilizador" - signed_in: "Login com sucesso." - signed_out: "Logout com sucesso." + remember_me: "Lembrar-se de mim" + sign_in: "Iniciar sessão" + username: "Nome de Utilizador" + signed_in: "A sessão foi iniciada com sucesso." + signed_out: "A sessão foi terminada com sucesso." shared: links: - forgot_your_password: "Esqueceste-te da tua senha?" - receive_confirmation: "Não recebeste as instruções de confirmação?" - receive_unlock: "Não recebeste as instruções de desbloqueio?" - sign_in: "Entrar" - sign_up: "Regista-te" + forgot_your_password: "Esqueceu-se da sua palavra-passe?" + receive_confirmation: "Não recebeu as instruções de confirmação?" + receive_unlock: "Não recebeu as instruções de desbloqueio?" + sign_in: "Iniciar sessão" + sign_up: "Registe-se" sign_up_closed: "Os registos abertos não estão disponíveis por agora." mail_signup_form: - sign_up_for_an_invite: "Sign up for an invite!" + sign_up_for_an_invite: "Inscreva-se para receber um convite!" unlocks: new: resend_unlock: "Reenviar instruções de desbloqueio" - send_instructions: "Vais receber uma mensagem sobre como desbloquear a tua conta dentro de alguns minutos." - unlocked: "A tua conta foi desbloqueada com sucesso. Estás online." + send_instructions: "Receberá um email sobre como desbloquear a sua conta dentro de alguns minutos." + unlocked: "A sua conta foi desbloqueada com sucesso. A sessão foi iniciada." errors: messages: already_confirmed: "já foi confirmado" diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml index b87d1a402..c74514abb 100644 --- a/config/locales/devise/devise.ro.yml +++ b/config/locales/devise/devise.ro.yml @@ -28,11 +28,11 @@ ro: subject: "Instrucţiuni de confirmare" you_can_confirm: "Puteţi confirma contul dvs. prin intermediul link-ul de mai jos:" hello: "Bună %{email}!" - invitation: - accept: "Acceptă invitaţia" - ignore: "Dacă nu doreşti sa accepţi invitaţia, ignorează acest mesaj." - no_account_till: "Contul dvs. nu va fi creat până când nu veţi accesa linkul de mai sus şi vă veţi înscrie." - subject: "Un prieten vrea să te vadă pe Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", la %{url}, puteţi să-l acceptaţi prin link-ul de mai jos" has_invited_you: "%{name} v-a invitat pe Diaspora" diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml index aa2c9c93a..b219db800 100644 --- a/config/locales/devise/devise.ru.yml +++ b/config/locales/devise/devise.ru.yml @@ -28,11 +28,11 @@ ru: subject: "Инструкции по подтверждению" you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке:" hello: "Привет %{email}!" - invitation: - accept: "Принять приглашение" - ignore: "Если вы не хотите принимать приглашение, проигнорируйте это письмо." - no_account_till: "Ваш аккаунт будет создан только тогда, если вы подтвердите линк и зарегистрируетесь." - subject: "Вас пригласили присоединиться к Диаспоре!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: "вы можете принять его, нажaв на ссылку %{url}" has_invited_you: "%{name} приглашает вас присоединиться к Диаспоре" diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml index d51f746f4..420f694ae 100644 --- a/config/locales/devise/devise.sk.yml +++ b/config/locales/devise/devise.sk.yml @@ -28,11 +28,11 @@ sk: subject: "Informácie na potvrdenie" you_can_confirm: "Váš účet môžete potvrdiť kliknutím na tento odkaz :" hello: "Zdravím %{email}!" - invitation: - accept: "Potvrdiť pozvánku" - ignore: "Ak nechcete potvrdiť pozvanie, tento e-mail prosím ignorujte." - no_account_till: "Pre dokončenie registrácie kliknite prosím na odkaz uvedený nižšie." - subject: "Boli ste prizvaný k Diaspore!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", na %{url}, akceptujte kliknutím na odkaz." has_invited_you: "%{name} Vás prizval k Diaspore" diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml index 1861279bc..02c6b1007 100644 --- a/config/locales/devise/devise.sl.yml +++ b/config/locales/devise/devise.sl.yml @@ -28,11 +28,11 @@ sl: subject: "Navodila za potrditev uporabniškega računa" you_can_confirm: "Vaš uporabniški račun lahko potrdite s pomočjo spodnje povezave:" hello: "Pozdravljeni %{email}!" - invitation: - accept: "Sprejmi povabilo" - ignore: "V kolikor ne želite sprejeti povabila, to e-sporočilo vzamite kot brezpredmetno." - no_account_till: "S pomočjo zgornje povezave ter vašo prijavo boste ustvarili nov uporabniški račun." - subject: "Bili ste povabljeni, da se pridružite v Diasporo!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", na %{url}, lahko potrdite s pomočjo spodnje povezave." has_invited_you: "%{name} vas je povabil, da se pridružite v Diasporo" diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml index 65cf81dae..0c19a27e2 100644 --- a/config/locales/devise/devise.sv.yml +++ b/config/locales/devise/devise.sv.yml @@ -28,11 +28,11 @@ sv: subject: "Instruktioner för att aktivera ditt konto" you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:" hello: "Hej %{email}!" - invitation: + invitation_instructions: accept: "Acceptera inbjudan" - ignore: "Om du inte vill gå med i Diaspora kan du ignorera detta mail." - no_account_till: "Ditt konto kommer inte skapas förrän du klickat på knappen ovan och skapat ett nytt konto." - subject: "Du har blivit inbjuden till Diaspora!" + ignore: "Om du inte vill acceptera inbjudan, var snäll och ignorera detta email." + no_account_till: "Ditt konto kommer inte att skapas förren du besöker länken ovan och registrerar dig." + subject: "Du har blivit inbjuden till att gå med i Diaspora!" inviters: accept_at: ", du kan acceptera din inbjudan på %{url}." has_invited_you: "%{name} vill att du ska gå med i Diaspora" diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml index 1640c0b6f..cddd8f932 100644 --- a/config/locales/devise/devise.tr.yml +++ b/config/locales/devise/devise.tr.yml @@ -28,11 +28,11 @@ tr: subject: "Doğrulama talimatları" you_can_confirm: "Hesabınızı aşağıdaki bağlantı ile doğrulayabilirsiniz:" hello: "Merhaba %{email}!" - invitation: - accept: "Daveti kabul et" - ignore: "Eğer daveti kabul etmek istemiyorsanız, bu e-postayı yoksayın." - no_account_till: "Hesabınız siz yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır." - subject: "Bir arkadaşınız sizin Diaspora'ya katılmanızı istiyor!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", %{url}, aşağıdaki linke tıklayarak bunu kabul edebilirsiniz." has_invited_you: "%{name} sizi Diaspora'ya katılmanız için davet etti" diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml index 955c6d3f5..2ea8499d6 100644 --- a/config/locales/devise/devise.zh-CN.yml +++ b/config/locales/devise/devise.zh-CN.yml @@ -28,11 +28,11 @@ zh-CN: subject: "帐号确认步骤" you_can_confirm: "你可以点击下面的链接确认帐号：" hello: "您好, %{email}!" - invitation: - accept: "接受邀请" - ignore: "如果您不想接受邀请, 请忽略这封邮件。" - no_account_till: "点击以上链接并注册后, 你才能创建帐号。" - subject: "您被邀请加入Diaspora！" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: " （%{url}）, 你可以点击下面的链接接收邀请。" has_invited_you: "%{name} 邀请您加入Diaspora" diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml index 03d864568..fcbe4ad4c 100644 --- a/config/locales/devise/devise.zh-TW.yml +++ b/config/locales/devise/devise.zh-TW.yml @@ -28,11 +28,11 @@ zh-TW: subject: "確認步驟" you_can_confirm: "你可以使用以下連結確認帳號:" hello: "你好, %{email}!" - invitation: - accept: "接受邀請" - ignore: "如果你不想接受邀請, 請忽略這封信件." - no_account_till: "在使用以上連結並登記後, 你的帳號才會建立." - subject: "有人邀請你加入 Diaspora!" + invitation_instructions: + accept: "Accept invitation" + ignore: "If you don't want to accept the invitation, please ignore this email." + no_account_till: "Your account won't be created until you access the link above and sign up." + subject: "You've been invited to join Diaspora!" inviters: accept_at: ", 在 %{url}, 你可以透過以下連結來接受." has_invited_you: "%{name} 邀請你加入 Diaspora" diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index b330f0d12..2246af5ad 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -615,7 +615,7 @@ cs: email_notifications_changed: "Oznámení emailem změněno" language_changed: "Jazyk změněn" language_not_changed: "Změna jazyka selhala" - password_changed: "Heslo změněno" + password_changed: "Heslo bylo změněno. Nyní se můžete přihlásit s novým heslem." password_not_changed: "Změna hesla selhala" webfinger: fetch_failed: "Selhalo načtení webfinger profilu pro %{profile_url}" diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index 9f53fcc1a..9b5b81775 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -615,7 +615,7 @@ eu: email_notifications_changed: "E-posta janirazpenak aldatu dituzu" language_changed: "Hizkuntza Aldatua" language_not_changed: "Hizkuntza aldaketak huts egin du" - password_changed: "Pasahitza aldatu duzu" + password_changed: "Pasahitza aldatu duzu. Orain zure pasahitz berria erabiliz sar zaitezke." password_not_changed: "Pasahitz Aldaketak Huts egin du" webfinger: fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index 4ecf55a59..e37815cd0 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -123,7 +123,7 @@ it: few: "%{count} commenti" many: "%{count} commenti" new_comment: - comment: "commento" + comment: "Commento" commenting: "Invio commento in corso..." one: "1 commento" other: "%{count} commenti" @@ -236,16 +236,16 @@ it: likes: likes: people_dislike_this: - few: "non piace a %{count} persone" - many: "non piace a %{count} persone " - one: "non piace ad una persona " - other: "non piace a %{count} persone" + few: "non piace a %{count}" + many: "non piace a %{count}" + one: "Non piace a %{count}" + other: "non piace a %{count}" zero: "non piace a zero persone" people_like_this: - few: "piace a %{count} persone" - many: "piace a %{count} persone" - one: "piace ad una persona" - other: "piace a %{count} persone" + few: "piace a %{count}" + many: "Piace a %{count}" + one: "piace a %{count}" + other: "piace a %{count}" zero: "piace a nessuno" more: "Altro" next: "successivo" @@ -267,7 +267,7 @@ it: and_others: "e altri %{number}" mark_all_as_read: "Segna Tutti come Letti" notifications: "Notifiche" - liked: "has just liked your post" + liked: "ha appena apprezzato il tuo post" mentioned: "ti ha menzionato in un " new_request: "vuole condividere con te." post: "post." @@ -285,9 +285,9 @@ it: diaspora: "l'email robot di diaspora" hello: "Ciao %{name}!" liked: - liked: "%{name} has just liked your post: " - sign_in: "Sign to view it" - subject: "%{name} has just liked your post" + liked: "%{name} ha appena apprezzato il tuo post: " + sign_in: "Accedi per vedere l'elemento" + subject: "%{name} ha appena apprezzato il tuo post" love: "amore," manage_your_email_settings: "gestisci le tue impostazioni email" mentioned: @@ -545,7 +545,7 @@ it: stream_element: dislike: "Non mi piace" like: "Mi piace" - unlike: "Unlike" + unlike: "Non come" status_messages: create: success: "Menzionati con successo: %{names}" @@ -584,7 +584,7 @@ it: download_xml: "scarica il mio xml" edit_account: "Modifica account" export_data: "Esporta Dati" - liked: "...someone likes your post?" + liked: "...a qualcuno piace il tuo post?" mentioned: "...sei menzionato in un post?" new_password: "Nuova Password" private_message: "...hai ricevuto un messaggio privato?" @@ -615,7 +615,7 @@ it: email_notifications_changed: "Notifiche email modificate con successo" language_changed: "Lingua Cambiata" language_not_changed: "Cambio di lingua fallito" - password_changed: "Password Cambiata" + password_changed: "Password Cambiata. Ora puoi effettuare l'accesso con la tua nuova password." password_not_changed: "Cambio di password fallito" webfinger: fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 96ebab9cf..4a6d1500e 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -6,8 +6,8 @@ pt-PT: _comments: "Comentários" _home: "Início" - _photos: "Fotografias" - _services: "Serviços" + _photos: "fotografias" + _services: "serviços" account: "Conta" activerecord: errors: @@ -32,12 +32,12 @@ pt-PT: invalid: "é inválido." username: taken: "já existe." - ago: "%{time} atrás" + ago: "Há %{time} atrás" all_aspects: "All aspects" application: helper: diaspora_alpha: "DIASPORA* ALPHA" - unknown_person: "utilizador(a) desconhecido(a)" + unknown_person: "pessoa desconhecida" video_title: unknown: "Video sem título " are_you_sure: "Tem a certeza?" @@ -48,8 +48,8 @@ pt-PT: success: "Pessoa removida com sucesso do aspecto." aspects: add_to_aspect: - failure: "Falha ao adicionar amigo ao grupo." - success: "Amigo adicionado com sucesso ao grupo." + failure: "Falha ao adicionar contacto ao aspecto." + success: "Contacto adicionado ao aspecto com sucesso." aspect_contacts: done_editing: "finalizar edição" aspect_stream: @@ -59,8 +59,8 @@ pt-PT: contacts_not_visible: "Contactos neste aspecto não se verão uns aos outros." contacts_visible: "Contactos neste aspecto ver-se-ão uns aos outros." create: - failure: "A criação do grupo falhou." - success: "O teu novo grupo %{name} foi criado" + failure: "A criação do aspecto falhou." + success: "O seu novo aspecto %{name} foi criado" destroy: failure: "%{name} não se encontra vazio e não pôde ser removido." success: "%{name} foi removido(a) com sucesso." @@ -78,17 +78,17 @@ pt-PT: few: "%{count} aspectos" helper: are_you_sure: "Tem a certeza que deseja eliminar este aspecto?" - aspect_not_empty: "Mini-Perfil não está vazio" + aspect_not_empty: "Aspecto não vazio" remove: "remover" index: handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar." no_contacts: "Nenhum contacto" post_a_message: "post a message >>" manage: - add_a_new_aspect: "Adicionar um novo grupo" + add_a_new_aspect: "Adicionar um novo aspecto" add_a_new_contact: "Adicionar um novo contacto" drag_to_add: "Arrasta para adicionar pessoas" - manage_aspects: "Gerir Grupos" + manage_aspects: "Gerir aspectos" no_requests: "Não existem novos pedidos" requests: "Pedidos" many: "%{count} aspectos" @@ -100,7 +100,7 @@ pt-PT: create: "Criar" name: "Nome" no_posts_message: - start_talking: "Ainda ninguém disse nada. Dá início à conversa!" + start_talking: "Ainda ninguém disse nada. Dê início à conversa!" one: "1 aspecto" other: "%{count} aspectos" seed: @@ -110,7 +110,7 @@ pt-PT: edit_aspect: "editar Grupo" update: failure: "Your aspect, %{name}, had too long name to be saved." - success: "O teu grupo, %{name}, foi editado com sucesso." + success: "O seu aspecto, %{name}, foi editado com sucesso." zero: "nenhum aspecto" back: "Voltar" bookmarklet: @@ -178,7 +178,7 @@ pt-PT: email: "Email" error_messages: helper: - correct_the_following_errors_and_try_again: "Corrige os seguintes erros e tenta novamente." + correct_the_following_errors_and_try_again: "Corrija os seguintes erros e volte a tentar." invalid_fields: "Campos Inválidos" fill_me_out: "Informa-me" hide: "Hide" @@ -198,13 +198,13 @@ pt-PT: tagline_second_half: "com quem desejar." invitations: check_token: - not_found: "Token de convite não encontrado" + not_found: "Código de convite não encontrado" create: already_contacts: "Você já está ligado a esta pessoa" already_sent: "Você já convidou esta pessoa." - no_more: "Não tens mais convites." + no_more: "Não tem mais convites." rejected: "Os seguintes endereços de email tiveram problemas: " - sent: "Os teu convites foram enviados a:" + sent: "Os convites foram enviados a:" edit: sign_up: "registar" new: @@ -212,10 +212,10 @@ pt-PT: aspect: "Aspecto" comma_seperated_plz: "Podes inserir vários endereços de email separados por vírgulas." if_they_accept_info: "se aceitarem, serão adicionados ao aspecto com que os convidou." - invite_someone_to_join: "Convida alguém para se juntar ao Diaspora!" + invite_someone_to_join: "Convide alguém para se juntar ao Diaspora!" personal_message: "Personal message" resend: "Reenviar" - send_an_invitation: "Envia um convite" + send_an_invitation: "Envie um convite" send_invitation: "Enviar convite" to: "Para" layouts: @@ -314,8 +314,8 @@ pt-PT: thanks: "Obrigado," ok: "OK" or: "ou" - password: "Palavra-chave" - password_confirmation: "Confirmação de palavra-chave" + password: "Palavra-passe" + password_confirmation: "Confirmação de palavra-passe" people: add_contact_small: add_contact_from_tag: "add contact from tag" @@ -329,15 +329,15 @@ pt-PT: couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!" no_one_found: "...e ninguém foi encontrado." no_results: "Hey! You need to search for something." - results_for: "resultados de pesquisa para" + results_for: "resultados da pesquisa para" many: "%{count} people" one: "1 person" other: "%{count} people" person: add_contact: "adicionar contacto" already_connected: "Já está ligado" - pending_request: "pedido pendente" - thats_you: "És tu!" + pending_request: "Pedido pendente" + thats_you: "É você!" profile_sidebar: bio: "sobre" born: "nascido a" @@ -355,7 +355,7 @@ pt-PT: incoming_request: "Tens um pedido desta pessoa" mention: "Mention" message: "Message" - no_posts: "Não existem entradas para mostrar!" + no_posts: "Não existem publicações para mostrar!" not_connected: "You are not connected with this person" recent_posts: "Recent Posts" recent_public_posts: "Recent Public Posts" @@ -379,7 +379,7 @@ pt-PT: new: back_to_list: "Voltar à Lista" new_photo: "Nova Fotografia" - post_it: "Publica!" + post_it: "Publique!" new_photo: empty: "{file} está vazio, por favor escolhe novamente os ficheiros sem este último." invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}." @@ -394,14 +394,14 @@ pt-PT: delete_photo: "Apagar Fotografia" edit: "editar" edit_delete_photo: "Editar descrição da fotografia / apagar fotografia" - make_profile_photo: "criar foto de perfil" + make_profile_photo: "tornar foto de perfil" original_post: "Original Post" permalink: "permalink" update_photo: "Actualizar Fotografia" view: "ver" update: error: "Falha ao editar a fotografia" - notice: "Fotografia adicionada com sucesso." + notice: "Fotografia actualizada com sucesso." post_visibilites: update: post_hidden: "%{name}'s post has been hidden." @@ -432,7 +432,7 @@ pt-PT: registrations: closed: "Os registos estão encerrados neste pod do Diaspora." create: - success: "Juntaste-te ao Diaspora!" + success: "Juntou-se ao Diaspora!" edit: cancel_my_account: "Cancelar a minha conta" edit: "Editar %{name}" @@ -445,16 +445,16 @@ pt-PT: enter_password: "Insira uma senha" enter_password_again: "Insira a mesma senha que anteriormente" enter_username: "Escolha um nome de utilizador (apenas letras, números e underscores)" - sign_up: "Registar" - sign_up_for_diaspora: "Regista-te no Diaspora" + sign_up: "Registar-se" + sign_up_for_diaspora: "Registe-se no Diaspora" requests: create: sending: "A enviar..." sent: "Você solicitou partilhar com %{name}, que será notificado assim que entrar no Diaspora." destroy: - error: "Por favor, escolhe um grupo!" - ignore: "Ignorar pedido de contacto." - success: "São agora amigos." + error: "Por favor, seleccione um aspecto!" + ignore: "Pedido de contacto ignorado." + success: "Já estão a partilhar." helper: new_requests: few: "%{count} novos pedidos!" @@ -470,9 +470,9 @@ pt-PT: search: "Procurar" services: create: - success: "Autenticação bem sucedida." + success: "Autentificação bem sucedida." destroy: - success: "A autenticação foi destruída com sucesso." + success: "A autentificação foi destruída com sucesso." failure: error: "there was an error connecting that service" finder: @@ -497,7 +497,7 @@ pt-PT: remote_friend: invite: "invite" resend: "resend" - settings: "Definições " + settings: "Definições" shared: add_contact: create_request: "Encontrar através do nome de utilizador no Diaspora" @@ -523,7 +523,7 @@ pt-PT: notification: new: "Novo %{type} de %{from}" public_explain: - logged_in: "Registado em %{service}" + logged_in: "Sessão iniciada em %{service}" manage: "Gerir ligações a outros serviços" outside: "As mensagens públicas ficarão visíveis a pessoas fora do Diaspora." title: "Estás prestes a publicar uma mensagem pública!" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index a63707a26..cfa66042d 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -53,9 +53,9 @@ sv: aspect_contacts: done_editing: "dölj" aspect_stream: - activity: "aktivitet" - post_time: "skickat " - sort_by: "sortera efter:" + activity: "Aktivitet" + post_time: "Skickat " + sort_by: "Sortera efter:" contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra." contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra." create: @@ -83,7 +83,7 @@ sv: index: handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora." no_contacts: "Inga kontakter" - post_a_message: "post a message >>" + post_a_message: "skriv ett inlägg >>" manage: add_a_new_aspect: "Lägg till en ny aspekt" add_a_new_contact: "Lägg till en ny kontakt" @@ -114,7 +114,7 @@ sv: zero: "inga aspekter" back: "Tillbaka" bookmarklet: - explanation: "%{link} från var som helst genom att lägga till denhär länken som bokmärke." + explanation: "%{link} från var som helst genom att lägga till den här länken som bokmärke." explanation_link_text: "Posta på Diaspora" post_something: "Posta något till Diaspora" post_success: "Postat! Stänger!" @@ -123,7 +123,7 @@ sv: few: "%{count} kommentarer" many: "%{count} kommentarer" new_comment: - comment: "kommentar" + comment: "Kommentera" commenting: "Kommenterar..." one: "1 kommentar" other: "%{count} kommentarer" @@ -229,24 +229,24 @@ sv: header: blog: "blogg" code: "källkod" - login: "logga in" - logout: "logga ut" + login: "Logga in" + logout: "Logga ut" profile: "profil" - settings: "inställningar" + settings: "Inställningar" likes: likes: people_dislike_this: few: "%{count} personer ogillade dethär" many: "%{count} personer ogillade dethär" one: "1 person ogillade dethär" - other: "%{count} person ogillade dethär" - zero: "inga personer ogillade dethär" + other: "%{count} person ogillade det här" + zero: "inga personer ogillade det här" people_like_this: - few: "%{count} personer gillade dethär" - many: "%{count} personer gillade dethär" - one: "1 person gillade dethär" - other: "%{count} personer gillade dethär" - zero: "inga personer gillade dethär" + few: "%{count} personer gillade det här" + many: "%{count} personer gillade det här" + one: "1 person gillade det här" + other: "%{count} personer gillade det här" + zero: "inga personer gillade det här" more: "Mer" next: "nästa" no_results: "Inga Resultat Funna" @@ -267,7 +267,7 @@ sv: and_others: "och %{number} andra" mark_all_as_read: "Markera alla som läst" notifications: "Notifieringar" - liked: "has just liked your post" + liked: "har precis gillat ditt inlägg" mentioned: "har nämnt dig i deras" new_request: "erbjöd sig att dela med dig." post: "meddelande" @@ -285,9 +285,9 @@ sv: diaspora: "Diasporas mailrobot" hello: "Hej %{name}!" liked: - liked: "%{name} has just liked your post: " + liked: "%{name} har precis gillat ditt inlägg: " sign_in: "Sign to view it" - subject: "%{name} has just liked your post" + subject: "%{name} har precis gillat ditt inlägg" love: "hälsningar," manage_your_email_settings: "administrera dina epost-inställningar" mentioned: @@ -360,7 +360,7 @@ sv: recent_posts: "Postat nyligen" recent_public_posts: "Senaste publika inlägg" return_to_aspects: "Återgå till översikten" - see_all: "See all" + see_all: "Visa alla" start_sharing: "börja dela" to_accept_or_ignore: "for att acceptera eller ignorera." you_have_no_tags: "du har inga taggar!" @@ -514,7 +514,7 @@ sv: invitations: by_email: "by Emaila" dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!" - from_facebook: "Från Facebook" + from_facebook: "från Facebook" invitations_left: "(%{count} kvar)" invite_someone: "Bjud in en kontakt" invite_your_friends: "Bjud in dina vänner" @@ -543,9 +543,9 @@ sv: reshare: reshare: "Återdela" stream_element: - dislike: "Jag ogillar dethär" - like: "Jag gillar dethär" - unlike: "Unlike" + dislike: "Jag ogillar det här" + like: "Jag gillar det här" + unlike: "Sluta gilla" status_messages: create: success: "Lyckades omnämna: %{names}" @@ -584,7 +584,7 @@ sv: download_xml: "Ladda ner min xml" edit_account: "Ändra konto" export_data: "Exportera data" - liked: "...someone likes your post?" + liked: "...någon gillar ditt inlägg?" mentioned: "...du är omnämnd i en post?" new_password: "Nytt lösenord" private_message: "...du mottar ett privat meddelande?" diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index b20179afd..10b718fc9 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -7,7 +7,7 @@ sv: javascripts: confirm_dialog: "Är du säker?" infinite_scroll: - no_more: "No more posts." + no_more: "Inga fler inlägg." publisher: at_least_one_aspect: "Du måste publicera till minst en aspekt." search_for: "Sök efter {{name}}" @@ -34,4 +34,4 @@ sv: unknown: "Okänd videotyp" watch: "Se denhär videon på {{provider}}" web_sockets: - disconnected: "The websocket is closed; posts will no longer be streamed live." + disconnected: "Webbsockeln är stängd; inlägg kommer inte längre att bli direktstreamade." From e33888691087932e52fa8d5ddec127f32defbec4 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 16 May 2011 15:16:01 +0200 Subject: [PATCH 36/38] fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled --- app/views/sessions/new.haml | 1 + public/javascripts/login.js | 24 ++++---- public/stylesheets/sass/login.sass | 89 ------------------------------ public/stylesheets/sass/login.scss | 12 ---- 4 files changed, 15 insertions(+), 111 deletions(-) delete mode 100644 public/stylesheets/sass/login.sass diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 37d0ee01b..202980c19 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -39,6 +39,7 @@ - if devise_mapping.rememberable? = f.check_box :remember_me, :tabindex => 3 = f.label :remember_me, t('devise.sessions.new.remember_me') + %br = f.submit t('devise.sessions.new.sign_in'), :tabindex => 4 diff --git a/public/javascripts/login.js b/public/javascripts/login.js index 7a9c4f766..0c0b89190 100644 --- a/public/javascripts/login.js +++ b/public/javascripts/login.js @@ -14,6 +14,14 @@ $(document).ready( function(){ var contentFilled = function(){ return($('#user_username').val() != "" && $('#user_password').val() != ""); } + + var checkSubmitAvailability = function() { + if(contentFilled()){ + controls.removeClass('hidden'); + }else{ + controls.addClass('hidden'); + } + } $("#login").center(); $(window).resize(function(){ @@ -27,17 +35,13 @@ $(document).ready( function(){ controls.addClass('hidden'); }); - $(document).keyup(function(){ - if(contentFilled()){ - controls.removeClass('hidden'); - }else{ - controls.addClass('hidden'); - } - }); + $(document).keyup(checkSubmitAvailability); - if(contentFilled()){ - controls.removeClass('hidden'); - } + // Check if the browser has pre-filled the form + checkSubmitAvailability(); + + // Check it again + setTimeout(checkSubmitAvailability, 1000); password .focus(function(){ diff --git a/public/stylesheets/sass/login.sass b/public/stylesheets/sass/login.sass deleted file mode 100644 index 1a0532bcc..000000000 --- a/public/stylesheets/sass/login.sass +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) 2010, Diaspora Inc. This file is -// licensed under the Affero General Public License version 3 or later. See -// the COPYRIGHT file. - -@import 'mixins' - -$blue: #3F8FBA -$red: #FF0000 -$background: rgb(252,252,252) - -body - :background-color $background - -.hidden - :display none - -#login - :width 600px - :padding - :top 10% - :bottom 20% - :text - :align center - :display inline-block - - form - input, - label - :font - :size 14px - :display inline - - label - :top 10px - :left 12px - :text-shadow none - - input[type='text'], - input[type='password'] - :-webkit-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :-moz-box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :box-shadow 0 1px 0px #fff, 0 -1px 0px #888 - :width 180px - :max-width 180px - - p - :display inline-block - :position relative - :width 200px - - span - :display inline-block - - &.submit - :width auto - :bottom 15px - - input - :width auto - :position relative - :height 40px - :top 0px - :color #666 - :margin - :bottom 10px - &:hover - :color #444 - - #forgot_password_link - :text-align left - :position absolute - :left 205px - :top 12px - :width 150px - :color #999 - - .controls.hidden - :display none - - #remember_me - :position absolute - :top 0 - :left 4px - - #user_submit - :position absolute - :top -6px - :right 5px - diff --git a/public/stylesheets/sass/login.scss b/public/stylesheets/sass/login.scss index 7deb19a6b..d787c855c 100644 --- a/public/stylesheets/sass/login.scss +++ b/public/stylesheets/sass/login.scss @@ -84,18 +84,6 @@ @include opacity(0); } } - - #remember_me { - position: absolute; - top: 0; - left: 4px; - } - - #user_submit { - position: absolute; - top: -6px; - right: 5px; - } } } From 956f0044a9c019829244813275d531e93a490f3c Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 16 May 2011 16:21:13 +0200 Subject: [PATCH 37/38] set @contacts_of_contact_count in photos#index, thanks LPrelle --- app/controllers/photos_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 94f40d728..f0293f372 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -23,9 +23,11 @@ class PhotosController < ApplicationController if @contact @aspects_with_person = @contact.aspects @contacts_of_contact = @contact.contacts + @contacts_of_contact_count = @contact.contacts.count else @contact = Contact.new @contacts_of_contact = [] + @contacts_of_contact_count = 0 end @posts = current_user.posts_from(@person).where(:type => 'Photo').paginate(:page => params[:page]) From 8c1e64a080ea78e23ad4263b2558b62bbe4d4314 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 16 May 2011 21:02:15 +0200 Subject: [PATCH 38/38] updated locales --- config/locales/devise/devise.bg.yml | 6 +- config/locales/devise/devise.el.yml | 4 +- config/locales/devise/devise.eu.yml | 8 +- config/locales/diaspora/bg.yml | 68 +++++------ config/locales/diaspora/it.yml | 18 +-- config/locales/diaspora/pt-PT.yml | 120 ++++++++++---------- config/locales/diaspora/sv.yml | 34 +++--- config/locales/javascript/javascript.it.yml | 2 +- config/locales/javascript/javascript.sv.yml | 2 +- 9 files changed, 131 insertions(+), 131 deletions(-) diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml index 6b2cb6779..643047ca6 100644 --- a/config/locales/devise/devise.bg.yml +++ b/config/locales/devise/devise.bg.yml @@ -30,9 +30,9 @@ bg: hello: "Здравейте %{email}!" invitation_instructions: accept: "Accept invitation" - ignore: "If you don't want to accept the invitation, please ignore this email." - no_account_till: "Your account won't be created until you access the link above and sign up." - subject: "You've been invited to join Diaspora!" + ignore: "Ако не желаете да приемете поканата, моля игнорирайте писмото." + no_account_till: "Акаунтът няма да бъде създаден докато не посетите горната връзката и се регистрирате." + subject: "Поканени сте да се присъедините към Diaspora!" inviters: accept_at: ", на адрес %{url}. Можете да приемете поканата чрез линка по-долу." has_invited_you: "%{name} ви кани да се присъедините към Diaspora" diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml index a8233900c..0e7adc63e 100644 --- a/config/locales/devise/devise.el.yml +++ b/config/locales/devise/devise.el.yml @@ -29,8 +29,8 @@ el: you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:" hello: "Γειά σου %{email}!" invitation_instructions: - accept: "Accept invitation" - ignore: "If you don't want to accept the invitation, please ignore this email." + accept: "Αποδοχή πρόσκλησης" + ignore: "Εάν δεν θέλετε να αποδεχτήτε την πρόσκληση, παρακαλώ αγνοήστε αυτό το email." no_account_till: "Your account won't be created until you access the link above and sign up." subject: "You've been invited to join Diaspora!" inviters: diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml index ffd0e3238..49311f78d 100644 --- a/config/locales/devise/devise.eu.yml +++ b/config/locales/devise/devise.eu.yml @@ -29,10 +29,10 @@ eu: you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:" hello: "Kaixo %{email}!" invitation_instructions: - accept: "Accept invitation" - ignore: "If you don't want to accept the invitation, please ignore this email." - no_account_till: "Your account won't be created until you access the link above and sign up." - subject: "You've been invited to join Diaspora!" + accept: "Gonbidapena" + ignore: "Ez baduzu gonbidapena onartu nahi, mesedez egin iezaiozu ez-ikusi mezu honi." + no_account_till: "Zure kontua ez da sortuko hemengo esteka jarraitu eta izena eman arte." + subject: "Diasporara batzera gonbidatua izan zara!" inviters: accept_at: ",%{url}(e)n, onartu dezakezu honako estekaren bidez." has_invited_you: "%{name} Diasporara gonbidatu zaitu" diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml index ffd6ef832..09be15b14 100644 --- a/config/locales/diaspora/bg.yml +++ b/config/locales/diaspora/bg.yml @@ -77,7 +77,7 @@ bg: updating: "updating" few: "%{count} аспекта" helper: - are_you_sure: "Наистина ли желаете да бъде изтриете аспектът?" + are_you_sure: "Наистина ли желаете да бъде изтрит аспектът?" aspect_not_empty: "Аспектът не е празен" remove: "премахване" index: @@ -116,14 +116,14 @@ bg: bookmarklet: explanation: "%{link} от където и да е, запаметявайки връзката като отметка." explanation_link_text: "Публикувайте в Diaspora" - post_something: "Публикувайте нещо в Diaspora" + post_something: "Публикуване в Diaspora" post_success: "Публикувано!" cancel: "Отказ" comments: few: "%{count} коментара" many: "%{count} коментара" new_comment: - comment: "коментар" + comment: "Kоментар" commenting: "Коментиране..." one: "1 коментар" other: "%{count} коментара" @@ -139,7 +139,7 @@ bg: one: "1 контакт" other: "%{count} контакта" share_with_pane: - accepts: "Щом %{name} приеме ще можете да следите публикациите си в Diaspora" + accepts: "Щом %{name} приеме поканата ще можете да следите публикациите си в Diaspora" add_new_aspect: "добавяне на нов аспект" share_with: "Започнете да споделяте с %{name}" zero: "няма контакти" @@ -211,12 +211,12 @@ bg: already_invited: "Вече е поканен" aspect: "Аспект" comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи." - if_they_accept_info: "ако приемат ще бъдат добавени към аспекта в който сте ги поканили." + if_they_accept_info: "ако приемат поканата ще бъдат добавени към аспекта в който сте ги поканили." invite_someone_to_join: "Поканете някой в Diaspora!" personal_message: "Лично съобщение" resend: "Повторно изпращане" send_an_invitation: "Изпращане на поканата" - send_invitation: "Send invitation" + send_invitation: "Изпрати покана" to: "До" layouts: application: @@ -236,17 +236,17 @@ bg: likes: likes: people_dislike_this: - few: "не е харесана от %{count} човека" - many: "не е харесана е от %{count} човека" - one: "не е харесана от 1 човек" - other: "не е харесана от %{count} човека" + few: "не е харесана %{count} пъти" + many: "не е харесана %{count} пъти" + one: "не е харесана %{count} път" + other: "не е харесана %{count} пъти" zero: "всички са я харесали" people_like_this: - few: "харесана от %{count} човека" - many: "харесана от %{count} човека" - one: "1 person liked this" - other: "%{count} people liked this" - zero: "no people liked this" + few: "харесана %{count} пъти" + many: "харесана %{count} пъти" + one: "харесана %{count} път" + other: "харесана %{count} пъти" + zero: "не е харесана" more: "Още" next: "next" no_results: "Няма намерени резултати" @@ -254,7 +254,7 @@ bg: also_commented: "also commented on %{post_author}'s" also_commented_deleted: "добави коментар на вече изтрита публикация." comment_on_post: "коментира ваша" - deleted: "deleted" + deleted: "изтрито" helper: new_notifications: few: "%{count} нови известия" @@ -267,7 +267,7 @@ bg: and_others: "и %{number} други" mark_all_as_read: "Маркиране на всички като прочетени" notifications: "Известия" - liked: "has just liked your post" + liked: "току-що хареса ваша публикация" mentioned: "ви спомена в" new_request: "ви предложи да споделяте." post: "публикация." @@ -285,9 +285,9 @@ bg: diaspora: "the diaspora email robot" hello: "Здравейте %{name}!" liked: - liked: "%{name} has just liked your post: " + liked: "току-що %{name} хареса вашата публикация:" sign_in: "Sign to view it" - subject: "%{name} has just liked your post" + subject: "току-що %{name} хареса ваша публикация" love: "love," manage_your_email_settings: "manage your email settings" mentioned: @@ -346,12 +346,12 @@ bg: gender: "пол" in_aspects: "in aspects" location: "местоположние" - remove_contact: "премахване на контакт" + remove_contact: "премахване на контакта" remove_from: "Премахване на %{name} от %{aspect}?" show: add_some: "add some" - does_not_exist: "Person does not exist!" - edit: "edit" + does_not_exist: "Лицето не съществува!" + edit: "редактиране" incoming_request: "%{name} желае да споделя с вас" mention: "Mention" message: "Съобщение" @@ -457,9 +457,9 @@ bg: success: "Сега споделяте." helper: new_requests: - few: "%{count} new requests!" - many: "%{count} new requests!" - one: "new request!" + few: "%{count} нови покани!" + many: "%{count} нови покани!" + one: "нова покана!" other: "%{count} нови покани!" zero: "няма нови покани" manage_aspect_contacts: @@ -483,19 +483,19 @@ bg: other: "%{count} приятеля" zero: "няма приятели" invite_your_friends_from: "Поканете приятелите си от %{service}" - not_connected: "not connected" + not_connected: "не съществува връзка" index: connect_to_facebook: "Свързване с facebook" connect_to_twitter: "Свързване с twitter" disconnect: "изключване" edit_services: "Редактиране на услугите" logged_in_as: "вписани сте като" - really_disconnect: "изключване на свързаността с %{service}?" + really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?" inviter: click_link_to_accept_invitation: "Click this link to accept your invitation" join_me_on_diaspora: "Join me on DIASPORA*" remote_friend: - invite: "invite" + invite: "покани" resend: "resend" settings: "Настройки" shared: @@ -514,8 +514,8 @@ bg: invitations: by_email: "по ел. поща" dont_have_now: "За момента не разполагате с покани, но скоро ще имате!" - from_facebook: "От Facebook" - invitations_left: "(остават още %{count})" + from_facebook: "от Facebook" + invitations_left: "(остават още %{count} покани)" invite_someone: "Поканете някого" invite_your_friends: "Намерете приятелите си" invites: "Покани" @@ -584,7 +584,7 @@ bg: download_xml: "данните ви (XML формат)" edit_account: "Редактиране на акаунта" export_data: "Сваляне на..." - liked: "...someone likes your post?" + liked: "...някой хареса ваша публикация?" mentioned: "...бъдете споменат в публикация?" new_password: "Нова парола" private_message: "...получите лично съобщение?" @@ -597,10 +597,10 @@ bg: connect_on_diaspora: "Connect on Diaspora" connect_services: "Свързване към други услуги" could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them." - edit_profile: "Edit your profile" + edit_profile: "Редактирайте профилът си" finished: "Готово!" save_and_continue: "Запиши и продължи" - signup_steps: "Finish your sign up by completing these three steps:" + signup_steps: "Приключете регистрирането като извършите следните 3 стъпки:" skip: "прескачане на страницата" step_2: find_your_friends_on_diaspora: "Желаете ли да намерите приятелите си от Facebook в Diaspora?" @@ -615,7 +615,7 @@ bg: email_notifications_changed: "Адресът за известяване е променен" language_changed: "Езикът е сменен" language_not_changed: "Езикът не бе променен" - password_changed: "Паролата е променена" + password_changed: "Паролата е променена. Можете да се впишете с новата парола." password_not_changed: "Паролата не бе променена" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index e37815cd0..fa9acb6f5 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -236,17 +236,17 @@ it: likes: likes: people_dislike_this: - few: "non piace a %{count}" - many: "non piace a %{count}" - one: "Non piace a %{count}" - other: "non piace a %{count}" - zero: "non piace a zero persone" + few: "%{count} Non mi piace" + many: "%{count} Non mi piace" + one: "%{count} Non mi piace" + other: "%{count} Non mi piace" + zero: "0 Non mi piace" people_like_this: - few: "piace a %{count}" + few: "%{count} Mi piace" many: "Piace a %{count}" - one: "piace a %{count}" - other: "piace a %{count}" - zero: "piace a nessuno" + one: "%{count} Mi piace" + other: "%{count} Mi piace" + zero: "0 Mi piace" more: "Altro" next: "successivo" no_results: "Nessun Risultato Trovato" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index 4a6d1500e..a940a37f5 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -81,21 +81,21 @@ pt-PT: aspect_not_empty: "Aspecto não vazio" remove: "remover" index: - handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar." + handle_explanation: "Esta é a sua chave do Diaspora. Tal como um endereço de email, pode dar esta chave a quem deseja que o contacte." no_contacts: "Nenhum contacto" post_a_message: "post a message >>" manage: add_a_new_aspect: "Adicionar um novo aspecto" add_a_new_contact: "Adicionar um novo contacto" - drag_to_add: "Arrasta para adicionar pessoas" + drag_to_add: "Arraste para adicionar pessoas" manage_aspects: "Gerir aspectos" no_requests: "Não existem novos pedidos" requests: "Pedidos" many: "%{count} aspectos" move_contact: - error: "Erro ao mover contacto: %{inspect}" + error: "Erro ao mover o contacto: %{inspect}" failure: "não funcionou %{inspect}" - success: "Pessoa movida para o novo grupo" + success: "Pessoa movida para o novo aspecto" new_aspect: create: "Criar" name: "Nome" @@ -180,20 +180,20 @@ pt-PT: helper: correct_the_following_errors_and_try_again: "Corrija os seguintes erros e volte a tentar." invalid_fields: "Campos Inválidos" - fill_me_out: "Informa-me" + fill_me_out: "Informe-me" hide: "Hide" home: show: - already_account: "já tens uma conta?" + already_account: "já tem uma conta?" choice: "Escolha" - choice_explanation: "O Diaspora permite-te organizar as tuas ligações em grupos. Exclusivos no Diaspora, os grupos garantem que as tuas fotografias, histórias e brincadeiras são partilhadas apenas com as pessoas com que tu queres que elas sejam partilhadas." - learn_about_host: "Aprende como alojar o teu próprio servidor do Diaspora" - login_here: "entra aqui" + choice_explanation: "O Diaspora permite-lhe organizar as suas ligações em grupos chamados aspectos. Exclusivos ao Diaspora, os aspectos garantem que as suas fotografias, histórias e piadas são partilhadas apenas com as pessoas com quem deseja que sejam partilhadas." + learn_about_host: "Aprenda sobre como alojar o seu próprio servidor do Diaspora." + login_here: "inicie a sessão aqui" ownership: "Propriedade" - ownership_explanation: "És dono das tuas fotografias, e não deves abdicar disso para as poderes partilhar. Tu manténs a posse de tudo o que partilhares no Diaspora, dando-te total controlo sobre como é partilhado." - share_what_you_want: "Partilha o que quiseres, com quem quiseres." + ownership_explanation: "É dono das suas fotografias, e não deve ter de abdicar desse direito para as poder partilhar. Mantém a posse de tudo o que partilha no Diaspora, sendo-lhe dado controlo total sobre como é distribuído." + share_what_you_want: "Partilhe o que quiser, com quem quiser." simplicity: "Simplicidade" - simplicity_explanation: "O Diaspora torna a partilha clara e fácil – e o mesmo se aplica à privacidade. Privado por definição, o Diaspora não tem inúmeras páginas de definições e opções de forma a manteres o teu perfil seguro e privado." + simplicity_explanation: "O Diaspora torna a partilha clara e fácil – e o mesmo se aplica à privacidade. Privado por definição, o Diaspora não o obriga a percorrer inúmeras páginas de definições e opções de forma a manter o seu perfil seguro." tagline_first_half: "Partilhe o que desejar," tagline_second_half: "com quem desejar." invitations: @@ -206,7 +206,7 @@ pt-PT: rejected: "Os seguintes endereços de email tiveram problemas: " sent: "Os convites foram enviados a:" edit: - sign_up: "registar" + sign_up: "resgistar-se" new: already_invited: "Já convidado" aspect: "Aspecto" @@ -227,10 +227,10 @@ pt-PT: whats_new: "O que há de novo?" your_aspects: "seus aspectos" header: - blog: "blog" + blog: "blogue" code: "código" - login: "entrar" - logout: "sair" + login: "iniciar sessão" + logout: "Terminar sessão" profile: "profile" settings: "settings" likes: @@ -295,17 +295,17 @@ pt-PT: sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" new_request: - just_sent_you: "acaba de enviar-te um pedido de contacto no Diaspora*" - sign_in: "regista-te aqui" + just_sent_you: "acaba de lhe enviar um pedido de contacto no Diaspora*" + sign_in: "Inicie sessão aqui" subject: "novo pedido de contacto do Diaspora* de %{from}" - try_it_out: "Devias mesmo pensar em dar-lhe uma vista de olhos." + try_it_out: "Devia mesmo pensar em dar-lhe uma vista de olhos." private_message: message_subject: "Subject: %{subject}" private_message: "has sent you a private message:" sign_in: "Sign in to view it." subject: "%{name} has sent you a private message yon Diaspora*" request_accepted: - accepted: "aceitou(aram) o teu pedido de contacto. Está(ão) agora no teu" + accepted: "aceitou o seu pedido de contacto!" sign_in: "Sign in here" subject: "%{name} aceitou o teu pedido de contacto no Diaspora*" single_admin: @@ -323,8 +323,8 @@ pt-PT: edit_membership: "editar participação no aspecto" few: "%{count} people" helper: - people_on_pod_are_aware_of: " as pessoas no pod estão cientes de que" - results_for: " resultados para %{params}" + people_on_pod_are_aware_of: "as pessoas no pod estão cientes de que" + results_for: "resultados para %{params}" index: couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!" no_one_found: "...e ninguém foi encontrado." @@ -339,12 +339,12 @@ pt-PT: pending_request: "Pedido pendente" thats_you: "É você!" profile_sidebar: - bio: "sobre" - born: "nascido a" - cannot_remove: "Impossível remover %{name} do último grupo.(Se te quiseres desligar desta pessoa terás que remover o contacto)" + bio: "biografia" + born: "data de nascimento" + cannot_remove: "Impossível remover %{name} do último aspecto.(Se se quiser desligar desta pessoa terá que remover o contacto)" edit_my_profile: "Editar o meu perfil" - gender: "género" - in_aspects: "nos grupos" + gender: "sexo" + in_aspects: "nos aspectos" location: "location" remove_contact: "remover contacto" remove_from: "Remover %{name} de %{aspect}?" @@ -381,9 +381,9 @@ pt-PT: new_photo: "Nova Fotografia" post_it: "Publique!" new_photo: - empty: "{file} está vazio, por favor escolhe novamente os ficheiros sem este último." + empty: "{file} está vazio, por favor seleccione de novo os ficheiros sem este último." invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}." - size_error: "{file} é muito grande, o tamanho máximo é {sizeLimit}." + size_error: "{file} é demasiado grande, o tamanho máximo é {sizeLimit}." new_profile_photo: or_select_one: "or select one from your already existing" upload: "Envie uma foto nova do seu perfil!" @@ -436,8 +436,8 @@ pt-PT: edit: cancel_my_account: "Cancelar a minha conta" edit: "Editar %{name}" - leave_blank: "(deixar em branco se não quiseres modificar)" - password_to_confirm: "(necessitamos da tua palavra-chave actual para confirmar as tuas modificações)" + leave_blank: "(deixe em branco se não quiser modificar)" + password_to_confirm: "(necessitamos da sua palavra-passe actual para confirmar as modificações)" unhappy: "Descontente?" update: "Actualizar" new: @@ -449,7 +449,7 @@ pt-PT: sign_up_for_diaspora: "Registe-se no Diaspora" requests: create: - sending: "A enviar..." + sending: "A enviar" sent: "Você solicitou partilhar com %{name}, que será notificado assim que entrar no Diaspora." destroy: error: "Por favor, seleccione um aspecto!" @@ -464,13 +464,13 @@ pt-PT: zero: "nenhum novo pedido" manage_aspect_contacts: existing: "Contactos existentes" - manage_within: "Gerir contactos dentro" + manage_within: "Gerir contactos dentro de" new_request_to_person: sent: "enviado!" search: "Procurar" services: create: - success: "Autentificação bem sucedida." + success: "A autentificação foi bem sucedida." destroy: success: "A autentificação foi destruída com sucesso." failure: @@ -487,9 +487,9 @@ pt-PT: index: connect_to_facebook: "Ligar ao Facebook" connect_to_twitter: "Ligar ao Twitter" - disconnect: "Desligar" + disconnect: "desligar" edit_services: "Editar serviços" - logged_in_as: "registado como" + logged_in_as: "com sessão registada como" really_disconnect: "desligar do %{service}?" inviter: click_link_to_accept_invitation: "Clique neste link para aceitar o convite" @@ -501,10 +501,10 @@ pt-PT: shared: add_contact: create_request: "Encontrar através do nome de utilizador no Diaspora" - diaspora_handle: "Nome de Utilizador" - enter_a_diaspora_username: "Insere um nome de utilizador do Diaspora" + diaspora_handle: "diaspora@handle.org" + enter_a_diaspora_username: "Introduza um nome de utilizador do Diaspora:" know_email: "Sabe os seus endereços de email? Deveria convidá-los" - your_diaspora_username_is: "O teu nome de utilizador do Diaspora é: %{diaspora_handle}" + your_diaspora_username_is: "O seu nome de utilizador do Diaspora é: %{diaspora_handle}" contact_list: all_contacts: "Todos os contactos" cannot_remove: "Impossível remover esta pessoa do último Grupo. (Se quiseres desligar-te desta pessoa terás que remover o contacto.)" @@ -516,7 +516,7 @@ pt-PT: dont_have_now: "Não tens nenhum agora, mas terás mais convites brevemente!" from_facebook: "Do Facebook" invitations_left: "(faltam %{count})" - invite_someone: "Convida alguém" + invite_someone: "Convidar alguém" invite_your_friends: "Convidar amigos" invites: "Convites" invites_closed: "Invites are currently closed on this Diaspora seed" @@ -524,9 +524,9 @@ pt-PT: new: "Novo %{type} de %{from}" public_explain: logged_in: "Sessão iniciada em %{service}" - manage: "Gerir ligações a outros serviços" + manage: "gerir serviços conectados" outside: "As mensagens públicas ficarão visíveis a pessoas fora do Diaspora." - title: "Estás prestes a publicar uma mensagem pública!" + title: "Configurar serviços conectados" publisher: add_photos: "adicionar fotografias" all: "tudo" @@ -538,10 +538,10 @@ pt-PT: public: "Public" publishing_to: "publishing to: " share: "Partilhar" - share_with: "Partilhar com %{aspect}" + share_with: "partilhar com" whats_on_your_mind: "No que está a pensar?" reshare: - reshare: "Partilhar Novamente" + reshare: "Voltar a partilhar" stream_element: dislike: "I dislike this" like: "I like this" @@ -552,11 +552,11 @@ pt-PT: destroy: failure: "Failed to delete post" helper: - no_message_to_display: "Nenhuma mensagem para mostrar." + no_message_to_display: "Não há mensagens para mostrar." new: mentioning: "Mentioning: %{person}" show: - destroy: "Destruir" + destroy: "Apagar" not_found: "Sorry, we couldn't find that post." permalink: "permalink" stream_helper: @@ -569,24 +569,24 @@ pt-PT: posts_tagged_with: "Posts tagged with #%{tag}" the_world: "o mundo" undo: "Undo?" - username: "Nome de Utilizador" + username: "Nome de utilizador" users: - destroy: "Conta encerrada com sucesso" + destroy: "A conta foi encerrada com sucesso." edit: also_commented: "...alguém também comenta no post do seu contacto?" change: "Mudar" - change_language: "Modificar Idioma" - change_password: "Modificar Palavra-chave" - close_account: "Encerrar Conta" + change_language: "Mudar de Idioma" + change_password: "Alterar a Palavra-passe" + close_account: "Encerrar a Conta" comment_on_post: "...alguém comenta nos seus post?" current_password: "Senha actual" - download_photos: "descarregar as minhas fotos" + download_photos: "descarregar as minhas fotografias" download_xml: "descarregar o meu xml" edit_account: "Editar conta" export_data: "Exportar Dados" liked: "...someone likes your post?" mentioned: "...você é mencionado num post?" - new_password: "Nova Palavra-chave" + new_password: "Nova Palavra-passe" private_message: "...você recebe uma mensagem privada?" receive_email_notifications: "Receive email notificaions?" request_acceptence: "...o seu pedido de partilha é aceite?" @@ -595,12 +595,12 @@ pt-PT: your_handle: "O teu nome de utilizador no Diaspora" getting_started: connect_on_diaspora: "Connect on Diaspora" - connect_services: "Liga os teus outros serviços" + connect_services: "Ligue os seus outros serviços" could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them." - edit_profile: "Edita o teu perfil" + edit_profile: "Edite o seu perfil" finished: "Terminado!" save_and_continue: "Guardar e continuar" - signup_steps: "Termina o teu registo completando estes três passos:" + signup_steps: "Termine o seu registo completando estes três passos:" skip: "saltar a introdução" step_2: find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?" @@ -613,10 +613,10 @@ pt-PT: does_not_exist: "O utilizador %{username} não existe!" update: email_notifications_changed: "Language Change Failed" - language_changed: "Idioma Modificado" - language_not_changed: "Falha ao Modificar Idioma" - password_changed: "Palavra-chave Modificada" - password_not_changed: "Falha ao Modificar Palavra-chave" + language_changed: "O Idioma Foi Alterado" + language_not_changed: "Falha ao Alterar o Idioma" + password_changed: "A palavra-passe foi alterada. Já pode iniciar sessão com a sua nova palavra-passe." + password_not_changed: "Falhou ao alterar a palavra-passe" webfinger: fetch_failed: "erro a obter perfil webfinger profile para %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index cfa66042d..fb9e6f421 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -227,7 +227,7 @@ sv: whats_new: "några nyheter?" your_aspects: "dina aspekter" header: - blog: "blogg" + blog: "Blogg" code: "källkod" login: "Logga in" logout: "Logga ut" @@ -236,17 +236,17 @@ sv: likes: likes: people_dislike_this: - few: "%{count} personer ogillade dethär" - many: "%{count} personer ogillade dethär" - one: "1 person ogillade dethär" - other: "%{count} person ogillade det här" - zero: "inga personer ogillade det här" + few: "%{count} personer ogillar" + many: "%{count} personer ogillar det här" + one: "1 person ogillar det här" + other: "%{count} personer ogillar det här" + zero: "inga personer ogillar det här" people_like_this: - few: "%{count} personer gillade det här" - many: "%{count} personer gillade det här" - one: "1 person gillade det här" - other: "%{count} personer gillade det här" - zero: "inga personer gillade det här" + few: "%{count} personer gillar det här" + many: "%{count} personer gillar det här" + one: "1 person gillar det här" + other: "%{count} personer gillar det här" + zero: "inga personer gillar det här" more: "Mer" next: "nästa" no_results: "Inga Resultat Funna" @@ -268,9 +268,9 @@ sv: mark_all_as_read: "Markera alla som läst" notifications: "Notifieringar" liked: "har precis gillat ditt inlägg" - mentioned: "har nämnt dig i deras" + mentioned: "har nämnt dig i sitt" new_request: "erbjöd sig att dela med dig." - post: "meddelande" + post: "inlägg." private_message: "skickade dig ett meddelande." request_accepted: "accepterade din förfrågan om att dela." notifier: @@ -286,7 +286,7 @@ sv: hello: "Hej %{name}!" liked: liked: "%{name} har precis gillat ditt inlägg: " - sign_in: "Sign to view it" + sign_in: "Logga in för att se" subject: "%{name} har precis gillat ditt inlägg" love: "hälsningar," manage_your_email_settings: "administrera dina epost-inställningar" @@ -539,7 +539,7 @@ sv: publishing_to: "publicerar till: " share: "Dela" share_with: "dela med" - whats_on_your_mind: "vad har du på hjärtat?" + whats_on_your_mind: "Vad har du på hjärtat?" reshare: reshare: "Återdela" stream_element: @@ -561,7 +561,7 @@ sv: permalink: "permalänk" stream_helper: hide_comments: "dölj kommentarer" - show_comments: "visa alla kommentarer" + show_comments: "Visa alla kommentarer" tags: show: nobody_talking: "Ingen talar om %{tag} än." @@ -615,7 +615,7 @@ sv: email_notifications_changed: "E-post-notifieringar har ändrats" language_changed: "Språk är nu ändrat" language_not_changed: "Språket kunde inte ändras" - password_changed: "Lösenordet är nu ändrat" + password_changed: "Lösenordet är nu ändrat." password_not_changed: "Lösenordet kunde inte ändras" webfinger: fetch_failed: "Kunde inte hämta webfinger-profil för %{profile_url}" diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml index 6a9ce17fc..9f59aed2c 100644 --- a/config/locales/javascript/javascript.it.yml +++ b/config/locales/javascript/javascript.it.yml @@ -34,4 +34,4 @@ it: unknown: "Tipo di video sconosciuto" watch: "Guarda questo video su {{provider}}" web_sockets: - disconnected: "Il websocket è chiuso; i post non saranno più ricevuti in tempo reale." + disconnected: "Il websocket è chiuso; i post non saranno più aggiornati in tempo reale." diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index 10b718fc9..03fbcb497 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -23,7 +23,7 @@ sv: minutes: "%d minuter" month: "ungefär en månad" months: "%d månader" - prefixAgo: "för" + prefixAgo: "För" prefixFromNow: "om" seconds: "mindre än en minut" suffixAgo: "sedan"