From cafb4d62f4cc135c19e2428a44678a511e1eacbe Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 9 Nov 2012 02:43:22 -0500
Subject: [PATCH 1/6] a little bit of phpdoc

---
 boot.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/boot.php b/boot.php
index 4bdf25d410..661ebf779c 100644
--- a/boot.php
+++ b/boot.php
@@ -989,6 +989,13 @@ if(! function_exists('remote_user')) {
 // a page is loaded. Usually used for errors or alerts.
 
 if(! function_exists('notice')) {
+	/**
+	 * Show an error message to user.
+	 * 
+	 * This function save text in session, to be shown to the user at next page load
+	 * 
+	 * @param string $s - Text of notice
+	 */
 	function notice($s) {
 		$a = get_app();
 		if(! x($_SESSION,'sysmsg'))	$_SESSION['sysmsg'] = array();
@@ -997,6 +1004,13 @@ if(! function_exists('notice')) {
 	}
 }
 if(! function_exists('info')) {
+	/**
+	 * Show an info message to user.
+	 * 
+	 * This function save text in session, to be shown to the user at next page load
+	 * 
+	 * @param string $s - Text of notice
+	 */
 	function info($s) {
 		$a = get_app();
 		if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();

From 1bc9f8b9924e484f9d47cd18bc52153a1658a4c4 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 9 Nov 2012 03:56:45 -0500
Subject: [PATCH 2/6] help: load Home.md in aside when not in home,add new
 markdown syntax New markdown block "warning"

    ! line1
    ! line2

will be rendered as

   <div class="md_warning"><p>line1</p><p>line2</p></div>
---
 mod/help.php | 104 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 79 insertions(+), 25 deletions(-)

diff --git a/mod/help.php b/mod/help.php
index af05bd47c0..44edbf9318 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,47 +1,101 @@
 <?php
+define( 'MARKDOWN_PARSER_CLASS',  'ExtendedMarkdown' );
+require_once('library/markdown.php');
 
-if(! function_exists('load_doc_file')) {
-function load_doc_file($s) {
-	global $lang;
-	if(! isset($lang))
-		$lang = 'en';
-	$b = basename($s);
-	$d = dirname($s);
-	if(file_exists("$d/$lang/$b"))
-		return file_get_contents("$d/$lang/$b");
-	if(file_exists($s))
-		return file_get_contents($s);
-	return '';
-}}
+class ExtendedMarkdown extends MarkdownExtra_Parser {
 
+	function ExtendedMarkdown() {
+		$this->block_gamut += array(
+			"doBlockWarning" => 45,
+		);
+		parent::MarkdownExtra_Parser();
+	}
 
+	function doBlockWarning($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*![ ]?				# "!" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm', array(&$this, '_doBlockWarning_callback'), $text);
+
+		return $text;
+	}
+
+	function _doBlockWarning_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*![ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);  # recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content, 
+		# so we need to fix that:
+//		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', array(&$this, '__doBlockWarning_callback2'), $bq);
+
+		return "\n" . $this->hashBlock("<div class='md_warning'>\n$bq\n</div>") . "\n\n";
+	}
+
+	function _doBlockWarning_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+}
+
+if (!function_exists('load_doc_file')) {
+
+	function load_doc_file($s) {
+		global $lang;
+		if (!isset($lang))
+			$lang = 'en';
+		$b = basename($s);
+		$d = dirname($s);
+		if (file_exists("$d/$lang/$b"))
+			return file_get_contents("$d/$lang/$b");
+		if (file_exists($s))
+			return file_get_contents($s);
+		return '';
+	}
+
+}
 
 function help_content(&$a) {
+	
+	
 	nav_set_selected('help');
 
 	global $lang;
 
-	require_once('library/markdown.php');
-
 	$text = '';
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$text = load_doc_file('doc/' . $a->argv[1] . '.md');
-		$a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1]));
+		$a->page['title'] = t('Help:') . ' ' . str_replace('-', ' ', notags($a->argv[1]));
 	}
-	if(! $text) {
-		$text = load_doc_file('doc/Home.md');
+	$home = load_doc_file('doc/Home.md');
+	if (!$text) {
+		$text = $home;
 		$a->page['title'] = t('Help');
+	} else {
+		$a->page['aside'] = Markdown($home);
 	}
-	
-	if(! strlen($text)) {
+
+	if (!strlen($text)) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
 		$tpl = get_markup_template("404.tpl");
 		return replace_macros($tpl, array(
-			'$message' =>  t('Page not found.' )
-		));
+					'$message' => t('Page not found.')
+				));
 	}
 	
-	return Markdown($text);
-
+	$html = Markdown($text);
+	$html = "<style>.md_warning { padding: 1em; border: #ff0000 solid 2px; background-color: #f9a3a3; color: #ffffff;</style>".$html;
+	return $html;
+		
 }

From 5541f396d8cee099ab5599de536568f8a93f9975 Mon Sep 17 00:00:00 2001
From: Fabrixxm <fabrix.xm@gmail.com>
Date: Fri, 9 Nov 2012 04:00:15 -0500
Subject: [PATCH 3/6] doc: add "Move account" basic documentation

---
 doc/Account-Basics.md |  2 ++
 doc/Home.md           |  1 +
 doc/Move-Account.md   | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 doc/Move-Account.md

diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md
index 41ca95b360..2c3c05e8bf 100644
--- a/doc/Account-Basics.md
+++ b/doc/Account-Basics.md
@@ -73,5 +73,7 @@ You can export a copy of your personal data in XML format from the "Export perso
 
 * [Groups and Privacy](help/Groups-and-Privacy)
 
+* [Move Account](help/Move-Account)
+
 * [Remove Account](help/Remove-Account)
 
diff --git a/doc/Home.md b/doc/Home.md
index 1df74b5f26..7c86ce805a 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -14,6 +14,7 @@ Friendica Documentation and Resources
 * [Groups and Privacy](help/Groups-and-Privacy)
 * [Tags and Mentions](help/Tags-and-Mentions)
 * [Pages](help/Pages)
+* [Move Account](help/Move-Account)
 * [Remove Account](help/Remove-Account)
 * [Bugs and Issues](help/Bugs-and-Issues)
 
diff --git a/doc/Move-Account.md b/doc/Move-Account.md
new file mode 100644
index 0000000000..cb20f99b42
--- /dev/null
+++ b/doc/Move-Account.md
@@ -0,0 +1,33 @@
+Move Account
+============
+
+* [Home](help)
+
+
+! **this is an experimental feature**
+
+** How to move an account between servers **
+
+Go to "Settings" -> "[Export personal data](uexport)"
+Click on "Export account" to save your account data.
+This file contains your details, your contacts, groups, and personal settings.
+It contains also your secret keys to authenticate yourself to your contacts:
+**save this file in a secure place**!
+
+Go to your new server, and open *http://newserver.com/uimport* (there is not a 
+direct link to this page at the moment).
+
+Load your saved account file and click "Import".
+
+Friendica will recreate your account on new server, with your contacts and groups.
+A message is sent to Friendica contacts, to inform them about your move: if your
+contacts are runnning on an updated server, automatically your details on their
+side will be updated.
+Contacts on Statusnet/Identi.ca or Diaspora will be archived, as we can't inform
+them about your move.
+You should ask them to remove your contact from their lists and readd you, and you
+should do the same with their contact.
+
+After the move, the account on the old server will not work reliably anymore, and
+should be not used.
+

From 85feaa1a8d65ce0ae8eabe39e7edcb463e3f906d Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 10 Nov 2012 08:36:43 +0100
Subject: [PATCH 4/6] PL: update to the strings

---
 view/pl/messages.po | 354 +++++++++++++++++++++++++++-----------------
 view/pl/strings.php |  68 ++++++---
 2 files changed, 261 insertions(+), 161 deletions(-)

diff --git a/view/pl/messages.po b/view/pl/messages.po
index ab0dd274c9..fc990cf6dd 100644
--- a/view/pl/messages.po
+++ b/view/pl/messages.po
@@ -8,6 +8,7 @@
 #   <czarnystokrotek@mailoo.org>, 2012.
 #   <d.exax@hotmail.com>, 2012.
 #   <hubertkoscianski@op.pl>, 2012.
+#   <jakub.hag96@gmail.com>, 2012.
 #   <jawiadomokto@o2.pl>, 2012.
 #   <johnnywiertara@gmail.com>, 2012.
 #   <karolinaa9506@gmail.com>, 2012.
@@ -21,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-05 10:00-0800\n"
-"PO-Revision-Date: 2012-11-07 19:36+0000\n"
-"Last-Translator: Lea1995polish <m.dauter@tlen.pl>\n"
+"POT-Creation-Date: 2012-11-08 10:00-0800\n"
+"PO-Revision-Date: 2012-11-09 20:57+0000\n"
+"Last-Translator: karolina.walkowiak <karolinaa9506@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +57,7 @@ msgstr "Nie udało się zaktualizować kontaktu."
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
@@ -73,7 +74,7 @@ msgstr "Nie udało się zaktualizować kontaktu."
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -301,7 +302,7 @@ msgid "link to source"
 msgstr "link do źródła"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1701
+#: ../../include/nav.php:52 ../../boot.php:1711
 msgid "Events"
 msgstr "Wydarzenia"
 
@@ -359,7 +360,7 @@ msgstr "Opis:"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1237
+#: ../../boot.php:1241
 msgid "Location:"
 msgstr "Lokalizacja"
 
@@ -427,7 +428,7 @@ msgstr ""
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/settings.php:967 ../../mod/register.php:237
 #: ../../mod/profiles.php:574
 msgid "Yes"
 msgstr "Tak"
@@ -439,12 +440,12 @@ msgstr "Tak"
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/settings.php:967 ../../mod/register.php:238
 #: ../../mod/profiles.php:575
 msgid "No"
 msgstr "Nie"
 
-#: ../../mod/photos.php:50 ../../boot.php:1694
+#: ../../mod/photos.php:50 ../../boot.php:1704
 msgid "Photo Albums"
 msgstr "Albumy zdjęć"
 
@@ -672,7 +673,7 @@ msgid "This is you"
 msgstr "To jesteś ty"
 
 #: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585
+#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
 #: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Komentarz"
@@ -964,7 +965,7 @@ msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
 msgid "[Name Withheld]"
 msgstr "[Nazwa wstrzymana]"
 
@@ -1036,6 +1037,65 @@ msgstr "Twój zidentyfikowany adres:"
 msgid "Submit Request"
 msgstr "Wyślij zgłoszenie"
 
+#: ../../mod/uexport.php:10 ../../mod/settings.php:30
+#: ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Ustawienia konta"
+
+#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Wyświetl ustawienia"
+
+#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr ""
+
+#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Ustawienia wtyczek"
+
+#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Eksportuje dane personalne"
+
+#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Usuń konto"
+
+#: ../../mod/uexport.php:49 ../../mod/settings.php:69
+#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: ../../mod/uexport.php:73
+msgid "Export account"
+msgstr ""
+
+#: ../../mod/uexport.php:73
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
+msgstr ""
+
+#: ../../mod/uexport.php:74
+msgid "Export all"
+msgstr ""
+
+#: ../../mod/uexport.php:74
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
+msgstr ""
+
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""
@@ -1357,7 +1417,7 @@ msgid "is interested in:"
 msgstr "interesuje się:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1175
+#: ../../include/contact_widgets.php:9 ../../boot.php:1179
 msgid "Connect"
 msgstr "Połącz"
 
@@ -1406,7 +1466,7 @@ msgstr "%s od %s"
 
 #: ../../mod/content.php:480 ../../include/conversation.php:622
 msgid "View in context"
-msgstr ""
+msgstr "Zobacz w kontekście"
 
 #: ../../mod/content.php:586 ../../object/Item.php:277
 #, php-format
@@ -1426,7 +1486,7 @@ msgstr[2] "komentarz"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:586
+#: ../../include/contact_widgets.php:195 ../../boot.php:590
 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -2027,13 +2087,13 @@ msgid "Password reset requested at %s"
 msgstr "Prośba o reset hasła na %s"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
-#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
+#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2047,7 +2107,7 @@ msgid ""
 "Password reset failed."
 msgstr "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:936
+#: ../../mod/lostpass.php:83 ../../boot.php:940
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
@@ -2091,43 +2151,6 @@ msgstr "Pseudonim lub Email:"
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Ustawienia konta"
-
-#: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr "Wyświetl ustawienia"
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr "Ustawienia wtyczek"
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr ""
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr "Eksportuje dane personalne"
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr "Usuń konto"
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
-#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr "Brakuje ważnych danych!"
@@ -2434,7 +2457,7 @@ msgstr ""
 
 #: ../../mod/settings.php:898
 msgid "Publish your default profile in the global social directory?"
-msgstr ""
+msgstr "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?"
 
 #: ../../mod/settings.php:906
 msgid "Hide your contact/friend list from viewers of your default profile?"
@@ -2739,7 +2762,7 @@ msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
 msgid "Invalid contact."
 msgstr "Zły kontakt"
 
-#: ../../mod/notes.php:44 ../../boot.php:1708
+#: ../../mod/notes.php:44 ../../boot.php:1718
 msgid "Personal Notes"
 msgstr "Osobiste notatki"
 
@@ -2757,6 +2780,31 @@ msgstr "Osobiste notatki"
 msgid "Save"
 msgstr "Zapisz"
 
+#: ../../mod/uimport.php:41
+msgid "Import"
+msgstr ""
+
+#: ../../mod/uimport.php:43
+msgid "Move account"
+msgstr ""
+
+#: ../../mod/uimport.php:44
+msgid ""
+"You can move here an account from another Friendica server. <br>\r\n"
+"                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n"
+"                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
+msgstr ""
+
+#: ../../mod/uimport.php:47
+msgid "Account file"
+msgstr ""
+
+#: ../../mod/uimport.php:47
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr ""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -2871,7 +2919,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1684
+#: ../../boot.php:1694
 msgid "Profile"
 msgstr "Profil"
 
@@ -3098,91 +3146,91 @@ msgstr "brak kontaktów"
 msgid "View Contacts"
 msgstr "widok kontaktów"
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Szczegóły rejestracji dla %s"
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila."
 
-#: ../../mod/register.php:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
-msgstr ""
+msgstr "Nie udało się wysłać wiadomości e-mail. Wysyłanie nie powiodło się."
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr "Twoja rejestracja nie może zostać przeprowadzona. "
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr "Prośba o rejestrację u %s"
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."
 
-#: ../../mod/register.php:189
+#: ../../mod/register.php:190
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów."
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr "Twój OpenID (opcjonalnie):"
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Czy dołączyć twój profil do katalogu członków?"
 
-#: ../../mod/register.php:255
+#: ../../mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu."
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
-msgstr ""
+msgstr "Twoje zaproszenia ID:"
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Rejestracja"
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Imię i nazwisko (np. Jan Kowalski):"
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Twój adres email:"
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wybierz login. Login musi zaczynać się literą. Adres twojego profilu na tej stronie będzie wyglądać następująco '<strong>login@$nazwastrony</strong>'."
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr "Wybierz pseudonim:"
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
 msgid "Register"
 msgstr "Zarejestruj"
 
@@ -3230,7 +3278,7 @@ msgstr "%1$s nie lubi %2$s's %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3780
+#: ../../mod/display.php:169 ../../include/items.php:3837
 msgid "Item not found."
 msgstr "Element nie znaleziony."
 
@@ -3239,7 +3287,7 @@ msgid "Access denied."
 msgstr "Brak dostępu"
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1691
+#: ../../include/nav.php:51 ../../boot.php:1701
 msgid "Photos"
 msgstr "Zdjęcia"
 
@@ -3511,7 +3559,7 @@ msgstr "Polecane wtyczki"
 
 #: ../../mod/admin.php:123
 msgid "User registrations waiting for confirmation"
-msgstr ""
+msgstr "Rejestracje użytkownika czekają na potwierdzenie."
 
 #: ../../mod/admin.php:183 ../../mod/admin.php:669
 msgid "Normal Account"
@@ -3557,7 +3605,7 @@ msgstr "Zarejestrowani użytkownicy"
 
 #: ../../mod/admin.php:217
 msgid "Pending registrations"
-msgstr ""
+msgstr "Rejestracje w toku."
 
 #: ../../mod/admin.php:218
 msgid "Version"
@@ -3573,11 +3621,11 @@ msgstr "Ustawienia strony zaktualizowane"
 
 #: ../../mod/admin.php:428
 msgid "Closed"
-msgstr ""
+msgstr "Zamknięty"
 
 #: ../../mod/admin.php:429
 msgid "Requires approval"
-msgstr ""
+msgstr "Wymagane zatwierdzenie."
 
 #: ../../mod/admin.php:430
 msgid "Open"
@@ -3700,7 +3748,7 @@ msgstr ""
 
 #: ../../mod/admin.php:464
 msgid "Allowed friend domains"
-msgstr ""
+msgstr "Dozwolone domeny przyjaciół"
 
 #: ../../mod/admin.php:464
 msgid ""
@@ -4120,7 +4168,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr "FTP Hasło"
 
-#: ../../mod/profile.php:21 ../../boot.php:1085
+#: ../../mod/profile.php:21 ../../boot.php:1089
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny"
 
@@ -4521,23 +4569,23 @@ msgstr "Wiek: "
 msgid "Edit/Manage Profiles"
 msgstr "Edytuj/Zarządzaj Profilami"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1203
+#: ../../mod/profiles.php:689 ../../boot.php:1207
 msgid "Change profile photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1204
+#: ../../mod/profiles.php:690 ../../boot.php:1208
 msgid "Create New Profile"
 msgstr "Stwórz nowy profil"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1214
+#: ../../mod/profiles.php:701 ../../boot.php:1218
 msgid "Profile Image"
 msgstr "Obraz profilowy"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1217
+#: ../../mod/profiles.php:703 ../../boot.php:1221
 msgid "visible to everybody"
 msgstr "widoczne dla wszystkich"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1218
+#: ../../mod/profiles.php:704 ../../boot.php:1222
 msgid "Edit visibility"
 msgstr "Edytuj widoczność"
 
@@ -4666,17 +4714,17 @@ msgid "Gender: "
 msgstr "Płeć: "
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1239
+#: ../../boot.php:1243
 msgid "Gender:"
 msgstr "Płeć:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1242
+#: ../../boot.php:1246
 msgid "Status:"
 msgstr "Status"
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1244
+#: ../../boot.php:1248
 msgid "Homepage:"
 msgstr "Strona główna:"
 
@@ -4802,7 +4850,7 @@ msgstr "Tymczasowo uszkodzone. Proszę poczekać i spróbować później."
 
 #: ../../mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
-msgstr ""
+msgstr "Nieudane lub unieważnione wprowadzenie."
 
 #: ../../mod/dfrn_confirm.php:420
 msgid "Unable to set contact photo."
@@ -4821,7 +4869,7 @@ msgstr "Nie znaleziono użytkownika dla '%s'"
 
 #: ../../mod/dfrn_confirm.php:572
 msgid "Our site encryption key is apparently messed up."
-msgstr ""
+msgstr "Klucz kodujący jest najwyraźniej zepsuty"
 
 #: ../../mod/dfrn_confirm.php:583
 msgid "Empty site URL was provided or URL could not be decrypted by us."
@@ -4844,11 +4892,11 @@ msgstr ""
 
 #: ../../mod/dfrn_confirm.php:649
 msgid "Unable to set your contact credentials on our system."
-msgstr ""
+msgstr "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie"
 
 #: ../../mod/dfrn_confirm.php:716
 msgid "Unable to update your contact profile details on our system"
-msgstr ""
+msgstr "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie"
 
 #: ../../mod/dfrn_confirm.php:750
 #, php-format
@@ -5549,7 +5597,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../include/nav.php:64 ../../boot.php:927
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6158,7 +6206,7 @@ msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:724
+#: ../../include/enotify.php:28 ../../include/notifier.php:774
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -7082,7 +7130,7 @@ msgstr "Podgląd źródła"
 #: ../../addon/statusnet/statusnet.php:134
 #: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
-msgstr ""
+msgstr "Opublikuj status"
 
 #: ../../addon/statusnet/statusnet.php:176
 #: ../../addon.old/statusnet/statusnet.php:176
@@ -7831,7 +7879,7 @@ msgstr "Telewizja:"
 
 #: ../../include/profile_advanced.php:75
 msgid "Film/dance/culture/entertainment:"
-msgstr ""
+msgstr "Film/taniec/kultura/rozrywka"
 
 #: ../../include/profile_advanced.php:77
 msgid "Love/Romance:"
@@ -8146,7 +8194,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr "Wykończenia:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:717
+#: ../../include/delivery.php:457 ../../include/notifier.php:767
 msgid "(no subject)"
 msgstr "(bez tematu)"
 
@@ -8414,6 +8462,38 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr ""
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr ""
+
+#: ../../include/uimport.php:92
+msgid "User creation error"
+msgstr ""
+
+#: ../../include/uimport.php:110
+msgid "User profile creation error"
+msgstr ""
+
+#: ../../include/uimport.php:155
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../../include/uimport.php:233
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8445,7 +8525,7 @@ msgstr "Stwórz nową grupę"
 msgid "Contacts not in any group"
 msgstr "Kontakt nie jest w żadnej grupie"
 
-#: ../../include/nav.php:46 ../../boot.php:922
+#: ../../include/nav.php:46 ../../boot.php:926
 msgid "Logout"
 msgstr "Wyloguj się"
 
@@ -8453,7 +8533,7 @@ msgstr "Wyloguj się"
 msgid "End this session"
 msgstr "Zakończ sesję"
 
-#: ../../include/nav.php:49 ../../boot.php:1677
+#: ../../include/nav.php:49 ../../boot.php:1687
 msgid "Status"
 msgstr "Status"
 
@@ -8533,11 +8613,11 @@ msgstr "Zarządzaj"
 msgid "Manage other pages"
 msgstr "Zarządzaj innymi stronami"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Manage/edit profiles"
 msgstr "Zarządzaj profilami"
 
@@ -8629,7 +8709,7 @@ msgstr ""
 
 #: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Różny"
 
 #: ../../include/datetime.php:153 ../../include/datetime.php:285
 msgid "year"
@@ -8964,15 +9044,15 @@ msgstr "Nie można otrzymać informacji kontaktowych"
 msgid "following"
 msgstr "następujący"
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3981
+#: ../../include/items.php:4038
 msgid "Archives"
 msgstr "Archiwum"
 
@@ -9210,101 +9290,101 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:584
+#: ../../boot.php:588
 msgid "Delete this item?"
 msgstr "Usunąć ten element?"
 
-#: ../../boot.php:587
+#: ../../boot.php:591
 msgid "show fewer"
 msgstr "Pokaż mniej"
 
-#: ../../boot.php:794
+#: ../../boot.php:798
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:796
+#: ../../boot.php:800
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:897
+#: ../../boot.php:901
 msgid "Create a New Account"
 msgstr "Załóż nowe konto"
 
-#: ../../boot.php:925
+#: ../../boot.php:929
 msgid "Nickname or Email address: "
 msgstr "Nick lub adres email:"
 
-#: ../../boot.php:926
+#: ../../boot.php:930
 msgid "Password: "
 msgstr "Hasło:"
 
-#: ../../boot.php:929
+#: ../../boot.php:933
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:935
+#: ../../boot.php:939
 msgid "Forgot your password?"
 msgstr "Zapomniałeś swojego hasła?"
 
-#: ../../boot.php:1046
+#: ../../boot.php:1050
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1127
 msgid "Edit profile"
 msgstr "Edytuj profil"
 
-#: ../../boot.php:1189
+#: ../../boot.php:1193
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1315 ../../boot.php:1401
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1312 ../../boot.php:1398
+#: ../../boot.php:1316 ../../boot.php:1402
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1357 ../../boot.php:1438
+#: ../../boot.php:1361 ../../boot.php:1442
 msgid "[today]"
 msgstr "[dziś]"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1373
 msgid "Birthday Reminders"
 msgstr "Przypomnienia o urodzinach"
 
-#: ../../boot.php:1370
+#: ../../boot.php:1374
 msgid "Birthdays this week:"
 msgstr "Urodziny w tym tygodniu:"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1435
 msgid "[No description]"
 msgstr "[Brak opisu]"
 
-#: ../../boot.php:1449
+#: ../../boot.php:1453
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1450
+#: ../../boot.php:1454
 msgid "Events this week:"
 msgstr "Wydarzenia w tym tygodniu:"
 
-#: ../../boot.php:1680
+#: ../../boot.php:1690
 msgid "Status Messages and Posts"
 msgstr "Status wiadomości i postów"
 
-#: ../../boot.php:1687
+#: ../../boot.php:1697
 msgid "Profile Details"
 msgstr "Szczegóły profilu"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1714
 msgid "Events and Calendar"
 msgstr "Wydarzenia i kalendarz"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1721
 msgid "Only You Can See This"
 msgstr ""
 
diff --git a/view/pl/strings.php b/view/pl/strings.php
index d4fda9847b..d4f287c32b 100644
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@@ -199,6 +199,18 @@ $a->strings["Diaspora"] = "";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = "";
 $a->strings["Your Identity Address:"] = "Twój zidentyfikowany adres:";
 $a->strings["Submit Request"] = "Wyślij zgłoszenie";
+$a->strings["Account settings"] = "Ustawienia konta";
+$a->strings["Display settings"] = "Wyświetl ustawienia";
+$a->strings["Connector settings"] = "";
+$a->strings["Plugin settings"] = "Ustawienia wtyczek";
+$a->strings["Connected apps"] = "";
+$a->strings["Export personal data"] = "Eksportuje dane personalne";
+$a->strings["Remove account"] = "Usuń konto";
+$a->strings["Settings"] = "Ustawienia";
+$a->strings["Export account"] = "";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "";
+$a->strings["Export all"] = "";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "";
 $a->strings["Friendica Social Communications Server - Setup"] = "";
 $a->strings["Could not connect to database."] = "Nie można nawiązać połączenia z bazą danych";
 $a->strings["Could not create table."] = "";
@@ -278,7 +290,7 @@ $a->strings["Group: "] = "Grupa:";
 $a->strings["Select"] = "Wybierz";
 $a->strings["View %s's profile @ %s"] = "Pokaż %s's profil @ %s";
 $a->strings["%s from %s"] = "%s od %s";
-$a->strings["View in context"] = "";
+$a->strings["View in context"] = "Zobacz w kontekście";
 $a->strings["%d comment"] = array(
 	0 => " %d komentarz",
 	1 => " %d komentarzy",
@@ -445,14 +457,6 @@ $a->strings["Forgot your Password?"] = "Zapomniałeś hasła?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Wpisz swój adres email i wyślij, aby zresetować hasło. Później sprawdź swojego emaila w celu uzyskania dalszych instrukcji.";
 $a->strings["Nickname or Email: "] = "Pseudonim lub Email:";
 $a->strings["Reset"] = "Zresetuj";
-$a->strings["Account settings"] = "Ustawienia konta";
-$a->strings["Display settings"] = "Wyświetl ustawienia";
-$a->strings["Connector settings"] = "";
-$a->strings["Plugin settings"] = "Ustawienia wtyczek";
-$a->strings["Connected apps"] = "";
-$a->strings["Export personal data"] = "Eksportuje dane personalne";
-$a->strings["Remove account"] = "Usuń konto";
-$a->strings["Settings"] = "Ustawienia";
 $a->strings["Missing some important data!"] = "Brakuje ważnych danych!";
 $a->strings["Update"] = "Zaktualizuj";
 $a->strings["Failed to connect with email account using the settings provided."] = "";
@@ -523,7 +527,7 @@ $a->strings["Private forum - approved members only"] = "";
 $a->strings["OpenID:"] = "";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "";
 $a->strings["Publish your default profile in your local site directory?"] = "";
-$a->strings["Publish your default profile in the global social directory?"] = "";
+$a->strings["Publish your default profile in the global social directory?"] = "Opublikować twój niewypełniony profil w globalnym, społecznym katalogu?";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ukryć listę znajomych przed odwiedzającymi Twój profil?";
 $a->strings["Hide your profile details from unknown viewers?"] = "Ukryć szczegóły twojego profilu przed nieznajomymi ?";
 $a->strings["Allow friends to post to your profile page?"] = "Zezwól na dodawanie postów na twoim profilu przez znajomych";
@@ -604,6 +608,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Zły kontakt";
 $a->strings["Personal Notes"] = "Osobiste notatki";
 $a->strings["Save"] = "Zapisz";
+$a->strings["Import"] = "";
+$a->strings["Move account"] = "";
+$a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "";
+$a->strings["Account file"] = "";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\"] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
 $a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
 $a->strings["Unable to check your home location."] = "";
@@ -675,7 +684,7 @@ $a->strings["No contacts."] = "brak kontaktów";
 $a->strings["View Contacts"] = "widok kontaktów";
 $a->strings["Registration details for %s"] = "Szczegóły rejestracji dla %s";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila.";
-$a->strings["Failed to send email message. Here is the message that failed."] = "";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Nie udało się wysłać wiadomości e-mail. Wysyłanie nie powiodło się.";
 $a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
 $a->strings["Registration request at %s"] = "Prośba o rejestrację u %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
@@ -685,7 +694,7 @@ $a->strings["If you are not familiar with OpenID, please leave that field blank
 $a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
 $a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
 $a->strings["Membership on this site is by invitation only."] = "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu.";
-$a->strings["Your invitation ID: "] = "";
+$a->strings["Your invitation ID: "] = "Twoje zaproszenia ID:";
 $a->strings["Registration"] = "Rejestracja";
 $a->strings["Your Full Name (e.g. Joe Smith): "] = "Imię i nazwisko (np. Jan Kowalski):";
 $a->strings["Your Email Address: "] = "Twój adres email:";
@@ -763,7 +772,7 @@ $a->strings["DB updates"] = "";
 $a->strings["Logs"] = "";
 $a->strings["Admin"] = "Administator";
 $a->strings["Plugin Features"] = "Polecane wtyczki";
-$a->strings["User registrations waiting for confirmation"] = "";
+$a->strings["User registrations waiting for confirmation"] = "Rejestracje użytkownika czekają na potwierdzenie.";
 $a->strings["Normal Account"] = "Konto normalne";
 $a->strings["Soapbox Account"] = "";
 $a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
@@ -774,12 +783,12 @@ $a->strings["Message queues"] = "";
 $a->strings["Administration"] = "Administracja";
 $a->strings["Summary"] = "Skrót";
 $a->strings["Registered users"] = "Zarejestrowani użytkownicy";
-$a->strings["Pending registrations"] = "";
+$a->strings["Pending registrations"] = "Rejestracje w toku.";
 $a->strings["Version"] = "Wersja";
 $a->strings["Active plugins"] = "";
 $a->strings["Site settings updated."] = "Ustawienia strony zaktualizowane";
-$a->strings["Closed"] = "";
-$a->strings["Requires approval"] = "";
+$a->strings["Closed"] = "Zamknięty";
+$a->strings["Requires approval"] = "Wymagane zatwierdzenie.";
 $a->strings["Open"] = "Otwórz";
 $a->strings["No SSL policy, links will track page SSL state"] = "";
 $a->strings["Force all links to use SSL"] = "";
@@ -807,7 +816,7 @@ $a->strings["Register text"] = "";
 $a->strings["Will be displayed prominently on the registration page."] = "";
 $a->strings["Accounts abandoned after x days"] = "Konto porzucone od x dni.";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "";
-$a->strings["Allowed friend domains"] = "";
+$a->strings["Allowed friend domains"] = "Dozwolone domeny przyjaciół";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "";
 $a->strings["Allowed email domains"] = "";
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "";
@@ -1067,17 +1076,17 @@ $a->strings["Unexpected response from remote site: "] = "Nieoczekiwana odpowied
 $a->strings["Confirmation completed successfully."] = "Potwierdzenie ukończone poprawnie";
 $a->strings["Remote site reported: "] = "";
 $a->strings["Temporary failure. Please wait and try again."] = "Tymczasowo uszkodzone. Proszę poczekać i spróbować później.";
-$a->strings["Introduction failed or was revoked."] = "";
+$a->strings["Introduction failed or was revoked."] = "Nieudane lub unieważnione wprowadzenie.";
 $a->strings["Unable to set contact photo."] = "Nie można ustawić zdjęcia kontaktu.";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s jest teraz znajomym z %2\$s";
 $a->strings["No user record found for '%s' "] = "Nie znaleziono użytkownika dla '%s'";
-$a->strings["Our site encryption key is apparently messed up."] = "";
+$a->strings["Our site encryption key is apparently messed up."] = "Klucz kodujący jest najwyraźniej zepsuty";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "";
 $a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
 $a->strings["Site public key not available in contact record for URL %s."] = "";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "";
-$a->strings["Unable to set your contact credentials on our system."] = "";
-$a->strings["Unable to update your contact profile details on our system"] = "";
+$a->strings["Unable to set your contact credentials on our system."] = "Niezdolny do ustalenie tożsamości twoich kontaktów w naszym systemie";
+$a->strings["Unable to update your contact profile details on our system"] = "Niezdolny do aktualizacji szczegółowych danych profilowych twoich kontaktów w naszym systemie";
 $a->strings["Connection accepted at %s"] = "Połączenie zaakceptowane %s";
 $a->strings["%1\$s has joined %2\$s"] = "";
 $a->strings["Google+ Import Settings"] = "";
@@ -1501,7 +1510,7 @@ $a->strings["Subscribe to Friendica contacts automatically"] = "";
 $a->strings["Purge internal list of jabber addresses of contacts"] = "";
 $a->strings["Add contact"] = "Dodaj kontakt";
 $a->strings["View Source"] = "Podgląd źródła";
-$a->strings["Post to StatusNet"] = "";
+$a->strings["Post to StatusNet"] = "Opublikuj status";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
 $a->strings["We could not contact the StatusNet API with the Path you entered."] = "";
 $a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane";
@@ -1657,7 +1666,7 @@ $a->strings["Contact information and Social Networks:"] = "";
 $a->strings["Musical interests:"] = "Zainteresowania muzyczne:";
 $a->strings["Books, literature:"] = "Książki, literatura:";
 $a->strings["Television:"] = "Telewizja:";
-$a->strings["Film/dance/culture/entertainment:"] = "";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/taniec/kultura/rozrywka";
 $a->strings["Love/Romance:"] = "Miłość/Romans:";
 $a->strings["Work/employment:"] = "Praca/zatrudnienie:";
 $a->strings["School/education:"] = "Szkoła/edukacja:";
@@ -1806,6 +1815,17 @@ $a->strings["Attachments:"] = "Załączniki:";
 $a->strings["view full size"] = "Zobacz pełen rozmiar";
 $a->strings["Embedded content"] = "";
 $a->strings["Embedding disabled"] = "";
+$a->strings["Error decoding account file"] = "";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "";
+$a->strings["User creation error"] = "";
+$a->strings["User profile creation error"] = "";
+$a->strings["%d contact not imported"] = array(
+	0 => "",
+	1 => "",
+	2 => "",
+);
+$a->strings["Done. You can now login with your username and password"] = "";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "";
 $a->strings["Default privacy group for new contacts"] = "Domyślne ustawienia prywatności dla nowych kontaktów";
 $a->strings["Everybody"] = "Wszyscy";
@@ -1861,7 +1881,7 @@ $a->strings["Categories"] = "Kategorie";
 $a->strings["Logged out."] = "Wyloguj";
 $a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "";
 $a->strings["The error message was:"] = "";
-$a->strings["Miscellaneous"] = "";
+$a->strings["Miscellaneous"] = "Różny";
 $a->strings["year"] = "rok";
 $a->strings["month"] = "miesiąc";
 $a->strings["day"] = "dzień";

From 286578542f5bbd4695904103cee7d90eecf8087f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 10 Nov 2012 08:37:21 +0100
Subject: [PATCH 5/6] DE: update to the strings

---
 view/de/messages.po | 474 ++++++++++++++++++++++++++------------------
 view/de/strings.php |  35 +++-
 2 files changed, 303 insertions(+), 206 deletions(-)

diff --git a/view/de/messages.po b/view/de/messages.po
index 827318d642..0f0c64da7c 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-03 15:31-0700\n"
-"PO-Revision-Date: 2012-11-05 06:28+0000\n"
+"POT-Creation-Date: 2012-11-08 10:00-0800\n"
+"PO-Revision-Date: 2012-11-10 07:33+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146
 #: ../../mod/settings.php:86 ../../mod/settings.php:525
 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
@@ -74,7 +74,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -150,7 +150,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1406 ../../mod/photos.php:1450
 #: ../../mod/photos.php:1522 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:348
+#: ../../mod/content.php:693 ../../mod/contacts.php:351
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@@ -302,7 +302,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1701
+#: ../../include/nav.php:52 ../../boot.php:1711
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -360,7 +360,7 @@ msgstr "Beschreibung"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1237
+#: ../../boot.php:1241
 msgid "Location:"
 msgstr "Ort:"
 
@@ -428,7 +428,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
+#: ../../mod/settings.php:967 ../../mod/register.php:237
 #: ../../mod/profiles.php:574
 msgid "Yes"
 msgstr "Ja"
@@ -440,12 +440,12 @@ msgstr "Ja"
 #: ../../mod/settings.php:927 ../../mod/settings.php:933
 #: ../../mod/settings.php:963 ../../mod/settings.php:964
 #: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
+#: ../../mod/settings.php:967 ../../mod/register.php:238
 #: ../../mod/profiles.php:575
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:50 ../../boot.php:1694
+#: ../../mod/photos.php:50 ../../boot.php:1704
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
@@ -673,7 +673,7 @@ msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585
+#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
 #: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Kommentar"
@@ -964,7 +964,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
 msgid "[Name Withheld]"
 msgstr "[Name unterdrückt]"
 
@@ -1036,6 +1036,65 @@ msgstr "Adresse deines Profils:"
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
+#: ../../mod/uexport.php:10 ../../mod/settings.php:30
+#: ../../include/nav.php:137
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
+
+#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+msgid "Display settings"
+msgstr "Anzeige-Einstellungen"
+
+#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+msgid "Connector settings"
+msgstr "Connector-Einstellungen"
+
+#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+msgid "Plugin settings"
+msgstr "Plugin-Einstellungen"
+
+#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+msgid "Export personal data"
+msgstr "Persönliche Daten exportieren"
+
+#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+msgid "Remove account"
+msgstr "Konto löschen"
+
+#: ../../mod/uexport.php:49 ../../mod/settings.php:69
+#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../mod/uexport.php:73
+msgid "Export account"
+msgstr "Account exportieren"
+
+#: ../../mod/uexport.php:73
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
+msgstr "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen."
+
+#: ../../mod/uexport.php:74
+msgid "Export all"
+msgstr "Alles exportieren"
+
+#: ../../mod/uexport.php:74
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
+msgstr "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert)."
+
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr "Friendica-Server für soziale Netzwerke – Setup"
@@ -1357,7 +1416,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1175
+#: ../../include/contact_widgets.php:9 ../../boot.php:1179
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1424,7 +1483,7 @@ msgstr[1] "Kommentar"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:586
+#: ../../include/contact_widgets.php:195 ../../boot.php:590
 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -1514,7 +1573,7 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1530,8 +1589,8 @@ msgid "Discard"
 msgstr "Verwerfen"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:321
-#: ../../mod/contacts.php:375
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
+#: ../../mod/contacts.php:378
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -1583,7 +1642,7 @@ msgid "suggested by %s"
 msgstr "vorgeschlagen von %s"
 
 #: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid "Hide this contact from others"
 msgstr "Verberge diesen Kontakt vor anderen"
 
@@ -1733,279 +1792,279 @@ msgstr "Kontakt wurde ignoriert"
 msgid "Contact has been unignored"
 msgstr "Kontakt wird nicht mehr ignoriert"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been archived"
 msgstr "Kontakt wurde archiviert"
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:219
 msgid "Contact has been unarchived"
 msgstr "Kontakt wurde aus dem Archiv geholt"
 
-#: ../../mod/contacts.php:229
+#: ../../mod/contacts.php:232
 msgid "Contact has been removed."
 msgstr "Kontakt wurde entfernt."
 
-#: ../../mod/contacts.php:263
+#: ../../mod/contacts.php:266
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Du hast mit %s eine beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:270
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Du teilst mit %s"
 
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:275
 #, php-format
 msgid "%s is sharing with you"
 msgstr "%s teilt mit Dir"
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:292
 msgid "Private communications are not available for this contact."
 msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:295
 msgid "Never"
 msgstr "Niemals"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was successful)"
 msgstr "(Aktualisierung war erfolgreich)"
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:299
 msgid "(Update was not successful)"
 msgstr "(Aktualisierung war nicht erfolgreich)"
 
-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:301
 msgid "Suggest friends"
 msgstr "Kontakte vorschlagen"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:305
 #, php-format
 msgid "Network type: %s"
 msgstr "Netzwerktyp: %s"
 
-#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] "%d gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
-#: ../../mod/contacts.php:310
+#: ../../mod/contacts.php:313
 msgid "View all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:698
 msgid "Unblock"
 msgstr "Entsperren"
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
 #: ../../mod/admin.php:697
 msgid "Block"
 msgstr "Sperren"
 
-#: ../../mod/contacts.php:318
+#: ../../mod/contacts.php:321
 msgid "Toggle Blocked status"
 msgstr "Geblockt-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
+#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
 msgid "Unignore"
 msgstr "Ignorieren aufheben"
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:327
 msgid "Toggle Ignored status"
 msgstr "Ignoriert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:331
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:334
 msgid "Toggle Archive status"
 msgstr "Archiviert-Status ein-/ausschalten"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:337
 msgid "Repair"
 msgstr "Reparieren"
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:340
 msgid "Advanced Contact Settings"
 msgstr "Fortgeschrittene Kontakteinstellungen"
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:346
 msgid "Communications lost with this contact!"
 msgstr "Verbindungen mit diesem Kontakt verloren!"
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:349
 msgid "Contact Editor"
 msgstr "Kontakt Editor"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:352
 msgid "Profile Visibility"
 msgstr "Profil-Sichtbarkeit"
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:353
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:354
 msgid "Contact Information / Notes"
 msgstr "Kontakt Informationen / Notizen"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:355
 msgid "Edit contact notes"
 msgstr "Notizen zum Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
+#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besuche %ss Profil [%s]"
 
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:361
 msgid "Block/Unblock contact"
 msgstr "Kontakt blockieren/freischalten"
 
-#: ../../mod/contacts.php:359
+#: ../../mod/contacts.php:362
 msgid "Ignore contact"
 msgstr "Ignoriere den Kontakt"
 
-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:363
 msgid "Repair URL settings"
 msgstr "URL Einstellungen reparieren"
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:364
 msgid "View conversations"
 msgstr "Unterhaltungen anzeigen"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:366
 msgid "Delete contact"
 msgstr "Lösche den Kontakt"
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:370
 msgid "Last update:"
 msgstr "letzte Aktualisierung:"
 
-#: ../../mod/contacts.php:369
+#: ../../mod/contacts.php:372
 msgid "Update public posts"
 msgstr "Öffentliche Beiträge aktualisieren"
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: ../../mod/contacts.php:378
+#: ../../mod/contacts.php:381
 msgid "Currently blocked"
 msgstr "Derzeit geblockt"
 
-#: ../../mod/contacts.php:379
+#: ../../mod/contacts.php:382
 msgid "Currently ignored"
 msgstr "Derzeit ignoriert"
 
-#: ../../mod/contacts.php:380
+#: ../../mod/contacts.php:383
 msgid "Currently archived"
 msgstr "Momentan archiviert"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:384
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
 
-#: ../../mod/contacts.php:434
+#: ../../mod/contacts.php:437
 msgid "Suggestions"
 msgstr "Kontaktvorschläge"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:440
 msgid "Suggest potential friends"
 msgstr "Freunde vorschlagen"
 
-#: ../../mod/contacts.php:440 ../../mod/group.php:191
+#: ../../mod/contacts.php:443 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Alle Kontakte"
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:446
 msgid "Show all contacts"
 msgstr "Alle Kontakte anzeigen"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:449
 msgid "Unblocked"
 msgstr "Ungeblockt"
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:452
 msgid "Only show unblocked contacts"
 msgstr "Nur nicht-blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:456
 msgid "Blocked"
 msgstr "Geblockt"
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:459
 msgid "Only show blocked contacts"
 msgstr "Nur blockierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:463
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:466
 msgid "Only show ignored contacts"
 msgstr "Nur ignorierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:470
 msgid "Archived"
 msgstr "Archiviert"
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:473
 msgid "Only show archived contacts"
 msgstr "Nur archivierte Kontakte anzeigen"
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:477
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:480
 msgid "Only show hidden contacts"
 msgstr "Nur verborgene Kontakte anzeigen"
 
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:528
 msgid "Mutual Friendship"
 msgstr "Beidseitige Freundschaft"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:532
 msgid "is a fan of yours"
 msgstr "ist ein Fan von dir"
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:536
 msgid "you are a fan of"
 msgstr "du bist Fan von"
 
-#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
+#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: ../../mod/contacts.php:575
+#: ../../mod/contacts.php:578
 msgid "Search your contacts"
 msgstr "Suche in deinen Kontakten"
 
-#: ../../mod/contacts.php:576 ../../mod/directory.php:59
+#: ../../mod/contacts.php:579 ../../mod/directory.php:59
 msgid "Finding: "
 msgstr "Funde: "
 
-#: ../../mod/contacts.php:577 ../../mod/directory.php:61
+#: ../../mod/contacts.php:580 ../../mod/directory.php:61
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Finde"
@@ -2024,13 +2083,13 @@ msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
-#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
+#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2044,7 +2103,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:936
+#: ../../mod/lostpass.php:83 ../../boot.php:940
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -2088,43 +2147,6 @@ msgstr "Spitzname oder E-Mail:"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr "Anzeige-Einstellungen"
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
-msgstr "Connector-Einstellungen"
-
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr "Plugin-Einstellungen"
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr "Verbundene Programme"
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr "Persönliche Daten exportieren"
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr "Konto löschen"
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
-#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
-#: ../../addon.old/mathjax/mathjax.php:36
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
@@ -2735,7 +2757,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1708
+#: ../../mod/notes.php:44 ../../boot.php:1718
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2753,6 +2775,31 @@ msgstr "Persönliche Notizen"
 msgid "Save"
 msgstr "Speichern"
 
+#: ../../mod/uimport.php:41
+msgid "Import"
+msgstr "Import"
+
+#: ../../mod/uimport.php:43
+msgid "Move account"
+msgstr "Account umziehen"
+
+#: ../../mod/uimport.php:44
+msgid ""
+"You can move here an account from another Friendica server. <br>\r\n"
+"                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n"
+"                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
+msgstr "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>"
+
+#: ../../mod/uimport.php:47
+msgid "Account file"
+msgstr "Account Datei"
+
+#: ../../mod/uimport.php:47
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
@@ -2867,7 +2914,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1684
+#: ../../boot.php:1694
 msgid "Profile"
 msgstr "Profil"
 
@@ -3094,91 +3141,91 @@ msgstr "Keine Kontakte."
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr "Details der Registration von %s"
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."
 
-#: ../../mod/register.php:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
 msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr "Deine Registrierung konnte nicht verarbeitet werden."
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr "Registrierungsanfrage auf %s"
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
 
-#: ../../mod/register.php:189
+#: ../../mod/register.php:190
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
 
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst."
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
 
-#: ../../mod/register.php:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr "Deine OpenID (optional): "
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:255
+#: ../../mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
 msgid "Register"
 msgstr "Registrieren"
 
@@ -3226,7 +3273,7 @@ msgstr "%1$s mag %2$ss %3$s nicht"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3780
+#: ../../mod/display.php:169 ../../include/items.php:3837
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -3235,7 +3282,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1691
+#: ../../include/nav.php:51 ../../boot.php:1701
 msgid "Photos"
 msgstr "Bilder"
 
@@ -4113,7 +4160,7 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:21 ../../boot.php:1085
+#: ../../mod/profile.php:21 ../../boot.php:1089
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -4514,23 +4561,23 @@ msgstr "Alter: "
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1203
+#: ../../mod/profiles.php:689 ../../boot.php:1207
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1204
+#: ../../mod/profiles.php:690 ../../boot.php:1208
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1214
+#: ../../mod/profiles.php:701 ../../boot.php:1218
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1217
+#: ../../mod/profiles.php:703 ../../boot.php:1221
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1218
+#: ../../mod/profiles.php:704 ../../boot.php:1222
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -4659,17 +4706,17 @@ msgid "Gender: "
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1239
+#: ../../boot.php:1243
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1242
+#: ../../boot.php:1246
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1244
+#: ../../boot.php:1248
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5539,7 +5586,7 @@ msgstr "Aktiviere Planeten Plugin"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../include/nav.php:64 ../../boot.php:927
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6148,7 +6195,7 @@ msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:710
+#: ../../include/enotify.php:28 ../../include/notifier.php:774
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8136,7 +8183,7 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:703
+#: ../../include/delivery.php:457 ../../include/notifier.php:767
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
@@ -8403,6 +8450,37 @@ msgstr "Eingebetteter Inhalt"
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account Datei"
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel."
+
+#: ../../include/uimport.php:92
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
+
+#: ../../include/uimport.php:110
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzerkontos"
+
+#: ../../include/uimport.php:155
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: ../../include/uimport.php:233
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden"
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -8434,7 +8512,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:922
+#: ../../include/nav.php:46 ../../boot.php:926
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -8442,7 +8520,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1677
+#: ../../include/nav.php:49 ../../boot.php:1687
 msgid "Status"
 msgstr "Status"
 
@@ -8522,11 +8600,11 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:138 ../../boot.php:1197
+#: ../../include/nav.php:138 ../../boot.php:1201
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
@@ -8952,15 +9030,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen."
 msgid "following"
 msgstr "folgen"
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "A new person is sharing with you at "
 msgstr "Eine neue Person teilt mit dir auf "
 
-#: ../../include/items.php:3300
+#: ../../include/items.php:3357
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
-#: ../../include/items.php:3981
+#: ../../include/items.php:4038
 msgid "Archives"
 msgstr "Archiv"
 
@@ -9050,37 +9128,37 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
-#: ../../include/Contact.php:111
+#: ../../include/Contact.php:115
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:795
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:789
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:790
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:791
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: ../../include/Contact.php:224 ../../include/Contact.php:237
+#: ../../include/Contact.php:229 ../../include/Contact.php:242
 #: ../../include/conversation.php:792
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: ../../include/Contact.php:225 ../../include/Contact.php:237
+#: ../../include/Contact.php:230 ../../include/Contact.php:242
 #: ../../include/conversation.php:793
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
-#: ../../include/Contact.php:226 ../../include/Contact.php:237
+#: ../../include/Contact.php:231 ../../include/Contact.php:242
 #: ../../include/conversation.php:794
 msgid "Send PM"
 msgstr "Private Nachricht senden"
@@ -9198,101 +9276,101 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
-#: ../../boot.php:584
+#: ../../boot.php:588
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:587
+#: ../../boot.php:591
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:794
+#: ../../boot.php:798
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:796
+#: ../../boot.php:800
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:897
+#: ../../boot.php:901
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:925
+#: ../../boot.php:929
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:926
+#: ../../boot.php:930
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:929
+#: ../../boot.php:933
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:935
+#: ../../boot.php:939
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1046
+#: ../../boot.php:1050
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1123
+#: ../../boot.php:1127
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1189
+#: ../../boot.php:1193
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1315 ../../boot.php:1401
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1312 ../../boot.php:1398
+#: ../../boot.php:1316 ../../boot.php:1402
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1357 ../../boot.php:1438
+#: ../../boot.php:1361 ../../boot.php:1442
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1369
+#: ../../boot.php:1373
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1370
+#: ../../boot.php:1374
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1431
+#: ../../boot.php:1435
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1449
+#: ../../boot.php:1453
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1450
+#: ../../boot.php:1454
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1680
+#: ../../boot.php:1690
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1687
+#: ../../boot.php:1697
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1704
+#: ../../boot.php:1714
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1721
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
 
diff --git a/view/de/strings.php b/view/de/strings.php
index 26ac10b0c6..ae252c98a7 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -198,6 +198,18 @@ $a->strings["Diaspora"] = "Diaspora";
 $a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste.";
 $a->strings["Your Identity Address:"] = "Adresse deines Profils:";
 $a->strings["Submit Request"] = "Anfrage abschicken";
+$a->strings["Account settings"] = "Kontoeinstellungen";
+$a->strings["Display settings"] = "Anzeige-Einstellungen";
+$a->strings["Connector settings"] = "Connector-Einstellungen";
+$a->strings["Plugin settings"] = "Plugin-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Remove account"] = "Konto löschen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Export account"] = "Account exportieren";
+$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen.";
+$a->strings["Export all"] = "Alles exportieren";
+$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup deines Accounts anzulegen (Photos werden nicht exportiert).";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
 $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
 $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
@@ -441,14 +453,6 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
 $a->strings["Reset"] = "Zurücksetzen";
-$a->strings["Account settings"] = "Kontoeinstellungen";
-$a->strings["Display settings"] = "Anzeige-Einstellungen";
-$a->strings["Connector settings"] = "Connector-Einstellungen";
-$a->strings["Plugin settings"] = "Plugin-Einstellungen";
-$a->strings["Connected apps"] = "Verbundene Programme";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
-$a->strings["Remove account"] = "Konto löschen";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
@@ -599,6 +603,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
 $a->strings["Save"] = "Speichern";
+$a->strings["Import"] = "Import";
+$a->strings["Move account"] = "Account umziehen";
+$a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>";
+$a->strings["Account file"] = "Account Datei";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\"] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
 $a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
 $a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen.";
@@ -1794,6 +1803,16 @@ $a->strings["Attachments:"] = "Anhänge:";
 $a->strings["view full size"] = "Volle Größe anzeigen";
 $a->strings["Embedded content"] = "Eingebetteter Inhalt";
 $a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
+$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel.";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
+$a->strings["%d contact not imported"] = array(
+	0 => "%d Kontakt nicht importiert",
+	1 => "%d Kontakte nicht importiert",
+);
+$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst dich jetzt mit deinem Nutzernamen und Passwort anmelden";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
 $a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
 $a->strings["Everybody"] = "Alle Kontakte";

From 7187107034ac635542c2548dc1757809a9331755 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 10 Nov 2012 08:50:26 +0100
Subject: [PATCH 6/6] glitch with DE, PL strings

---
 view/de/strings.php | 2 +-
 view/pl/strings.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/de/strings.php b/view/de/strings.php
index ae252c98a7..b1547de2f4 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -607,7 +607,7 @@ $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Account umziehen";
 $a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.<br>Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.<br><b>Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden.</b>";
 $a->strings["Account file"] = "Account Datei";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\"] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
 $a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
 $a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen.";
diff --git a/view/pl/strings.php b/view/pl/strings.php
index d4f287c32b..f6e09ddc76 100644
--- a/view/pl/strings.php
+++ b/view/pl/strings.php
@@ -612,7 +612,7 @@ $a->strings["Import"] = "";
 $a->strings["Move account"] = "";
 $a->strings["You can move here an account from another Friendica server. <br>\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.<br>\r\n                            <b>This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "";
 $a->strings["Account file"] = "";
-$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\"] = "";
+$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
 $a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
 $a->strings["Unable to check your home location."] = "";