autonomic-cooperative
/
hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge issues

This commit is contained in:
Renato "Lond" Cerqueira 2019-06-30 10:55:00 +02:00
parent f0a512c7ca
commit 405d6a71c8
12 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/stream_entries_controller.rb
View File

@ -21,7 +21,7 @@ class StreamEntriesController < ApplicationController
end
format.atom do
expires_in 3.minutes, public: true unless @stream_entry.hidden?
expires_in 3.minutes, public: true unless @stream_entry.hidden? || @stream_entry.local_only?
render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(@stream_entry, true))
end

6
app/javascript/mastodon/locales/bn.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "আপনি এখনো কোনো ব্যবহারকারীকে সরাননি।",
"empty_column.notifications": "আপনার এখনো কোনো প্রজ্ঞাপন নেই। কথোপকথন শুরু করতে, অন্যদের সাথে মেলামেশা করতে পারেন।",
"empty_column.public": "এখানে এখনো কিছু নেই! প্রকাশ্য ভাবে কিছু লিখুন বা অন্য সার্ভার থেকে কাওকে অনুসরণ করে এই জায়গা ভরে ফেলুন",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "অনুমতি দিন",
"follow_request.reject": "প্রত্যাখ্যান করুন",
"getting_started.developers": "তৈরিকারকদের জন্য",
@ -328,6 +333,7 @@
"status.favourite": "পছন্দের করতে",
"status.filtered": "ছাঁকনিদিত",
"status.load_more": "আরো দেখুন",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "ছবি বা ভিডিও পেছনে",
"status.mention": "@{name}কে উল্লেখ করতে",
"status.more": "আরো",

6
app/javascript/mastodon/locales/hi.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "You haven't muted any users yet.",
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"getting_started.developers": "Developers",
@ -328,6 +333,7 @@
"status.favourite": "Favourite",
"status.filtered": "Filtered",
"status.load_more": "Load more",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}",
"status.more": "More",

5
app/javascript/mastodon/locales/hu.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "Még egy felhasználót sem némítottál le.",
"empty_column.notifications": "Jelenleg nincsenek értesítéseid. Lépj kapcsolatba másokkal, hogy elindítsd a beszélgetést.",
"empty_column.public": "Jelenleg itt nincs semmi! Írj valamit nyilvánosan vagy kövess más szervereken levő felhasználókat, hogy megtöltsd",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Engedélyezés",
"follow_request.reject": "Visszautasítás",
"getting_started.developers": "Fejlesztőknek",

6
app/javascript/mastodon/locales/kk.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "Әзірше ешқандай үнсізге қойылған қолданушы жоқ.",
"empty_column.notifications": "Әзірше ешқандай ескертпе жоқ. Басқалармен араласуды бастаңыз және пікірталастарға қатысыңыз.",
"empty_column.public": "Ештеңе жоқ бұл жерде! Өзіңіз бастап жазып көріңіз немесе басқаларға жазылыңыз",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Авторизация",
"follow_request.reject": "Қабылдамау",
"getting_started.developers": "Жасаушылар тобы",
@ -328,6 +333,7 @@
"status.favourite": "Таңдаулы",
"status.filtered": "Фильтрленген",
"status.load_more": "Тағы әкел",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "Жабық медиа",
"status.mention": "Аталым @{name}",
"status.more": "Тағы",

6
app/javascript/mastodon/locales/lt.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "You haven't muted any users yet.",
"empty_column.notifications": "You don't have any notifications yet. Interact with others to start the conversation.",
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Authorize",
"follow_request.reject": "Reject",
"getting_started.developers": "Developers",
@ -328,6 +333,7 @@
"status.favourite": "Favourite",
"status.filtered": "Filtered",
"status.load_more": "Load more",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}",
"status.more": "More",

6
app/javascript/mastodon/locales/sl.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "Niste utišali še nobenega uporabnika.",
"empty_column.notifications": "Nimate še nobenih obvestil. Poveži se z drugimi, da začnete pogovor.",
"empty_column.public": "Tukaj ni ničesar! Da ga napolnite, napišite nekaj javnega ali pa ročno sledite uporabnikom iz drugih strežnikov",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Overi",
"follow_request.reject": "Zavrni",
"getting_started.developers": "Razvijalci",
@ -328,6 +333,7 @@
"status.favourite": "Priljubljen",
"status.filtered": "Filtrirano",
"status.load_more": "Naloži več",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "Mediji so skriti",
"status.mention": "Omeni @{name}",
"status.more": "Več",

6
app/javascript/mastodon/locales/sq.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "S’keni heshtuar ende ndonjë përdorues.",
"empty_column.notifications": "Ende s’keni ndonjë njoftim. Ndërveproni me të tjerët që të nisë biseda.",
"empty_column.public": "S’ka gjë këtu! Shkruani diçka publikisht, ose ndiqni dorazi përdorues prej instancash të tjera, që ta mbushni këtë zonë",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "Autorizoje",
"follow_request.reject": "Hidhe tej",
"getting_started.developers": "Zhvillues",
@ -328,6 +333,7 @@
"status.favourite": "I parapëlqyer",
"status.filtered": "I filtruar",
"status.load_more": "Ngarko më tepër",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "Me media të fshehur",
"status.mention": "Përmendni @{name}",
"status.more": "Më tepër",

6
app/javascript/mastodon/locales/ta.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "நீங்கள் இதுவரை எந்த பயனர்களையும் முடக்கியிருக்கவில்லை.",
"empty_column.notifications": "உங்களிடம் எந்த அறிவிப்புகளும் இல்லை. உரையாடலைத் தொடங்க பிறருடன் தொடர்புகொள்ளவும்.",
"empty_column.public": "இங்கே எதுவும் இல்லை! பகிரங்கமாக ஒன்றை எழுதவும் அல்லது மற்ற நிகழ்வுகளிலிருந்து பயனர்களை அதை நிரப்புவதற்கு கைமுறையாக பின்பற்றவும்",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "அதிகாரமளி",
"follow_request.reject": "விலக்கு",
"getting_started.developers": "உருவாக்குநர்கள்",
@ -328,6 +333,7 @@
"status.favourite": "விருப்பத்துக்குகந்த",
"status.filtered": "வடிகட்டு",
"status.load_more": "அதிகமாய் ஏற்று",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "மீடியா மறைக்கப்பட்டது",
"status.mention": "குறிப்பிடு @{name}",
"status.more": "அதிக",

6
app/javascript/mastodon/locales/th.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "คุณยังไม่ได้ปิดเสียงผู้ใช้ใด ๆ",
"empty_column.notifications": "คุณยังไม่มีการแจ้งเตือนใด ๆ โต้ตอบกับผู้อื่นเพื่อเริ่มการสนทนา",
"empty_column.public": "ไม่มีสิ่งใดที่นี่! เขียนบางอย่างเป็นสาธารณะ หรือติดตามผู้ใช้จากเซิร์ฟเวอร์อื่น ๆ ด้วยตนเองเพื่อเติมให้เต็ม",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "อนุญาต",
"follow_request.reject": "ปฏิเสธ",
"getting_started.developers": "นักพัฒนา",
@ -328,6 +333,7 @@
"status.favourite": "ชื่นชอบ",
"status.filtered": "กรองอยู่",
"status.load_more": "โหลดเพิ่มเติม",
"status.local_only": "This post is only visible by other users of your instance",
"status.media_hidden": "ซ่อนสื่ออยู่",
"status.mention": "กล่าวถึง @{name}",
"status.more": "เพิ่มเติม",

5
app/javascript/mastodon/locales/zh-CN.json
View File

@ -134,6 +134,11 @@
"empty_column.mutes": "你没有隐藏任何用户。",
"empty_column.notifications": "你还没有收到过任何通知，快向其他用户搭讪吧。",
"empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
"federation.change": "Adjust status federation",
"federation.federated.long": "Allow toot to reach other instances",
"federation.federated.short": "Federated",
"federation.local_only.long": "Restrict this toot only to my instance",
"federation.local_only.short": "Local-only",
"follow_request.authorize": "同意",
"follow_request.reject": "拒绝",
"getting_started.developers": "开发",

2
lib/mastodon/version.rb
View File

@ -13,7 +13,7 @@ module Mastodon
end
def patch
4
2
end
def pre