Download as
Browse Code »

Commit e6f846c0e88522bc055ca8b53ca5136a016a14a3

Authored by Joenio Costa
Committed by Antonio Terceiro
1 parent 19a6d1af
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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,13 +12,8 @@
12 msgid "" 12 msgid ""
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.13.0\n" 14 "Project-Id-Version: noosfero 0.13.0\n"
15 -<<<<<<< HEAD:po/pt_BR/noosfero.po  
16 "POT-Creation-Date: 2009-01-30 15:19-0300\n" 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 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
23 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
24 "MIME-Version: 1.0\n" 19 "MIME-Version: 1.0\n"