From c1e5a83f157195af94cf7de59db474d6bf2f812d Mon Sep 17 00:00:00 2001 From: Andrej Kacian Date: Mon, 18 Jul 2011 23:37:38 +0200 Subject: [PATCH 1/4] Fix for issue #1603 - use different i18n string for comment likes count --- app/views/comments/_comment.html.haml | 2 +- app/views/likes/_likes_container.haml | 10 ++++++++-- app/views/shared/_stream_element.html.haml | 2 +- config/locales/diaspora/en.yml | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml index 909398112..64c537d47 100644 --- a/app/views/comments/_comment.html.haml +++ b/app/views/comments/_comment.html.haml @@ -21,7 +21,7 @@ = comment.created_at ? timeago(comment.created_at) : timeago(Time.now) .likes - = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count + = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count, :target_type => "Comment" - unless (defined?(@commenting_disabled) && @commenting_disabled) %span.like_action diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml index 0a8ea4de0..ef278ac05 100644 --- a/app/views/likes/_likes_container.haml +++ b/app/views/likes/_likes_container.haml @@ -6,9 +6,15 @@ - if likes_count > 0 = image_tag('icons/heart.svg') - if defined?(likes_index_link) && likes_index_link - = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" + - if target_type == "Comment" + = link_to t('likes.likes.people_like_this_comment', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" + - else + = link_to t('likes.likes.people_like_this', :count => likes_count), post_likes_path(target_id), :class => "expand_likes" - else - = t('likes.likes.people_like_this', :count => likes_count) + - if target_type == "Comment" + = t('likes.likes.people_like_this_comment', :count => likes_count) + - else + = t('likes.likes.people_like_this', :count => likes_count) %span.hidden.likes_list /= render 'likes/likes', :likes => likes diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index 0c1d4769a..b20f01815 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -56,6 +56,6 @@ = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea' .likes.on_post - = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true + = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :likes_index_link => true, :target_type => "Post" = render "comments/comments", :post => post, :current_user => current_user, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index b08d09126..21337e7d9 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -316,6 +316,12 @@ en: few: "%{count} likes" many: "%{count} likes" other: "%{count} likes" + people_like_this_comment: + zero: "no likes" + one: "%{count} like" + few: "%{count} likes" + many: "%{count} likes" + other: "%{count} likes" people_dislike_this: zero: "no dislikes" one: "%{count} dislike" From 67ffdd71aa0093477f68433254d037b07f5043eb Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 25 Jul 2011 12:54:25 +0200 Subject: [PATCH 2/4] update rails-i18n --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 50650d9f6..cbe9d5ea7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM activesupport (= 3.0.9) bundler (~> 1.0) railties (= 3.0.9) - rails-i18n (0.1.0) + rails-i18n (0.1.2) activesupport (~> 3) railties (3.0.9) actionpack (= 3.0.9) From 072e48462bd19cd585558a65051a9576ad0f1e62 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 25 Jul 2011 13:25:16 +0200 Subject: [PATCH 3/4] updated locales --- config/locales/diaspora/ar.yml | 243 ++++++++++-------- config/locales/diaspora/bg.yml | 55 ++-- config/locales/diaspora/br.yml | 53 ++-- config/locales/diaspora/cs.yml | 55 ++-- config/locales/diaspora/cy.yml | 53 ++-- config/locales/diaspora/da.yml | 53 ++-- config/locales/diaspora/de.yml | 65 +++-- config/locales/diaspora/el.yml | 57 ++-- config/locales/diaspora/en_shaw.yml | 155 ++++++----- config/locales/diaspora/eo.yml | 57 ++-- config/locales/diaspora/es-AR.yml | 53 ++-- config/locales/diaspora/es-CL.yml | 57 ++-- config/locales/diaspora/es.yml | 53 ++-- config/locales/diaspora/eu.yml | 59 +++-- config/locales/diaspora/fi.yml | 53 ++-- config/locales/diaspora/fr.yml | 53 ++-- config/locales/diaspora/ga.yml | 53 ++-- config/locales/diaspora/he.yml | 53 ++-- config/locales/diaspora/hu.yml | 53 ++-- config/locales/diaspora/id.yml | 53 ++-- config/locales/diaspora/is.yml | 53 ++-- config/locales/diaspora/it.yml | 53 ++-- config/locales/diaspora/ja.yml | 53 ++-- config/locales/diaspora/ko.yml | 61 +++-- config/locales/diaspora/lt.yml | 53 ++-- config/locales/diaspora/mk.yml | 53 ++-- config/locales/diaspora/nb.yml | 53 ++-- config/locales/diaspora/nl.yml | 53 ++-- config/locales/diaspora/pa.yml | 53 ++-- config/locales/diaspora/pl.yml | 53 ++-- config/locales/diaspora/pt-BR.yml | 53 ++-- config/locales/diaspora/pt-PT.yml | 53 ++-- config/locales/diaspora/ro.yml | 53 ++-- config/locales/diaspora/ru.yml | 53 ++-- config/locales/diaspora/sk.yml | 53 ++-- config/locales/diaspora/sl.yml | 53 ++-- config/locales/diaspora/sv.yml | 53 ++-- config/locales/diaspora/tr.yml | 53 ++-- config/locales/diaspora/zh-CN.yml | 53 ++-- config/locales/diaspora/zh-TW.yml | 59 +++-- config/locales/javascript/javascript.ar.yml | 1 + config/locales/javascript/javascript.bg.yml | 1 + config/locales/javascript/javascript.br.yml | 1 + config/locales/javascript/javascript.cs.yml | 1 + config/locales/javascript/javascript.da.yml | 1 + config/locales/javascript/javascript.de.yml | 1 + config/locales/javascript/javascript.el.yml | 1 + .../locales/javascript/javascript.en_shaw.yml | 1 + config/locales/javascript/javascript.eo.yml | 1 + .../locales/javascript/javascript.es-AR.yml | 1 + config/locales/javascript/javascript.es.yml | 1 + config/locales/javascript/javascript.eu.yml | 1 + config/locales/javascript/javascript.fi.yml | 1 + config/locales/javascript/javascript.fr.yml | 1 + config/locales/javascript/javascript.he.yml | 1 + config/locales/javascript/javascript.hu.yml | 1 + config/locales/javascript/javascript.id.yml | 1 + config/locales/javascript/javascript.is.yml | 1 + config/locales/javascript/javascript.it.yml | 1 + config/locales/javascript/javascript.ja.yml | 1 + config/locales/javascript/javascript.ko.yml | 1 + config/locales/javascript/javascript.nb.yml | 1 + config/locales/javascript/javascript.nl.yml | 1 + config/locales/javascript/javascript.pl.yml | 1 + .../locales/javascript/javascript.pt-BR.yml | 1 + .../locales/javascript/javascript.pt-PT.yml | 1 + config/locales/javascript/javascript.ro.yml | 1 + config/locales/javascript/javascript.ru.yml | 1 + config/locales/javascript/javascript.sk.yml | 1 + config/locales/javascript/javascript.sl.yml | 1 + config/locales/javascript/javascript.sv.yml | 1 + config/locales/javascript/javascript.tr.yml | 1 + .../locales/javascript/javascript.zh-CN.yml | 1 + .../locales/javascript/javascript.zh-TW.yml | 1 + 74 files changed, 1604 insertions(+), 890 deletions(-) diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml index a802f8959..40872278a 100644 --- a/config/locales/diaspora/ar.yml +++ b/config/locales/diaspora/ar.yml @@ -4,9 +4,9 @@ ar: - _applications: "Applications" + _applications: "التطبيقات" _comments: "تعليقات" - _contacts: "Contacts" + _contacts: "جهات الاتصال" _home: "الرئيسية" _photos: "صور" _services: "خدمات" @@ -26,6 +26,10 @@ ar: attributes: from_id: taken: "نسخة من طلب سابق" + reshare: + attributes: + root_guid: + taken: "لقد أعدت نشر هذه المشاركة بالفعل!" user: attributes: email: @@ -63,12 +67,12 @@ ar: aspect_contacts: done_editing: "اتمام التغييرات" aspect_listings: - add_an_aspect: "+ Add an aspect" + add_an_aspect: "+ أضف فئة جديدة" aspect_stream: - commented_on: "commented on" - posted: "posted" - recently: "recently:" - stream: "Stream" + commented_on: "علق عليها" + posted: "أُرسِلت" + recently: "مؤخرًا:" + stream: "البث" contacts_not_visible: "رؤية عضو لآخر في هاته الفئة غير متاحة" contacts_visible: "رؤية عضو لآخر في هاته الفئة متاحة" create: @@ -95,22 +99,22 @@ ar: remove: "حذف" index: cubbies: - explanation: "Cubbi.es is the first Diaspora application under development." - heading: "Connect to Cubbi.es" - learn_more: "Learn more" + explanation: "Cubbi.es هو أول تطبيق تحت التطوير لديسبورا." + heading: "صِل حسابك بـ Cubbi.es" + learn_more: "اعرف المزيد" diaspora_id: - content_1: "Your Diaspora ID is:" - content_2: "Give it to anyone and they'll be able to find you on Diaspora." - heading: "Diaspora ID" - handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني, يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم" + content_1: "وسيط ديسبورا خاصتك هو:" + content_2: "أعطه لأي شخص وسيتمكن من إيجادك على ديسبورا." + heading: "وسيط ديسبورا" + handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني، يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم." no_contacts: "لا أعضاء" people_sharing_with_you: "أعضاء يتشاركون معك" post_a_message: "انشر رسالة >>" services: - content: "You can connect the following services to Diaspora:" - heading: "Connect Services" - tags_following: "Followed Tags" - your_aspects: "Your Aspects" + content: "يمكنك وصل حساب ديسبورا الخاص بك بالخدمات الآتية:" + heading: "صل حسابك بالخدمات" + tags_following: "الوسوم المتابعة" + your_aspects: "فئاتك" many: "%{count} فئات" move_contact: error: "خطأ خلال تحريك عضو: %{inspect}" @@ -120,17 +124,17 @@ ar: create: "أنشئ" name: "إسم" no_posts_message: - start_talking: "لم تنشر أي رسالة بعد، إبدأ المحادثة" - try_adding_some_more_contacts: "Try adding some more contacts." + start_talking: "لم يتحدث أحد بعد!" + try_adding_some_more_contacts: "حاول إضافة المزيد من جهات الاتصال." one: "فئة" other: "%{count} فئات" seed: family: "العائلة" work: "العمل" selected_contacts: - manage_your_aspects: "Manage your aspects." - no_contacts: "You don't have any contacts here yet." - view_all_contacts: "View all contacts" + manage_your_aspects: "أَدِر فئاتك." + no_contacts: "لا تملك أية جهات اتصال هنا بعد." + view_all_contacts: "أظهر كل جهات الاتصال" show: edit_aspect: "تحرير الفئة" update: @@ -139,12 +143,12 @@ ar: zero: "لا فئات" authorizations: index: - revoke_access: "Revoke Access" + revoke_access: "إلغاء الوصول" back: "عودة" bookmarklet: - explanation: "%{link} من أي مكان بحفظ هذا الرابط في المفضلة" - explanation_link_text: "انشر على دياسبرا" - heading: "Diaspora Bookmarklet" + explanation: "%{link} انشر في ديسبورا من أي مكان بحفظ الرابط في مفضلتك/علاماتك" + explanation_link_text: "هذا الرابط" + heading: "زر المفضلة" post_something: "انشر شيئا على دياسبرا" post_success: "تم النشر, إغلاق" cancel: "إلغاء" @@ -152,7 +156,7 @@ ar: few: "%{count} تعليقات" many: "%{count} تعليقات" new_comment: - comment: "تعليق" + comment: "علِّق" commenting: "تعليق..." one: "1 تعليق" other: "%{count} تعليقات" @@ -162,17 +166,17 @@ ar: failure: "فشل في إنشاء الإتصال" few: "%{count} أعضاء" index: - add_a_new_aspect: "Add a new aspect" - all_contacts: "All Contacts" - edit_aspect: "Edit %{name}" - many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." - my_contacts: "My Contacts" - no_contacts: "No contacts." - only_sharing_with_me: "Only sharing with me" - remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\"" - start_a_conversation: "Start a conversation" - title: "Contacts" - your_contacts: "Your Contacts" + add_a_new_aspect: "أضف فئة جديدة" + all_contacts: "كل جهات الاتصال" + edit_aspect: "عدل %{name}" + many_people_are_you_sure: "هل أنت متأكد من بدأ هذه المحادثة الخاصة مع أكثر من %{suggested_limit} جهات اتصال? من الأفضل إرسال مشاركة لهذه الفئة لتتصل بهم." + my_contacts: "جهات الاتصال الخاصة بي" + no_contacts: "لا توجد جهات اتصال." + only_sharing_with_me: "فقط يتشاركون معي" + remove_person_from_aspect: "احذف %{person_name} من \"%{aspect_name}\"" + start_a_conversation: "ابدأ محادثة" + title: "جهات الاتصال" + your_contacts: "جهات الاتصال" many: "%{count} أعضاء" one: "1 عضو" other: "%{count} أعضاء" @@ -190,7 +194,7 @@ ar: many: "%{count} رسائل جديدة" one: "1 رسالة جديدة" other: "%{count} رسائل جديدة" - zero: "لايوجد رسائل جديدة" + zero: "لا يوجد رسائل جديدة" index: create_a_new_message: "إنشاء رسالة جديدة" inbox: "الوارد" @@ -199,7 +203,7 @@ ar: no_conversation_selected: "لم تحدد أية محادثة" no_messages: "لا يوجد رسائل" new: - abandon_changes: "Abandon changes?" + abandon_changes: "أأتجاهل التغييرات؟" send: "إرسال" subject: "العنوان" to: "إلى" @@ -208,9 +212,9 @@ ar: reply: "رد" date: formats: - birthday: "%B %d" - birthday_with_year: "%B %d %Y" - fullmonth_day: "%B %d" + birthday: "%d %B" + birthday_with_year: "%d %B %Y" + fullmonth_day: "%d %B" delete: "حذف" email: "بريد إلكتروني" error_messages: @@ -218,7 +222,7 @@ ar: correct_the_following_errors_and_try_again: ".صحح الأخطاء التالية ثم أعد المحاولة" invalid_fields: "مدخلات غير صحيحة" fill_me_out: "إملأ" - find_people: "Find people" + find_people: "ابحث عن الناس" hide: "إخفاء" home: show: @@ -247,7 +251,7 @@ ar: edit: sign_up: "تسجيل" new: - already_invited: "تم دعوته مسبقا" + already_invited: "لم يقبل هؤلاء الأشخاص دعوتك:" aspect: "فئة" comma_seperated_plz: "يمكن إدخال أكثر من بريد إلكتروني واحد باستعمال علامة التوقف فاصلة, بين كل بريد وآخر" if_they_accept_info: "إذا قبلوا دعوتك ، سيتم إضافتهم إلى الفئة التي دعوتهم إليها" @@ -266,29 +270,30 @@ ar: whats_new: "ما الجديد؟" your_aspects: "فئاتك" header: - admin: "admin" + admin: "المشرف" blog: "مدونة" code: "شيفرة" login: "لُج" logout: "خروج" profile: "الصفحة الشخصية" + recent_notifications: "آخر التنبيهات" settings: "إعدادات" - view_all: "View all" + view_all: "أظهر الكل" 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 أعجبه هذا" - other: "%{count} أشخاص أعجبهم هذا" - zero: "لا أحد أحب هذا" - limited: "Limited" + few: "%{count} إعجابًا" + many: "%{count} إعجابات" + one: "%{count} أعجبه هذا" + other: "%{count} إعجابًا" + zero: "لا إعجابات" + limited: "محدود" more: "أكثر" next: "التالي" no_results: "لا نتائج موجودة" @@ -352,7 +357,7 @@ ar: one: "%{actors} أشار إليك في منشور محذوف." other: "%{actors} أشاروا إليك في منشور محذوف." zero: "%{actors} أشار إليك في منشور محذوف." - post: "منشور" + post: "مشاركة" private_message: few: "%{actors} راسلوك." many: "%{actors} راسلوك." @@ -366,39 +371,31 @@ ar: other: "%{actors} بدؤوا المشاركة معك." zero: "%{actors} بدأ المشاركة معك." notifier: - also_commented: - commented: "علق أيضا على مشاركة %{post_author}:" - sign_in: "لُج لمشاهدته" - subject: "%{name} على أيضا على منشور %{post_author}." + click_here: "اضغط هنا" comment_on_post: - commented: "علق على مشاركتك" - sign_in: "لُج لمشاهدته" - subject: "%{name} علق على مشاركتك" - diaspora: "البريد الآلي لدياسبرا" + reply: "رُد أو اعرض مشاركة %{name} >" + confirm_email: + click_link: "لتفعيل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}, من فضلك اضغط على هذا الرابط:" + subject: "من فضلك، فَعِّل عنوان بريدك الإلكتروني الجديد %{unconfirmed_email}" + email_sent_by_diaspora: "أُرسِلَت هذه الرسالة بواسطة ديسبورا. إذا أردت إيقاف مثل هذه الرسالة، " hello: "مرحبا %{name}!" liked: - liked: "%{name} أعجبه منشورك: " - sign_in: "لج لمشاهدته" - subject: "%{name} أعجبه منشورك" - love: "كل الود," - manage_your_email_settings: "إدارة إعدادات بريدك الإلكتروني" + liked: "%{name} أعجبه منشورك" + view_post: "اعرض المشاركة >" mentioned: mentioned: "قام بذكرك في مشاركة:" - sign_in: "لُج لمشاهدته" subject: "%{name} قام بذكرك في دياسبرا" private_message: - message_subject: "العنوان: %{subject}" - private_message: "راسلك برسالة خاصة:" - sign_in: "لُج لمشاهدته" - subject: "%{name} راسلك برسالة خاصة في دياسبرا" + reply_to_or_view: "رُد أو اعرض هذه المحادثة >" single_admin: admin: "إدارة دياسبرا" subject: "رسالة من إدارة دياسبرا:" started_sharing: sharing: "بدأ المشاركة معك!" - sign_in: "لُج هنا" subject: "%{name} بدأ المشاركة معك بدياسبرا" + view_profile: "اعرض ملف %{name} الشخصي" thanks: "شكرا," + to_change_your_notification_settings: "لتعديل إعدادات التنبيهات خاصتك" ok: "حسنا" or: "أو" password: "كلمة المرور" @@ -492,9 +489,9 @@ ar: post_hidden: "تم إخفاء مشاركة %{name}" posts: show: - destroy: "Delete" - not_found: "Sorry, we couldn't find that post." - permalink: "permalink" + destroy: "احذف" + not_found: "عفوًا، لم نجد هذه المشاركة." + permalink: "رابط دائم" previous: "السابق" profile: "الصفحة الشخصية" profiles: @@ -512,12 +509,12 @@ ar: your_photo: "صورتك" your_private_profile: "صفحتك الخاصة" your_public_profile: "صفحتك العامة" - your_tags: "أنت: في 5 #tags" - your_tags_placeholder: "مثال: #diaspora #ironing #kittens #music" + your_tags: "صف نفسك في 5 كلمات" + your_tags_placeholder: "مثال: #دياسبرا #إسلام #عرب #موسيقى #فن" update: failed: "فشل في تحديث حسابك الشخصي" updated: "تم تحديث حسابك الشخصي" - public: "Public" + public: "عام" registrations: closed: "التسجيلات مغلقة على هذه المنصة" create: @@ -556,6 +553,19 @@ ar: manage_within: "إدارة الأعضاء" new_request_to_person: sent: "إرسال!" + reshares: + create: + failure: "هناك خطأ ما في إعادة نشر هذه المشاركة." + reshare: + deleted: "لقد حذف المؤلف مشاركته الأصلية." + reshare: + few: "أُعِيدَ نشرها %{count} مرات" + many: "أُعِيدَ نشرها %{count} مرة" + one: "أُعِيدَ نشرها مرة واحدة" + other: "أُعِيدَ نشرها %{count} مرة" + zero: "أَعِد النشر" + reshare_confirmation: "هل أُعِد نشر مشاركة %{author} - ومحتواها: %{text} ?" + show_original: "اعرض الأصلية" search: "بحث" services: create: @@ -574,13 +584,13 @@ ar: invite_your_friends_from: "دعوة أصدقائك من %{service}" not_connected: "غير متصل" index: - connect_to_facebook: "إتصل بـ فسبوك" - connect_to_tumblr: "Connect to Tumblr" + connect_to_facebook: "إتصل بـ فيسبوك" + connect_to_tumblr: "صل حسابك بـ Tumblr" connect_to_twitter: "إتصل بتويتر" disconnect: "فصل الإتصال" edit_services: "تعديل الخدمات" logged_in_as: "متصل بحساب" - no_services: "You have not connected any services yet." + no_services: "لم تَصِل أي خدمة بحسابك بعد." really_disconnect: "فصل إتصال %{service}?" inviter: click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك" @@ -591,9 +601,9 @@ ar: settings: "إعدادات" shared: add_contact: - add_new_contact: "Add a new contact" - create_request: "ابحث باستخدام وسيط دياسبرا" - diaspora_handle: "وسيط دياسبرا" + add_new_contact: "أضف جهة اتصال جديدة" + create_request: "ابحث باستخدام وسيط ديسبورا" + diaspora_handle: "ديسبورا@فرع.org" enter_a_diaspora_username: "أدخل وسيط دياسبرا:" know_email: "تعرف بريد الإلكتروني؟ يجدر بك دعوتهم" your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}" @@ -606,9 +616,9 @@ ar: by_email: "عبر البريد الإلكتروني" dont_have_now: "لا تملك دعوات حاليا، لكنها قادمة قريبا" from_facebook: "عبر فسبوك" - invitations_left: "(%{count} متبقية)" + invitations_left: "%{count} متبقية" invite_someone: "دعوة شخص" - invite_your_friends: "دعوات لأصدقائك" + invite_your_friends: "ادعُ أصدقاءك" invites: "دعوات" invites_closed: "الدعوات غير متاحة على هذه المنصة حاليا" notification: @@ -622,7 +632,7 @@ ar: all: "الجميع" all_contacts: "جميع الفئات" click_to_share_with: "إضغط للمشاركة مع: " - discard_post: "Discard post" + discard_post: "تجاهل المشاركة" make_public: "عممها" post_a_message_to: "انشر رسالة إلى %{aspect}" posting: "نشر..." @@ -630,17 +640,17 @@ ar: publishing_to: "نشر إلى: " share: "مشاركة" share_with: "مشاركة مع %{aspect}" - upload_photos: "Upload photos" - whats_on_your_mind: "ما يجول في خاطرك؟" + upload_photos: "ارفع صور" + whats_on_your_mind: "ماذا يجول في خاطرك؟" reshare: - reshare: "إعادة مشاركة" + reshare: "أَعِد النشر" stream_element: dislike: "لم يعجبني" like: "أعجبني" - shared_with: "Shared with: %{aspect_names}" + shared_with: "مُشَارك مع: %{aspect_names}" unlike: "إلغاء إعجابي" via: "بواسطة %{link}" - viewable_to_anyone: "This post is viewable to anyone on the web" + viewable_to_anyone: "يستطيع أي شخص على الشابكة رؤية هذه المشاركة." status_messages: create: success: "ذكرت بنجاح: %{names}" @@ -657,29 +667,29 @@ ar: other: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا" zero: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا" stream_helper: - hide_comments: "إخفاء التعليقات" - show_more_comments: "Show %{number} more comments" + hide_comments: "أخْفِ كل التعليقات" + show_more_comments: "أظهر %{number} من التعليقات" tag_followings: create: - failure: "Failed to follow: #%{name}" - success: "Successfully following: #%{name}" + failure: "فشل في متابعة: #%{name}" + success: "بدأت بنجاح متابعة: #%{name}" destroy: - failure: "Failed to stop following: #%{name}" - success: "Successfully stopped following: #%{name}" + failure: "فشل في إيقاف متابعة: #%{name}" + success: "أوقف بنجاح متابعة: #%{name}" tags: show: - follow: "Follow #%{tag}" - following: "Following #%{tag}" + follow: "تابع #%{tag}" + following: "أنت تتابع #%{tag}" nobody_talking: "لا أحد يتكلم %{tag} بعد" people_tagged_with: "أشخاص tagged بـ %{tag}" posts_tagged_with: "رسائل tagged بـ #%{tag}" - stop_following: "Stop Following #%{tag}" + stop_following: "أوقف متابعة #%{tag}" tokens: show: connect_to_cubbies: "اتصل بـ Cubbi.es" - connecting_is_simple: "صِل حساب دياسبرا خاصتك عن طريق ملأ حقلين بـصفحة حساب Cubbi.es خاصتك." + connecting_is_simple: "اتصال حسابك في ديسبورا بسيط! فقط أدخل وسيط ديسبورا الخاص بك (%{diaspora_id}) من صفحة إعداداتك في Cubbies ثم اضغط \"اتصِل\"." daniels_account: "حساب دياسبرا الخاص بدانييل" - log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora." + log_in_with_diaspora_is_comming: "قريبًا جدًا .. ستتمكن من الاتصال بتطبيق جديد دون إنشاء حساب منفصل عن حسابك في ديسبورا." love_to_try: "نحبذ أن تجربه." making_the_connection: "جارِ الإتصال" screenshot_explanation: "%{link1}. هذا الـ cubby خاص بـ %{link2}." @@ -690,11 +700,15 @@ ar: undo: "تراجع؟" username: "معرف" users: - destroy: "تم إغلاق الحساب بنجاح" + confirm_email: + email_confirmed: "فُعِّل البريد الإلكتروني %{email} بنجاح" + email_not_confirmed: "لا يمكن تفعيل البريد الإلكتروني، أهو رابط خاطئ؟" + destroy: "أُغلِق حسابك بنجاح. قد يستغرق إغلاق الحساب تمامًا 20 دقيقة. شكرًا لتجريبك ديسبورا." edit: also_commented: "...علق أحدهم على منشور مراسلك" change: "تغيير" - change_language: "تغيير اللعة" + change_email: "عدِّل البريد الإلكتروني" + change_language: "تغيير اللغة" change_password: "تغيير كلمة المرور" close_account: "غلق الحساب" comment_on_post: "...علق أحدهم على رسالتك" @@ -702,6 +716,7 @@ ar: download_photos: "تحميل صوري" download_xml: "تحميل xml خاصتي" edit_account: "تعديل الحساب" + email_awaiting_confirmation: "لقد أرسلنا إليك رابط تفعيل إلى %{unconfirmed_email}. وحتى تتبع هذا الرابط وتفعل العنوان الجديد، سنستمر في استخدام بريدك الأساسي %{email}." export_data: "تصدير البيانات" liked: "...أعجب أحدهم بمنشورك" mentioned: "...تم ذكرك في رسالة" @@ -710,7 +725,7 @@ ar: receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟" started_sharing: "...بدأ أحدهم المشاركة معك؟" your_email: "بريدك الإلكتروني" - your_handle: "وسيط دياسبرا خاصتك" + your_handle: "وسيط ديسبورا الخاص بك" getting_started: connect_on_diaspora: "الإتصال بدياسبورا" connect_services: "الإتصال بخدماتك" @@ -733,8 +748,10 @@ ar: email_notifications_changed: "فشل تغيير اللغة" language_changed: "تم تغيير اللغة" language_not_changed: "فشل تغيير اللغة" - password_changed: "تم تغيير كلمة المرور" + password_changed: "غُيِّرت كلمة المرور بنجاح. يمكنك الولوج بكلمة سرك الجديدة." password_not_changed: "فشل تغيير كلمة المرور" + unconfirmed_email_changed: "عُدَِل البريد الإلكتروني. بحاجة إلى التفعيل." + unconfirmed_email_not_changed: "فشل تعديل البريد الإلكتروني" webfinger: fetch_failed: "فشل تحميل webfinger الحساب لـ %{profile_url}" hcard_fetch_failed: "خطأ خلال تحميل hcard الخاص بـ #{@account}" diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml index 278be5064..43dafba0b 100644 --- a/config/locales/diaspora/bg.yml +++ b/config/locales/diaspora/bg.yml @@ -26,6 +26,10 @@ bg: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ bg: login: "вписване" logout: "отписване" profile: "профил" + recent_notifications: "Recent notifications" settings: "настройки" view_all: "Показване на всички" likes: @@ -366,39 +371,31 @@ bg: other: "%{actors} започна да споделя с вас." zero: "%{actors} започна да споделя с вас." notifier: - also_commented: - commented: "също коментира публикацията на %{post_author}:" - sign_in: "Впишете се, за да я прегледате." - subject: "%{name} коментира публикация на %{post_author}." + click_here: "click here" comment_on_post: - commented: "добави коментар на ваша публикация:" - sign_in: "Впишете се, за да го прегледате." - subject: "%{name} коментира ваша публикация." - diaspora: "системата за ел. поща на Diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Здравейте %{name}!" liked: liked: "току-що %{name} хареса вашата публикация:" - sign_in: "Впишете се, за да я прегледате" - subject: "току-що %{name} хареса ваша публикация" - love: "с уважение," - manage_your_email_settings: "променяне на настройките за известяване" + view_post: "View post >" mentioned: mentioned: "ви спомена в публикация:" - sign_in: "Впишете се, за да я прегледате." subject: "%{name} ви спомена в Diaspora*" private_message: - message_subject: "Тема: %{subject}" - private_message: "ви изпрати лично съобщение:" - sign_in: "Впишете се, за да го прегледате." - subject: "%{name} ви изпрати лично съобщение в Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Вашият администратор на Diaspora" subject: "Съобщение относно акаунта ви в Diaspora:" started_sharing: sharing: "започна да споделя с вас!" - sign_in: "Впишете се тук" subject: "%{name} започна да споделя с вас в Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Благодаря," + to_change_your_notification_settings: "to change your notification settings" ok: "Добре" or: "или" password: "Парола" @@ -512,7 +509,7 @@ bg: your_photo: "Снимка" your_private_profile: "Вашият личен профил" your_public_profile: "Вашият публичен профил" - your_tags: "Опишете се с до 5 #думи" + your_tags: "Опишете се с до 5 #думи (тагове)" your_tags_placeholder: "например: #България #diaspora #фитнес #музика #котки" update: failed: "Профилът не бе обновен" @@ -556,6 +553,19 @@ bg: manage_within: "Manage contacts within" new_request_to_person: sent: "изпратена!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Търсене" services: create: @@ -690,10 +700,14 @@ bg: undo: "Отмяна?" username: "Потребителско име" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Акаунтът ви в Diaspora е заключен. Затварянето може да отнеме до 20 минути. Благодарим ви, че пробвахте Diaspora." edit: also_commented: "...някой коментира публикация на ваш контакт?" change: "Промяна" + change_email: "Change E-Mail" change_language: "Промяна на езика" change_password: "Промяна на паролата" close_account: "Затваряне на акаунта" @@ -702,6 +716,7 @@ bg: download_photos: "снимките ви" download_xml: "данните ви (XML формат)" edit_account: "Редактиране на акаунта" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Сваляне на..." liked: "...някой хареса ваша публикация?" mentioned: "...бъдете споменат в публикация?" @@ -735,6 +750,8 @@ bg: language_not_changed: "Езикът не бе променен" password_changed: "Паролата е променена. Можете да се впишете с новата парола." password_not_changed: "Паролата не бе променена" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml index 574f7d767..324f08563 100644 --- a/config/locales/diaspora/br.yml +++ b/config/locales/diaspora/br.yml @@ -26,6 +26,10 @@ br: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ br: login: "login" logout: "mont kuit" profile: "patrom" + recent_notifications: "Recent notifications" settings: "dibaboù" view_all: "View all" likes: @@ -366,39 +371,31 @@ br: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented on %{post_author}'s post." + click_here: "click here" comment_on_post: - commented: "has commented on your post:" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "the diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" private_message: - message_subject: "Danvez: %{subject}" - private_message: "en/hi deus kaset deoc'h ur gemennadenn prevez:" - sign_in: "Sign in to view it." - subject: "%{name} en/hi deus kaset deoc'h ur gemennadenn prevez gant Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message about your Diaspora account:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "MAT EO" or: "pe" password: "Ger-kuzh" @@ -556,6 +553,19 @@ br: manage_within: "Manage contacts within" new_request_to_person: sent: "kaset!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Klask" services: create: @@ -690,10 +700,14 @@ br: undo: "Mont war-gil?" username: "Anv-implijer" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Ar c'hont zo bet klozet mat." edit: also_commented: "...someone also comments on your contact's post?" change: "Cheñch" + change_email: "Change E-Mail" change_language: "Cheñch Yezh" change_password: "Cheñch ar Ger-Kuzh" close_account: "Klozañ ar C'hont" @@ -702,6 +716,7 @@ br: download_photos: "download my photos" download_xml: "download my xml" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Export Data" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ br: language_not_changed: "Kudennoù zo bet o cheñch ar yezh" password_changed: "Ger-Kuzh Cheñchet" password_not_changed: "Ur gudenn zo bet o cheñch ar ger-kuzh" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml index eb7c79d11..da6f5ff07 100644 --- a/config/locales/diaspora/cs.yml +++ b/config/locales/diaspora/cs.yml @@ -26,6 +26,10 @@ cs: attributes: from_id: taken: "je duplicitní k dříve existující žádosti." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -247,7 +251,7 @@ cs: edit: sign_up: "sign_up" new: - already_invited: "Již byl pozván" + already_invited: "Následující lidé nepřijali vaše pozvání:" aspect: "Aspekt" comma_seperated_plz: "Můžete zadat více emailových adres oddělených čárkami." if_they_accept_info: "pokud přijmou, budou přidáni do aspektu, do kterého byly pozváni." @@ -272,6 +276,7 @@ cs: login: "přihlásit" logout: "odhlásit" profile: "profil" + recent_notifications: "Recent notifications" settings: "nastavení" view_all: "Zobrazit všechno" likes: @@ -366,39 +371,31 @@ cs: other: "%{actors} s vámi začali sdílet." zero: "%{actors} s vámi začali sdílet." notifier: - also_commented: - commented: "také komentoval příspěvek od %{post_author}:" - sign_in: "Přihlašte se pro zobrazení." - subject: "%{name} se také vyjádřil k vašemu %{post_author} příspěvku." + click_here: "click here" comment_on_post: - commented: "komentoval váš příspěvek:" - sign_in: "Přihlašte se pro zobrazení." - subject: "%{name} komentoval váš příspěvek." - diaspora: "diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "zmínil jste v příspěvku:" - sign_in: "Přihlaste se pro zobrazení." subject: "%{name} vás zmínil na Diaspoře*" private_message: - message_subject: "Předmět: %{subject}" - private_message: "vám poslal soukromou zprávu:" - sign_in: "Přihlaste se pro zobrazení." - subject: "%{name} vám poslal soukromou zprávu na Diasporu*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Váš Diaspora administrátor" subject: "Zpráva o vašem účtu na Diaspoře:" started_sharing: sharing: "s vámi začal sdílet!" - sign_in: "Přihlaste se zde" subject: "%{name} s vámi začal sdílet na Diaspoře*" + view_profile: "View %{name}'s profile" thanks: "Díky," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "nebo" password: "Heslo" @@ -556,6 +553,19 @@ cs: manage_within: "Spravovat kontakty uvnitř" new_request_to_person: sent: "odesláno!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Hledat" services: create: @@ -690,10 +700,14 @@ cs: undo: "Vrátit?" username: "Uživatelské jméno" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Váš účet byl uzamčen. Dokončení uzavření vašeho účtu může trvat 20 minut. Děkujeme vám za vyzkoušení Diaspory." edit: also_commented: "...někdo komentoval váš příspěvek?" change: "Změnit" + change_email: "Change E-Mail" change_language: "Změnit jazyk" change_password: "Změnit heslo" close_account: "Uzavřít účet" @@ -702,6 +716,7 @@ cs: download_photos: "stáhnout moje fotky" download_xml: "stáhnout moje xml" edit_account: "Upravit účet" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportovat data" liked: "...někomu se líbí váš příspěvek?" mentioned: "...jste zmíněn v příspěvku?" @@ -735,6 +750,8 @@ cs: language_not_changed: "Změna jazyka selhala" 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" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Selhalo načtení webfinger profilu pro %{profile_url}" hcard_fetch_failed: "Nepodařilo se získat hcard pro %{@account}" diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml index ba53e1fc6..d2e8cf417 100644 --- a/config/locales/diaspora/cy.yml +++ b/config/locales/diaspora/cy.yml @@ -26,6 +26,10 @@ cy: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ cy: login: "login" logout: "logout" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ cy: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "the diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "or" password: "Password" @@ -556,6 +553,19 @@ cy: manage_within: "Manage contacts within" new_request_to_person: sent: "sent!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Search" services: create: @@ -690,10 +700,14 @@ cy: undo: "Undo?" username: "Username" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Account successfully closed." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Change Language" change_password: "Change Password" close_account: "Close Account" @@ -702,6 +716,7 @@ cy: download_photos: "download my photos" download_xml: "download my xml" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Export Data" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ cy: language_not_changed: "Language Change Failed" password_changed: "Password Changed" password_not_changed: "Password Change Failed" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml index cdd89e3b4..08577d65d 100644 --- a/config/locales/diaspora/da.yml +++ b/config/locales/diaspora/da.yml @@ -26,6 +26,10 @@ da: attributes: from_id: taken: "er en kopi af en allerede eksisterende forespørgsel." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ da: login: "Log ind" logout: "Log ud" profile: "profil" + recent_notifications: "Recent notifications" settings: "indstillinger" view_all: "View all" likes: @@ -366,39 +371,31 @@ da: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "har også kommenteret på %{post_author}'s post:" - sign_in: "Log in for at se det." - subject: "%{name} har også kommenteret på %{post_author}'s post." + click_here: "click here" comment_on_post: - commented: "har kommenteret på din post:" - sign_in: "Log in for at se det." - subject: "%{name} har kommenteret på din post!" - diaspora: "Diaspora e-mail robotten" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Hej %{name}!" liked: liked: "%{name} har lige syntes om din post: " - sign_in: "Sign to view it" - subject: "%{name} synes godt om din post" - love: "Hilsen," - manage_your_email_settings: "rediger dine email indstillinger" + view_post: "View post >" mentioned: mentioned: "omtalte dig i en post:" - sign_in: "Log in for at se det." subject: "%{name} har omtalt dig på Diaspora*" private_message: - message_subject: "Emne: %{subject}" - private_message: "har sendt dig en privat besked:" - sign_in: "Log in for at se." - subject: "%{name} har sendt dig en privat meddelelse på Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Din Diaspora administrator" subject: "En besked fra din Diaspora administrator:" started_sharing: sharing: "er begyndt at dele med dig!" - sign_in: "Log in her" subject: "%{name} er begyndt at dele med dig på Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Tak," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "eller" password: "Adgangskode" @@ -556,6 +553,19 @@ da: manage_within: "Administrér kontaktpersoner indenfor" new_request_to_person: sent: "afsendt!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Søg" services: create: @@ -690,10 +700,14 @@ da: undo: "Fortryd?" username: "Brugernavn" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Kontoen er nu lukket." edit: also_commented: "...en eller anden har også kommenteret på din kontakts post?" change: "Skift" + change_email: "Change E-Mail" change_language: "Skift sprog" change_password: "Skift adgangskode" close_account: "Luk konto" @@ -702,6 +716,7 @@ da: download_photos: "Download mine billeder" download_xml: "Download min XML" edit_account: "Rediger konto" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportér data" liked: "...nogen synes godt om din post?" mentioned: "...du er nævnt i en post?" @@ -735,6 +750,8 @@ da: language_not_changed: "Kunne ikke ændre sprog" password_changed: "Adgangskode ændret" password_not_changed: "Kunne ikke ændre adgangskode" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "kunne ikke hente webfinger profil for %{profile_url}" hcard_fetch_failed: "der opstod et problem i forbindelse med hentning af hcard for %{account}" diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 59f99ee2e..998848661 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -26,6 +26,10 @@ de: attributes: from_id: taken: "wurde schon einmal angefordert." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -109,7 +113,7 @@ de: services: content: "Du kannst die folgenden Dienste mit Diaspora verbinden:" heading: "Verbinde Dienste" - tags_following: "Followed Tags" + tags_following: "Tags, denen ich folge" your_aspects: "Deine Aspekte" many: "%{count} Aspekte" move_contact: @@ -272,6 +276,7 @@ de: login: "Anmelden" logout: "Abmelden" profile: "Profil" + recent_notifications: "Recent notifications" settings: "Einstellungen" view_all: "alle anzeigen" likes: @@ -366,39 +371,31 @@ de: other: "%{actors} haben angefangen mit dir zu teilen." zero: "Niemand hat angefangen mit dir zu teilen." notifier: - also_commented: - commented: "hat den Beitrag von %{post_author} ebenfalls kommentiert:" - sign_in: "Melde dich an, um ihn anzuzeigen." - subject: "%{name} hat den Beitrag von %{post_author} auch kommentiert." + click_here: "click here" comment_on_post: - commented: "hat deinen Beitrag kommentiert:" - sign_in: "Melde dich an, um ihn anzuzeigen." - subject: "%{name} hat deinen Beitrag kommentiert." - diaspora: "der Diaspora E-Mail-Roboter" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "hat dich in einem Beitrag erwähnt:" - sign_in: "Melde dich an um sie zu sehen." subject: "%{name} hat dich auf Diaspora* erwähnt" private_message: - message_subject: "Betreff: %{subject}" - private_message: "hat dir eine Private Nachricht gesendet." - sign_in: "Melde dich an um sie Anzuschauen" - subject: "%{name} hat dir eine Private Nachricht bei Diaspora* gesendet" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Dein Diaspora-Administrator" subject: "Eine Nachricht dein Diaspora*-Konto betreffend:" started_sharing: sharing: "hat angefangen mit dir zu teilen!" - sign_in: "Hier anmelden" subject: "Auf Diaspora* hat %{name} angefangen mit dir zu teilen" + view_profile: "View %{name}'s profile" thanks: "Danke," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "oder" password: "Passwort" @@ -556,6 +553,19 @@ de: manage_within: "Kontakte verwalten in" new_request_to_person: sent: "Gesendet!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Suche" services: create: @@ -661,11 +671,11 @@ de: show_more_comments: "Zeige %{number} weitere Kommentare" tag_followings: create: - failure: "Failed to follow: #%{name}" - success: "Successfully following: #%{name}" + failure: "Fehler beim Folgen von: #%{name}" + success: "Du folgst nun: #%{name}" destroy: - failure: "Failed to stop following: #%{name}" - success: "Successfully stopped following: #%{name}" + failure: "Fehler beim Beenden des Folgens von: #%{name}" + success: "Du folgst #%{name} nicht mehr" tags: show: follow: "#%{tag} folgen" @@ -677,7 +687,7 @@ de: tokens: show: connect_to_cubbies: "Mit Cubbi.es verbinden" - connecting_is_simple: "Um dein Diaspora Konto zu verbinden, kopiere einfach die zwei Felder in deine Cubbi.es Kontoseite." + connecting_is_simple: "Dein Diaspora-Konto mit Cubbi.es zu verbinden ist einfach! Trage einfach deine Diaspora-ID in der Cubbi.es Einstellungenseite ein und verbinde die Konten!" daniels_account: "Daniels Diaspora-Konto" log_in_with_diaspora_is_comming: "Schon bald wirst du in der Lage sein eine Verbindung zu einer neuen Anwendung herzustellen, ohne ein seperates Konto neben deinem Konto auf Diaspora anzulegen." love_to_try: "Es wäre toll wenn Du es ausprobieren würdest." @@ -690,10 +700,14 @@ de: undo: "Rückgängig machen?" username: "Benutzername" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Dein Konto wurde gesperrt. Es kann 20 Minuten dauern, bis wir die Schließung deines Kontos abgeschlossen haben. Vielen Dank, dass du Diaspora ausprobiert hast." edit: also_commented: "… jemand ebenfalls den Beitrag eines Kontaktes kommentiert hat?" change: "Ändern" + change_email: "Change E-Mail" change_language: "Sprache ändern" change_password: "Passwort ändern" close_account: "Konto schließen" @@ -702,6 +716,7 @@ de: download_photos: "Fotos herunterladen" download_xml: "Daten herunterladen (XML)" edit_account: "Konto bearbeiten" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Daten exportieren" liked: "... wenn jemandem dein Beitrag gefällt?" mentioned: "… du in einem Beitrag erwähnt wirst?" @@ -735,6 +750,8 @@ de: language_not_changed: "Ändern der Sprache fehlgeschlagen" password_changed: "Passwort geändert" password_not_changed: "Ändern des Passworts fehlgeschlagen" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden" hcard_fetch_failed: "es gab Probleme beim Laden der hcard für %{account}" diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index 2d6c9818e..3fb59cd14 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -26,6 +26,10 @@ el: attributes: from_id: taken: "είναι αντίγραφο ενός προϋπάρχοντος αιτήματος." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ el: login: "Είσοδος" logout: "αποσύνδεση" profile: "προφίλ" + recent_notifications: "Πρόσφατες ειδοποιήσεις" settings: "ρυθμίσεις" view_all: "Προβολή όλων" likes: @@ -366,39 +371,31 @@ el: other: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας." zero: "Οι χρήστες %{actors} άρχισαν να διαμοιράζονται μαζί σας." notifier: - also_commented: - commented: "σχολίασε επίσης τη δημοσίευση του χρήστη %{post_author} :" - sign_in: "Συνδεθείτε για να το δείτε." - subject: "Ο/Η %{name} επίσης σχολίασε τη δημοσίευση του χρήστη %{post_author}." + click_here: "πατήστε εδώ" comment_on_post: - commented: "έχει σχολιάσει σε δημοσίευση σας:" - sign_in: "Συνδεθείτε για να το δείτε." - subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας." - diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.." + reply: "Απαντήστε ή δείτε τη δημοσίευση του χρήστη %{name} >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Γειά σου %{name}!" liked: liked: "στο χρήστη %{name} αρέσει η δημοσίευση σας: " - sign_in: "Συνδεθείτε για να το δείτε" - subject: "στο χρήστη %{name} αρέσει η δημοσίευση σας" - love: "Με αγάπη," - manage_your_email_settings: "διαχείριση των ρυθμίσεων ηλεκτρονικού ταχυδρομείου" + view_post: "View post >" mentioned: mentioned: "αναφέρεται σε σας σε μια δημοσίευση:" - sign_in: "Συνδεθείτε για να το δείτε." subject: "Ο/Η %{name} σας αναφέρει στο Diaspora*" private_message: - message_subject: "Θέμα: %{subject}" - private_message: "σας έστειλε ένα ιδιωτικό μήνυμα:" - sign_in: "Συνδεθείτε για να το δείτε." - subject: "Ο χρήστης %{name} σας έστειλε ένα ιδιωτικό μήνυμα στο Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Ο διαχειριστής Diaspora σας" subject: "Μήνυμα για τον Diaspora λογαριασμό σας:" started_sharing: sharing: "ξεκίνησε το διαμοιρασμό μαζί σας!" - sign_in: "Συνδεθείτε εδώ" subject: "Ο χρήστης %{name} ξεκίνησε το διαμοιρασμό μαζί σας στο Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Ευχαριστώ," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "ή" password: "Κωδικός" @@ -492,8 +489,8 @@ el: post_hidden: "Στη δημοσίευση του χρήστη %{name} έχει γίνει απόκρυψη." posts: show: - destroy: "Delete" - not_found: "Sorry, we couldn't find that post." + destroy: "Διαγραφή" + not_found: "Λυπούμαστε, δεν καταφέραμε να βρούμε αυτή τη δημοσίευση." permalink: "permalink" previous: "προηγούμενο" profile: "Προφίλ" @@ -556,6 +553,19 @@ el: manage_within: "Διαχειριστείτε τις επαφές της πτυχής" new_request_to_person: sent: "εστάλη!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Αναζήτηση" services: create: @@ -690,10 +700,14 @@ el: undo: "Αναίρεση;" username: "Όνομα Χρήστη" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Ο λογαριασμός σας έχει κλειδωθεί. Μπορεί να διαρκέσει μέχρι και 20 λεπτά για να τελειώσουμε το κλείσιμο του λογαριασμού. Σας ευχαριστούμε που δοκιμάσατε το Diaspora." edit: also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;" change: "Αλλαγή" + change_email: "Change E-Mail" change_language: "Αλλαγή Γλώσσας" change_password: "Αλλαγή κωδικού πρόσβασης" close_account: "Κλείσιμο Λογαριασμού" @@ -702,6 +716,7 @@ el: download_photos: "κατέβασε τις φωτογραφίες μου" download_xml: "κατέβασε το xml μου" edit_account: "Επεξεργασία λογαριασμού" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Εξαγωγή Δεδομένων" liked: "...σε κάποιον αρέσει η δημοσίευση σας;" mentioned: "...επισημανθήκατε σε μία φωτογραφία?" @@ -735,6 +750,8 @@ el: language_not_changed: "Η αλλαγή γλώσσας απέτυχε" password_changed: "Ο κωδικός σας άλλαξε. Μπορείτε τώρα να συνδεθείτε με τον νέο κωδικό. " password_not_changed: "Η αλλαγή κωδικού απέτυχε" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml index 3e51f1876..373d97dd6 100644 --- a/config/locales/diaspora/en_shaw.yml +++ b/config/locales/diaspora/en_shaw.yml @@ -6,7 +6,7 @@ en_shaw: _applications: "𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯" _comments: "𐑒𐑪𐑥𐑩𐑯𐑑𐑕" - _contacts: "Contacts" + _contacts: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" _home: "Home" _photos: "𐑓𐑴𐑑𐑴𐑟" _services: "Services" @@ -26,6 +26,10 @@ en_shaw: attributes: from_id: taken: "𐑦𐑟 𐑛𐑵𐑐𐑤𐑦𐑒𐑩𐑑 𐑝 𐑩 𐑐𐑮𐑦-𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑮𐑦𐑒𐑢𐑧𐑕𐑑." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -63,12 +67,12 @@ en_shaw: aspect_contacts: done_editing: "𐑛𐑳𐑯 𐑧𐑛𐑦𐑑𐑦𐑙" aspect_listings: - add_an_aspect: "+ Add an aspect" + add_an_aspect: "+ 𐑨𐑛 𐑩𐑯 𐑨𐑕𐑐𐑧𐑒𐑑" aspect_stream: - commented_on: "commented on" - posted: "posted" - recently: "recently:" - stream: "Stream" + commented_on: "𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯" + posted: "𐑐𐑴𐑕𐑑𐑩𐑛" + recently: "𐑮𐑰𐑕𐑩𐑯𐑑𐑤𐑦:" + stream: "𐑕𐑑𐑮𐑰𐑥" contacts_not_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼." contacts_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼." create: @@ -99,18 +103,18 @@ en_shaw: heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es" learn_more: "𐑤𐑻𐑯 𐑥𐑹" diaspora_id: - content_1: "Your Diaspora ID is:" - content_2: "Give it to anyone and they'll be able to find you on Diaspora." - heading: "Diaspora ID" - handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿." + content_1: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑯 𐑦𐑟:" + content_2: "𐑜𐑦𐑝 𐑦𐑑 𐑑 𐑧𐑯𐑦𐑢𐑩𐑯 𐑯 𐑞𐑱𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑓𐑲𐑯𐑛 𐑿 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩." + heading: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯" + handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑨𐑛𐑮𐑧𐑕, 𐑿 𐑒𐑨𐑯 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿." no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿" post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>" services: - content: "You can connect the following services to Diaspora:" - heading: "Connect Services" - tags_following: "Followed Tags" - your_aspects: "Your Aspects" + content: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩:" + heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟" + tags_following: "𐑓𐑪𐑤𐑴𐑛 𐑑𐑨𐑜𐑟" + your_aspects: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" many: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" move_contact: error: "𐑺𐑼 𐑥𐑵𐑝𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑: %{inspect}" @@ -120,17 +124,17 @@ en_shaw: create: "𐑒𐑮𐑦𐑱𐑑" name: "𐑯𐑱𐑥" no_posts_message: - start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑. 𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!" - try_adding_some_more_contacts: "Try adding some more contacts." + start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑧𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑!" + try_adding_some_more_contacts: "𐑑𐑮𐑲 𐑨𐑛𐑦𐑙 𐑕𐑳𐑥 𐑥𐑹 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕." one: "1 𐑨𐑕𐑐𐑧𐑒𐑑" other: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕" seed: family: "𐑓𐑨𐑥𐑦𐑤𐑦" work: "𐑢𐑻𐑒" selected_contacts: - manage_your_aspects: "Manage your aspects." - no_contacts: "You don't have any contacts here yet." - view_all_contacts: "View all contacts" + manage_your_aspects: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕." + no_contacts: "𐑿 𐑛𐑴𐑯𐑑 𐑣𐑨𐑝 𐑧𐑯𐑦 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑣𐑽 𐑘𐑧𐑑." + view_all_contacts: "𐑝𐑿 𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" show: edit_aspect: "𐑧𐑛𐑦𐑑 𐑨𐑕𐑐𐑧𐑒𐑑" update: @@ -144,7 +148,7 @@ en_shaw: bookmarklet: explanation: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑮𐑳𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 %{link}." explanation_link_text: "𐑞𐑦𐑕 𐑤𐑦𐑙𐑒" - heading: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑚𐑫𐑒𐑥𐑸𐑒𐑤𐑧𐑑" + heading: "𐑚𐑫𐑒𐑥𐑸𐑒𐑤𐑧𐑑" post_something: "𐑐𐑴𐑕𐑑 𐑕𐑳𐑥𐑔𐑦𐑙 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩" post_success: "𐑐𐑴𐑕𐑑𐑩𐑛! 𐑒𐑤𐑴𐑟𐑦𐑙!" cancel: "𐑒𐑨𐑯𐑕𐑩𐑤" @@ -164,13 +168,13 @@ en_shaw: index: add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑" all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" - edit_aspect: "Edit %{name}" - many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them." + edit_aspect: "𐑧𐑛𐑦𐑑 %{name}" + many_people_are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑕𐑑𐑸𐑑 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑢𐑦𐑞 𐑥𐑹 𐑞𐑨𐑯 %{suggested_limit} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕? 𐑐𐑴𐑕𐑑𐑦𐑙 𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑥𐑱 𐑚𐑰 𐑩 𐑚𐑧𐑑𐑼 𐑢𐑱 𐑑 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑞𐑧𐑥." my_contacts: "𐑥𐑲 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕." only_sharing_with_me: "𐑴𐑯𐑤𐑦 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑥𐑰" remove_person_from_aspect: "𐑮𐑦𐑥𐑵𐑝 %{person_name} 𐑓𐑮𐑳𐑥 \"%{aspect_name}\"" - start_a_conversation: "Start a conversation" + start_a_conversation: "𐑕𐑑𐑸𐑑 𐑩 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯" title: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" your_contacts: "𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" many: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" @@ -199,7 +203,7 @@ en_shaw: no_conversation_selected: "𐑯𐑴 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑩𐑤𐑧𐑒𐑑𐑩𐑛" no_messages: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡𐑩𐑟" new: - abandon_changes: "Abandon changes?" + abandon_changes: "𐑩𐑚𐑨𐑯𐑛𐑩𐑯 𐑗𐑱𐑯𐑡𐑩𐑟?" send: "𐑕𐑧𐑯𐑛" subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑" to: "𐑑" @@ -218,7 +222,7 @@ en_shaw: correct_the_following_errors_and_try_again: "𐑒𐑩𐑮𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑺𐑼𐑟 𐑯 𐑑𐑮𐑲 𐑩𐑜𐑧𐑯." invalid_fields: "𐑦𐑯𐑝𐑨𐑤𐑦𐑛 𐑓𐑰𐑤𐑛𐑟" fill_me_out: "𐑓𐑦𐑤 𐑥𐑰 𐑬𐑑" - find_people: "Find people" + find_people: "𐑓𐑲𐑯𐑛 𐑐𐑰𐑐𐑩𐑤" hide: "𐑣𐑲𐑛" home: show: @@ -247,7 +251,7 @@ en_shaw: edit: sign_up: "𐑕𐑲𐑯_𐑳𐑐" new: - already_invited: "𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑯𐑝𐑲𐑑𐑩𐑛" + already_invited: "𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑐𐑰𐑐𐑩𐑤 𐑣𐑨𐑝 𐑯𐑪𐑑 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯:" aspect: "𐑨𐑕𐑐𐑧𐑒𐑑" comma_seperated_plz: "𐑿 𐑒𐑨𐑯 𐑧𐑯𐑑𐑼 𐑥𐑫𐑤𐑑𐑦𐑐𐑩𐑤 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕𐑩𐑟 𐑕𐑧𐑐𐑼𐑱𐑑𐑩𐑛 𐑚𐑲 𐑒𐑪𐑥𐑩𐑟." if_they_accept_info: "𐑦𐑓 𐑞𐑱 𐑩𐑒𐑕𐑧𐑐𐑑, 𐑞𐑱 𐑢𐑦𐑤 𐑚𐑰 𐑨𐑛𐑩𐑛 𐑑 𐑞 𐑨𐑕𐑐𐑧𐑒𐑑 𐑿 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑧𐑥." @@ -272,8 +276,9 @@ en_shaw: login: "𐑤𐑪𐑜 𐑦𐑯" logout: "𐑤𐑪𐑜 𐑬𐑑" profile: "𐑐𐑮𐑴𐑓𐑲𐑤" + recent_notifications: "Recent notifications" settings: "𐑕𐑧𐑑𐑦𐑙𐑟" - view_all: "View all" + view_all: "𐑝𐑿 𐑷𐑤" likes: likes: people_dislike_this: @@ -288,7 +293,7 @@ en_shaw: one: "%{count} 𐑤𐑲𐑒" other: "%{count} 𐑤𐑲𐑒𐑕" zero: "𐑯𐑴 𐑤𐑲𐑒𐑕" - limited: "Limited" + limited: "𐑤𐑦𐑥𐑦𐑑𐑩𐑛" more: "𐑥𐑹" next: "𐑯𐑧𐑒𐑕𐑑" no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛" @@ -366,39 +371,31 @@ en_shaw: other: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿." zero: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿." notifier: - also_commented: - commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:" - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑." - subject: "%{name}(e)k ere iruzkindu du %{post_author}(r)en mezua." + click_here: "click here" comment_on_post: - commented: "𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑:" - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑." - subject: "%{name} 𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑." - diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "𐑣𐑧𐑤𐑴 %{name}!" liked: liked: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑: " - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑" - subject: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑" - love: "𐑤𐑳𐑝," - manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟" + view_post: "View post >" mentioned: mentioned: "𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑:" - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑." subject: "%{name} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*" private_message: - message_subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑: %{subject}" - private_message: "𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡:" - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑." - subject: "%{name} 𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡 𐑪𐑯 *𐑛𐑦𐑨𐑕𐑐𐑹𐑩" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑛𐑥𐑦𐑯𐑦𐑕𐑑𐑮𐑱𐑑𐑼" subject: "𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑:" started_sharing: sharing: "𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿!" - sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽" subject: "%{name} 𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*" + view_profile: "View %{name}'s profile" thanks: "𐑔𐑱𐑙𐑒𐑕," + to_change_your_notification_settings: "to change your notification settings" ok: "𐑴𐑒𐑱" or: "𐑹" password: "Password" @@ -492,9 +489,9 @@ en_shaw: post_hidden: "%{name}𐑟 𐑐𐑴𐑕𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑣𐑦𐑛𐑩𐑯." posts: show: - destroy: "Delete" - not_found: "Sorry, we couldn't find that post." - permalink: "permalink" + destroy: "𐑛𐑦𐑤𐑰𐑑" + not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑." + permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒" previous: "𐑐𐑮𐑰𐑝𐑾𐑕" profile: "𐑐𐑮𐑴𐑓𐑲𐑤" profiles: @@ -517,7 +514,7 @@ en_shaw: update: failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤" updated: "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑𐑩𐑛" - public: "Public" + public: "𐑐𐑳𐑚𐑤𐑦𐑒" registrations: closed: "𐑕𐑲𐑯𐑩𐑐𐑕 𐑸 𐑒𐑤𐑴𐑟𐑛 𐑪𐑯 𐑞𐑦𐑕 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛." create: @@ -556,6 +553,19 @@ en_shaw: manage_within: "𐑥𐑨𐑯𐑩𐑡 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑢𐑦𐑞𐑦𐑯" new_request_to_person: sent: "𐑕𐑧𐑯𐑑!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "𐑕𐑻𐑗" services: create: @@ -580,7 +590,7 @@ en_shaw: disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑" edit_services: "𐑧𐑛𐑦𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟" logged_in_as: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑨𐑟" - no_services: "You have not connected any services yet." + no_services: "𐑿 𐑣𐑨𐑝 𐑯𐑪𐑑 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑑 𐑧𐑯𐑦 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑘𐑧𐑑." really_disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 %{service}?" inviter: click_link_to_accept_invitation: "𐑒𐑤𐑦𐑒 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯" @@ -592,7 +602,7 @@ en_shaw: shared: add_contact: add_new_contact: "𐑨𐑛 𐑯𐑿 𐑒𐑪𐑯𐑑𐑨𐑒𐑑" - create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤" + create_request: "𐑓𐑲𐑯𐑛 𐑚𐑲·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯" diaspora_handle: "diaspora@handle.org" enter_a_diaspora_username: "𐑧𐑯𐑑𐑼 𐑩 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑿𐑟𐑼𐑯𐑱𐑥:" know_email: "𐑯𐑴 𐑞𐑺 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕? 𐑿 𐑖𐑫𐑛 𐑦𐑯𐑝𐑲𐑑 𐑞𐑧𐑥" @@ -622,7 +632,7 @@ en_shaw: all: "𐑷𐑤" all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕" click_to_share_with: "𐑒𐑤𐑦𐑒 𐑑 𐑖𐑺 𐑢𐑦𐑞:" - discard_post: "Discard post" + discard_post: "𐑛𐑦𐑕𐑒𐑸𐑛 𐑐𐑴𐑕𐑑" make_public: "𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒" post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}" posting: "𐑐𐑴𐑕𐑑𐑦𐑙..." @@ -630,17 +640,17 @@ en_shaw: publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: " share: "𐑖𐑺" share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}" - upload_photos: "Upload photos" - whats_on_your_mind: "𐑢𐑪𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?" + upload_photos: "𐑳𐑐𐑤𐑴𐑛 𐑓𐑴𐑑𐑴𐑟" + whats_on_your_mind: "𐑢𐑳𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?" reshare: reshare: "𐑮𐑦𐑖𐑺" stream_element: dislike: "𐑛𐑦𐑕𐑤𐑲𐑒" like: "𐑤𐑲𐑒" - shared_with: "Shared with: %{aspect_names}" + shared_with: "𐑖𐑺𐑛 𐑢𐑦𐑞: %{aspect_names}" unlike: "𐑩𐑯𐑤𐑲𐑒" via: "𐑝𐑾 %{link}" - viewable_to_anyone: "This post is viewable to anyone on the web" + viewable_to_anyone: "𐑞𐑦𐑕 𐑐𐑴𐑕𐑑 𐑦𐑟 𐑝𐑿𐑩𐑚𐑩𐑤 𐑑 𐑧𐑯𐑦𐑢𐑩𐑯 𐑪𐑯 𐑞 𐑢𐑧𐑚" status_messages: create: success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}" @@ -657,29 +667,29 @@ en_shaw: other: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟" zero: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟" stream_helper: - hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕" - show_more_comments: "Show %{number} more comments" + hide_comments: "𐑣𐑲𐑛 𐑷𐑤 𐑒𐑪𐑥𐑩𐑯𐑑𐑕" + show_more_comments: "𐑖𐑴 %{number} 𐑥𐑹 𐑒𐑪𐑥𐑩𐑯𐑑𐑕" tag_followings: create: - failure: "Failed to follow: #%{name}" - success: "Successfully following: #%{name}" + failure: "𐑓𐑱𐑤𐑛 𐑑 𐑓𐑪𐑤𐑴: #%{name}" + success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}" destroy: - failure: "Failed to stop following: #%{name}" - success: "Successfully stopped following: #%{name}" + failure: "𐑓𐑱𐑤𐑛 𐑑 𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}" + success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑕𐑑𐑪𐑐𐑑 𐑓𐑪𐑤𐑴𐑦𐑙: #%{name}" tags: show: - follow: "Follow #%{tag}" - following: "Following #%{tag}" + follow: "𐑓𐑪𐑤𐑴 #%{tag}" + following: "𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}" nobody_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑦𐑟 𐑑𐑷𐑒𐑦𐑙 𐑩𐑚𐑬𐑑 %{tag} 𐑘𐑧𐑑." people_tagged_with: "𐑐𐑰𐑐𐑩𐑤 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 %{tag}" posts_tagged_with: "𐑐𐑴𐑕𐑑𐑕 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 #%{tag}" - stop_following: "Stop Following #%{tag}" + stop_following: "𐑕𐑑𐑪𐑐 𐑓𐑪𐑤𐑴𐑦𐑙 #%{tag}" tokens: show: connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es" - connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑨𐑟 𐑕𐑦𐑥𐑐𐑩𐑤 𐑨𐑟 𐑓𐑦𐑤𐑦𐑙 𐑬𐑑 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟 𐑪𐑯 𐑿𐑼 Cubbi.es 𐑩𐑒𐑬𐑯𐑑 𐑐𐑱𐑡." + connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑕𐑦𐑥𐑐𐑩𐑤! 𐑡𐑳𐑕𐑑 𐑧𐑯𐑑𐑼 𐑿𐑼 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯 (%{diaspora_id}) 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑒𐑳𐑚𐑦𐑟 settings page 𐑯 𐑣𐑦𐑑 𐑒𐑩𐑯𐑧𐑒𐑑." daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑" - log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora." + log_in_with_diaspora_is_comming: "𐑐𐑮𐑦𐑑𐑦 𐑕𐑵𐑯, 𐑿𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑩 𐑯𐑿 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯 𐑢𐑦𐑞𐑬𐑑 𐑒𐑮𐑦𐑱𐑑𐑦𐑙 𐑩𐑯 𐑩𐑒𐑬𐑯𐑑 𐑕𐑧𐑐𐑮𐑩𐑑 𐑓𐑮𐑳𐑥 𐑿𐑼 𐑢𐑳𐑯 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩." love_to_try: "𐑢𐑰'𐑛 𐑤𐑳𐑝 𐑓𐑹 𐑿 𐑑 𐑑𐑮𐑲 𐑦𐑑 𐑬𐑑." making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯" screenshot_explanation: "%{link1}. 𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}." @@ -690,10 +700,14 @@ en_shaw: undo: "𐑩𐑯𐑛𐑵?" username: "𐑿𐑟𐑼𐑯𐑱𐑥" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑤𐑪𐑒𐑑. 𐑦𐑑 𐑥𐑱 𐑑𐑱𐑒 20 𐑥𐑦𐑯𐑩𐑑𐑕 𐑓𐑹 𐑳𐑕 𐑑 𐑓𐑦𐑯𐑦𐑖 𐑒𐑤𐑴𐑟𐑦𐑙 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑. 𐑔𐑱𐑙𐑒 𐑿 𐑓𐑹 𐑑𐑮𐑲𐑦𐑙 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩." edit: also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?" change: "𐑗𐑱𐑯𐑡" + change_email: "Change E-Mail" change_language: "𐑗𐑱𐑯𐑡 𐑤𐑱𐑙𐑜𐑢𐑩𐑡" change_password: "𐑗𐑱𐑯𐑡 𐑐𐑨𐑕𐑢𐑼𐑛" close_account: "𐑒𐑤𐑴𐑟 𐑩𐑒𐑬𐑯𐑑" @@ -702,6 +716,7 @@ en_shaw: download_photos: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑓𐑴𐑑𐑴𐑟" download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤." edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩" liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?" mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?" @@ -710,7 +725,7 @@ en_shaw: receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..." started_sharing: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑕𐑑𐑸𐑑𐑕 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿?" your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤" - your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤" + your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯" getting_started: connect_on_diaspora: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩" connect_services: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑿𐑼 𐑳𐑞𐑼 𐑕𐑻𐑝𐑦𐑕𐑩𐑟" @@ -735,6 +750,8 @@ en_shaw: language_not_changed: "𐑤𐑱𐑙𐑜𐑢𐑩𐑡 𐑗𐑱𐑯𐑡 𐑓𐑱𐑤𐑛" password_changed: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑗𐑱𐑯𐑡. 𐑿 𐑒𐑨𐑯 𐑯𐑬 𐑤𐑪𐑜 𐑦𐑯 𐑢𐑦𐑞 𐑿𐑼 𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛." password_not_changed: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑗𐑱𐑯𐑡 𐑓𐑱𐑤𐑛" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml index b71864e54..9b1424d46 100644 --- a/config/locales/diaspora/eo.yml +++ b/config/locales/diaspora/eo.yml @@ -26,6 +26,10 @@ eo: attributes: from_id: taken: "estas multobliga de ekzistanta peto." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -63,7 +67,7 @@ eo: aspect_contacts: done_editing: "finita redakti" aspect_listings: - add_an_aspect: "+ Add an aspect" + add_an_aspect: "+ Aldoni aspekton" aspect_stream: commented_on: "commented on" posted: "posted" @@ -130,7 +134,7 @@ eo: selected_contacts: manage_your_aspects: "Manage your aspects." no_contacts: "You don't have any contacts here yet." - view_all_contacts: "View all contacts" + view_all_contacts: "Vidi ĉiujn kontaktojn" show: edit_aspect: "redakti aspekton" update: @@ -272,6 +276,7 @@ eo: login: "ensaluti" logout: "elsaluti" profile: "profilo" + recent_notifications: "Recent notifications" settings: "agordoj" view_all: "View all" likes: @@ -366,39 +371,31 @@ eo: other: "%{actors} komencis konigi kun vi." zero: "%{actors} komencis konigi kun vi." notifier: - also_commented: - commented: "ankaŭ komentis pri la afiŝo de %{post_author}:" - sign_in: "Ensalutu por vidi ĝin." - subject: "%{name} ankaŭ komentis pri la afiŝo de %{post_author}." + click_here: "click here" comment_on_post: - commented: "komentis pri via afiŝo:" - sign_in: "Ensalutu por vidi ĝin." - subject: "%{name} komentis pri via afiŝo" - diaspora: "la diaspora retpoŝtroboto" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Saluton %{name}!" liked: liked: "%{name} ĵus ŝatis vian afiŝon: " - sign_in: "Ensaluti por vidi ĝin" - subject: "%{name} ĵus ŝatis vian afiŝon" - love: "ame," - manage_your_email_settings: "administrigi viajn retpoŝtajn agordojn" + view_post: "View post >" mentioned: mentioned: "menciis vin en afiŝon:" - sign_in: "Ensalutu por vidi ĝin." subject: "%{name} menciis vin ĉe DIASPORA*" private_message: - message_subject: "Subjekto: %{subject}" - private_message: "sendis al vin nepublikan mesaĝon:" - sign_in: "Ensaluti por vidi ĝin." - subject: "%{name} sendis al vin nepublikan mesaĝon per DIASPORA*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Via DIASPORA* administristo" subject: "Mesaĝo pri via DIASPORA* konto:" started_sharing: sharing: "komencis konigi kun vi!" - sign_in: "Ensaluti tie ĉi" subject: "%{name} komencis konigi kun vi ĉe DIASPORA*" + view_profile: "View %{name}'s profile" thanks: "Dankon," + to_change_your_notification_settings: "to change your notification settings" ok: "Nu" or: "aŭ" password: "Pasvorto" @@ -556,6 +553,19 @@ eo: manage_within: "Administrigi kontaktojn ene de" new_request_to_person: sent: "sendita!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Serĉi" services: create: @@ -690,10 +700,14 @@ eo: undo: "Ĉu malfarigi?" username: "Uzantnomo" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Via konto ŝlositas. Eble esti ĝis 20 minutoj antaŭ ni fini forigi vian konton. Dankon por via provado je DIASPORA*" edit: also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?" change: "Ŝanĝi" + change_email: "Change E-Mail" change_language: "Ŝanĝi Lingvon" change_password: "Ŝanĝi Pasvorton" close_account: "Malaniĝi" @@ -702,6 +716,7 @@ eo: download_photos: "elŝuti mian bildojn" download_xml: "elŝuti mian xml" edit_account: "Redakti konton" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Eksporti Datumojn" liked: "...iu ŝatis vian afiŝon?" mentioned: "...vi menciatas en afiŝo?" @@ -735,6 +750,8 @@ eo: language_not_changed: "Ne povis ŝanĝi lingvon" password_changed: "Pasvorto Ŝanĝita. Vi nun povas ensaluti per via nova pasvorto." password_not_changed: "Ne povis ŝanĝi pasvorton" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "ne povas alporti webfinger-an profilon por %{profile_url}" hcard_fetch_failed: "estis problemo, kiam ni alportis la hcard-on de #{@account}" diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml index 9acd7a5c7..bc03fa07c 100644 --- a/config/locales/diaspora/es-AR.yml +++ b/config/locales/diaspora/es-AR.yml @@ -26,6 +26,10 @@ es-AR: attributes: from_id: taken: "es un duplicado de una solicitud preexistente." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ es-AR: login: "conectarse" logout: "desconectarse" profile: "perfil" + recent_notifications: "Recent notifications" settings: "configuración" view_all: "View all" likes: @@ -366,39 +371,31 @@ es-AR: other: "%{actors} comparten con vos." zero: "%{actors} comparte con vos." notifier: - also_commented: - commented: "también comentó en la publicación de %{post_author}:" - sign_in: "Conectate para verlo." - subject: "%{name} también comentó en la publicación de %{post_author}." + click_here: "click here" comment_on_post: - commented: "comentó en tu publicación:" - sign_in: "Conectate para verlo." - subject: "%{name} comentó en tu publicación." - diaspora: "el robot de correos de Diáspora*" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "¡Hola %{name}!" liked: liked: "%{name} le gusta tu publicación: " - sign_in: "Conectate para verlo" - subject: "%{name} le gusta tu publicación" - love: "con amor," - manage_your_email_settings: "configurá tu correo" + view_post: "View post >" mentioned: mentioned: "te mencionó en una publicación:" - sign_in: "Conectate para verlo." subject: "%{name} te mencionó en Diáspora*" private_message: - message_subject: "Asunto: %{subject}" - private_message: "te envió un mensaje privado:" - sign_in: "Conectate para verlo." - subject: "%{name} te envió un mensaje privado en Diáspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Tu administrador de Diáspora*" subject: "Un mensaje sobre tu cuenta Diáspora*:" started_sharing: sharing: "comenzó a compartir con vos." - sign_in: "Conectate acá" subject: "%{name} comenzó a compartir con vos en Diáspora*" + view_profile: "View %{name}'s profile" thanks: "Gracias," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "o" password: "Contraseña" @@ -556,6 +553,19 @@ es-AR: manage_within: "Gestioná tus contactos" new_request_to_person: sent: "¡Enviado!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Buscar" services: create: @@ -690,10 +700,14 @@ es-AR: undo: "¿Deshacer?" username: "Nombre de usuario" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Cuenta cerrada satisfactoriamente." edit: also_commented: "...alguien también comenta en una publicación en la que comentaste?" change: "Cambiar" + change_email: "Change E-Mail" change_language: "Cambiar idioma" change_password: "Cambiar contraseña" close_account: "Cerrar cuenta" @@ -702,6 +716,7 @@ es-AR: download_photos: "descargar mis fotos" download_xml: "decargar mi XML" edit_account: "Editar cuenta" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportar datos" liked: "...a alguien le gusta una publicación tuya?" mentioned: "...te mencionan en una publicación?" @@ -735,6 +750,8 @@ es-AR: language_not_changed: "No pudo cambiarse tu idioma" password_changed: "Tu contraseña se cambió. Ya podés conectarte con tu nueva contraseña." password_not_changed: "No pudo cambiarse tu contraseña" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "No pudo encontrarse el perfil webfinger de %{profile_url}" hcard_fetch_failed: "Hubo un problema al buscar el 'hcard' de %{account}" diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml index bf4855719..027ae9273 100644 --- a/config/locales/diaspora/es-CL.yml +++ b/config/locales/diaspora/es-CL.yml @@ -26,6 +26,10 @@ es-CL: attributes: from_id: taken: "es un duplicado de una solicitud que ya existe." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -247,7 +251,7 @@ es-CL: edit: sign_up: "regístrate" new: - already_invited: "Ya invitado" + already_invited: "Las siguientes personas no aceptaron tu invitación:" aspect: "Aspecto" comma_seperated_plz: "Puedes escribir varias direcciones de correo separadas por comas." if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste." @@ -272,6 +276,7 @@ es-CL: login: "entrar" logout: "salir" profile: "perfil" + recent_notifications: "Recent notifications" settings: "Configuración" view_all: "Ver todo" likes: @@ -366,39 +371,31 @@ es-CL: other: "%{actors} comenzaron a compartir contigo." zero: "%{actors} comenzó a compartir contigo." notifier: - also_commented: - commented: "También comentó en el post de %{post_author}:" - sign_in: "Conéctate para verlo." - subject: "%{name} también comentó en el post de %{post_author}." + click_here: "click here" comment_on_post: - commented: "Comentó en tu post!" - sign_in: "Conéctate para verlo." - subject: "%{name} comentó en tu post." - diaspora: "correo robot de diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "Te mencionó en un post:" - sign_in: "Conéctate para verlo." subject: "%{name} te mencionó en Diaspora*" private_message: - message_subject: "Asunto: %{subject}" - private_message: "te envió un mensaje privado:" - sign_in: "Conéctate para verlo." - subject: "%{name} te envió un mensaje privado en Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Tu administrador de Diaspora" subject: "Un mensaje sobre tu cuenta de Diaspora:" started_sharing: sharing: "Ha comenzado a compartir contigo!" - sign_in: "Conectate aqui" subject: "%{name} ha comenzado a compartir contigo en Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Gracias," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "o" password: "Contraseña" @@ -556,6 +553,19 @@ es-CL: manage_within: "Manejar los contactos en" new_request_to_person: sent: "¡enviado!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Buscar" services: create: @@ -677,7 +687,7 @@ es-CL: tokens: show: connect_to_cubbies: "Conectarse a Cubbi.es" - connecting_is_simple: "Conectar la cuenta de diáspora es tan simple! Solo ingresa tu ID de Diaspora (%{diaspora_id}) de tu pagina de configuración de cubbies y presiona conectar." + connecting_is_simple: "Conectar la cuenta de diáspora es simple! Solo ingresa tu ID de Diaspora (%{diaspora_id}) en la pagina de configuración de cubbies y presiona conectar." daniels_account: "La cuenta de Diaspora de Daniel" log_in_with_diaspora_is_comming: "Muy pronto, podrás conectarte a nuevas aplicaciones sin crear una cuenta separada de la de Diaspora." love_to_try: "Nos encantaría que lo pruebes." @@ -690,10 +700,14 @@ es-CL: undo: "Deshacer?" username: "Nombre de usuario" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Tu cuenta ha sido bloqueada. Nos puede tomar hasta 20 minutos cerrar tu cuenta. Gracias por probar Diaspora." edit: also_commented: "...alguien comenta en el post de tu amigo?" change: "Modificar" + change_email: "Change E-Mail" change_language: "Cambiar Idioma" change_password: "Cambiar Contraseña" close_account: "Cerrar Cuenta" @@ -702,6 +716,7 @@ es-CL: download_photos: "descargar mis fotos" download_xml: "descargar mi xml" edit_account: "Editar cuenta" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportar Datos" liked: "...a alguien le gusta tu post?" mentioned: "...te mencionan en un post?" @@ -735,6 +750,8 @@ es-CL: language_not_changed: "Error al cambiar de idioma" password_changed: "Contraseña Cambiada. Ahora puedes conectarte con la nueva contraseña." password_not_changed: "Error al cambiar la contraseña" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "error al buscar el perfil webfinger para %{profile_url}" hcard_fetch_failed: "hubo un problema buscando la hcard de %{account}" diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml index e89a49b9c..0b83261ed 100644 --- a/config/locales/diaspora/es.yml +++ b/config/locales/diaspora/es.yml @@ -26,6 +26,10 @@ es: attributes: from_id: taken: "es un duplicado de una solicitud que ya existe." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ es: login: "acceder" logout: "salir" profile: "perfil" + recent_notifications: "Recent notifications" settings: "configuración" view_all: "Ver todo" likes: @@ -366,39 +371,31 @@ es: other: "%{actors} comenzaron a compartir contigo." zero: "%{actors} comenzó a compartir contigo." notifier: - also_commented: - commented: "ha participado también en la publicación de %{post_author}:" - sign_in: "Conéctate para verlo." - subject: "%{name} ha participado también en la publicación de %{post_author}." + click_here: "click here" comment_on_post: - commented: "ha participado en tu publicación:" - sign_in: "Conéctate para verlo." - subject: "%{name} ha participado en tu publicación." - diaspora: "el robot de email de Diaspora*" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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 email" + view_post: "View post >" mentioned: mentioned: "te mencionó en una publicación:" - sign_in: "Conéctate para verlo." subject: "%{name} te mencionó en Diaspora*" private_message: - message_subject: "Asunto: %{subject}" - private_message: "te envió un mensaje privado:" - sign_in: "Conéctate para verlo." - subject: "%{name} te envió un mensaje privado en Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Tu administrador Diaspora*" subject: "Un mensaje sobre tu cuenta Diaspora*:" started_sharing: sharing: "ha empezado a compartir contigo!" - sign_in: "Accede aquí" subject: "%{name} ha empezado a compartir contigo en Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Gracias," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "o" password: "Contraseña" @@ -556,6 +553,19 @@ es: manage_within: "Gestión de contactos" new_request_to_person: sent: "¡Enviado!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Buscar" services: create: @@ -690,10 +700,14 @@ es: undo: "¿Deshacer?" username: "Nombre de usuario" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Tu cuenta ha sido bloqueada. En unos 20 minutos se cerrará totalmente. Gracias por probar Diaspora*. " edit: also_commented: "...alguien comenta en la publicación de tu contacto?" change: "Cambiar" + change_email: "Change E-Mail" change_language: "Cambiar idioma" change_password: "Cambiar contraseña" close_account: "Cerrar cuenta" @@ -702,6 +716,7 @@ es: download_photos: "Descargar mis fotos" download_xml: "Descargar mi XML" edit_account: "Editar cuenta" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportar datos" liked: "...a alguien le gusta tu publicación?" mentioned: "...eres mencionado en una publicación?" @@ -735,6 +750,8 @@ es: language_not_changed: "Error cambiando de idioma" password_changed: "Contraseña cambiada. Ya puedes acceder con tu nueva contraseña." password_not_changed: "Error cambiando la contraseña" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Error al buscar el perfil webfinger de %{profile_url}" hcard_fetch_failed: "Hubo un problema al buscar el hcard para #{@account}" diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml index a1db74ce3..f2fda0419 100644 --- a/config/locales/diaspora/eu.yml +++ b/config/locales/diaspora/eu.yml @@ -26,6 +26,10 @@ eu: attributes: from_id: taken: "lehenago egindako eskaera baten bikoizketa bat da." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -247,7 +251,7 @@ eu: edit: sign_up: "izena_eman" new: - already_invited: "Gonbidatuta jadanik" + already_invited: "Pertsona hauek ez dute zure gonbidapena onartu:" aspect: "Alderdia" comma_seperated_plz: "Nahi dituzun e-posta guztiak idatzi ditzakezu, koma batez bananduta." if_they_accept_info: "eskaera onartzen badute, gonbidatutako alderdira batuko dira" @@ -272,6 +276,7 @@ eu: login: "sartu" logout: "irten" profile: "profila" + recent_notifications: "Recent notifications" settings: "lehentasunak" view_all: "Guztiak ikusi" likes: @@ -366,39 +371,31 @@ eu: other: "%{actors} zurekin harremanetan hasi d(ir)a" zero: "%{actors} zurekin harremanetan hasi d(ir)a" notifier: - also_commented: - commented: "(e)k ere iruzkindu du %{post_author}(r)en mezuan:" - sign_in: "Sartu zaitez ikusteko." - subject: "%{name}(e)k ere iruzkindu du." + click_here: "click here" comment_on_post: - commented: "zure mezua iruzkindu du:" - sign_in: "Sartu zaitez ikusteko." - subject: "%{name}(e)k zure mezua iruzkindu du." - diaspora: "diasporaren e-posta robota" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "zu aipatu zaituzte mezu batean:" - sign_in: "Sartu ikusteko." subject: "%{name}(e)k Diasporan aipatu zaitu" private_message: - message_subject: "Gaia: %{subject}" - private_message: "(e)k mezu pribatu bat bidali dizu:" - sign_in: "Sartu zaitez ikusteko." - subject: "%{name}(e)k mezu pribatu bat bidali dizu Diasporan" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Zure Diaspora administratzailea" subject: "Mezu bat zure Diaspora kontuari buruz:" started_sharing: sharing: "zurekin harremanetan hasi da!" - sign_in: "Sartu hemen" subject: "%{name} zurekin harremanetan hasi da Diasporan" + view_profile: "View %{name}'s profile" thanks: "Milesker," + to_change_your_notification_settings: "to change your notification settings" ok: "Onartu" or: "edo" password: "Pasahitza" @@ -492,8 +489,8 @@ eu: post_hidden: "%{name}(r)en mezua ezkutatua izan da." posts: show: - destroy: "Delete" - not_found: "Sorry, we couldn't find that post." + destroy: "Ezabatu" + not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu." permalink: "permalink" previous: "aurrekoa" profile: "Profila" @@ -556,6 +553,19 @@ eu: manage_within: "Adiskideak kudeatu hemen:" new_request_to_person: sent: "bidalia!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Bilatu" services: create: @@ -690,10 +700,14 @@ eu: undo: "Desegin?" username: "Erabiltzailea" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Zure kontua giltzapetuta dago. 20 minutu eraman dezake kontua ezabatzeak. Eskerrik asko Diaspora erabiltzeagatik." edit: also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?" change: "Aldatu" + change_email: "Change E-Mail" change_language: "Hizkuntza Aldatu" change_password: "Pasahitza aldatu" close_account: "Kontua Ezabatu" @@ -702,6 +716,7 @@ eu: download_photos: "nire argazkiak jaitsi" download_xml: "nire xml jaitsi" edit_account: "Kontua aldatu" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Datuak esportatu" liked: "...norbaitek zure mezu bat gustoko duenean?" mentioned: "...mezu batean aipatzen zaituztenean?" @@ -735,6 +750,8 @@ eu: language_not_changed: "Hizkuntza aldaketak huts egin du" password_changed: "Pasahitza aldatu duzu. Orain zure pasahitz berria erabiliz sar zaitezke." password_not_changed: "Pasahitz Aldaketak Huts egin du" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik" hcard_fetch_failed: "%{account} kontutik ezin izan da hcard sortu" diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml index bccaea8a6..e8dfa8d7d 100644 --- a/config/locales/diaspora/fi.yml +++ b/config/locales/diaspora/fi.yml @@ -26,6 +26,10 @@ fi: attributes: from_id: taken: "on jo tehdyn pyynnön kaksoiskappale." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ fi: login: "kirjaudu sisään" logout: "kirjaudu ulos" profile: "Profiili" + recent_notifications: "Recent notifications" settings: "Asetukset" view_all: "View all" likes: @@ -366,39 +371,31 @@ fi: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "kommentoi myös käyttäjän %{post_author} viestiin:" - sign_in: "Kirjaudu sisään nähdäksesi." - subject: "%{name} on myös kommentoinut %{post_author}:n viestiin." + click_here: "click here" comment_on_post: - commented: "on kommentoinut viestiisi:" - sign_in: "Kirjaudu sisään nähdäksesi." - subject: "%{name} on kommentoinut viestiisi." - diaspora: "Diasporan sähköpostirobotti" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Hei %{name}!" liked: liked: "%{name} tykkäsi kirjoituksestasi: " - sign_in: "Kirjaudu sisään nähdäksesi" - subject: "%{name} tykkäsi juuri kirjoituksestasi" - love: "Terveisin," - manage_your_email_settings: "manage your email settings" + view_post: "View post >" mentioned: mentioned: "mainitsi sinut viestissään:" - sign_in: "Kirjaudu sisään nähdäksesi." subject: "%{name} on maininnut sinut Diaspora*:ssa" private_message: - message_subject: "Aihe: %{subject}" - private_message: "on lähettänyt sinulle henkilökohtaisen viestin:" - sign_in: "Kirjaudu sisään nähdäksesi." - subject: "%{name} on lähettänyt sinulle henkilökohtaisen viestin Diaspora*:ssa" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Diasporasi ylläpitäjä" subject: "Viesti Diaspora-käyttäjätilistäsi:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Kirjaudu sisään täältä" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Kiitos," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "tai" password: "Salasana" @@ -556,6 +553,19 @@ fi: manage_within: "Muokkaa kontakteja näkymässä" new_request_to_person: sent: "lähetetty!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Etsi" services: create: @@ -690,10 +700,14 @@ fi: undo: "Peruuta?" username: "Käyttäjätunnus" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Käyttäjätilin sulkeminen onnistui." edit: also_commented: "...joku myös kommentoi kontaktisi viestiin?" change: "Vaihda" + change_email: "Change E-Mail" change_language: "Vaihda kieli" change_password: "Vaihda salasana" close_account: "Sulje käyttäjätili" @@ -702,6 +716,7 @@ fi: download_photos: "Lataa kaikki kuvat" download_xml: "Lataa tiedot XML-muodossa" edit_account: "Muokkaa käyttäjätiliä" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Vie tietoja" liked: "...tykkää kirjoituksistasi?" mentioned: "...sinut mainitaan viestissä?" @@ -735,6 +750,8 @@ fi: language_not_changed: "Kielen vaihtaminen epäonnistui" password_changed: "Salasana vaihdettu. Voit nyt kirjautua uudella salasanallasi." password_not_changed: "Salasanan vaihto epäonnistui" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "webfinger-profiilin %{profile_url} haku epäonnistui" hcard_fetch_failed: "tapahtui virhe haettaessa hcard:ia tilille %{account}" diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml index f9b9df85b..9ca1d7b4c 100644 --- a/config/locales/diaspora/fr.yml +++ b/config/locales/diaspora/fr.yml @@ -26,6 +26,10 @@ fr: attributes: from_id: taken: "est un doublon d'une requête déjà existante." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ fr: login: "connexion" logout: "déconnexion" profile: "profil" + recent_notifications: "Recent notifications" settings: "paramètres" view_all: "Tout afficher" likes: @@ -366,39 +371,31 @@ fr: other: "%{actors} a/ont commencé à partager avec vous." zero: "%{actors} a/ont commencé à partager avec vous." notifier: - also_commented: - commented: "a également commenté le message de %{post_author} :" - sign_in: "Connectez-vous pour le voir." - subject: "%{name} a également commenté le message de %{post_author}." + click_here: "click here" comment_on_post: - commented: "a commenté votre message:" - sign_in: "Connectez-vous pour le voir." - subject: "%{name} a commenté votre message." - diaspora: "le robot de messagerie électronique de Diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Bonjour %{name} !" liked: liked: "%{name} vient juste d'aimer votre message : " - sign_in: "Identifiez-vous pour le voir" - subject: "%{name} vient juste d'aimer votre message" - love: "affectueusement," - manage_your_email_settings: "modifier vos paramètres de courriel" + view_post: "View post >" mentioned: mentioned: "vous a mentionné(e) dans un message :" - sign_in: "Connectez-vous pour le/la voir." subject: "%{name} vous a mentionné(e) sur Diaspora*" private_message: - message_subject: "Sujet : %{subject}" - private_message: "vous a envoyé un message privé :" - sign_in: "Connectez-vous pour le voir." - subject: "%{name} vous a envoyé un message privé sur Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Votre administrateur Diaspora" subject: "Un message concernant votre compte Diaspora :" started_sharing: sharing: "a commencé à partager avec vous !" - sign_in: "Identifiez-vous ici" subject: "%{name} a commencé à partager avec vous sur Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Merci," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "ou" password: "Mot de passe" @@ -556,6 +553,19 @@ fr: manage_within: "Gérer les contacts de" new_request_to_person: sent: "envoyée !" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Rechercher" services: create: @@ -690,10 +700,14 @@ fr: undo: "Annuler ?" username: "Nom d'utilisateur" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Votre compte a été clôturé. Il faudra peut-être 20 minutes pour terminer la fermeture de votre compte. Merci d'essayer Diaspora." edit: also_commented: "…quelqu'un d'autre commente une publication de votre contact ?" change: "Modifier" + change_email: "Change E-Mail" change_language: "Changer la langue" change_password: "Changer le mot de passe" close_account: "Clôturer le compte" @@ -702,6 +716,7 @@ fr: download_photos: "télécharger mes photos" download_xml: "télécharger mon XML" edit_account: "Modifier le compte" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exporter des données" liked: "...quelqu'un aime votre message ?" mentioned: "…vous êtes mentionné(e) dans une publication ?" @@ -735,6 +750,8 @@ fr: language_not_changed: "Échec lors de la mise à jour de la langue" password_changed: "Mot de passe mis à jour. Vous pouvez maintenant vous identifier avec votre nouveau mot de passe." password_not_changed: "Échec de la mise à jour du mot de passe" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}" hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de %{account}" diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml index b881eae0c..8891f7795 100644 --- a/config/locales/diaspora/ga.yml +++ b/config/locales/diaspora/ga.yml @@ -26,6 +26,10 @@ ga: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ ga: login: "logáil isteach" logout: "logáil amach" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ ga: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "an róbat ríomhpost diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Do riarthóir Diaspora" subject: "Fógra faoi do chúntas Diaspora:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Gur raibh maith agat," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "nó" password: "Pasfhocal" @@ -556,6 +553,19 @@ ga: manage_within: "Bainistiú teagmháilí istigh" new_request_to_person: sent: "seolta!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Search" services: create: @@ -690,10 +700,14 @@ ga: undo: "Undo?" username: "Ainm úsáideora" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "D'eirigh le dúna do cúntas" edit: also_commented: "...someone also comments on your contact's post?" change: "Athraigh" + change_email: "Change E-Mail" change_language: "Athraigh Teanga" change_password: "Athraigh Pasfhocal" close_account: "Dún Cúntas" @@ -702,6 +716,7 @@ ga: download_photos: "íoslódáil mo phictiúrí" download_xml: "íoslódáil mo xml" edit_account: "Athraigh cúntas" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Easpórtáil Sonraí" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ ga: language_not_changed: "Níor Éirigh le Athrú Teanga" password_changed: "Pasfhocal Athraithe" password_not_changed: "Níor Éirigh le Athrú Pasfhocal" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "níor d'éirigh le próifíl webfinger a fháil do %{profile_url}" hcard_fetch_failed: "bhí fadbh ag fháil an hcard do %{account}" diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml index ecb785210..a401a97fe 100644 --- a/config/locales/diaspora/he.yml +++ b/config/locales/diaspora/he.yml @@ -26,6 +26,10 @@ he: attributes: from_id: taken: "הוא כפיל של בקשה שהתקבלה קודם לכן." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ he: login: "כניסה" logout: "יציאה" profile: "פרופיל" + recent_notifications: "Recent notifications" settings: "הגדרות" view_all: "View all" likes: @@ -366,39 +371,31 @@ he: other: "%{actors} החל/ה לשתף אתך." zero: "%{actors} החלו לשתף אתך." notifier: - also_commented: - commented: "גם כן הגיב/ה על הרשומה של %{post_author}:" - sign_in: "יש להיכנס כדי לצפות בזה." - subject: "%{name} גם כן הגיב/ה על הרשומה של %{post_author}." + click_here: "click here" comment_on_post: - commented: "הגיב/ה על הרשומה שלך:" - sign_in: "יש להיכנס כדי לצפות בזה." - subject: "%{name} הגיב/ה על הרשומה שלך." - diaspora: "רובוט הדוא״ל של דיאספורה" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "שלום %{name}!" liked: liked: "%{name} בדיוק עכשיו סימן/נה את הרשומה שלך כאהובה: " - sign_in: "יש להיכנס כדי לצפות בזה" - subject: "%{name} בדיוק עכשיו סימן/נה את הרשומה שלך כאהובה" - love: "באהבה," - manage_your_email_settings: "ניהול הגדרות הדוא״ל שלך" + view_post: "View post >" mentioned: mentioned: "ציין/ה אותך ברשומה:" - sign_in: "יש להיכנס כדי לצפות בזה." subject: "הוזכרת על ידי %{name} בדיאספורה*" private_message: - message_subject: "נושא: %{subject}" - private_message: "שלח/ה לך הודעה פרטית:" - sign_in: "יש להיכנס כדי לצפות בזה." - subject: "נשלחה אליך הודעה פרטית מאת %{name} דרך דיאספורה*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "מנהל הדיאספורה שלך" subject: "הודעה בנוגע לחשבונך בדיאספורה:" started_sharing: sharing: "החל/ה לשתף אתך!" - sign_in: "כניסה מכאן" subject: "%{name} החל/ה לשתף אתך בדיאספורה*" + view_profile: "View %{name}'s profile" thanks: "רב תודות," + to_change_your_notification_settings: "to change your notification settings" ok: "אישור" or: "או" password: "ססמה" @@ -556,6 +553,19 @@ he: manage_within: "ניהול אנשי קשר בתוך" new_request_to_person: sent: "נשלחה!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "חיפוש" services: create: @@ -690,10 +700,14 @@ he: undo: "האם לבטל?" username: "שם משתמש" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "חשבונך ננעל. סגירת חשבונך עלולה להימשך כ־20 דקות. תודה על שהתנסית בדיאספורה." edit: also_commented: "...מישהו הגיב גם על הרשומה של איש הקשר שלך?" change: "שינוי" + change_email: "Change E-Mail" change_language: "החלפת השפה" change_password: "החלפת הססמה" close_account: "סגירת החשבון" @@ -702,6 +716,7 @@ he: download_photos: "הורדת התמונות שלי" download_xml: "הורדת ה־xml שלי" edit_account: "עריכת החשבון" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "יצוא הנתונים" liked: "...מישהו אהב את הרשומה שלך?" mentioned: "...מישהו ציין אותך ברשומה?" @@ -735,6 +750,8 @@ he: language_not_changed: "החלפת השפה נכשלה" password_changed: "הססמה הוחלפה. כעת באפשרותך להיכנס עם הססמה החדשה שלך." password_not_changed: "החלפת הססמה נכשלה" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "אירע כשל בקבלת פרופיל ה־webfinger שלך ל־%{profile_url}" hcard_fetch_failed: "אירעה שגיאה בעת קבלת ה־hcard לחשבון %{account}" diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml index 0fbae8ddf..3bf51142e 100644 --- a/config/locales/diaspora/hu.yml +++ b/config/locales/diaspora/hu.yml @@ -26,6 +26,10 @@ hu: attributes: from_id: taken: "már létező kérés." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ hu: login: "bejelentkezés" logout: "kijelentkezés" profile: "profil" + recent_notifications: "Recent notifications" settings: "beállítások" view_all: "View all" likes: @@ -366,39 +371,31 @@ hu: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "hozzászólt még %{post_author} bejegyzéséhez is:" - sign_in: "Jelentkezz be, hogy megnézhesd." - subject: "%{name} is hozzászólt %{post_author} bejegyzéséhez." + click_here: "click here" comment_on_post: - commented: "hozzászólt a bejegyzésedhez:" - sign_in: "Jelentkezz be, hogy megnézd." - subject: "%{name} hozzászólt a bejegyzésedhez." - diaspora: "A diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Szia %{name}!" liked: liked: "%{name} kedveli a bejegyzésedet:" - sign_in: "Sign to view it" - subject: "%{name} kedveli a bejegyzésed" - love: "Szeretettel," - manage_your_email_settings: "Kezeld az email beállításaidat" + view_post: "View post >" mentioned: mentioned: "megemlített téged egy bejegyzésében:" - sign_in: "Jelentkezz be, hogy megnézhesd." subject: "%{name} megemlített téged a Diaspora* közösségi oldalon." private_message: - message_subject: "Tárgy: %{subject}" - private_message: "egy személyes üzenetet küldött neked:" - sign_in: "Jelentkezz be, hogy megnézd." - subject: "%{name} egy személyes üzenetet küldött neked a Diaspora-n" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "A Te Diaspora* rendszergazdád" subject: "Üzenet a Diaspora* rendszergazdától:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Köszi," + to_change_your_notification_settings: "to change your notification settings" ok: "Rendben" or: "vagy" password: "Jelszó" @@ -556,6 +553,19 @@ hu: manage_within: "Kapcsolatok kezelése" new_request_to_person: sent: "elküldve!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Keresés" services: create: @@ -690,10 +700,14 @@ hu: undo: "Visszavonod?" username: "Felhasználónév" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Fiók sikeresen lezárult." edit: also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?" change: "Módosítás" + change_email: "Change E-Mail" change_language: "Nyelv megváltoztatása" change_password: "Jelszó módosítása" close_account: "Fiók bezárása" @@ -702,6 +716,7 @@ hu: download_photos: "Képeim letöltése" download_xml: "Saját XML letöltése" edit_account: "Fiók szerkesztése" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Adatok exportálása" liked: "... valakinek tetszik a bejegyzésed?" mentioned: "...meg vagy említve egy bejegyzésben?" @@ -735,6 +750,8 @@ hu: language_not_changed: "Nyelv megváltoztatása nem sikerült" password_changed: "A jelszó megváltozott" password_not_changed: "Jelszó megváltoztatása nem sikerült" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Nem sikerült lekérni webfinger profilt %{profile_url} számára" hcard_fetch_failed: "nem sikerült lekérni a hCard-ot #{@account} számára" diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml index d14c18abb..e085dd3a7 100644 --- a/config/locales/diaspora/id.yml +++ b/config/locales/diaspora/id.yml @@ -26,6 +26,10 @@ id: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ id: login: "login" logout: "logout" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ id: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "the diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "or" password: "Password" @@ -556,6 +553,19 @@ id: manage_within: "Manage contacts within" new_request_to_person: sent: "sent!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Search" services: create: @@ -690,10 +700,14 @@ id: undo: "Undo?" username: "Username" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Account successfully closed." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Change Language" change_password: "Change Password" close_account: "Close Account" @@ -702,6 +716,7 @@ id: download_photos: "download my photos" download_xml: "download my xml" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Export Data" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ id: language_not_changed: "Language Change Failed" password_changed: "Password Changed" password_not_changed: "Password Change Failed" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml index 0fb866767..e08b20a49 100644 --- a/config/locales/diaspora/is.yml +++ b/config/locales/diaspora/is.yml @@ -26,6 +26,10 @@ is: attributes: from_id: taken: "er afrit af fyrirliggjandi beiðni." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ is: login: "Innskráning" logout: "Útskrá" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ is: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "hefur einnig gert athugasemd við færslu notandans %{post_author}:" - sign_in: "Skráðu þig inn til að skoða það." - subject: "%{name} hefur einnig gert athugasemd við færslu tengiliðar þíns. " + click_here: "click here" comment_on_post: - commented: "hefur gert athugasemd við færsluna þína!" - sign_in: "Skráðu þig inn til að sjá það." - subject: "%{name} hefur gert atugasemd við þína færslu." - diaspora: "the diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "gat þín í pósti:" - sign_in: "Skráðu þig inn til að sjá það." subject: "% {Nafn} hefur getið þín á Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "Skilaboð um notandastillingar þínar í Diaspora:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Takk," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "eða" password: "Lykilorð" @@ -556,6 +553,19 @@ is: manage_within: "Umsjón tengiliða innan" new_request_to_person: sent: "sent!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Leita" services: create: @@ -690,10 +700,14 @@ is: undo: "Undo?" username: "Notandanafn" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Notandastillingar voru afskráðar." edit: also_commented: "...someone also comments on your contact's post?" change: "Breyting" + change_email: "Change E-Mail" change_language: "Breyta um tungumál" change_password: "Breyta lykilorði" close_account: "Loka notendastillingum." @@ -702,6 +716,7 @@ is: download_photos: "download my photos" download_xml: "download my xml" edit_account: "Breyta notandastillingum" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Export Data" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ is: language_not_changed: "ekki tókst að breyta um tungumál" password_changed: "Lykilorði var breytt" password_not_changed: "Breyting á lykilorði mistókst" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index d68a7e9fa..c6fd95a12 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -26,6 +26,10 @@ it: attributes: from_id: taken: "è un duplicato di una richiesta pre-esistente." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ it: login: "accedi" logout: "esci" profile: "profilo" + recent_notifications: "Recent notifications" settings: "impostazioni" view_all: "Elenco completo" likes: @@ -366,39 +371,31 @@ it: other: "%{actors} hanno iniziato a condividere con te." zero: "%{actors} ha iniziato a condividere con te." notifier: - also_commented: - commented: "ha anche commentato sul post di %{post_author}:" - sign_in: "Accedi per vederlo." - subject: "%{name} ha anche commentato sul post di %{post_author}." + click_here: "click here" comment_on_post: - commented: "ha commentato il tuo post:" - sign_in: "Accedi per vederlo." - subject: "%{name} ha commentato il tuo post." - diaspora: "il robot che manda email per diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Ciao %{name}!" liked: liked: "%{name} ha appena apprezzato il tuo post: " - sign_in: "Per vedere è necessario accedere" - subject: "%{name} ha appena apprezzato il tuo post" - love: "pace e bene," - manage_your_email_settings: "gestisci le tue impostazioni email" + view_post: "View post >" mentioned: mentioned: "ti ha menzionato in un post:" - sign_in: "Accedi per vederlo." subject: "%{name} ti ha menzionato su Diaspora*" private_message: - message_subject: "Oggetto: %{subject}" - private_message: "ti ha inviato un messaggio privato:" - sign_in: "Accedi per vederlo." - subject: "%{name} ti ha inviato un messaggio privato su Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Il tuo amministratore Diaspora" subject: "Un messaggio sul tuo account Diaspora:" started_sharing: sharing: "ha iniziato a condividere con te!" - sign_in: "Accedi qui" subject: "%{name} ha iniziato a condividere con te su Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Grazie," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "o" password: "Password" @@ -556,6 +553,19 @@ it: manage_within: "Amministra contatti" new_request_to_person: sent: "richiesta inviata!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Cerca" services: create: @@ -690,10 +700,14 @@ it: undo: "Annullare?" username: "Nome Utente" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Il tuo account è stato bloccato. Potrebbero occorrerci 20 minuti per terminare la chiusura del tuo account. Grazie per aver provato Diaspora." edit: also_commented: "...qualcun altro ha commentato il post del tuo contatto?" change: "Cambia" + change_email: "Change E-Mail" change_language: "Cambia lingua" change_password: "Cambia Password" close_account: "Chiudi account" @@ -702,6 +716,7 @@ it: download_photos: "scarica le mie foto" download_xml: "scarica il mio xml" edit_account: "Modifica account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Esporta Dati" liked: "...a qualcuno piace il tuo post?" mentioned: "...sei menzionato in un post?" @@ -735,6 +750,8 @@ it: language_not_changed: "Cambio di lingua fallito" password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password." password_not_changed: "Cambio di password fallito" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}" hcard_fetch_failed: "impossibile recuperare l'hcard di %{account}" diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml index a34fbf64a..8b2c253f4 100644 --- a/config/locales/diaspora/ja.yml +++ b/config/locales/diaspora/ja.yml @@ -26,6 +26,10 @@ ja: attributes: from_id: taken: "既存のリクエストと重複しています。" + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ ja: login: "ログイン" logout: "ログアウト" profile: "プロフィール" + recent_notifications: "Recent notifications" settings: "設定" view_all: "View all" likes: @@ -366,39 +371,31 @@ ja: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "も%{post_author}さんの投稿にコメントしました：" - sign_in: "コメントを見るにはログインしてください。" - subject: "%{name}も%{post_author}さんの投稿にコメントしました。" + click_here: "click here" comment_on_post: - commented: "は次の投稿にコメントしました：" - sign_in: "見るにはログインしてください。" - subject: "%{name}は投稿にコメントしました。" - diaspora: "ダイアスポラ＊メールロボット" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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: "メール設定を管理する" + view_post: "View post >" mentioned: mentioned: "さんは投稿であなたをメンションしました。" - sign_in: "見るのにログインして下さい。" subject: "%{name}さんはダイアスポラ＊であなたをメンションしました。" private_message: - message_subject: "件名：%{subject}" - private_message: "からメッセージが届いています。" - sign_in: "見るにはログインしてください。" - subject: "ダイアスポラ＊で%{name}さんからの非公開メッセージが届いています。" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "ダイアスポラ＊管理者" subject: "ダイアスポラ＊アカウントの重要なお知らせ：" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "ありがとうございます。" + to_change_your_notification_settings: "to change your notification settings" ok: "了解" or: "または" password: "パスワード" @@ -556,6 +553,19 @@ ja: manage_within: "次のアスペクトの連絡先を管理：" new_request_to_person: sent: "送信しました！" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "検索" services: create: @@ -690,10 +700,14 @@ ja: undo: "元に戻す" username: "ユーザ名" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "アカウント閉鎖に成功しました。" edit: also_commented: "他の人も連絡先の投稿にコメントしたとき" change: "変更" + change_email: "Change E-Mail" change_language: "言語変更" change_password: "パスワード変更" close_account: "アカウント閉鎖" @@ -702,6 +716,7 @@ ja: download_photos: "写真をダウンロードする" download_xml: "XMLをダウンロードする" edit_account: "アカウント編集" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "データ出力" liked: "...someone likes your post?" mentioned: "投稿に自分がメンションされたとき" @@ -735,6 +750,8 @@ ja: language_not_changed: "言語の選択に失敗しました" password_changed: "パスワードを変更しました" password_not_changed: "パスワードの変更に失敗しました" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "%{profile_url} のwebfingerプロフィールの取得に失敗しました。" hcard_fetch_failed: "%{account}のhcard取得に問題が発生しました。" diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml index 560bd00c7..d0d78e91a 100644 --- a/config/locales/diaspora/ko.yml +++ b/config/locales/diaspora/ko.yml @@ -26,6 +26,10 @@ ko: attributes: from_id: taken: "이미 요청했습니다." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ ko: login: "로그인" logout: "로그아웃" profile: "프로필" + recent_notifications: "Recent notifications" settings: "설정" view_all: "모두 보기" likes: @@ -288,7 +293,7 @@ ko: one: "한 명이 좋아합니다" other: "%{count}명이 좋아합니다" zero: "아무도 좋아하지 않습니다" - limited: "Limited" + limited: "제한됨" more: "더" next: "다음" no_results: "결과 없음" @@ -366,39 +371,31 @@ ko: other: "%{actors}님이 나와 공유를 시작했습니다." zero: "%{actors}님이 나와 공유를 시작했습니다." notifier: - also_commented: - commented: "님도 %{post_author}님의 공유물에 댓글을 달았습니다:" - sign_in: "로그인하기" - subject: "%{name}님도 %{post_author}님의 공유물에 댓글을 달았습니다." + click_here: "click here" comment_on_post: - commented: "님이 내 공유물에 댓글을 달았습니다:" - sign_in: "로그인하기" - subject: "%{name}님이 내 공유물에 댓글을 달았습니다." - diaspora: "디아스포라 자동 이메일" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "%{name}님!" liked: liked: "%{name}님이 내 공유물을 좋아합니다:" - sign_in: "Sign to view it" - subject: "%{name}님이 내 공유물을 좋아합니다." - love: "" - manage_your_email_settings: "이메일 설정 관리" + view_post: "View post >" mentioned: mentioned: "님이 공유물에서 나를 멘션했습니다:" - sign_in: "로그인하기" subject: "%{name}님이 디아스포라*에서 나를 멘션했습니다" private_message: - message_subject: "제목: %{subject}" - private_message: "님이 디아스포라*에서 쪽지를 보냈습니다:" - sign_in: "로그인하기" - subject: "%{name}님이 디아스포라*에서 쪽지를 보냈습니다" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "디아스포라 관리자" subject: "내 디아스포라 계정에 대한 메시지:" started_sharing: sharing: "님이 나와 공유를 시작했습니다!" - sign_in: "여기서 로그인하세요" subject: "%{name}님이 디아스포라*에서 나와 공유를 시작했습니다." + view_profile: "View %{name}'s profile" thanks: "고맙습니다." + to_change_your_notification_settings: "to change your notification settings" ok: "확인" or: "또는" password: "암호" @@ -492,9 +489,9 @@ ko: post_hidden: "%{name}님의 공유물을 감췄습니다." posts: show: - destroy: "Delete" - not_found: "Sorry, we couldn't find that post." - permalink: "permalink" + destroy: "지우기" + not_found: "해당 공유물을 찾을 수 없습니다." + permalink: "영구 링크" previous: "이전" profile: "프로필" profiles: @@ -556,6 +553,19 @@ ko: manage_within: "컨택 관리하기:" new_request_to_person: sent: "보냈습니다." + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "검색" services: create: @@ -690,10 +700,14 @@ ko: undo: "돌이키겠습니까?" username: "사용자명" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "계정을 성공적으로 없앴습니다." edit: also_commented: "댓글 달았던 공유물에 내 컨택도 댓글을 달았을 때" change: "바꾸기" + change_email: "Change E-Mail" change_language: "언어 바꾸기" change_password: "암호 바꾸기" close_account: "계정 없애기" @@ -702,6 +716,7 @@ ko: download_photos: "내 사진 다운로드" download_xml: "내 xml 다운로드" edit_account: "계정 고치기" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "자료 뽑아내기" liked: "누군가가 내 공유물을 좋아할 때" mentioned: "내가 멘션되었을 때" @@ -735,6 +750,8 @@ ko: language_not_changed: "언어를 바꿀 수 없습니다" password_changed: "암호를 바꿨습니다" password_not_changed: "암호를 바꿀 수 없습니다" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml index c36257d2f..9347a70b5 100644 --- a/config/locales/diaspora/lt.yml +++ b/config/locales/diaspora/lt.yml @@ -26,6 +26,10 @@ lt: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ lt: login: "prisijungti" logout: "atsijungti" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ lt: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "Diasporos pašto robotas" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "gerai" or: "arba" password: "Slaptažodis" @@ -556,6 +553,19 @@ lt: manage_within: "Valdyti kontaktus ties" new_request_to_person: sent: "išsiųsta!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Paieška" services: create: @@ -690,10 +700,14 @@ lt: undo: "Undo?" username: "Vartotojo vardas" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Paskyra uždaryta sėkmingai." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Keisti kalbą" change_password: "Keisti slaptažodį" close_account: "Uždaryti paskyrą" @@ -702,6 +716,7 @@ lt: download_photos: "atsisiųsti mano nuotraukas" download_xml: "atsisiųsti mano duomenis xml formatu" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Eksportuoti duomenis" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ lt: language_not_changed: "Kalbos pakeisti nepavyko" password_changed: "Slaptažodis pakeistas" password_not_changed: "Slaptažodžio pakeisti nepavyko" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml index ef0835864..da9de2ca5 100644 --- a/config/locales/diaspora/mk.yml +++ b/config/locales/diaspora/mk.yml @@ -26,6 +26,10 @@ mk: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ mk: login: "најави се" logout: "одјави се" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ mk: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "diaspora е-маил робот" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "ОК" or: "или" password: "Лозинка" @@ -556,6 +553,19 @@ mk: manage_within: "Менаџирај контакти во" new_request_to_person: sent: "испратено!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Барај" services: create: @@ -690,10 +700,14 @@ mk: undo: "Undo?" username: "Корисничко име" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Корисничката сметка е успешно затворена." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Промени јазик" change_password: "Промени лозинка" close_account: "Затвори корисничка сметка" @@ -702,6 +716,7 @@ mk: download_photos: "симни ги моите слики" download_xml: "симни го мојот xml" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Изнеси податоци" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ mk: language_not_changed: "Изменувањето на јазик е неуспешно" password_changed: "Лозинката е променета" password_not_changed: "Промената на лозинка е неуспешна" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml index 6e539700d..039300737 100644 --- a/config/locales/diaspora/nb.yml +++ b/config/locales/diaspora/nb.yml @@ -26,6 +26,10 @@ nb: attributes: from_id: taken: "er en kopi av en pre-eksisterende forespørsel." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ nb: login: "logg inn" logout: "logg ut" profile: "profil" + recent_notifications: "Recent notifications" settings: "innstillinger" view_all: "View all" likes: @@ -366,39 +371,31 @@ nb: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "har også kommentert på %{post_author} sitt innlegg:" - sign_in: "Logg inn for å se det." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Logg inn for å se det." - subject: "%{name} har kommentert på ditt innlegg." - diaspora: "diasporas epostrobot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "nevnte deg i et innlegg:" - sign_in: "Logg inn for å se det." subject: "%{name} har nevnt deg på Diaspora*" private_message: - message_subject: "Emne: %{subject}" - private_message: "har sendt deg en privat melding:" - sign_in: "Logg inn for å se den." - subject: "%{name} has sent you a private message yon Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Din Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Takk," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "eller" password: "Passord" @@ -556,6 +553,19 @@ nb: manage_within: "Administrer kontakter innen" new_request_to_person: sent: "sendt!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Søk" services: create: @@ -690,10 +700,14 @@ nb: undo: "Angre?" username: "Brukernavn" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Kontoen er stengt." edit: also_commented: " noen andre også kommenterte på din kontakts innlegg?" change: "Endre" + change_email: "Change E-Mail" change_language: "Endre Språk" change_password: "Endre Passord" close_account: "Steng Konto" @@ -702,6 +716,7 @@ nb: download_photos: "last ned mine bilder" download_xml: "last ned min xml" edit_account: "Endre konto" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Eksporter Data" liked: "...someone likes your post?" mentioned: " du nevnes i et innlegg?" @@ -735,6 +750,8 @@ nb: language_not_changed: "Endring av språk mislyktes" password_changed: "Passord Endret" password_not_changed: "Endring av Passord mislyktes" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "klarte ikke å hente webfinger profil for % {profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml index e4d22f461..37a096158 100644 --- a/config/locales/diaspora/nl.yml +++ b/config/locales/diaspora/nl.yml @@ -26,6 +26,10 @@ nl: attributes: from_id: taken: "is een duplicaat van een reeds bestaande aanvraag." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ nl: login: "inloggen" logout: "log uit" profile: "profiel" + recent_notifications: "Recent notifications" settings: "instellingen" view_all: "Bekijk alles" likes: @@ -366,39 +371,31 @@ nl: other: "%{actors} delen nu met jou." zero: "%{actors} deelt nu met jou." notifier: - also_commented: - commented: "heeft ook op %{post_author}'s post gereageerd:" - sign_in: "Log in om het te zien." - subject: "%{name} heeft ook gereageerd op %{post_author}'s post." + click_here: "click here" comment_on_post: - commented: "heeft gereageerd op jouw post:" - sign_in: "Log in om het te zien." - subject: "%{name} heeft op jouw post gereageerd." - diaspora: "de diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Hoi %{name}!" liked: liked: "%{name} vind je post leuk: " - sign_in: "Sign to view it" - subject: "%{name} vindt jouw post leuk" - love: "liefs," - manage_your_email_settings: "beheer je e-mail instellingen" + view_post: "View post >" mentioned: mentioned: "heeft jou genoemd in een post:" - sign_in: "Log in om het te bekijken." subject: "%{name} heeft jou genoemd op Diaspora*" private_message: - message_subject: "Onderwerp: %{subject}" - private_message: "heeft je een persoonlijk bericht gestuurd:" - sign_in: "Log in om het te zien." - subject: "%{name} heeft je een persoonlijk bericht gestuurd op Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Je Diaspora administrator" subject: "Een bericht over je Diaspora account:" started_sharing: sharing: "deelt vanaf nu met jou!" - sign_in: "Log hier in" subject: "%{name} deelt vanaf nu met je op Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Bedankt," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "of" password: "Wachtwoord" @@ -556,6 +553,19 @@ nl: manage_within: "Beheer contacten in" new_request_to_person: sent: "verzonden!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Zoek" services: create: @@ -690,10 +700,14 @@ nl: undo: "Ongedaan maken?" username: "Gebruikersnaam" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Je account is geblokkeerd. Het sluiten van je account kan twintig minuten in beslag nemen. Bedankt voor je interesse in Diaspora." edit: also_commented: "...iemand na jou op de post van jouw contact reageert?" change: "Verander" + change_email: "Change E-Mail" change_language: "Taal wijzigen" change_password: "Verander wachtwoord" close_account: "Verwijder account" @@ -702,6 +716,7 @@ nl: download_photos: "download mijn foto's" download_xml: "download mijn xml" edit_account: "Bewerk account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exporteer data" liked: "... iemand je post leuk vind?" mentioned: "...je genoemd word in een post?" @@ -735,6 +750,8 @@ nl: language_not_changed: "Taal wijzigen mislukt" password_changed: "Wachtwoord gewijzigd. Je kunt nu inloggen met je nieuwe wachtwoord." password_not_changed: "Wachtwoord wijzigen mislukt" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "ophalen van webfinger profiel is mislukt voor %{profile_url}" hcard_fetch_failed: "er was een probleem bij het ophalen van de hcard voor %{account}" diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml index c6539e9f5..6146192f2 100644 --- a/config/locales/diaspora/pa.yml +++ b/config/locales/diaspora/pa.yml @@ -26,6 +26,10 @@ pa: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ pa: login: "ਲਾਗਇਨ" logout: "ਲਾਗਆਉਟ" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ pa: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "the diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message about your Diaspora account:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "ਠੀਕ ਹੈ" or: "ਜਾਂ" password: "ਪਾਸਵਰਡ" @@ -556,6 +553,19 @@ pa: manage_within: "Manage contacts within" new_request_to_person: sent: "ਭੇਜਿਆ!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "ਖੋਜ" services: create: @@ -690,10 +700,14 @@ pa: undo: "Undo?" username: "ਯੂਜ਼ਰ ਨਾਂ" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Account successfully closed." edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Change Language" change_password: "Change Password" close_account: "Close Account" @@ -702,6 +716,7 @@ pa: download_photos: "download my photos" download_xml: "download my xml" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Export Data" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ pa: language_not_changed: "Language Change Failed" password_changed: "ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ" password_not_changed: "Password Change Failed" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for %{account}" diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml index 6a02a4d78..9c5298b2e 100644 --- a/config/locales/diaspora/pl.yml +++ b/config/locales/diaspora/pl.yml @@ -26,6 +26,10 @@ pl: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ pl: login: "logowanie" logout: "wyloguj" profile: "profil" + recent_notifications: "Recent notifications" settings: "ustawienia" view_all: "View all" likes: @@ -366,39 +371,31 @@ pl: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "skomentował też wpis użytkownika %{post_author}:" - sign_in: "Zaloguj się, aby je obejrzeć." - subject: "%{name} skomentował również wpis użytkownika %{post_author}." + click_here: "click here" comment_on_post: - commented: "skomentował twój wpis:" - sign_in: "Zaloguj się, aby go obejrzeć." - subject: "Użytkownik %{name} skomentował Twój wpis." - diaspora: "robot e-mailowy diaspory" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Cześć %{name}!" liked: 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" + view_post: "View post >" mentioned: mentioned: "wspomniał(a) o tobie we wpisie:" - sign_in: "Zaloguj się, aby uzyskać dostęp." subject: "%{name} wspomniał o tobie w serwisie Diaspora*" private_message: - message_subject: "Temat: %{subject}" - private_message: "wysłał ci wiadomość prywatną:" - sign_in: "Zarejestruj się, aby zobaczyć." - subject: "%{name} wysłał ci prywatną wiadomość w serwisie Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Twój panel zarządzania Diaspora" subject: "Wiadomość od twojego panelu zarządzania Diaspora:" started_sharing: sharing: "zaczął dzielić się z tobą!" - sign_in: "Zaloguj się" subject: "%{name} zaczął dzielić się z tobą na Diasporze*" + view_profile: "View %{name}'s profile" thanks: "Dzięki," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "lub" password: "Hasło" @@ -556,6 +553,19 @@ pl: manage_within: "Zarządzanie kontaktami w" new_request_to_person: sent: "wysłano!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Szukaj" services: create: @@ -690,10 +700,14 @@ pl: undo: "Cofnąć?" username: "Nazwa użytkownika" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Konto zostało pomyślnie zamknięte." edit: also_commented: "...ktoś także skomentuje wpis jednego z twoich kontaktów?" change: "Zmień" + change_email: "Change E-Mail" change_language: "Zmień język" change_password: "Zmiana hasła" close_account: "Zamknij konto" @@ -702,6 +716,7 @@ pl: download_photos: "pobierz moje zdjęcia" download_xml: "pobierz mój xml" edit_account: "Edytuj konto" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Eksportowanie danych" liked: "...ktoś polubił twój wpis?" mentioned: "...zostałeś wspomniany(a) we wpisie?" @@ -735,6 +750,8 @@ pl: language_not_changed: "Nie udało się zmienić języka" password_changed: "Zmieniono hasło" password_not_changed: "Nie udało się zmienić hasła" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Nie udało się pobrać profilu Webfinger dla %{profile_url}" hcard_fetch_failed: "Wystąpił problem podczas pobierania wizytówki hcard użytkownika %{account}" diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml index 2551c2998..90bfbe17f 100644 --- a/config/locales/diaspora/pt-BR.yml +++ b/config/locales/diaspora/pt-BR.yml @@ -26,6 +26,10 @@ pt-BR: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ pt-BR: login: "Entrar" logout: "Sair" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ pt-BR: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "também comentou sobre a postagem de %{post_author}:" - sign_in: "Entre para ver." - subject: "%{name} também comentou." + click_here: "click here" comment_on_post: - commented: "comentou sua postagem!" - sign_in: "Entre para ver." - subject: "%{name} comentou sua postagem." - diaspora: "o robô de email da Diaspora*" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "O administrador de sua Diaspora*" subject: "Uma mensagem do administrador de sua Diaspora*:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Obrigado," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "ou" password: "Senha" @@ -556,6 +553,19 @@ pt-BR: manage_within: "Gerenciar contatos de" new_request_to_person: sent: "Enviado!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Busca" services: create: @@ -690,10 +700,14 @@ pt-BR: undo: "Undo?" username: "Usuário" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Conta encerrada com sucesso." edit: also_commented: "...someone also comments on your contact's post?" change: "Trocar" + change_email: "Change E-Mail" change_language: "Trocar idioma" change_password: "Trocar senha" close_account: "Encerrar minha conta" @@ -702,6 +716,7 @@ pt-BR: download_photos: "Baixar minhas fotos" download_xml: "Baixar meu XML" edit_account: "Alterar conta" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportar dados" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ pt-BR: language_not_changed: "Falha ao alterar o idioma" password_changed: "Senha alterada" password_not_changed: "Falha ao alterar a senha" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "falha ao trazer perfil webfinger de %{profile_url}" hcard_fetch_failed: "ocorreu um problema ao obter o hcard de #{@account}" diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml index b053c4320..0c6f3f03e 100644 --- a/config/locales/diaspora/pt-PT.yml +++ b/config/locales/diaspora/pt-PT.yml @@ -26,6 +26,10 @@ pt-PT: attributes: from_id: taken: "é um duplicado de um pedido pré-existente." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ pt-PT: login: "iniciar sessão" logout: "Terminar sessão" profile: "perfil" + recent_notifications: "Recent notifications" settings: "definições" view_all: "View all" likes: @@ -366,39 +371,31 @@ pt-PT: other: "%{actors} começaram a partilhar consigo." zero: "%{actors} começou a partilhar consigo." notifier: - also_commented: - commented: "também comentou na publicação de %{post_author}:" - sign_in: "Inicie sessão para ver." - subject: "%{name} também comentou na publicação de %{post_author}." + click_here: "click here" comment_on_post: - commented: "comentou na sua publicação!" - sign_in: "Inicie sessão para ver." - subject: "%{name} comentou na sua publicação." - diaspora: "o robot de email do diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Olá %{name}!" liked: liked: "%{name} gostou da sua publicação: " - sign_in: "Inicie sessão para ver" - subject: "%{name} gostou da sua publicação" - love: "com carinho," - manage_your_email_settings: "gerir as suas definições de email" + view_post: "View post >" mentioned: mentioned: "mencionou-o numa publicação:" - sign_in: "Inicie sessão para ver." subject: "%{name} mencionou-o no Diaspora*" private_message: - message_subject: "Assunto: %{subject}" - private_message: "enviou-lhe uma mensagem privada:" - sign_in: "Inicie a sessão para ver." - subject: "%{name} enviou-lhe uma mensagem privada no Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "O seu administrador do Diaspora" subject: "Uma mensagem sobre a sua conta do Diaspora:" started_sharing: sharing: "começou a partilhar consigo!" - sign_in: "Inicie a sessão aqui" subject: "%{name} começou a partilhar consigo no Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Obrigado," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "ou" password: "Palavra-passe" @@ -556,6 +553,19 @@ pt-PT: manage_within: "Gerir contactos dentro de" new_request_to_person: sent: "enviado!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Procurar" services: create: @@ -690,10 +700,14 @@ pt-PT: undo: "Anular?" username: "Nome de utilizador" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "A sua conta foi encerrada. Pode demorar até 20 minutos para que terminemos o processo de encerramento da sua conta. Obrigado por experimentar o Diaspora." edit: also_commented: "...alguém também comenta na publicação do seu contacto?" change: "Alterar" + change_email: "Change E-Mail" change_language: "Mudar de Idioma" change_password: "Alterar a Palavra-passe" close_account: "Encerrar a Conta" @@ -702,6 +716,7 @@ pt-PT: download_photos: "descarregar as minhas fotografias" download_xml: "descarregar o meu xml" edit_account: "Editar conta" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportar Dados" liked: "...alguém gosta da sua publicação?" mentioned: "...é mencionado numa publicação?" @@ -735,6 +750,8 @@ pt-PT: 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" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "erro a obter perfil webfinger profile para %{profile_url}" hcard_fetch_failed: "ocorreu um problema a obter a hcard para %{account}" diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml index 880f20f1b..9627575e5 100644 --- a/config/locales/diaspora/ro.yml +++ b/config/locales/diaspora/ro.yml @@ -26,6 +26,10 @@ ro: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ ro: login: "login" logout: "Ieşire" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ ro: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "robotul e-mail Diaspora" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "te-a menţionat întrun post: " - sign_in: "Sign in to view it." subject: "%{name} te-a menţionat pe Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Mulţumim," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "sau" password: "Parola" @@ -556,6 +553,19 @@ ro: manage_within: "Manage contacts within" new_request_to_person: sent: "trimis!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Caută" services: create: @@ -690,10 +700,14 @@ ro: undo: "Undo?" username: "Nume de utilizator" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Contul a fost închis cu succes." edit: also_commented: "...someone also comments on your contact's post?" change: "Modifică" + change_email: "Change E-Mail" change_language: "Modificare limbă" change_password: "Modificare parolă" close_account: "Închide cont" @@ -702,6 +716,7 @@ ro: download_photos: "descarcă fotografiile mele" download_xml: "descarcă datele mele (xml)" edit_account: "Editează cont" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportare de date" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ ro: language_not_changed: "Nu sa putut modifica limba" password_changed: "S-a modificat parola" password_not_changed: "Nu sa putut schimba parola" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml index f45d3dc71..9b55852db 100644 --- a/config/locales/diaspora/ru.yml +++ b/config/locales/diaspora/ru.yml @@ -26,6 +26,10 @@ ru: attributes: from_id: taken: "дубликат ранних запросов." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ ru: login: "логин" logout: "выйти" profile: "профиль" + recent_notifications: "Recent notifications" settings: "настройки" view_all: "View all" likes: @@ -366,39 +371,31 @@ ru: other: "%{actors} начали делиться с вами." zero: "%{actors} начали делиться с вами." notifier: - also_commented: - commented: "также прокомментировал %{post_author} сообщение:\n" - sign_in: "Войдите в систему, для дальнейшего просмотра." - subject: "%{name} прокомментировал сообщение от %{post_author}." + click_here: "click here" comment_on_post: - commented: "прокомментировал ваше сообщение:" - sign_in: "Войдите в систему, для дальнейшего просмотра." - subject: "%{name} прокомментировал ваше сообщение." - diaspora: "почтовый робот Диаспоры" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Привет %{name}!" liked: liked: "%{name} понравилось Ваше сообщение:" - sign_in: "Войдите в систему, чтобы увидеть это" - subject: "%{name} понравилось Ваше сообщение" - love: "С уважением," - manage_your_email_settings: "администрировать настройки электронной почты" + view_post: "View post >" mentioned: mentioned: "упомянул вас в сообщении:" - sign_in: "Войти в систему, чтобы посмотреть." subject: "% {name} упомянул вас в диаспоре*" private_message: - message_subject: "Тема: %{subject}" - private_message: "отправил вам личное сообщение:" - sign_in: "Войдите в систему, чтобы посмотреть." - subject: "%{name} прислал вам личное сообщение в диаспоре*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Ваш администратор Диаспоры" subject: "Сообщение о вашем аккаунте Диаспоры:" started_sharing: sharing: "начал делиться с вами!" - sign_in: "Войти сюда" subject: "%{name} начал делиться с вами в диаспоре*" + view_profile: "View %{name}'s profile" thanks: "Спасибо," + to_change_your_notification_settings: "to change your notification settings" ok: "Ок" or: "или" password: "Пароль" @@ -556,6 +553,19 @@ ru: manage_within: "Управление контактами в" new_request_to_person: sent: "отправлено!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Поиск" services: create: @@ -690,10 +700,14 @@ ru: undo: "Отменить?" username: "Имя пользователя" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Ваш Аккаунт заблокирован. Примерно через 20 минут Аккаунт будет закрыт. Благодарим Вас." edit: also_commented: "... кто-то комментировал сообщения ваших контактов?" change: "Изменение" + change_email: "Change E-Mail" change_language: "Изменить язык" change_password: "Сменить пароль" close_account: "Закрыть аккаунт" @@ -702,6 +716,7 @@ ru: download_photos: "Скачать мои фотографии" download_xml: "Скачать мою информацию в xml" edit_account: "Редактировать аккаунт" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Экспорт информации" liked: "... кому-нибудь нравится ваше сообщение?" mentioned: "... Вы упомянуты в сообщении?" @@ -735,6 +750,8 @@ ru: language_not_changed: "Не удалось изменить язык" password_changed: "Пароль изменён. Теперь вы можете войти в систему с новым паролем." password_not_changed: "Изменить пароль не удалось" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Не удалось получить профиль для %{profile_url}" hcard_fetch_failed: "Возникла проблема при получении hcard для %{account}" diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml index 96ab3c75f..ca191ef09 100644 --- a/config/locales/diaspora/sk.yml +++ b/config/locales/diaspora/sk.yml @@ -26,6 +26,10 @@ sk: attributes: from_id: taken: "je duplikát už existujúcej požiadavky." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ sk: login: "prihlásenie" logout: "odhlásiť sa" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ sk: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "tiež komentoval príspevok užívateľa %{post_author} :" - sign_in: "Pre zobrazenie musíte byť prihlásený." - subject: "%{name} tiež komentoval." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Pre zobrazenie musíte byť prihlásený." - subject: "Užívateľ %{name} komentoval Váš príspevok." - diaspora: "e-mail robot Diaspory" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "ťa spomenul v príspevku:" - sign_in: "K prezeraniu sa prihlás." subject: "%{name} ťa spomenul na Diaspore*" private_message: - message_subject: "Predmet: %{subject}" - private_message: "ti poslal súkromnú správu:" - sign_in: "Sign in to view it." - subject: "%{name} has sent you a private message yon Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Váš administrátor" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Vďaka," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "alebo" password: "Heslo" @@ -556,6 +553,19 @@ sk: manage_within: "Spravovať kontakty v rámci" new_request_to_person: sent: "Poslané!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Hľadať" services: create: @@ -690,10 +700,14 @@ sk: undo: "Undo?" username: "Užívateľské meno" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Účet bol úspešne zrušený." edit: also_commented: "...someone also comments on your contact's post?" change: "Zmeniť" + change_email: "Change E-Mail" change_language: "Zmeniť jazyk" change_password: "Zmeniť heslo" close_account: "Zrušiť účet" @@ -702,6 +716,7 @@ sk: download_photos: "Stiahnuť moje fotky" download_xml: "stiahnuť moje xml" edit_account: "Upraviť účet" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportovať dáta" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ sk: language_not_changed: "Zmena jazyka zlyhala" password_changed: "Heslo zmenené" password_not_changed: "Zmena hesla zlyhala" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Nepodarilo sa získať webfinger profil pre %{profile_url}" hcard_fetch_failed: "Nepodarilo sa získať hcard pre %{@account}" diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml index 20037b230..ba6f7c4af 100644 --- a/config/locales/diaspora/sl.yml +++ b/config/locales/diaspora/sl.yml @@ -26,6 +26,10 @@ sl: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ sl: login: "prijava" logout: "odjavi me" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ sl: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "prav tako komentirano na objavo osebe %{post_author}:" - sign_in: "Za ogled se prijavite." - subject: "oseba %{name} je prav tako komentirala %{post_author}." + click_here: "click here" comment_on_post: - commented: "oseba je komentirala na vašo objavo:" - sign_in: "Za ogled se prijavite." - subject: "Oseba %{name} je komentirala vašo objavo." - diaspora: "diaspora email robot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" private_message: - message_subject: "Subject: %{subject}" - private_message: "has sent you a private message:" - sign_in: "Sign in to view it." - subject: "oseba %{name} vam je poslala privatno sporočilo v Diaspori*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Vaš administrator Diaspore" subject: "Sporočilo o vašem Diaspora računu:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Hvala," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "ali" password: "Geslo" @@ -556,6 +553,19 @@ sl: manage_within: "Uredi stike znotraj" new_request_to_person: sent: "poslano!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Najdi" services: create: @@ -690,10 +700,14 @@ sl: undo: "Undo?" username: "Uporabniško ime" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Uporabniški račun je uspešno zaprt." edit: also_commented: "...someone also comments on your contact's post?" change: "Spremeni" + change_email: "Change E-Mail" change_language: "Spremeni jezik" change_password: "Spremeni geslo" close_account: "Zapri uporabniški račun" @@ -702,6 +716,7 @@ sl: download_photos: "prenesi slike" download_xml: "prenesi v xml" edit_account: "Uredi uporabniški račun" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Izvozi podatke" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ sl: language_not_changed: "Sprememba jezika ni uspela" password_changed: "Geslo spremenjeno" password_not_changed: "Sprememba gesla ni uspela" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "'webfinger' profil ni bilo mogoče prenesti za %{profile_url}" hcard_fetch_failed: "prišlo je do težave pri prenosu 'hCard' kartice za %{account}" diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml index 7eda2db92..bec18a453 100644 --- a/config/locales/diaspora/sv.yml +++ b/config/locales/diaspora/sv.yml @@ -26,6 +26,10 @@ sv: attributes: from_id: taken: "är en kopia av en redan existerande förfrågan." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ sv: login: "Logga in" logout: "Logga ut" profile: "profil" + recent_notifications: "Recent notifications" settings: "Inställningar" view_all: "View all" likes: @@ -366,39 +371,31 @@ sv: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "har också kommenterat %{post_author}'s inlägg:" - sign_in: "Logga in för att se den." - subject: "%{name} har också kommenterat %{post_author}s inlägg." + click_here: "click here" comment_on_post: - commented: "Har kommenterat ditt inlägg" - sign_in: "Logga in för att visa den." - subject: "%{name} har kommenterat ditt inlägg." - diaspora: "Diasporas mailrobot" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "Hej %{name}!" liked: liked: "%{name} har precis gillat ditt inlägg: " - 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" + view_post: "View post >" mentioned: mentioned: "nämnde dig i ett inlägg:" - sign_in: "Logga in för att kunna se det." subject: "%{name} har nämnt dig på Diaspora*" private_message: - message_subject: "Ämne: %{subject}" - private_message: "har skickat dig ett private meddelande:" - sign_in: "Logga in för att se det." - subject: "%{name} har skickat ett privat meddelande till dig på Diaspora*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Din Diaspora administratör" subject: "Ett meddelande gällande ditt Diaspora-konto:" started_sharing: sharing: "har börjat dela med dig!" - sign_in: "Logga in här" subject: "%{name} har börjat dela med dig på Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Tack," + to_change_your_notification_settings: "to change your notification settings" ok: "OK" or: "eller" password: "Lösenord" @@ -556,6 +553,19 @@ sv: manage_within: "Hantera kontakter i " new_request_to_person: sent: "skickat!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Sök" services: create: @@ -690,10 +700,14 @@ sv: undo: "Ångra?" username: "Användarnamn" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Ditt konto är nu stängt." edit: also_commented: "...någon har också kommenterat på din kontakts post?" change: "Ändra" + change_email: "Change E-Mail" change_language: "Ändra språk" change_password: "Ändra lösenord" close_account: "Stäng kontot" @@ -702,6 +716,7 @@ sv: download_photos: "Ladda ner mina foton" download_xml: "Ladda ner min xml" edit_account: "Ändra konto" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Exportera data" liked: "...någon gillar ditt inlägg?" mentioned: "...du är omnämnd i en post?" @@ -735,6 +750,8 @@ sv: language_not_changed: "Språket kunde inte ändras" password_changed: "Lösenordet är nu ändrat." password_not_changed: "Lösenordet kunde inte ändras" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "Kunde inte hämta webfinger-profil för %{profile_url}" hcard_fetch_failed: "Kunde inte hämta hcard för #{@account}" diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml index 69fa6c289..bdb95bf51 100644 --- a/config/locales/diaspora/tr.yml +++ b/config/locales/diaspora/tr.yml @@ -26,6 +26,10 @@ tr: attributes: from_id: taken: "is a duplicate of a pre-existing request." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ tr: login: "login" logout: "Çıkış" profile: "profile" + recent_notifications: "Recent notifications" settings: "settings" view_all: "View all" likes: @@ -366,39 +371,31 @@ tr: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "has also commented on %{post_author}'s post:" - sign_in: "Sign in to view it." - subject: "%{name} has also commented." + click_here: "click here" comment_on_post: - commented: "has commented on your post!" - sign_in: "Sign in to view it." - subject: "%{name} has commented on your post." - diaspora: "Diaspora e-posta robotu" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," 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" + view_post: "View post >" mentioned: mentioned: "mentioned you in a post:" - sign_in: "Sign in to view it." subject: "%{name} has mentioned you on Diaspora*" 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*" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "Your Diaspora administrator" subject: "A message from your Diaspora administrator:" started_sharing: sharing: "has started sharing with you!" - sign_in: "Sign in here" subject: "%{name} has started sharing with you on Diaspora*" + view_profile: "View %{name}'s profile" thanks: "Thanks," + to_change_your_notification_settings: "to change your notification settings" ok: "Tamam" or: "ya da" password: "Parola" @@ -556,6 +553,19 @@ tr: manage_within: "Manage contacts within" new_request_to_person: sent: "yollandı!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "Ara" services: create: @@ -690,10 +700,14 @@ tr: undo: "Undo?" username: "Kullanıcı Adı" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "Hesap başarıyla kapatıldı" edit: also_commented: "...someone also comments on your contact's post?" change: "Change" + change_email: "Change E-Mail" change_language: "Dili Değiştir" change_password: "Şifremi Değiştir" close_account: "Hesabımı kapat" @@ -702,6 +716,7 @@ tr: download_photos: "fotoğraflarımı kaydet" download_xml: "xml dosyamı kaydet" edit_account: "Edit account" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "Bilgilerimi Dışarı taşı" liked: "...someone likes your post?" mentioned: "...you are mentioned in a post?" @@ -735,6 +750,8 @@ tr: language_not_changed: "Dil Değişikliği Başarılamadı" password_changed: "Şifre Değişti" password_not_changed: "Şifre Değişikliği Başarılamadı" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "failed to fetch webfinger profile for %{profile_url}" hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}" diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml index ff28247d3..27035e6fc 100644 --- a/config/locales/diaspora/zh-CN.yml +++ b/config/locales/diaspora/zh-CN.yml @@ -26,6 +26,10 @@ zh-CN: attributes: from_id: taken: "与已存在的请求重复。" + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -272,6 +276,7 @@ zh-CN: login: "登录" logout: "登出" profile: "个人档案" + recent_notifications: "Recent notifications" settings: "设置" view_all: "View all" likes: @@ -366,39 +371,31 @@ zh-CN: other: "%{actors} started sharing with you." zero: "%{actors} started sharing with you." notifier: - also_commented: - commented: "也对 %{post_author} 的贴文发布了意见:" - sign_in: "登录后可以查看。" - subject: "%{name} 也评论了 %{post_author} 发布的内容。" + click_here: "click here" comment_on_post: - commented: "对评论了您发布的内容：" - sign_in: "登录后可以查看。" - subject: "%{name} 评论了您发布的内容。" - diaspora: "diaspora邮件机器人" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "您好 %{name}！" liked: liked: "%{name}刚说喜欢您发布的内容：" - sign_in: "Sign to view it" - subject: "%{name}刚说喜欢您发布的内容" - love: "衷心祝福，" - manage_your_email_settings: "管理邮件设置" + view_post: "View post >" mentioned: mentioned: "在 Diaspora* 发布的内容中提到了您：" - sign_in: "登录后可以查看。" subject: "%{name} 在 Diaspora* 上发布的内容中提到了您" private_message: - message_subject: "主题: %{subject}" - private_message: "已发送了私人信息给您：" - sign_in: "登录进来看看。" - subject: "%{name} 在 Diaspora* 给您发送了私人信息" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "为您服务的 Diaspora 管理员" subject: "关于您 Diaspora 帐号的信息:" started_sharing: sharing: "刚开始与您分享！" - sign_in: "在这里登录" subject: "%{name}刚开始在Diaspora*与您分享" + view_profile: "View %{name}'s profile" thanks: "谢谢，" + to_change_your_notification_settings: "to change your notification settings" ok: "确定" or: "或" password: "密码" @@ -556,6 +553,19 @@ zh-CN: manage_within: "管理好友：" new_request_to_person: sent: "发送成功！" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "搜索" services: create: @@ -690,10 +700,14 @@ zh-CN: undo: "撤消？" username: "帐号" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "帐号关闭成功。" edit: also_commented: "……当有人也对您的好友的内容发表评论时？" change: "更改" + change_email: "Change E-Mail" change_language: "更改语言" change_password: "更改密码" close_account: "关闭帐号" @@ -702,6 +716,7 @@ zh-CN: download_photos: "下载我的照片" download_xml: "下载我的 xml" edit_account: "编辑帐号" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "资料导出" liked: "…有人喜欢您发布的内容？" mentioned: "……当贴文中提到您时？" @@ -735,6 +750,8 @@ zh-CN: language_not_changed: "语言更改失败" password_changed: "密码更改成功" password_not_changed: "密码更改失败" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "获取 %{profile_url} 的 webfinger 个人档案失败" hcard_fetch_failed: "获取 %{account} 的 hcard 资料时发生错误" diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml index d41b71f9e..c9552cb8a 100644 --- a/config/locales/diaspora/zh-TW.yml +++ b/config/locales/diaspora/zh-TW.yml @@ -26,6 +26,10 @@ zh-TW: attributes: from_id: taken: "與已存在的請求重複." + reshare: + attributes: + root_guid: + taken: "You've already reshared that post!" user: attributes: email: @@ -247,7 +251,7 @@ zh-TW: edit: sign_up: "登記" new: - already_invited: "已邀請了" + already_invited: "這些人尚未接受你的邀請:" aspect: "面向" comma_seperated_plz: "你可以輸入多個電子信箱, 只要以逗號分隔即可." if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中." @@ -272,6 +276,7 @@ zh-TW: login: "登入" logout: "登出" profile: "個人檔案" + recent_notifications: "Recent notifications" settings: "設定" view_all: "檢視全部" likes: @@ -366,39 +371,31 @@ zh-TW: other: "%{actors}開始跟你分享了." zero: "%{actors}開始跟你分享了." notifier: - also_commented: - commented: "也對 %{post_author} 的貼文發表了意見:" - sign_in: "登入來看看." - subject: "%{name} 也對 %{post_author} 的貼文發表了意見." + click_here: "click here" comment_on_post: - commented: "對你的貼文發表了意見:" - sign_in: "登入來看看." - subject: "%{name} 對你的貼文發表了意見." - diaspora: "diaspora 電郵機器人" + reply: "Reply or view %{name}'s post >" + confirm_email: + click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:" + subject: "Please activate your new e-mail address %{unconfirmed_email}" + email_sent_by_diaspora: "This email was sent by Diaspora. If you'd like to stop getting emails like this," hello: "%{name}你好!" liked: liked: "%{name}剛剛說你的貼文讚: " - sign_in: "登入來看看" - subject: "%{name}剛剛說你的貼文讚" - love: "衷心祝福," - manage_your_email_settings: "管理電郵設定" + view_post: "View post >" mentioned: mentioned: "在貼文中提到你:" - sign_in: "登入來看看." subject: "%{name} 在 Diaspora* 提到你" private_message: - message_subject: "主旨: %{subject}" - private_message: "已傳送私人訊息給你:" - sign_in: "登入來看看." - subject: "%{name} 在 Diaspora* 傳送私人訊息給你" + reply_to_or_view: "Reply to or view this conversation >" single_admin: admin: "為您服務的 Diaspora 管理員" subject: "關於你的 Diaspora 帳號的訊息:" started_sharing: sharing: "開始跟你分享了!" - sign_in: "由此登入" subject: "%{name} 在 Diaspora* 開始跟你分享了" + view_profile: "View %{name}'s profile" thanks: "謝謝," + to_change_your_notification_settings: "to change your notification settings" ok: "好了" or: "或是" password: "密碼" @@ -501,8 +498,8 @@ zh-TW: edit: allow_search: "讓別人可以在 Diaspora 搜尋到你" edit_profile: "編輯個人檔案" - first_name: "First name" - last_name: "Last name" + first_name: "名字(前)" + last_name: "名字(後)" update_profile: "更新個人檔案" your_bio: "你的自我介紹" your_birthday: "你的生日" @@ -556,6 +553,19 @@ zh-TW: manage_within: "管理聯繫:" new_request_to_person: sent: "已送出!" + reshares: + create: + failure: "There was an error resharing this post." + reshare: + deleted: "Original post deleted by author." + reshare: + few: "%{count} Reshares" + many: "%{count} Reshares" + one: "1 Reshare" + other: "%{count} Reshares" + zero: "Reshare" + reshare_confirmation: "Reshare %{author} - %{text}?" + show_original: "Show Original" search: "搜尋" services: create: @@ -690,10 +700,14 @@ zh-TW: undo: "復原?" username: "用戶名稱" users: + confirm_email: + email_confirmed: "E-Mail %{email} activated" + email_not_confirmed: "E-Mail could not be activated. Wrong link?" destroy: "帳號已鎖定. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora." edit: also_commented: "...當有人也對你的聯繫的貼文發表意見時?" change: "更改" + change_email: "Change E-Mail" change_language: "更改語言" change_password: "更改密碼" close_account: "關閉帳號" @@ -702,6 +716,7 @@ zh-TW: download_photos: "下載我的相片" download_xml: "下載我的 xml" edit_account: "編輯帳號" + email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}." export_data: "資料匯出" liked: "...有人對你的貼文說讚時?" mentioned: "...當貼文中提到你時?" @@ -735,6 +750,8 @@ zh-TW: language_not_changed: "語言更改失敗" password_changed: "密碼已變更. 現在起你可以用新密碼登入了." password_not_changed: "密碼更改失敗" + unconfirmed_email_changed: "E-Mail Changed. Needs activation." + unconfirmed_email_not_changed: "E-Mail Change Failed" webfinger: fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗" hcard_fetch_failed: "擷取 %{account} 的 hcard 資料時發生錯誤" diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml index 6edddede6..5313eb9c4 100644 --- a/config/locales/javascript/javascript.ar.yml +++ b/config/locales/javascript/javascript.ar.yml @@ -23,6 +23,7 @@ ar: no_more: "لا توجد أية رسائل أخرى" publisher: at_least_one_aspect: "حدد فئة واحدة على الأقل" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "إبحث عن {{name}}" show_more: "المزيد" timeago: diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml index 5c706f014..670c667d7 100644 --- a/config/locales/javascript/javascript.bg.yml +++ b/config/locales/javascript/javascript.bg.yml @@ -23,6 +23,7 @@ bg: no_more: "Няма повече публикации." publisher: at_least_one_aspect: "Трябва да публикувате в поне един аспект" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Търсене за {{name}}" show_more: "покажи още" timeago: diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml index 198fcbec6..994532f57 100644 --- a/config/locales/javascript/javascript.br.yml +++ b/config/locales/javascript/javascript.br.yml @@ -23,6 +23,7 @@ br: no_more: "No more posts." publisher: at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Klask war-lerc'h {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml index 7aa0ad97c..4a1e146ca 100644 --- a/config/locales/javascript/javascript.cs.yml +++ b/config/locales/javascript/javascript.cs.yml @@ -23,6 +23,7 @@ cs: no_more: "Žádné další příspěvky." publisher: at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Hledat {{name}}" show_more: "zobrazit více" timeago: diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml index 292507ec4..8d41cbae8 100644 --- a/config/locales/javascript/javascript.da.yml +++ b/config/locales/javascript/javascript.da.yml @@ -23,6 +23,7 @@ da: no_more: "Ikke flere poster." publisher: at_least_one_aspect: "Du skal dele med mindst et aspekt" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Søg efter {{name}}" show_more: "Vis mere" timeago: diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml index 2a68410d0..ca83aa9c6 100644 --- a/config/locales/javascript/javascript.de.yml +++ b/config/locales/javascript/javascript.de.yml @@ -23,6 +23,7 @@ de: no_more: "Keine weiteren Beiträge." publisher: at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Nach {{name}} suchen" show_more: "Mehr zeigen" timeago: diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml index 0c51c6023..09047b8b1 100644 --- a/config/locales/javascript/javascript.el.yml +++ b/config/locales/javascript/javascript.el.yml @@ -23,6 +23,7 @@ el: no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις." publisher: at_least_one_aspect: "πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Αναζήτηση για {{name}}" show_more: "Προβολή περισσότερων" timeago: diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml index 6f97157c5..c827069c6 100644 --- a/config/locales/javascript/javascript.en_shaw.yml +++ b/config/locales/javascript/javascript.en_shaw.yml @@ -23,6 +23,7 @@ en_shaw: no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕." publisher: at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}" show_more: "𐑖𐑴 𐑥𐑹" timeago: diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml index 83bb2ac9b..d8cf542c3 100644 --- a/config/locales/javascript/javascript.eo.yml +++ b/config/locales/javascript/javascript.eo.yml @@ -23,6 +23,7 @@ eo: no_more: "Ne pli afiŝoj." publisher: at_least_one_aspect: "Vi devus eldoni al almenaŭ unu aspekto" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Serĉi por {{name}}" show_more: "vidi plu" timeago: diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml index 416cc554d..896337301 100644 --- a/config/locales/javascript/javascript.es-AR.yml +++ b/config/locales/javascript/javascript.es-AR.yml @@ -23,6 +23,7 @@ es-AR: no_more: "No hay más publicaciones." publisher: at_least_one_aspect: "Tenés que publicarlo en, por lo menos, un aspecto" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Buscar a {{name}}" show_more: "mostrar más" timeago: diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml index 029b53026..748ac9b9a 100644 --- a/config/locales/javascript/javascript.es.yml +++ b/config/locales/javascript/javascript.es.yml @@ -23,6 +23,7 @@ es: no_more: "No hay más publicaciones." publisher: at_least_one_aspect: "Debes publicarlo en al menos un aspecto" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Buscar a {{name}}" show_more: "ver más" timeago: diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml index fb15bebdd..aab980713 100644 --- a/config/locales/javascript/javascript.eu.yml +++ b/config/locales/javascript/javascript.eu.yml @@ -23,6 +23,7 @@ eu: no_more: "Mezu gehiagorik ez dago." publisher: at_least_one_aspect: "Gutxienez alderdi batean partekatu behar duzu" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Bilatu {{name}}" show_more: "erakutsi gehiago" timeago: diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml index d4976fbc0..126a64724 100644 --- a/config/locales/javascript/javascript.fi.yml +++ b/config/locales/javascript/javascript.fi.yml @@ -23,6 +23,7 @@ fi: no_more: "Ei enempää viestejä." publisher: at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle." + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Etsi nimellä {{name}}" show_more: "näytä lisää" timeago: diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml index 085b136a8..1c80f4202 100644 --- a/config/locales/javascript/javascript.fr.yml +++ b/config/locales/javascript/javascript.fr.yml @@ -23,6 +23,7 @@ fr: no_more: "Pas d'autre messages." publisher: at_least_one_aspect: "Vous devez créer au moins un aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Chercher {{name}}" show_more: "voir plus" timeago: diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml index b1c9fa8ba..df411cfcb 100644 --- a/config/locales/javascript/javascript.he.yml +++ b/config/locales/javascript/javascript.he.yml @@ -23,6 +23,7 @@ he: no_more: "אין רשומות נוספות." publisher: at_least_one_aspect: "עליך לפרסם היבט אחד לפחות" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "חיפוש אחר {{name}}" show_more: "הצגת עוד" timeago: diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml index e2e8f4720..266c7f546 100644 --- a/config/locales/javascript/javascript.hu.yml +++ b/config/locales/javascript/javascript.hu.yml @@ -23,6 +23,7 @@ hu: no_more: "Nincs több bejegyzés." publisher: at_least_one_aspect: "Minimum 1 csoportnak meg kell osztanod!" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "{{name}} keresése." show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml index 81f26da02..a9320278f 100644 --- a/config/locales/javascript/javascript.id.yml +++ b/config/locales/javascript/javascript.id.yml @@ -23,6 +23,7 @@ id: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Search for {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml index 265778c43..ffee7a4ee 100644 --- a/config/locales/javascript/javascript.is.yml +++ b/config/locales/javascript/javascript.is.yml @@ -23,6 +23,7 @@ is: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Search for {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml index 0a9bf78ba..31fd5413e 100644 --- a/config/locales/javascript/javascript.it.yml +++ b/config/locales/javascript/javascript.it.yml @@ -23,6 +23,7 @@ it: no_more: "Non ci sono altri post." publisher: at_least_one_aspect: "Devi condividere almeno con un aspetto" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Ricerca per {{name}}" show_more: "mostra altro" timeago: diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml index 96537a1d4..3e5c2450f 100644 --- a/config/locales/javascript/javascript.ja.yml +++ b/config/locales/javascript/javascript.ja.yml @@ -23,6 +23,7 @@ ja: no_more: "投稿はこれ以上ありません。" publisher: at_least_one_aspect: "アスペクトを選択してから投稿してください。" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "{{name}}を検索する" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml index 4d1968fd7..085c19422 100644 --- a/config/locales/javascript/javascript.ko.yml +++ b/config/locales/javascript/javascript.ko.yml @@ -23,6 +23,7 @@ ko: no_more: "공유물이 더 없습니다." publisher: at_least_one_aspect: "공유하려면 적어도 한 애스펙을 골라야 합니다." + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "{{name}} 검색" show_more: "더 보기" timeago: diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml index 6f01e2eec..82f9fa7c0 100644 --- a/config/locales/javascript/javascript.nb.yml +++ b/config/locales/javascript/javascript.nb.yml @@ -23,6 +23,7 @@ nb: no_more: "No more posts." publisher: at_least_one_aspect: "Du må poste til minst ett aspekt" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Søk etter {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml index 9874005e7..57e3c9611 100644 --- a/config/locales/javascript/javascript.nl.yml +++ b/config/locales/javascript/javascript.nl.yml @@ -23,6 +23,7 @@ nl: no_more: "Geen posts meer." publisher: at_least_one_aspect: "Je moet op zijn minst één aspect publiceren" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Zoek naar {{name}}" show_more: "laat meer zien" timeago: diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml index 49672a37f..79f0bf990 100644 --- a/config/locales/javascript/javascript.pl.yml +++ b/config/locales/javascript/javascript.pl.yml @@ -23,6 +23,7 @@ pl: no_more: "No more posts." publisher: at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Szukaj: {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml index 83ee40118..3cd614b3a 100644 --- a/config/locales/javascript/javascript.pt-BR.yml +++ b/config/locales/javascript/javascript.pt-BR.yml @@ -23,6 +23,7 @@ pt-BR: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Search for {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml index e49ab50e0..16d0d981d 100644 --- a/config/locales/javascript/javascript.pt-PT.yml +++ b/config/locales/javascript/javascript.pt-PT.yml @@ -23,6 +23,7 @@ pt-PT: no_more: "Não há mais publicações." publisher: at_least_one_aspect: "Tem de publicar para pelo menos um aspecto" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Procurar por {{name}}" show_more: "mostrar mais" timeago: diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml index de402ce4f..1e7a17462 100644 --- a/config/locales/javascript/javascript.ro.yml +++ b/config/locales/javascript/javascript.ro.yml @@ -23,6 +23,7 @@ ro: no_more: "Nu mai sunt posturi." publisher: at_least_one_aspect: "Trebuie sa publici pe cel puţin un aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Caută {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml index c33a6bd5b..69cf796ec 100644 --- a/config/locales/javascript/javascript.ru.yml +++ b/config/locales/javascript/javascript.ru.yml @@ -23,6 +23,7 @@ ru: no_more: "Сообщений больше нет." publisher: at_least_one_aspect: "Вам надо минимум один аспект создать" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Искать {{name}}" show_more: "показать больше" timeago: diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml index 48b21f929..82dacb859 100644 --- a/config/locales/javascript/javascript.sk.yml +++ b/config/locales/javascript/javascript.sk.yml @@ -23,6 +23,7 @@ sk: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Hľadať {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.sl.yml b/config/locales/javascript/javascript.sl.yml index eaffc2a11..fb575e5b9 100644 --- a/config/locales/javascript/javascript.sl.yml +++ b/config/locales/javascript/javascript.sl.yml @@ -23,6 +23,7 @@ sl: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Search for {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml index b412a043d..1966a9f2c 100644 --- a/config/locales/javascript/javascript.sv.yml +++ b/config/locales/javascript/javascript.sv.yml @@ -23,6 +23,7 @@ sv: no_more: "Inga fler inlägg." publisher: at_least_one_aspect: "Du måste publicera till minst en aspekt." + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "Sök efter {{name}}" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml index 3b032b00a..d20cb684a 100644 --- a/config/locales/javascript/javascript.tr.yml +++ b/config/locales/javascript/javascript.tr.yml @@ -23,6 +23,7 @@ tr: no_more: "No more posts." publisher: at_least_one_aspect: "You must publish to at least one aspect" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "{{name}}'i ara" show_more: "show more" timeago: diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml index 675c55ed7..5965db94f 100644 --- a/config/locales/javascript/javascript.zh-CN.yml +++ b/config/locales/javascript/javascript.zh-CN.yml @@ -23,6 +23,7 @@ zh-CN: no_more: "没有更多的内容了。" publisher: at_least_one_aspect: "发布时请选择至少一个情景" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "搜索 {{name}}" show_more: "查看更多" timeago: diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml index f6e3c58fb..3880e0cf2 100644 --- a/config/locales/javascript/javascript.zh-TW.yml +++ b/config/locales/javascript/javascript.zh-TW.yml @@ -23,6 +23,7 @@ zh-TW: no_more: "沒有貼文了." publisher: at_least_one_aspect: "發表時請至少選擇一個面向" + reshares: "duplicate:\"You've already reshared that post!\"" search_for: "搜尋 {{name}}" show_more: "顯示更多" timeago: From 6425bdc47cc1b0ef99b4a98ea667cdb073d41954 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 25 Jul 2011 15:38:17 +0200 Subject: [PATCH 4/4] added esperanto to the available languages --- config/locale_settings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locale_settings.yml b/config/locale_settings.yml index 4a3fabd6a..2aaf6290e 100644 --- a/config/locale_settings.yml +++ b/config/locale_settings.yml @@ -11,6 +11,7 @@ available: el: "Ελληνικά" en: "English" en_shaw: "𐑦𐑙𐑤𐑦𐑖" + eo: "Esperanto" es: "Español" es-AR: "Castellano" es-CL: "Español Chileno"