Uploaded image for project: 'Sakai'
  1. Sakai
  2. SAK-40707

Fix merge conflicts in properties files

    Details

    • 12 status:
      Please Merge
    • Test Plan:
      Hide

      Please add a Test Plan here.

      Show
      Please add a Test Plan here.

      Description

      https://github.com/sakaiproject/sakai/blob/master/portal/portal-impl/impl/src/bundle/sitenav_pt_BR.properties

      sit_search=Buscar sites na lista
      sit_search_cancel=Cancelar Busca
      <<<<<<< .mine
      sit_search_none=Nenhum resultado de busca encontrado
      =======
      sit_search_none=Nenhum resultado
      >>>>>>> .r1805
      sit_drawer=Sites dispon\u00edveis
      sit_othersitesclose=Fechar

       

      https://github.com/sakaiproject/sakai/blob/master/admin-su/src/bundle/tool-tool-su_pt_BR.properties

      userinfoheader	=	Informa\u00e7\u00f5es do Usu\u00e1rio
      view_user_info_button	=	Visualizar as informa\u00e7\u00f5es do usu\u00e1rio
      <<<<<<< .mine
      become_user_button	=	Tornar-se outro Usu\u00e1rio
      =======
      become_user_button	=	Tornar-se o usu\u00e1rio
      >>>>>>> .r1836
      return_to_portal	=	Voltar para a p\u00e1gina principal
      no_such_user	=	Conta de usu\u00e1rio n\u00e3o existe

       

      https://github.com/sakaiproject/sakai/blob/12.x/tool/tool-tool/su/src/bundle/tool-tool-su_pt_BR.properties

      userinfoheader	=	Informa\u00e7\u00f5es do Usu\u00e1rio
      view_user_info_button	=	Visualizar as informa\u00e7\u00f5es do usu\u00e1rio
      <<<<<<< .mine
      become_user_button	=	Tornar-se outro Usu\u00e1rio
      =======
      become_user_button	=	Tornar-se o usu\u00e1rio
      >>>>>>> .r1836
      return_to_portal	=	Voltar para a p\u00e1gina principal
      no_such_user	=	Conta de usu\u00e1rio n\u00e3o existe

        Gliffy Diagrams

          Attachments

            Activity

              People

              • Assignee:
                farreri Miguel Pellicer
                Reporter:
                austinUH Austin
              • Votes:
                0 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Git Source Code