From 38a3f078b18c93ad24fb0fb7adecf636e6cc418b Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 20 Mar 2013 11:45:02 +0100
Subject: [PATCH] Portuguese translation update

Thanks, Manuel!
---
 lang-pt.js |   8 ++++++++
 locale.js  | Bin 13334 -> 13334 bytes
 2 files changed, 8 insertions(+)

diff --git a/lang-pt.js b/lang-pt.js
index 9b3d373d..656cbc51 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 59af784968d053dd9c189fe4f722ca5efd497cd6..fd83d2cda5eac3b98abc32f8106940c8159512c4 100644
GIT binary patch
delta 20
ccmbQ1F)d?5oyOz<Ew0H^R4g_h&<NuO09v>Q=>Px#

delta 22
ecmbQ1F)d?5oyO!Y6&^<8$q(gBHy_Xl;|2g~w+NR2