From cb1151483dd7f3a91fd124a63f0cbc3ef8a32ff1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 26 Sep 2016 15:20:40 +0200
Subject: [PATCH] update translations

---
 Habitica/res/values-de/strings.xml | 3 +++
 Habitica/res/values-nl/strings.xml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 4e213fcdf..b3f0923bf 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -375,7 +375,10 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
   <string name="action_continue">Weiter</string>
   <string name="scan_qr_code">QR Code scannen</string>
+<<<<<<< 45c1ce8a90369471b2d685bf53545c890e2cfa1f
   <string name="enter_recipient_uuid">ID des Empfängers eingeben</string>
+=======
+>>>>>>> update translations
   <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
   <string name="stats_widget_label">Habitica: Avatar</string>
   <string name="add_task">Neue Aufgabe</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 9c3f2eabf..da25eec84 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -30,7 +30,6 @@
   <string name="preference_push_gifted_gems">Edelstenen geschonken</string>
   <string name="preference_push_gifted_subscription">Abonnement geschonken</string>
   <string name="preference_push_invited_to_party">Uitgenodigd voor groep</string>
-  <string name="preference_push_invited_to_guild">Uitgenodigd voor gilde</string>
   <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
   <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
   <!--Adding tasks-->