Copyright changes

app/views/layouts/menu/_bottom.html.haml

@@ -20,10 +20,6 @@
   %li
     = image_tag 'square.png'
     = link_to t('bottom_menu.developer_api'), t('bottom_menu.developer_api_url')
-  -if pr = Project.find_by_owner_and_name('abf/abf-ideas')
-    %li
-      = image_tag 'square.png'
-      = link_to t('bottom_menu.abf_ideas'), project_issues_url(pr)
   %li
     = image_tag 'square.png'
     = link_to t('bottom_menu.abf_blog'), t('bottom_menu.abf_blog_url')

app/views/layouts/menu/_new_bottom.html.haml

@@ -10,11 +10,4 @@
     %li ·
     %li= link_to t('bottom_menu.tos'), tos_url
     %li ·
-    %li= link_to t('bottom_menu.support'), contact_url
+    %li= link_to t('bottom_menu.support'), contact_url
-    %li ·
-    %li= link_to t('bottom_menu.developer_api'), t('bottom_menu.developer_api_url')
-    - if pr = Project.find_by_owner_and_name('abf/abf-ideas')
-      %li ·
-      %li= link_to t('bottom_menu.abf_ideas'), project_issues_url(pr)
-    %li ·
-    %li= link_to t('bottom_menu.abf_blog'), t('bottom_menu.abf_blog_url')

app/views/pages/tos.html.haml

@@ -10,9 +10,8 @@
   %h1 Terms of Service
 
   %p
-    By using the ABF web site ("Service"), or any services of ROSA CJSC ("ROSA"),
+    By using the ABF web site ("Service"), you are agreeing to be bound by the 
-    you are agreeing to be bound by the following terms and conditions ("Terms
+    following terms and conditions ("Terms of Service"). IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF A COMPANY
-    of Service"). IF YOU ARE ENTERING INTO THIS AGREEMENT ON BEHALF OF A COMPANY
     OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE AUTHORITY TO BIND SUCH
     ENTITY, ITS AFFILIATES AND ALL USERS WHO ACCESS OUR SERVICES THROUGH YOUR
     ACCOUNT TO THESE TERMS AND CONDITIONS, IN WHICH CASE THE TERMS "YOU" OR "YOUR"
@@ -21,7 +20,7 @@
     CONDITIONS, YOU MUST NOT ACCEPT THIS AGREEMENT AND MAY NOT USE THE SERVICES.
 
   %p
-    ROSA reserves the right to update and change the Terms of Service from time
+    Openmandriva reserves the right to update and change the Terms of Service from time
     to time without notice. Any new features that augment or enhance the current
     Service, including the release of new tools and resources, shall be subject
     to the Terms of Service. Continued use of the Service after any such changes
@@ -30,8 +29,8 @@
 
   %p
     Violation of any of the terms below will result in the termination of your
-    Account. While ROSA prohibits such conduct and Content on the Service, you
+    Account. While Openmandriva prohibits such conduct and Content on the Service, you
-    understand and agree that ROSA cannot be responsible for the Content posted
+    understand and agree that Openmandriva cannot be responsible for the Content posted
     on the Service and you nonetheless may be exposed to such materials. You agree
     to use the Service at your own risk.
 
@@ -49,7 +48,7 @@
       It is also possible to register using Google, Facebook or Github account.
     %li
       You are responsible for maintaining the security of your account and password.
-      ROSA cannot and will not be liable for any loss or damage from your
+      Openmandriva cannot and will not be liable for any loss or damage from your
       failure to comply with this security obligation.
     %li
       You are responsible for all Content posted and activity that occurs under your
@@ -75,20 +74,20 @@
       account is canceled. Any content committed by you to repositories of other platforms
       will remain in place until owners of that platforms cancel their accounts.
     %li
-      ROSA has the right to suspend or terminate your account and refuse any and all current
+      Openmandriva has the right to suspend or terminate your account and refuse any and all current
-      or future use of the Service, or any other ROSA service, for one of the following reasons:
+      or future use of the Service, or any other Openmandriva service, for one of the following reasons:
       %ul
         %li
           your bandwidth or server CPU usage significantly exceeds the average bandwidth or
-          server CPU usage (as determined ABF administrators) of other ROSA customers.
+          server CPU usage (as determined ABF administrators) of other Openmandriva customers.
         %li
-          content uploaded by you to ROSA servers violates the laws of one of the countries where
+          content uploaded by you to Openmandriva servers violates the laws of one of the countries where
           the storage servers reside. Currently these countries include Russian Federation,
           Switzerland and Germany. This list can be extended or changed in future;
           if this is the case, we will notify ABF users in our blog in advance.
         %li
           you violate one of the statements from this Terms of Service.
-      If any of these events happens, ROSA representatives will temporary block your account,
+      If any of these events happens, Openmandriva representatives will temporary block your account,
       remove forbidden content and contact you to discuss possible ways to resolve the problematic
       situation. Once the solution is found, your account will be unblocked.
 
@@ -97,14 +96,14 @@
 
   %ol
     %li
-      ROSA reserves the right at any time and from time to time to modify or discontinue,
+      Openmandriva reserves the right at any time and from time to time to modify or discontinue,
       temporarily or permanently, the Service (or any part thereof) with or without notice.
     %li
       Conditions of all Services are subject to change upon 30 days notice from us.
       Such notice may be provided at any time by posting the changes to the Service Site
       (#{ link_to root_url[0..-2], root_url })
     %li
-      ROSA shall not be liable to you or to any third party for any modification, suspension
+      Openmandriva shall not be liable to you or to any third party for any modification, suspension
       or discontinuance of the Service.
 
   %a{name: 'Copyright_and_Ownership'}
@@ -118,28 +117,28 @@
       By setting your repositories to be viewed publicly, you agree to allow others
       to view and fork your repositories.
     %li
-      ROSA does not pre-screen Content, but ROSA and its designee have the right
+      Openmandriva does not pre-screen Content, but Openmandriva and its designee have the right
       (but not the obligation) in their sole discretion to refuse or remove any
       Content that is available via the Service.
     %li
-      You shall defend ROSA against any claim, demand, suit or proceeding made or
+      You shall defend Openmandriva against any claim, demand, suit or proceeding made or
-      brought against ROSA by a third party alleging that Your Content,
+      brought against Openmandriva by a third party alleging that Your Content,
       or Your use of the Service in violation of this Agreement, infringes or
       misappropriates the intellectual property rights of a third party or violates
-      applicable law, and shall indemnify ROSA for any damages finally awarded against,
+      applicable law, and shall indemnify Openmandriva for any damages finally awarded against,
-      and for reasonable attorney’s fees incurred by, ROSA in connection with any such
+      and for reasonable attorney’s fees incurred by, Openmandriva in connection with any such
-      claim, demand, suit or proceeding; provided, that ROSA (a) promptly gives You
+      claim, demand, suit or proceeding; provided, that Openmandriva (a) promptly gives You
       written notice of the claim, demand, suit or proceeding; (b) gives You sole
       control of the defense and settlement of the claim, demand, suit or proceeding
       (provided that You may not settle any claim, demand, suit or proceeding unless
-      the settlement unconditionally releases ROSA of all liability); and (c) provides
+      the settlement unconditionally releases Openmandriva of all liability); and (c) provides
       to You all reasonable assistance, at Your expense.
     %li
       The look and feel of the Service is copyright ©
       = Date.today.year
-      ROSA CJSC. All rights reserved.
+      Openmandriva Association. All rights reserved.
       You may not duplicate, copy, or reuse any portion of the HTML/CSS, Javascript, or
-      visual design elements or concepts without express written permission from ROSA.
+      visual design elements or concepts without express written permission from Openmandriva.
 
   %a{name: 'General_Conditions'}
   %h2 V. General Conditions
@@ -152,7 +151,7 @@
       Technical support is only garanteed for paying account holders and is only available
       via email. Support is available in English and Russian.
     %li
-      You understand that ROSA uses third party vendors and hosting partners to provide
+      You understand that Openmandriva uses third party vendors and hosting partners to provide
       the necessary hardware, software, networking, storage, and related technology
       required to run the Service.
     %li
@@ -162,7 +161,7 @@
       any party’s intellectual property or these Terms of Service.
     %li
       Verbal, physical, written or other abuse (including threats of abuse or retribution)
-      of any ROSA customer, employee, member, or officer will result in immediate account
+      of any Openmandriva customer, employee, member, or officer will result in immediate account
       termination.
     %li
       You understand that the technical processing and transmission of the Service,
@@ -174,17 +173,17 @@
     %li
       You must not transmit any worms or viruses or any code of a destructive nature.
     %li
-      ROSA does not warrant that (i) the service will meet your specific requirements,
+      Openmandriva does not warrant that (i) the service will meet your specific requirements,
       (ii) the service will be uninterrupted, timely, secure, or error-free, (iii) the
       results that may be obtained from the use of the service will be accurate or
       reliable, (iv) the quality of any products, services, information, or other material
       purchased or obtained by you through the service will meet your expectations, and
       (v) any errors in the Service will be corrected.
     %li
-      You expressly understand and agree that ROSA shall not be liable for any direct,
+      You expressly understand and agree that Openmandriva shall not be liable for any direct,
       indirect, incidental, special, consequential or exemplary damages, including but
       not limited to, damages for loss of profits, goodwill, use, data or other
-      intangible losses (even if ROSA has been advised of the possibility of such damages),
+      intangible losses (even if Openmandriva has been advised of the possibility of such damages),
       resulting from: (i) the use or the inability to use the service; (ii) the cost of
       procurement of substitute goods and services resulting from any goods, data,
       information or services purchased or obtained or messages received or transactions
@@ -192,13 +191,13 @@
       of your transmissions or data; (iv) statements or conduct of any third party on the
       service; (v) or any other matter relating to the service.
     %li
-      The failure of ROSA to exercise or enforce any right or provision of the Terms of
+      The failure of Openmandriva to exercise or enforce any right or provision of the Terms of
       Service shall not constitute a waiver of such right or provision. The Terms of
-      Service constitutes the entire agreement between you and ROSA and govern your use of
+      Service constitutes the entire agreement between you and Openmandriva and govern your use of
-      the Service, superseding any prior agreements between you and ROSA (including, but
+      the Service, superseding any prior agreements between you and Openmandriva (including, but
       not limited to, any prior versions of the Terms of Service). You agree that these
       Terms of Service and Your use of the Service are governed under European law.
 
   %p
-    Questions about the Terms of Service should be sent to #{ mail_to 'abf@rosalinux.ru' }
+    Questions about the Terms of Service should be sent to #{ mail_to 'abf@openmandriva.org' }
 

config/locales/menu.en.yml

@@ -11,19 +11,13 @@ en:
     advisories: Advisories
     statistics: Statistics
   bottom_menu:
-    copyright: ROSA Lab © %{year}
+    copyright: OMV © %{year}
     about: About the company
-    about_url: http://www.rosalab.com/about
+    about_url: https://www.openmandriva.org/About?lang=en
     contacts: Contacts
-    contacts_url: http://www.rosalab.com/about/contacts
+    contacts_url: https://www.openmandriva.org/Join-contribute?lang=en
     tos: Terms Of Service
-    tos_url: http://www.rosalab.com/about
     support: Support
-    developer_api: Developer API
-    developer_api_url: http://abf-doc.rosalinux.ru
-    abf_blog: ABF Blog
-    abf_blog_url: http://abf-blog.rosalinux.ru
-    abf_ideas: ABF Ideas
   project_menu:
     project: Project
     files: Files

config/locales/menu.ru.yml

@@ -11,19 +11,13 @@ ru:
     advisories: Бюллетени
     statistics: Статистика
   bottom_menu:
-    copyright: ROSA Лаб. © %{year}
+    copyright: OMV © %{year}
     about: О компании
-    about_url: http://www.rosalab.ru/about
+    about_url: https://www.openmandriva.org/About?lang=ru
     contacts: Контакты
-    contacts_url: http://www.rosalab.ru/about/contacts
+    contacts_url: https://www.openmandriva.org/Join-contribute?lang=ru
     tos: Условия использования
-    tos_url: http://www.rosalab.ru/about
     support: Служба поддержки
-    developer_api: API для разработчиков
-    developer_api_url: http://abf-doc.rosalinux.ru
-    abf_blog: Блог ABF
-    abf_blog_url: http://abf-blog.rosalinux.ru
-    abf_ideas: Идеи для ABF
   project_menu:
     project: Проект
     files: Файлы