2 files changed, 8 insertions, 0 deletions
diff --git a/lang-pt.js b/lang-pt.js
index 9b3d373..656cbc5 100644
--- a/lang-pt.js
+++ b/lang-pt.js
@@ -185,7 +185,11 @@ SnapTranslator.dict.pt = {
     'translator_e-mail':
         'mmsequeira@gmail.com',
     'last_changed':
+<<<<<<< HEAD
         '2013-03-19',
+=======
+        '2013-03-20',
+>>>>>>> Portuguese translation update
 
     // GUI
     // control bar:
@@ -287,7 +291,11 @@ SnapTranslator.dict.pt = {
 
     // movimento:
     'Stage selected:\nno motion primitives':
+<<<<<<< HEAD
         'Palco seleccionado:\sem primitivas de movimento',
+=======
+        'Palco seleccionado:\nsem primitivas de movimento',
+>>>>>>> Portuguese translation update
 
 
     'move %n steps':
diff --git a/locale.js b/locale.js
index 59af784..fd83d2c 100644
--- a/locale.js
+++ b/locale.js