diff --git a/package.json b/package.json index 28122da2e..af915c663 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,6 @@ }, "collective": { "type": "opencollective", - "url": "https://opencollective.com/pixelfed-528" + "url": "https://opencollective.com/pixelfed" } } diff --git a/public/vendor/horizon/css/app.css b/public/vendor/horizon/css/app.css index d27a6b667..bc6de602e 100644 Binary files a/public/vendor/horizon/css/app.css and b/public/vendor/horizon/css/app.css differ diff --git a/resources/assets/js/components/DiscoverComponent.vue b/resources/assets/js/components/DiscoverComponent.vue index d40240145..18049e614 100644 --- a/resources/assets/js/components/DiscoverComponent.vue +++ b/resources/assets/js/components/DiscoverComponent.vue @@ -64,7 +64,7 @@ export default { }, methods: { - + followUser(id, event) { axios.post('/i/follow', { item: id @@ -74,7 +74,7 @@ export default { el.text('Unfollow'); }).catch(err => { swal( - 'Whoops! Something went wrong...', + 'Whoops! Something went wrong…', 'An error occurred, please try again later.', 'error' ); @@ -136,4 +136,4 @@ export default { }, } } - \ No newline at end of file + diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue index b3979aae1..9d2ce03ab 100644 --- a/resources/assets/js/components/PostComponent.vue +++ b/resources/assets/js/components/PostComponent.vue @@ -152,7 +152,7 @@
- +
@@ -172,7 +172,7 @@
- +

@@ -203,7 +203,7 @@

- +
@@ -526,7 +526,7 @@ export default { }); } }, - + owner() { return this.user.id === this.status.account.id; }, diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index bdeaa6bb7..f9689a59e 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -34,25 +34,25 @@

- {{profile.display_name}} + {{profile.display_name}}

{{profile.website}}

@@ -144,7 +144,7 @@
- +
@@ -233,7 +233,7 @@
- +

@@ -262,7 +262,7 @@

- +

@@ -329,7 +329,7 @@ export default { mode: 'grid', modes: ['grid', 'list', 'masonry'], modalStatus: false, - relationship: {}, + relationship: {}, followers: [], followerCursor: 1, followerMore: true, @@ -456,7 +456,7 @@ export default { if($('body').hasClass('loggedIn') == false) { return; } - + axios.post('/i/like', { item: status.id }).then(res => { @@ -688,7 +688,7 @@ export default { .then(res => { this.followers = res.data; this.followerCursor++; - }) + }) this.$refs.followerModal.show(); }, @@ -726,4 +726,4 @@ export default { } } } - \ No newline at end of file + diff --git a/resources/assets/js/components/SearchResults.vue b/resources/assets/js/components/SearchResults.vue index b138dc0dd..a2125bc70 100644 --- a/resources/assets/js/components/SearchResults.vue +++ b/resources/assets/js/components/SearchResults.vue @@ -2,7 +2,7 @@

- Loading... + Loading…
@@ -10,7 +10,7 @@
- +

Filters

@@ -31,7 +31,7 @@ @@ -22,7 +22,7 @@ \ No newline at end of file + diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index baf0f6528..bdae7548c 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -58,7 +58,7 @@ @@ -307,7 +307,7 @@
- +

@@ -336,7 +336,7 @@

- +

@@ -567,7 +567,7 @@ if($('body').hasClass('loggedIn') == false) { return; } - + axios.post('/i/like', { item: status.id }).then(res => { @@ -786,7 +786,7 @@ break; case 'disable': - msg = 'Are you sure you want to disable ' + username + '\'s account ?'; + msg = 'Are you sure you want to disable ' + username + '’s account ?'; swal({ title: 'Confirm', text: msg, @@ -800,7 +800,7 @@ item_id: status.id, item_type: 'status' }).then(res => { - swal('Success', 'Successfully disabled ' + username + '\'s account', 'success'); + swal('Success', 'Successfully disabled ' + username + '’s account', 'success'); }).catch(err => { swal( 'Error', @@ -813,7 +813,7 @@ break; case 'suspend': - msg = 'Are you sure you want to suspend ' + username + '\'s account ?'; + msg = 'Are you sure you want to suspend ' + username + '’s account ?'; swal({ title: 'Confirm', text: msg, @@ -827,7 +827,7 @@ item_id: status.id, item_type: 'status' }).then(res => { - swal('Success', 'Successfully suspend ' + username + '\'s account', 'success'); + swal('Success', 'Successfully suspend ' + username + '’s account', 'success'); }).catch(err => { swal( 'Error', @@ -908,7 +908,7 @@ .then(res => { this.followers = res.data; this.followerCursor++; - }) + }) this.$refs.followerModal.show(); }, @@ -946,4 +946,4 @@ } } } - \ No newline at end of file + diff --git a/resources/lang/cs/navmenu.php b/resources/lang/cs/navmenu.php index 7ca3c49b5..6622ff1b3 100644 --- a/resources/lang/cs/navmenu.php +++ b/resources/lang/cs/navmenu.php @@ -2,13 +2,17 @@ return [ - 'viewMyProfile' => 'Zobrazit můj profil', - 'myTimeline' => 'Moje časová osa', - 'publicTimeline' => 'Veřejná časová osa', - 'remoteFollow' => 'Vzdálené sledování', - 'settings' => 'Nastavení', - 'admin' => 'Administrace', - 'logout' => 'Odhlásit', - 'directMessages' => 'Přímé zprávy', + 'search' => 'Hledat', + 'home' => 'Domů', + 'local' => 'Místní', + 'discover' => 'Objevovat', + 'viewMyProfile' => 'Zobrazit můj profil', + 'myTimeline' => 'Moje časová osa', + 'publicTimeline' => 'Veřejná časová osa', + 'remoteFollow' => 'Vzdálené sledování', + 'settings' => 'Nastavení', + 'admin' => 'Administrace', + 'logout' => 'Odhlásit', + 'directMessages' => 'Přímé zprávy', ]; diff --git a/resources/lang/de/site.php b/resources/lang/de/site.php index 0c109a8b5..9c3cabf56 100644 --- a/resources/lang/de/site.php +++ b/resources/lang/de/site.php @@ -9,7 +9,7 @@ return [ 'opensource' => 'Open Source', 'terms' => 'Nutzungshinweise', 'privacy' => 'Privacy', - 'l10nWip' => 'Wir arbeiten noch an der Unterstützung weiterer Sprachen.', + 'l10nWip' => 'Wir arbeiten noch an der Unterstützung weiterer Sprachen', 'currentLocale' => 'Aktuelle Sprache', 'selectLocale' => 'Wähle eine der unterstützten Sprachen aus', diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 8975d113f..51511710a 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -15,8 +15,8 @@ return [ 'password' => 'Passwords must be at least six characters and match the confirmation.', 'reset' => 'Your password has been reset!', - 'sent' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.', + 'sent' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.', 'token' => 'This password reset token is invalid.', - 'user' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.', + 'user' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.', ]; diff --git a/resources/lang/en/site.php b/resources/lang/en/site.php index f0207615e..70b9e862d 100644 --- a/resources/lang/en/site.php +++ b/resources/lang/en/site.php @@ -11,6 +11,6 @@ return [ 'privacy' => 'Privacy', 'l10nWip' => 'We’re still working on localization support', 'currentLocale' => 'Current locale', - 'selectLocale' => 'Select from one of the supported languages', + 'selectLocale' => 'Select one of the supported languages', -]; \ No newline at end of file +]; diff --git a/resources/lang/eu/navmenu.php b/resources/lang/eu/navmenu.php index cfa8903c6..3b99428af 100644 --- a/resources/lang/eu/navmenu.php +++ b/resources/lang/eu/navmenu.php @@ -2,6 +2,10 @@ return [ + 'search' => 'Bilatu', + 'home' => 'Sarrera', + 'local' => 'Lokala', + 'discover' => 'Esploratu', 'viewMyProfile' => 'Ikusi nire profila', 'myTimeline' => 'Nire denboralerroa', 'publicTimeline' => 'Denboralerro publikoa', diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php index d8d3d1c86..9160bec44 100644 --- a/resources/lang/id/auth.php +++ b/resources/lang/id/auth.php @@ -14,6 +14,6 @@ return [ */ 'failed' => 'Kredensial ini tidak cocok dengan data kami.', - 'throttle' => 'Terlalu banyak percobaan login. COba lagi setelah :seconds detik.', + 'throttle' => 'Terlalu banyak percobaan login. Coba lagi setelah :seconds detik.', ]; diff --git a/resources/lang/id/profile.php b/resources/lang/id/profile.php index 7ed6d2533..11b7e9201 100644 --- a/resources/lang/id/profile.php +++ b/resources/lang/id/profile.php @@ -4,7 +4,7 @@ return [ 'emptyFollowers' => 'User ini belum punya pengikut!', 'emptyFollowing' => 'User ini belum mengikuti siapapun!', 'emptySaved' => 'Kamu belum membuat posting!', - 'savedWarning' => 'Hanya kami yang bisa melihat posting kamu sendiri', + 'savedWarning' => 'Hanya kamu yang bisa melihat posting kamu sendiri', 'privateProfileWarning' => 'Akun ini Privat', 'alreadyFollow' => 'Sudah mengikuti :username?', 'loginToSeeProfile' => 'untuk melihat foro dan videonya.', diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php index 3c94d6186..41362303d 100644 --- a/resources/lang/id/validation.php +++ b/resources/lang/id/validation.php @@ -31,7 +31,7 @@ return [ 'date' => ':attribute bukan berupa tanggal yang benar.', 'date_format' => ':attribute tidak sesuai dengan format :format.', 'different' => ':attribute dan :other harus berbeda.', - 'digits' => ':attribute haurs berisi :digits digit.', + 'digits' => ':attribute harus berisi :digits digit.', 'digits_between' => ':attribute harus antara :min dan :max digit.', 'dimensions' => ':attribute berisi dimensi gambar yang tidak benar.', 'distinct' => 'Bagian :attribute memiliki duplikasi.', @@ -48,43 +48,43 @@ return [ 'ipv6' => ':attribute harus berupa alamat IPv6 yang benar.', 'json' => ':attribute harus berupa string JSON yang benar.', 'max' => [ - 'numeric' => 'The :attribute may not be greater than :max.', - 'file' => 'The :attribute may not be greater than :max kilobytes.', - 'string' => 'The :attribute may not be greater than :max characters.', - 'array' => 'The :attribute may not have more than :max items.', + 'numeric' => ':attribute tidak boleh lebih dari :max.', + 'file' => ':attribute tidak boleh lebih dari :max kilobyte.', + 'string' => ':attribute tidak boleh lebih dari :max karakter.', + 'array' => ':attribute tidak boleh lebih dari :max item.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'mimes' => ':attribute harus berupa berkas: :values.', + 'mimetypes' => ':attribute harus berupa berkas: :values.', 'min' => [ - 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'numeric' => ':attribute minimal harus :min.', + 'file' => ':attribute minimal harus :min kilobyte.', + 'string' => ':attribute minimal harus :min karakter.', + 'array' => ':attribute minimal harus berisi :min item.', ], - 'not_in' => 'The selected :attribute is invalid.', - 'not_regex' => 'The :attribute format is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'present' => 'The :attribute field must be present.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values is present.', - 'required_without' => 'The :attribute field is required when :values is not present.', - 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', + 'not_in' => ':attribute yang dipilih tidak benar.', + 'not_regex' => 'Format :attribute tidak benar.', + 'numeric' => ':attribute harus berupa angka.', + 'present' => 'Bagian :attribute harus diisi.', + 'regex' => 'Format :attribute tidak benar.', + 'required' => 'Bagian :attribute harus diisi.', + 'required_if' => 'Bagian :attribute harus diisi jika :other :value.', + 'required_unless' => 'Bagian :attribute harus diisi kecuali jika :other :values.', + 'required_with' => 'Bagian :attribute harus diisi jika ada :values.', + 'required_with_all' => 'Bagian :attribute harus diisi jika ada :values.', + 'required_without' => 'Bagian :attribute harus diisi jika tidak ada :values.', + 'required_without_all' => 'Bagian :attribute harus diisi jika tidak ada :values.', + 'same' => ':attribute dan :other harus sama.', 'size' => [ - 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', - 'array' => 'The :attribute must contain :size items.', + 'numeric' => ':attribute harus :size.', + 'file' => ':attribute harus berukuran :size kilobyte.', + 'string' => ':attribute harus berisi :size karaker.', + 'array' => ':attribute harus berisi :size item.', ], - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid zone.', - 'unique' => 'The :attribute has already been taken.', - 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute format is invalid.', + 'string' => ':attribute harus berupa string.', + 'timezone' => ':attribute harus berupa zona yang benar.', + 'unique' => ':attribute sudah digunakan.', + 'uploaded' => ':attribute gagal diunggah.', + 'url' => 'Format :attribute tidak benar.', /* |-------------------------------------------------------------------------- | Custom Validation Language Lines diff --git a/resources/lang/pl/navmenu.php b/resources/lang/pl/navmenu.php index 56e5faafa..87887cb09 100644 --- a/resources/lang/pl/navmenu.php +++ b/resources/lang/pl/navmenu.php @@ -2,12 +2,16 @@ return [ + 'search' => 'Szukaj', + 'home' => 'Strona główna', + 'local' => 'Lokalne', + 'discover' => 'Odkrywaj', 'viewMyProfile' => 'Pokaż mój profil', 'myTimeline' => 'Moja oś czasu', 'publicTimeline' => 'Publiczna oś czasu', 'remoteFollow' => 'Zdalne śledzenie', 'settings' => 'Ustawienia', - 'admin' => 'Administrator', + 'admin' => 'Administracja', 'logout' => 'Wyloguj się', 'directMessages' => 'Wiadomości bezpośrednie', diff --git a/resources/lang/pl/notification.php b/resources/lang/pl/notification.php index bf2b15c20..e6046f9c5 100644 --- a/resources/lang/pl/notification.php +++ b/resources/lang/pl/notification.php @@ -6,5 +6,6 @@ return [ 'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.', 'commented' => 'skomentował(a) Twój wpis', 'mentionedYou' => 'wspomniał(a) o Tobie.', + 'shared' => 'udostępnił(a) Twój wpis.', ]; diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php index 0d6d1f2d1..df79105a6 100644 --- a/resources/lang/pl/passwords.php +++ b/resources/lang/pl/passwords.php @@ -15,8 +15,8 @@ return [ 'password' => 'Hasło musi składać się z przynajmniej 6 znaków i być równe powtórzonemu.', 'reset' => 'Twoje hasło zostało zresetowane!', - 'sent' => 'Wysłaliśmy Ci link resetujący hasło mailem!', + 'sent' => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.', 'token' => 'This password reset token is invalid.', - 'user' => 'Nie znaleziono użytkownika z tym adresem e-mail.', + 'user' => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.', ]; diff --git a/resources/lang/pl/profile.php b/resources/lang/pl/profile.php index bbe60c1ee..b0e72e79c 100644 --- a/resources/lang/pl/profile.php +++ b/resources/lang/pl/profile.php @@ -1,9 +1,12 @@ 'Ten użytkownik nie opublikował jeszcze niczego!', - 'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!', - 'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!', - 'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!', - 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)', + 'emptyTimeline' => 'Ten użytkownik nie opublikował jeszcze niczego!', + 'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!', + 'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!', + 'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!', + 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)', + 'privateProfileWarning' => 'To konto jest prywatne', + 'alreadyFollow' => 'Już obserwujesz :username?', + 'loginToSeeProfile' => 'aby zobaczyć zdjęcia i filmy tego użytkownika.', ]; diff --git a/resources/lang/pl/site.php b/resources/lang/pl/site.php new file mode 100644 index 000000000..7a668ea5e --- /dev/null +++ b/resources/lang/pl/site.php @@ -0,0 +1,16 @@ + 'O nas', + 'help' => 'Pomoc', + 'language' => 'Język', + 'fediverse' => 'Fediwersum', + 'opensource' => 'Otwarte źródło', + 'terms' => 'Zasady', + 'privacy' => 'Prywatność', + 'l10nWip' => 'Wciąż pracujemy nad obsługą wielu języków', + 'currentLocale' => 'Obecny język', + 'selectLocale' => 'Wybierz jeden z dostępnych języków', + +]; diff --git a/resources/views/admin/settings/system.blade.php b/resources/views/admin/settings/system.blade.php index 03c3669cd..1f72bf230 100644 --- a/resources/views/admin/settings/system.blade.php +++ b/resources/views/admin/settings/system.blade.php @@ -32,8 +32,8 @@

{{$sys['php']}}

-
-
+
+
@@ -48,9 +48,9 @@
- Loading... + Loading…
-
+
@@ -112,4 +112,4 @@ $(document).ready(function() { }); -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/site/language.blade.php b/resources/views/site/language.blade.php index f8f6fd477..131e3bd68 100644 --- a/resources/views/site/language.blade.php +++ b/resources/views/site/language.blade.php @@ -11,7 +11,7 @@

{{__('site.selectLocale')}}:

@endsection diff --git a/resources/views/status/compose.blade.php b/resources/views/status/compose.blade.php index 691a97a3e..156563ffb 100644 --- a/resources/views/status/compose.blade.php +++ b/resources/views/status/compose.blade.php @@ -13,7 +13,7 @@ Compose

-
+
-
+
@@ -37,14 +37,14 @@
- +
- +
@@ -83,33 +83,33 @@
-
+

Public

Anyone can see

-
+
-
+

Followers Only

Only followers can see

-
+
{{--
-
+

Direct Message

Recipients only

-
+
--}}
@@ -280,7 +280,7 @@ pixelfed.uploader.loadMeta = function() { if(pixelfed.uploader.ids.length > 1) { $('.next').removeClass('text-light'); } - } + } if(cursor > 1) { $('.prev').removeClass('text-light'); if(pixelfed.uploader.ids.length > cursor) { @@ -490,14 +490,14 @@ $('.visibility .dropdown-item').on('click', function(e) { }); el.addClass('active'); $('#visibility').text(el.data('title')); - pixelfed.uploader.visibility = el.data('id'); + pixelfed.uploader.visibility = el.data('id'); }); $('#composeMenu').on('click', function(e) { e.preventDefault(); swal( 'Experimental Feature', - 'We\'re still working on this feature.', + 'We’re still working on this feature.', 'info' ); }); @@ -526,4 +526,4 @@ $('#composeMenu').on('click', function(e) { }); --}} -@endpush \ No newline at end of file +@endpush diff --git a/resources/views/status/show/sidebar.blade.php b/resources/views/status/show/sidebar.blade.php index 1fc98c147..e524cb98d 100644 --- a/resources/views/status/show/sidebar.blade.php +++ b/resources/views/status/show/sidebar.blade.php @@ -111,7 +111,7 @@ @csrf - +
-
\ No newline at end of file +