Download as
Browse Code »

Commit e6f846c0e88522bc055ca8b53ca5136a016a14a3

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 19a6d1af
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem918: oops: po/pt_BR/noosfero.po unmerged!

Showing 1 changed file with 1 additions and 6 deletions   Show diff stats
po/pt_BR/noosfero.po
  Diff comments   View file @e6f846c
... ... @@ -12,13 +12,8 @@
12 12 msgid ""
13 13 msgstr ""
14 14 "Project-Id-Version: noosfero 0.13.0\n"
15   -<<<<<<< HEAD:po/pt_BR/noosfero.po
16 15 "POT-Creation-Date: 2009-01-30 15:19-0300\n"
17   -"PO-Revision-Date: 2009-02-03 18:38-0300\n"
18   -=======
19   -"POT-Creation-Date: 2009-01-06 16:46-0300\n"
20   -"PO-Revision-Date: 2009-01-28 18:24-0300\n"
21   ->>>>>>> ActionItem897-novo:po/pt_BR/noosfero.po
  16 +"PO-Revision-Date: 2009-02-06 09:57-0300\n"
22 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
23 18 "Language-Team: LANGUAGE <LL@li.org>\n"
24 19 "MIME-Version: 1.0\n"
... ...