From bugzilla-daemon@bugs.koha-community.org Tue Jun 6 18:07:34 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] New: Improve translation of title tags: Patrons Date: Tue, 06 Jun 2023 16:07:34 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2569461906242039521==" --===============2569461906242039521== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Bug ID: 33920 Summary: Improve translation of title tags: Patrons Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org CC: testopia@bugs.koha-community.org Blocks: 33906 This patch will modify patron module templates in the staff client so that translatable strings in the tag are wrapped in the correct translation function, e.g. [% t('Translate me') %] Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33906 [Bug 33906] [OMNIBUS] Improve translation of title tags -- You are receiving this mail because: You are watching all bug changes. --===============2569461906242039521==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 13 17:57:35 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Tue, 13 Jun 2023 15:57:35 +0000 Message-ID: <bug-33920-70-eHynXHYeO4@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1294543306996526861==" --===============1294543306996526861== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Medium patch -- You are receiving this mail because: You are watching all bug changes. --===============1294543306996526861==-- From bugzilla-daemon@bugs.koha-community.org Tue Jun 13 17:57:45 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Tue, 13 Jun 2023 15:57:37 +0000 Message-ID: <bug-33920-70-THHNkHYAZU@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0966409559664554458==" --===============0966409559664554458== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 152309 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=152309&action=edit Bug 33920: Improve translation of title tags: Patrons This patch updates patron module templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following patron-related pages have the correct title tags: - Patrons home page - Patron search -> - Select two patrons -> Merge selected - Add patron -> - Add a patron with the same name and email address -> - Click "View existing record" in "Duplicate patron record?" dialog. - Patron details - Manage API keys (must have RESTOAuth2ClientCredentials enabled) - Accounting - Transactions - Print fee receipt - Print invoice - Make a payment - Create manual invoice - Create manual credit - Routing lists (must have RoutingSerials enabled) - Circulation history - Notices - Statistics - Files (must have EnableBorrowerFiles enabled) - Purchase suggestions - Discharges (must have useDischarge enabled) - Housebound (must have HouseboundModule enabled) - ILL requests history (must have ILLModule enabled) - Set permissions - Change password - Print summary - Print account balance - Two-factor authentication (must have TwoFactorAuthentication enabled) - Edit patron - Update child to adult patron: - Must have more than one "adult" type category defined - Locate a patron with a "child" type category - Choose More -> Update child to adult patron - Delete patron (confirmation page) - Pending discharge requests - Patrons requesting modifications -- You are receiving this mail because: You are watching all bug changes. --===============0966409559664554458==-- From bugzilla-daemon@bugs.koha-community.org Wed Aug 16 11:16:55 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Wed, 16 Aug 2023 09:16:54 +0000 Message-ID: <bug-33920-70-qCqPFepFvs@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4580149191604539664==" --===============4580149191604539664== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D33920 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |caroline.cyr-la-rose@inlibr | |o.com --- Comment #2 from Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> -= -- OK Patrons home page OK Patron search OK Merge patron records OK Add patron OK Check duplicate patron OK Patron details for XX (YY) OK API keys OK Account for XX (YY) OK Details of debit - Details of credit - It was like this before, but it still says 'Details of debit' even when we click on the details button of a payment for example OK Print receipt for XX (YY) - improved from before! :) - Print invoice - It was like this before, but the invoice also says 'Print receipt' OK Make a payment for XX (YY) OK Collect payment for XX (YY) OK Create manual invoice=20 OK Create manual credit OK Subscription routing lists for XX (YY) OK Circulation history for XX (YY) - improved from before! :) - Holds history for XX (YY) - I think this one is missing a > between the na= me and Patrons OK Sent notices for XX (YY) - Discharge for XX (YY) - There is an extra > between the patron's name and Patrons OK Statistics for XX (YY) OK Files for XX (YY) - One > missing between the patron's name and Patrons OK Purchase suggestions for XX (YY) OK Details for XX (YY) > Housebound OK ILL requests history for XX (YY) OK Set permissions for XX (YY) - Update password for XX (YY) - There is an extra > between the patron's name and Patrons OK Print summary for XX (YY) - improved from before! OK Account summary for XX (YY) OK Two-factor authentication OK Modify patron XX (YY) (ZZ) OK Choose adult category OK Delete patron XX (YY) - improved from before! :) OK Pending discharge requests OK Update patron records --=20 You are receiving this mail because: You are watching all bug changes. --===============4580149191604539664==-- From bugzilla-daemon@bugs.koha-community.org Wed Aug 16 11:18:40 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Wed, 16 Aug 2023 09:18:39 +0000 Message-ID: <bug-33920-70-moOUYij2Iz@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2916578888562645089==" --===============2916578888562645089== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D33920 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #3 from Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> -= -- Hi Owen! I tested this and there are a couple of things that need to be corrected. - Holds history for XX (YY) - I think this one is missing a > between the na= me and Patrons - Discharge for XX (YY) - There is an extra > between the patron's name and Patrons - Update password for XX (YY) - There is an extra > between the patron's name and Patrons Caroline --=20 You are receiving this mail because: You are watching all bug changes. --===============2916578888562645089==-- From bugzilla-daemon@bugs.koha-community.org Wed Aug 16 12:39:01 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Wed, 16 Aug 2023 10:39:00 +0000 Message-ID: <bug-33920-70-6uzBBKQNug@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4268532909451526061==" --===============4268532909451526061== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Failed QA |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. --===============4268532909451526061==-- From bugzilla-daemon@bugs.koha-community.org Wed Aug 16 12:39:11 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Wed, 16 Aug 2023 10:39:07 +0000 Message-ID: <bug-33920-70-jG8UTo8CT4@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1540775504420872093==" --===============1540775504420872093== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #152309|0 |1 is obsolete| | --- Comment #4 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 154460 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=154460&action=edit Bug 33920: Improve translation of title tags: Patrons This patch updates patron module templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following patron-related pages have the correct title tags: - Patrons home page - Patron search -> - Select two patrons -> Merge selected - Add patron -> - Add a patron with the same name and email address -> - Click "View existing record" in "Duplicate patron record?" dialog. - Patron details - Manage API keys (must have RESTOAuth2ClientCredentials enabled) - Accounting - Transactions - Print fee receipt - Print invoice - Make a payment - Create manual invoice - Create manual credit - Routing lists (must have RoutingSerials enabled) - Circulation history - Notices - Statistics - Files (must have EnableBorrowerFiles enabled) - Purchase suggestions - Discharges (must have useDischarge enabled) - Housebound (must have HouseboundModule enabled) - ILL requests history (must have ILLModule enabled) - Set permissions - Change password - Print summary - Print account balance - Two-factor authentication (must have TwoFactorAuthentication enabled) - Edit patron - Update child to adult patron: - Must have more than one "adult" type category defined - Locate a patron with a "child" type category - Choose More -> Update child to adult patron - Delete patron (confirmation page) - Pending discharge requests - Patrons requesting modifications -- You are receiving this mail because: You are watching all bug changes. --===============1540775504420872093==-- From bugzilla-daemon@bugs.koha-community.org Thu Aug 17 12:04:08 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Thu, 17 Aug 2023 10:04:07 +0000 Message-ID: <bug-33920-70-tr54EHV5bH@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2678532441416721344==" --===============2678532441416721344== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes. --===============2678532441416721344==-- From bugzilla-daemon@bugs.koha-community.org Thu Aug 17 12:04:18 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Thu, 17 Aug 2023 10:04:10 +0000 Message-ID: <bug-33920-70-GmmkxUmNfe@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3971859081186055348==" --===============3971859081186055348== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3D33920 Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #154460|0 |1 is obsolete| | --- Comment #5 from Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> -= -- Created attachment 154511 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=3D154511&action= =3Dedit Bug 33920: Improve translation of title tags: Patrons This patch updates patron module templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following patron-related pages have the correct title tags: - Patrons home page - Patron search -> - Select two patrons -> Merge selected - Add patron -> - Add a patron with the same name and email address -> - Click "View existing record" in "Duplicate patron record?" dialog. - Patron details - Manage API keys (must have RESTOAuth2ClientCredentials enabled) - Accounting - Transactions - Print fee receipt - Print invoice - Make a payment - Create manual invoice - Create manual credit - Routing lists (must have RoutingSerials enabled) - Circulation history - Notices - Statistics - Files (must have EnableBorrowerFiles enabled) - Purchase suggestions - Discharges (must have useDischarge enabled) - Housebound (must have HouseboundModule enabled) - ILL requests history (must have ILLModule enabled) - Set permissions - Change password - Print summary - Print account balance - Two-factor authentication (must have TwoFactorAuthentication enabled) - Edit patron - Update child to adult patron: - Must have more than one "adult" type category defined - Locate a patron with a "child" type category - Choose More -> Update child to adult patron - Delete patron (confirmation page) - Pending discharge requests - Patrons requesting modifications Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> --=20 You are receiving this mail because: You are watching all bug changes. --===============3971859081186055348==-- From bugzilla-daemon@bugs.koha-community.org Thu Aug 17 14:28:52 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Thu, 17 Aug 2023 12:28:51 +0000 Message-ID: <bug-33920-70-UHlovc8Ej3@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3580064617641002345==" --===============3580064617641002345== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #154511|0 |1 is obsolete| | --- Comment #6 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 154558 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=154558&action=edit Bug 33920: Improve translation of title tags: Patrons This patch updates patron module templates so that title tags can be more easily translated. To test, apply the patch and confirm that the following patron-related pages have the correct title tags: - Patrons home page - Patron search -> - Select two patrons -> Merge selected - Add patron -> - Add a patron with the same name and email address -> - Click "View existing record" in "Duplicate patron record?" dialog. - Patron details - Manage API keys (must have RESTOAuth2ClientCredentials enabled) - Accounting - Transactions - Print fee receipt - Print invoice - Make a payment - Create manual invoice - Create manual credit - Routing lists (must have RoutingSerials enabled) - Circulation history - Notices - Statistics - Files (must have EnableBorrowerFiles enabled) - Purchase suggestions - Discharges (must have useDischarge enabled) - Housebound (must have HouseboundModule enabled) - ILL requests history (must have ILLModule enabled) - Set permissions - Change password - Print summary - Print account balance - Two-factor authentication (must have TwoFactorAuthentication enabled) - Edit patron - Update child to adult patron: - Must have more than one "adult" type category defined - Locate a patron with a "child" type category - Choose More -> Update child to adult patron - Delete patron (confirmation page) - Pending discharge requests - Patrons requesting modifications Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes. --===============3580064617641002345==-- From bugzilla-daemon@bugs.koha-community.org Thu Aug 17 14:29:25 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Thu, 17 Aug 2023 12:29:24 +0000 Message-ID: <bug-33920-70-8qjiIDSwuY@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8365457857587150647==" --===============8365457857587150647== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA CC| |martin.renvoize@ptfs-europe | |.com --- Comment #7 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Great improvement, well worthwhile! Passing QA -- You are receiving this mail because: You are watching all bug changes. --===============8365457857587150647==-- From bugzilla-daemon@bugs.koha-community.org Tue Aug 29 19:58:51 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Tue, 29 Aug 2023 17:58:02 +0000 Message-ID: <bug-33920-70-SRsUpy5hmI@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2636097871817865327==" --===============2636097871817865327== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Tomás Cohen Arazi <tomascohen@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |23.11.00 released in| | Status|Passed QA |Pushed to master -- You are receiving this mail because: You are watching all bug changes. --===============2636097871817865327==-- From bugzilla-daemon@bugs.koha-community.org Tue Aug 29 19:59:01 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Tue, 29 Aug 2023 17:58:04 +0000 Message-ID: <bug-33920-70-XUW8qMNCXO@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5805601592635904601==" --===============5805601592635904601== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 --- Comment #8 from Tomás Cohen Arazi <tomascohen@gmail.com> --- Pushed to master for 23.11. Nice work everyone, thanks! -- You are receiving this mail because: You are watching all bug changes. --===============5805601592635904601==-- From bugzilla-daemon@bugs.koha-community.org Wed Aug 30 09:12:23 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Wed, 30 Aug 2023 07:12:22 +0000 Message-ID: <bug-33920-70-pnWqM5ubYk@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8132639261545284772==" --===============8132639261545284772== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Fridolin Somers <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fridolin.somers@biblibre.co | |m --- Comment #9 from Fridolin Somers <fridolin.somers@biblibre.com> --- I choose to not backport to stable to avoid too much translation work -- You are receiving this mail because: You are watching all bug changes. --===============8132639261545284772==-- From bugzilla-daemon@bugs.koha-community.org Tue Sep 19 14:19:23 2023 From: bugzilla-daemon@bugs.koha-community.org To: koha-bugs@lists.koha-community.org Subject: [Koha-bugs] [Bug 33920] Improve translation of title tags: Patrons Date: Tue, 19 Sep 2023 12:18:31 +0000 Message-ID: <bug-33920-70-WbDfQMJty1@https.bugs.koha-community.org/bugzilla3/> In-Reply-To: <bug-33920-70@https.bugs.koha-community.org/bugzilla3/> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5958358032593549014==" --===============5958358032593549014== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33920 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Pushed to master |RESOLVED -- You are receiving this mail because: You are watching all bug changes. --===============5958358032593549014==--