diff --git a/altpager/lang/cs/messages.po b/altpager/lang/cs/messages.po
new file mode 100644
index 00000000..877d0a57
--- /dev/null
+++ b/altpager/lang/cs/messages.po
@@ -0,0 +1,56 @@
+# ADDON altpager
+# Copyright (C)
+# This file is distributed under the same license as the Friendica altpager addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-07-02 15:15+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: altpager.php:46
+msgid "Altpager settings updated."
+msgstr "Nastavení Altpager aktualizováno."
+
+#: altpager.php:83
+msgid "Alternate Pagination Setting"
+msgstr "Alternate Pagination nastavení"
+
+#: altpager.php:85
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?"
+
+#: altpager.php:91 altpager.php:98
+msgid "Submit"
+msgstr "Odeslat"
+
+#: altpager.php:99
+msgid "Global"
+msgstr "Globální"
+
+#: altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr "Vynutit globální použití alternativního stránkování"
+
+#: altpager.php:100
+msgid "Individual"
+msgstr "Individuálové"
+
+#: altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr "Každý uživatel si vybere, zda-li použije alternativní stránkování."
+
+#: altpager.php:107
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/altpager/lang/cs/strings.php b/altpager/lang/cs/strings.php
index 992c1e7b..6c93ca0b 100644
--- a/altpager/lang/cs/strings.php
+++ b/altpager/lang/cs/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Nastavení Altpager aktualizováno.";
-$a->strings["Alternate Pagination Setting"] = "Alternate Pagination nastavení";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Global"] = "Globální";
-$a->strings["Force global use of the alternate pager"] = "Vynutit globální použití alternativního stránkování";
-$a->strings["Individual"] = "Individuálové";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Každý uživatel si vybere, zda-li použije alternativní stránkování.";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Altpager settings updated."] = "Nastavení Altpager aktualizováno.";
+$a->strings["Alternate Pagination Setting"] = "Alternate Pagination nastavení";
+$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Global"] = "Globální";
+$a->strings["Force global use of the alternate pager"] = "Vynutit globální použití alternativního stránkování";
+$a->strings["Individual"] = "Individuálové";
+$a->strings["Each user chooses whether to use the alternate pager"] = "Každý uživatel si vybere, zda-li použije alternativní stránkování.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/altpager/lang/de/messages.po b/altpager/lang/de/messages.po
new file mode 100644
index 00000000..dbe1f7de
--- /dev/null
+++ b/altpager/lang/de/messages.po
@@ -0,0 +1,56 @@
+# ADDON altpager
+# Copyright (C)
+# This file is distributed under the same license as the Friendica altpager addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-06-24 04:36+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: altpager.php:46
+msgid "Altpager settings updated."
+msgstr "Altpager Einstellungen wurden aktualisiert."
+
+#: altpager.php:83
+msgid "Alternate Pagination Setting"
+msgstr "Alternative Seitenumbruch Einstellung"
+
+#: altpager.php:85
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?"
+
+#: altpager.php:91 altpager.php:98
+msgid "Submit"
+msgstr "Senden"
+
+#: altpager.php:99
+msgid "Global"
+msgstr "Global"
+
+#: altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server"
+
+#: altpager.php:100
+msgid "Individual"
+msgstr "Individuell"
+
+#: altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll"
+
+#: altpager.php:107
+msgid "Settings updated."
+msgstr "Einstellungen gespeichert."
diff --git a/altpager/lang/de/strings.php b/altpager/lang/de/strings.php
index ff7086db..98a519ff 100644
--- a/altpager/lang/de/strings.php
+++ b/altpager/lang/de/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Altpager settings updated."] = "Altpager Einstellungen sind aktualisiert.";
-$a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung";
-$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?";
-$a->strings["Submit"] = "Senden";
-$a->strings["Global"] = "Global";
-$a->strings["Force global use of the alternate pager"] = "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server";
-$a->strings["Individual"] = "Individuell";
-$a->strings["Each user chooses whether to use the alternate pager"] = "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Altpager settings updated."] = "Altpager Einstellungen wurden aktualisiert.";
+$a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung";
+$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?";
+$a->strings["Submit"] = "Senden";
+$a->strings["Global"] = "Global";
+$a->strings["Force global use of the alternate pager"] = "Erzwinge die Verwendung des \"Alternate Pager\" auf diesem Server";
+$a->strings["Individual"] = "Individuell";
+$a->strings["Each user chooses whether to use the alternate pager"] = "Jede/r Nutzer/in kann wählen ob der \"Alternate Pager\" verwendet werden soll";
+$a->strings["Settings updated."] = "Einstellungen gespeichert.";
diff --git a/altpager/lang/ro/messages.po b/altpager/lang/ro/messages.po
new file mode 100644
index 00000000..3c48eef2
--- /dev/null
+++ b/altpager/lang/ro/messages.po
@@ -0,0 +1,55 @@
+# ADDON altpager
+# Copyright (C)
+# This file is distributed under the same license as the Friendica altpager addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-07-08 11:39+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: altpager.php:46
+msgid "Altpager settings updated."
+msgstr "Configurările Altpager au fost actualizate."
+
+#: altpager.php:83
+msgid "Alternate Pagination Setting"
+msgstr "Configurare Paginație Alternantă"
+
+#: altpager.php:85
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr "Se utilizează legături pentru paginile \"mai noi\" şi \"mai vechi\", în locul de numerelor de pagină?"
+
+#: altpager.php:91 altpager.php:98
+msgid "Submit"
+msgstr "Trimite"
+
+#: altpager.php:99
+msgid "Global"
+msgstr "Global"
+
+#: altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr "Se forțează utilizarea globală a paginatorului alternant"
+
+#: altpager.php:100
+msgid "Individual"
+msgstr "Individual"
+
+#: altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr "Fiecare utilizator alege dacă va utiliza paginatorul alternant"
+
+#: altpager.php:107
+msgid "Settings updated."
+msgstr "Configurări actualizate."
diff --git a/altpager/lang/ro/strings.php b/altpager/lang/ro/strings.php
new file mode 100644
index 00000000..cbd818c2
--- /dev/null
+++ b/altpager/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Altpager settings updated."] = "Configurările Altpager au fost actualizate.";
+$a->strings["Alternate Pagination Setting"] = "Configurare Paginație Alternantă";
+$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Se utilizează legături pentru paginile \"mai noi\" şi \"mai vechi\", în locul de numerelor de pagină?";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Global"] = "Global";
+$a->strings["Force global use of the alternate pager"] = "Se forțează utilizarea globală a paginatorului alternant";
+$a->strings["Individual"] = "Individual";
+$a->strings["Each user chooses whether to use the alternate pager"] = "Fiecare utilizator alege dacă va utiliza paginatorul alternant";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/appnet/appnet.php b/appnet/appnet.php
index 7e80c6ab..d175ad58 100644
--- a/appnet/appnet.php
+++ b/appnet/appnet.php
@@ -8,11 +8,7 @@
  */
 
 /*
- To-Do:
- - Use embedded pictures for the attachment information (large attachment)
- - Sound links must be handled
- - https://alpha.app.net/sr_rolando/post/32365203 - double pictures
- - https://alpha.app.net/opendev/post/34396399 - location data
+ Some marker in the post so that reimported posts can be treated better. (BBCode over app.net?)
 */
 
 define('APPNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
@@ -24,7 +20,6 @@ function appnet_install() {
 	register_hook('cron',			'addon/appnet/appnet.php', 'appnet_cron');
 	register_hook('connector_settings',	'addon/appnet/appnet.php', 'appnet_settings');
 	register_hook('connector_settings_post','addon/appnet/appnet.php', 'appnet_settings_post');
-	register_hook('prepare_body', 		'addon/appnet/appnet.php', 'appnet_prepare_body');
 }
 
 
@@ -33,9 +28,8 @@ function appnet_uninstall() {
 	unregister_hook('notifier_normal',  'addon/appnet/appnet.php', 'appnet_send');
 	unregister_hook('jot_networks',     'addon/appnet/appnet.php', 'appnet_jot_nets');
 	unregister_hook('cron',			'addon/appnet/appnet.php', 'appnet_cron');
-	unregister_hook('connector_settings',	'addon/appnet/appnet.php', 'appnet_settings');
+	unregister_hook('connector_settings',      'addon/appnet/appnet.php', 'appnet_settings');
 	unregister_hook('connector_settings_post', 'addon/appnet/appnet.php', 'appnet_settings_post');
-	unregister_hook('prepare_body', 	'addon/appnet/appnet.php', 'appnet_prepare_body');
 }
 
 function appnet_module() {}
@@ -64,35 +58,11 @@ function appnet_content(&$a) {
 	return $o;
 }
 
-function appnet_plugin_admin(&$a, &$o){
-        $t = get_markup_template( "admin.tpl", "addon/appnet/" );
-
-        $o = replace_macros($t, array(
-                '$submit' => t('Save Settings'),
-                                                                // name, label, value, help, [extra values]
-                '$clientid' => array('clientid', t('Client ID'),  get_config('appnet', 'clientid' ), ''),
-                '$clientsecret' => array('clientsecret', t('Client Secret'),  get_config('appnet', 'clientsecret' ), ''),
-        ));
-}
-
-function appnet_plugin_admin_post(&$a){
-        $clientid     =       ((x($_POST,'clientid'))              ? notags(trim($_POST['clientid']))   : '');
-        $clientsecret =       ((x($_POST,'clientsecret'))   ? notags(trim($_POST['clientsecret'])): '');
-        set_config('appnet','clientid',$clientid);
-        set_config('appnet','clientsecret',$clientsecret);
-        info( t('Settings updated.'). EOL );
-}
-
 function appnet_connect(&$a) {
 	require_once 'addon/appnet/AppDotNet.php';
 
-	$clientId     = get_config('appnet','clientid');
-	$clientSecret = get_config('appnet','clientsecret');
-
-	if (($clientId == "") OR ($clientSecret == "")) {
-		$clientId     = get_pconfig(local_user(),'appnet','clientid');
-		$clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
-	}
+	$clientId     = get_pconfig(local_user(),'appnet','clientid');
+	$clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
 
 	$app = new AppDotNet($clientId, $clientSecret);
 
@@ -132,14 +102,8 @@ function appnet_settings(&$a,&$s) {
 		return;
 
 	$token = get_pconfig(local_user(),'appnet','token');
-
-	$app_clientId     = get_config('appnet','clientid');
-	$app_clientSecret = get_config('appnet','clientsecret');
-
-	if (($app_clientId == "") OR ($app_clientSecret == "")) {
-		$app_clientId     = get_pconfig(local_user(),'appnet','clientid');
-		$app_clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
-	}
+	$app_clientId     = get_pconfig(local_user(),'appnet','clientid');
+	$app_clientSecret = get_pconfig(local_user(),'appnet','clientsecret');
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/appnet/appnet.css' . '" media="all" />' . "\r\n";
@@ -158,11 +122,11 @@ function appnet_settings(&$a,&$s) {
 	$ownid =  get_pconfig(local_user(),'appnet','ownid');
 
 	$s .= '<span id="settings_appnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnet_expanded\'); openClose(\'settings_appnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Import/Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_appnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_appnet_expanded\'); openClose(\'settings_appnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Import/Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/appnet.png" /><h3 class="connector">'. t('App.net Export').'</h3>';
 	$s .= '</span>';
 
 	if ($token != "") {
@@ -194,6 +158,7 @@ function appnet_settings(&$a,&$s) {
 		catch (AppDotNetException $e) {
 			$s .= t("<p>Error fetching user profile. Please clear the configuration and try again.</p>");
 		}
+		//$s .= print_r($userdata, true);
 
 	} elseif (($app_clientId == '') OR ($app_clientSecret == '')) {
 		$s .= t("<p>You have two ways to connect to App.net.</p>");
@@ -202,11 +167,11 @@ function appnet_settings(&$a,&$s) {
 		$s .= sprintf(t("Use '%s' as Redirect URI<p>"), $a->get_baseurl().'/appnet/connect');
 		$s .= '<div id="appnet-clientid-wrapper">';
 		$s .= '<label id="appnet-clientid-label" for="appnet-clientid">' . t('Client ID') . '</label>';
-		$s .= '<input id="appnet-clientid" type="text" name="clientid" value="" />';
+		$s .= '<input id="appnet-clientid" type="text" name="clientid" value="'.$app_clientId.'" />';
 		$s .= '</div><div class="clear"></div>';
 		$s .= '<div id="appnet-clientsecret-wrapper">';
 		$s .= '<label id="appnet-clientsecret-label" for="appnet-clientsecret">' . t('Client Secret') . '</label>';
-		$s .= '<input id="appnet-clientsecret" type="text" name="clientsecret" value="" />';
+		$s .= '<input id="appnet-clientsecret" type="text" name="clientsecret" value="'.$app_clientSecret.'" />';
 		$s .= '</div><div class="clear"></div>';
 		$s .= "<hr />";
 		$s .= t('<p>Second way: fetch a token at <a href="http://dev-lite.jonathonduerig.com/">http://dev-lite.jonathonduerig.com/</a>. ');
@@ -291,105 +256,6 @@ function appnet_post_local(&$a,&$b) {
 	}
 }
 
-function appnet_create_entities($a, $b, $postdata) {
-	require_once("include/bbcode.php");
-	require_once("include/plaintext.php");
-
-	$bbcode = $b["body"];
-	$bbcode = bb_remove_share_information($bbcode, false, true);
-
-	// Change pure links in text to bbcode uris
-	$bbcode = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2]$2[/url]', $bbcode);
-
-	$URLSearchString = "^\[\]";
-
-	$bbcode = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'#$2',$bbcode);
-	$bbcode = preg_replace("/@\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'@$2',$bbcode);
-	$bbcode = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$bbcode);
-	$bbcode = preg_replace("/\[video\](.*?)\[\/video\]/ism",'[url=$1]$1[/url]',$bbcode);
-	$bbcode = preg_replace("/\[youtube\]https?:\/\/(.*?)\[\/youtube\]/ism",'[url=https://$1]https://$1[/url]',$bbcode);
-	$bbcode = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism",
-			       '[url=https://www.youtube.com/watch?v=$1]https://www.youtube.com/watch?v=$1[/url]', $bbcode);
-	$bbcode = preg_replace("/\[vimeo\]https?:\/\/(.*?)\[\/vimeo\]/ism",'[url=https://$1]https://$1[/url]',$bbcode);
-	$bbcode = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism",
-				'[url=https://vimeo.com/$1]https://vimeo.com/$1[/url]', $bbcode);
-	//$bbcode = preg_replace("/\[vimeo\](.*?)\[\/vimeo\]/ism",'[url=$1]$1[/url]',$bbcode);
-
-	$bbcode = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $bbcode);
-
-
-	preg_match_all("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $bbcode, $urls, PREG_SET_ORDER);
-
-	$bbcode = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1',$bbcode);
-
-	$b["body"] = $bbcode;
-
-	// To-Do:
-	// Bilder
-	// https://alpha.app.net/heluecht/post/32424376
-	// https://alpha.app.net/heluecht/post/32424307
-
-	$plaintext = plaintext($a, $b, 0, false, 6);
-
-	$text = $plaintext["text"];
-
-	$start = 0;
-	$entities = array();
-
-	foreach ($urls AS $url) {
-		$lenurl = iconv_strlen($url[1], "UTF-8");
-		$len = iconv_strlen($url[2], "UTF-8");
-		$pos = iconv_strpos($text, $url[1], $start, "UTF-8");
-		$pre = iconv_substr($text, 0, $pos, "UTF-8");
-		$post = iconv_substr($text, $pos + $lenurl, 1000000, "UTF-8");
-
-		$mid = $url[2];
-		$html = bbcode($mid, false, false, 6);
-		$mid = html2plain($html, 0, true);
-
-		$mid = trim(html_entity_decode($mid,ENT_QUOTES,'UTF-8'));
-
-		$text = $pre.$mid.$post;
-
-		if ($mid != "")
-			$entities[] = array("pos" => $pos, "len" => $len, "url" => $url[1], "text" => $mid);
-
-		$start = $pos + 1;
-	}
-
-	if (isset($postdata["url"]) AND isset($postdata["title"])) {
-		$postdata["title"] = shortenmsg($postdata["title"], 90);
-		$max = 256 - strlen($postdata["title"]);
-		$text = shortenmsg($text, $max);
-		$text .= "\n[".$postdata["title"]."](".$postdata["url"].")";
-	} elseif (isset($postdata["url"])) {
-		$postdata["url"] = short_link($postdata["url"]);
-		$max = 240;
-		$text = shortenmsg($text, $max);
-		$text .= " [".$postdata["url"]."](".$postdata["url"].")";
-	} else {
-		$max = 256;
-		$text = shortenmsg($text, $max);
-	}
-
-	if (iconv_strlen($text, "UTF-8") < $max)
-		$max = iconv_strlen($text, "UTF-8");
-
-	krsort($entities);
-	foreach ($entities AS $entity) {
-		//if (iconv_strlen($text, "UTF-8") >= $entity["pos"] + $entity["len"]) {
-		if (($entity["pos"] + $entity["len"]) <= $max) {
-			$pre = iconv_substr($text, 0, $entity["pos"], "UTF-8");
-			$post = iconv_substr($text, $entity["pos"] + $entity["len"], 1000000, "UTF-8");
-
-			$text = $pre."[".$entity["text"]."](".$entity["url"].")".$post;
-		}
-	}
-
-
-	return($text);
-}
-
 function appnet_send(&$a,&$b) {
 
 	logger('appnet_send: invoked for post '.$b['id']." ".$b['app']);
@@ -474,12 +340,12 @@ function appnet_send(&$a,&$b) {
 		require_once("include/plaintext.php");
 		require_once("include/network.php");
 
-		$post = plaintext($a, $b, 256, false, 6);
+		$post = plaintext($a, $b, 256, false);
 		logger("appnet_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
 
 		if (isset($post["image"])) {
 			$img_str = fetch_url($post['image'],true, $redirects, 10);
-			$tempfile = tempnam(get_temppath(), "cache");
+			$tempfile = tempnam(get_config("system","temppath"), "cache");
 			file_put_contents($tempfile, $img_str);
 
 			try {
@@ -496,7 +362,7 @@ function appnet_send(&$a,&$b) {
 								);
 			}
 			catch (AppDotNetException $e) {
-				logger("appnet_send: Error creating file ".appnet_error($e->getMessage()));
+				logger("appnet_send: Error creating file");
 			}
 
 			unlink($tempfile);
@@ -510,20 +376,23 @@ function appnet_send(&$a,&$b) {
 							);
 
 		// Adding the original post
-		$attached_data = get_attached_data($b["body"]);
-		$attached_data["post-uri"] = $b["uri"];
-		$attached_data["post-title"] = $b["title"];
-		$attached_data["post-body"] = substr($b["body"], 0, 4000); // To-Do: Better shortening
-		$attached_data["post-tag"] = $b["tag"];
-		$attached_data["author-name"] = $b["author-name"];
-		$attached_data["author-link"] = $b["author-link"];
-		$attached_data["author-avatar"] = $b["author-avatar"];
-
 		$data["annotations"][] = array(
 						"type" => "com.friendica.post",
-						"value" => $attached_data
+						"value" => array(
+								"uri" => $b["uri"],
+								"title" => $b["title"],
+								"body" => substr($b["body"], 0, 4000), // To-Do: Better shortening
+								"tag" => $b["tag"],
+								"author-name" => $b["author-name"],
+								"author-link" => $b["author-link"],
+								"author-avatar" => $b["author-avatar"],
+								)
 						);
 
+
+		// To-Do
+		// Alle Links verkürzen
+
 		if (isset($post["url"]) AND !isset($post["title"])) {
 			$display_url = str_replace(array("http://www.", "https://www."), array("", ""), $post["url"]);
 			$display_url = str_replace(array("http://", "https://"), array("", ""), $display_url);
@@ -534,17 +403,27 @@ function appnet_send(&$a,&$b) {
 			$post["title"] = $display_url;
 		}
 
-		$text = appnet_create_entities($a, $b, $post);
+		if (isset($post["url"]) AND isset($post["title"])) {
+			$post["title"] = shortenmsg($post["title"], 90);
+			$post["text"] = shortenmsg($post["text"], 256 - strlen($post["title"]));
+			$post["text"] .= "\n[".$post["title"]."](".$post["url"].")";
+		} elseif (isset($post["url"])) {
+			$post["url"] = short_link($post["url"]);
+			$post["text"] = shortenmsg($post["text"], 240);
+			$post["text"] .= " ".$post["url"];
+		}
 
+		//print_r($post);
+		$data["entities"]["parse_links"] = true;
 		$data["entities"]["parse_markdown_links"] = true;
 
 		if ($iscomment)
 			$data["reply_to"] = substr($orig_post["uri"], 5);
 
 		try {
-			logger("appnet_send: sending message ".$b["id"]." ".$text." ".print_r($data, true), LOGGER_DEBUG);
-			$ret = $app->createPost($text, $data);
+			$ret = $app->createPost($post["text"], $data);
 			logger("appnet_send: send message ".$b["id"]." result: ".print_r($ret, true), LOGGER_DEBUG);
+
 			if ($iscomment) {
 				logger('appnet_send: Update extid '.$ret["id"]." for post id ".$b['id']);
 				q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
@@ -554,7 +433,7 @@ function appnet_send(&$a,&$b) {
 			}
 		}
 		catch (AppDotNetException $e) {
-			logger("appnet_send: Error sending message ".$b["id"]." ".appnet_error($e->getMessage()));
+			logger("appnet_send: Error sending message ".$b["id"]);
 		}
 	}
 }
@@ -586,7 +465,7 @@ function appnet_action($a, $uid, $pid, $action) {
 		logger("appnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
 	}
 	catch (AppDotNetException $e) {
-		logger("appnet_action: Error sending action ".$action." pid ".$pid." ".appnet_error($e->getMessage()), LOGGER_DEBUG);
+		logger("appnet_action: Error sending action ".$action." pid ".$pid, LOGGER_DEBUG);
 	}
 }
 
@@ -637,7 +516,7 @@ function appnet_is_repost($a, $uid, $body) {
 		return true;
 	}
 	catch (AppDotNetException $e) {
-		logger('appnet_is_repost: error doing repost '.appnet_error($e->getMessage()), LOGGER_DEBUG);
+		logger('appnet_is_repost: error doing repost', LOGGER_DEBUG);
 		return false;
 	}
 }
@@ -689,7 +568,7 @@ function appnet_fetchstream($a, $uid) {
 		$stream = $app->getUserStream($param);
 	}
 	catch (AppDotNetException $e) {
-		logger("appnet_fetchstream: Error fetching stream for user ".$uid." ".appnet_error($e->getMessage()));
+		logger("appnet_fetchstream: Error fetching stream for user ".$uid);
 	}
 
 	$stream = array_reverse($stream);
@@ -716,7 +595,7 @@ function appnet_fetchstream($a, $uid) {
 					'to_email'     => $user['email'],
 					'uid'          => $user['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'         => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item,
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
@@ -743,42 +622,24 @@ function appnet_fetchstream($a, $uid) {
 		$mentions = $app->getUserMentions("me", $param);
 	}
 	catch (AppDotNetException $e) {
-		logger("appnet_fetchstream: Error fetching mentions for user ".$uid." ".appnet_error($e->getMessage()));
+		logger("appnet_fetchstream: Error fetching mentions for user ".$uid);
 	}
 
 	$mentions = array_reverse($mentions);
 	foreach ($mentions AS $post) {
 		$postarray = appnet_createpost($a, $uid, $post, $me, $user, $ownid, false);
 
-		if (isset($postarray["id"])) {
+		if (isset($postarray["id"]))
 			$item = $postarray["id"];
-			$parent_id = $postarray['parent'];
-		} elseif (isset($postarray["body"])) {
+		elseif (isset($postarray["body"])) {
 			$item = item_store($postarray);
-			$parent_id = 0;
 			logger('appnet_fetchstream: User '.$uid.' posted mention item '.$item);
-		} else {
+		} else
 			$item = 0;
-			$parent_id = 0;
-		}
-
-		// Fetch the parent and id
-		if (($parent_id == 0) AND ($postarray['uri'] != "")) {
-			$r = q("SELECT `id`, `parent` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($postarray['uri']),
-				intval($uid)
-			);
-
-			if (count($r)) {
-				$item = $r[0]['id'];
-				$parent_id = $r[0]['parent'];
-			}
-		}
 
 		$lastid = $post["id"];
 
-		//if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) {
-		if ($item != 0) {
+		if (($item != 0) AND ($postarray['contact-id'] != $me["id"])) {
 			require_once('include/enotify.php');
 			notification(array(
 				'type'         => NOTIFY_TAGSELF,
@@ -788,13 +649,12 @@ function appnet_fetchstream($a, $uid) {
 				'to_email'     => $user['email'],
 				'uid'          => $user['uid'],
 				'item'         => $postarray,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+				'link'         => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $item,
 				'source_name'  => $postarray['author-name'],
 				'source_link'  => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
 				'verb'         => ACTIVITY_TAG,
-				'otype'        => 'item',
-				'parent'       => $parent_id,
+				'otype'        => 'item'
 			));
 		}
 	}
@@ -810,7 +670,7 @@ function appnet_fetchstream($a, $uid) {
 */
 }
 
-function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true, $nodupcheck = false) {
+function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $threadcompletion = true) {
 	require_once('include/items.php');
 
 	if ($post["machine_only"])
@@ -825,45 +685,35 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 	$postarray['wall'] = 0;
 	$postarray['verb'] = ACTIVITY_POST;
 	$postarray['network'] =  dbesc(NETWORK_APPNET);
-	if (is_array($post["repost_of"])) {
-		// You can't reply to reposts. So use the original id and thread-id
-		$postarray['uri'] = "adn::".$post["repost_of"]["id"];
-		$postarray['parent-uri'] = "adn::".$post["repost_of"]["thread_id"];
-	} else {
-		$postarray['uri'] = "adn::".$post["id"];
-		$postarray['parent-uri'] = "adn::".$post["thread_id"];
-	}
+	$postarray['uri'] = "adn::".$post["id"];
 
-	if (!$nodupcheck) {
-		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($postarray['uri']),
-			intval($uid)
-			);
+	$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+		dbesc($postarray['uri']),
+		intval($uid)
+		);
 
-		if (count($r))
-			return($r[0]);
+	if (count($r))
+		return($r[0]);
 
-		$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($postarray['uri']),
-			intval($uid)
-			);
+	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
+		dbesc($postarray['uri']),
+		intval($uid)
+		);
 
-		if (count($r))
-			return($r[0]);
-	}
+	if (count($r))
+		return($r[0]);
 
+	$postarray['parent-uri'] = "adn::".$post["thread_id"];
 	if (isset($post["reply_to"]) AND ($post["reply_to"] != "")) {
 		$postarray['thr-parent'] = "adn::".$post["reply_to"];
 
-		// Complete the thread (if the parent doesn't exists)
+		// Complete the thread if the parent doesn't exists
 		if ($threadcompletion) {
-			//$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-			//	dbesc($postarray['thr-parent']),
-			//	intval($uid)
-			//	);
-			//if (!count($r)) {
-				logger("appnet_createpost: completing thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG);
-
+			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($postarray['thr-parent']),
+				intval($uid)
+				);
+			if (!count($r)) {
 				require_once("addon/appnet/AppDotNet.php");
 
 				$token = get_pconfig($uid,'appnet','token');
@@ -879,27 +729,19 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 					$thread = $app->getPostReplies($post["thread_id"], $param);
 				}
 				catch (AppDotNetException $e) {
-					logger("appnet_createpost: Error fetching thread for user ".$uid." ".appnet_error($e->getMessage()));
+					logger("appnet_createpost: Error fetching thread for user ".$uid);
 				}
 				$thread = array_reverse($thread);
-
-				logger("appnet_createpost: fetched ".count($thread)." items for thread ".$post["thread_id"]." for user ".$uid, LOGGER_DEBUG);
-
 				foreach ($thread AS $tpost) {
-					$threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, false, false);
+					$threadpost = appnet_createpost($a, $uid, $tpost, $me, $user, $ownid, $createuser, false);
 					$item = item_store($threadpost);
-					logger("appnet_createpost: stored post ".$post["id"]." thread ".$post["thread_id"]." in item ".$item, LOGGER_DEBUG);
 				}
-			//}
+			}
 		}
-		// Don't create accounts of people who just comment something
-		$createuser = false;
-
-		$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
-	} else {
+	} else
 		$postarray['thr-parent'] = $postarray['uri'];
-		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
-	}
+
+	$postarray['plink'] = $post["canonical_url"];
 
 	if (($post["user"]["id"] != $ownid) OR ($postarray['thr-parent'] == $postarray['uri'])) {
 		$postarray['owner-name'] = $post["user"]["name"];
@@ -929,8 +771,6 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 		$content = $post;
 	}
 
-	$postarray['plink'] = $content["canonical_url"];
-
 	if (is_array($content["entities"])) {
 		$converted = appnet_expand_entities($a, $content["text"], $content["entities"]);
 		$postarray['body'] = $converted["body"];
@@ -938,13 +778,16 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 	} else
 		$postarray['body'] = $content["text"];
 
+	if (is_array($content["annotations"]))
+		$postarray['body'] = appnet_expand_annotations($a, $postarray['body'], $content["annotations"]);
+
 	if (sizeof($content["entities"]["links"]))
 		foreach($content["entities"]["links"] AS $link) {
 			$url = normalise_link($link["url"]);
 			$links[$url] = $link["url"];
 		}
 
-	/* if (sizeof($content["annotations"]))
+	if (sizeof($content["annotations"]))
 		foreach($content["annotations"] AS $annotation) {
 			if ($annotation[type] == "net.app.core.oembed") {
 				if (isset($annotation["value"]["embeddable_url"])) {
@@ -953,15 +796,15 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 						unset($links[$url]);
 				}
 			} elseif ($annotation[type] == "com.friendica.post") {
-				//$links = array();
-				//if (isset($annotation["value"]["post-title"]))
-				//	$postarray['title'] = $annotation["value"]["post-title"];
+				$links = array();
+				if (isset($annotation["value"]["embeddable_url"]))
+					$postarray['title'] = $annotation["value"]["title"];
 
-				//if (isset($annotation["value"]["post-body"]))
-				//	$postarray['body'] = $annotation["value"]["post-body"];
+				if (isset($annotation["value"]["body"]))
+					$postarray['body'] = $annotation["value"]["body"];
 
-				//if (isset($annotation["value"]["post-tag"]))
-				//	$postarray['tag'] = $annotation["value"]["post-tag"];
+				if (isset($annotation["value"]["tag"]))
+					$postarray['tag'] = $annotation["value"]["tag"];
 
 				if (isset($annotation["value"]["author-name"]))
 					$postarray['author-name'] = $annotation["value"]["author-name"];
@@ -973,44 +816,28 @@ function appnet_createpost($a, $uid, $post, $me, $user, $ownid, $createuser, $th
 					$postarray['author-avatar'] = $annotation["value"]["author-avatar"];
 			}
 
-		} */
-
-	$page_info = "";
-
-	if (is_array($content["annotations"])) {
-		$photo = appnet_expand_annotations($a, $content["annotations"]);
-		if (($photo["large"] != "") AND ($photo["url"] != ""))
-			$page_info = "\n[url=".$photo["url"]."][img]".$photo["large"]."[/img][/url]";
-		elseif ($photo["url"] != "")
-			$page_info = "\n[img]".$photo["url"]."[/img]";
-
-		if ($photo["url"] != "")
-			$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
-
-	} else
-		$photo = array("url" => "", "large" => "");
+		}
 
 	if (sizeof($links)) {
 		$link = array_pop($links);
-		$url = str_replace(array('/', '.'), array('\/', '\.'), $link);
+		$url = "[url=".$link."]".$link."[/url]";
 
-		$page_info = add_page_info($link, false, $photo["url"]);
+		$removedlink = trim(str_replace($url, "", $postarray['body']));
 
-		if (trim($page_info) != "") {
-			$removedlink = preg_replace("/\[url\=".$url."\](.*?)\[\/url\]/ism", '', $postarray['body']);
-			if (($removedlink == "") OR strstr($postarray['body'], $removedlink))
-				$postarray['body'] = $removedlink;
-		}
+		if (($removedlink == "") OR strstr($postarray['body'], $removedlink))
+			$postarray['body'] = $removedlink;
+
+		$postarray['body'] .= add_page_info($link);
 	}
 
-	$postarray['body'] .= $page_info;
-
 	$postarray['created'] = datetime_convert('UTC','UTC',$post["created_at"]);
 	$postarray['edited'] = datetime_convert('UTC','UTC',$post["created_at"]);
 
 	$postarray['app'] = $post["source"]["name"];
 
 	return($postarray);
+	//print_r($postarray);
+	//print_r($post);
 }
 
 function appnet_expand_entities($a, $body, $entities) {
@@ -1039,10 +866,7 @@ function appnet_expand_entities($a, $body, $entities) {
 
 	foreach ($entities["links"] AS $links) {
 		$url = "[url=".$links["url"]."]".$links["text"]."[/url]";
-		if (isset($links["amended_len"]) AND ($links["amended_len"] > $links["len"]))
-			$replace[$links["pos"]] = array("pos"=> $links["pos"], "len"=> $links["amended_len"], "replace"=> $url);
-		else
-			$replace[$links["pos"]] = array("pos"=> $links["pos"], "len"=> $links["len"], "replace"=> $url);
+		$replace[$links["pos"]] = array("pos"=> $links["pos"], "len"=> $links["len"], "replace"=> $url);
 	}
 
 
@@ -1051,8 +875,6 @@ function appnet_expand_entities($a, $body, $entities) {
 		foreach ($replace AS $entity) {
 			$pre = substr_unicode($body, 0, $entity["pos"]);
 			$post = substr_unicode($body, $entity["pos"] + $entity["len"]);
-			//$pre = iconv_substr($body, 0, $entity["pos"], "UTF-8");
-			//$post = iconv_substr($body, $entity["pos"] + $entity["len"], "UTF-8");
 
 			$body = $pre.$entity["replace"].$post;
 		}
@@ -1061,24 +883,16 @@ function appnet_expand_entities($a, $body, $entities) {
 	return(array("body" => $body, "tags" => implode($tags_arr, ",")));
 }
 
-function appnet_expand_annotations($a, $annotations) {
-	$photo = array("url" => "", "large" => "");
+function appnet_expand_annotations($a, $body, $annotations) {
 	foreach ($annotations AS $annotation) {
-		if (($annotation[type] == "net.app.core.oembed") AND
-			($annotation["value"]["type"] == "photo")) {
-			if ($annotation["value"]["url"] != "")
-				$photo["url"] = $annotation["value"]["url"];
-
-			if ($annotation["value"]["thumbnail_large_url"] != "")
-				$photo["large"] = $annotation["value"]["thumbnail_large_url"];
-
-			//if (($annotation["value"]["thumbnail_large_url"] != "") AND ($annotation["value"]["url"] != ""))
-			//	$embedded = "\n[url=".$annotation["value"]["url"]."][img]".$annotation["value"]["thumbnail_large_url"]."[/img][/url]";
-			//elseif ($annotation["value"]["url"] != "")
-			//	$embedded = "\n[img]".$annotation["value"]["url"]."[/img]";
+		if ($annotation["value"]["type"] == "photo") {
+			if (($annotation["value"]["thumbnail_large_url"] != "") AND ($annotation["value"]["url"] != ""))
+				$body .= "\n[url=".$annotation["value"]["url"]."][img]".$annotation["value"]["thumbnail_large_url"]."[/img][/url]";
+			elseif ($annotation["value"]["url"] != "")
+				$body .= "\n[img]".$annotation["value"]["url"]."[/img]";
 		}
 	}
-	return $photo;
+	return $body;
 }
 
 function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
@@ -1086,10 +900,8 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 		intval($uid), dbesc("adn::".$contact["id"]));
 
 	if(!count($r) AND !$create_user)
-		return($me["id"]);
+		return($me);
 
-	if ($contact["canonical_url"] == "")
-		return($me["id"]);
 
 	if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
 		logger("appnet_fetchcontact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
@@ -1097,13 +909,6 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 	}
 
 	if(!count($r)) {
-
-		if ($contact["name"] == "")
-			$contact["name"] = $contact["username"];
-
-		if ($contact["username"] == "")
-			$contact["username"] = $contact["name"];
-
 		// create contact record
 		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
@@ -1170,7 +975,7 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 
 		//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
 		$update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
-
+$update_photo = true;
 		// check that we have all the photos, this has been known to fail on occasion
 
 		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
@@ -1212,43 +1017,6 @@ function appnet_fetchcontact($a, $uid, $contact, $me, $create_user) {
 	return($r[0]["id"]);
 }
 
-function appnet_prepare_body(&$a,&$b) {
-        if ($b["item"]["network"] != NETWORK_APPNET)
-                return;
-
-        if ($b["preview"]) {
-                $max_char = 256;
-                require_once("include/plaintext.php");
-                $item = $b["item"];
-                $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
-
-                $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
-                        dbesc($item["thr-parent"]),
-                        intval(local_user()));
-
-                if(count($r)) {
-                        $orig_post = $r[0];
-
-	                $nicknameplain = preg_replace("=https?://alpha.app.net/(.*)=ism", "$1", $orig_post["author-link"]);
-	                $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-	                $nicknameplain = "@".$nicknameplain;
-
-	                if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
-	                        $item["body"] = $nickname." ".$item["body"];
-                }
-
-
-
-                $msgarr = plaintext($a, $item, $max_char, true);
-		$msg = appnet_create_entities($a, $item, $msgarr);
-
-		require_once("library/markdown.php");
-		$msg = Markdown($msg);
-
-                $b['html'] = $msg;
-        }
-}
-
 function appnet_cron($a,$b) {
 	$last = get_config('appnet','last_poll');
 
@@ -1277,23 +1045,3 @@ function appnet_cron($a,$b) {
 
 	set_config('appnet','last_poll', time());
 }
-
-function appnet_error($msg) {
-        $msg = trim($msg);
-        $pos = strrpos($msg, "\r\n\r\n");
-
-        if (!$pos)
-                return($msg);
-
-        $msg = substr($msg, $pos + 4);
-
-        $error = json_decode($msg);
-
-        if ($error == NULL)
-                return($msg);
-
-	if (isset($error->meta->error_message))
-		return($error->meta->error_message);
-        else
-                return(print_r($error));
-}
diff --git a/appnet/lang/C/messages.po b/appnet/lang/C/messages.po
new file mode 100644
index 00000000..a6617de9
--- /dev/null
+++ b/appnet/lang/C/messages.po
@@ -0,0 +1,116 @@
+# ADDON appnet
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica appnet addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: appnet.php:39
+msgid "Permission denied."
+msgstr ""
+
+#: appnet.php:73
+msgid "You are now authenticated to app.net. "
+msgstr ""
+
+#: appnet.php:77
+msgid "<p>Error fetching token. Please try again.</p>"
+msgstr ""
+
+#: appnet.php:80
+msgid "return to the connector page"
+msgstr ""
+
+#: appnet.php:94
+msgid "Post to app.net"
+msgstr ""
+
+#: appnet.php:125 appnet.php:129
+msgid "App.net Export"
+msgstr ""
+
+#: appnet.php:142
+msgid "Currently connected to: "
+msgstr ""
+
+#: appnet.php:144
+msgid "Enable App.net Post Plugin"
+msgstr ""
+
+#: appnet.php:149
+msgid "Post to App.net by default"
+msgstr ""
+
+#: appnet.php:153
+msgid "Import the remote timeline"
+msgstr ""
+
+#: appnet.php:159
+msgid ""
+"<p>Error fetching user profile. Please clear the configuration and try again."
+"</p>"
+msgstr ""
+
+#: appnet.php:164
+msgid "<p>You have two ways to connect to App.net.</p>"
+msgstr ""
+
+#: appnet.php:166
+msgid ""
+"<p>First way: Register an application at <a href=\"https://account.app.net/"
+"developer/apps/\">https://account.app.net/developer/apps/</a> and enter "
+"Client ID and Client Secret. "
+msgstr ""
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI<p>"
+msgstr ""
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr ""
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr ""
+
+#: appnet.php:177
+msgid ""
+"<p>Second way: fetch a token at <a href=\"http://dev-lite.jonathonduerig.com/"
+"\">http://dev-lite.jonathonduerig.com/</a>. "
+msgstr ""
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'.</p>"
+msgstr ""
+
+#: appnet.php:180
+msgid "Token"
+msgstr ""
+
+#: appnet.php:192
+msgid "Sign in using App.net"
+msgstr ""
+
+#: appnet.php:197
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: appnet.php:204
+msgid "Save Settings"
+msgstr ""
diff --git a/appnet/lang/cs/messages.po b/appnet/lang/cs/messages.po
new file mode 100644
index 00000000..b6527459
--- /dev/null
+++ b/appnet/lang/cs/messages.po
@@ -0,0 +1,118 @@
+# ADDON appnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnet addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-07-02 15:24+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: appnet.php:39
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: appnet.php:73
+msgid "You are now authenticated to app.net. "
+msgstr "Nyní jste přihlášen k app.net."
+
+#: appnet.php:77
+msgid "<p>Error fetching token. Please try again.</p>"
+msgstr "<p>Chyba v přenesení tokenu. Prosím zkuste to znovu.</p>"
+
+#: appnet.php:80
+msgid "return to the connector page"
+msgstr "návrat ke stránce konektor"
+
+#: appnet.php:94
+msgid "Post to app.net"
+msgstr "Poslat příspěvek na app.net"
+
+#: appnet.php:125 appnet.php:129
+msgid "App.net Export"
+msgstr "App.net Export"
+
+#: appnet.php:142
+msgid "Currently connected to: "
+msgstr "V současné době připojen k:"
+
+#: appnet.php:144
+msgid "Enable App.net Post Plugin"
+msgstr "Aktivovat App.net Post Plugin"
+
+#: appnet.php:149
+msgid "Post to App.net by default"
+msgstr "Defaultně poslat na App.net"
+
+#: appnet.php:153
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
+
+#: appnet.php:159
+msgid ""
+"<p>Error fetching user profile. Please clear the configuration and try "
+"again.</p>"
+msgstr "<p>Chyba v přenesení uživatelského profilu. Prosím zkuste smazat konfiguraci a zkusit to znovu.</p>"
+
+#: appnet.php:164
+msgid "<p>You have two ways to connect to App.net.</p>"
+msgstr "<p>Máte nyní dvě možnosti jak se připojit k App.net.</p>"
+
+#: appnet.php:166
+msgid ""
+"<p>First way: Register an application at <a "
+"href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a>"
+" and enter Client ID and Client Secret. "
+msgstr "<p>První možnost: Registrovat svou žádost na <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> a zadat Client ID and Client Secret. "
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI<p>"
+msgstr "Použít '%s' jako URI pro přesměrování<p>"
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr "Client ID"
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: appnet.php:177
+msgid ""
+"<p>Second way: fetch a token at <a href=\"http://dev-"
+"lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+msgstr "<p>Druhá možnost: vložit token do <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'.</p>"
+msgstr "Nastavte tyto rámce: 'Základní', 'Stream', 'Psaní příspěvků, 'Veřejné zprávy', 'Zprávy'.</p>"
+
+#: appnet.php:180
+msgid "Token"
+msgstr "Token"
+
+#: appnet.php:192
+msgid "Sign in using App.net"
+msgstr "Přihlásit se s použitím App.net"
+
+#: appnet.php:197
+msgid "Clear OAuth configuration"
+msgstr "Vymazat konfiguraci OAuth"
+
+#: appnet.php:204
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/appnet/lang/cs/strings.php b/appnet/lang/cs/strings.php
new file mode 100644
index 00000000..4bc45427
--- /dev/null
+++ b/appnet/lang/cs/strings.php
@@ -0,0 +1,29 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["You are now authenticated to app.net. "] = "Nyní jste přihlášen k app.net.";
+$a->strings["<p>Error fetching token. Please try again.</p>"] = "<p>Chyba v přenesení tokenu. Prosím zkuste to znovu.</p>";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to app.net"] = "Poslat příspěvek na app.net";
+$a->strings["App.net Export"] = "App.net Export";
+$a->strings["Currently connected to: "] = "V současné době připojen k:";
+$a->strings["Enable App.net Post Plugin"] = "Aktivovat App.net Post Plugin";
+$a->strings["Post to App.net by default"] = "Defaultně poslat na App.net";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["<p>Error fetching user profile. Please clear the configuration and try again.</p>"] = "<p>Chyba v přenesení uživatelského profilu. Prosím zkuste smazat konfiguraci a zkusit to znovu.</p>";
+$a->strings["<p>You have two ways to connect to App.net.</p>"] = "<p>Máte nyní dvě možnosti jak se připojit k App.net.</p>";
+$a->strings["<p>First way: Register an application at <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> and enter Client ID and Client Secret. "] = "<p>První možnost: Registrovat svou žádost na <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> a zadat Client ID and Client Secret. ";
+$a->strings["Use '%s' as Redirect URI<p>"] = "Použít '%s' jako URI pro přesměrování<p>";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["<p>Second way: fetch a token at <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "] = "<p>Druhá možnost: vložit token do <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. ";
+$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>"] = "Nastavte tyto rámce: 'Základní', 'Stream', 'Psaní příspěvků, 'Veřejné zprávy', 'Zprávy'.</p>";
+$a->strings["Token"] = "Token";
+$a->strings["Sign in using App.net"] = "Přihlásit se s použitím App.net";
+$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/appnet/lang/de/messages.po b/appnet/lang/de/messages.po
new file mode 100644
index 00000000..6e8f7c88
--- /dev/null
+++ b/appnet/lang/de/messages.po
@@ -0,0 +1,118 @@
+# ADDON appnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnet addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-06-25 04:31+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appnet.php:39
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: appnet.php:73
+msgid "You are now authenticated to app.net. "
+msgstr "Du bist nun auf app.net authentifiziert."
+
+#: appnet.php:77
+msgid "<p>Error fetching token. Please try again.</p>"
+msgstr "<p>Fehler beim Holen des Tokens, bitte versuche es später noch einmal.</p>"
+
+#: appnet.php:80
+msgid "return to the connector page"
+msgstr "zurück zur Connector Seite"
+
+#: appnet.php:94
+msgid "Post to app.net"
+msgstr "Nach app.net senden"
+
+#: appnet.php:125 appnet.php:129
+msgid "App.net Export"
+msgstr "App.net Export"
+
+#: appnet.php:142
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit: "
+
+#: appnet.php:144
+msgid "Enable App.net Post Plugin"
+msgstr "Veröffentlichungen bei App.net erlauben"
+
+#: appnet.php:149
+msgid "Post to App.net by default"
+msgstr "Standardmäßig bei App.net veröffentlichen"
+
+#: appnet.php:153
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Zeitleiste"
+
+#: appnet.php:159
+msgid ""
+"<p>Error fetching user profile. Please clear the configuration and try "
+"again.</p>"
+msgstr "<p>Beim Laden des Nutzerprofils ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</p>"
+
+#: appnet.php:164
+msgid "<p>You have two ways to connect to App.net.</p>"
+msgstr "<p>Du hast zwei Wege deinen friendica Account mit App.net zu verbinden.</p>"
+
+#: appnet.php:166
+msgid ""
+"<p>First way: Register an application at <a "
+"href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a>"
+" and enter Client ID and Client Secret. "
+msgstr "<p>Erster Weg: Registriere eine Anwendung unter <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> und wähle eine Client ID und ein Client Secret."
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI<p>"
+msgstr "Verwende '%s' als Redirect URI<p>"
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr "Client ID"
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: appnet.php:177
+msgid ""
+"<p>Second way: fetch a token at <a href=\"http://dev-"
+"lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+msgstr "<p>Zweiter Weg: Beantrage ein Token unter <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'.</p>"
+msgstr "Verwende folgende Scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>"
+
+#: appnet.php:180
+msgid "Token"
+msgstr "Token"
+
+#: appnet.php:192
+msgid "Sign in using App.net"
+msgstr "Per App.net anmelden"
+
+#: appnet.php:197
+msgid "Clear OAuth configuration"
+msgstr "OAuth Konfiguration löschen"
+
+#: appnet.php:204
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/appnet/lang/de/strings.php b/appnet/lang/de/strings.php
new file mode 100644
index 00000000..da80cf7c
--- /dev/null
+++ b/appnet/lang/de/strings.php
@@ -0,0 +1,29 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["You are now authenticated to app.net. "] = "Du bist nun auf app.net authentifiziert.";
+$a->strings["<p>Error fetching token. Please try again.</p>"] = "<p>Fehler beim Holen des Tokens, bitte versuche es später noch einmal.</p>";
+$a->strings["return to the connector page"] = "zurück zur Connector Seite";
+$a->strings["Post to app.net"] = "Nach app.net senden";
+$a->strings["App.net Export"] = "App.net Export";
+$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
+$a->strings["Enable App.net Post Plugin"] = "Veröffentlichungen bei App.net erlauben";
+$a->strings["Post to App.net by default"] = "Standardmäßig bei App.net veröffentlichen";
+$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste";
+$a->strings["<p>Error fetching user profile. Please clear the configuration and try again.</p>"] = "<p>Beim Laden des Nutzerprofils ist ein Fehler aufgetreten. Bitte versuche es später noch einmal.</p>";
+$a->strings["<p>You have two ways to connect to App.net.</p>"] = "<p>Du hast zwei Wege deinen friendica Account mit App.net zu verbinden.</p>";
+$a->strings["<p>First way: Register an application at <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> and enter Client ID and Client Secret. "] = "<p>Erster Weg: Registriere eine Anwendung unter <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> und wähle eine Client ID und ein Client Secret.";
+$a->strings["Use '%s' as Redirect URI<p>"] = "Verwende '%s' als Redirect URI<p>";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["<p>Second way: fetch a token at <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "] = "<p>Zweiter Weg: Beantrage ein Token unter <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. ";
+$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>"] = "Verwende folgende Scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>";
+$a->strings["Token"] = "Token";
+$a->strings["Sign in using App.net"] = "Per App.net anmelden";
+$a->strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/appnet/lang/ro/messages.po b/appnet/lang/ro/messages.po
new file mode 100644
index 00000000..a9c5242f
--- /dev/null
+++ b/appnet/lang/ro/messages.po
@@ -0,0 +1,117 @@
+# ADDON appnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnet addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-07-08 11:40+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: appnet.php:39
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: appnet.php:73
+msgid "You are now authenticated to app.net. "
+msgstr "Acum sunteți autentificat pe App.net."
+
+#: appnet.php:77
+msgid "<p>Error fetching token. Please try again.</p>"
+msgstr "<p>Eroare la procesarea token-ului. Vă rugăm să reîncercați.</p>"
+
+#: appnet.php:80
+msgid "return to the connector page"
+msgstr "revenire la pagina de conectare"
+
+#: appnet.php:94
+msgid "Post to app.net"
+msgstr "Postați pe App.net"
+
+#: appnet.php:125 appnet.php:129
+msgid "App.net Export"
+msgstr "Exportare pe App.net"
+
+#: appnet.php:142
+msgid "Currently connected to: "
+msgstr "Conectat curent la:"
+
+#: appnet.php:144
+msgid "Enable App.net Post Plugin"
+msgstr "Activare Modul Postare pe App.net"
+
+#: appnet.php:149
+msgid "Post to App.net by default"
+msgstr "Postați implicit pe App.net"
+
+#: appnet.php:153
+msgid "Import the remote timeline"
+msgstr "Importare cronologie la distanță"
+
+#: appnet.php:159
+msgid ""
+"<p>Error fetching user profile. Please clear the configuration and try "
+"again.</p>"
+msgstr "<p>Eroare la procesarea profilului de utilizator. Vă rugăm să ștergeți configurarea şi apoi reîncercați.</p>"
+
+#: appnet.php:164
+msgid "<p>You have two ways to connect to App.net.</p>"
+msgstr "<p>Aveți două modalități de a vă conecta la App.net.</p>"
+
+#: appnet.php:166
+msgid ""
+"<p>First way: Register an application at <a "
+"href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a>"
+" and enter Client ID and Client Secret. "
+msgstr "<p>Prima modalitate: Înregistrați o cerere pe <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> şi introduceți ID Client şi Cheia Secretă Client."
+
+#: appnet.php:167
+#, php-format
+msgid "Use '%s' as Redirect URI<p>"
+msgstr "Utilizați '%s' ca URI de Redirecţionare<p>"
+
+#: appnet.php:169
+msgid "Client ID"
+msgstr "ID Client"
+
+#: appnet.php:173
+msgid "Client Secret"
+msgstr "Cheia Secretă Client"
+
+#: appnet.php:177
+msgid ""
+"<p>Second way: fetch a token at <a href=\"http://dev-"
+"lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "
+msgstr "<p>A doua cale: autorizați un indicativ de acces token de pe <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a> ."
+
+#: appnet.php:178
+msgid ""
+"Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', "
+"'Messages'.</p>"
+msgstr "Stabiliți aceste scopuri: 'De Bază', 'Flux', 'Scriere Postare', 'Mesaje Publice', 'Mesaje'.</p>"
+
+#: appnet.php:180
+msgid "Token"
+msgstr "Token"
+
+#: appnet.php:192
+msgid "Sign in using App.net"
+msgstr "Autentificați-vă utilizând App.net"
+
+#: appnet.php:197
+msgid "Clear OAuth configuration"
+msgstr "Ștergeți configurările OAuth"
+
+#: appnet.php:204
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/appnet/lang/ro/strings.php b/appnet/lang/ro/strings.php
new file mode 100644
index 00000000..fa8d139d
--- /dev/null
+++ b/appnet/lang/ro/strings.php
@@ -0,0 +1,29 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["You are now authenticated to app.net. "] = "Acum sunteți autentificat pe App.net.";
+$a->strings["<p>Error fetching token. Please try again.</p>"] = "<p>Eroare la procesarea token-ului. Vă rugăm să reîncercați.</p>";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to app.net"] = "Postați pe App.net";
+$a->strings["App.net Export"] = "Exportare pe App.net";
+$a->strings["Currently connected to: "] = "Conectat curent la:";
+$a->strings["Enable App.net Post Plugin"] = "Activare Modul Postare pe App.net";
+$a->strings["Post to App.net by default"] = "Postați implicit pe App.net";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["<p>Error fetching user profile. Please clear the configuration and try again.</p>"] = "<p>Eroare la procesarea profilului de utilizator. Vă rugăm să ștergeți configurarea şi apoi reîncercați.</p>";
+$a->strings["<p>You have two ways to connect to App.net.</p>"] = "<p>Aveți două modalități de a vă conecta la App.net.</p>";
+$a->strings["<p>First way: Register an application at <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> and enter Client ID and Client Secret. "] = "<p>Prima modalitate: Înregistrați o cerere pe <a href=\"https://account.app.net/developer/apps/\">https://account.app.net/developer/apps/</a> şi introduceți ID Client şi Cheia Secretă Client.";
+$a->strings["Use '%s' as Redirect URI<p>"] = "Utilizați '%s' ca URI de Redirecţionare<p>";
+$a->strings["Client ID"] = "ID Client";
+$a->strings["Client Secret"] = "Cheia Secretă Client";
+$a->strings["<p>Second way: fetch a token at <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a>. "] = "<p>A doua cale: autorizați un indicativ de acces token de pe <a href=\"http://dev-lite.jonathonduerig.com/\">http://dev-lite.jonathonduerig.com/</a> .";
+$a->strings["Set these scopes: 'Basic', 'Stream', 'Write Post', 'Public Messages', 'Messages'.</p>"] = "Stabiliți aceste scopuri: 'De Bază', 'Flux', 'Scriere Postare', 'Mesaje Publice', 'Mesaje'.</p>";
+$a->strings["Token"] = "Token";
+$a->strings["Sign in using App.net"] = "Autentificați-vă utilizând App.net";
+$a->strings["Clear OAuth configuration"] = "Ștergeți configurările OAuth";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/appnet/templates/admin.tpl b/appnet/templates/admin.tpl
deleted file mode 100644
index a933f3d3..00000000
--- a/appnet/templates/admin.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{include file="field_input.tpl" field=$clientid}}
-{{include file="field_input.tpl" field=$clientsecret}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/appnetpost/lang/C/messages.po b/appnetpost/lang/C/messages.po
new file mode 100644
index 00000000..4778c497
--- /dev/null
+++ b/appnetpost/lang/C/messages.po
@@ -0,0 +1,38 @@
+# ADDON appnetpost
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica appnetpost addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: appnetpost.php:37
+msgid "Post to app.net"
+msgstr ""
+
+#: appnetpost.php:59 appnetpost.php:63
+msgid "App.net Export"
+msgstr ""
+
+#: appnetpost.php:67
+msgid "Enable App.net Post Plugin"
+msgstr ""
+
+#: appnetpost.php:72
+msgid "Post to App.net by default"
+msgstr ""
+
+#: appnetpost.php:78
+msgid "Save Settings"
+msgstr ""
diff --git a/appnetpost/lang/cs/messages.po b/appnetpost/lang/cs/messages.po
new file mode 100644
index 00000000..9490c5fb
--- /dev/null
+++ b/appnetpost/lang/cs/messages.po
@@ -0,0 +1,40 @@
+# ADDON appnetpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnetpost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-07-02 15:25+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: appnetpost.php:37
+msgid "Post to app.net"
+msgstr "Poslat příspěvek na app.net"
+
+#: appnetpost.php:59 appnetpost.php:63
+msgid "App.net Export"
+msgstr "App.net Export"
+
+#: appnetpost.php:67
+msgid "Enable App.net Post Plugin"
+msgstr "Aktivovat App.net Post Plugin"
+
+#: appnetpost.php:72
+msgid "Post to App.net by default"
+msgstr "Defaultně poslat na App.net"
+
+#: appnetpost.php:78
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/appnetpost/lang/cs/strings.php b/appnetpost/lang/cs/strings.php
new file mode 100644
index 00000000..231a7c63
--- /dev/null
+++ b/appnetpost/lang/cs/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to app.net"] = "Poslat příspěvek na app.net";
+$a->strings["App.net Export"] = "App.net Export";
+$a->strings["Enable App.net Post Plugin"] = "Aktivovat App.net Post Plugin";
+$a->strings["Post to App.net by default"] = "Defaultně poslat na App.net";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/appnetpost/lang/de/messages.po b/appnetpost/lang/de/messages.po
new file mode 100644
index 00000000..368b8da7
--- /dev/null
+++ b/appnetpost/lang/de/messages.po
@@ -0,0 +1,40 @@
+# ADDON appnetpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnetpost addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-07-03 05:42+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: appnetpost.php:37
+msgid "Post to app.net"
+msgstr "Bei app.net veröffentlichen"
+
+#: appnetpost.php:59 appnetpost.php:63
+msgid "App.net Export"
+msgstr "App.net Export"
+
+#: appnetpost.php:67
+msgid "Enable App.net Post Plugin"
+msgstr "Veröffentlichungen bei App.net erlauben"
+
+#: appnetpost.php:72
+msgid "Post to App.net by default"
+msgstr "Standardmäßig bei App.net veröffentlichen"
+
+#: appnetpost.php:78
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/appnetpost/lang/de/strings.php b/appnetpost/lang/de/strings.php
new file mode 100644
index 00000000..7925d92e
--- /dev/null
+++ b/appnetpost/lang/de/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to app.net"] = "Bei app.net veröffentlichen";
+$a->strings["App.net Export"] = "App.net Export";
+$a->strings["Enable App.net Post Plugin"] = "Veröffentlichungen bei App.net erlauben";
+$a->strings["Post to App.net by default"] = "Standardmäßig bei App.net veröffentlichen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/appnetpost/lang/ro/messages.po b/appnetpost/lang/ro/messages.po
new file mode 100644
index 00000000..dbe56220
--- /dev/null
+++ b/appnetpost/lang/ro/messages.po
@@ -0,0 +1,39 @@
+# ADDON appnetpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica appnetpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 11:47+0200\n"
+"PO-Revision-Date: 2014-07-08 11:41+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: appnetpost.php:37
+msgid "Post to app.net"
+msgstr "Postați pe App.net"
+
+#: appnetpost.php:59 appnetpost.php:63
+msgid "App.net Export"
+msgstr "Exportare pe App.net"
+
+#: appnetpost.php:67
+msgid "Enable App.net Post Plugin"
+msgstr "Activare Modul Postare pe App.net"
+
+#: appnetpost.php:72
+msgid "Post to App.net by default"
+msgstr "Postați implicit pe App.net"
+
+#: appnetpost.php:78
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/appnetpost/lang/ro/strings.php b/appnetpost/lang/ro/strings.php
new file mode 100644
index 00000000..176f6c88
--- /dev/null
+++ b/appnetpost/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to app.net"] = "Postați pe App.net";
+$a->strings["App.net Export"] = "Exportare pe App.net";
+$a->strings["Enable App.net Post Plugin"] = "Activare Modul Postare pe App.net";
+$a->strings["Post to App.net by default"] = "Postați implicit pe App.net";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/blackout/lang/C/messages.po b/blackout/lang/C/messages.po
index 76e9d69d..d67af05e 100644
--- a/blackout/lang/C/messages.po
+++ b/blackout/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,5 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: blackout.php:99
-msgid "Submit"
+msgid "Save Settings"
+msgstr ""
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr ""
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr ""
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr ""
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</"
+"em> hour and <em>mm</em> minute"
+msgstr ""
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr ""
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix this."
 msgstr ""
diff --git a/blackout/lang/cs/messages.po b/blackout/lang/cs/messages.po
new file mode 100644
index 00000000..1fa459af
--- /dev/null
+++ b/blackout/lang/cs/messages.po
@@ -0,0 +1,52 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-02 15:28+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: blackout.php:99
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr "URL Přesměrování"
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "všichni vaši návštěvníci z webu budou přesměrování na tuto URL adresu"
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr "Zahájení odstávky"
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "formát je <em>RRRR</em> rok, <em>MM</em> měsíc, <em>DD</em> den, <em>hh</em> hodina a <em>mm</em> minuta"
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr "Konec odstávky"
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "Datum konce odstávky je před datem zahájení odstávky prosím opravte to."
diff --git a/blackout/lang/cs/strings.php b/blackout/lang/cs/strings.php
index ae3080c1..6bca0c65 100644
--- a/blackout/lang/cs/strings.php
+++ b/blackout/lang/cs/strings.php
@@ -1,3 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Redirect URL"] = "URL Přesměrování";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "všichni vaši návštěvníci z webu budou přesměrování na tuto URL adresu";
+$a->strings["Begin of the Blackout"] = "Zahájení odstávky";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formát je <em>RRRR</em> rok, <em>MM</em> měsíc, <em>DD</em> den, <em>hh</em> hodina a <em>mm</em> minuta";
+$a->strings["End of the Blackout"] = "Konec odstávky";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Datum konce odstávky je před datem zahájení odstávky prosím opravte to.";
diff --git a/blackout/lang/de/messages.po b/blackout/lang/de/messages.po
new file mode 100644
index 00000000..e0ff33e3
--- /dev/null
+++ b/blackout/lang/de/messages.po
@@ -0,0 +1,52 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-26 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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blackout.php:99
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr "Umleitungs-URL"
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "Alle Besucher der Webseite werden zu dieser URL umgeleitet"
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr "Beginn des Blackouts"
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "Das Format ist <em>YYYY</em> Jahr, <em>MM</em> Monat, <em>DD</em> Tag, <em>hh</em> Stunde und <em>mm</em> Minute"
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr "Ende des Blackouts"
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "Das Enddatum liegt vor dem Startdatum des Blackouts, du solltest dies korrigieren."
diff --git a/blackout/lang/de/strings.php b/blackout/lang/de/strings.php
index 9e5d0516..66570090 100644
--- a/blackout/lang/de/strings.php
+++ b/blackout/lang/de/strings.php
@@ -1,3 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Redirect URL"] = "Umleitungs-URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "Alle Besucher der Webseite werden zu dieser URL umgeleitet";
+$a->strings["Begin of the Blackout"] = "Beginn des Blackouts";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "Das Format ist <em>YYYY</em> Jahr, <em>MM</em> Monat, <em>DD</em> Tag, <em>hh</em> Stunde und <em>mm</em> Minute";
+$a->strings["End of the Blackout"] = "Ende des Blackouts";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Das Enddatum liegt vor dem Startdatum des Blackouts, du solltest dies korrigieren.";
diff --git a/blackout/lang/ro/messages.po b/blackout/lang/ro/messages.po
new file mode 100644
index 00000000..c19779ac
--- /dev/null
+++ b/blackout/lang/ro/messages.po
@@ -0,0 +1,51 @@
+# ADDON blackout
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blackout addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:42+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: blackout.php:99
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: blackout.php:100
+msgid "Redirect URL"
+msgstr "URL de Redirecționare"
+
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "toți vizitatorii dvs. de pe web vor fi redirecționați către acest URL"
+
+#: blackout.php:101
+msgid "Begin of the Blackout"
+msgstr "Pornire punct Blackout"
+
+#: blackout.php:101
+msgid ""
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "formatul este <em>YYYY</em> anul, <em>MM</em> luna, <em>DD</em> ziua, <em>hh</em> ora și <em>mm</em> minute"
+
+#: blackout.php:102
+msgid "End of the Blackout"
+msgstr "Finalizare punct Blackout"
+
+#: blackout.php:108
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "Data de finalizare este anterioară punctului blackout de pornire, ar trebui să corectați aceasta."
diff --git a/blackout/lang/ro/strings.php b/blackout/lang/ro/strings.php
new file mode 100644
index 00000000..498f7c3e
--- /dev/null
+++ b/blackout/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Redirect URL"] = "URL de Redirecționare";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "toți vizitatorii dvs. de pe web vor fi redirecționați către acest URL";
+$a->strings["Begin of the Blackout"] = "Pornire punct Blackout";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formatul este <em>YYYY</em> anul, <em>MM</em> luna, <em>DD</em> ziua, <em>hh</em> ora și <em>mm</em> minute";
+$a->strings["End of the Blackout"] = "Finalizare punct Blackout";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Data de finalizare este anterioară punctului blackout de pornire, ar trebui să corectați aceasta.";
diff --git a/blockem/lang/C/messages.po b/blockem/lang/C/messages.po
index 8089438b..39c4f231 100644
--- a/blockem/lang/C/messages.po
+++ b/blockem/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,35 +17,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockem.php:51
-msgid "\"Blockem\" Settings"
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
 msgstr ""
 
-#: blockem.php:53
+#: blockem.php:61
 msgid "Comma separated profile URLS to block"
 msgstr ""
 
-#: blockem.php:57
-msgid "Submit"
+#: blockem.php:65
+msgid "Save Settings"
 msgstr ""
 
-#: blockem.php:70
+#: blockem.php:78
 msgid "BLOCKEM Settings saved."
 msgstr ""
 
-#: blockem.php:105
+#: blockem.php:142
 #, php-format
 msgid "Blocked %s - Click to open/close"
 msgstr ""
 
-#: blockem.php:160
+#: blockem.php:197
 msgid "Unblock Author"
 msgstr ""
 
-#: blockem.php:162
+#: blockem.php:199
 msgid "Block Author"
 msgstr ""
 
-#: blockem.php:194
+#: blockem.php:231
 msgid "blockem settings updated"
 msgstr ""
diff --git a/blockem/lang/cs/messages.po b/blockem/lang/cs/messages.po
new file mode 100644
index 00000000..249f57eb
--- /dev/null
+++ b/blockem/lang/cs/messages.po
@@ -0,0 +1,53 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-02 15:28+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS to block"
+msgstr "Čárkou oddělené URL adresy profilů určených k ignorování"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM nastavení uloženo."
+
+#: blockem.php:142
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "Blokován %s - Klikněte pro otevření/zavření"
+
+#: blockem.php:197
+msgid "Unblock Author"
+msgstr "Odblokovat autora"
+
+#: blockem.php:199
+msgid "Block Author"
+msgstr "Zablokovat autora"
+
+#: blockem.php:231
+msgid "blockem settings updated"
+msgstr "blockem nastavení aktualizováno"
diff --git a/blockem/lang/cs/strings.php b/blockem/lang/cs/strings.php
index 174abc63..fad08059 100644
--- a/blockem/lang/cs/strings.php
+++ b/blockem/lang/cs/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Nastavení";
-$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["BLOCKEM Settings saved."] = "BLOCKEM nastavení uloženo.";
-$a->strings["Blocked %s - Click to open/close"] = "Blokován %s - Klikněte pro otevření/zavření";
-$a->strings["Unblock Author"] = "Odblokovat autora";
-$a->strings["Block Author"] = "Zablokovat autora";
-$a->strings["blockem settings updated"] = "blockem nastavení aktualizováno";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM nastavení uloženo.";
+$a->strings["Blocked %s - Click to open/close"] = "Blokován %s - Klikněte pro otevření/zavření";
+$a->strings["Unblock Author"] = "Odblokovat autora";
+$a->strings["Block Author"] = "Zablokovat autora";
+$a->strings["blockem settings updated"] = "blockem nastavení aktualizováno";
diff --git a/blockem/lang/de/messages.po b/blockem/lang/de/messages.po
new file mode 100644
index 00000000..ba950067
--- /dev/null
+++ b/blockem/lang/de/messages.po
@@ -0,0 +1,53 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-03 05:44+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS to block"
+msgstr "Liste von Profil URLs die geblockt werden soll (durch Kommas getrennt)"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM-Einstellungen gesichert."
+
+#: blockem.php:142
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s blockiert - Zum Öffnen/Schließen klicken"
+
+#: blockem.php:197
+msgid "Unblock Author"
+msgstr "Autor freischalten"
+
+#: blockem.php:199
+msgid "Block Author"
+msgstr "Autor blockieren"
+
+#: blockem.php:231
+msgid "blockem settings updated"
+msgstr "blockem Einstellungen aktualisiert"
diff --git a/blockem/lang/de/strings.php b/blockem/lang/de/strings.php
index 132b68a2..a11507bd 100644
--- a/blockem/lang/de/strings.php
+++ b/blockem/lang/de/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
-$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
-$a->strings["Submit"] = "Senden";
-$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert.";
-$a->strings["Blocked %s - Click to open/close"] = "%s blockiert - Zum Öffnen/Schließen klicken";
-$a->strings["Unblock Author"] = "Autor freischalten";
-$a->strings["Block Author"] = "Autor blockieren";
-$a->strings["blockem settings updated"] = "blockem Einstellungen aktualisiert";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Liste von Profil URLs die geblockt werden soll (durch Kommas getrennt)";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blockiert - Zum Öffnen/Schließen klicken";
+$a->strings["Unblock Author"] = "Autor freischalten";
+$a->strings["Block Author"] = "Autor blockieren";
+$a->strings["blockem settings updated"] = "blockem Einstellungen aktualisiert";
diff --git a/blockem/lang/ro/messages.po b/blockem/lang/ro/messages.po
new file mode 100644
index 00000000..a74e5757
--- /dev/null
+++ b/blockem/lang/ro/messages.po
@@ -0,0 +1,52 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:43+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS to block"
+msgstr "Adresele URL de profil, de blocat, separate prin virgulă"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Configurările BLOCKEM au fost salvate."
+
+#: blockem.php:142
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s Blocate - Apăsați pentru a deschide/închide"
+
+#: blockem.php:197
+msgid "Unblock Author"
+msgstr "Deblocare Autor"
+
+#: blockem.php:199
+msgid "Block Author"
+msgstr "Blocare Autor"
+
+#: blockem.php:231
+msgid "blockem settings updated"
+msgstr "Configurările blockem au fost actualizate"
diff --git a/blockem/lang/ro/strings.php b/blockem/lang/ro/strings.php
new file mode 100644
index 00000000..b842467d
--- /dev/null
+++ b/blockem/lang/ro/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Adresele URL de profil, de blocat, separate prin virgulă";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["BLOCKEM Settings saved."] = "Configurările BLOCKEM au fost salvate.";
+$a->strings["Blocked %s - Click to open/close"] = "%s Blocate - Apăsați pentru a deschide/închide";
+$a->strings["Unblock Author"] = "Deblocare Autor";
+$a->strings["Block Author"] = "Blocare Autor";
+$a->strings["blockem settings updated"] = "Configurările blockem au fost actualizate";
diff --git a/blogger/lang/C/messages.po b/blogger/lang/C/messages.po
index 1c9caee7..1f99bc65 100644
--- a/blogger/lang/C/messages.po
+++ b/blogger/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,34 +21,34 @@ msgstr ""
 msgid "Post to blogger"
 msgstr ""
 
-#: blogger.php:74
-msgid "Blogger Post Settings"
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
 msgstr ""
 
-#: blogger.php:76
+#: blogger.php:82
 msgid "Enable Blogger Post Plugin"
 msgstr ""
 
-#: blogger.php:81
+#: blogger.php:87
 msgid "Blogger username"
 msgstr ""
 
-#: blogger.php:86
+#: blogger.php:92
 msgid "Blogger password"
 msgstr ""
 
-#: blogger.php:91
+#: blogger.php:97
 msgid "Blogger API URL"
 msgstr ""
 
-#: blogger.php:96
+#: blogger.php:102
 msgid "Post to Blogger by default"
 msgstr ""
 
-#: blogger.php:102
-msgid "Submit"
+#: blogger.php:108
+msgid "Save Settings"
 msgstr ""
 
-#: blogger.php:172
+#: blogger.php:178
 msgid "Post from Friendica"
 msgstr ""
diff --git a/blogger/lang/cs/messages.po/cs.po b/blogger/lang/cs/messages.po/cs.po
new file mode 100644
index 00000000..0d2a1227
--- /dev/null
+++ b/blogger/lang/cs/messages.po/cs.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-02 15:29+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Poslat na blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Export"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Plugin"
+msgstr "Povolit Blogger Post Plugin"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger uživatelské jméno"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger heslo"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Defaultně zaslat na Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Příspěvek z Friendica"
diff --git a/blogger/lang/cs/strings.php b/blogger/lang/cs/strings.php
index 1bd39241..a4abe2da 100644
--- a/blogger/lang/cs/strings.php
+++ b/blogger/lang/cs/strings.php
@@ -1,11 +1,2 @@
-<?php
-
-$a->strings["Post to blogger"] = "Poslat na blogger";
-$a->strings["Blogger Post Settings"] = "Nastavení příspěvků na Blogger ";
-$a->strings["Enable Blogger Post Plugin"] = "Povolit Blogger Post Plugin";
-$a->strings["Blogger username"] = "Blogger uživatelské jméno";
-$a->strings["Blogger password"] = "Blogger heslo";
-$a->strings["Blogger API URL"] = "Blogger API URL";
-$a->strings["Post to Blogger by default"] = "Defaultně zaslat na Blogger";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
+<?php
+
diff --git a/blogger/lang/de/messages.po b/blogger/lang/de/messages.po
new file mode 100644
index 00000000..61cb7863
--- /dev/null
+++ b/blogger/lang/de/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-29 08:19+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Auf Blogger posten"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Export"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Plugin"
+msgstr "Blogger-Post-Plugin aktivieren"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger-Benutzername"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger-Passwort"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger-API-URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Standardmäßig auf Blogger posten"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Post via Friendica"
diff --git a/blogger/lang/de/strings.php b/blogger/lang/de/strings.php
index 0146f1d8..8e44b4c2 100644
--- a/blogger/lang/de/strings.php
+++ b/blogger/lang/de/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Post to blogger"] = "Auf Blogger posten";
-$a->strings["Blogger Post Settings"] = "Einstellungen zum posten auf Blogger";
-$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren";
-$a->strings["Blogger username"] = "Blogger-Benutzername";
-$a->strings["Blogger password"] = "Blogger-Passwort";
-$a->strings["Blogger API URL"] = "Blogger-API-URL";
-$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten";
-$a->strings["Submit"] = "Senden";
-$a->strings["Post from Friendica"] = "Beitrag via Friendica";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Auf Blogger posten";
+$a->strings["Blogger Export"] = "Blogger Export";
+$a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren";
+$a->strings["Blogger username"] = "Blogger-Benutzername";
+$a->strings["Blogger password"] = "Blogger-Passwort";
+$a->strings["Blogger API URL"] = "Blogger-API-URL";
+$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Post from Friendica"] = "Post via Friendica";
diff --git a/blogger/lang/ro/messages.po b/blogger/lang/ro/messages.po
new file mode 100644
index 00000000..8ba21d2f
--- /dev/null
+++ b/blogger/lang/ro/messages.po
@@ -0,0 +1,55 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:44+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Postați pe Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Export pe Blogger "
+
+#: blogger.php:82
+msgid "Enable Blogger Post Plugin"
+msgstr "Activare Modul Postare pe Blogger "
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Utilizator Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Parolă Blogger "
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL Cheie API Blogger "
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Postați implicit pe Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Postați din Friendica"
diff --git a/blogger/lang/ro/strings.php b/blogger/lang/ro/strings.php
new file mode 100644
index 00000000..f89fd4b9
--- /dev/null
+++ b/blogger/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to blogger"] = "Postați pe Blogger";
+$a->strings["Blogger Export"] = "Export pe Blogger ";
+$a->strings["Enable Blogger Post Plugin"] = "Activare Modul Postare pe Blogger ";
+$a->strings["Blogger username"] = "Utilizator Blogger";
+$a->strings["Blogger password"] = "Parolă Blogger ";
+$a->strings["Blogger API URL"] = "URL Cheie API Blogger ";
+$a->strings["Post to Blogger by default"] = "Postați implicit pe Blogger";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Post from Friendica"] = "Postați din Friendica";
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 595dba43..4b81fb31 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -60,13 +60,6 @@ function buffer_plugin_admin(&$a, &$o){
 		'$client_secret' => array('client_secret', t('Client Secret'),  get_config('buffer', 'client_secret' ), ''),
 	));
 }
-function buffer_plugin_admin_post(&$a){
-        $client_id     =       ((x($_POST,'client_id'))              ? notags(trim($_POST['client_id']))   : '');
-        $client_secret =       ((x($_POST,'client_secret'))   ? notags(trim($_POST['client_secret'])): '');
-        set_config('buffer','client_id',$client_id);
-        set_config('buffer','client_secret',$client_secret);
-        info( t('Settings updated.'). EOL );
-}
 
 function buffer_connect(&$a) {
 
@@ -253,6 +246,9 @@ function buffer_send(&$a,&$b) {
 	if($access_token) {
 		$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
 
+		$result = q("SELECT `installed` FROM `addon` WHERE `name` = 'privacy_image_cache' AND `installed`");
+		$image_cache = (count($result) > 0);
+
 		require_once("include/plaintext.php");
 		require_once("include/network.php");
 
@@ -305,13 +301,15 @@ function buffer_send(&$a,&$b) {
 				$post = plaintext($a, $item, $limit, $includedlinks);
 				logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
 
-				// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
-				require_once("mod/proxy.php");
-				if (isset($post["image"]))
-					$post["image"] = proxy_url($post["image"]);
+				// The image cache is used as a sanitizer. Buffer seems to be really picky about pictures
+				if ($image_cache) {
+					require_once("addon/privacy_image_cache/privacy_image_cache.php");
+					if (isset($post["image"]))
+						$post["image"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["image"]);
 
-				if (isset($post["preview"]))
-					$post["preview"] = proxy_url($post["preview"]);
+					if (isset($post["preview"]))
+						$post["preview"] = $a->get_baseurl() . "/privacy_image_cache/".privacy_image_cache_cachename($post["preview"]);
+				}
 
 				//if ($profile->service == "twitter") {
 				if ($includedlinks) {
diff --git a/buffer/lang/C/messages.po b/buffer/lang/C/messages.po
new file mode 100644
index 00000000..17522ebe
--- /dev/null
+++ b/buffer/lang/C/messages.po
@@ -0,0 +1,74 @@
+# ADDON buffer
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr ""
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr ""
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr ""
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr ""
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr ""
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr ""
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr ""
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr ""
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr ""
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr ""
+
+#: buffer.php:146
+msgid "Enable Buffer Post Plugin"
+msgstr ""
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr ""
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr ""
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr ""
diff --git a/buffer/lang/cs/messages.po b/buffer/lang/cs/messages.po
new file mode 100644
index 00000000..7ec1390b
--- /dev/null
+++ b/buffer/lang/cs/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:27+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Chyba při registraci buffer spojená"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Nyní jste přihlášen k bufferu."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "návrat ke stránce konektor"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Příspěvek na Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Export"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Přihlásit ke spojení na Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Plugin"
+msgstr "Povolit Buffer Post Plugin"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Defaultně zaslat na Buffer"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Zaškrtnout pro smazání tohoto nastavení"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Příspěvky jsou zasílány na všechny účty, které jsou defaultně povoleny:"
diff --git a/buffer/lang/cs/strings.php b/buffer/lang/cs/strings.php
new file mode 100644
index 00000000..052b3e8e
--- /dev/null
+++ b/buffer/lang/cs/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Chyba při registraci buffer spojená";
+$a->strings["You are now authenticated to buffer. "] = "Nyní jste přihlášen k bufferu.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to Buffer"] = "Příspěvek na Buffer";
+$a->strings["Buffer Export"] = "Buffer Export";
+$a->strings["Authenticate your Buffer connection"] = "Přihlásit ke spojení na Buffer";
+$a->strings["Enable Buffer Post Plugin"] = "Povolit Buffer Post Plugin";
+$a->strings["Post to Buffer by default"] = "Defaultně zaslat na Buffer";
+$a->strings["Check to delete this preset"] = "Zaškrtnout pro smazání tohoto nastavení";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Příspěvky jsou zasílány na všechny účty, které jsou defaultně povoleny:";
diff --git a/buffer/lang/de/messages.po b/buffer/lang/de/messages.po
new file mode 100644
index 00000000..21bbdda1
--- /dev/null
+++ b/buffer/lang/de/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-03 05:49+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Fehler beim Registrieren des buffer Connectors."
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Du bist nun auf buffer authentifiziert."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "zurück zur Connector Seite"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Auf buffer veröffentlichen"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Export"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Authentifiziere deine Verbindung zu buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Plugin"
+msgstr "Buffer Post-Plugin aktivieren"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Standardmäßig auf buffer veröffentlichen"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Markieren um dieses Preset zu löschen"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Beiträge werden an alle Accounts geschickt, die Standardmäßig aktiviert sind."
diff --git a/buffer/lang/de/strings.php b/buffer/lang/de/strings.php
new file mode 100644
index 00000000..4ddbf1e9
--- /dev/null
+++ b/buffer/lang/de/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Fehler beim Registrieren des buffer Connectors.";
+$a->strings["You are now authenticated to buffer. "] = "Du bist nun auf buffer authentifiziert.";
+$a->strings["return to the connector page"] = "zurück zur Connector Seite";
+$a->strings["Post to Buffer"] = "Auf buffer veröffentlichen";
+$a->strings["Buffer Export"] = "Buffer Export";
+$a->strings["Authenticate your Buffer connection"] = "Authentifiziere deine Verbindung zu buffer";
+$a->strings["Enable Buffer Post Plugin"] = "Buffer Post-Plugin aktivieren";
+$a->strings["Post to Buffer by default"] = "Standardmäßig auf buffer veröffentlichen";
+$a->strings["Check to delete this preset"] = "Markieren um dieses Preset zu löschen";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Beiträge werden an alle Accounts geschickt, die Standardmäßig aktiviert sind.";
diff --git a/buffer/lang/ro/messages.po b/buffer/lang/ro/messages.po
new file mode 100644
index 00000000..383390aa
--- /dev/null
+++ b/buffer/lang/ro/messages.po
@@ -0,0 +1,75 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:45+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "ID Client"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Cheia Secretă Client"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Eroare la înregistrarea conexiunii Buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Acum sunteți autentificat pe Buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "revenire la pagina de conectare"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Postați pe Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Export pe Buffer "
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autentificați-vă conectarea la Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Plugin"
+msgstr "Activare Modul Postare pe Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Postați implicit pe Buffer"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Bifați pentru a șterge această presetare"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Posturile merg către toate conturile care sunt activate implicit:"
diff --git a/buffer/lang/ro/strings.php b/buffer/lang/ro/strings.php
new file mode 100644
index 00000000..7e7e575f
--- /dev/null
+++ b/buffer/lang/ro/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Client ID"] = "ID Client";
+$a->strings["Client Secret"] = "Cheia Secretă Client";
+$a->strings["Error when registering buffer connection:"] = "Eroare la înregistrarea conexiunii Buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Acum sunteți autentificat pe Buffer.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to Buffer"] = "Postați pe Buffer";
+$a->strings["Buffer Export"] = "Export pe Buffer ";
+$a->strings["Authenticate your Buffer connection"] = "Autentificați-vă conectarea la Buffer";
+$a->strings["Enable Buffer Post Plugin"] = "Activare Modul Postare pe Buffer";
+$a->strings["Post to Buffer by default"] = "Postați implicit pe Buffer";
+$a->strings["Check to delete this preset"] = "Bifați pentru a șterge această presetare";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Posturile merg către toate conturile care sunt activate implicit:";
diff --git a/buglink/lang/C/messages.po b/buglink/lang/C/messages.po
index 260c583a..1721ffa6 100644
--- a/buglink/lang/C/messages.po
+++ b/buglink/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/buglink/lang/cs/messages.po b/buglink/lang/cs/messages.po
new file mode 100644
index 00000000..61dc88cf
--- /dev/null
+++ b/buglink/lang/cs/messages.po
@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:27+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Nahlásit chybu"
diff --git a/buglink/lang/cs/strings.php b/buglink/lang/cs/strings.php
index a1cd51f4..7a9f9204 100644
--- a/buglink/lang/cs/strings.php
+++ b/buglink/lang/cs/strings.php
@@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Report Bug"] = "Nahlásit chybu";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Report Bug"] = "Nahlásit chybu";
diff --git a/buglink/lang/de/messages.po b/buglink/lang/de/messages.po
new file mode 100644
index 00000000..a9f5dd12
--- /dev/null
+++ b/buglink/lang/de/messages.po
@@ -0,0 +1,24 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-22 11:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Fehler melden."
diff --git a/buglink/lang/de/strings.php b/buglink/lang/de/strings.php
index cf96a178..19123819 100644
--- a/buglink/lang/de/strings.php
+++ b/buglink/lang/de/strings.php
@@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Report Bug"] = "Fehlerreport erstellen";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Report Bug"] = "Fehler melden.";
diff --git a/buglink/lang/ro/messages.po b/buglink/lang/ro/messages.po
new file mode 100644
index 00000000..ef213bf6
--- /dev/null
+++ b/buglink/lang/ro/messages.po
@@ -0,0 +1,23 @@
+# ADDON buglink
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buglink addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:45+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: buglink.php:15
+msgid "Report Bug"
+msgstr "Raportează Problema"
diff --git a/buglink/lang/ro/strings.php b/buglink/lang/ro/strings.php
new file mode 100644
index 00000000..25a9c769
--- /dev/null
+++ b/buglink/lang/ro/strings.php
@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Report Bug"] = "Raportează Problema";
diff --git a/cal/lang/C/messages.po b/cal/lang/C/messages.po
index db7ae28b..91883299 100644
--- a/cal/lang/C/messages.po
+++ b/cal/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-19 13:20+0200\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,22 +33,22 @@ msgstr ""
 msgid "This calendar format is not supported"
 msgstr ""
 
-#: cal.php:174
+#: cal.php:181 cal.php:185
 msgid "Export Events"
 msgstr ""
 
-#: cal.php:175
+#: cal.php:189
 msgid "If this is enabled, your public events will be available at"
 msgstr ""
 
-#: cal.php:176
+#: cal.php:190
 msgid "Currently supported formats are ical and csv."
 msgstr ""
 
-#: cal.php:178
+#: cal.php:191
 msgid "Enable calendar export"
 msgstr ""
 
-#: cal.php:181
-msgid "Submit"
+#: cal.php:193
+msgid "Save Settings"
 msgstr ""
diff --git a/cal/lang/cs/messages.po b/cal/lang/cs/messages.po
new file mode 100644
index 00000000..c21062e5
--- /dev/null
+++ b/cal/lang/cs/messages.po
@@ -0,0 +1,56 @@
+# ADDON cal
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cal addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-19 13:20+0200\n"
+"PO-Revision-Date: 2014-07-07 18:29+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: cal.php:33
+msgid "Event Export"
+msgstr "Export událostí"
+
+#: cal.php:33
+msgid "You can download public events from: "
+msgstr "Veřejné události si můžete stánout z:"
+
+#: cal.php:53
+msgid "The user does not export the calendar."
+msgstr "Uživatel kalenář neexportuje."
+
+#: cal.php:83
+msgid "This calendar format is not supported"
+msgstr "Tento kalendářový formát není podporován."
+
+#: cal.php:174
+msgid "Export Events"
+msgstr "Export událostí"
+
+#: cal.php:175
+msgid "If this is enabled, your public events will be available at"
+msgstr "Pokud je toto povoleno, vaše veřejné události budou viditelné na"
+
+#: cal.php:176
+msgid "Currently supported formats are ical and csv."
+msgstr "Aktuálně podporované formáty jsou ical a csv."
+
+#: cal.php:178
+msgid "Enable calendar export"
+msgstr "Povolit export kalendáře"
+
+#: cal.php:181
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/cal/lang/cs/strings.php b/cal/lang/cs/strings.php
new file mode 100644
index 00000000..15b054d5
--- /dev/null
+++ b/cal/lang/cs/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Event Export"] = "Export událostí";
+$a->strings["You can download public events from: "] = "Veřejné události si můžete stánout z:";
+$a->strings["The user does not export the calendar."] = "Uživatel kalenář neexportuje.";
+$a->strings["This calendar format is not supported"] = "Tento kalendářový formát není podporován.";
+$a->strings["Export Events"] = "Export událostí";
+$a->strings["If this is enabled, your public events will be available at"] = "Pokud je toto povoleno, vaše veřejné události budou viditelné na";
+$a->strings["Currently supported formats are ical and csv."] = "Aktuálně podporované formáty jsou ical a csv.";
+$a->strings["Enable calendar export"] = "Povolit export kalendáře";
+$a->strings["Submit"] = "Odeslat";
diff --git a/cal/lang/de/messages.po b/cal/lang/de/messages.po
new file mode 100644
index 00000000..2e31c5ea
--- /dev/null
+++ b/cal/lang/de/messages.po
@@ -0,0 +1,56 @@
+# ADDON cal
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cal addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-19 13:20+0200\n"
+"PO-Revision-Date: 2014-06-26 07:44+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: cal.php:33
+msgid "Event Export"
+msgstr "Ereignis Export"
+
+#: cal.php:33
+msgid "You can download public events from: "
+msgstr "Du kannst öffentliche Ereignisse hier herunterladen;"
+
+#: cal.php:53
+msgid "The user does not export the calendar."
+msgstr "Diese_r Nutzer_in exportiert den Kalender nicht."
+
+#: cal.php:83
+msgid "This calendar format is not supported"
+msgstr "Dieses Kalenderformat wird nicht unterstützt."
+
+#: cal.php:174
+msgid "Export Events"
+msgstr "Exportiere Ereignisse"
+
+#: cal.php:175
+msgid "If this is enabled, your public events will be available at"
+msgstr "Wenn dies aktiviert ist, werden alle öffentliche Ereignisse unter folgender URL verfügbar sein"
+
+#: cal.php:176
+msgid "Currently supported formats are ical and csv."
+msgstr "Derzeit werden die Formate ical und csv unterstützt."
+
+#: cal.php:178
+msgid "Enable calendar export"
+msgstr "Kalenderexport aktivieren"
+
+#: cal.php:181
+msgid "Submit"
+msgstr "Senden"
diff --git a/cal/lang/de/strings.php b/cal/lang/de/strings.php
index 968a0a8a..3804f997 100644
--- a/cal/lang/de/strings.php
+++ b/cal/lang/de/strings.php
@@ -1,11 +1,16 @@
 <?php
 
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
 ;
-$a->strings["Event Export"] = "Export von Veranstaltungen";
-$a->strings["You can download public events from: "] = "Öffentliche Veranstaltungen können unter folgender Adresse geladen werden: ";
-$a->strings["The user does not export the calendar."] = "Dieser Nutzer exportiert keine Veranstaltungen.";
-$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt ";
-$a->strings["Export Events"] = "Export von Veranstaltungen";
-$a->strings["If this is enabled, your public events will be available at"] = "Ist dieses Addon aktiviert werden deine öffentlichen Veranstaltungen exportiert. Die Adresse zum Download lautet";
+$a->strings["Event Export"] = "Ereignis Export";
+$a->strings["You can download public events from: "] = "Du kannst öffentliche Ereignisse hier herunterladen;";
+$a->strings["The user does not export the calendar."] = "Diese_r Nutzer_in exportiert den Kalender nicht.";
+$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt.";
+$a->strings["Export Events"] = "Exportiere Ereignisse";
+$a->strings["If this is enabled, your public events will be available at"] = "Wenn dies aktiviert ist, werden alle öffentliche Ereignisse unter folgender URL verfügbar sein";
 $a->strings["Currently supported formats are ical and csv."] = "Derzeit werden die Formate ical und csv unterstützt.";
-$a->strings["Enable calendar export"] = "Aktiviere den Kalenderexport";
+$a->strings["Enable calendar export"] = "Kalenderexport aktivieren";
+$a->strings["Submit"] = "Senden";
diff --git a/cal/lang/ro/messages.po b/cal/lang/ro/messages.po
new file mode 100644
index 00000000..9c590a71
--- /dev/null
+++ b/cal/lang/ro/messages.po
@@ -0,0 +1,55 @@
+# ADDON cal
+# Copyright (C)
+# This file is distributed under the same license as the Friendica cal addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-19 13:20+0200\n"
+"PO-Revision-Date: 2014-07-08 11:46+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: cal.php:33
+msgid "Event Export"
+msgstr "Exportare Eveniment"
+
+#: cal.php:33
+msgid "You can download public events from: "
+msgstr "Puteți descărca evenimente publice de la:"
+
+#: cal.php:53
+msgid "The user does not export the calendar."
+msgstr "Utilizatorul nu își exportă calendarul."
+
+#: cal.php:83
+msgid "This calendar format is not supported"
+msgstr "Acest format de calendar nu este acceptat"
+
+#: cal.php:174
+msgid "Export Events"
+msgstr "Exportați Evenimente"
+
+#: cal.php:175
+msgid "If this is enabled, your public events will be available at"
+msgstr "Dacă este activat, evenimente dvs publice vor fi disponibile pe"
+
+#: cal.php:176
+msgid "Currently supported formats are ical and csv."
+msgstr "Formate acceptate în prezent sunt ical şi csv."
+
+#: cal.php:178
+msgid "Enable calendar export"
+msgstr "Activați exportarea calendarului"
+
+#: cal.php:181
+msgid "Submit"
+msgstr "Trimite"
diff --git a/cal/lang/ro/strings.php b/cal/lang/ro/strings.php
new file mode 100644
index 00000000..cafda67b
--- /dev/null
+++ b/cal/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Event Export"] = "Exportare Eveniment";
+$a->strings["You can download public events from: "] = "Puteți descărca evenimente publice de la:";
+$a->strings["The user does not export the calendar."] = "Utilizatorul nu își exportă calendarul.";
+$a->strings["This calendar format is not supported"] = "Acest format de calendar nu este acceptat";
+$a->strings["Export Events"] = "Exportați Evenimente";
+$a->strings["If this is enabled, your public events will be available at"] = "Dacă este activat, evenimente dvs publice vor fi disponibile pe";
+$a->strings["Currently supported formats are ical and csv."] = "Formate acceptate în prezent sunt ical şi csv.";
+$a->strings["Enable calendar export"] = "Activați exportarea calendarului";
+$a->strings["Submit"] = "Trimite";
diff --git a/calc/lang/C/messages.po b/calc/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/communityhome/lang/cs/messages.po b/communityhome/lang/cs/messages.po
new file mode 100644
index 00000000..27853fc2
--- /dev/null
+++ b/communityhome/lang/cs/messages.po
@@ -0,0 +1,74 @@
+# ADDON communityhome
+# Copyright (C)
+# This file is distributed under the same license as the Friendica communityhome addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:33+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: communityhome.php:29 communityhome.php:35
+msgid "Login"
+msgstr "Přihlásit se"
+
+#: communityhome.php:30
+msgid "OpenID"
+msgstr "OpenID"
+
+#: communityhome.php:46
+msgid "Latest users"
+msgstr "Poslední uživatelé"
+
+#: communityhome.php:91
+msgid "Most active users"
+msgstr "Nejaktivnější uživatelé"
+
+#: communityhome.php:109
+msgid "Latest photos"
+msgstr "Poslední fotky"
+
+#: communityhome.php:122
+msgid "Contact Photos"
+msgstr "Fotogalerie kontaktu"
+
+#: communityhome.php:123
+msgid "Profile Photos"
+msgstr "Profilové fotografie"
+
+#: communityhome.php:148
+msgid "Latest likes"
+msgstr "Poslední \"líbí se mi\""
+
+#: communityhome.php:170
+msgid "event"
+msgstr "událost"
+
+#: communityhome.php:173 communityhome.php:182
+msgid "status"
+msgstr "Stav"
+
+#: communityhome.php:178
+msgid "photo"
+msgstr "fotografie"
+
+#: communityhome.php:187
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "Uživateli %1$s se líbí %3$s uživatele %2$s"
+
+#: communityhome.php:196
+#, php-format
+msgid "Welcome to %s"
+msgstr "Vítá Vás %s"
diff --git a/communityhome/lang/cs/strings.php b/communityhome/lang/cs/strings.php
index b696a878..06cf3f36 100644
--- a/communityhome/lang/cs/strings.php
+++ b/communityhome/lang/cs/strings.php
@@ -1,14 +1,20 @@
-<?php
-
-$a->strings["Login"] = "Přihlásit se";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Latest users"] = "Poslední uživatelé";
-$a->strings["Most active users"] = "Nejaktivnější uživatelé";
-$a->strings["Latest photos"] = "Poslední fotky";
-$a->strings["Contact Photos"] = "Fotogalerie kontaktu";
-$a->strings["Profile Photos"] = "Profilové fotografie";
-$a->strings["Latest likes"] = "Poslední \"líbí se mi\"";
-$a->strings["event"] = "událost";
-$a->strings["status"] = "Stav";
-$a->strings["photo"] = "fotografie";
-$a->strings["Welcome to %s"] = "Vítá Vás %s";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Login"] = "Přihlásit se";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Latest users"] = "Poslední uživatelé";
+$a->strings["Most active users"] = "Nejaktivnější uživatelé";
+$a->strings["Latest photos"] = "Poslední fotky";
+$a->strings["Contact Photos"] = "Fotogalerie kontaktu";
+$a->strings["Profile Photos"] = "Profilové fotografie";
+$a->strings["Latest likes"] = "Poslední \"líbí se mi\"";
+$a->strings["event"] = "událost";
+$a->strings["status"] = "Stav";
+$a->strings["photo"] = "fotografie";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "Uživateli %1\$s se líbí %3\$s uživatele %2\$s";
+$a->strings["Welcome to %s"] = "Vítá Vás %s";
diff --git a/communityhome/lang/de/messages.po b/communityhome/lang/de/messages.po
new file mode 100644
index 00000000..b6f1335f
--- /dev/null
+++ b/communityhome/lang/de/messages.po
@@ -0,0 +1,74 @@
+# ADDON communityhome
+# Copyright (C)
+# This file is distributed under the same license as the Friendica communityhome addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:06+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: communityhome.php:29 communityhome.php:35
+msgid "Login"
+msgstr "Anmeldung"
+
+#: communityhome.php:30
+msgid "OpenID"
+msgstr "OpenID"
+
+#: communityhome.php:46
+msgid "Latest users"
+msgstr "Letzte Benutzer"
+
+#: communityhome.php:91
+msgid "Most active users"
+msgstr "Aktivste Nutzer"
+
+#: communityhome.php:109
+msgid "Latest photos"
+msgstr "Neueste Fotos"
+
+#: communityhome.php:122
+msgid "Contact Photos"
+msgstr "Kontaktbilder"
+
+#: communityhome.php:123
+msgid "Profile Photos"
+msgstr "Profilbilder"
+
+#: communityhome.php:148
+msgid "Latest likes"
+msgstr "Neueste Favoriten"
+
+#: communityhome.php:170
+msgid "event"
+msgstr "Veranstaltung"
+
+#: communityhome.php:173 communityhome.php:182
+msgid "status"
+msgstr "Status"
+
+#: communityhome.php:178
+msgid "photo"
+msgstr "Foto"
+
+#: communityhome.php:187
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s"
+
+#: communityhome.php:196
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen zu %s"
diff --git a/communityhome/lang/de/strings.php b/communityhome/lang/de/strings.php
index 87489c6f..87b9bccf 100644
--- a/communityhome/lang/de/strings.php
+++ b/communityhome/lang/de/strings.php
@@ -1,14 +1,20 @@
-<?php
-
-$a->strings["Login"] = "Anmeldung";
-$a->strings["OpenID"] = "OpenID";
-$a->strings["Latest users"] = "Letzte Benutzer";
-$a->strings["Most active users"] = "Aktivste Nutzer";
-$a->strings["Latest photos"] = "Neueste Fotos";
-$a->strings["Contact Photos"] = "Kontaktbilder";
-$a->strings["Profile Photos"] = "Profilbilder";
-$a->strings["Latest likes"] = "Neueste Favoriten";
-$a->strings["event"] = "Veranstaltung";
-$a->strings["status"] = "Status";
-$a->strings["photo"] = "Foto";
-$a->strings["Welcome to %s"] = "Willkommen zu %s";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Login"] = "Anmeldung";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Latest users"] = "Letzte Benutzer";
+$a->strings["Most active users"] = "Aktivste Nutzer";
+$a->strings["Latest photos"] = "Neueste Fotos";
+$a->strings["Contact Photos"] = "Kontaktbilder";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["Latest likes"] = "Neueste Favoriten";
+$a->strings["event"] = "Veranstaltung";
+$a->strings["status"] = "Status";
+$a->strings["photo"] = "Foto";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
+$a->strings["Welcome to %s"] = "Willkommen zu %s";
diff --git a/communityhome/lang/ro/messages.po b/communityhome/lang/ro/messages.po
new file mode 100644
index 00000000..68b4e733
--- /dev/null
+++ b/communityhome/lang/ro/messages.po
@@ -0,0 +1,73 @@
+# ADDON communityhome
+# Copyright (C)
+# This file is distributed under the same license as the Friendica communityhome addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:46+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: communityhome.php:29 communityhome.php:35
+msgid "Login"
+msgstr "Autentificare"
+
+#: communityhome.php:30
+msgid "OpenID"
+msgstr "OpenID"
+
+#: communityhome.php:46
+msgid "Latest users"
+msgstr "Cei mai recenți utilizatori"
+
+#: communityhome.php:91
+msgid "Most active users"
+msgstr "Cei mai activi utilizatori"
+
+#: communityhome.php:109
+msgid "Latest photos"
+msgstr "Cele mai recente fotografii"
+
+#: communityhome.php:122
+msgid "Contact Photos"
+msgstr "Fotografiile Contactului"
+
+#: communityhome.php:123
+msgid "Profile Photos"
+msgstr "Fotografii de Profil"
+
+#: communityhome.php:148
+msgid "Latest likes"
+msgstr "Cele mai recente aprecieri"
+
+#: communityhome.php:170
+msgid "event"
+msgstr "eveniment"
+
+#: communityhome.php:173 communityhome.php:182
+msgid "status"
+msgstr "status"
+
+#: communityhome.php:178
+msgid "photo"
+msgstr "fotografie"
+
+#: communityhome.php:187
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s apreciază %3$s lui %2$s"
+
+#: communityhome.php:196
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bine ați venit la %s"
diff --git a/communityhome/lang/ro/strings.php b/communityhome/lang/ro/strings.php
new file mode 100644
index 00000000..faaf2c7e
--- /dev/null
+++ b/communityhome/lang/ro/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Login"] = "Autentificare";
+$a->strings["OpenID"] = "OpenID";
+$a->strings["Latest users"] = "Cei mai recenți utilizatori";
+$a->strings["Most active users"] = "Cei mai activi utilizatori";
+$a->strings["Latest photos"] = "Cele mai recente fotografii";
+$a->strings["Contact Photos"] = "Fotografiile Contactului";
+$a->strings["Profile Photos"] = "Fotografii de Profil";
+$a->strings["Latest likes"] = "Cele mai recente aprecieri";
+$a->strings["event"] = "eveniment";
+$a->strings["status"] = "status";
+$a->strings["photo"] = "fotografie";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s apreciază %3\$s lui %2\$s";
+$a->strings["Welcome to %s"] = "Bine ați venit la %s";
diff --git a/convert/lang/C/messages.po b/convert/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/convpath/convpath.php b/convpath/convpath.php
index 8deb46cf..95093694 100644
--- a/convpath/convpath.php
+++ b/convpath/convpath.php
@@ -34,8 +34,7 @@ function convpath_page_header(&$a, &$o){
 
 function convpath_page_end(&$a, &$o){
 	$o = convpath_convert($o);
-	if (isset($a->page['aside']))
-		$a->page['aside'] = convpath_convert($a->page['aside']);
+	$a->page['aside'] = convpath_convert($a->page['aside']);
 }
 
 function convpath_prepare_body_hook(&$a, &$o) {
diff --git a/convpath/lang/C/messages.po b/convpath/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/curweather/lang/cs/messages.po b/curweather/lang/cs/messages.po
new file mode 100644
index 00000000..a542380d
--- /dev/null
+++ b/curweather/lang/cs/messages.po
@@ -0,0 +1,40 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:03+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: curweather.php:46 curweather.php:90
+msgid "Current Weather"
+msgstr "Aktuální počasí"
+
+#: curweather.php:67
+msgid "Current Weather settings updated."
+msgstr "Nastavení pro Aktuální počasí aktualizováno."
+
+#: curweather.php:93
+msgid "Weather Location: "
+msgstr "Poloha počasí:"
+
+#: curweather.php:96
+msgid "Enable Current Weather"
+msgstr "Povolit Aktuální počasí"
+
+#: curweather.php:104
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/curweather/lang/cs/strings.php b/curweather/lang/cs/strings.php
index ae3080c1..ce5df63b 100644
--- a/curweather/lang/cs/strings.php
+++ b/curweather/lang/cs/strings.php
@@ -1,3 +1,12 @@
-<?php
-
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Current Weather"] = "Aktuální počasí";
+$a->strings["Current Weather settings updated."] = "Nastavení pro Aktuální počasí aktualizováno.";
+$a->strings["Weather Location: "] = "Poloha počasí:";
+$a->strings["Enable Current Weather"] = "Povolit Aktuální počasí";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/curweather/lang/de/messages.po b/curweather/lang/de/messages.po
new file mode 100644
index 00000000..7798fb95
--- /dev/null
+++ b/curweather/lang/de/messages.po
@@ -0,0 +1,40 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-29 08:20+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: curweather.php:46 curweather.php:90
+msgid "Current Weather"
+msgstr "Aktuelles Wetter"
+
+#: curweather.php:67
+msgid "Current Weather settings updated."
+msgstr "Einstellungen des Aktuellen Wetter Addons aktualisiert."
+
+#: curweather.php:93
+msgid "Weather Location: "
+msgstr "Wetter Standort"
+
+#: curweather.php:96
+msgid "Enable Current Weather"
+msgstr "Aktuelles Wetter aktivieren"
+
+#: curweather.php:104
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php
index 9e5d0516..da9f02ca 100644
--- a/curweather/lang/de/strings.php
+++ b/curweather/lang/de/strings.php
@@ -1,3 +1,12 @@
-<?php
-
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Current Weather"] = "Aktuelles Wetter";
+$a->strings["Current Weather settings updated."] = "Einstellungen des Aktuellen Wetter Addons aktualisiert.";
+$a->strings["Weather Location: "] = "Wetter Standort";
+$a->strings["Enable Current Weather"] = "Aktuelles Wetter aktivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/curweather/lang/ro/messages.po b/curweather/lang/ro/messages.po
new file mode 100644
index 00000000..f0c303ad
--- /dev/null
+++ b/curweather/lang/ro/messages.po
@@ -0,0 +1,39 @@
+# ADDON curweather
+# Copyright (C)
+# This file is distributed under the same license as the Friendica curweather addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:47+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: curweather.php:46 curweather.php:90
+msgid "Current Weather"
+msgstr "Starea Vremii"
+
+#: curweather.php:67
+msgid "Current Weather settings updated."
+msgstr "Configurări actualizate pentru Starea Vremii"
+
+#: curweather.php:93
+msgid "Weather Location: "
+msgstr "Locație Meteo:"
+
+#: curweather.php:96
+msgid "Enable Current Weather"
+msgstr "Activare Starea Vremii"
+
+#: curweather.php:104
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/curweather/lang/ro/strings.php b/curweather/lang/ro/strings.php
new file mode 100644
index 00000000..f32eb730
--- /dev/null
+++ b/curweather/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Current Weather"] = "Starea Vremii";
+$a->strings["Current Weather settings updated."] = "Configurări actualizate pentru Starea Vremii";
+$a->strings["Weather Location: "] = "Locație Meteo:";
+$a->strings["Enable Current Weather"] = "Activare Starea Vremii";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/dav/lang/cs/messages.po b/dav/lang/cs/messages.po
new file mode 100644
index 00000000..e541c554
--- /dev/null
+++ b/dav/lang/cs/messages.po
@@ -0,0 +1,578 @@
+# ADDON dav
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dav addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:40+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: friendica/calendar.friendica.fnk.php:206
+msgid "Private Calendar"
+msgstr "Soukromý kalendář"
+
+#: friendica/calendar.friendica.fnk.php:207
+msgid "Friendica Events: Mine"
+msgstr "Friendica události: Mé"
+
+#: friendica/calendar.friendica.fnk.php:208
+msgid "Friendica Events: Contacts"
+msgstr "Friendica události: Kontakty"
+
+#: friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Soukromé adresy"
+
+#: friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Friendica Kontakty"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:59
+msgid "Friendica-Contacts"
+msgstr "Friendica kontakty"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+msgid "Your Friendica-Contacts"
+msgstr "Vaše Friendica kontakty"
+
+#: friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Nativní Friendica události"
+
+#: friendica/main.php:202
+msgid ""
+"The current version of this plugin has not been set up correctly. Please "
+"contact the system administrator of your installation of friendica to fix "
+"this."
+msgstr "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví."
+
+#: friendica/main.php:239 common/wdcal_edit.inc.php:146
+msgid "Calendar"
+msgstr "Kalendář"
+
+#: friendica/main.php:242
+msgid "Extended calendar with CalDAV-support"
+msgstr "Rozšířený kalendář s podporou CalDAV"
+
+#: friendica/main.php:279 friendica/main.php:280
+msgid "noreply"
+msgstr "bez odpovědi"
+
+#: friendica/main.php:282
+msgid "Notification: "
+msgstr "Notifikace:"
+
+#: friendica/main.php:309
+msgid "The database tables have been installed."
+msgstr "Databázové tabulky byly nainstalovány"
+
+#: friendica/main.php:310
+msgid "An error occurred during the installation."
+msgstr "Během instalace nastala chyba."
+
+#: friendica/main.php:316
+msgid "The database tables have been updated."
+msgstr "Databázové tabulky byly aktualizovány."
+
+#: friendica/main.php:317
+msgid "An error occurred during the update."
+msgstr "Během aktualizace došlo k chybě."
+
+#: friendica/main.php:333
+msgid "No system-wide settings yet."
+msgstr "Nastavení systému dosud nebylo vytvořeno"
+
+#: friendica/main.php:336
+msgid "Database status"
+msgstr "Status databáze"
+
+#: friendica/main.php:339
+msgid "Installed"
+msgstr "Instalováno"
+
+#: friendica/main.php:343
+msgid "Upgrade needed"
+msgstr "Upgrade vyžadován"
+
+#: friendica/main.php:343
+msgid ""
+"Please back up all calendar data (the tables beginning with dav_*) before "
+"proceeding. While all calendar events <i>should</i> be converted to the new "
+"database structure, it's always safe to have a backup. Below, you can have a"
+" look at the database-queries that will be made when pressing the "
+"'update'-button."
+msgstr "Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."
+
+#: friendica/main.php:343
+msgid "Upgrade"
+msgstr "Upgrade"
+
+#: friendica/main.php:346
+msgid "Not installed"
+msgstr "Nenainstalováno"
+
+#: friendica/main.php:346
+msgid "Install"
+msgstr "Instalovat"
+
+#: friendica/main.php:350
+msgid "Unknown"
+msgstr "Neznámý"
+
+#: friendica/main.php:350
+msgid ""
+"Something really went wrong. I cannot recover from this state automatically,"
+" sorry. Please go to the database backend, back up the data, and delete all "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine"
+" should be able to reinitialize the tables automatically."
+msgstr "Něco se opravdu nepovedlo. Z aktuálního stavu nelze provést automatickou obnovu. Prosím přihlaste se do databáze, zazálohujte data a smažte manuálně všechny tabulky začínající s \"dav_\". Poté by měl instalační skript sám automaticky znovu založit potřebné tabulky."
+
+#: friendica/main.php:355
+msgid "Troubleshooting"
+msgstr "Řešení problémů"
+
+#: friendica/main.php:356
+msgid "Manual creation of the database tables:"
+msgstr "Manuálnní vytvoření databázových tabulek:"
+
+#: friendica/main.php:357
+msgid "Show SQL-statements"
+msgstr "Zobrazit SQL-příkazy"
+
+#: friendica/layout.fnk.php:99 friendica/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr "Při importu souboru se něco nezdařilo, omlouváme se. Přesto se mohly některé události načíst."
+
+#: friendica/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr "Při importu souboru se něco nezdařilo, omlouváme se."
+
+#: friendica/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr "ICS soubor byl importován."
+
+#: friendica/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr "Žádný soubor nebyl nahrán."
+
+#: friendica/layout.fnk.php:143 friendica/layout.fnk.php:422
+#: common/wdcal_edit.inc.php:140
+msgid "Go back to the calendar"
+msgstr "Návrat na kalendář"
+
+#: friendica/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr "Import ICS souboru."
+
+#: friendica/layout.fnk.php:150
+msgid "ICS-File"
+msgstr "ICS soubor."
+
+#: friendica/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr "Přepsat všechny #num# existující události"
+
+#: friendica/layout.fnk.php:152
+msgid "Upload"
+msgstr "Nahrát"
+
+#: friendica/layout.fnk.php:225
+msgid "Settings"
+msgstr "Nastavení"
+
+#: friendica/layout.fnk.php:225
+msgid "Help"
+msgstr "Nápověda"
+
+#: friendica/layout.fnk.php:228
+msgid "New event"
+msgstr "Nová událost"
+
+#: friendica/layout.fnk.php:232
+msgid "Today"
+msgstr "Dnes"
+
+#: friendica/layout.fnk.php:241
+msgid "Day"
+msgstr "Den"
+
+#: friendica/layout.fnk.php:248
+msgid "Week"
+msgstr "Týden"
+
+#: friendica/layout.fnk.php:255 common/wdcal_edit.inc.php:372
+msgid "Month"
+msgstr "Měsíc"
+
+#: friendica/layout.fnk.php:260
+msgid "Reload"
+msgstr "Načíst znovu"
+
+#: friendica/layout.fnk.php:263
+msgid "Previous"
+msgstr "Předchozí"
+
+#: friendica/layout.fnk.php:266
+msgid "Next"
+msgstr "Dále"
+
+#: friendica/layout.fnk.php:271
+msgid "Date"
+msgstr "Datum"
+
+#: friendica/layout.fnk.php:313
+msgid "Error"
+msgstr "Chyba"
+
+#: friendica/layout.fnk.php:354
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: friendica/layout.fnk.php:361
+msgid "The new values have been saved."
+msgstr "Nové hodnoty byly uloženy."
+
+#: friendica/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr "Kalendář byl aktualizován."
+
+#: friendica/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr "Nový kalendář byl vytvořen."
+
+#: friendica/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr "Kalendář byl smazán."
+
+#: friendica/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr "Nastavení kalendáře"
+
+#: friendica/layout.fnk.php:430
+msgid "Date format"
+msgstr "Formát datumu"
+
+#: friendica/layout.fnk.php:439
+msgid "Time zone"
+msgstr "Časová zóna"
+
+#: friendica/layout.fnk.php:441 friendica/layout.fnk.php:488
+msgid "Save"
+msgstr "Uložit"
+
+#: friendica/layout.fnk.php:445
+msgid "Calendars"
+msgstr "Kalendáře"
+
+#: friendica/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr "Vytvořit nový kalendář"
+
+#: friendica/layout.fnk.php:496
+msgid "Limitations"
+msgstr "Limity"
+
+#: friendica/layout.fnk.php:500
+msgid "Warning"
+msgstr "Omezení"
+
+#: friendica/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Synchronizace (iPhone, Thunderbird Lightning, Android, ...)"
+
+#: friendica/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Synchronizovat tento kalendář s iPhone"
+
+#: friendica/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Synchronizovat Vaše Friendica kontakty s iPhone"
+
+#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
+msgstr "Nelze otevřít komponentu pro editaci"
+
+#: common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr "Data události"
+
+#: common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr "Speciální barva"
+
+#: common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr "Subjekt"
+
+#: common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr "Hvězdiček"
+
+#: common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr "Končí"
+
+#: common/wdcal_edit.inc.php:183
+msgid "Location"
+msgstr "Lokace"
+
+#: common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr "Popis"
+
+#: common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr "Opakování"
+
+#: common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr "Frekvence"
+
+#: common/wdcal_edit.inc.php:191
+msgid "None"
+msgstr "Žádný"
+
+#: common/wdcal_edit.inc.php:194
+msgid "Daily"
+msgstr "denně"
+
+#: common/wdcal_edit.inc.php:197
+msgid "Weekly"
+msgstr "Týdenně"
+
+#: common/wdcal_edit.inc.php:200
+msgid "Monthly"
+msgstr "Měsíčně"
+
+#: common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr "Ročně"
+
+#: common/wdcal_edit.inc.php:214
+msgid "days"
+msgstr "dnů"
+
+#: common/wdcal_edit.inc.php:215
+msgid "weeks"
+msgstr "týdny"
+
+#: common/wdcal_edit.inc.php:216
+msgid "months"
+msgstr "měsíců"
+
+#: common/wdcal_edit.inc.php:217
+msgid "years"
+msgstr "let"
+
+#: common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr "Interval"
+
+#: common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr "Všechny %select% %time%"
+
+#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260
+#: common/wdcal_edit.inc.php:481
+msgid "Days"
+msgstr "Dny"
+
+#: common/wdcal_edit.inc.php:231 common/wdcal_edit.inc.php:254
+#: common/wdcal_edit.inc.php:270 common/wdcal_edit.inc.php:293
+#: common/wdcal_edit.inc.php:305
+msgid "Sunday"
+msgstr "Neděle"
+
+#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274
+#: common/wdcal_edit.inc.php:308
+msgid "Monday"
+msgstr "Pondělí"
+
+#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277
+msgid "Tuesday"
+msgstr "Úterý"
+
+#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280
+msgid "Wednesday"
+msgstr "Středa"
+
+#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283
+msgid "Thursday"
+msgstr "Čtvrtek"
+
+#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286
+msgid "Friday"
+msgstr "Pátek"
+
+#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289
+msgid "Saturday"
+msgstr "Sobota"
+
+#: common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr "První den v týdnu"
+
+#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr "Den v měsíci"
+
+#: common/wdcal_edit.inc.php:354
+msgid "#num#th of each month"
+msgstr "#num#. v každém měsíci"
+
+#: common/wdcal_edit.inc.php:357
+msgid "#num#th-last of each month"
+msgstr "#num# pořadí od konce v každém měsíci"
+
+#: common/wdcal_edit.inc.php:360
+msgid "#num#th #wkday# of each month"
+msgstr "#num#. #wkday# v každém měsíci"
+
+#: common/wdcal_edit.inc.php:363
+msgid "#num#th-last #wkday# of each month"
+msgstr "#num#. od konce #wkday# v každém měsíci"
+
+#: common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr "#num#. v daném měsíci"
+
+#: common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr "#num#. od konce v daném měsíci"
+
+#: common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr "#num#. #wkday# v daném měsíci"
+
+#: common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr "#num#.  #wkday# od konce v daném měsíci"
+
+#: common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr "Opakuj dokud"
+
+#: common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr "Do nekončena"
+
+#: common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr "Do následujícího data"
+
+#: common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr "Počet opakování"
+
+#: common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr "Výjimky"
+
+#: common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr "žádný"
+
+#: common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr "Notifikace"
+
+#: common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr "Notifikivat"
+
+#: common/wdcal_edit.inc.php:468
+msgid "Remove"
+msgstr "Odstranit"
+
+#: common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr "e-mailem"
+
+#: common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr "Na stránce Friendica"
+
+#: common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr "Čas"
+
+#: common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr "Hodiny"
+
+#: common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr "Minuty"
+
+#: common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr "sekund"
+
+#: common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr "týdnů"
+
+#: common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr "před"
+
+#: common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr "začátkem události"
+
+#: common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr "koncem události"
+
+#: common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr "Přidat notifikaci"
+
+#: common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr "Událost #name# bude zahájena #date"
+
+#: common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr "#name# právě začíná."
+
+#: common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr "Uloženo"
+
+#: common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Soukromé adresáře kontaktů"
+
+#: common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr "Soukromé události"
+
+#: common/wdcal_backend.inc.php:92 common/wdcal_backend.inc.php:166
+#: common/wdcal_backend.inc.php:178 common/wdcal_backend.inc.php:206
+#: common/wdcal_backend.inc.php:214 common/wdcal_backend.inc.php:229
+msgid "No access"
+msgstr "Zádný přístup"
+
+#: common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "americký formát času (mm/dd/YYYY)"
+
+#: common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "německý formát času (dd.mm.YYYY)"
diff --git a/dav/lang/cs/strings.php b/dav/lang/cs/strings.php
index b67606c8..b93bb4d6 100644
--- a/dav/lang/cs/strings.php
+++ b/dav/lang/cs/strings.php
@@ -1,136 +1,141 @@
-<?php
-
-$a->strings["Friendica-Native events"] = "Nativní Friendica události";
-$a->strings["Friendica-Contacts"] = "Friendica kontakty";
-$a->strings["Your Friendica-Contacts"] = "Vaše Friendica kontakty";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Při importu souboru se něco nezdařilo, omlouváme se. Přesto se mohly některé události načíst.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "Při importu souboru se něco nezdařilo, omlouváme se.";
-$a->strings["The ICS-File has been imported."] = "ICS soubor byl importován.";
-$a->strings["No file was uploaded."] = "Žádný soubor nebyl nahrán.";
-$a->strings["Go back to the calendar"] = "Návrat na kalendář";
-$a->strings["Import a ICS-file"] = "Import ICS souboru.";
-$a->strings["ICS-File"] = "ICS soubor.";
-$a->strings["Overwrite all #num# existing events"] = "Přepsat všechny #num# existující události";
-$a->strings["Upload"] = "Nahrát";
-$a->strings["Settings"] = "Nastavení";
-$a->strings["Help"] = "Nápověda";
-$a->strings["New event"] = "Nová událost";
-$a->strings["Today"] = "Dnes";
-$a->strings["Day"] = "Den";
-$a->strings["Week"] = "Týden";
-$a->strings["Month"] = "Měsíc";
-$a->strings["Reload"] = "Načíst znovu";
-$a->strings["Previous"] = "Předchozí";
-$a->strings["Next"] = "Dále";
-$a->strings["Date"] = "Datum";
-$a->strings["Error"] = "Chyba";
-$a->strings["Permission denied."] = "Přístup odmítnut.";
-$a->strings["The new values have been saved."] = "Nové hodnoty byly uloženy";
-$a->strings["The calendar has been updated."] = "Kalendář byl aktualizován.";
-$a->strings["The new calendar has been created."] = "Nový kalendář byl vytvořen.";
-$a->strings["The calendar has been deleted."] = "Kalendář byl smazán.";
-$a->strings["Calendar Settings"] = "Nastavení kalendáře";
-$a->strings["Date format"] = "Formát datumu";
-$a->strings["Time zone"] = "Časová zóna";
-$a->strings["Save"] = "Uložit";
-$a->strings["Calendars"] = "Kalendáře";
-$a->strings["Create a new calendar"] = "Vytvořit nový kalendář";
-$a->strings["Limitations"] = "Omezení";
-$a->strings["Warning"] = "Varování";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronizace (iPhone, Thunderbird Lightning, Android, ...)";
-$a->strings["Synchronizing this calendar with the iPhone"] = "Synchronizovat tento kalendář s iPhone";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Synchronizovat Vaše Friendica kontakty s iPhone";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví.";
-$a->strings["Calendar"] = "Kalendář";
-$a->strings["Extended calendar with CalDAV-support"] = "Rozšířený kalendář s podporou CalDAV";
-$a->strings["noreply"] = "neodpovídat";
-$a->strings["Notification: "] = "Notifikace:";
-$a->strings["The database tables have been installed."] = "Databázové tabulky byly nainstalovány";
-$a->strings["An error occurred during the installation."] = "Během instalace nastala chyba.";
-$a->strings["The database tables have been updated."] = "Databázové tabulky byly aktualizovány.";
-$a->strings["An error occurred during the update."] = "Během aktualizace došlo k chybě.";
-$a->strings["No system-wide settings yet."] = "Nastavení systému dosud nebylo vytvořeno";
-$a->strings["Database status"] = "Status databáze";
-$a->strings["Installed"] = "Instalováno";
-$a->strings["Upgrade needed"] = "Upgrade vyžadován";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Prosím, zálohujte si všechny data v kalendářích (všechny tabulky začínající s dav_*) před pokračováním. Ačkoliv <i>by měly</i> být všechny kalendářové události převedeny do nové databázové struktury, vždy je bezpečnější mít zálohu. Níže se můžete podívat na databázové příkazy, které budou spuštěny po stisknutí tlačítka \"Aktualizovat\".";
-$a->strings["Upgrade"] = "Upgrade";
-$a->strings["Not installed"] = "Nenainstalováno";
-$a->strings["Install"] = "Instalovat";
-$a->strings["Unknown"] = "Neznámý";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Něco se opravdu nepovedlo. Z aktuálního stavu nelze provést automatickou obnovu. Prosím přihlaste se do databáze, zazálohujte data a smažte manuálně všechny tabulky začínající s \"dav_\". Poté by měl instalační skript sám automaticky znovu založit potřebné tabulky.";
-$a->strings["Troubleshooting"] = "Řešení problémů";
-$a->strings["Manual creation of the database tables:"] = "Manuálnní vytvoření databázových tabulek:";
-$a->strings["Show SQL-statements"] = "Zobrazit SQL-příkazy";
-$a->strings["Private Calendar"] = "Soukromý kalendář";
-$a->strings["Friendica Events: Mine"] = "Friendica události: Mé";
-$a->strings["Friendica Events: Contacts"] = "Friendica události: Kontakty";
-$a->strings["Private Addresses"] = "Soukromé adresy";
-$a->strings["Friendica Contacts"] = "Friendica Kontakty";
-$a->strings["Could not open component for editing"] = "Nelze otevřít komponentu pro editaci";
-$a->strings["Event data"] = "Data události";
-$a->strings["Special color"] = "Speciální barva";
-$a->strings["Subject"] = "Subjekt";
-$a->strings["Starts"] = "Hvězdiček";
-$a->strings["Ends"] = "Končí";
-$a->strings["Location"] = "Lokace";
-$a->strings["Description"] = "Popis";
-$a->strings["Recurrence"] = "Opakování";
-$a->strings["Frequency"] = "Frekvence";
-$a->strings["None"] = "Žádný";
-$a->strings["Daily"] = "denně";
-$a->strings["Weekly"] = "Týdenně";
-$a->strings["Monthly"] = "Měsíčně";
-$a->strings["Yearly"] = "Ročně";
-$a->strings["days"] = "dnů";
-$a->strings["weeks"] = "týdny";
-$a->strings["months"] = "měsíců";
-$a->strings["years"] = "let";
-$a->strings["Interval"] = "Interval";
-$a->strings["All %select% %time%"] = "Všechny %select% %time%";
-$a->strings["Days"] = "Dny";
-$a->strings["Sunday"] = "Neděle";
-$a->strings["Monday"] = "Pondělí";
-$a->strings["Tuesday"] = "Úterý";
-$a->strings["Wednesday"] = "Středa";
-$a->strings["Thursday"] = "Čtvrtek";
-$a->strings["Friday"] = "Pátek";
-$a->strings["Saturday"] = "Sobota";
-$a->strings["First day of week:"] = "První den v týdnu";
-$a->strings["Day of month"] = "Den v měsíci";
-$a->strings["#num#th of each month"] = "#num#. v každém měsíci";
-$a->strings["#num#th-last of each month"] = "#num#. od konce v každém měsíci";
-$a->strings["#num#th #wkday# of each month"] = "#num#. #wkday# v každém měsíci";
-$a->strings["#num#th-last #wkday# of each month"] = "#num#. od konce #wkday# v každém měsíci";
-$a->strings["#num#th of the given month"] = "#num#. v daném měsíci";
-$a->strings["#num#th-last of the given month"] = "#num#. od konce v daném měsíci";
-$a->strings["#num#th #wkday# of the given month"] = "#num#. #wkday# v daném měsíci";
-$a->strings["#num#th-last #wkday# of the given month"] = "#num#.  #wkday# od konce v daném měsíci";
-$a->strings["Repeat until"] = "Opakuj dokud";
-$a->strings["Infinite"] = "Do nekončena";
-$a->strings["Until the following date"] = "Do následujícího data";
-$a->strings["Number of times"] = "Počet opakování";
-$a->strings["Exceptions"] = "Výjimky";
-$a->strings["none"] = "žádný";
-$a->strings["Notification"] = "Notifikace";
-$a->strings["Notify by"] = "Notifikován";
-$a->strings["Remove"] = "Odstranit";
-$a->strings["E-Mail"] = "e-mailem";
-$a->strings["On Friendica / Display"] = "Na stránce Friendica";
-$a->strings["Time"] = "Čas";
-$a->strings["Hours"] = "Hodiny";
-$a->strings["Minutes"] = "Minuty";
-$a->strings["Seconds"] = "sekund";
-$a->strings["Weeks"] = "týdnů";
-$a->strings["before the"] = "před";
-$a->strings["start of the event"] = "začátkem události";
-$a->strings["end of the event"] = "koncem události";
-$a->strings["Add a notification"] = "Přidat notifikaci";
-$a->strings["The event #name# will start at #date"] = "Událost #name# bude zahájena #date";
-$a->strings["#name# is about to begin."] = "#name# právě začíná.";
-$a->strings["Saved"] = "Uloženo";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "americký formát času (mm/dd/YYYY)";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "německý formát času (dd.mm.YYYY)";
-$a->strings["Private Events"] = "Soukromé události";
-$a->strings["No access"] = "Zádný přístup";
-$a->strings["Private Addressbooks"] = "Soukromé adresáře kontaktů";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Private Calendar"] = "Soukromý kalendář";
+$a->strings["Friendica Events: Mine"] = "Friendica události: Mé";
+$a->strings["Friendica Events: Contacts"] = "Friendica události: Kontakty";
+$a->strings["Private Addresses"] = "Soukromé adresy";
+$a->strings["Friendica Contacts"] = "Friendica Kontakty";
+$a->strings["Friendica-Contacts"] = "Friendica kontakty";
+$a->strings["Your Friendica-Contacts"] = "Vaše Friendica kontakty";
+$a->strings["Friendica-Native events"] = "Nativní Friendica události";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Stávající verze tohoto rozšíření nebyla správně nastavena. Prosím, kontaktujte administrátora webu, ať to opraví.";
+$a->strings["Calendar"] = "Kalendář";
+$a->strings["Extended calendar with CalDAV-support"] = "Rozšířený kalendář s podporou CalDAV";
+$a->strings["noreply"] = "bez odpovědi";
+$a->strings["Notification: "] = "Notifikace:";
+$a->strings["The database tables have been installed."] = "Databázové tabulky byly nainstalovány";
+$a->strings["An error occurred during the installation."] = "Během instalace nastala chyba.";
+$a->strings["The database tables have been updated."] = "Databázové tabulky byly aktualizovány.";
+$a->strings["An error occurred during the update."] = "Během aktualizace došlo k chybě.";
+$a->strings["No system-wide settings yet."] = "Nastavení systému dosud nebylo vytvořeno";
+$a->strings["Database status"] = "Status databáze";
+$a->strings["Installed"] = "Instalováno";
+$a->strings["Upgrade needed"] = "Upgrade vyžadován";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button.";
+$a->strings["Upgrade"] = "Upgrade";
+$a->strings["Not installed"] = "Nenainstalováno";
+$a->strings["Install"] = "Instalovat";
+$a->strings["Unknown"] = "Neznámý";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Něco se opravdu nepovedlo. Z aktuálního stavu nelze provést automatickou obnovu. Prosím přihlaste se do databáze, zazálohujte data a smažte manuálně všechny tabulky začínající s \"dav_\". Poté by měl instalační skript sám automaticky znovu založit potřebné tabulky.";
+$a->strings["Troubleshooting"] = "Řešení problémů";
+$a->strings["Manual creation of the database tables:"] = "Manuálnní vytvoření databázových tabulek:";
+$a->strings["Show SQL-statements"] = "Zobrazit SQL-příkazy";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Při importu souboru se něco nezdařilo, omlouváme se. Přesto se mohly některé události načíst.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Při importu souboru se něco nezdařilo, omlouváme se.";
+$a->strings["The ICS-File has been imported."] = "ICS soubor byl importován.";
+$a->strings["No file was uploaded."] = "Žádný soubor nebyl nahrán.";
+$a->strings["Go back to the calendar"] = "Návrat na kalendář";
+$a->strings["Import a ICS-file"] = "Import ICS souboru.";
+$a->strings["ICS-File"] = "ICS soubor.";
+$a->strings["Overwrite all #num# existing events"] = "Přepsat všechny #num# existující události";
+$a->strings["Upload"] = "Nahrát";
+$a->strings["Settings"] = "Nastavení";
+$a->strings["Help"] = "Nápověda";
+$a->strings["New event"] = "Nová událost";
+$a->strings["Today"] = "Dnes";
+$a->strings["Day"] = "Den";
+$a->strings["Week"] = "Týden";
+$a->strings["Month"] = "Měsíc";
+$a->strings["Reload"] = "Načíst znovu";
+$a->strings["Previous"] = "Předchozí";
+$a->strings["Next"] = "Dále";
+$a->strings["Date"] = "Datum";
+$a->strings["Error"] = "Chyba";
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["The new values have been saved."] = "Nové hodnoty byly uloženy.";
+$a->strings["The calendar has been updated."] = "Kalendář byl aktualizován.";
+$a->strings["The new calendar has been created."] = "Nový kalendář byl vytvořen.";
+$a->strings["The calendar has been deleted."] = "Kalendář byl smazán.";
+$a->strings["Calendar Settings"] = "Nastavení kalendáře";
+$a->strings["Date format"] = "Formát datumu";
+$a->strings["Time zone"] = "Časová zóna";
+$a->strings["Save"] = "Uložit";
+$a->strings["Calendars"] = "Kalendáře";
+$a->strings["Create a new calendar"] = "Vytvořit nový kalendář";
+$a->strings["Limitations"] = "Limity";
+$a->strings["Warning"] = "Omezení";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronizace (iPhone, Thunderbird Lightning, Android, ...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Synchronizovat tento kalendář s iPhone";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Synchronizovat Vaše Friendica kontakty s iPhone";
+$a->strings["Could not open component for editing"] = "Nelze otevřít komponentu pro editaci";
+$a->strings["Event data"] = "Data události";
+$a->strings["Special color"] = "Speciální barva";
+$a->strings["Subject"] = "Subjekt";
+$a->strings["Starts"] = "Hvězdiček";
+$a->strings["Ends"] = "Končí";
+$a->strings["Location"] = "Lokace";
+$a->strings["Description"] = "Popis";
+$a->strings["Recurrence"] = "Opakování";
+$a->strings["Frequency"] = "Frekvence";
+$a->strings["None"] = "Žádný";
+$a->strings["Daily"] = "denně";
+$a->strings["Weekly"] = "Týdenně";
+$a->strings["Monthly"] = "Měsíčně";
+$a->strings["Yearly"] = "Ročně";
+$a->strings["days"] = "dnů";
+$a->strings["weeks"] = "týdny";
+$a->strings["months"] = "měsíců";
+$a->strings["years"] = "let";
+$a->strings["Interval"] = "Interval";
+$a->strings["All %select% %time%"] = "Všechny %select% %time%";
+$a->strings["Days"] = "Dny";
+$a->strings["Sunday"] = "Neděle";
+$a->strings["Monday"] = "Pondělí";
+$a->strings["Tuesday"] = "Úterý";
+$a->strings["Wednesday"] = "Středa";
+$a->strings["Thursday"] = "Čtvrtek";
+$a->strings["Friday"] = "Pátek";
+$a->strings["Saturday"] = "Sobota";
+$a->strings["First day of week:"] = "První den v týdnu";
+$a->strings["Day of month"] = "Den v měsíci";
+$a->strings["#num#th of each month"] = "#num#. v každém měsíci";
+$a->strings["#num#th-last of each month"] = "#num# pořadí od konce v každém měsíci";
+$a->strings["#num#th #wkday# of each month"] = "#num#. #wkday# v každém měsíci";
+$a->strings["#num#th-last #wkday# of each month"] = "#num#. od konce #wkday# v každém měsíci";
+$a->strings["#num#th of the given month"] = "#num#. v daném měsíci";
+$a->strings["#num#th-last of the given month"] = "#num#. od konce v daném měsíci";
+$a->strings["#num#th #wkday# of the given month"] = "#num#. #wkday# v daném měsíci";
+$a->strings["#num#th-last #wkday# of the given month"] = "#num#.  #wkday# od konce v daném měsíci";
+$a->strings["Repeat until"] = "Opakuj dokud";
+$a->strings["Infinite"] = "Do nekončena";
+$a->strings["Until the following date"] = "Do následujícího data";
+$a->strings["Number of times"] = "Počet opakování";
+$a->strings["Exceptions"] = "Výjimky";
+$a->strings["none"] = "žádný";
+$a->strings["Notification"] = "Notifikace";
+$a->strings["Notify by"] = "Notifikivat";
+$a->strings["Remove"] = "Odstranit";
+$a->strings["E-Mail"] = "e-mailem";
+$a->strings["On Friendica / Display"] = "Na stránce Friendica";
+$a->strings["Time"] = "Čas";
+$a->strings["Hours"] = "Hodiny";
+$a->strings["Minutes"] = "Minuty";
+$a->strings["Seconds"] = "sekund";
+$a->strings["Weeks"] = "týdnů";
+$a->strings["before the"] = "před";
+$a->strings["start of the event"] = "začátkem události";
+$a->strings["end of the event"] = "koncem události";
+$a->strings["Add a notification"] = "Přidat notifikaci";
+$a->strings["The event #name# will start at #date"] = "Událost #name# bude zahájena #date";
+$a->strings["#name# is about to begin."] = "#name# právě začíná.";
+$a->strings["Saved"] = "Uloženo";
+$a->strings["Private Addressbooks"] = "Soukromé adresáře kontaktů";
+$a->strings["Private Events"] = "Soukromé události";
+$a->strings["No access"] = "Zádný přístup";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "americký formát času (mm/dd/YYYY)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "německý formát času (dd.mm.YYYY)";
diff --git a/dav/lang/de/messages.po b/dav/lang/de/messages.po
new file mode 100644
index 00000000..f314f15e
--- /dev/null
+++ b/dav/lang/de/messages.po
@@ -0,0 +1,578 @@
+# ADDON dav
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dav addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-10 06:05+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: friendica/calendar.friendica.fnk.php:206
+msgid "Private Calendar"
+msgstr "Privater Kalender"
+
+#: friendica/calendar.friendica.fnk.php:207
+msgid "Friendica Events: Mine"
+msgstr "Meine Friendica-Veranstaltungen"
+
+#: friendica/calendar.friendica.fnk.php:208
+msgid "Friendica Events: Contacts"
+msgstr "Friendica Veranstaltungen meiner Kontakte"
+
+#: friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Private Adressen"
+
+#: friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Friendica Kontakte"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:59
+msgid "Friendica-Contacts"
+msgstr "Friendica-Kontakte"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+msgid "Your Friendica-Contacts"
+msgstr "Deine Friendica-Kontakte"
+
+#: friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Friendica Veranstaltungen"
+
+#: friendica/main.php:202
+msgid ""
+"The current version of this plugin has not been set up correctly. Please "
+"contact the system administrator of your installation of friendica to fix "
+"this."
+msgstr "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben."
+
+#: friendica/main.php:239 common/wdcal_edit.inc.php:146
+msgid "Calendar"
+msgstr "Kalender"
+
+#: friendica/main.php:242
+msgid "Extended calendar with CalDAV-support"
+msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
+
+#: friendica/main.php:279 friendica/main.php:280
+msgid "noreply"
+msgstr "noreply"
+
+#: friendica/main.php:282
+msgid "Notification: "
+msgstr "Benachrichtigungen: "
+
+#: friendica/main.php:309
+msgid "The database tables have been installed."
+msgstr "Die Datenbank-Tabellen wurden installiert."
+
+#: friendica/main.php:310
+msgid "An error occurred during the installation."
+msgstr "Während der Installation trat ein Fehler auf."
+
+#: friendica/main.php:316
+msgid "The database tables have been updated."
+msgstr "Die Tabellen in der Datenbank wurden aktualisiert."
+
+#: friendica/main.php:317
+msgid "An error occurred during the update."
+msgstr "Während der Aktualisierung trat ein Fehler auf."
+
+#: friendica/main.php:333
+msgid "No system-wide settings yet."
+msgstr "Momentan keine systemweiten Einstellungen."
+
+#: friendica/main.php:336
+msgid "Database status"
+msgstr "Datenbank Status"
+
+#: friendica/main.php:339
+msgid "Installed"
+msgstr "Installiert"
+
+#: friendica/main.php:343
+msgid "Upgrade needed"
+msgstr "Upgrade erforderlich"
+
+#: friendica/main.php:343
+msgid ""
+"Please back up all calendar data (the tables beginning with dav_*) before "
+"proceeding. While all calendar events <i>should</i> be converted to the new "
+"database structure, it's always safe to have a backup. Below, you can have a"
+" look at the database-queries that will be made when pressing the "
+"'update'-button."
+msgstr "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche <i>sollten</i> alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden."
+
+#: friendica/main.php:343
+msgid "Upgrade"
+msgstr "Upgrade"
+
+#: friendica/main.php:346
+msgid "Not installed"
+msgstr "Nicht installiert"
+
+#: friendica/main.php:346
+msgid "Install"
+msgstr "Installieren"
+
+#: friendica/main.php:350
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: friendica/main.php:350
+msgid ""
+"Something really went wrong. I cannot recover from this state automatically,"
+" sorry. Please go to the database backend, back up the data, and delete all "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine"
+" should be able to reinitialize the tables automatically."
+msgstr "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen."
+
+#: friendica/main.php:355
+msgid "Troubleshooting"
+msgstr "Problembehebung"
+
+#: friendica/main.php:356
+msgid "Manual creation of the database tables:"
+msgstr "Manuelles anlegen der Datenbank Tabellen:"
+
+#: friendica/main.php:357
+msgid "Show SQL-statements"
+msgstr "SQL-Anweisungen anzeigen"
+
+#: friendica/layout.fnk.php:99 friendica/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert."
+
+#: friendica/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen."
+
+#: friendica/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr "Die ICS-Datei wurde importoert."
+
+#: friendica/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr "Es wurde keine Datei geladen."
+
+#: friendica/layout.fnk.php:143 friendica/layout.fnk.php:422
+#: common/wdcal_edit.inc.php:140
+msgid "Go back to the calendar"
+msgstr "Zurück zum Kalender"
+
+#: friendica/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr "Importiere eine ICS-Datei"
+
+#: friendica/layout.fnk.php:150
+msgid "ICS-File"
+msgstr "ICS-Datei"
+
+#: friendica/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr "Überschreibe alle #num# existierenden Einträge"
+
+#: friendica/layout.fnk.php:152
+msgid "Upload"
+msgstr "Hochladen"
+
+#: friendica/layout.fnk.php:225
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: friendica/layout.fnk.php:225
+msgid "Help"
+msgstr "Hilfe"
+
+#: friendica/layout.fnk.php:228
+msgid "New event"
+msgstr "Neue Veranstaltung"
+
+#: friendica/layout.fnk.php:232
+msgid "Today"
+msgstr "Heute"
+
+#: friendica/layout.fnk.php:241
+msgid "Day"
+msgstr "Tag"
+
+#: friendica/layout.fnk.php:248
+msgid "Week"
+msgstr "Woche"
+
+#: friendica/layout.fnk.php:255 common/wdcal_edit.inc.php:372
+msgid "Month"
+msgstr "Monat"
+
+#: friendica/layout.fnk.php:260
+msgid "Reload"
+msgstr "Neu Laden"
+
+#: friendica/layout.fnk.php:263
+msgid "Previous"
+msgstr "Vorherige"
+
+#: friendica/layout.fnk.php:266
+msgid "Next"
+msgstr "Nächste"
+
+#: friendica/layout.fnk.php:271
+msgid "Date"
+msgstr "Datum"
+
+#: friendica/layout.fnk.php:313
+msgid "Error"
+msgstr "Fehler"
+
+#: friendica/layout.fnk.php:354
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: friendica/layout.fnk.php:361
+msgid "The new values have been saved."
+msgstr "Die neuen Einstellungen wurden gespeichert."
+
+#: friendica/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr "Der Kalender wurde aktualisiert."
+
+#: friendica/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr "Der neue Kalender wurde erstellt."
+
+#: friendica/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr "Der Kalender wurde gelöscht."
+
+#: friendica/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr "Kalender Einstellungen"
+
+#: friendica/layout.fnk.php:430
+msgid "Date format"
+msgstr "Datumsformat"
+
+#: friendica/layout.fnk.php:439
+msgid "Time zone"
+msgstr "Zeitzone"
+
+#: friendica/layout.fnk.php:441 friendica/layout.fnk.php:488
+msgid "Save"
+msgstr "Speichern"
+
+#: friendica/layout.fnk.php:445
+msgid "Calendars"
+msgstr "Kalender"
+
+#: friendica/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr "Neuen Kalender anlegen"
+
+#: friendica/layout.fnk.php:496
+msgid "Limitations"
+msgstr "Einschränkungen"
+
+#: friendica/layout.fnk.php:500
+msgid "Warning"
+msgstr "Warnung"
+
+#: friendica/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)"
+
+#: friendica/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Diesen Kalender mit dem iPhone synchronisieren"
+
+#: friendica/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Friendica-Kontakte mit dem iPhone synchronisieren"
+
+#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
+msgstr "Kalender-Editierfunktion konnte nicht geöffnet werden"
+
+#: common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr "Veranstaltungsdetails"
+
+#: common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr "Spezielle Farbe"
+
+#: common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr "Betreff:"
+
+#: common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr "Beginnt"
+
+#: common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr "Endet"
+
+#: common/wdcal_edit.inc.php:183
+msgid "Location"
+msgstr "Ort:"
+
+#: common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr "Beschreibung"
+
+#: common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr "Wiederholungen:"
+
+#: common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr "Frequenz"
+
+#: common/wdcal_edit.inc.php:191
+msgid "None"
+msgstr "Keine"
+
+#: common/wdcal_edit.inc.php:194
+msgid "Daily"
+msgstr "Täglich"
+
+#: common/wdcal_edit.inc.php:197
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+#: common/wdcal_edit.inc.php:200
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr "Jährlich"
+
+#: common/wdcal_edit.inc.php:214
+msgid "days"
+msgstr "Tage"
+
+#: common/wdcal_edit.inc.php:215
+msgid "weeks"
+msgstr "Wochen"
+
+#: common/wdcal_edit.inc.php:216
+msgid "months"
+msgstr "Monate"
+
+#: common/wdcal_edit.inc.php:217
+msgid "years"
+msgstr "Jahre"
+
+#: common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr "Intervall"
+
+#: common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr "Jeden %select% %time%"
+
+#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260
+#: common/wdcal_edit.inc.php:481
+msgid "Days"
+msgstr "Tage"
+
+#: common/wdcal_edit.inc.php:231 common/wdcal_edit.inc.php:254
+#: common/wdcal_edit.inc.php:270 common/wdcal_edit.inc.php:293
+#: common/wdcal_edit.inc.php:305
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274
+#: common/wdcal_edit.inc.php:308
+msgid "Monday"
+msgstr "Montag"
+
+#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286
+msgid "Friday"
+msgstr "Freitag"
+
+#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289
+msgid "Saturday"
+msgstr "Samstag"
+
+#: common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr "Erster Tag der Woche"
+
+#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr "Tag des Monats"
+
+#: common/wdcal_edit.inc.php:354
+msgid "#num#th of each month"
+msgstr "#num#ten jedes Monats"
+
+#: common/wdcal_edit.inc.php:357
+msgid "#num#th-last of each month"
+msgstr "letzten #num#ten jedes Monats"
+
+#: common/wdcal_edit.inc.php:360
+msgid "#num#th #wkday# of each month"
+msgstr "jeden #num#ten #wkday# eines Monats"
+
+#: common/wdcal_edit.inc.php:363
+msgid "#num#th-last #wkday# of each month"
+msgstr "jeden #num#ten letzten #wkday# eines Monats"
+
+#: common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr "#num#ten des Monats"
+
+#: common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr "letzten #num#ten des Monats"
+
+#: common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr "jeden #num#ten eines Monats"
+
+#: common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr "jeden #num#ten letzten eines Monats"
+
+#: common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr "Wiederholungen"
+
+#: common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr "unendlich"
+
+#: common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr "bis zum folgenden Datum"
+
+#: common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr "Bestimmte Anzahl von Wiederholungen"
+
+#: common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr "Ausnahmen"
+
+#: common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr "keine"
+
+#: common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr "Benachrichtigung"
+
+#: common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr "Benarchrichtigungsmethode"
+
+#: common/wdcal_edit.inc.php:468
+msgid "Remove"
+msgstr "Entfernen"
+
+#: common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr "Bei Friendica / Anzeige"
+
+#: common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr "Zeit"
+
+#: common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr "Stunden"
+
+#: common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr "Minuten"
+
+#: common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr "Sekunden"
+
+#: common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr "Wochen"
+
+#: common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr "vor dem"
+
+#: common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr "Beginn des Termins"
+
+#: common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr "Ende des Termins"
+
+#: common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr "Benachrichtigung hinzufügen"
+
+#: common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr "Der Termin #name# wird am #date anfangen"
+
+#: common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr "#name# beginnt demnächst."
+
+#: common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr "Gespeichert"
+
+#: common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Private Adressbücher"
+
+#: common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr "Privater Termin"
+
+#: common/wdcal_backend.inc.php:92 common/wdcal_backend.inc.php:166
+#: common/wdcal_backend.inc.php:178 common/wdcal_backend.inc.php:206
+#: common/wdcal_backend.inc.php:214 common/wdcal_backend.inc.php:229
+msgid "No access"
+msgstr "Kein Zugriff"
+
+#: common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "U.S. Datumsformat (mm/dd/YYYY)"
+
+#: common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "Deutsches Datumsformat (dd.mm.YYYY)"
diff --git a/dav/lang/de/strings.php b/dav/lang/de/strings.php
index ac08b90e..d436b8af 100644
--- a/dav/lang/de/strings.php
+++ b/dav/lang/de/strings.php
@@ -1,136 +1,141 @@
-<?php
-
-$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen";
-$a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
-$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
-$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert.";
-$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen.";
-$a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert.";
-$a->strings["No file was uploaded."] = "Es wurde keine Datei geladen.";
-$a->strings["Go back to the calendar"] = "Zurück zum Kalender";
-$a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei";
-$a->strings["ICS-File"] = "ICS-Datei";
-$a->strings["Overwrite all #num# existing events"] = "Überschreibe alle #num# existierenden Einträge";
-$a->strings["Upload"] = "Hochladen";
-$a->strings["Settings"] = "Einstellungen";
-$a->strings["Help"] = "Hilfe";
-$a->strings["New event"] = "Neue Veranstaltung";
-$a->strings["Today"] = "Heute";
-$a->strings["Day"] = "Tag";
-$a->strings["Week"] = "Woche";
-$a->strings["Month"] = "Monat";
-$a->strings["Reload"] = "Neu Laden";
-$a->strings["Previous"] = "Vorherige";
-$a->strings["Next"] = "Nächste";
-$a->strings["Date"] = "Datum";
-$a->strings["Error"] = "Fehler";
-$a->strings["Permission denied."] = "Zugriff verweigert.";
-$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert.";
-$a->strings["The calendar has been updated."] = "Der Kalender wurde aktualisiert.";
-$a->strings["The new calendar has been created."] = "Der neue Kalender wurde erstellt.";
-$a->strings["The calendar has been deleted."] = "Der Kalender wurde gelöscht.";
-$a->strings["Calendar Settings"] = "Kalendereinstellungen";
-$a->strings["Date format"] = "Datumsformat";
-$a->strings["Time zone"] = "Zeitzone";
-$a->strings["Save"] = "Speichern";
-$a->strings["Calendars"] = "Kalender";
-$a->strings["Create a new calendar"] = "Neuen Kalender anlegen";
-$a->strings["Limitations"] = "Einschränkungen";
-$a->strings["Warning"] = "Warnung";
-$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)";
-$a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren";
-$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren";
-$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben.";
-$a->strings["Calendar"] = "Kalender";
-$a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung.";
-$a->strings["noreply"] = "noreply";
-$a->strings["Notification: "] = "Benachrichtigungen: ";
-$a->strings["The database tables have been installed."] = "Die Datenbanktabellen wurden installiert.";
-$a->strings["An error occurred during the installation."] = "Während der Installation trat ein Fehler auf.";
-$a->strings["The database tables have been updated."] = "Die Tabellen in der Datenbank wurden aktualisiert.";
-$a->strings["An error occurred during the update."] = "Während der Aktualisierung trat ein Fehler auf.";
-$a->strings["No system-wide settings yet."] = "Momentan keine systemweiten Einstellungen.";
-$a->strings["Database status"] = "Datenbankstatus";
-$a->strings["Installed"] = "Installiert";
-$a->strings["Upgrade needed"] = "Upgrade erforderlich";
-$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche <i>sollten</i> alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden.";
-$a->strings["Upgrade"] = "Upgrade";
-$a->strings["Not installed"] = "Nicht installiert";
-$a->strings["Install"] = "Installieren";
-$a->strings["Unknown"] = "Unbekannt";
-$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen.";
-$a->strings["Troubleshooting"] = "Problembehebung";
-$a->strings["Manual creation of the database tables:"] = "Manuelles Anlegen der Datenbanktabellen:";
-$a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen";
-$a->strings["Private Calendar"] = "Privater Kalender";
-$a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen";
-$a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte";
-$a->strings["Private Addresses"] = "Private Adressen";
-$a->strings["Friendica Contacts"] = "Friendica Kontakte";
-$a->strings["Could not open component for editing"] = "Kalender-Editierfunktion konnte nicht geöffnet werden";
-$a->strings["Event data"] = "Veranstaltungsdetails";
-$a->strings["Special color"] = "Spezielle Farbe";
-$a->strings["Subject"] = "Betreff:";
-$a->strings["Starts"] = "Beginnt";
-$a->strings["Ends"] = "Endet";
-$a->strings["Location"] = "Wohnort";
-$a->strings["Description"] = "Beschreibung";
-$a->strings["Recurrence"] = "Wiederholungen:";
-$a->strings["Frequency"] = "Frequenz";
-$a->strings["None"] = "Keine";
-$a->strings["Daily"] = "Täglich";
-$a->strings["Weekly"] = "Wöchentlich";
-$a->strings["Monthly"] = "Monatlich";
-$a->strings["Yearly"] = "Jährlich";
-$a->strings["days"] = "Tage";
-$a->strings["weeks"] = "Wochen";
-$a->strings["months"] = "Monate";
-$a->strings["years"] = "Jahre";
-$a->strings["Interval"] = "Intervall";
-$a->strings["All %select% %time%"] = "Jeden %select% %time%";
-$a->strings["Days"] = "Tage";
-$a->strings["Sunday"] = "Sonntag";
-$a->strings["Monday"] = "Montag";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["First day of week:"] = "Erster Tag der Woche";
-$a->strings["Day of month"] = "Tag des Monats";
-$a->strings["#num#th of each month"] = "#num#ten jedes Monats";
-$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats";
-$a->strings["#num#th #wkday# of each month"] = "jeden #num#ten #wkday# eines Monats";
-$a->strings["#num#th-last #wkday# of each month"] = "jeden #num#ten letzten #wkday# eines Monats";
-$a->strings["#num#th of the given month"] = "#num#ten des Monats";
-$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats";
-$a->strings["#num#th #wkday# of the given month"] = "jeden #num#ten eines Monats";
-$a->strings["#num#th-last #wkday# of the given month"] = "jeden #num#ten letzten eines Monats";
-$a->strings["Repeat until"] = "Wiederholungen";
-$a->strings["Infinite"] = "unendlich";
-$a->strings["Until the following date"] = "bis zum folgenden Datum";
-$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen";
-$a->strings["Exceptions"] = "Ausnahmen";
-$a->strings["none"] = "keine";
-$a->strings["Notification"] = "Benachrichtigung";
-$a->strings["Notify by"] = "Benarchrichtigungsmethode";
-$a->strings["Remove"] = "Entfernen";
-$a->strings["E-Mail"] = "E-Mail";
-$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige";
-$a->strings["Time"] = "Zeit";
-$a->strings["Hours"] = "Stunden";
-$a->strings["Minutes"] = "Minuten";
-$a->strings["Seconds"] = "Sekunden";
-$a->strings["Weeks"] = "Wochen";
-$a->strings["before the"] = "vor dem";
-$a->strings["start of the event"] = "Beginn des Termins";
-$a->strings["end of the event"] = "Ende des Termins";
-$a->strings["Add a notification"] = "Benachrichtigung hinzufügen";
-$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen";
-$a->strings["#name# is about to begin."] = "#name# beginnt demnächst.";
-$a->strings["Saved"] = "Gespeichert";
-$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)";
-$a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)";
-$a->strings["Private Events"] = "Privater Termin";
-$a->strings["No access"] = "Kein Zugriff";
-$a->strings["Private Addressbooks"] = "Private Adressbücher";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Private Calendar"] = "Privater Kalender";
+$a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen";
+$a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte";
+$a->strings["Private Addresses"] = "Private Adressen";
+$a->strings["Friendica Contacts"] = "Friendica Kontakte";
+$a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
+$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
+$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben.";
+$a->strings["Calendar"] = "Kalender";
+$a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung.";
+$a->strings["noreply"] = "noreply";
+$a->strings["Notification: "] = "Benachrichtigungen: ";
+$a->strings["The database tables have been installed."] = "Die Datenbank-Tabellen wurden installiert.";
+$a->strings["An error occurred during the installation."] = "Während der Installation trat ein Fehler auf.";
+$a->strings["The database tables have been updated."] = "Die Tabellen in der Datenbank wurden aktualisiert.";
+$a->strings["An error occurred during the update."] = "Während der Aktualisierung trat ein Fehler auf.";
+$a->strings["No system-wide settings yet."] = "Momentan keine systemweiten Einstellungen.";
+$a->strings["Database status"] = "Datenbank Status";
+$a->strings["Installed"] = "Installiert";
+$a->strings["Upgrade needed"] = "Upgrade erforderlich";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche <i>sollten</i> alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden.";
+$a->strings["Upgrade"] = "Upgrade";
+$a->strings["Not installed"] = "Nicht installiert";
+$a->strings["Install"] = "Installieren";
+$a->strings["Unknown"] = "Unbekannt";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen.";
+$a->strings["Troubleshooting"] = "Problembehebung";
+$a->strings["Manual creation of the database tables:"] = "Manuelles anlegen der Datenbank Tabellen:";
+$a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen.";
+$a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert.";
+$a->strings["No file was uploaded."] = "Es wurde keine Datei geladen.";
+$a->strings["Go back to the calendar"] = "Zurück zum Kalender";
+$a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei";
+$a->strings["ICS-File"] = "ICS-Datei";
+$a->strings["Overwrite all #num# existing events"] = "Überschreibe alle #num# existierenden Einträge";
+$a->strings["Upload"] = "Hochladen";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Help"] = "Hilfe";
+$a->strings["New event"] = "Neue Veranstaltung";
+$a->strings["Today"] = "Heute";
+$a->strings["Day"] = "Tag";
+$a->strings["Week"] = "Woche";
+$a->strings["Month"] = "Monat";
+$a->strings["Reload"] = "Neu Laden";
+$a->strings["Previous"] = "Vorherige";
+$a->strings["Next"] = "Nächste";
+$a->strings["Date"] = "Datum";
+$a->strings["Error"] = "Fehler";
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["The new values have been saved."] = "Die neuen Einstellungen wurden gespeichert.";
+$a->strings["The calendar has been updated."] = "Der Kalender wurde aktualisiert.";
+$a->strings["The new calendar has been created."] = "Der neue Kalender wurde erstellt.";
+$a->strings["The calendar has been deleted."] = "Der Kalender wurde gelöscht.";
+$a->strings["Calendar Settings"] = "Kalender Einstellungen";
+$a->strings["Date format"] = "Datumsformat";
+$a->strings["Time zone"] = "Zeitzone";
+$a->strings["Save"] = "Speichern";
+$a->strings["Calendars"] = "Kalender";
+$a->strings["Create a new calendar"] = "Neuen Kalender anlegen";
+$a->strings["Limitations"] = "Einschränkungen";
+$a->strings["Warning"] = "Warnung";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren";
+$a->strings["Could not open component for editing"] = "Kalender-Editierfunktion konnte nicht geöffnet werden";
+$a->strings["Event data"] = "Veranstaltungsdetails";
+$a->strings["Special color"] = "Spezielle Farbe";
+$a->strings["Subject"] = "Betreff:";
+$a->strings["Starts"] = "Beginnt";
+$a->strings["Ends"] = "Endet";
+$a->strings["Location"] = "Ort:";
+$a->strings["Description"] = "Beschreibung";
+$a->strings["Recurrence"] = "Wiederholungen:";
+$a->strings["Frequency"] = "Frequenz";
+$a->strings["None"] = "Keine";
+$a->strings["Daily"] = "Täglich";
+$a->strings["Weekly"] = "Wöchentlich";
+$a->strings["Monthly"] = "Monatlich";
+$a->strings["Yearly"] = "Jährlich";
+$a->strings["days"] = "Tage";
+$a->strings["weeks"] = "Wochen";
+$a->strings["months"] = "Monate";
+$a->strings["years"] = "Jahre";
+$a->strings["Interval"] = "Intervall";
+$a->strings["All %select% %time%"] = "Jeden %select% %time%";
+$a->strings["Days"] = "Tage";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["First day of week:"] = "Erster Tag der Woche";
+$a->strings["Day of month"] = "Tag des Monats";
+$a->strings["#num#th of each month"] = "#num#ten jedes Monats";
+$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats";
+$a->strings["#num#th #wkday# of each month"] = "jeden #num#ten #wkday# eines Monats";
+$a->strings["#num#th-last #wkday# of each month"] = "jeden #num#ten letzten #wkday# eines Monats";
+$a->strings["#num#th of the given month"] = "#num#ten des Monats";
+$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats";
+$a->strings["#num#th #wkday# of the given month"] = "jeden #num#ten eines Monats";
+$a->strings["#num#th-last #wkday# of the given month"] = "jeden #num#ten letzten eines Monats";
+$a->strings["Repeat until"] = "Wiederholungen";
+$a->strings["Infinite"] = "unendlich";
+$a->strings["Until the following date"] = "bis zum folgenden Datum";
+$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen";
+$a->strings["Exceptions"] = "Ausnahmen";
+$a->strings["none"] = "keine";
+$a->strings["Notification"] = "Benachrichtigung";
+$a->strings["Notify by"] = "Benarchrichtigungsmethode";
+$a->strings["Remove"] = "Entfernen";
+$a->strings["E-Mail"] = "E-Mail";
+$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige";
+$a->strings["Time"] = "Zeit";
+$a->strings["Hours"] = "Stunden";
+$a->strings["Minutes"] = "Minuten";
+$a->strings["Seconds"] = "Sekunden";
+$a->strings["Weeks"] = "Wochen";
+$a->strings["before the"] = "vor dem";
+$a->strings["start of the event"] = "Beginn des Termins";
+$a->strings["end of the event"] = "Ende des Termins";
+$a->strings["Add a notification"] = "Benachrichtigung hinzufügen";
+$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen";
+$a->strings["#name# is about to begin."] = "#name# beginnt demnächst.";
+$a->strings["Saved"] = "Gespeichert";
+$a->strings["Private Addressbooks"] = "Private Adressbücher";
+$a->strings["Private Events"] = "Privater Termin";
+$a->strings["No access"] = "Kein Zugriff";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)";
diff --git a/dav/lang/ro/messages.po b/dav/lang/ro/messages.po
new file mode 100644
index 00000000..15743c8d
--- /dev/null
+++ b/dav/lang/ro/messages.po
@@ -0,0 +1,577 @@
+# ADDON dav
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dav addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:47+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: friendica/calendar.friendica.fnk.php:206
+msgid "Private Calendar"
+msgstr "Calendar Privat"
+
+#: friendica/calendar.friendica.fnk.php:207
+msgid "Friendica Events: Mine"
+msgstr "Evenimente Friendica: ale Mele"
+
+#: friendica/calendar.friendica.fnk.php:208
+msgid "Friendica Events: Contacts"
+msgstr "Evenimente Friendica: Contacte"
+
+#: friendica/calendar.friendica.fnk.php:248
+msgid "Private Addresses"
+msgstr "Adresele Private"
+
+#: friendica/calendar.friendica.fnk.php:249
+msgid "Friendica Contacts"
+msgstr "Contacte Friendica"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:59
+msgid "Friendica-Contacts"
+msgstr "Contacte-Friendica"
+
+#: friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+msgid "Your Friendica-Contacts"
+msgstr "Contactele-Dvs-Friendica"
+
+#: friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendica-Native events"
+msgstr "Evenimente Native-Friendica"
+
+#: friendica/main.php:202
+msgid ""
+"The current version of this plugin has not been set up correctly. Please "
+"contact the system administrator of your installation of friendica to fix "
+"this."
+msgstr "Versiunea curentă a acestui modul nu a fost corect configurată. Vă rugăm să contactați administratorul de sistem al aplicației dvs. friendica, pentru a corecta această situație."
+
+#: friendica/main.php:239 common/wdcal_edit.inc.php:146
+msgid "Calendar"
+msgstr "Calendar"
+
+#: friendica/main.php:242
+msgid "Extended calendar with CalDAV-support"
+msgstr "Calendar extins cu suport-CalDAV"
+
+#: friendica/main.php:279 friendica/main.php:280
+msgid "noreply"
+msgstr "nu-răspunde"
+
+#: friendica/main.php:282
+msgid "Notification: "
+msgstr "Notificare:"
+
+#: friendica/main.php:309
+msgid "The database tables have been installed."
+msgstr "Tabelele bazei de date au fost instalate."
+
+#: friendica/main.php:310
+msgid "An error occurred during the installation."
+msgstr "A apărut o eroare la instalare."
+
+#: friendica/main.php:316
+msgid "The database tables have been updated."
+msgstr "Tabelele bazei de date au fost actualizate."
+
+#: friendica/main.php:317
+msgid "An error occurred during the update."
+msgstr "A apărut o eroare în timpul actualizării."
+
+#: friendica/main.php:333
+msgid "No system-wide settings yet."
+msgstr "Nu există încă configurări globale de sistem."
+
+#: friendica/main.php:336
+msgid "Database status"
+msgstr "Status bază de date"
+
+#: friendica/main.php:339
+msgid "Installed"
+msgstr "Instalat"
+
+#: friendica/main.php:343
+msgid "Upgrade needed"
+msgstr "Necesită actualizare"
+
+#: friendica/main.php:343
+msgid ""
+"Please back up all calendar data (the tables beginning with dav_*) before "
+"proceeding. While all calendar events <i>should</i> be converted to the new "
+"database structure, it's always safe to have a backup. Below, you can have a"
+" look at the database-queries that will be made when pressing the "
+"'update'-button."
+msgstr "Vă rugăm să faceți backup la toate datele din calendar (tabelele cu sufixul dav_*), înainte de a continua. În timp ce toate evenimentele din calendar <i>ar trebui</i> să fie convertite la noua structură a bazei date, e întotdeauna mai sigur să dețineți o copie de backup. Mai jos, puteți vizualiza interogările-bazei-de-date ce vor fi făcute la apăsarea butonului 'actualizare'."
+
+#: friendica/main.php:343
+msgid "Upgrade"
+msgstr "Actualizare"
+
+#: friendica/main.php:346
+msgid "Not installed"
+msgstr "Nu este instalat"
+
+#: friendica/main.php:346
+msgid "Install"
+msgstr "Instalați"
+
+#: friendica/main.php:350
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: friendica/main.php:350
+msgid ""
+"Something really went wrong. I cannot recover from this state automatically,"
+" sorry. Please go to the database backend, back up the data, and delete all "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine"
+" should be able to reinitialize the tables automatically."
+msgstr "Ceva chiar nu a mers bine. Nu se poate reveni automat din această stare, ne pare rău. Vă rugăm să vă deplasați către zona de administrare a bazei de date, faceți backup pentru toate datele, şi ștergeți manual toate tabelele cu sufixul 'dav_'. După aceea, această sesiune de instalare ar trebui să fie capabilă să reinițializeze tabelele automat."
+
+#: friendica/main.php:355
+msgid "Troubleshooting"
+msgstr "Rezolvarea problemelor"
+
+#: friendica/main.php:356
+msgid "Manual creation of the database tables:"
+msgstr "Crearea manuală a tabelelor bazei de date:"
+
+#: friendica/main.php:357
+msgid "Show SQL-statements"
+msgstr "Afișare declarații-SQL"
+
+#: friendica/layout.fnk.php:99 friendica/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr "Ceva s-a greșit la încercarea de importare a fișierului. Ne pare rău. Probabil că unele evenimente au fost importate oricum."
+
+#: friendica/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr "Ceva s-a greșit la încercarea de importare a fișierului. Ne pare rău."
+
+#: friendica/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr "Fișierul-ICS a fost importat."
+
+#: friendica/layout.fnk.php:138
+msgid "No file was uploaded."
+msgstr "Nici un fișier nu a fost încărcat."
+
+#: friendica/layout.fnk.php:143 friendica/layout.fnk.php:422
+#: common/wdcal_edit.inc.php:140
+msgid "Go back to the calendar"
+msgstr "Înapoi la calendar"
+
+#: friendica/layout.fnk.php:147
+msgid "Import a ICS-file"
+msgstr "Importați un fișier-ICS"
+
+#: friendica/layout.fnk.php:150
+msgid "ICS-File"
+msgstr "Fișier-ICS"
+
+#: friendica/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
+msgstr "Suprascrie toate cele #num# evenimente existente"
+
+#: friendica/layout.fnk.php:152
+msgid "Upload"
+msgstr "Încărcare"
+
+#: friendica/layout.fnk.php:225
+msgid "Settings"
+msgstr "Configurări"
+
+#: friendica/layout.fnk.php:225
+msgid "Help"
+msgstr "Ajutor"
+
+#: friendica/layout.fnk.php:228
+msgid "New event"
+msgstr "Eveniment nou"
+
+#: friendica/layout.fnk.php:232
+msgid "Today"
+msgstr "Astăzi"
+
+#: friendica/layout.fnk.php:241
+msgid "Day"
+msgstr "Zi"
+
+#: friendica/layout.fnk.php:248
+msgid "Week"
+msgstr "Săptămâna"
+
+#: friendica/layout.fnk.php:255 common/wdcal_edit.inc.php:372
+msgid "Month"
+msgstr "Luna"
+
+#: friendica/layout.fnk.php:260
+msgid "Reload"
+msgstr "Reîncărcare"
+
+#: friendica/layout.fnk.php:263
+msgid "Previous"
+msgstr "Precedent"
+
+#: friendica/layout.fnk.php:266
+msgid "Next"
+msgstr "Următor"
+
+#: friendica/layout.fnk.php:271
+msgid "Date"
+msgstr "Data"
+
+#: friendica/layout.fnk.php:313
+msgid "Error"
+msgstr "Eroare"
+
+#: friendica/layout.fnk.php:354
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: friendica/layout.fnk.php:361
+msgid "The new values have been saved."
+msgstr "Noile valori au fost salvate."
+
+#: friendica/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr "Calendarul a fost actualizat."
+
+#: friendica/layout.fnk.php:393
+msgid "The new calendar has been created."
+msgstr "Noul calendar a fost creat."
+
+#: friendica/layout.fnk.php:417
+msgid "The calendar has been deleted."
+msgstr "Calendarul a fost șters."
+
+#: friendica/layout.fnk.php:424
+msgid "Calendar Settings"
+msgstr "Configurări Calendar"
+
+#: friendica/layout.fnk.php:430
+msgid "Date format"
+msgstr "Formatul datei"
+
+#: friendica/layout.fnk.php:439
+msgid "Time zone"
+msgstr "Fus orar"
+
+#: friendica/layout.fnk.php:441 friendica/layout.fnk.php:488
+msgid "Save"
+msgstr "Salvare"
+
+#: friendica/layout.fnk.php:445
+msgid "Calendars"
+msgstr "Calendare"
+
+#: friendica/layout.fnk.php:487
+msgid "Create a new calendar"
+msgstr "Creați un calendar nou"
+
+#: friendica/layout.fnk.php:496
+msgid "Limitations"
+msgstr "Limitări"
+
+#: friendica/layout.fnk.php:500
+msgid "Warning"
+msgstr "Atenție"
+
+#: friendica/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr "Sincronizare (iPhone, Thunderbird Lightning, Android, ...)"
+
+#: friendica/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
+msgstr "Sincronizați acest calendar cu iPhone"
+
+#: friendica/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr "Sincronizați contactele Friendica cu iPhone"
+
+#: common/wdcal_edit.inc.php:30 common/wdcal_edit.inc.php:738
+msgid "Could not open component for editing"
+msgstr "Nu s-a putut deschide componenta pentru editare"
+
+#: common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr "Dată eveniment"
+
+#: common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr "Culoare specială"
+
+#: common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr "Subiect"
+
+#: common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr "Începe"
+
+#: common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr "Finalizare"
+
+#: common/wdcal_edit.inc.php:183
+msgid "Location"
+msgstr "Locație"
+
+#: common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr "Descriere"
+
+#: common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr "Repetare"
+
+#: common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr "Frecvență"
+
+#: common/wdcal_edit.inc.php:191
+msgid "None"
+msgstr "Nimic"
+
+#: common/wdcal_edit.inc.php:194
+msgid "Daily"
+msgstr "Zilnic"
+
+#: common/wdcal_edit.inc.php:197
+msgid "Weekly"
+msgstr "Săptămânal"
+
+#: common/wdcal_edit.inc.php:200
+msgid "Monthly"
+msgstr "Lunar"
+
+#: common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr "Anual"
+
+#: common/wdcal_edit.inc.php:214
+msgid "days"
+msgstr "zile"
+
+#: common/wdcal_edit.inc.php:215
+msgid "weeks"
+msgstr "săptămâni"
+
+#: common/wdcal_edit.inc.php:216
+msgid "months"
+msgstr "luni"
+
+#: common/wdcal_edit.inc.php:217
+msgid "years"
+msgstr "ani"
+
+#: common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr "Interval"
+
+#: common/wdcal_edit.inc.php:218
+msgid "All %select% %time%"
+msgstr "Toate %select% %time%"
+
+#: common/wdcal_edit.inc.php:222 common/wdcal_edit.inc.php:260
+#: common/wdcal_edit.inc.php:481
+msgid "Days"
+msgstr "Zile"
+
+#: common/wdcal_edit.inc.php:231 common/wdcal_edit.inc.php:254
+#: common/wdcal_edit.inc.php:270 common/wdcal_edit.inc.php:293
+#: common/wdcal_edit.inc.php:305
+msgid "Sunday"
+msgstr "Duminică"
+
+#: common/wdcal_edit.inc.php:235 common/wdcal_edit.inc.php:274
+#: common/wdcal_edit.inc.php:308
+msgid "Monday"
+msgstr "Luni"
+
+#: common/wdcal_edit.inc.php:238 common/wdcal_edit.inc.php:277
+msgid "Tuesday"
+msgstr "Marţi"
+
+#: common/wdcal_edit.inc.php:241 common/wdcal_edit.inc.php:280
+msgid "Wednesday"
+msgstr "Miercuri"
+
+#: common/wdcal_edit.inc.php:244 common/wdcal_edit.inc.php:283
+msgid "Thursday"
+msgstr "Joi"
+
+#: common/wdcal_edit.inc.php:247 common/wdcal_edit.inc.php:286
+msgid "Friday"
+msgstr "Vineri"
+
+#: common/wdcal_edit.inc.php:250 common/wdcal_edit.inc.php:289
+msgid "Saturday"
+msgstr "Sâmbătă"
+
+#: common/wdcal_edit.inc.php:297
+msgid "First day of week:"
+msgstr "Prima zi a săptămânii:"
+
+#: common/wdcal_edit.inc.php:350 common/wdcal_edit.inc.php:373
+msgid "Day of month"
+msgstr "Ziua din lună"
+
+#: common/wdcal_edit.inc.php:354
+msgid "#num#th of each month"
+msgstr "A #num# -a a fiecărei luni"
+
+#: common/wdcal_edit.inc.php:357
+msgid "#num#th-last of each month"
+msgstr "Ultima a #num#-a a fiecărei luni"
+
+#: common/wdcal_edit.inc.php:360
+msgid "#num#th #wkday# of each month"
+msgstr "A #num#-a #wkday# din fiecare lună"
+
+#: common/wdcal_edit.inc.php:363
+msgid "#num#th-last #wkday# of each month"
+msgstr "Ultima a #num#-a #wkday# din fiecare lună"
+
+#: common/wdcal_edit.inc.php:377
+msgid "#num#th of the given month"
+msgstr "A #num#-a a lunii respective"
+
+#: common/wdcal_edit.inc.php:380
+msgid "#num#th-last of the given month"
+msgstr "Ultima a #num#-a a lunii respective"
+
+#: common/wdcal_edit.inc.php:383
+msgid "#num#th #wkday# of the given month"
+msgstr "A #num#-a #wkday# din luna respectivă"
+
+#: common/wdcal_edit.inc.php:386
+msgid "#num#th-last #wkday# of the given month"
+msgstr "Ultima a #num#-a #wkday# din luna respectivă"
+
+#: common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr "Repetare până în"
+
+#: common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr "Infinit"
+
+#: common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr "Până la următoarea dată"
+
+#: common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr "Număr de repetări"
+
+#: common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr "Excepții"
+
+#: common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr "nespecificat"
+
+#: common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr "Notificare"
+
+#: common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr "Notificare prin"
+
+#: common/wdcal_edit.inc.php:468
+msgid "Remove"
+msgstr "Eliminare"
+
+#: common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr "Pe Friendica / Afișare"
+
+#: common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr "Data"
+
+#: common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr "Ore"
+
+#: common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr "Minute"
+
+#: common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr "Secunde"
+
+#: common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr "Săptămâni"
+
+#: common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr "înainte de"
+
+#: common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr "începerea evenimentului"
+
+#: common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr "finalizarea evenimentului"
+
+#: common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr "Adăugați o notificare"
+
+#: common/wdcal_edit.inc.php:687
+msgid "The event #name# will start at #date"
+msgstr "Evenimentul #nume# va începe la #data"
+
+#: common/wdcal_edit.inc.php:696
+msgid "#name# is about to begin."
+msgstr "#Nume# este pe cale să înceapă."
+
+#: common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr "Salvat"
+
+#: common/dav_carddav_backend_private.inc.php:46
+msgid "Private Addressbooks"
+msgstr "Agende Private"
+
+#: common/dav_caldav_backend_private.inc.php:39
+msgid "Private Events"
+msgstr "Evenimente Private"
+
+#: common/wdcal_backend.inc.php:92 common/wdcal_backend.inc.php:166
+#: common/wdcal_backend.inc.php:178 common/wdcal_backend.inc.php:206
+#: common/wdcal_backend.inc.php:214 common/wdcal_backend.inc.php:229
+msgid "No access"
+msgstr "Nu aveți acces"
+
+#: common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr "Format Dată S.U.A. (mm/dd/YYYY)"
+
+#: common/wdcal_configuration.php:243
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr "Format Dată Germania (dd.mm.YYYY)"
diff --git a/dav/lang/ro/strings.php b/dav/lang/ro/strings.php
new file mode 100644
index 00000000..793a27d4
--- /dev/null
+++ b/dav/lang/ro/strings.php
@@ -0,0 +1,141 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Private Calendar"] = "Calendar Privat";
+$a->strings["Friendica Events: Mine"] = "Evenimente Friendica: ale Mele";
+$a->strings["Friendica Events: Contacts"] = "Evenimente Friendica: Contacte";
+$a->strings["Private Addresses"] = "Adresele Private";
+$a->strings["Friendica Contacts"] = "Contacte Friendica";
+$a->strings["Friendica-Contacts"] = "Contacte-Friendica";
+$a->strings["Your Friendica-Contacts"] = "Contactele-Dvs-Friendica";
+$a->strings["Friendica-Native events"] = "Evenimente Native-Friendica";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Versiunea curentă a acestui modul nu a fost corect configurată. Vă rugăm să contactați administratorul de sistem al aplicației dvs. friendica, pentru a corecta această situație.";
+$a->strings["Calendar"] = "Calendar";
+$a->strings["Extended calendar with CalDAV-support"] = "Calendar extins cu suport-CalDAV";
+$a->strings["noreply"] = "nu-răspunde";
+$a->strings["Notification: "] = "Notificare:";
+$a->strings["The database tables have been installed."] = "Tabelele bazei de date au fost instalate.";
+$a->strings["An error occurred during the installation."] = "A apărut o eroare la instalare.";
+$a->strings["The database tables have been updated."] = "Tabelele bazei de date au fost actualizate.";
+$a->strings["An error occurred during the update."] = "A apărut o eroare în timpul actualizării.";
+$a->strings["No system-wide settings yet."] = "Nu există încă configurări globale de sistem.";
+$a->strings["Database status"] = "Status bază de date";
+$a->strings["Installed"] = "Instalat";
+$a->strings["Upgrade needed"] = "Necesită actualizare";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Vă rugăm să faceți backup la toate datele din calendar (tabelele cu sufixul dav_*), înainte de a continua. În timp ce toate evenimentele din calendar <i>ar trebui</i> să fie convertite la noua structură a bazei date, e întotdeauna mai sigur să dețineți o copie de backup. Mai jos, puteți vizualiza interogările-bazei-de-date ce vor fi făcute la apăsarea butonului 'actualizare'.";
+$a->strings["Upgrade"] = "Actualizare";
+$a->strings["Not installed"] = "Nu este instalat";
+$a->strings["Install"] = "Instalați";
+$a->strings["Unknown"] = "Necunoscut";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Ceva chiar nu a mers bine. Nu se poate reveni automat din această stare, ne pare rău. Vă rugăm să vă deplasați către zona de administrare a bazei de date, faceți backup pentru toate datele, şi ștergeți manual toate tabelele cu sufixul 'dav_'. După aceea, această sesiune de instalare ar trebui să fie capabilă să reinițializeze tabelele automat.";
+$a->strings["Troubleshooting"] = "Rezolvarea problemelor";
+$a->strings["Manual creation of the database tables:"] = "Crearea manuală a tabelelor bazei de date:";
+$a->strings["Show SQL-statements"] = "Afișare declarații-SQL";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Ceva s-a greșit la încercarea de importare a fișierului. Ne pare rău. Probabil că unele evenimente au fost importate oricum.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Ceva s-a greșit la încercarea de importare a fișierului. Ne pare rău.";
+$a->strings["The ICS-File has been imported."] = "Fișierul-ICS a fost importat.";
+$a->strings["No file was uploaded."] = "Nici un fișier nu a fost încărcat.";
+$a->strings["Go back to the calendar"] = "Înapoi la calendar";
+$a->strings["Import a ICS-file"] = "Importați un fișier-ICS";
+$a->strings["ICS-File"] = "Fișier-ICS";
+$a->strings["Overwrite all #num# existing events"] = "Suprascrie toate cele #num# evenimente existente";
+$a->strings["Upload"] = "Încărcare";
+$a->strings["Settings"] = "Configurări";
+$a->strings["Help"] = "Ajutor";
+$a->strings["New event"] = "Eveniment nou";
+$a->strings["Today"] = "Astăzi";
+$a->strings["Day"] = "Zi";
+$a->strings["Week"] = "Săptămâna";
+$a->strings["Month"] = "Luna";
+$a->strings["Reload"] = "Reîncărcare";
+$a->strings["Previous"] = "Precedent";
+$a->strings["Next"] = "Următor";
+$a->strings["Date"] = "Data";
+$a->strings["Error"] = "Eroare";
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["The new values have been saved."] = "Noile valori au fost salvate.";
+$a->strings["The calendar has been updated."] = "Calendarul a fost actualizat.";
+$a->strings["The new calendar has been created."] = "Noul calendar a fost creat.";
+$a->strings["The calendar has been deleted."] = "Calendarul a fost șters.";
+$a->strings["Calendar Settings"] = "Configurări Calendar";
+$a->strings["Date format"] = "Formatul datei";
+$a->strings["Time zone"] = "Fus orar";
+$a->strings["Save"] = "Salvare";
+$a->strings["Calendars"] = "Calendare";
+$a->strings["Create a new calendar"] = "Creați un calendar nou";
+$a->strings["Limitations"] = "Limitări";
+$a->strings["Warning"] = "Atenție";
+$a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Sincronizare (iPhone, Thunderbird Lightning, Android, ...)";
+$a->strings["Synchronizing this calendar with the iPhone"] = "Sincronizați acest calendar cu iPhone";
+$a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Sincronizați contactele Friendica cu iPhone";
+$a->strings["Could not open component for editing"] = "Nu s-a putut deschide componenta pentru editare";
+$a->strings["Event data"] = "Dată eveniment";
+$a->strings["Special color"] = "Culoare specială";
+$a->strings["Subject"] = "Subiect";
+$a->strings["Starts"] = "Începe";
+$a->strings["Ends"] = "Finalizare";
+$a->strings["Location"] = "Locație";
+$a->strings["Description"] = "Descriere";
+$a->strings["Recurrence"] = "Repetare";
+$a->strings["Frequency"] = "Frecvență";
+$a->strings["None"] = "Nimic";
+$a->strings["Daily"] = "Zilnic";
+$a->strings["Weekly"] = "Săptămânal";
+$a->strings["Monthly"] = "Lunar";
+$a->strings["Yearly"] = "Anual";
+$a->strings["days"] = "zile";
+$a->strings["weeks"] = "săptămâni";
+$a->strings["months"] = "luni";
+$a->strings["years"] = "ani";
+$a->strings["Interval"] = "Interval";
+$a->strings["All %select% %time%"] = "Toate %select% %time%";
+$a->strings["Days"] = "Zile";
+$a->strings["Sunday"] = "Duminică";
+$a->strings["Monday"] = "Luni";
+$a->strings["Tuesday"] = "Marţi";
+$a->strings["Wednesday"] = "Miercuri";
+$a->strings["Thursday"] = "Joi";
+$a->strings["Friday"] = "Vineri";
+$a->strings["Saturday"] = "Sâmbătă";
+$a->strings["First day of week:"] = "Prima zi a săptămânii:";
+$a->strings["Day of month"] = "Ziua din lună";
+$a->strings["#num#th of each month"] = "A #num# -a a fiecărei luni";
+$a->strings["#num#th-last of each month"] = "Ultima a #num#-a a fiecărei luni";
+$a->strings["#num#th #wkday# of each month"] = "A #num#-a #wkday# din fiecare lună";
+$a->strings["#num#th-last #wkday# of each month"] = "Ultima a #num#-a #wkday# din fiecare lună";
+$a->strings["#num#th of the given month"] = "A #num#-a a lunii respective";
+$a->strings["#num#th-last of the given month"] = "Ultima a #num#-a a lunii respective";
+$a->strings["#num#th #wkday# of the given month"] = "A #num#-a #wkday# din luna respectivă";
+$a->strings["#num#th-last #wkday# of the given month"] = "Ultima a #num#-a #wkday# din luna respectivă";
+$a->strings["Repeat until"] = "Repetare până în";
+$a->strings["Infinite"] = "Infinit";
+$a->strings["Until the following date"] = "Până la următoarea dată";
+$a->strings["Number of times"] = "Număr de repetări";
+$a->strings["Exceptions"] = "Excepții";
+$a->strings["none"] = "nespecificat";
+$a->strings["Notification"] = "Notificare";
+$a->strings["Notify by"] = "Notificare prin";
+$a->strings["Remove"] = "Eliminare";
+$a->strings["E-Mail"] = "E-Mail";
+$a->strings["On Friendica / Display"] = "Pe Friendica / Afișare";
+$a->strings["Time"] = "Data";
+$a->strings["Hours"] = "Ore";
+$a->strings["Minutes"] = "Minute";
+$a->strings["Seconds"] = "Secunde";
+$a->strings["Weeks"] = "Săptămâni";
+$a->strings["before the"] = "înainte de";
+$a->strings["start of the event"] = "începerea evenimentului";
+$a->strings["end of the event"] = "finalizarea evenimentului";
+$a->strings["Add a notification"] = "Adăugați o notificare";
+$a->strings["The event #name# will start at #date"] = "Evenimentul #nume# va începe la #data";
+$a->strings["#name# is about to begin."] = "#Nume# este pe cale să înceapă.";
+$a->strings["Saved"] = "Salvat";
+$a->strings["Private Addressbooks"] = "Agende Private";
+$a->strings["Private Events"] = "Evenimente Private";
+$a->strings["No access"] = "Nu aveți acces";
+$a->strings["U.S. Time Format (mm/dd/YYYY)"] = "Format Dată S.U.A. (mm/dd/YYYY)";
+$a->strings["German Time Format (dd.mm.YYYY)"] = "Format Dată Germania (dd.mm.YYYY)";
diff --git a/defaultfeatures/lang/C/messages.po b/defaultfeatures/lang/C/messages.po
new file mode 100644
index 00000000..70c34f69
--- /dev/null
+++ b/defaultfeatures/lang/C/messages.po
@@ -0,0 +1,34 @@
+# ADDON defaultfeatures
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica defaultfeatures addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:44+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: defaultfeatures.php:36
+msgid "Features updated"
+msgstr ""
+
+#: defaultfeatures.php:48
+msgid "Off"
+msgstr ""
+
+#: defaultfeatures.php:48
+msgid "On"
+msgstr ""
+
+#: defaultfeatures.php:55
+msgid "Save Settings"
+msgstr ""
diff --git a/defaultprofilepic/lang/C/messages.po b/defaultprofilepic/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po
new file mode 100644
index 00000000..0f71c2cd
--- /dev/null
+++ b/diaspora/lang/C/messages.po
@@ -0,0 +1,60 @@
+# ADDON diaspora
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: diaspora.php:37
+msgid "Post to Diaspora"
+msgstr ""
+
+#: diaspora.php:142
+msgid ""
+"Can't login to your Diaspora account. Please check username and password and "
+"ensure you used the complete address (including http...)"
+msgstr ""
+
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr ""
+
+#: diaspora.php:163
+msgid "Enable Diaspora Post Plugin"
+msgstr ""
+
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr ""
+
+#: diaspora.php:173
+msgid "Diaspora password"
+msgstr ""
+
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr ""
+
+#: diaspora.php:183
+msgid "Post to Diaspora by default"
+msgstr ""
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr ""
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr ""
diff --git a/diaspora/lang/cs/messages.po b/diaspora/lang/cs/messages.po
new file mode 100644
index 00000000..22e1cfef
--- /dev/null
+++ b/diaspora/lang/cs/messages.po
@@ -0,0 +1,62 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:44+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: diaspora.php:37
+msgid "Post to Diaspora"
+msgstr "Příspěvek na Diaspora"
+
+#: diaspora.php:142
+msgid ""
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Nelze se přihlásit na váš Diaspora účet. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)"
+
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Diaspora export"
+
+#: diaspora.php:163
+msgid "Enable Diaspora Post Plugin"
+msgstr "Povolit Diaspora Plugin"
+
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Diaspora uživatelské jméno"
+
+#: diaspora.php:173
+msgid "Diaspora password"
+msgstr "Diaspora heslo"
+
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Adresa webu Diaspora"
+
+#: diaspora.php:183
+msgid "Post to Diaspora by default"
+msgstr "Defaultně zasílat příspěvky na Diaspora"
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Zaslání příspěvku na Diasporu selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
diff --git a/diaspora/lang/cs/strings.php b/diaspora/lang/cs/strings.php
new file mode 100644
index 00000000..9db09791
--- /dev/null
+++ b/diaspora/lang/cs/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Diaspora"] = "Příspěvek na Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nelze se přihlásit na váš Diaspora účet. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)";
+$a->strings["Diaspora Export"] = "Diaspora export";
+$a->strings["Enable Diaspora Post Plugin"] = "Povolit Diaspora Plugin";
+$a->strings["Diaspora username"] = "Diaspora uživatelské jméno";
+$a->strings["Diaspora password"] = "Diaspora heslo";
+$a->strings["Diaspora site URL"] = "Adresa webu Diaspora";
+$a->strings["Post to Diaspora by default"] = "Defaultně zasílat příspěvky na Diaspora";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Diaspora post failed. Queued for retry."] = "Zaslání příspěvku na Diasporu selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
diff --git a/diaspora/lang/de/messages.po b/diaspora/lang/de/messages.po
new file mode 100644
index 00000000..eaeb24ed
--- /dev/null
+++ b/diaspora/lang/de/messages.po
@@ -0,0 +1,62 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:10+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: diaspora.php:37
+msgid "Post to Diaspora"
+msgstr "Auf Diaspora veröffentlichen"
+
+#: diaspora.php:142
+msgid ""
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde."
+
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Diaspora Export"
+
+#: diaspora.php:163
+msgid "Enable Diaspora Post Plugin"
+msgstr "Veröffentlichungen bei Diaspora erlauben"
+
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Diaspora Nutzername"
+
+#: diaspora.php:173
+msgid "Diaspora password"
+msgstr "Diaspora Passwort"
+
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL der Diaspora Seite"
+
+#: diaspora.php:183
+msgid "Post to Diaspora by default"
+msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut."
diff --git a/diaspora/lang/de/strings.php b/diaspora/lang/de/strings.php
new file mode 100644
index 00000000..597d4cea
--- /dev/null
+++ b/diaspora/lang/de/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde.";
+$a->strings["Diaspora Export"] = "Diaspora Export";
+$a->strings["Enable Diaspora Post Plugin"] = "Veröffentlichungen bei Diaspora erlauben";
+$a->strings["Diaspora username"] = "Diaspora Nutzername";
+$a->strings["Diaspora password"] = "Diaspora Passwort";
+$a->strings["Diaspora site URL"] = "URL der Diaspora Seite";
+$a->strings["Post to Diaspora by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Diaspora post failed. Queued for retry."] = "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut.";
diff --git a/diaspora/lang/ro/messages.po b/diaspora/lang/ro/messages.po
new file mode 100644
index 00000000..4ad834a1
--- /dev/null
+++ b/diaspora/lang/ro/messages.po
@@ -0,0 +1,61 @@
+# ADDON diaspora
+# Copyright (C)
+# This file is distributed under the same license as the Friendica diaspora addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:48+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: diaspora.php:37
+msgid "Post to Diaspora"
+msgstr "Postați pe Diaspora"
+
+#: diaspora.php:142
+msgid ""
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă  (inclusiv http ... )"
+
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Exportare pe Diaspora "
+
+#: diaspora.php:163
+msgid "Enable Diaspora Post Plugin"
+msgstr "Activare Modul Postare pe Diaspora"
+
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Utilizator Diaspora"
+
+#: diaspora.php:173
+msgid "Diaspora password"
+msgstr "Parola Diaspora"
+
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL site Diaspora"
+
+#: diaspora.php:183
+msgid "Post to Diaspora by default"
+msgstr "Postați implicit pe Diaspora"
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Postarea pe Diaspora a eșuat. S-a pus în așteptare pentru reîncercare."
diff --git a/diaspora/lang/ro/strings.php b/diaspora/lang/ro/strings.php
new file mode 100644
index 00000000..c40ac8b6
--- /dev/null
+++ b/diaspora/lang/ro/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Diaspora"] = "Postați pe Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă  (inclusiv http ... )";
+$a->strings["Diaspora Export"] = "Exportare pe Diaspora ";
+$a->strings["Enable Diaspora Post Plugin"] = "Activare Modul Postare pe Diaspora";
+$a->strings["Diaspora username"] = "Utilizator Diaspora";
+$a->strings["Diaspora password"] = "Parola Diaspora";
+$a->strings["Diaspora site URL"] = "URL site Diaspora";
+$a->strings["Post to Diaspora by default"] = "Postați implicit pe Diaspora";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Diaspora post failed. Queued for retry."] = "Postarea pe Diaspora a eșuat. S-a pus în așteptare pentru reîncercare.";
diff --git a/dwpost/lang/cs/messages.po b/dwpost/lang/cs/messages.po
new file mode 100644
index 00000000..8ec59999
--- /dev/null
+++ b/dwpost/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:44+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "Poslat na Dreamwidth"
+
+#: dwpost.php:70 dwpost.php:74
+msgid "Dreamwidth Export"
+msgstr "Dreamwidth export"
+
+#: dwpost.php:78
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Povolit dreamwidth Plugin"
+
+#: dwpost.php:83
+msgid "dreamwidth username"
+msgstr "dreamwidth uživatelské jméno"
+
+#: dwpost.php:88
+msgid "dreamwidth password"
+msgstr "dreamwidth heslo"
+
+#: dwpost.php:93
+msgid "Post to dreamwidth by default"
+msgstr "Defaultně umístit na dreamwidth"
+
+#: dwpost.php:99
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/dwpost/lang/cs/strings.php b/dwpost/lang/cs/strings.php
index e01db0d1..cf98ccc2 100644
--- a/dwpost/lang/cs/strings.php
+++ b/dwpost/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth";
-$a->strings["Dreamwidth Post Settings"] = "Nastavení Dreamwidth  příspěvků";
-$a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin";
-$a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
-$a->strings["dreamwidth password"] = "dreamwidth heslo";
-$a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth";
+$a->strings["Dreamwidth Export"] = "Dreamwidth export";
+$a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin";
+$a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
+$a->strings["dreamwidth password"] = "dreamwidth heslo";
+$a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/dwpost/lang/de/messages.po b/dwpost/lang/de/messages.po
new file mode 100644
index 00000000..437ebfeb
--- /dev/null
+++ b/dwpost/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-10 05:48+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "In Dreamwidth veröffentlichen"
+
+#: dwpost.php:70 dwpost.php:74
+msgid "Dreamwidth Export"
+msgstr "Dreamwidth Passwort"
+
+#: dwpost.php:78
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Dreamwidth Post Plugin aktivieren"
+
+#: dwpost.php:83
+msgid "dreamwidth username"
+msgstr "Dreamwidth Benutzername"
+
+#: dwpost.php:88
+msgid "dreamwidth password"
+msgstr "Dreamwidth Passwort"
+
+#: dwpost.php:93
+msgid "Post to dreamwidth by default"
+msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
+
+#: dwpost.php:99
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/dwpost/lang/de/strings.php b/dwpost/lang/de/strings.php
index 2e3ba985..e2025339 100644
--- a/dwpost/lang/de/strings.php
+++ b/dwpost/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
-$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
-$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
-$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
-$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
-$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
+$a->strings["Dreamwidth Export"] = "Dreamwidth Passwort";
+$a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktivieren";
+$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
+$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
+$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/dwpost/lang/ro/messages.po b/dwpost/lang/ro/messages.po
new file mode 100644
index 00000000..7a458731
--- /dev/null
+++ b/dwpost/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON dwpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica dwpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:48+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr "Postați pe Dreamwidth"
+
+#: dwpost.php:70 dwpost.php:74
+msgid "Dreamwidth Export"
+msgstr "Exportare pe Dreamwidth "
+
+#: dwpost.php:78
+msgid "Enable dreamwidth Post Plugin"
+msgstr "Activare Modul Postare pe Dreamwidth"
+
+#: dwpost.php:83
+msgid "dreamwidth username"
+msgstr "Utilizator Dreamwidth"
+
+#: dwpost.php:88
+msgid "dreamwidth password"
+msgstr "Parola Dreamwidth "
+
+#: dwpost.php:93
+msgid "Post to dreamwidth by default"
+msgstr "Postați implicit pe Dreamwidth"
+
+#: dwpost.php:99
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/dwpost/lang/ro/strings.php b/dwpost/lang/ro/strings.php
new file mode 100644
index 00000000..c51d9c93
--- /dev/null
+++ b/dwpost/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Dreamwidth"] = "Postați pe Dreamwidth";
+$a->strings["Dreamwidth Export"] = "Exportare pe Dreamwidth ";
+$a->strings["Enable dreamwidth Post Plugin"] = "Activare Modul Postare pe Dreamwidth";
+$a->strings["dreamwidth username"] = "Utilizator Dreamwidth";
+$a->strings["dreamwidth password"] = "Parola Dreamwidth ";
+$a->strings["Post to dreamwidth by default"] = "Postați implicit pe Dreamwidth";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/editplain/editplain.php b/editplain/editplain.php
index 3aa21491..caa0f29d 100755
--- a/editplain/editplain.php
+++ b/editplain/editplain.php
@@ -4,7 +4,7 @@
  * Description: This addon is deprecated and has been replaced with the "Advanced Features" setting.  Admins should remove this addon when their core code is updated to include advanced feature settings.
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * Status: Unsupported
+ * 
  *
  */
 
diff --git a/editplain/lang/cs/messages.po b/editplain/lang/cs/messages.po
new file mode 100644
index 00000000..5b388fdf
--- /dev/null
+++ b/editplain/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON editplain
+# Copyright (C)
+# This file is distributed under the same license as the Friendica editplain addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:45+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Editplain nastavení aktualizováno"
+
+#: editplain.php:76
+msgid "Editplain Settings"
+msgstr "Editplain nastavení"
+
+#: editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Zakázat richtext status editor"
+
+#: editplain.php:84
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/editplain/lang/cs/strings.php b/editplain/lang/cs/strings.php
index 714e39f5..150681aa 100644
--- a/editplain/lang/cs/strings.php
+++ b/editplain/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno";
-$a->strings["Editplain Settings"] = "Nastavení Editplain";
-$a->strings["Disable richtext status editor"] = "Zakázat richtext status editor";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno";
+$a->strings["Editplain Settings"] = "Editplain nastavení";
+$a->strings["Disable richtext status editor"] = "Zakázat richtext status editor";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/editplain/lang/de/messages.po b/editplain/lang/de/messages.po
new file mode 100644
index 00000000..883bfbf7
--- /dev/null
+++ b/editplain/lang/de/messages.po
@@ -0,0 +1,36 @@
+# ADDON editplain
+# Copyright (C)
+# This file is distributed under the same license as the Friendica editplain addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-27 08:47+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Editplain Einstellungen gespeichert."
+
+#: editplain.php:76
+msgid "Editplain Settings"
+msgstr "Editplain Einstellungen"
+
+#: editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Web-Editor für Beiträge deakivieren"
+
+#: editplain.php:84
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/editplain/lang/de/strings.php b/editplain/lang/de/strings.php
index d4de2143..8686e807 100644
--- a/editplain/lang/de/strings.php
+++ b/editplain/lang/de/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
-$a->strings["Editplain Settings"] = "Editplain Einstellungen";
-$a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Editplain settings updated."] = "Editplain Einstellungen gespeichert.";
+$a->strings["Editplain Settings"] = "Editplain Einstellungen";
+$a->strings["Disable richtext status editor"] = "Web-Editor für Beiträge deakivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/editplain/lang/ro/messages.po b/editplain/lang/ro/messages.po
new file mode 100644
index 00000000..3ed2efa5
--- /dev/null
+++ b/editplain/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON editplain
+# Copyright (C)
+# This file is distributed under the same license as the Friendica editplain addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:49+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Configurările Editplain au fost actualizate."
+
+#: editplain.php:76
+msgid "Editplain Settings"
+msgstr "Configurări Editplain"
+
+#: editplain.php:78
+msgid "Disable richtext status editor"
+msgstr "Dezactivare editorul status de text îmbogățit"
+
+#: editplain.php:84
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/editplain/lang/ro/strings.php b/editplain/lang/ro/strings.php
new file mode 100644
index 00000000..214a64ac
--- /dev/null
+++ b/editplain/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Editplain settings updated."] = "Configurările Editplain au fost actualizate.";
+$a->strings["Editplain Settings"] = "Configurări Editplain";
+$a->strings["Disable richtext status editor"] = "Dezactivare editorul status de text îmbogățit";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/extcron/lang/C/messages.po b/extcron/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/facebook_restrict/lang/C/messages.po b/facebook_restrict/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 2ac558ea..b554453f 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -34,7 +34,6 @@ function fbpost_install() {
 	register_hook('enotify',          'addon/fbpost/fbpost.php', 'fbpost_enotify');
 	register_hook('queue_predeliver', 'addon/fbpost/fbpost.php', 'fbpost_queue_hook');
 	register_hook('cron', 		  'addon/fbpost/fbpost.php', 'fbpost_cron');
-	register_hook('prepare_body',     'addon/fbpost/fbpost.php', 'fbpost_prepare_body');
 }
 
 
@@ -46,7 +45,6 @@ function fbpost_uninstall() {
 	unregister_hook('enotify',          'addon/fbpost/fbpost.php', 'fbpost_enotify');
 	unregister_hook('queue_predeliver', 'addon/fbpost/fbpost.php', 'fbpost_queue_hook');
 	unregister_hook('cron', 	    'addon/fbpost/fbpost.php', 'fbpost_cron');
-	unregister_hook('prepare_body',     'addon/fbpost/fbpost.php', 'fbpost_prepare_body');
 }
 
 
@@ -564,14 +562,12 @@ function fbpost_post_hook(&$a,&$b) {
 
 				if ($toplevel) {
 					require_once("include/plaintext.php");
-					$msgarr = plaintext($a, $b, 0, false, 9);
+					$msgarr = plaintext($a, $b, 0, false);
 					$msg = $msgarr["text"];
 					$link = $msgarr["url"];
+					$image = $msgarr["image"];
 					$linkname = $msgarr["title"];
 
-					if ($msgarr["type"] != "video")
-						$image = $msgarr["image"];
-
 					// Fallback - if message is empty
 					if(!strlen($msg))
 						$msg = $linkname;
@@ -921,23 +917,6 @@ function fbpost_get_app_access_token() {
 	}
 }
 
-function fbpost_prepare_body(&$a,&$b) {
-        if ($b["item"]["network"] != NETWORK_FACEBOOK)
-                return;
-
-        if ($b["preview"]) {
-                $msg = $b["item"]["body"];
-
-		require_once("include/bbcode.php");
-		require_once("include/html2plain.php");
-		$msg = bb_CleanPictureLinks($msg);
-		$msg = bbcode($msg, false, false, 2, true);
-		$msg = trim(html2plain($msg, 0));
-
-                $b['html'] = nl2br(htmlspecialchars($msg));
-        }
-}
-
 function fbpost_cron($a,$b) {
 	$last = get_config('facebook','last_poll');
 
@@ -1032,13 +1011,6 @@ function fbpost_fetchwall($a, $uid) {
 			$oembed_data = oembed_fetch_url($item->link);
 			$type = $oembed_data->type;
 			$content = "[bookmark=".$item->link."]".$item->name."[/bookmark]";
-
-			// If a link is not only attached but also added in the body, look if it can be removed in the body.
-			$removedlink = trim(str_replace($item->link, "", $_REQUEST["body"]));
-
-			if (($removedlink == "") OR strstr($_REQUEST["body"], $removedlink))
-				$_REQUEST["body"] = $removedlink;
-
 		} elseif (isset($item->name))
 			$content .= "[b]".$item->name."[/b]";
 
@@ -1057,25 +1029,11 @@ function fbpost_fetchwall($a, $uid) {
 
 			$type = $item->type;
 
-			if (isset($item->picture))
-				$picture = $item->picture;
-
-			if (($type == "photo") AND isset($item->object_id)) {
-				 logger('fbpost_fetchwall: fetching fbid '.$item->object_id, LOGGER_DEBUG);
-				$url = "https://graph.facebook.com/".$item->object_id."?access_token=".$access_token;
-				$feed = fetch_url($url);
-				$data = json_decode($feed);
-				if (isset($data->images)) {
-					$picture = $data->images[0]->source;
-					logger('fbpost_fetchwall: got fbid image '.$preview, LOGGER_DEBUG);
-				}
-			}
-
-			if(($picture != "") && isset($item->link))
-				$content .= "\n".'[url='.$item->link.'][img]'.$picture.'[/img][/url]';
+			if(isset($item->picture) && isset($item->link))
+				$content .= "\n".'[url='.$item->link.'][img]'.fpost_cleanpicture($item->picture).'[/img][/url]';
 			else {
-				if ($picture != "")
-					$content .= "\n".'[img]'.$picture.'[/img]';
+				if (isset($item->picture))
+					$content .= "\n".'[img]'.fpost_cleanpicture($item->picture).'[/img]';
 				// if just a link, it may be a wall photo - check
 				if(isset($item->link))
 					$content .= fbpost_get_photo($uid,$item->link);
@@ -1146,7 +1104,7 @@ function fbpost_get_photo($uid,$link) {
 	$x = fetch_url('https://graph.facebook.com/'.$photo_id.'?access_token='.$access_token);
 	$j = json_decode($x);
 	if($j->picture)
-		return "\n\n".'[url='.$link.'][img]'.$j->picture.'[/img][/url]';
+		return "\n\n".'[url='.$link.'][img]'.fpost_cleanpicture($j->picture).'[/img][/url]';
 
 	return "";
 }
diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index 51d2747f..85859151 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -213,8 +213,6 @@ function fbsync_expire($a,$b) {
 
 function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $create_user) {
 
-	$access_token = get_pconfig($uid,'facebook','access_token');
-
 	require_once("include/oembed.php");
 
 	// check if it was already imported
@@ -231,7 +229,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	$postarray['wall'] = 0;
 
 	$postarray['verb'] = ACTIVITY_POST;
-	$postarray['object-type'] = ACTIVITY_OBJ_NOTE; // default value - is maybe changed later when media is attached
 	$postarray['network'] =  dbesc(NETWORK_FACEBOOK);
 
 	$postarray['uri'] = "fb::".$post->post_id;
@@ -281,19 +278,7 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	}
 
 	if ($contact_id <= 0) {
-		if ($post->actor_id != $post->source_id) {
-			// Testing if we know the source or the actor
-			$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], false);
-
-			if (($contact_id == 0) and array_key_exists($post->actor_id, $contacts))
-				$contact_id = fbsync_fetch_contact($uid, $contacts[$post->actor_id], false);
-
-			// If we don't know anyone, we guess we should know the source. Could be the wrong decision
-			if ($contact_id == 0)
-				$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
-		} else
-			$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
-
+		$contact_id = fbsync_fetch_contact($uid, $contacts[$post->source_id], $create_user);
 
 		if ($contact_id == -1) {
 			logger('fbsync_createpost: Contact is blocked. Post not imported '.print_r($post, true), LOGGER_DEBUG);
@@ -317,24 +302,6 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 	$postarray["body"] = $msgdata["body"];
 	$postarray["tag"] = $msgdata["tags"];
 
-	// Change the object type when an attachment is present
-	if (isset($post->attachment->fb_object_type))
-		logger('fb_object_type: '.$post->attachment->fb_object_type." ".print_r($post->attachment, true), LOGGER_DEBUG);
-		switch ($post->attachment->fb_object_type) {
-			case 'photo':
-				$postarray['object-type'] = ACTIVITY_OBJ_IMAGE; // photo is deprecated: http://activitystrea.ms/head/activity-schema.html#image
-				break;
-			case 'video':
-				$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
-				break;
-			case '':
-				//$postarray['object-type'] = ACTIVITY_OBJ_BOOKMARK;
-				break;
-			default:
-				logger('Unknown object type '.$post->attachment->fb_object_type, LOGGER_DEBUG);
-				break;
-		}
-
 	$content = "";
 	$type = "";
 
@@ -345,68 +312,47 @@ function fbsync_createpost($a, $uid, $self, $contacts, $applications, $post, $cr
 			$type = "link";
 
 		$content = "[bookmark=".$post->attachment->href."]".$post->attachment->name."[/bookmark]";
-
-		// If a link is not only attached but also added in the body, look if it can be removed in the body.
-		$removedlink = trim(str_replace($post->attachment->href, "", $postarray["body"]));
-
-		if (($removedlink == "") OR strstr($postarray["body"], $removedlink))
-			$postarray["body"] = $removedlink;
-
 	} elseif (isset($post->attachment->name) AND ($post->attachment->name != ""))
 		$content = "[b]" . $post->attachment->name."[/b]";
 
 	$quote = "";
-	if (isset($post->attachment->description) and ($post->attachment->fb_object_type != "photo"))
+	if(isset($post->attachment->description) and ($post->attachment->fb_object_type != "photo"))
 		$quote = $post->attachment->description;
 
-	if (isset($post->attachment->caption) and ($post->attachment->fb_object_type == "photo"))
+	if(isset($post->attachment->caption) and ($post->attachment->fb_object_type == "photo"))
 		$quote = $post->attachment->caption;
 
 	if ($quote.$post->attachment->href.$content.$postarray["body"] == "")
 		return;
 
-	if (isset($post->attachment->media) AND (($type == "") OR ($type == "link"))) {
+	if (isset($post->attachment->media) // AND !strstr($post->attachment->href, "://www.youtube.com/")
+		//AND !strstr($post->attachment->href, "://youtu.be/")
+		//AND !strstr($post->attachment->href, ".vimeo.com/"))
+		AND (($type == "") OR ($type == "link"))) {
 		foreach ($post->attachment->media AS $media) {
+			//$media->photo->owner = number_format($media->photo->owner, 0, '', '');
+			//if ($media->photo->owner != '') {
+			//	$postarray['author-name'] = $contacts[$media->photo->owner]->name;
+			//	$postarray['author-link'] = $contacts[$media->photo->owner]->url;
+			//	$postarray['author-avatar'] = $contacts[$media->photo->owner]->pic_square;
+			//}
 
 			if (isset($media->type))
 				$type = $media->type;
 
-			if (isset($media->src))
-				$preview = $media->src;
-
-			if (isset($media->photo)) {
-				if (isset($media->photo->images) AND (count($media->photo->images) > 1))
-					$preview = $media->photo->images[1]->src;
-
-				if (isset($media->photo->fbid)) {
-					logger('fbsync_createpost: fetching fbid '.$media->photo->fbid, LOGGER_DEBUG);
-					$url = "https://graph.facebook.com/".$media->photo->fbid."?access_token=".$access_token;
-					$feed = fetch_url($url);
-					$data = json_decode($feed);
-					if (isset($data->images)) {
-						$preview = $data->images[0]->source;
-						logger('fbsync_createpost: got fbid '.$media->photo->fbid.' image '.$preview, LOGGER_DEBUG);
-					} else
-						logger('fbsync_createpost: error fetching fbid '.$media->photo->fbid.' '.print_r($data, true), LOGGER_DEBUG);
-				}
-			}
-
-			if (isset($media->href) AND ($preview != "") AND ($media->href != ""))
-				$content .= "\n".'[url='.$media->href.'][img]'.$preview.'[/img][/url]';
+			if(isset($media->src) && isset($media->href) AND ($media->src != "") AND ($media->href != ""))
+				$content .= "\n".'[url='.$media->href.'][img]'.fpost_cleanpicture($media->src).'[/img][/url]';
 			else {
-				if ($preview != "")
-					$content .= "\n".'[img]'.$preview.'[/img]';
+				if (isset($media->src) AND ($media->src != ""))
+					$content .= "\n".'[img]'.fpost_cleanpicture($media->src).'[/img]';
 
 				// if just a link, it may be a wall photo - check
-				if (isset($post->link))
+				if(isset($post->link))
 					$content .= fbpost_get_photo($media->href);
 			}
 		}
 	}
 
-	if ($type == "link")
-		$postarray["object-type"] = ACTIVITY_OBJ_BOOKMARK;
-
 	if ($content)
 		$postarray["body"] .= "\n";
 
@@ -532,7 +478,6 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 	$postarray['wall'] = 0;
 
 	$postarray['verb'] = ACTIVITY_POST;
-	$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 	$postarray['network'] =  dbesc(NETWORK_FACEBOOK);
 
 	$postarray['uri'] = "fb::".$comment->id;
@@ -632,7 +577,7 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl
 					'to_email'     => $user[0]['email'],
 					'uid'          => $user[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
@@ -684,11 +629,8 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 
 	$likedata = array();
 	$likedata['parent'] = $orig_post['id'];
-
 	$likedata['verb'] = ACTIVITY_LIKE;
-	$likedata['object-type'] = ACTIVITY_OBJ_NOTE;
 	$likedate['network'] =  dbesc(NETWORK_FACEBOOK);
-
 	$likedata['gravity'] = 3;
 	$likedata['uid'] = $uid;
 	$likedata['wall'] = 0;
@@ -738,9 +680,6 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) {
 
 function fbsync_fetch_contact($uid, $contact, $create_user) {
 
-	if($contact->url == "")
-		return(0);
-
 	// Check if the unique contact is existing
 	// To-Do: only update once a while
 	$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
diff --git a/fbsync/lang/C/messages.po b/fbsync/lang/C/messages.po
new file mode 100644
index 00000000..a333d3b8
--- /dev/null
+++ b/fbsync/lang/C/messages.po
@@ -0,0 +1,43 @@
+# ADDON fbsync
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica fbsync addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:44+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: fbsync.php:128 fbsync.php:132
+msgid "Facebook Import"
+msgstr ""
+
+#: fbsync.php:136
+msgid "Import Facebook newsfeed"
+msgstr ""
+
+#: fbsync.php:141
+msgid "Automatically create contacts"
+msgstr ""
+
+#: fbsync.php:147
+msgid "Save Settings"
+msgstr ""
+
+#: fbsync.php:656
+msgid "status"
+msgstr ""
+
+#: fbsync.php:661
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
diff --git a/fortunate/lang/C/messages.po b/fortunate/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/forumdirectory/lang/cs/messages.po b/forumdirectory/lang/cs/messages.po
new file mode 100644
index 00000000..8017a215
--- /dev/null
+++ b/forumdirectory/lang/cs/messages.po
@@ -0,0 +1,80 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:45+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: forumdirectory.php:22
+msgid "Forum Directory"
+msgstr "Adresář Fór"
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr "Veřejný přístup odepřen."
+
+#: forumdirectory.php:71
+msgid "Global Directory"
+msgstr "Globální adresář"
+
+#: forumdirectory.php:79
+msgid "Find on this site"
+msgstr "Nalézt na tomto webu"
+
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Zjištění: "
+
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Adresář serveru"
+
+#: forumdirectory.php:83
+msgid "Find"
+msgstr "Najít"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Věk: "
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Pohlaví: "
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Místo:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Pohlaví:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Status:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Domácí stránka:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "O mě:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Žádné záznamy (některé položky mohou být skryty)."
diff --git a/forumdirectory/lang/cs/strings.php b/forumdirectory/lang/cs/strings.php
index 8f677bb2..63178026 100644
--- a/forumdirectory/lang/cs/strings.php
+++ b/forumdirectory/lang/cs/strings.php
@@ -1,17 +1,22 @@
-<?php
-
-$a->strings["Forum Directory"] = "Adresář Fór";
-$a->strings["Public access denied."] = "Veřejný přístup odepřen.";
-$a->strings["Global Directory"] = "Globální adresář";
-$a->strings["Find on this site"] = "Nalézt na tomto webu";
-$a->strings["Finding: "] = "Zjištění: ";
-$a->strings["Site Directory"] = "Adresář serveru";
-$a->strings["Find"] = "Najít";
-$a->strings["Age: "] = "Věk: ";
-$a->strings["Gender: "] = "Pohlaví: ";
-$a->strings["Location:"] = "Místo:";
-$a->strings["Gender:"] = "Pohlaví:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Domácí stránka:";
-$a->strings["About:"] = "O mě:";
-$a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty).";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Forum Directory"] = "Adresář Fór";
+$a->strings["Public access denied."] = "Veřejný přístup odepřen.";
+$a->strings["Global Directory"] = "Globální adresář";
+$a->strings["Find on this site"] = "Nalézt na tomto webu";
+$a->strings["Finding: "] = "Zjištění: ";
+$a->strings["Site Directory"] = "Adresář serveru";
+$a->strings["Find"] = "Najít";
+$a->strings["Age: "] = "Věk: ";
+$a->strings["Gender: "] = "Pohlaví: ";
+$a->strings["Location:"] = "Místo:";
+$a->strings["Gender:"] = "Pohlaví:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Domácí stránka:";
+$a->strings["About:"] = "O mě:";
+$a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty).";
diff --git a/forumdirectory/lang/de/messages.po b/forumdirectory/lang/de/messages.po
new file mode 100644
index 00000000..48975ab3
--- /dev/null
+++ b/forumdirectory/lang/de/messages.po
@@ -0,0 +1,80 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:00+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumdirectory.php:22
+msgid "Forum Directory"
+msgstr "Foren Verzeichnis"
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr "Öffentlicher Zugriff verweigert."
+
+#: forumdirectory.php:71
+msgid "Global Directory"
+msgstr "Weltweites Verzeichnis"
+
+#: forumdirectory.php:79
+msgid "Find on this site"
+msgstr "Auf diesem Server suchen"
+
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Funde: "
+
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Verzeichnis"
+
+#: forumdirectory.php:83
+msgid "Find"
+msgstr "Finde"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Alter: "
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Geschlecht:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Ort:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Status:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Über:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
diff --git a/forumdirectory/lang/de/strings.php b/forumdirectory/lang/de/strings.php
index 4de16ffd..dfacc62d 100644
--- a/forumdirectory/lang/de/strings.php
+++ b/forumdirectory/lang/de/strings.php
@@ -1,17 +1,22 @@
-<?php
-
-$a->strings["Forum Directory"] = "Foren Verzeichnis";
-$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
-$a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Find on this site"] = "Auf diesem Server suchen";
-$a->strings["Finding: "] = "Funde: ";
-$a->strings["Site Directory"] = "Verzeichnis";
-$a->strings["Find"] = "Finde";
-$a->strings["Age: "] = "Alter: ";
-$a->strings["Gender: "] = "Geschlecht:";
-$a->strings["Location:"] = "Ort:";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["About:"] = "Über:";
-$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Forum Directory"] = "Foren Verzeichnis";
+$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Finding: "] = "Funde: ";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["Find"] = "Finde";
+$a->strings["Age: "] = "Alter: ";
+$a->strings["Gender: "] = "Geschlecht:";
+$a->strings["Location:"] = "Ort:";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Über:";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
diff --git a/forumdirectory/lang/ro/messages.po b/forumdirectory/lang/ro/messages.po
new file mode 100644
index 00000000..2199863f
--- /dev/null
+++ b/forumdirectory/lang/ro/messages.po
@@ -0,0 +1,79 @@
+# ADDON forumdirectory
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumdirectory addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:49+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: forumdirectory.php:22
+msgid "Forum Directory"
+msgstr "Director Forum"
+
+#: forumdirectory.php:53
+msgid "Public access denied."
+msgstr "Acces public refuzat."
+
+#: forumdirectory.php:71
+msgid "Global Directory"
+msgstr "Director Global"
+
+#: forumdirectory.php:79
+msgid "Find on this site"
+msgstr "Căutați pe acest site"
+
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Căutare:"
+
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Director Site"
+
+#: forumdirectory.php:83
+msgid "Find"
+msgstr "Căutați"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Vârsta:"
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Sex:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Locație:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Sex:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Status:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Pagină web:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Despre:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Fără înregistrări (unele înregistrări pot fi ascunse)."
diff --git a/forumdirectory/lang/ro/strings.php b/forumdirectory/lang/ro/strings.php
new file mode 100644
index 00000000..357904b2
--- /dev/null
+++ b/forumdirectory/lang/ro/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Forum Directory"] = "Director Forum";
+$a->strings["Public access denied."] = "Acces public refuzat.";
+$a->strings["Global Directory"] = "Director Global";
+$a->strings["Find on this site"] = "Căutați pe acest site";
+$a->strings["Finding: "] = "Căutare:";
+$a->strings["Site Directory"] = "Director Site";
+$a->strings["Find"] = "Căutați";
+$a->strings["Age: "] = "Vârsta:";
+$a->strings["Gender: "] = "Sex:";
+$a->strings["Location:"] = "Locație:";
+$a->strings["Gender:"] = "Sex:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Pagină web:";
+$a->strings["About:"] = "Despre:";
+$a->strings["No entries (some entries may be hidden)."] = "Fără înregistrări (unele înregistrări pot fi ascunse).";
diff --git a/forumlist/lang/cs/messages.po b/forumlist/lang/cs/messages.po
new file mode 100644
index 00000000..23eccd66
--- /dev/null
+++ b/forumlist/lang/cs/messages.po
@@ -0,0 +1,60 @@
+# ADDON forumlist
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumlist addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:47+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: forumlist.php:64
+msgid "Forums"
+msgstr "Fóra"
+
+#: forumlist.php:67
+msgid "show/hide"
+msgstr "zobrazit/skrýt"
+
+#: forumlist.php:81
+msgid "No forum subscriptions"
+msgstr "Žádné registrace k fórům"
+
+#: forumlist.php:98
+msgid "Forums:"
+msgstr "Fóra:"
+
+#: forumlist.php:134
+msgid "Forumlist settings updated."
+msgstr "Nastavení Forumlist aktualizováno."
+
+#: forumlist.php:161 forumlist.php:165
+msgid "Forumlist"
+msgstr "Forumlist"
+
+#: forumlist.php:169
+msgid "Randomise forum list"
+msgstr "Zamíchat lis fór"
+
+#: forumlist.php:172
+msgid "Show forums on profile page"
+msgstr "Zobrazit fóra na profilové stránce"
+
+#: forumlist.php:175
+msgid "Show forums on network page"
+msgstr "Zobrazit fóra na stránce Síť"
+
+#: forumlist.php:183
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/forumlist/lang/cs/strings.php b/forumlist/lang/cs/strings.php
index 18f47ef7..035f4f71 100644
--- a/forumlist/lang/cs/strings.php
+++ b/forumlist/lang/cs/strings.php
@@ -1,12 +1,17 @@
-<?php
-
-$a->strings["Forums"] = "Fóra";
-$a->strings["show/hide"] = "zobrazit/skrýt";
-$a->strings["No forum subscriptions"] = "Žádné registrace k fórům";
-$a->strings["Forums:"] = "Fóra:";
-$a->strings["Forumlist settings updated."] = "Nastavení Forumlist aktualizováno.";
-$a->strings["Forumlist Settings"] = "Nastavení Forumlist";
-$a->strings["Randomise forum list"] = "Zamíchat list fór";
-$a->strings["Show forums on profile page"] = "Zobrazit fóra na profilové stránce";
-$a->strings["Show forums on network page"] = "Zobrazit fóra na stránce Síť";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Forums"] = "Fóra";
+$a->strings["show/hide"] = "zobrazit/skrýt";
+$a->strings["No forum subscriptions"] = "Žádné registrace k fórům";
+$a->strings["Forums:"] = "Fóra:";
+$a->strings["Forumlist settings updated."] = "Nastavení Forumlist aktualizováno.";
+$a->strings["Forumlist"] = "Forumlist";
+$a->strings["Randomise forum list"] = "Zamíchat lis fór";
+$a->strings["Show forums on profile page"] = "Zobrazit fóra na profilové stránce";
+$a->strings["Show forums on network page"] = "Zobrazit fóra na stránce Síť";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/forumlist/lang/de/messages.po b/forumlist/lang/de/messages.po
new file mode 100644
index 00000000..e640ace5
--- /dev/null
+++ b/forumlist/lang/de/messages.po
@@ -0,0 +1,60 @@
+# ADDON forumlist
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumlist addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 05:35+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: forumlist.php:64
+msgid "Forums"
+msgstr "Foren"
+
+#: forumlist.php:67
+msgid "show/hide"
+msgstr "anzeigen/verbergen"
+
+#: forumlist.php:81
+msgid "No forum subscriptions"
+msgstr "Keine Foren-Mitgliedschaften."
+
+#: forumlist.php:98
+msgid "Forums:"
+msgstr "Foren:"
+
+#: forumlist.php:134
+msgid "Forumlist settings updated."
+msgstr "Einstellungen zur Foren-Liste aktualisiert."
+
+#: forumlist.php:161 forumlist.php:165
+msgid "Forumlist"
+msgstr "Foren-Liste"
+
+#: forumlist.php:169
+msgid "Randomise forum list"
+msgstr "Zufällige Zusammenstellung der Foren-Liste"
+
+#: forumlist.php:172
+msgid "Show forums on profile page"
+msgstr "Zeige die Liste der Foren auf der Profilseite"
+
+#: forumlist.php:175
+msgid "Show forums on network page"
+msgstr "Zeige Foren auf der Netzwerk-Seite"
+
+#: forumlist.php:183
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/forumlist/lang/de/strings.php b/forumlist/lang/de/strings.php
index e9235951..638aa507 100644
--- a/forumlist/lang/de/strings.php
+++ b/forumlist/lang/de/strings.php
@@ -1,12 +1,17 @@
-<?php
-
-$a->strings["Forums"] = "Foren";
-$a->strings["show/hide"] = "anzeigen/verbergen";
-$a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften.";
-$a->strings["Forums:"] = "Foren:";
-$a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert.";
-$a->strings["Forumlist Settings"] = "Foren-Liste Einstellungen";
-$a->strings["Randomise forum list"] = "Zufällige Zusammenstellung der Foren-Liste";
-$a->strings["Show forums on profile page"] = "Zeige die Liste der Foren auf der Profilseite";
-$a->strings["Show forums on network page"] = "Zeige Foren auf der Netzwerk-Seite";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Forums"] = "Foren";
+$a->strings["show/hide"] = "anzeigen/verbergen";
+$a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften.";
+$a->strings["Forums:"] = "Foren:";
+$a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert.";
+$a->strings["Forumlist"] = "Foren-Liste";
+$a->strings["Randomise forum list"] = "Zufällige Zusammenstellung der Foren-Liste";
+$a->strings["Show forums on profile page"] = "Zeige die Liste der Foren auf der Profilseite";
+$a->strings["Show forums on network page"] = "Zeige Foren auf der Netzwerk-Seite";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/forumlist/lang/ro/messages.po b/forumlist/lang/ro/messages.po
new file mode 100644
index 00000000..893f375c
--- /dev/null
+++ b/forumlist/lang/ro/messages.po
@@ -0,0 +1,59 @@
+# ADDON forumlist
+# Copyright (C)
+# This file is distributed under the same license as the Friendica forumlist addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:50+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: forumlist.php:64
+msgid "Forums"
+msgstr "Forumuri"
+
+#: forumlist.php:67
+msgid "show/hide"
+msgstr "afișare/ascundere"
+
+#: forumlist.php:81
+msgid "No forum subscriptions"
+msgstr "Nu există subscrieri pe forum"
+
+#: forumlist.php:98
+msgid "Forums:"
+msgstr "Forumuri:"
+
+#: forumlist.php:134
+msgid "Forumlist settings updated."
+msgstr "Configurările Forumlist au fost actualizate."
+
+#: forumlist.php:161 forumlist.php:165
+msgid "Forumlist"
+msgstr "Forumlist"
+
+#: forumlist.php:169
+msgid "Randomise forum list"
+msgstr "Randomizare listă forum"
+
+#: forumlist.php:172
+msgid "Show forums on profile page"
+msgstr "Afișare forumuri pe pagina de profil"
+
+#: forumlist.php:175
+msgid "Show forums on network page"
+msgstr "Afișare forumuri pe pagina de rețea"
+
+#: forumlist.php:183
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/forumlist/lang/ro/strings.php b/forumlist/lang/ro/strings.php
new file mode 100644
index 00000000..e7f4a688
--- /dev/null
+++ b/forumlist/lang/ro/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Forums"] = "Forumuri";
+$a->strings["show/hide"] = "afișare/ascundere";
+$a->strings["No forum subscriptions"] = "Nu există subscrieri pe forum";
+$a->strings["Forums:"] = "Forumuri:";
+$a->strings["Forumlist settings updated."] = "Configurările Forumlist au fost actualizate.";
+$a->strings["Forumlist"] = "Forumlist";
+$a->strings["Randomise forum list"] = "Randomizare listă forum";
+$a->strings["Show forums on profile page"] = "Afișare forumuri pe pagina de profil";
+$a->strings["Show forums on network page"] = "Afișare forumuri pe pagina de rețea";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/fromapp/lang/cs/messages.po b/fromapp/lang/cs/messages.po
new file mode 100644
index 00000000..342fe911
--- /dev/null
+++ b/fromapp/lang/cs/messages.po
@@ -0,0 +1,41 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:03+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "Fromapp nastavení aktualizováno."
+
+#: fromapp.php:64 fromapp.php:68
+msgid "FromApp Settings"
+msgstr "FromApp nastavení"
+
+#: fromapp.php:71
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr "Jméno zdrojové aplikace"
+
+#: fromapp.php:75
+msgid "Use this application name even if another application was used."
+msgstr "Použij toto jméno aplikace i když byla použita jiná aplikace"
+
+#: fromapp.php:82
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/fromapp/lang/cs/strings.php b/fromapp/lang/cs/strings.php
index bd336347..f6ec1402 100644
--- a/fromapp/lang/cs/strings.php
+++ b/fromapp/lang/cs/strings.php
@@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Fromapp settings updated."] = "Fromapp nastavení aktualizováno.";
-$a->strings["FromApp Settings"] = "FromApp nastavení";
-$a->strings["The application name you would like to show your posts originating from."] = "Jméno aplikace, které chcete aby bylo jako zdroj u vašich příspěvků";
-$a->strings["Use this application name even if another application was used."] = "Použij toto jméno aplikace i když byla použita jiná aplikace";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Fromapp settings updated."] = "Fromapp nastavení aktualizováno.";
+$a->strings["FromApp Settings"] = "FromApp nastavení";
+$a->strings["The application name you would like to show your posts originating from."] = "Jméno zdrojové aplikace";
+$a->strings["Use this application name even if another application was used."] = "Použij toto jméno aplikace i když byla použita jiná aplikace";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/fromapp/lang/de/messages.po b/fromapp/lang/de/messages.po
new file mode 100644
index 00000000..c42a5836
--- /dev/null
+++ b/fromapp/lang/de/messages.po
@@ -0,0 +1,41 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-26 08:29+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "Fromapp Einstellungen aktualisiert."
+
+#: fromapp.php:64 fromapp.php:68
+msgid "FromApp Settings"
+msgstr "FromApp Einstellungen"
+
+#: fromapp.php:71
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr "Der Name der Applikation der als Quelle deiner Beiträge angezeigt werden soll."
+
+#: fromapp.php:75
+msgid "Use this application name even if another application was used."
+msgstr "Verwende diesen Namen selbst wenn eine andere Applikation verwendet wurde"
+
+#: fromapp.php:82
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/fromapp/lang/de/strings.php b/fromapp/lang/de/strings.php
index 6030bf1f..76d597eb 100644
--- a/fromapp/lang/de/strings.php
+++ b/fromapp/lang/de/strings.php
@@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Fromapp settings updated."] = "FromApp Einstellungen aktualisiert.";
-$a->strings["FromApp Settings"] = "FromApp Einstellungen";
-$a->strings["The application name you would like to show your posts originating from."] = "Der Name der Anwendung von der deine Beiträge stammen sollen.";
-$a->strings["Use this application name even if another application was used."] = "Verwende diesen Namen auch wenn eine andere Anwendung den Anwendungsnamen bereits gesetzt hat.";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Fromapp settings updated."] = "Fromapp Einstellungen aktualisiert.";
+$a->strings["FromApp Settings"] = "FromApp Einstellungen";
+$a->strings["The application name you would like to show your posts originating from."] = "Der Name der Applikation der als Quelle deiner Beiträge angezeigt werden soll.";
+$a->strings["Use this application name even if another application was used."] = "Verwende diesen Namen selbst wenn eine andere Applikation verwendet wurde";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/fromapp/lang/ro/messages.po b/fromapp/lang/ro/messages.po
new file mode 100644
index 00000000..3ebef1e3
--- /dev/null
+++ b/fromapp/lang/ro/messages.po
@@ -0,0 +1,40 @@
+# ADDON fromapp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromapp addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:50+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "Configurările Fromapp au fost actualizate."
+
+#: fromapp.php:64 fromapp.php:68
+msgid "FromApp Settings"
+msgstr "Configurări FromApp"
+
+#: fromapp.php:71
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr "Denumirea aplicației pe care doriți să o afișați ca și origine pentru postările dvs."
+
+#: fromapp.php:75
+msgid "Use this application name even if another application was used."
+msgstr "Utilizați numele acestei aplicații chiar dacă o altă aplicație a fost utilizată."
+
+#: fromapp.php:82
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/fromapp/lang/ro/strings.php b/fromapp/lang/ro/strings.php
new file mode 100644
index 00000000..a5304929
--- /dev/null
+++ b/fromapp/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Fromapp settings updated."] = "Configurările Fromapp au fost actualizate.";
+$a->strings["FromApp Settings"] = "Configurări FromApp";
+$a->strings["The application name you would like to show your posts originating from."] = "Denumirea aplicației pe care doriți să o afișați ca și origine pentru postările dvs.";
+$a->strings["Use this application name even if another application was used."] = "Utilizați numele acestei aplicații chiar dacă o altă aplicație a fost utilizată.";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 9699ba9b..5c7e1e28 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -195,15 +195,14 @@ function fromgplus_parse_query($var)
 }
 
 function fromgplus_cleanupgoogleproxy($fullImage, $image) {
-	//$preview = "/w".$fullImage->width."-h".$fullImage->height."/";
-	//$preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/";
-	//$fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url);
-	$fullImage = $fullImage->url;
 
-	//$preview = "/w".$image->width."-h".$image->height."/";
-	//$preview2 = "/w".$image->width."-h".$image->height."-p/";
-	//$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url);
-	$image = $image->url;
+	$preview = "/w".$fullImage->width."-h".$fullImage->height."/";
+	$preview2 = "/w".$fullImage->width."-h".$fullImage->height."-p/";
+	$fullImage = str_replace(array($preview, $preview2), array("/", "/"), $fullImage->url);
+
+	$preview = "/w".$image->width."-h".$image->height."/";
+	$preview2 = "/w".$image->width."-h".$image->height."-p/";
+	$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url);
 
        	$cleaned = array();
 
@@ -228,23 +227,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 		$cleaned["preview"] = "";
 	}
 
-	if ($cleaned["full"] != "")
-		$infoFull = get_photo_info($cleaned["full"]);
-	else
-		$infoFull = array("0" => 0, "1" => 0);
-
-	if ($cleaned["preview"] != "")
-		$infoPreview = get_photo_info($cleaned["preview"]);
-	else
-		$infoFull = array("0" => 0, "1" => 0);
-
-	if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) {
-		$temp = $cleaned["full"];
-		$cleaned["full"] = $cleaned["preview"];
-		$cleaned["preview"] = $temp;
-	}
-
-	if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1])))
+	if ($cleaned["full"] == $cleaned["preview"])
 		$cleaned["preview"] = "";
 
 	if ($cleaned["full"] == "")
@@ -253,10 +236,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 
 	if ($cleaned["full"] == "")
 		if (@exif_imagetype($image) != 0)
-			$cleaned["full"] = $image;
-
-	// Could be changed in the future to a link to the album
-	$cleaned["page"] = $cleaned["full"];
+			$cleaned["full"] = $fullImage;
 
 	return($cleaned);
 }
@@ -273,9 +253,7 @@ function fromgplus_cleantext($text) {
 	return($text);
 }
 
-function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-	require_once("include/Photo.php");
-
+function fromgplus_handleattachments($item, $displaytext) {
 	$post = "";
 	$quote = "";
 	$type = "";
@@ -301,18 +279,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 				break;
 
 			case "photo":
-				// Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
-				if ($shared)
-					$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-				else {
-					if ($attachment->fullImage->url != "")
-						$images = store_photo($a, $uid, "", $attachment->fullImage->url);
-					elseif ($attachment->image->url != "")
-						$images = store_photo($a, $uid, "", $attachment->image->url);
-				}
-
+				$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
 				if ($images["preview"] != "")
-					$post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
+					$post .= "\n[url=".$images["full"]."][img]".$images["preview"]."[/img][/url]\n";
 				elseif ($images["full"] != "")
 					$post .= "\n[img]".$images["full"]."[/img]\n";
 
@@ -391,12 +360,6 @@ function fromgplus_fetch($a, $uid) {
 		if (strtotime($item->published) <= $initiallastdate)
 			continue;
 
-		// Don't publish items that are too young
-		if (strtotime($item->published) > (time() - 3*60)) {
-			logger('fromgplus_fetch: item too new '.$item->published);
-			continue;
-		}
-
 		if ($lastdate < strtotime($item->published))
 			$lastdate = strtotime($item->published);
 
@@ -418,7 +381,7 @@ function fromgplus_fetch($a, $uid) {
 					$post = fromgplus_html2bbcode($item->object->content);
 
 					if (is_array($item->object->attachments))
-						$post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false);
+						$post .= fromgplus_handleattachments($item, $item->object->content);
 
 					// geocode, placeName
 					if (isset($item->address))
@@ -443,7 +406,7 @@ function fromgplus_fetch($a, $uid) {
 						$post .= fromgplus_html2bbcode($item->object->content);
 
 						if (is_array($item->object->attachments))
-							$post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
+							$post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
 
 						$post .= "[/share]";
 					} else {
@@ -452,7 +415,7 @@ function fromgplus_fetch($a, $uid) {
 						$post .= fromgplus_html2bbcode($item->object->content);
 
 						if (is_array($item->object->attachments))
-							$post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
+							$post .= "\n".trim(fromgplus_handleattachments($item, $item->object->content));
 					}
 
 					if (isset($item->address))
@@ -468,3 +431,22 @@ function fromgplus_fetch($a, $uid) {
 	if ($lastdate != 0)
 		set_pconfig($uid,'fromgplus','lastdate', $lastdate);
 }
+
+/*
+// Test
+require_once("boot.php");
+
+if(@is_null($a)) {
+        $a = new App;
+}
+
+if(@is_null($db)) {
+        @include(".htconfig.php");
+        require_once("include/dba.php");
+        $db = new dba($db_host, $db_user, $db_pass, $db_data);
+        unset($db_host, $db_user, $db_pass, $db_data);
+};
+
+$test = array();
+fromgplus_cron($a, $test);
+*/
diff --git a/fromgplus/lang/cs/messages.po b/fromgplus/lang/cs/messages.po
new file mode 100644
index 00000000..a256d91d
--- /dev/null
+++ b/fromgplus/lang/cs/messages.po
@@ -0,0 +1,40 @@
+# ADDON fromgplus
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromgplus addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:04+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: fromgplus.php:42 fromgplus.php:46
+msgid "Google+ Mirror"
+msgstr "Google+ Mirror"
+
+#: fromgplus.php:51
+msgid "Enable Google+ Import"
+msgstr "Povolit Import z Google+"
+
+#: fromgplus.php:54
+msgid "Google Account ID"
+msgstr "název účtu Google "
+
+#: fromgplus.php:59
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: fromgplus.php:78
+msgid "Google+ Import Settings saved."
+msgstr "Nastavení importu z Google+ uloženo."
diff --git a/fromgplus/lang/cs/strings.php b/fromgplus/lang/cs/strings.php
index 7e061d1f..9e5e3fe5 100644
--- a/fromgplus/lang/cs/strings.php
+++ b/fromgplus/lang/cs/strings.php
@@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Google+ Import Settings"] = "Nastavení importu z Google+ ";
-$a->strings["Enable Google+ Import"] = "Povolit Import z Google+";
-$a->strings["Google Account ID"] = "název účtu Google ";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Google+ Import Settings saved."] = "Nastavení importu z Google+ uloženo.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Google+ Mirror"] = "Google+ Mirror";
+$a->strings["Enable Google+ Import"] = "Povolit Import z Google+";
+$a->strings["Google Account ID"] = "název účtu Google ";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Google+ Import Settings saved."] = "Nastavení importu z Google+ uloženo.";
diff --git a/fromgplus/lang/ro/messages.po b/fromgplus/lang/ro/messages.po
new file mode 100644
index 00000000..fa8434d2
--- /dev/null
+++ b/fromgplus/lang/ro/messages.po
@@ -0,0 +1,39 @@
+# ADDON fromgplus
+# Copyright (C)
+# This file is distributed under the same license as the Friendica fromgplus addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:51+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: fromgplus.php:42 fromgplus.php:46
+msgid "Google+ Mirror"
+msgstr "Clonă Google+"
+
+#: fromgplus.php:51
+msgid "Enable Google+ Import"
+msgstr "Permitere Import Google+"
+
+#: fromgplus.php:54
+msgid "Google Account ID"
+msgstr "ID Cont Google"
+
+#: fromgplus.php:59
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: fromgplus.php:78
+msgid "Google+ Import Settings saved."
+msgstr "Configurările de Importare Google+ au fost salvate. "
diff --git a/fromgplus/lang/ro/strings.php b/fromgplus/lang/ro/strings.php
new file mode 100644
index 00000000..07a00e56
--- /dev/null
+++ b/fromgplus/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Google+ Mirror"] = "Clonă Google+";
+$a->strings["Enable Google+ Import"] = "Permitere Import Google+";
+$a->strings["Google Account ID"] = "ID Cont Google";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Google+ Import Settings saved."] = "Configurările de Importare Google+ au fost salvate. ";
diff --git a/geonames/lang/cs/messages.po b/geonames/lang/cs/messages.po
new file mode 100644
index 00000000..a4c32976
--- /dev/null
+++ b/geonames/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:04+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Geonames nastavení aktualizováno."
+
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr "Nastavení Geonames"
+
+#: geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Povolit Geonames rozšíření"
+
+#: geonames.php:187
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/geonames/lang/cs/strings.php b/geonames/lang/cs/strings.php
index 51a9b39d..ced15b32 100644
--- a/geonames/lang/cs/strings.php
+++ b/geonames/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Geonames settings updated."] = "Geonames nastavení aktualizováno.";
-$a->strings["Geonames Settings"] = "Nastavení Geonames";
-$a->strings["Enable Geonames Plugin"] = "Povolit Geonames rozšíření";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Geonames settings updated."] = "Geonames nastavení aktualizováno.";
+$a->strings["Geonames Settings"] = "Nastavení Geonames";
+$a->strings["Enable Geonames Plugin"] = "Povolit Geonames rozšíření";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/geonames/lang/de/messages.po b/geonames/lang/de/messages.po
new file mode 100644
index 00000000..a3b34e92
--- /dev/null
+++ b/geonames/lang/de/messages.po
@@ -0,0 +1,36 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-06 12:14+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Geonames Einstellungen aktualisiert"
+
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr "Geonames Einstellungen"
+
+#: geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Geonames Plugin aktivieren"
+
+#: geonames.php:187
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/geonames/lang/de/strings.php b/geonames/lang/de/strings.php
index ebe62ddf..1b05d809 100644
--- a/geonames/lang/de/strings.php
+++ b/geonames/lang/de/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
-$a->strings["Geonames Settings"] = "Geonames Einstellungen";
-$a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
+$a->strings["Geonames Settings"] = "Geonames Einstellungen";
+$a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/geonames/lang/ro/messages.po b/geonames/lang/ro/messages.po
new file mode 100644
index 00000000..6f8f22f2
--- /dev/null
+++ b/geonames/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON geonames
+# Copyright (C)
+# This file is distributed under the same license as the Friendica geonames addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:51+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Configurări Geonume actualizate."
+
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr "Configurări Geonume"
+
+#: geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr "Permite Modul Geonume"
+
+#: geonames.php:187
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/geonames/lang/ro/strings.php b/geonames/lang/ro/strings.php
new file mode 100644
index 00000000..82a82be4
--- /dev/null
+++ b/geonames/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Geonames settings updated."] = "Configurări Geonume actualizate.";
+$a->strings["Geonames Settings"] = "Configurări Geonume";
+$a->strings["Enable Geonames Plugin"] = "Permite Modul Geonume";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/gnot/lang/cs/messages.po b/gnot/lang/cs/messages.po
new file mode 100644
index 00000000..5073a68f
--- /dev/null
+++ b/gnot/lang/cs/messages.po
@@ -0,0 +1,47 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:05+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Nastavení Gnot aktualizováno."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Nastavení Gnot"
+
+#: gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu."
+
+#: gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Povolit tento plugin/rozšíření?"
+
+#: gnot.php:88
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica:Upozornění] Komentář ke konverzaci #%d"
diff --git a/gnot/lang/cs/strings.php b/gnot/lang/cs/strings.php
index b6beeb03..5ff4a720 100644
--- a/gnot/lang/cs/strings.php
+++ b/gnot/lang/cs/strings.php
@@ -1,8 +1,13 @@
-<?php
-
-$a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
-$a->strings["Gnot Settings"] = "Nastavení Gnot";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu.";
-$a->strings["Enable this plugin/addon?"] = "Povolit tento plugin/rozšíření?";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Upozornění] Komentář ke konverzaci #%d";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
+$a->strings["Gnot Settings"] = "Nastavení Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu.";
+$a->strings["Enable this plugin/addon?"] = "Povolit tento plugin/rozšíření?";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Upozornění] Komentář ke konverzaci #%d";
diff --git a/gnot/lang/de/messages.po b/gnot/lang/de/messages.po
new file mode 100644
index 00000000..6d264738
--- /dev/null
+++ b/gnot/lang/de/messages.po
@@ -0,0 +1,47 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-06 12:14+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Gnot Einstellungen aktualisiert."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Gnot Einstellungen"
+
+#: gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
+
+#: gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Dieses Plugin/Addon aktivieren?"
+
+#: gnot.php:88
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d"
diff --git a/gnot/lang/de/strings.php b/gnot/lang/de/strings.php
index 20ce6879..0a5dc5c6 100644
--- a/gnot/lang/de/strings.php
+++ b/gnot/lang/de/strings.php
@@ -1,8 +1,13 @@
-<?php
-
-$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
-$a->strings["Gnot Settings"] = "Gnot Einstellungen";
-$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
-$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
-$a->strings["Submit"] = "Senden";
-$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Meldung] Kommentar zum Beitrag #%d";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
+$a->strings["Gnot Settings"] = "Gnot Einstellungen";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
+$a->strings["Enable this plugin/addon?"] = "Dieses Plugin/Addon aktivieren?";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d";
diff --git a/gnot/lang/ro/messages.po b/gnot/lang/ro/messages.po
new file mode 100644
index 00000000..28a37ffd
--- /dev/null
+++ b/gnot/lang/ro/messages.po
@@ -0,0 +1,46 @@
+# ADDON gnot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gnot addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:52+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Configurările Gnot au fost actualizate."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Configurări Gnot"
+
+#: gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the"
+" subject line."
+msgstr "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea  subiectului."
+
+#: gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr "Activați acest modul/supliment?"
+
+#: gnot.php:88
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr "[Friendica:Notificare] Comentariu la conversația # %d"
diff --git a/gnot/lang/ro/strings.php b/gnot/lang/ro/strings.php
new file mode 100644
index 00000000..0a1a2031
--- /dev/null
+++ b/gnot/lang/ro/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Gnot settings updated."] = "Configurările Gnot au fost actualizate.";
+$a->strings["Gnot Settings"] = "Configurări Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea  subiectului.";
+$a->strings["Enable this plugin/addon?"] = "Activați acest modul/supliment?";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificare] Comentariu la conversația # %d";
diff --git a/gpluspost/.gitignore b/gpluspost/.gitignore
deleted file mode 100644
index 4e76a242..00000000
--- a/gpluspost/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-postToGooglePlus.php
-nxs-http.php
diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index 5b2b3bf6..415e031b 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -233,25 +233,24 @@ function gpluspost_send(&$a,&$b) {
 	if (!get_pconfig($b["uid"],'gpluspost','no_loop_prevention') and ($b['app'] == "Google+"))
 		return;
 
-	if (!gpluspost_nextscripts()) {
-		// Posting via RSS-Feed and Hootsuite
-		$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
-		$items = explode(",", $itemlist);
+	// Always do the export via RSS-Feed (even if NextScripts is enabled), since it doesn't hurt
+	$itemlist = get_pconfig($b["uid"],'gpluspost','itemlist');
+	$items = explode(",", $itemlist);
 
-		$i = 0;
-		$newitems = array($b['id']);
-		foreach ($items AS $item)
-			if ($i++ < 9)
-				$newitems[] = $item;
+	$i = 0;
+	$newitems = array($b['id']);
+	foreach ($items AS $item)
+		if ($i++ < 9)
+			$newitems[] = $item;
 
-		$itemlist = implode(",", $newitems);
+	$itemlist = implode(",", $newitems);
 
-		logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
+	logger('gpluspost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]);
 
-		set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
+	set_pconfig($b["uid"],'gpluspost','itemlist', $itemlist);
 
-	} else {
-		// Posting via NextScripts
+	// Posting via NextScripts
+	if (gpluspost_nextscripts()) {
 		$username = get_pconfig($b['uid'],'gpluspost','username');
 		$password = get_pconfig($b['uid'],'gpluspost','password');
 		$page = get_pconfig($b['uid'],'gpluspost','page');
@@ -272,7 +271,7 @@ function gpluspost_send(&$a,&$b) {
 			$item["body"] = preg_replace("(\[i\](.*?)\[\/i\])ism",'_$1_',$item["body"]);
 			$item["body"] = preg_replace("(\[s\](.*?)\[\/s\])ism",'-$1-',$item["body"]);
 
-			$data = plaintext($a, $item, 0, false, 9);
+			$data = plaintext($a, $item, 0, false);
 
 			logger('gpluspost_send: data: '.print_r($data, true), LOGGER_DEBUG);
 
diff --git a/gpluspost/lang/C/messages.po b/gpluspost/lang/C/messages.po
new file mode 100644
index 00000000..cedf6cbb
--- /dev/null
+++ b/gpluspost/lang/C/messages.po
@@ -0,0 +1,66 @@
+# ADDON gpluspost
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica gpluspost addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:44+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gpluspost.php:38
+msgid "Post to Google+"
+msgstr ""
+
+#: gpluspost.php:93
+msgid "Enable Google+ Post Plugin"
+msgstr ""
+
+#: gpluspost.php:108
+msgid "Google+ username"
+msgstr ""
+
+#: gpluspost.php:113
+msgid "Google+ password"
+msgstr ""
+
+#: gpluspost.php:118
+msgid "Google+ page number"
+msgstr ""
+
+#: gpluspost.php:124
+msgid "Post to Google+ by default"
+msgstr ""
+
+#: gpluspost.php:129
+msgid "Do not prevent posting loops"
+msgstr ""
+
+#: gpluspost.php:135
+msgid "Skip messages without links"
+msgstr ""
+
+#: gpluspost.php:142
+msgid "Mirror all public posts"
+msgstr ""
+
+#: gpluspost.php:146
+msgid "Mirror Google Account ID"
+msgstr ""
+
+#: gpluspost.php:153
+msgid "Save Settings"
+msgstr ""
+
+#: gpluspost.php:308
+msgid "Google+ post failed. Queued for retry."
+msgstr ""
diff --git a/gpluspost/lang/cs/messages.po b/gpluspost/lang/cs/messages.po
new file mode 100644
index 00000000..f03cbaf6
--- /dev/null
+++ b/gpluspost/lang/cs/messages.po
@@ -0,0 +1,68 @@
+# ADDON gpluspost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gpluspost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:09+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: gpluspost.php:38
+msgid "Post to Google+"
+msgstr "Příspěvek na Google+"
+
+#: gpluspost.php:93
+msgid "Enable Google+ Post Plugin"
+msgstr "Povolit Google+ Plugin"
+
+#: gpluspost.php:108
+msgid "Google+ username"
+msgstr "Google+ uživatelské jméno"
+
+#: gpluspost.php:113
+msgid "Google+ password"
+msgstr "Google+ heslo"
+
+#: gpluspost.php:118
+msgid "Google+ page number"
+msgstr "Google+ číslo stránky"
+
+#: gpluspost.php:124
+msgid "Post to Google+ by default"
+msgstr "Defaultně zaslat na Google+"
+
+#: gpluspost.php:129
+msgid "Do not prevent posting loops"
+msgstr "Nezabraňovat cyklení příspěvků "
+
+#: gpluspost.php:135
+msgid "Skip messages without links"
+msgstr "Přeskakovat zprávy bez odkazů"
+
+#: gpluspost.php:142
+msgid "Mirror all public posts"
+msgstr "Zrcadlit všechny veřejné příspěvky"
+
+#: gpluspost.php:146
+msgid "Mirror Google Account ID"
+msgstr "ID účtu Google pro zrcadlení"
+
+#: gpluspost.php:153
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: gpluspost.php:308
+msgid "Google+ post failed. Queued for retry."
+msgstr "Zaslání příspěvku na Google+ selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
diff --git a/gpluspost/lang/cs/strings.php b/gpluspost/lang/cs/strings.php
new file mode 100644
index 00000000..9068b643
--- /dev/null
+++ b/gpluspost/lang/cs/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Google+"] = "Příspěvek na Google+";
+$a->strings["Enable Google+ Post Plugin"] = "Povolit Google+ Plugin";
+$a->strings["Google+ username"] = "Google+ uživatelské jméno";
+$a->strings["Google+ password"] = "Google+ heslo";
+$a->strings["Google+ page number"] = "Google+ číslo stránky";
+$a->strings["Post to Google+ by default"] = "Defaultně zaslat na Google+";
+$a->strings["Do not prevent posting loops"] = "Nezabraňovat cyklení příspěvků ";
+$a->strings["Skip messages without links"] = "Přeskakovat zprávy bez odkazů";
+$a->strings["Mirror all public posts"] = "Zrcadlit všechny veřejné příspěvky";
+$a->strings["Mirror Google Account ID"] = "ID účtu Google pro zrcadlení";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Google+ post failed. Queued for retry."] = "Zaslání příspěvku na Google+ selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
diff --git a/gpluspost/lang/ro/messages.po b/gpluspost/lang/ro/messages.po
new file mode 100644
index 00000000..f43b9ddb
--- /dev/null
+++ b/gpluspost/lang/ro/messages.po
@@ -0,0 +1,67 @@
+# ADDON gpluspost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gpluspost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:52+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: gpluspost.php:38
+msgid "Post to Google+"
+msgstr "Postați pe Google+"
+
+#: gpluspost.php:93
+msgid "Enable Google+ Post Plugin"
+msgstr "Activare Modul Postare Google+"
+
+#: gpluspost.php:108
+msgid "Google+ username"
+msgstr "Utilizator Google+ "
+
+#: gpluspost.php:113
+msgid "Google+ password"
+msgstr "Parola Google+"
+
+#: gpluspost.php:118
+msgid "Google+ page number"
+msgstr "Numărul paginii Google+ "
+
+#: gpluspost.php:124
+msgid "Post to Google+ by default"
+msgstr "Postați implicit pe Google+"
+
+#: gpluspost.php:129
+msgid "Do not prevent posting loops"
+msgstr "Nu se previn înlănțuirile postării"
+
+#: gpluspost.php:135
+msgid "Skip messages without links"
+msgstr "Se omit mesajele fără legături"
+
+#: gpluspost.php:142
+msgid "Mirror all public posts"
+msgstr "Reproducere pentru toate postările publice"
+
+#: gpluspost.php:146
+msgid "Mirror Google Account ID"
+msgstr "Reproducere ID Cont Google"
+
+#: gpluspost.php:153
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: gpluspost.php:308
+msgid "Google+ post failed. Queued for retry."
+msgstr "Postarea pe Google+ a eșuat. S-a pus în așteptare pentru reîncercare."
diff --git a/gpluspost/lang/ro/strings.php b/gpluspost/lang/ro/strings.php
new file mode 100644
index 00000000..a7494f06
--- /dev/null
+++ b/gpluspost/lang/ro/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Google+"] = "Postați pe Google+";
+$a->strings["Enable Google+ Post Plugin"] = "Activare Modul Postare Google+";
+$a->strings["Google+ username"] = "Utilizator Google+ ";
+$a->strings["Google+ password"] = "Parola Google+";
+$a->strings["Google+ page number"] = "Numărul paginii Google+ ";
+$a->strings["Post to Google+ by default"] = "Postați implicit pe Google+";
+$a->strings["Do not prevent posting loops"] = "Nu se previn înlănțuirile postării";
+$a->strings["Skip messages without links"] = "Se omit mesajele fără legături";
+$a->strings["Mirror all public posts"] = "Reproducere pentru toate postările publice";
+$a->strings["Mirror Google Account ID"] = "Reproducere ID Cont Google";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Google+ post failed. Queued for retry."] = "Postarea pe Google+ a eșuat. S-a pus în așteptare pentru reîncercare.";
diff --git a/gravatar/lang/cs/messages.po b/gravatar/lang/cs/messages.po
new file mode 100644
index 00000000..005a9882
--- /dev/null
+++ b/gravatar/lang/cs/messages.po
@@ -0,0 +1,75 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: gravatar.php:71
+msgid "generic profile image"
+msgstr "generický profilový obrázek"
+
+#: gravatar.php:72
+msgid "random geometric pattern"
+msgstr "náhodný geometrický vzor"
+
+#: gravatar.php:73
+msgid "monster face"
+msgstr "tvář příšery"
+
+#: gravatar.php:74
+msgid "computer generated face"
+msgstr "počítačově generovaná tvář"
+
+#: gravatar.php:75
+msgid "retro arcade style face"
+msgstr "tvář v retro arkádovém stylu"
+
+#: gravatar.php:89
+msgid "Information"
+msgstr "Informace"
+
+#: gravatar.php:89
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno."
+
+#: gravatar.php:95
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: gravatar.php:96
+msgid "Default avatar image"
+msgstr "Defaultní obrázek avataru"
+
+#: gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README."
+
+#: gravatar.php:97
+msgid "Rating of images"
+msgstr "Hodnocení obrázků"
+
+#: gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Nastavení Gravatar aktualizováno."
diff --git a/gravatar/lang/cs/strings.php b/gravatar/lang/cs/strings.php
index 24e7d417..e3aacbb8 100644
--- a/gravatar/lang/cs/strings.php
+++ b/gravatar/lang/cs/strings.php
@@ -1,15 +1,20 @@
-<?php
-
-$a->strings["generic profile image"] = "generický profilový obrázek";
-$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
-$a->strings["monster face"] = "tvář příšery";
-$a->strings["computer generated face"] = "počítačově generovaná tvář";
-$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
-$a->strings["Information"] = "Informace";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Default avatar image"] = "Defaultní obrázek avataru";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README.";
-$a->strings["Rating of images"] = "Hodnocení obrázků";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README.";
-$a->strings["Gravatar settings updated."] = "Nastavení Gravatar aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["generic profile image"] = "generický profilový obrázek";
+$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
+$a->strings["monster face"] = "tvář příšery";
+$a->strings["computer generated face"] = "počítačově generovaná tvář";
+$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
+$a->strings["Information"] = "Informace";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Default avatar image"] = "Defaultní obrázek avataru";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README.";
+$a->strings["Rating of images"] = "Hodnocení obrázků";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README.";
+$a->strings["Gravatar settings updated."] = "Nastavení Gravatar aktualizováno.";
diff --git a/gravatar/lang/de/messages.po b/gravatar/lang/de/messages.po
new file mode 100644
index 00000000..2d2fb112
--- /dev/null
+++ b/gravatar/lang/de/messages.po
@@ -0,0 +1,75 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-28 06:14+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gravatar.php:71
+msgid "generic profile image"
+msgstr "generisches Profilbild"
+
+#: gravatar.php:72
+msgid "random geometric pattern"
+msgstr "zufälliges Profilbild"
+
+#: gravatar.php:73
+msgid "monster face"
+msgstr "Monsterfratze"
+
+#: gravatar.php:74
+msgid "computer generated face"
+msgstr "computergeneriertes Gesicht"
+
+#: gravatar.php:75
+msgid "retro arcade style face"
+msgstr "Retro Arcade Design Gesicht"
+
+#: gravatar.php:89
+msgid "Information"
+msgstr "Information"
+
+#: gravatar.php:89
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>"
+
+#: gravatar.php:95
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: gravatar.php:96
+msgid "Default avatar image"
+msgstr "Standard Profilbild "
+
+#: gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."
+
+#: gravatar.php:97
+msgid "Rating of images"
+msgstr "Bildbewertung"
+
+#: gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Gravatar Einstellungen aktualisiert."
diff --git a/gravatar/lang/de/strings.php b/gravatar/lang/de/strings.php
index 0f83e686..98832d95 100644
--- a/gravatar/lang/de/strings.php
+++ b/gravatar/lang/de/strings.php
@@ -1,15 +1,20 @@
-<?php
-
-$a->strings["generic profile image"] = "allgemeines Profilbild";
-$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
-$a->strings["monster face"] = "Monstergesicht";
-$a->strings["computer generated face"] = "Computergesicht";
-$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
-$a->strings["Information"] = "Information";
-$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
-$a->strings["Submit"] = "Senden";
-$a->strings["Default avatar image"] = "Standard Profilbild ";
-$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
-$a->strings["Rating of images"] = "Bildbewertung";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach.";
-$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["generic profile image"] = "generisches Profilbild";
+$a->strings["random geometric pattern"] = "zufälliges Profilbild";
+$a->strings["monster face"] = "Monsterfratze";
+$a->strings["computer generated face"] = "computergeneriertes Gesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Information"] = "Information";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
+$a->strings["Rating of images"] = "Bildbewertung";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach.";
+$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
diff --git a/gravatar/lang/ro/messages.po b/gravatar/lang/ro/messages.po
new file mode 100644
index 00000000..1d6cb7b1
--- /dev/null
+++ b/gravatar/lang/ro/messages.po
@@ -0,0 +1,74 @@
+# ADDON gravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica gravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:53+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: gravatar.php:71
+msgid "generic profile image"
+msgstr "imagine generică de profil"
+
+#: gravatar.php:72
+msgid "random geometric pattern"
+msgstr "șablon geometric aleator"
+
+#: gravatar.php:73
+msgid "monster face"
+msgstr "chip monstruos"
+
+#: gravatar.php:74
+msgid "computer generated face"
+msgstr "chip generat de calculator"
+
+#: gravatar.php:75
+msgid "retro arcade style face"
+msgstr "chip în stil jocuri arcade retro "
+
+#: gravatar.php:89
+msgid "Information"
+msgstr "Informaţii"
+
+#: gravatar.php:89
+msgid ""
+"Libravatar addon is installed, too. Please disable Libravatar addon or this "
+"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
+"nothing was found at Libravatar."
+msgstr "Modulul Libravatar este instalat, de asemenea. Vă rugăm să dezactivați modulul Libravatar sau acest modul Gravatar. <br>Modulul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar."
+
+#: gravatar.php:95
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: gravatar.php:96
+msgid "Default avatar image"
+msgstr "Imagine avatar implicită"
+
+#: gravatar.php:96
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr "Selectați imagine avatar implicită, dacă nici una nu fost găsită în Gravatar. Consultați FIŞIERUL README"
+
+#: gravatar.php:97
+msgid "Rating of images"
+msgstr "Evaluările imaginilor"
+
+#: gravatar.php:97
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr "Selectați evaluarea adecvată a avatarului pentru site-ul dumneavoastră. Consultați FIŞIERUL README"
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Configurările Gravatar au fost actualizate."
diff --git a/gravatar/lang/ro/strings.php b/gravatar/lang/ro/strings.php
new file mode 100644
index 00000000..d95af35b
--- /dev/null
+++ b/gravatar/lang/ro/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["generic profile image"] = "imagine generică de profil";
+$a->strings["random geometric pattern"] = "șablon geometric aleator";
+$a->strings["monster face"] = "chip monstruos";
+$a->strings["computer generated face"] = "chip generat de calculator";
+$a->strings["retro arcade style face"] = "chip în stil jocuri arcade retro ";
+$a->strings["Information"] = "Informaţii";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Modulul Libravatar este instalat, de asemenea. Vă rugăm să dezactivați modulul Libravatar sau acest modul Gravatar. <br>Modulul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Default avatar image"] = "Imagine avatar implicită";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selectați imagine avatar implicită, dacă nici una nu fost găsită în Gravatar. Consultați FIŞIERUL README";
+$a->strings["Rating of images"] = "Evaluările imaginilor";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selectați evaluarea adecvată a avatarului pentru site-ul dumneavoastră. Consultați FIŞIERUL README";
+$a->strings["Gravatar settings updated."] = "Configurările Gravatar au fost actualizate.";
diff --git a/group_text/lang/cs/messages.po b/group_text/lang/cs/messages.po
new file mode 100644
index 00000000..106f1b7e
--- /dev/null
+++ b/group_text/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Nastavení textu skupiny aktualizováno."
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Skupinový text"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Použijte pouze textový (neobrázkový) výběr skupiny v menu editace skupin."
+
+#: group_text.php:84
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/group_text/lang/cs/strings.php b/group_text/lang/cs/strings.php
index 55631a59..b1be4285 100644
--- a/group_text/lang/cs/strings.php
+++ b/group_text/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Group Text settings updated."] = "Nastavení textu skupiny aktualizováno.";
-$a->strings["Group Text"] = "Skupinový text";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Použijte pouze textový (neobrázkový) výběr skupiny v menu editace skupin.";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Group Text settings updated."] = "Nastavení textu skupiny aktualizováno.";
+$a->strings["Group Text"] = "Skupinový text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Použijte pouze textový (neobrázkový) výběr skupiny v menu editace skupin.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/group_text/lang/de/messages.po b/group_text/lang/de/messages.po
new file mode 100644
index 00000000..331579af
--- /dev/null
+++ b/group_text/lang/de/messages.po
@@ -0,0 +1,36 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-29 08:17+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Gruppen Text Einstellungen aktualisiert"
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Gruppen als Text"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"
+
+#: group_text.php:84
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/group_text/lang/de/strings.php b/group_text/lang/de/strings.php
index 206b7c96..ce7ed059 100644
--- a/group_text/lang/de/strings.php
+++ b/group_text/lang/de/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Group Text settings updated."] = "Gruppen Text Einstellungen aktualisiert";
-$a->strings["Group Text"] = "Gruppen als Text";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Group Text settings updated."] = "Gruppen Text Einstellungen aktualisiert";
+$a->strings["Group Text"] = "Gruppen als Text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/group_text/lang/ro/messages.po b/group_text/lang/ro/messages.po
new file mode 100644
index 00000000..019850f4
--- /dev/null
+++ b/group_text/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON group_text
+# Copyright (C)
+# This file is distributed under the same license as the Friendica group_text addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:53+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Configurările Text Grup, au fost actualizate."
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Text Grup"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Folosiți în meniul \"editare grup\" un selector de grup strict textual (fără-imagine)"
+
+#: group_text.php:84
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/group_text/lang/ro/strings.php b/group_text/lang/ro/strings.php
new file mode 100644
index 00000000..3ffd251a
--- /dev/null
+++ b/group_text/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Group Text settings updated."] = "Configurările Text Grup, au fost actualizate.";
+$a->strings["Group Text"] = "Text Grup";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Folosiți în meniul \"editare grup\" un selector de grup strict textual (fără-imagine)";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/ijpost/lang/cs/messages.po b/ijpost/lang/cs/messages.po
new file mode 100644
index 00000000..9fc14916
--- /dev/null
+++ b/ijpost/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON ijpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ijpost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:11+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Odeslat na Insanejournal"
+
+#: ijpost.php:69 ijpost.php:73
+msgid "InsaneJournal Export"
+msgstr "Insanejournal export"
+
+#: ijpost.php:77
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Povolit Insanejournal plugin"
+
+#: ijpost.php:82
+msgid "InsaneJournal username"
+msgstr "Insanejournal uživatelské jméno"
+
+#: ijpost.php:87
+msgid "InsaneJournal password"
+msgstr "Insanejournal heslo"
+
+#: ijpost.php:92
+msgid "Post to InsaneJournal by default"
+msgstr "Defaultně zasílat  příspěvky na InsaneJournal"
+
+#: ijpost.php:98
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/ijpost/lang/cs/strings.php b/ijpost/lang/cs/strings.php
index 8e40419a..dd9f75f6 100644
--- a/ijpost/lang/cs/strings.php
+++ b/ijpost/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Insanejournal"] = "Odeslat na Insanejournal";
-$a->strings["InsaneJournal Post Settings"] = "Nastavení příspěvků pro InsaneJournal";
-$a->strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin";
-$a->strings["InsaneJournal username"] = "Insanejournal uživatelské jméno";
-$a->strings["InsaneJournal password"] = "Insanejournal heslo";
-$a->strings["Post to InsaneJournal by default"] = "Defaultně zasílat  příspěvky na InsaneJournal";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Insanejournal"] = "Odeslat na Insanejournal";
+$a->strings["InsaneJournal Export"] = "Insanejournal export";
+$a->strings["Enable InsaneJournal Post Plugin"] = "Povolit Insanejournal plugin";
+$a->strings["InsaneJournal username"] = "Insanejournal uživatelské jméno";
+$a->strings["InsaneJournal password"] = "Insanejournal heslo";
+$a->strings["Post to InsaneJournal by default"] = "Defaultně zasílat  příspěvky na InsaneJournal";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/ijpost/lang/de/messages.po b/ijpost/lang/de/messages.po
new file mode 100644
index 00000000..1326a1d9
--- /dev/null
+++ b/ijpost/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON ijpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ijpost addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-06 12:16+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Auf InsaneJournal posten."
+
+#: ijpost.php:69 ijpost.php:73
+msgid "InsaneJournal Export"
+msgstr "InsaneJournal Export"
+
+#: ijpost.php:77
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "InsaneJournal Plugin aktivieren"
+
+#: ijpost.php:82
+msgid "InsaneJournal username"
+msgstr "InsaneJournal Benutzername"
+
+#: ijpost.php:87
+msgid "InsaneJournal password"
+msgstr "InsaneJournal Passwort"
+
+#: ijpost.php:92
+msgid "Post to InsaneJournal by default"
+msgstr "Standardmäßig auf InsaneJournal posten."
+
+#: ijpost.php:98
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/ijpost/lang/de/strings.php b/ijpost/lang/de/strings.php
index 319a9743..ef9c4e06 100644
--- a/ijpost/lang/de/strings.php
+++ b/ijpost/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
-$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen";
-$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren";
-$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
-$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
-$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
+$a->strings["InsaneJournal Export"] = "InsaneJournal Export";
+$a->strings["Enable InsaneJournal Post Plugin"] = "InsaneJournal Plugin aktivieren";
+$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
+$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
+$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/ijpost/lang/ro/messages.po b/ijpost/lang/ro/messages.po
new file mode 100644
index 00000000..8f6f23d1
--- /dev/null
+++ b/ijpost/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON ijpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ijpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:53+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Postare pe Insanejournal"
+
+#: ijpost.php:69 ijpost.php:73
+msgid "InsaneJournal Export"
+msgstr "Export InsaneJournal "
+
+#: ijpost.php:77
+msgid "Enable InsaneJournal Post Plugin"
+msgstr "Activare Modul Postare InsaneJournal"
+
+#: ijpost.php:82
+msgid "InsaneJournal username"
+msgstr "Utilizator InsaneJournal "
+
+#: ijpost.php:87
+msgid "InsaneJournal password"
+msgstr "Parolă InsaneJournal "
+
+#: ijpost.php:92
+msgid "Post to InsaneJournal by default"
+msgstr "Postați implicit pe InsaneJournal "
+
+#: ijpost.php:98
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/ijpost/lang/ro/strings.php b/ijpost/lang/ro/strings.php
new file mode 100644
index 00000000..2fa3b985
--- /dev/null
+++ b/ijpost/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Insanejournal"] = "Postare pe Insanejournal";
+$a->strings["InsaneJournal Export"] = "Export InsaneJournal ";
+$a->strings["Enable InsaneJournal Post Plugin"] = "Activare Modul Postare InsaneJournal";
+$a->strings["InsaneJournal username"] = "Utilizator InsaneJournal ";
+$a->strings["InsaneJournal password"] = "Parolă InsaneJournal ";
+$a->strings["Post to InsaneJournal by default"] = "Postați implicit pe InsaneJournal ";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/impressum/lang/cs/messages.po b/impressum/lang/cs/messages.po
new file mode 100644
index 00000000..403c7e22
--- /dev/null
+++ b/impressum/lang/cs/messages.po
@@ -0,0 +1,89 @@
+# ADDON impressum
+# Copyright (C)
+# This file is distributed under the same license as the Friendica impressum addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:11+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: impressum.php:45
+msgid "Impressum"
+msgstr "Impressum"
+
+#: impressum.php:58 impressum.php:60 impressum.php:92
+msgid "Site Owner"
+msgstr "Vlastník webu"
+
+#: impressum.php:58 impressum.php:96
+msgid "Email Address"
+msgstr "E-mailová adresa"
+
+#: impressum.php:63 impressum.php:94
+msgid "Postal Address"
+msgstr "Poštovní adresa"
+
+#: impressum.php:69
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "Doplněk Impressum musí být nakonfigurován!<br/>Prosím, přidejte alespoň proměnnou <tt>owner</tt> do konfiguračního souboru. Pro nastavení ostatních proměnných se seznamte s nápovědou v souboru README tohoto doplňku."
+
+#: impressum.php:86
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: impressum.php:91
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: impressum.php:92
+msgid "The page operators name."
+msgstr "Jméno operátora stránky."
+
+#: impressum.php:93
+msgid "Site Owners Profile"
+msgstr "Profil majitele webu"
+
+#: impressum.php:93
+msgid "Profile address of the operator."
+msgstr "Profilová addresa operátora."
+
+#: impressum.php:94
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr "Jak kontaktovat operátora prostřednictvím klasické pošty. Zde můžete použít BBCode."
+
+#: impressum.php:95
+msgid "Notes"
+msgstr "Poznámky"
+
+#: impressum.php:95
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can"
+" use BBCode here."
+msgstr "Další poznámky, které jsou zobrazeny pod kontaktními informacemi. Zde můžete použít BBCode."
+
+#: impressum.php:96
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Jak konktaktovat operátora přes mail. (bude zobrazen \"zmateně\")"
+
+#: impressum.php:97
+msgid "Footer note"
+msgstr "Poznámka v zápatí"
+
+#: impressum.php:97
+msgid "Text for the footer. You can use BBCode here."
+msgstr "Text pro zápatí. Zde můžete použít BBCode."
diff --git a/impressum/lang/cs/strings.php b/impressum/lang/cs/strings.php
index c491cc90..ab80304d 100644
--- a/impressum/lang/cs/strings.php
+++ b/impressum/lang/cs/strings.php
@@ -1,18 +1,23 @@
-<?php
-
-$a->strings["Impressum"] = "Impressum";
-$a->strings["Site Owner"] = "Vlastník webu";
-$a->strings["Email Address"] = "E-mailová adresa";
-$a->strings["Postal Address"] = "Poštovní adresa";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Doplněk Impressum musí být nakonfigurován!<br/>Prosím, přidejte alespoň proměnnou <tt>owner</tt> do konfiguračního souboru. Pro nastavení ostatních proměnných se seznamte s nápovědou v souboru README tohoto doplňku.";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["The page operators name."] = "Jméno operátora stránky.";
-$a->strings["Site Owners Profile"] = "Profil majitele webu";
-$a->strings["Profile address of the operator."] = "Profilová addresa operátora.";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Jak kontaktovat operátora prostřednictvím klasické pošty. Zde můžete použít BBCode.";
-$a->strings["Notes"] = "Poznámky";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Další poznámky, které jsou zobrazeny pod kontaktními informacemi. Zde můžete použít BBCode.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Jak konktaktovat operátora přes mail. (bude zobrazen \"zmateně\")";
-$a->strings["Footer note"] = "Poznámka v zápatí";
-$a->strings["Text for the footer. You can use BBCode here."] = "Text pro zápatí. Zde můžete použít BBCode.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Vlastník webu";
+$a->strings["Email Address"] = "E-mailová adresa";
+$a->strings["Postal Address"] = "Poštovní adresa";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Doplněk Impressum musí být nakonfigurován!<br/>Prosím, přidejte alespoň proměnnou <tt>owner</tt> do konfiguračního souboru. Pro nastavení ostatních proměnných se seznamte s nápovědou v souboru README tohoto doplňku.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["The page operators name."] = "Jméno operátora stránky.";
+$a->strings["Site Owners Profile"] = "Profil majitele webu";
+$a->strings["Profile address of the operator."] = "Profilová addresa operátora.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Jak kontaktovat operátora prostřednictvím klasické pošty. Zde můžete použít BBCode.";
+$a->strings["Notes"] = "Poznámky";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Další poznámky, které jsou zobrazeny pod kontaktními informacemi. Zde můžete použít BBCode.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Jak konktaktovat operátora přes mail. (bude zobrazen \"zmateně\")";
+$a->strings["Footer note"] = "Poznámka v zápatí";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text pro zápatí. Zde můžete použít BBCode.";
diff --git a/impressum/lang/de/messages.po b/impressum/lang/de/messages.po
new file mode 100644
index 00000000..2d535ab4
--- /dev/null
+++ b/impressum/lang/de/messages.po
@@ -0,0 +1,89 @@
+# ADDON impressum
+# Copyright (C)
+# This file is distributed under the same license as the Friendica impressum addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-03 05:51+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: impressum.php:45
+msgid "Impressum"
+msgstr "Impressum"
+
+#: impressum.php:58 impressum.php:60 impressum.php:92
+msgid "Site Owner"
+msgstr "Betreiber der Seite"
+
+#: impressum.php:58 impressum.php:96
+msgid "Email Address"
+msgstr "Email Adresse"
+
+#: impressum.php:63 impressum.php:94
+msgid "Postal Address"
+msgstr "Postalische Anschrift"
+
+#: impressum.php:69
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
+
+#: impressum.php:86
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: impressum.php:91
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: impressum.php:92
+msgid "The page operators name."
+msgstr "Name des Server-Administrators"
+
+#: impressum.php:93
+msgid "Site Owners Profile"
+msgstr "Profil des Seitenbetreibers"
+
+#: impressum.php:93
+msgid "Profile address of the operator."
+msgstr "Profil-Adresse des Server-Administrators"
+
+#: impressum.php:94
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden."
+
+#: impressum.php:95
+msgid "Notes"
+msgstr "Hinweise"
+
+#: impressum.php:95
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can"
+" use BBCode here."
+msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."
+
+#: impressum.php:96
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)"
+
+#: impressum.php:97
+msgid "Footer note"
+msgstr "Fußnote"
+
+#: impressum.php:97
+msgid "Text for the footer. You can use BBCode here."
+msgstr "Text für die Fußzeile. Du kannst BBCode verwenden."
diff --git a/impressum/lang/de/strings.php b/impressum/lang/de/strings.php
index 0a852136..1d9fcd0c 100644
--- a/impressum/lang/de/strings.php
+++ b/impressum/lang/de/strings.php
@@ -1,18 +1,23 @@
-<?php
-
-$a->strings["Impressum"] = "Impressum";
-$a->strings["Site Owner"] = "Betreiber der Seite";
-$a->strings["Email Address"] = "Email Adresse";
-$a->strings["Postal Address"] = "Postalische Anschrift";
-$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Submit"] = "Senden";
-$a->strings["The page operators name."] = "Name des Serveradministrators";
-$a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
-$a->strings["Profile address of the operator."] = "Profil-Adresse des Serveradministrators";
-$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.";
-$a->strings["Notes"] = "Hinweise";
-$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.";
-$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)";
-$a->strings["Footer note"] = "Fußnote";
-$a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Betreiber der Seite";
+$a->strings["Email Address"] = "Email Adresse";
+$a->strings["Postal Address"] = "Postalische Anschrift";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["The page operators name."] = "Name des Server-Administrators";
+$a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.";
+$a->strings["Notes"] = "Hinweise";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)";
+$a->strings["Footer note"] = "Fußnote";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden.";
diff --git a/impressum/lang/ro/messages.po b/impressum/lang/ro/messages.po
new file mode 100644
index 00000000..720acdd1
--- /dev/null
+++ b/impressum/lang/ro/messages.po
@@ -0,0 +1,88 @@
+# ADDON impressum
+# Copyright (C)
+# This file is distributed under the same license as the Friendica impressum addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:54+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: impressum.php:45
+msgid "Impressum"
+msgstr "Impressum"
+
+#: impressum.php:58 impressum.php:60 impressum.php:92
+msgid "Site Owner"
+msgstr "Deținător Site"
+
+#: impressum.php:58 impressum.php:96
+msgid "Email Address"
+msgstr "Adresă de mail"
+
+#: impressum.php:63 impressum.php:94
+msgid "Postal Address"
+msgstr "Adresă poștală"
+
+#: impressum.php:69
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr "Modulul Impressum trebuie configurat! <br />Vă rugăm să adăugați cel puțin variabila <tt>deținător</tt> în fișierul de configurare. Pentru alte variabile vă rugăm să consultați fișierul README al modulului."
+
+#: impressum.php:86
+msgid "Settings updated."
+msgstr "Configurări actualizate."
+
+#: impressum.php:91
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: impressum.php:92
+msgid "The page operators name."
+msgstr "Pagina numelor operatorilor."
+
+#: impressum.php:93
+msgid "Site Owners Profile"
+msgstr "Profil Deținători Site "
+
+#: impressum.php:93
+msgid "Profile address of the operator."
+msgstr "Adresa de profil a operatorului."
+
+#: impressum.php:94
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr "Cum să contactați operatorul prin corespondență lentă. Puteți folosi aici Codul BB."
+
+#: impressum.php:95
+msgid "Notes"
+msgstr "Note"
+
+#: impressum.php:95
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can"
+" use BBCode here."
+msgstr "Notele suplimentare care sunt afișate sub informațiile de contact. Puteți folosi aici Codul BB."
+
+#: impressum.php:96
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr "Modul de contactare al operatorului prin e-mail. (va fi afișat eclipsat)"
+
+#: impressum.php:97
+msgid "Footer note"
+msgstr "Notă de Subsol"
+
+#: impressum.php:97
+msgid "Text for the footer. You can use BBCode here."
+msgstr "Textul de pagina de subsol. Puteți folosi aici Codul BB."
diff --git a/impressum/lang/ro/strings.php b/impressum/lang/ro/strings.php
new file mode 100644
index 00000000..0f085a82
--- /dev/null
+++ b/impressum/lang/ro/strings.php
@@ -0,0 +1,23 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Deținător Site";
+$a->strings["Email Address"] = "Adresă de mail";
+$a->strings["Postal Address"] = "Adresă poștală";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Modulul Impressum trebuie configurat! <br />Vă rugăm să adăugați cel puțin variabila <tt>deținător</tt> în fișierul de configurare. Pentru alte variabile vă rugăm să consultați fișierul README al modulului.";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["The page operators name."] = "Pagina numelor operatorilor.";
+$a->strings["Site Owners Profile"] = "Profil Deținători Site ";
+$a->strings["Profile address of the operator."] = "Adresa de profil a operatorului.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cum să contactați operatorul prin corespondență lentă. Puteți folosi aici Codul BB.";
+$a->strings["Notes"] = "Note";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notele suplimentare care sunt afișate sub informațiile de contact. Puteți folosi aici Codul BB.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Modul de contactare al operatorului prin e-mail. (va fi afișat eclipsat)";
+$a->strings["Footer note"] = "Notă de Subsol";
+$a->strings["Text for the footer. You can use BBCode here."] = "Textul de pagina de subsol. Puteți folosi aici Codul BB.";
diff --git a/infiniteimprobabilitydrive/lang/cs/messages.po b/infiniteimprobabilitydrive/lang/cs/messages.po
new file mode 100644
index 00000000..e264d190
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/cs/messages.po
@@ -0,0 +1,24 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:12+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/cs/strings.php b/infiniteimprobabilitydrive/lang/cs/strings.php
index cd57a87e..9dec8bcc 100644
--- a/infiniteimprobabilitydrive/lang/cs/strings.php
+++ b/infiniteimprobabilitydrive/lang/cs/strings.php
@@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/de/messages.po b/infiniteimprobabilitydrive/lang/de/messages.po
new file mode 100644
index 00000000..e9ecccb5
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/de/messages.po
@@ -0,0 +1,24 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-06 12:15+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/de/strings.php b/infiniteimprobabilitydrive/lang/de/strings.php
index cd57a87e..d98dd403 100644
--- a/infiniteimprobabilitydrive/lang/de/strings.php
+++ b/infiniteimprobabilitydrive/lang/de/strings.php
@@ -1,3 +1,8 @@
-<?php
-
-$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/ro/messages.po b/infiniteimprobabilitydrive/lang/ro/messages.po
new file mode 100644
index 00000000..1a68b343
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/ro/messages.po
@@ -0,0 +1,23 @@
+# ADDON infiniteimprobabilitydrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:54+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr "Unitate improbabil infinită"
diff --git a/infiniteimprobabilitydrive/lang/ro/strings.php b/infiniteimprobabilitydrive/lang/ro/strings.php
new file mode 100644
index 00000000..b082c2e8
--- /dev/null
+++ b/infiniteimprobabilitydrive/lang/ro/strings.php
@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Infinite Improbability Drive"] = "Unitate improbabil infinită";
diff --git a/irc/lang/cs/messages.po b/irc/lang/cs/messages.po
new file mode 100644
index 00000000..a8e98f43
--- /dev/null
+++ b/irc/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON irc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica irc addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:12+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: irc.php:44
+msgid "IRC Settings"
+msgstr "IRC Nastavení"
+
+#: irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "Kanál(y) pro automatické připojení(oddělené čárkou)"
+
+#: irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Oblíbené Kanály (oddělené čárkou)"
+
+#: irc.php:55
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC Nastavení uloženo."
+
+#: irc.php:74
+msgid "IRC Chatroom"
+msgstr "IRC Místnost"
+
+#: irc.php:96
+msgid "Popular Channels"
+msgstr "Oblíbené kanály"
diff --git a/irc/lang/cs/strings.php b/irc/lang/cs/strings.php
index 6129c33c..61fa1f34 100644
--- a/irc/lang/cs/strings.php
+++ b/irc/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["IRC Settings"] = "Nastavení IRC";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "Kanál(y) pro automatické připojení(oddělené čárkou)";
-$a->strings["Popular Channels (comma separated)"] = "Oblíbené Kanály (oddělené čárkou)";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["IRC settings saved."] = "Nastavení IRC uloženo.";
-$a->strings["IRC Chatroom"] = "IRC Místnost";
-$a->strings["Popular Channels"] = "Oblíbené kanály";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["IRC Settings"] = "IRC Nastavení";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Kanál(y) pro automatické připojení(oddělené čárkou)";
+$a->strings["Popular Channels (comma separated)"] = "Oblíbené Kanály (oddělené čárkou)";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["IRC settings saved."] = "IRC Nastavení uloženo.";
+$a->strings["IRC Chatroom"] = "IRC Místnost";
+$a->strings["Popular Channels"] = "Oblíbené kanály";
diff --git a/irc/lang/de/messages.po b/irc/lang/de/messages.po
new file mode 100644
index 00000000..278dd9d6
--- /dev/null
+++ b/irc/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON irc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica irc addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:15+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: irc.php:44
+msgid "IRC Settings"
+msgstr "IRC Einstellungen"
+
+#: irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"
+
+#: irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Beliebte Kanäle (mit Komma getrennt)"
+
+#: irc.php:55
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: irc.php:69
+msgid "IRC settings saved."
+msgstr "IRC Einstellungen gespeichert."
+
+#: irc.php:74
+msgid "IRC Chatroom"
+msgstr "IRC Chatraum"
+
+#: irc.php:96
+msgid "Popular Channels"
+msgstr "Beliebte Räume"
diff --git a/irc/lang/de/strings.php b/irc/lang/de/strings.php
index 02d4aa53..3bbb4972 100644
--- a/irc/lang/de/strings.php
+++ b/irc/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["IRC Settings"] = "IRC Einstellungen";
-$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)";
-$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)";
-$a->strings["Submit"] = "Senden";
-$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
-$a->strings["IRC Chatroom"] = "IRC Chatraum";
-$a->strings["Popular Channels"] = "Beliebte Räume";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["IRC Settings"] = "IRC Einstellungen";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)";
+$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
+$a->strings["IRC Chatroom"] = "IRC Chatraum";
+$a->strings["Popular Channels"] = "Beliebte Räume";
diff --git a/irc/lang/ro/messages.po b/irc/lang/ro/messages.po
new file mode 100644
index 00000000..3fe389d0
--- /dev/null
+++ b/irc/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON irc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica irc addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:55+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: irc.php:44
+msgid "IRC Settings"
+msgstr "Configurări IRC"
+
+#: irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr "Canal(e) pentru auto-conectare (separate prin virgulă)"
+
+#: irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr "Canale Populare (separate prin virgulă)"
+
+#: irc.php:55
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: irc.php:69
+msgid "IRC settings saved."
+msgstr "Configurările IRC au fost salvate."
+
+#: irc.php:74
+msgid "IRC Chatroom"
+msgstr "Spațiu Chat IRC"
+
+#: irc.php:96
+msgid "Popular Channels"
+msgstr "Canale populare"
diff --git a/irc/lang/ro/strings.php b/irc/lang/ro/strings.php
new file mode 100644
index 00000000..ff7c322c
--- /dev/null
+++ b/irc/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["IRC Settings"] = "Configurări IRC";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(e) pentru auto-conectare (separate prin virgulă)";
+$a->strings["Popular Channels (comma separated)"] = "Canale Populare (separate prin virgulă)";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["IRC settings saved."] = "Configurările IRC au fost salvate.";
+$a->strings["IRC Chatroom"] = "Spațiu Chat IRC";
+$a->strings["Popular Channels"] = "Canale populare";
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 73062aae..f998acd1 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -485,8 +485,7 @@ function jappixmini_script(&$a,&$s) {
 		dbesc($dfrn_id),
 		dbesc($dfrn_id)
 	);
-	if (count($r))
-		$name = $r[0]["name"];
+	$name = $r[0]["name"];
 
         $value = $row['v'];
         $pos = strpos($value, ":");
diff --git a/jappixmini/lang/cs/messages.po b/jappixmini/lang/cs/messages.po
new file mode 100644
index 00000000..92b74cbe
--- /dev/null
+++ b/jappixmini/lang/cs/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:12+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: jappixmini.php:298 jappixmini.php:302
+msgid "Jappix Mini"
+msgstr "Jappix Mini"
+
+#: jappixmini.php:305
+msgid "Activate addon"
+msgstr "Aktivovat rozšíření"
+
+#: jappixmini.php:308
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>Nevlkádejte</em> Jappixmini Chat-Widget do webového rozhraní"
+
+#: jappixmini.php:311
+msgid "Jabber username"
+msgstr "Jabber uživatelské jméno"
+
+#: jappixmini.php:314
+msgid "Jabber server"
+msgstr "Jabber server"
+
+#: jappixmini.php:319
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH host"
+
+#: jappixmini.php:325
+msgid "Jabber password"
+msgstr "Jabber heslo"
+
+#: jappixmini.php:330
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)"
+
+#: jappixmini.php:333
+msgid "Friendica password"
+msgstr "Friendica heslo"
+
+#: jappixmini.php:336
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Automaticky schválit požadavek na členství od Friedica kontaktů."
+
+#: jappixmini.php:339
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Automaticky zaslat požadavek na členství Friedica kontaktům."
+
+#: jappixmini.php:342
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Očistit interní seznam jabber adres kontaktů"
+
+#: jappixmini.php:347
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: jappixmini.php:348
+msgid "Add contact"
+msgstr "Přidat kontakt"
diff --git a/jappixmini/lang/cs/strings.php b/jappixmini/lang/cs/strings.php
index 2be6042a..2aecb88b 100644
--- a/jappixmini/lang/cs/strings.php
+++ b/jappixmini/lang/cs/strings.php
@@ -1,16 +1,21 @@
-<?php
-
-$a->strings["Jappix Mini addon settings"] = "Nastavení rozšíření Jappix Mini";
-$a->strings["Activate addon"] = "Aktivovat rozšíření";
-$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nevlkádejte</em> Jappixmini Chat-Widget do webového rozhraní";
-$a->strings["Jabber username"] = "Jabber uživatelské jméno";
-$a->strings["Jabber server"] = "Jabber server";
-$a->strings["Jabber BOSH host"] = "Jabber BOSH host";
-$a->strings["Jabber password"] = "Jabber heslo";
-$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)";
-$a->strings["Friendica password"] = "Friendica heslo";
-$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů.";
-$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům.";
-$a->strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Add contact"] = "Přidat kontakt";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Jappix Mini"] = "Jappix Mini";
+$a->strings["Activate addon"] = "Aktivovat rozšíření";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nevlkádejte</em> Jappixmini Chat-Widget do webového rozhraní";
+$a->strings["Jabber username"] = "Jabber uživatelské jméno";
+$a->strings["Jabber server"] = "Jabber server";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH host";
+$a->strings["Jabber password"] = "Jabber heslo";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat Jabber heslo s heslem Friendica (doporučeno)";
+$a->strings["Friendica password"] = "Friendica heslo";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek na členství od Friedica kontaktů.";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky zaslat požadavek na členství Friedica kontaktům.";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Add contact"] = "Přidat kontakt";
diff --git a/jappixmini/lang/ro/messages.po b/jappixmini/lang/ro/messages.po
new file mode 100644
index 00000000..b1fb603a
--- /dev/null
+++ b/jappixmini/lang/ro/messages.po
@@ -0,0 +1,76 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:55+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: jappixmini.php:298 jappixmini.php:302
+msgid "Jappix Mini"
+msgstr "Jappix Mini"
+
+#: jappixmini.php:305
+msgid "Activate addon"
+msgstr "Activare supliment"
+
+#: jappixmini.php:308
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>Nu</em> se introduce Jappixmini Chat-Widget în interfața web"
+
+#: jappixmini.php:311
+msgid "Jabber username"
+msgstr "Utilizator Jabber "
+
+#: jappixmini.php:314
+msgid "Jabber server"
+msgstr "Server Jabber "
+
+#: jappixmini.php:319
+msgid "Jabber BOSH host"
+msgstr "Host BOSH Jabber"
+
+#: jappixmini.php:325
+msgid "Jabber password"
+msgstr "Parolă Jabber "
+
+#: jappixmini.php:330
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Criptare parolă Jabber cu parola Friendica (recomandat)"
+
+#: jappixmini.php:333
+msgid "Friendica password"
+msgstr "Parolă Friendica "
+
+#: jappixmini.php:336
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Aprobare solicitări de subscriere din contactele Friendica, în mod automat"
+
+#: jappixmini.php:339
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Abonare automată la contactele Friendica"
+
+#: jappixmini.php:342
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Curățare listă internă a adreselor de contact jabber"
+
+#: jappixmini.php:347
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: jappixmini.php:348
+msgid "Add contact"
+msgstr "Adăugare contact"
diff --git a/jappixmini/lang/ro/strings.php b/jappixmini/lang/ro/strings.php
new file mode 100644
index 00000000..a718a933
--- /dev/null
+++ b/jappixmini/lang/ro/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Jappix Mini"] = "Jappix Mini";
+$a->strings["Activate addon"] = "Activare supliment";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nu</em> se introduce Jappixmini Chat-Widget în interfața web";
+$a->strings["Jabber username"] = "Utilizator Jabber ";
+$a->strings["Jabber server"] = "Server Jabber ";
+$a->strings["Jabber BOSH host"] = "Host BOSH Jabber";
+$a->strings["Jabber password"] = "Parolă Jabber ";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Criptare parolă Jabber cu parola Friendica (recomandat)";
+$a->strings["Friendica password"] = "Parolă Friendica ";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobare solicitări de subscriere din contactele Friendica, în mod automat";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Abonare automată la contactele Friendica";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Curățare listă internă a adreselor de contact jabber";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Add contact"] = "Adăugare contact";
diff --git a/js_upload/lang/cs/messages.po b/js_upload/lang/cs/messages.po
new file mode 100644
index 00000000..7515f7fd
--- /dev/null
+++ b/js_upload/lang/cs/messages.po
@@ -0,0 +1,56 @@
+# ADDON js_upload
+# Copyright (C)
+# This file is distributed under the same license as the Friendica js_upload addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:13+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Nahrát soubor"
+
+#: js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Přeneste sem soubory k nahrání"
+
+#: js_upload.php:45
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: js_upload.php:46
+msgid "Failed"
+msgstr "Neúspěch"
+
+#: js_upload.php:303
+msgid "No files were uploaded."
+msgstr "Žádné soubory nebyly nahrány."
+
+#: js_upload.php:309
+msgid "Uploaded file is empty"
+msgstr "Nahraný soubor je prázdný"
+
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Velikost obrázku překračuje limit velikosti"
+
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Soubor má neplatnou příponu, ta by měla být jednou z"
+
+#: js_upload.php:343
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"
diff --git a/js_upload/lang/cs/strings.php b/js_upload/lang/cs/strings.php
index fa1d67df..6cb6b654 100644
--- a/js_upload/lang/cs/strings.php
+++ b/js_upload/lang/cs/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Upload a file"] = "Nahrát soubor";
-$a->strings["Drop files here to upload"] = "Přeneste sem soubory k nahrání";
-$a->strings["Cancel"] = "Zrušit";
-$a->strings["Failed"] = "Neúspěch";
-$a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány.";
-$a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný";
-$a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti";
-$a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z";
-$a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Upload a file"] = "Nahrát soubor";
+$a->strings["Drop files here to upload"] = "Přeneste sem soubory k nahrání";
+$a->strings["Cancel"] = "Zrušit";
+$a->strings["Failed"] = "Neúspěch";
+$a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány.";
+$a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný";
+$a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti";
+$a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z";
+$a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru";
diff --git a/js_upload/lang/de/messages.po b/js_upload/lang/de/messages.po
new file mode 100644
index 00000000..c93bfa32
--- /dev/null
+++ b/js_upload/lang/de/messages.po
@@ -0,0 +1,56 @@
+# ADDON js_upload
+# Copyright (C)
+# This file is distributed under the same license as the Friendica js_upload addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:01+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Datei hochladen"
+
+#: js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Ziehe die Dateien hierher die du hochladen willst"
+
+#: js_upload.php:45
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js_upload.php:46
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: js_upload.php:303
+msgid "No files were uploaded."
+msgstr "Keine Dateien hochgeladen."
+
+#: js_upload.php:309
+msgid "Uploaded file is empty"
+msgstr "Hochgeladene Datei ist leer"
+
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Die Bildgröße übersteigt das Limit von "
+
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein "
+
+#: js_upload.php:343
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Upload abgebrochen oder Serverfehler aufgetreten"
diff --git a/js_upload/lang/de/strings.php b/js_upload/lang/de/strings.php
index 282ffac7..5a680cb2 100644
--- a/js_upload/lang/de/strings.php
+++ b/js_upload/lang/de/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["Upload a file"] = "Datei hochladen";
-$a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen";
-$a->strings["Cancel"] = "Abbrechen";
-$a->strings["Failed"] = "Fehlgeschlagen";
-$a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
-$a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
-$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
-$a->strings["File has an invalid extension, it should be one of "] = "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein ";
-$a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Upload a file"] = "Datei hochladen";
+$a->strings["Drop files here to upload"] = "Ziehe die Dateien hierher die du hochladen willst";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Failed"] = "Fehlgeschlagen";
+$a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
+$a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
+$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
+$a->strings["File has an invalid extension, it should be one of "] = "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
diff --git a/js_upload/lang/ro/messages.po b/js_upload/lang/ro/messages.po
new file mode 100644
index 00000000..47dd08af
--- /dev/null
+++ b/js_upload/lang/ro/messages.po
@@ -0,0 +1,55 @@
+# ADDON js_upload
+# Copyright (C)
+# This file is distributed under the same license as the Friendica js_upload addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:56+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Încărcați un fișier"
+
+#: js_upload.php:44
+msgid "Drop files here to upload"
+msgstr "Fixați fișierele aici pentru încărcare"
+
+#: js_upload.php:45
+msgid "Cancel"
+msgstr "Anulare"
+
+#: js_upload.php:46
+msgid "Failed"
+msgstr "Eșuat"
+
+#: js_upload.php:303
+msgid "No files were uploaded."
+msgstr "Nici un fișier nu a fost încărcat."
+
+#: js_upload.php:309
+msgid "Uploaded file is empty"
+msgstr "Fișierul încărcat este gol"
+
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Dimensiunea imaginii depășește limita de"
+
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Fișierul are o extensie invalidă, acesta trebuie să fie una de tipul"
+
+#: js_upload.php:343
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Încărcarea a fost anulată, sau a apărut o eroare de server"
diff --git a/js_upload/lang/ro/strings.php b/js_upload/lang/ro/strings.php
new file mode 100644
index 00000000..778210e7
--- /dev/null
+++ b/js_upload/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Upload a file"] = "Încărcați un fișier";
+$a->strings["Drop files here to upload"] = "Fixați fișierele aici pentru încărcare";
+$a->strings["Cancel"] = "Anulare";
+$a->strings["Failed"] = "Eșuat";
+$a->strings["No files were uploaded."] = "Nici un fișier nu a fost încărcat.";
+$a->strings["Uploaded file is empty"] = "Fișierul încărcat este gol";
+$a->strings["Image exceeds size limit of "] = "Dimensiunea imaginii depășește limita de";
+$a->strings["File has an invalid extension, it should be one of "] = "Fișierul are o extensie invalidă, acesta trebuie să fie una de tipul";
+$a->strings["Upload was cancelled, or server error encountered"] = "Încărcarea a fost anulată, sau a apărut o eroare de server";
diff --git a/ldapauth/lang/C/messages.po b/ldapauth/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/libertree/lang/cs/messages.po b/libertree/lang/cs/messages.po
new file mode 100644
index 00000000..9ec8e31b
--- /dev/null
+++ b/libertree/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON libertree
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libertree addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:13+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: libertree.php:36
+msgid "Post to libertree"
+msgstr "Poslat na libertree"
+
+#: libertree.php:67 libertree.php:71
+msgid "libertree Export"
+msgstr "libertree export"
+
+#: libertree.php:75
+msgid "Enable Libertree Post Plugin"
+msgstr "Povolit Libertree Post rozšíření"
+
+#: libertree.php:80
+msgid "Libertree API token"
+msgstr "Libertree API token"
+
+#: libertree.php:85
+msgid "Libertree site URL"
+msgstr "URL adresa Libertree "
+
+#: libertree.php:90
+msgid "Post to Libertree by default"
+msgstr "Defaultně poslat na Libertree"
+
+#: libertree.php:96
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/libertree/lang/cs/strings.php b/libertree/lang/cs/strings.php
index 51164954..fd0ffd18 100644
--- a/libertree/lang/cs/strings.php
+++ b/libertree/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to libertree"] = "Poslat na Libertree";
-$a->strings["libertree Post Settings"] = "Nastavení Libertree příspěvků";
-$a->strings["Enable Libertree Post Plugin"] = "Povolit Libertree Post rozšíření";
-$a->strings["Libertree API token"] = "Libertree API token";
-$a->strings["Libertree site URL"] = "URL adresa Libertree ";
-$a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to libertree"] = "Poslat na libertree";
+$a->strings["libertree Export"] = "libertree export";
+$a->strings["Enable Libertree Post Plugin"] = "Povolit Libertree Post rozšíření";
+$a->strings["Libertree API token"] = "Libertree API token";
+$a->strings["Libertree site URL"] = "URL adresa Libertree ";
+$a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/libertree/lang/de/messages.po b/libertree/lang/de/messages.po
new file mode 100644
index 00000000..a07d5ba6
--- /dev/null
+++ b/libertree/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON libertree
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libertree addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:27+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: libertree.php:36
+msgid "Post to libertree"
+msgstr "bei libertree veröffentlichen"
+
+#: libertree.php:67 libertree.php:71
+msgid "libertree Export"
+msgstr "Blogger Export"
+
+#: libertree.php:75
+msgid "Enable Libertree Post Plugin"
+msgstr "Libertree Post Plugin aktivieren"
+
+#: libertree.php:80
+msgid "Libertree API token"
+msgstr "Libertree API Token"
+
+#: libertree.php:85
+msgid "Libertree site URL"
+msgstr "Libertree URL"
+
+#: libertree.php:90
+msgid "Post to Libertree by default"
+msgstr "Standardmäßig bei libertree veröffentlichen"
+
+#: libertree.php:96
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/libertree/lang/de/strings.php b/libertree/lang/de/strings.php
index 553089fd..9190262c 100644
--- a/libertree/lang/de/strings.php
+++ b/libertree/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to libertree"] = "bei libertree veröffentlichen";
-$a->strings["libertree Post Settings"] = "libertree Post Einstellungen";
-$a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren";
-$a->strings["Libertree API token"] = "Libertree API Token";
-$a->strings["Libertree site URL"] = "Libertree URL";
-$a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to libertree"] = "bei libertree veröffentlichen";
+$a->strings["libertree Export"] = "Blogger Export";
+$a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren";
+$a->strings["Libertree API token"] = "Libertree API Token";
+$a->strings["Libertree site URL"] = "Libertree URL";
+$a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/libertree/lang/ro/messages.po b/libertree/lang/ro/messages.po
new file mode 100644
index 00000000..a24d3363
--- /dev/null
+++ b/libertree/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON libertree
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libertree addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:56+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: libertree.php:36
+msgid "Post to libertree"
+msgstr "Postați pe libertree"
+
+#: libertree.php:67 libertree.php:71
+msgid "libertree Export"
+msgstr "Export Libertree"
+
+#: libertree.php:75
+msgid "Enable Libertree Post Plugin"
+msgstr "Activare Modul Postare Libertree"
+
+#: libertree.php:80
+msgid "Libertree API token"
+msgstr "Token API Libertree"
+
+#: libertree.php:85
+msgid "Libertree site URL"
+msgstr "URL site Libertree"
+
+#: libertree.php:90
+msgid "Post to Libertree by default"
+msgstr "Postați implicit pe Libertree"
+
+#: libertree.php:96
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/libertree/lang/ro/strings.php b/libertree/lang/ro/strings.php
new file mode 100644
index 00000000..aedb9698
--- /dev/null
+++ b/libertree/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to libertree"] = "Postați pe libertree";
+$a->strings["libertree Export"] = "Export Libertree";
+$a->strings["Enable Libertree Post Plugin"] = "Activare Modul Postare Libertree";
+$a->strings["Libertree API token"] = "Token API Libertree";
+$a->strings["Libertree site URL"] = "URL site Libertree";
+$a->strings["Post to Libertree by default"] = "Postați implicit pe Libertree";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/libravatar/lang/cs/messages.po b/libravatar/lang/cs/messages.po
new file mode 100644
index 00000000..cd79abbf
--- /dev/null
+++ b/libravatar/lang/cs/messages.po
@@ -0,0 +1,84 @@
+# ADDON libravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libravatar addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:14+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Libravatar není možné úspěšně nainstalovat .<br>Vyžaduje PHP >= 5.3"
+
+#: libravatar.php:73
+msgid "generic profile image"
+msgstr "generický profilový obrázek"
+
+#: libravatar.php:74
+msgid "random geometric pattern"
+msgstr "náhodný geometrický vzor"
+
+#: libravatar.php:75
+msgid "monster face"
+msgstr "tvář příšery"
+
+#: libravatar.php:76
+msgid "computer generated face"
+msgstr "počítačově generovaná tvář"
+
+#: libravatar.php:77
+msgid "retro arcade style face"
+msgstr "tvář v retro arkádovém stylu"
+
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Omezení"
+
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Vaše PHP verze %s je nižší než požadovaná PHP >= 5.3."
+
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Tento doplněk není funkční na Vašem serveru."
+
+#: libravatar.php:93
+msgid "Information"
+msgstr "Informace"
+
+#: libravatar.php:93
+msgid ""
+"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
+"Libravatar addon will fall back to Gravatar if nothing was found at "
+"Libravatar."
+msgstr "Gravatar doplněk je nainstalován. Prosím zakažte doplněk Gravatar. <br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno."
+
+#: libravatar.php:99
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: libravatar.php:100
+msgid "Default avatar image"
+msgstr "Defaultní obrázek avataru"
+
+#: libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr "Vyberte defaultní avatar obrázek pokud nebyl žádný nalezen. Více viz. soubor README."
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Nastavení Libravatar aktualizováno."
diff --git a/libravatar/lang/cs/strings.php b/libravatar/lang/cs/strings.php
index 4c5c87c7..ed55ecb6 100644
--- a/libravatar/lang/cs/strings.php
+++ b/libravatar/lang/cs/strings.php
@@ -1,17 +1,22 @@
-<?php
-
-$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar není možné úspěšně nainstalovat .<br>Vyžaduje PHP >= 5.3";
-$a->strings["generic profile image"] = "generický profilový obrázek";
-$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
-$a->strings["monster face"] = "tvář příšery";
-$a->strings["computer generated face"] = "počítačově generovaná tvář";
-$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
-$a->strings["Warning"] = "Varování";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Vaše PHP verze %s je nižší než požadovaná PHP >= 5.3.";
-$a->strings["This addon is not functional on your server."] = "Tento doplněk není funkční na Vašem serveru.";
-$a->strings["Information"] = "Informace";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Gravatar doplněk je nainstalován. Prosím zakažte doplněk Gravatar. <br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Default avatar image"] = "Defaultní obrázek avataru";
-$a->strings["Select default avatar image if none was found. See README"] = "Vyberte defaultní avatar obrázek pokud nebyl žádný nalezen. Více viz. soubor README.";
-$a->strings["Libravatar settings updated."] = "Nastavení Libravatar aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar není možné úspěšně nainstalovat .<br>Vyžaduje PHP >= 5.3";
+$a->strings["generic profile image"] = "generický profilový obrázek";
+$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
+$a->strings["monster face"] = "tvář příšery";
+$a->strings["computer generated face"] = "počítačově generovaná tvář";
+$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
+$a->strings["Warning"] = "Omezení";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Vaše PHP verze %s je nižší než požadovaná PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Tento doplněk není funkční na Vašem serveru.";
+$a->strings["Information"] = "Informace";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Gravatar doplněk je nainstalován. Prosím zakažte doplněk Gravatar. <br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Default avatar image"] = "Defaultní obrázek avataru";
+$a->strings["Select default avatar image if none was found. See README"] = "Vyberte defaultní avatar obrázek pokud nebyl žádný nalezen. Více viz. soubor README.";
+$a->strings["Libravatar settings updated."] = "Nastavení Libravatar aktualizováno.";
diff --git a/libravatar/lang/de/messages.po b/libravatar/lang/de/messages.po
new file mode 100644
index 00000000..167df0ed
--- /dev/null
+++ b/libravatar/lang/de/messages.po
@@ -0,0 +1,84 @@
+# ADDON libravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libravatar addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:25+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt"
+
+#: libravatar.php:73
+msgid "generic profile image"
+msgstr "allgemeines Profilbild"
+
+#: libravatar.php:74
+msgid "random geometric pattern"
+msgstr "zufällig erzeugtes geometrisches Muster"
+
+#: libravatar.php:75
+msgid "monster face"
+msgstr "Monstergesicht"
+
+#: libravatar.php:76
+msgid "computer generated face"
+msgstr "Computergesicht"
+
+#: libravatar.php:77
+msgid "retro arcade style face"
+msgstr "Retro Arcade Design Gesicht"
+
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Warnung"
+
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3."
+
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Dieses Addon funktioniert auf deinem Server nicht."
+
+#: libravatar.php:93
+msgid "Information"
+msgstr "Information"
+
+#: libravatar.php:93
+msgid ""
+"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
+"Libravatar addon will fall back to Gravatar if nothing was found at "
+"Libravatar."
+msgstr "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden."
+
+#: libravatar.php:99
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: libravatar.php:100
+msgid "Default avatar image"
+msgstr "Standard Profilbild "
+
+#: libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr "Das Standard Avatar Bild wurde nicht gefunden. Siehe README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Libravatar Einstellungen sind aktualisiert."
diff --git a/libravatar/lang/de/strings.php b/libravatar/lang/de/strings.php
index 9750809a..0e2cbb63 100644
--- a/libravatar/lang/de/strings.php
+++ b/libravatar/lang/de/strings.php
@@ -1,17 +1,22 @@
-<?php
-
-$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
-$a->strings["generic profile image"] = "allgemeines Profilbild";
-$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
-$a->strings["monster face"] = "Monstergesicht";
-$a->strings["computer generated face"] = "Computergesicht";
-$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
-$a->strings["Warning"] = "Warnung";
-$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3.";
-$a->strings["This addon is not functional on your server."] = "Dieses Addon funktioniert auf deinem Server nicht.";
-$a->strings["Information"] = "Information";
-$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
-$a->strings["Submit"] = "Senden";
-$a->strings["Default avatar image"] = "Standard Profilbild ";
-$a->strings["Select default avatar image if none was found. See README"] = "Das Standard Avatar Bild wurde nicht gefunden. Siehe README";
-$a->strings["Libravatar settings updated."] = "Libravatar Einstellungen sind aktualisiert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
+$a->strings["generic profile image"] = "allgemeines Profilbild";
+$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
+$a->strings["monster face"] = "Monstergesicht";
+$a->strings["computer generated face"] = "Computergesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Warning"] = "Warnung";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Dieses Addon funktioniert auf deinem Server nicht.";
+$a->strings["Information"] = "Information";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found. See README"] = "Das Standard Avatar Bild wurde nicht gefunden. Siehe README";
+$a->strings["Libravatar settings updated."] = "Libravatar Einstellungen sind aktualisiert.";
diff --git a/libravatar/lang/ro/messages.po b/libravatar/lang/ro/messages.po
new file mode 100644
index 00000000..efcf12bc
--- /dev/null
+++ b/libravatar/lang/ro/messages.po
@@ -0,0 +1,83 @@
+# ADDON libravatar
+# Copyright (C)
+# This file is distributed under the same license as the Friendica libravatar addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:57+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "NU s-a putut instala Libravatar cu succes.<br>Acesta necesită PHP >= 5.3"
+
+#: libravatar.php:73
+msgid "generic profile image"
+msgstr "imagine generică de profil"
+
+#: libravatar.php:74
+msgid "random geometric pattern"
+msgstr "șablon geometric aleator"
+
+#: libravatar.php:75
+msgid "monster face"
+msgstr "chip monstruos"
+
+#: libravatar.php:76
+msgid "computer generated face"
+msgstr "chip generat de calculator"
+
+#: libravatar.php:77
+msgid "retro arcade style face"
+msgstr "chip în stil jocuri arcade retro"
+
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Atenție"
+
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Versiunea dumneavoastră PHP %s este inferioară celei necesare PHP >= 5.3."
+
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Acest supliment nu este funcțional pe serverul dumneavoastră."
+
+#: libravatar.php:93
+msgid "Information"
+msgstr "Informaţii"
+
+#: libravatar.php:93
+msgid ""
+"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
+"Libravatar addon will fall back to Gravatar if nothing was found at "
+"Libravatar."
+msgstr "Suplimentul Gravatar este instalat. Vă rugăm să dezactivați suplimentul Gravatar.<br> Suplimentul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar."
+
+#: libravatar.php:99
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: libravatar.php:100
+msgid "Default avatar image"
+msgstr "Imagine avatar implicită"
+
+#: libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr "Selectați imaginea avatar implicită, dacă nici una nu fost găsită. Consultați FIŞIERUL README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Configurările Libravatar au fost actualizate."
diff --git a/libravatar/lang/ro/strings.php b/libravatar/lang/ro/strings.php
new file mode 100644
index 00000000..9d04b1f3
--- /dev/null
+++ b/libravatar/lang/ro/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "NU s-a putut instala Libravatar cu succes.<br>Acesta necesită PHP >= 5.3";
+$a->strings["generic profile image"] = "imagine generică de profil";
+$a->strings["random geometric pattern"] = "șablon geometric aleator";
+$a->strings["monster face"] = "chip monstruos";
+$a->strings["computer generated face"] = "chip generat de calculator";
+$a->strings["retro arcade style face"] = "chip în stil jocuri arcade retro";
+$a->strings["Warning"] = "Atenție";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Versiunea dumneavoastră PHP %s este inferioară celei necesare PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Acest supliment nu este funcțional pe serverul dumneavoastră.";
+$a->strings["Information"] = "Informaţii";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Suplimentul Gravatar este instalat. Vă rugăm să dezactivați suplimentul Gravatar.<br> Suplimentul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Default avatar image"] = "Imagine avatar implicită";
+$a->strings["Select default avatar image if none was found. See README"] = "Selectați imaginea avatar implicită, dacă nici una nu fost găsită. Consultați FIŞIERUL README";
+$a->strings["Libravatar settings updated."] = "Configurările Libravatar au fost actualizate.";
diff --git a/ljpost/lang/cs/messages.po b/ljpost/lang/cs/messages.po
new file mode 100644
index 00000000..2fbf978b
--- /dev/null
+++ b/ljpost/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON ljpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ljpost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:14+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "Poslat na LiveJournal"
+
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Nastavení LiveJournal Post"
+
+#: ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Povolit LiveJournal Post plugin"
+
+#: ljpost.php:77
+msgid "LiveJournal username"
+msgstr "LiveJournal uživatelské jméno"
+
+#: ljpost.php:82
+msgid "LiveJournal password"
+msgstr "LiveJournal heslo"
+
+#: ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Defaultně umístit na LiveJournal"
+
+#: ljpost.php:93
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/ljpost/lang/cs/strings.php b/ljpost/lang/cs/strings.php
index c0f39003..e2dddb3a 100644
--- a/ljpost/lang/cs/strings.php
+++ b/ljpost/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to LiveJournal"] = "Poslat na LiveJournal";
-$a->strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post";
-$a->strings["Enable LiveJournal Post Plugin"] = "Povolit LiveJournal Post plugin";
-$a->strings["LiveJournal username"] = "LiveJournal uživatelské jméno";
-$a->strings["LiveJournal password"] = "LiveJournal heslo";
-$a->strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to LiveJournal"] = "Poslat na LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post";
+$a->strings["Enable LiveJournal Post Plugin"] = "Povolit LiveJournal Post plugin";
+$a->strings["LiveJournal username"] = "LiveJournal uživatelské jméno";
+$a->strings["LiveJournal password"] = "LiveJournal heslo";
+$a->strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/ljpost/lang/de/messages.po b/ljpost/lang/de/messages.po
new file mode 100644
index 00000000..b44966e7
--- /dev/null
+++ b/ljpost/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON ljpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ljpost addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:25+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "In LiveJournal veröffentlichen."
+
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "LiveJournal Veröffentlichungs-Einstellungen"
+
+#: ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "LiveJournal Post Plugin aktivieren"
+
+#: ljpost.php:77
+msgid "LiveJournal username"
+msgstr "LiveJournal Benutzername"
+
+#: ljpost.php:82
+msgid "LiveJournal password"
+msgstr "LiveJournal Passwort"
+
+#: ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Standardmäßig bei LiveJournal veröffentlichen"
+
+#: ljpost.php:93
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/ljpost/lang/de/strings.php b/ljpost/lang/de/strings.php
index 8ac9e5b2..b3d29943 100644
--- a/ljpost/lang/de/strings.php
+++ b/ljpost/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
-$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
-$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren";
-$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
-$a->strings["LiveJournal password"] = "LiveJournal Passwort";
-$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
+$a->strings["Enable LiveJournal Post Plugin"] = "LiveJournal Post Plugin aktivieren";
+$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
+$a->strings["LiveJournal password"] = "LiveJournal Passwort";
+$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/ljpost/lang/ro/messages.po b/ljpost/lang/ro/messages.po
new file mode 100644
index 00000000..cc76c81d
--- /dev/null
+++ b/ljpost/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON ljpost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica ljpost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:57+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr "Postați pe LiveJournal"
+
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Configurări Postări LiveJournal"
+
+#: ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr "Activare Modul Postare LiveJournal"
+
+#: ljpost.php:77
+msgid "LiveJournal username"
+msgstr "Utilizator LiveJournal"
+
+#: ljpost.php:82
+msgid "LiveJournal password"
+msgstr "Parolă LiveJournal "
+
+#: ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr "Postați implicit pe LiveJournal"
+
+#: ljpost.php:93
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/ljpost/lang/ro/strings.php b/ljpost/lang/ro/strings.php
new file mode 100644
index 00000000..d2df8016
--- /dev/null
+++ b/ljpost/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to LiveJournal"] = "Postați pe LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Configurări Postări LiveJournal";
+$a->strings["Enable LiveJournal Post Plugin"] = "Activare Modul Postare LiveJournal";
+$a->strings["LiveJournal username"] = "Utilizator LiveJournal";
+$a->strings["LiveJournal password"] = "Parolă LiveJournal ";
+$a->strings["Post to LiveJournal by default"] = "Postați implicit pe LiveJournal";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/mahjongg/lang/C/messages.po b/mahjongg/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po
new file mode 100644
index 00000000..ac528cc6
--- /dev/null
+++ b/mailstream/lang/C/messages.po
@@ -0,0 +1,78 @@
+# ADDON mailstream
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica mailstream addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: mailstream.php:55
+msgid "From Address"
+msgstr ""
+
+#: mailstream.php:57
+msgid "Email address that stream items will appear to be from."
+msgstr ""
+
+#: mailstream.php:60 mailstream.php:282
+msgid "Save Settings"
+msgstr ""
+
+#: mailstream.php:165
+msgid "Re:"
+msgstr ""
+
+#: mailstream.php:173
+msgid "Friendica post"
+msgstr ""
+
+#: mailstream.php:176
+msgid "Diaspora post"
+msgstr ""
+
+#: mailstream.php:183
+msgid "Feed item"
+msgstr ""
+
+#: mailstream.php:186
+msgid "Email"
+msgstr ""
+
+#: mailstream.php:188
+msgid "Friendica Item"
+msgstr ""
+
+#: mailstream.php:229
+msgid "Upstream"
+msgstr ""
+
+#: mailstream.php:230
+msgid "Local"
+msgstr ""
+
+#: mailstream.php:274
+msgid "Email Address"
+msgstr ""
+
+#: mailstream.php:276
+msgid "Leave blank to use your account email address"
+msgstr ""
+
+#: mailstream.php:279
+msgid "Enabled"
+msgstr ""
+
+#: mailstream.php:281
+msgid "Mail Stream Settings"
+msgstr ""
diff --git a/mailstream/lang/cs/messages.po b/mailstream/lang/cs/messages.po
new file mode 100644
index 00000000..a5d36f7f
--- /dev/null
+++ b/mailstream/lang/cs/messages.po
@@ -0,0 +1,80 @@
+# ADDON mailstream
+# Copyright (C)
+# This file is distributed under the same license as the Friendica mailstream addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:19+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: mailstream.php:55
+msgid "From Address"
+msgstr "Adresa odesílatele"
+
+#: mailstream.php:57
+msgid "Email address that stream items will appear to be from."
+msgstr "Adresa, která vysílá položky, se objeví jako odesílatel."
+
+#: mailstream.php:60 mailstream.php:282
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: mailstream.php:165
+msgid "Re:"
+msgstr "Re:"
+
+#: mailstream.php:173
+msgid "Friendica post"
+msgstr "Friendica příspěvky"
+
+#: mailstream.php:176
+msgid "Diaspora post"
+msgstr "Diaspora příspvěvky"
+
+#: mailstream.php:183
+msgid "Feed item"
+msgstr "Zdrojová položka"
+
+#: mailstream.php:186
+msgid "Email"
+msgstr "E-mail"
+
+#: mailstream.php:188
+msgid "Friendica Item"
+msgstr "Friendica položka"
+
+#: mailstream.php:229
+msgid "Upstream"
+msgstr "Upstream"
+
+#: mailstream.php:230
+msgid "Local"
+msgstr "Lokální"
+
+#: mailstream.php:274
+msgid "Email Address"
+msgstr "E-mailová adresa"
+
+#: mailstream.php:276
+msgid "Leave blank to use your account email address"
+msgstr "Ponechte prázdné pro použití vaší e-mailové adresy"
+
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Povoleno"
+
+#: mailstream.php:281
+msgid "Mail Stream Settings"
+msgstr "Mail Stream nastavení"
diff --git a/mailstream/lang/cs/strings.php b/mailstream/lang/cs/strings.php
new file mode 100644
index 00000000..fd36cca4
--- /dev/null
+++ b/mailstream/lang/cs/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["From Address"] = "Adresa odesílatele";
+$a->strings["Email address that stream items will appear to be from."] = "Adresa, která vysílá položky, se objeví jako odesílatel.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Friendica příspěvky";
+$a->strings["Diaspora post"] = "Diaspora příspvěvky";
+$a->strings["Feed item"] = "Zdrojová položka";
+$a->strings["Email"] = "E-mail";
+$a->strings["Friendica Item"] = "Friendica položka";
+$a->strings["Upstream"] = "Upstream";
+$a->strings["Local"] = "Lokální";
+$a->strings["Email Address"] = "E-mailová adresa";
+$a->strings["Leave blank to use your account email address"] = "Ponechte prázdné pro použití vaší e-mailové adresy";
+$a->strings["Enabled"] = "Povoleno";
+$a->strings["Mail Stream Settings"] = "Mail Stream nastavení";
diff --git a/mailstream/lang/ro/messages.po b/mailstream/lang/ro/messages.po
new file mode 100644
index 00000000..e640fbe5
--- /dev/null
+++ b/mailstream/lang/ro/messages.po
@@ -0,0 +1,79 @@
+# ADDON mailstream
+# Copyright (C)
+# This file is distributed under the same license as the Friendica mailstream addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:57+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: mailstream.php:55
+msgid "From Address"
+msgstr "Adresa sursă"
+
+#: mailstream.php:57
+msgid "Email address that stream items will appear to be from."
+msgstr "Adresa de e-mail folosită ca și sursă pentru elemente fluxate."
+
+#: mailstream.php:60 mailstream.php:282
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: mailstream.php:165
+msgid "Re:"
+msgstr "Re:"
+
+#: mailstream.php:173
+msgid "Friendica post"
+msgstr "Postare Friendica "
+
+#: mailstream.php:176
+msgid "Diaspora post"
+msgstr "Postare Diaspora"
+
+#: mailstream.php:183
+msgid "Feed item"
+msgstr "Element de flux"
+
+#: mailstream.php:186
+msgid "Email"
+msgstr "Email"
+
+#: mailstream.php:188
+msgid "Friendica Item"
+msgstr "Element Friendica"
+
+#: mailstream.php:229
+msgid "Upstream"
+msgstr "Fluxare inversă"
+
+#: mailstream.php:230
+msgid "Local"
+msgstr "Local"
+
+#: mailstream.php:274
+msgid "Email Address"
+msgstr "Adresă de Email"
+
+#: mailstream.php:276
+msgid "Leave blank to use your account email address"
+msgstr "Lăsați necompletat pentru a utiliza adresa de e-mail a contul dvs ."
+
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Activat"
+
+#: mailstream.php:281
+msgid "Mail Stream Settings"
+msgstr "Configurări Flux Mail"
diff --git a/mailstream/lang/ro/strings.php b/mailstream/lang/ro/strings.php
new file mode 100644
index 00000000..6a02d65f
--- /dev/null
+++ b/mailstream/lang/ro/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["From Address"] = "Adresa sursă";
+$a->strings["Email address that stream items will appear to be from."] = "Adresa de e-mail folosită ca și sursă pentru elemente fluxate.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Postare Friendica ";
+$a->strings["Diaspora post"] = "Postare Diaspora";
+$a->strings["Feed item"] = "Element de flux";
+$a->strings["Email"] = "Email";
+$a->strings["Friendica Item"] = "Element Friendica";
+$a->strings["Upstream"] = "Fluxare inversă";
+$a->strings["Local"] = "Local";
+$a->strings["Email Address"] = "Adresă de Email";
+$a->strings["Leave blank to use your account email address"] = "Lăsați necompletat pentru a utiliza adresa de e-mail a contul dvs .";
+$a->strings["Enabled"] = "Activat";
+$a->strings["Mail Stream Settings"] = "Configurări Flux Mail";
diff --git a/mathjax/lang/cs/messages.po b/mathjax/lang/cs/messages.po
new file mode 100644
index 00000000..921e4669
--- /dev/null
+++ b/mathjax/lang/cs/messages.po
@@ -0,0 +1,53 @@
+# ADDON mathjax
+# Copyright (C)
+# This file is distributed under the same license as the Friendica mathjax addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:18+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: mathjax.php:36 mathjax.php:40
+msgid "Settings"
+msgstr "Nastavení"
+
+#: mathjax.php:42
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách."
+
+#: mathjax.php:43
+msgid "Use the MathJax renderer"
+msgstr "Použít Mathjax vykreslování"
+
+#: mathjax.php:47 mathjax.php:80
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: mathjax.php:71
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: mathjax.php:81
+msgid "MathJax Base URL"
+msgstr "Základní MathJax adresa URL"
+
+#: mathjax.php:81
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax."
diff --git a/mathjax/lang/cs/strings.php b/mathjax/lang/cs/strings.php
index bdb83c4f..af9d887c 100644
--- a/mathjax/lang/cs/strings.php
+++ b/mathjax/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Settings"] = "Nastavení";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na Vaší zdi, záložce síť a soukromých zprávách.";
-$a->strings["Use the MathJax renderer"] = "Použít Mathjax vykreslování";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
-$a->strings["MathJax Base URL"] = "Základní MathJax adresa URL";
-$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Settings"] = "Nastavení";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách.";
+$a->strings["Use the MathJax renderer"] = "Použít Mathjax vykreslování";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["MathJax Base URL"] = "Základní MathJax adresa URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax.";
diff --git a/mathjax/lang/de/messages.po b/mathjax/lang/de/messages.po
new file mode 100644
index 00000000..d6fa621f
--- /dev/null
+++ b/mathjax/lang/de/messages.po
@@ -0,0 +1,53 @@
+# ADDON mathjax
+# Copyright (C)
+# This file is distributed under the same license as the Friendica mathjax addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: mathjax.php:36 mathjax.php:40
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: mathjax.php:42
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert."
+
+#: mathjax.php:43
+msgid "Use the MathJax renderer"
+msgstr "MathJax verwenden"
+
+#: mathjax.php:47 mathjax.php:80
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: mathjax.php:71
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: mathjax.php:81
+msgid "MathJax Base URL"
+msgstr "MathJax Basis-URL"
+
+#: mathjax.php:81
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."
diff --git a/mathjax/lang/de/strings.php b/mathjax/lang/de/strings.php
index 42a09f1a..dfebe53d 100644
--- a/mathjax/lang/de/strings.php
+++ b/mathjax/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["Settings"] = "Einstellungen";
-$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
-$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
-$a->strings["Submit"] = "Senden";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
-$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
+$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
diff --git a/mathjax/lang/ro/messages.po b/mathjax/lang/ro/messages.po
new file mode 100644
index 00000000..b017f966
--- /dev/null
+++ b/mathjax/lang/ro/messages.po
@@ -0,0 +1,52 @@
+# ADDON mathjax
+# Copyright (C)
+# This file is distributed under the same license as the Friendica mathjax addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:58+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: mathjax.php:36 mathjax.php:40
+msgid "Settings"
+msgstr "Configurări"
+
+#: mathjax.php:42
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr "Suplimentul MathJax procesează formule matematice scrise folosind sintaxa LaTeX încapsulată de obicei prin semnul $$ sau într-un bloc eqnarray, în postările de perete, fila de rețea și şi poșta privată."
+
+#: mathjax.php:43
+msgid "Use the MathJax renderer"
+msgstr "Utilizare funcția renderer MathJax"
+
+#: mathjax.php:47 mathjax.php:80
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: mathjax.php:71
+msgid "Settings updated."
+msgstr "Configurări actualizate."
+
+#: mathjax.php:81
+msgid "MathJax Base URL"
+msgstr "Adresa URL de Bază MathJax"
+
+#: mathjax.php:81
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Adresa URL pentru fișierul de javascript care ar trebui să fie inclus pentru a putea utiliza MathJax. Pot fi, fie CDN MathJax sau o altă instalare de MathJax."
diff --git a/mathjax/lang/ro/strings.php b/mathjax/lang/ro/strings.php
new file mode 100644
index 00000000..6c45a01d
--- /dev/null
+++ b/mathjax/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Settings"] = "Configurări";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Suplimentul MathJax procesează formule matematice scrise folosind sintaxa LaTeX încapsulată de obicei prin semnul $$ sau într-un bloc eqnarray, în postările de perete, fila de rețea și şi poșta privată.";
+$a->strings["Use the MathJax renderer"] = "Utilizare funcția renderer MathJax";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["MathJax Base URL"] = "Adresa URL de Bază MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Adresa URL pentru fișierul de javascript care ar trebui să fie inclus pentru a putea utiliza MathJax. Pot fi, fie CDN MathJax sau o altă instalare de MathJax.";
diff --git a/morechoice/lang/C/messages.po b/morechoice/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/morepokes/lang/cs/messages.po b/morepokes/lang/cs/messages.po
new file mode 100644
index 00000000..d5148941
--- /dev/null
+++ b/morepokes/lang/cs/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:21+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "dát facku"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "dostat facku"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr ""
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr ""
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "udělat něco obscéně biologického uživateli"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "udělal něco obscéně biologického uživateli"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "upozornit na poke funkci uživatele"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "upozorněn na poke funkci "
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "vyjadřit nehynoucí lásku ke"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "vyjadřil nehynoucí lásku ke"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "patentovat"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "patentován"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "pohladit plnovous"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "pohladit něčí plnovous"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "stěžující si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "stěžovat si na klesající úroveň moderního sekundárního a terciárního vzdělávání u"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "obejmout"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "obejmut "
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "políbit"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "políben"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "zvednout obočí na"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "zvednul obočí na"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "urazit"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "uražen"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "pochválit"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "pochválen"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "mít pochyby o"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "má pochybnosti z"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "sníst"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "snězen"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "hihňat se"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "hihňá se"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "pochybovat"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "pochybující"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "zabodáván pohledem"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "zabodávat pohledem "
diff --git a/morepokes/lang/cs/strings.php b/morepokes/lang/cs/strings.php
index 0f459ab1..217c52bb 100644
--- a/morepokes/lang/cs/strings.php
+++ b/morepokes/lang/cs/strings.php
@@ -1,38 +1,43 @@
-<?php
-
-$a->strings["bitchslap"] = "";
-$a->strings["bitchslapped"] = "";
-$a->strings["shag"] = "";
-$a->strings["shagged"] = "";
-$a->strings["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli";
-$a->strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli";
-$a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele";
-$a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci ";
-$a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke";
-$a->strings["declared undying love for"] = "vyjadřil nehynoucí lásku ke";
-$a->strings["patent"] = "patentovat";
-$a->strings["patented"] = "patentován";
-$a->strings["stroke beard"] = "pohladit plnovous";
-$a->strings["stroked their beard at"] = "pohladit něčí plnovous";
-$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "stěžující si na klesající úroveň moderního sekundárního a terciárního vzdělávání u";
-$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "stěžovat si na klesající úroveň moderního sekundárního a terciárního vzdělávání u";
-$a->strings["hug"] = "obejmout";
-$a->strings["hugged"] = "obejmut ";
-$a->strings["kiss"] = "políbit";
-$a->strings["kissed"] = "políben";
-$a->strings["raise eyebrows at"] = "zvednout obočí na";
-$a->strings["raised their eyebrows at"] = "zvednul obočí na";
-$a->strings["insult"] = "urazit";
-$a->strings["insulted"] = "uražen";
-$a->strings["praise"] = "pochválit";
-$a->strings["praised"] = "pochválen";
-$a->strings["be dubious of"] = "mít pochyby o";
-$a->strings["was dubious of"] = "má pochybnosti z";
-$a->strings["eat"] = "sníst";
-$a->strings["ate"] = "snězen";
-$a->strings["giggle and fawn at"] = "hihňat se";
-$a->strings["giggled and fawned at"] = "hihňá se";
-$a->strings["doubt"] = "pochybovat";
-$a->strings["doubted"] = "pochybující";
-$a->strings["glare"] = "zabodáván pohledem";
-$a->strings["glared at"] = "zabodávat pohledem ";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["bitchslap"] = "dát facku";
+$a->strings["bitchslapped"] = "dostat facku";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli";
+$a->strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli";
+$a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele";
+$a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci ";
+$a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke";
+$a->strings["declared undying love for"] = "vyjadřil nehynoucí lásku ke";
+$a->strings["patent"] = "patentovat";
+$a->strings["patented"] = "patentován";
+$a->strings["stroke beard"] = "pohladit plnovous";
+$a->strings["stroked their beard at"] = "pohladit něčí plnovous";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "stěžující si na klesající úroveň moderního sekundárního a terciárního vzdělávání u";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "stěžovat si na klesající úroveň moderního sekundárního a terciárního vzdělávání u";
+$a->strings["hug"] = "obejmout";
+$a->strings["hugged"] = "obejmut ";
+$a->strings["kiss"] = "políbit";
+$a->strings["kissed"] = "políben";
+$a->strings["raise eyebrows at"] = "zvednout obočí na";
+$a->strings["raised their eyebrows at"] = "zvednul obočí na";
+$a->strings["insult"] = "urazit";
+$a->strings["insulted"] = "uražen";
+$a->strings["praise"] = "pochválit";
+$a->strings["praised"] = "pochválen";
+$a->strings["be dubious of"] = "mít pochyby o";
+$a->strings["was dubious of"] = "má pochybnosti z";
+$a->strings["eat"] = "sníst";
+$a->strings["ate"] = "snězen";
+$a->strings["giggle and fawn at"] = "hihňat se";
+$a->strings["giggled and fawned at"] = "hihňá se";
+$a->strings["doubt"] = "pochybovat";
+$a->strings["doubted"] = "pochybující";
+$a->strings["glare"] = "zabodáván pohledem";
+$a->strings["glared at"] = "zabodávat pohledem ";
diff --git a/morepokes/lang/ro/messages.po b/morepokes/lang/ro/messages.po
new file mode 100644
index 00000000..700f5ed4
--- /dev/null
+++ b/morepokes/lang/ro/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Arian - Cazare Muncitori <arianserv@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-08-15 08:16+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "palmuire-javră"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "javră-pălmuită"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "pune-o"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "a pus-o"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "fă-i ceva biologic obscen lui"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "i s-a făcut ceva biologic obscen lui"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "arată caracteristica de abordare lui"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "caracteristică de abordare arătată lui"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "declară dragoste veșnică pentru"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "dragoste veșnică declarată lui"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "brevet"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "brevetat"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "lovire în barbă"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "loviți în barbă la"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "îmbrățișare"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "îmbrățișat(ă)"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "sărut"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "sărutat(ă)"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "ridică sprâncenele către"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "a ridicat sprâncenele către"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "insultă"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "insultat(ă)"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "laudă"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "lăudat(ă)"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "arată-ți sceptitudinea față de"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "a fost catalogat(ă) ca ciudat(ă) de către"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "devorează"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "devorat(ă)"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "chicotește și lingușește-l pe"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "a fost chicotit(ă) și lingușit(ă) de către"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "îndoială"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "nu a prezentat încredere"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "fixează cu privirea"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "luat(ă) în colimator"
diff --git a/morepokes/lang/ro/strings.php b/morepokes/lang/ro/strings.php
new file mode 100644
index 00000000..3af70529
--- /dev/null
+++ b/morepokes/lang/ro/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["bitchslap"] = "palmuire-javră";
+$a->strings["bitchslapped"] = "javră-pălmuită";
+$a->strings["shag"] = "pune-o";
+$a->strings["shagged"] = "a pus-o";
+$a->strings["do something obscenely biological to"] = "fă-i ceva biologic obscen lui";
+$a->strings["did something obscenely biological to"] = "i s-a făcut ceva biologic obscen lui";
+$a->strings["point out the poke feature to"] = "arată caracteristica de abordare lui";
+$a->strings["pointed out the poke feature to"] = "caracteristică de abordare arătată lui";
+$a->strings["declare undying love for"] = "declară dragoste veșnică pentru";
+$a->strings["declared undying love for"] = "dragoste veșnică declarată lui";
+$a->strings["patent"] = "brevet";
+$a->strings["patented"] = "brevetat";
+$a->strings["stroke beard"] = "lovire în barbă";
+$a->strings["stroked their beard at"] = "loviți în barbă la";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru";
+$a->strings["hug"] = "îmbrățișare";
+$a->strings["hugged"] = "îmbrățișat(ă)";
+$a->strings["kiss"] = "sărut";
+$a->strings["kissed"] = "sărutat(ă)";
+$a->strings["raise eyebrows at"] = "ridică sprâncenele către";
+$a->strings["raised their eyebrows at"] = "a ridicat sprâncenele către";
+$a->strings["insult"] = "insultă";
+$a->strings["insulted"] = "insultat(ă)";
+$a->strings["praise"] = "laudă";
+$a->strings["praised"] = "lăudat(ă)";
+$a->strings["be dubious of"] = "arată-ți sceptitudinea față de";
+$a->strings["was dubious of"] = "a fost catalogat(ă) ca ciudat(ă) de către";
+$a->strings["eat"] = "devorează";
+$a->strings["ate"] = "devorat(ă)";
+$a->strings["giggle and fawn at"] = "chicotește și lingușește-l pe";
+$a->strings["giggled and fawned at"] = "a fost chicotit(ă) și lingușit(ă) de către";
+$a->strings["doubt"] = "îndoială";
+$a->strings["doubted"] = "nu a prezentat încredere";
+$a->strings["glare"] = "fixează cu privirea";
+$a->strings["glared at"] = "luat(ă) în colimator";
diff --git a/namethingy/lang/C/messages.po b/namethingy/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/newmemberwidget/lang/cs/messages.po b/newmemberwidget/lang/cs/messages.po
new file mode 100644
index 00000000..ae285ea0
--- /dev/null
+++ b/newmemberwidget/lang/cs/messages.po
@@ -0,0 +1,76 @@
+# ADDON newmemberwidget
+# Copyright (C)
+# This file is distributed under the same license as the Friendica newmemberwidget addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:25+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: newmemberwidget.php:23
+msgid "New Member"
+msgstr "Nový člen"
+
+#: newmemberwidget.php:24
+msgid "Tips for New Members"
+msgstr "Tipy pro nové členy"
+
+#: newmemberwidget.php:26
+msgid "Global Support Forum"
+msgstr "Globální fórum podpory"
+
+#: newmemberwidget.php:28
+msgid "Local Support Forum"
+msgstr "Lokální fórum podpory"
+
+#: newmemberwidget.php:51
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: newmemberwidget.php:52
+msgid "Message"
+msgstr "Zpráva"
+
+#: newmemberwidget.php:52
+msgid "Your message for new members. You can use bbcode here."
+msgstr "Vaše zpráva pro nové členy. Zde můžete použít BBCode."
+
+#: newmemberwidget.php:53
+msgid "Add a link to global support forum"
+msgstr "Přidejte odkaz na globální fórum podpory"
+
+#: newmemberwidget.php:53
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Má být odkaz na globální fórum podpory zobrazen?"
+
+#: newmemberwidget.php:54
+msgid "Add a link to the local support forum"
+msgstr "Přidejte odkaz na lokální fórum podpory"
+
+#: newmemberwidget.php:54
+msgid ""
+"If you have a local support forum and wand to have a link displayed in the "
+"widget, check this box."
+msgstr "Pokud máte lokální fórum podpory a chcete mít zobrazen jeho odkaz, zvolte tuto volbu."
+
+#: newmemberwidget.php:55
+msgid "Name of the local support group"
+msgstr "Název lokálního fóra podpory"
+
+#: newmemberwidget.php:55
+msgid ""
+"If you checked the above, specify the <em>nickname</em> of the local support"
+" group here (i.e. helpers)"
+msgstr "Pokud jste výše uvedené zaškrtli, specifikujte zde <em>přezdívku</em> lokální podpůrné skupiny (např. pomahači)"
diff --git a/newmemberwidget/lang/cs/strings.php b/newmemberwidget/lang/cs/strings.php
new file mode 100644
index 00000000..30fed02c
--- /dev/null
+++ b/newmemberwidget/lang/cs/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["New Member"] = "Nový člen";
+$a->strings["Tips for New Members"] = "Tipy pro nové členy";
+$a->strings["Global Support Forum"] = "Globální fórum podpory";
+$a->strings["Local Support Forum"] = "Lokální fórum podpory";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Message"] = "Zpráva";
+$a->strings["Your message for new members. You can use bbcode here."] = "Vaše zpráva pro nové členy. Zde můžete použít BBCode.";
+$a->strings["Add a link to global support forum"] = "Přidejte odkaz na globální fórum podpory";
+$a->strings["Should a link to the global support forum be displayed?"] = "Má být odkaz na globální fórum podpory zobrazen?";
+$a->strings["Add a link to the local support forum"] = "Přidejte odkaz na lokální fórum podpory";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Pokud máte lokální fórum podpory a chcete mít zobrazen jeho odkaz, zvolte tuto volbu.";
+$a->strings["Name of the local support group"] = "Název lokálního fóra podpory";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Pokud jste výše uvedené zaškrtli, specifikujte zde <em>přezdívku</em> lokální podpůrné skupiny (např. pomahači)";
diff --git a/newmemberwidget/lang/de/messages.po b/newmemberwidget/lang/de/messages.po
index 1181bb08..006fd4ee 100644
--- a/newmemberwidget/lang/de/messages.po
+++ b/newmemberwidget/lang/de/messages.po
@@ -1,74 +1,75 @@
 # ADDON newmemberwidget
-# Copyright (C) 
+# Copyright (C)
 # This file is distributed under the same license as the Friendica newmemberwidget addon package.
 # 
-#
-#, fuzzy
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-01 12:06+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-23 10:27+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:21
+#: newmemberwidget.php:23
 msgid "New Member"
 msgstr "Neue Nutzer"
 
-#: newmemberwidget.php:22
+#: newmemberwidget.php:24
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
-#: newmemberwidget.php:24
+#: newmemberwidget.php:26
 msgid "Global Support Forum"
 msgstr "Globales Forum für Hilfsanfragen"
 
-#: newmemberwidget.php:26
+#: newmemberwidget.php:28
 msgid "Local Support Forum"
 msgstr "Lokales Forum für Hilfsanfragen"
 
-#: newmemberwidget.php:47
+#: newmemberwidget.php:51
 msgid "Save Settings"
 msgstr "Einstellungen Speichern"
 
-#: newmemberwidget.php:48
+#: newmemberwidget.php:52
 msgid "Message"
 msgstr "Nachricht"
 
-#: newmemberwidget.php:48
+#: newmemberwidget.php:52
 msgid "Your message for new members. You can use bbcode here."
 msgstr "Deine Nachricht für neue Nutzer. BBCode kann verwendet werden."
 
-#: newmemberwidget.php:49
+#: newmemberwidget.php:53
 msgid "Add a link to global support forum"
 msgstr "Link zum globalen Support Forum anzeigen"
 
-#: newmemberwidget.php:49
+#: newmemberwidget.php:53
 msgid "Should a link to the global support forum be displayed?"
 msgstr "Soll ein Link zum globalen Support Forum angezeigt werden?"
 
-#: newmemberwidget.php:50
+#: newmemberwidget.php:54
 msgid "Add a link to the local support forum"
 msgstr "Link zum lokalen Support Forum anzeigen"
 
-#: newmemberwidget.php:50
+#: newmemberwidget.php:54
 msgid ""
 "If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
 msgstr "Wenn du ein lokales Support Forum eingerichtet hast und Link darauf angezeigt werden soll, hier klicken"
 
-#: newmemberwidget.php:51
+#: newmemberwidget.php:55
 msgid "Name of the local support group"
 msgstr "Name des lokalen Support Forums"
 
-#: newmemberwidget.php:51
+#: newmemberwidget.php:55
 msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support "
-"group here (i.e. helpers)"
+"If you checked the above, specify the <em>nickname</em> of the local support"
+" group here (i.e. helpers)"
 msgstr "Wenn der Link angezeigt werden soll, dann trage hier den <em>Spitznamen</em> des Forums ein (z.B. helpers)"
diff --git a/newmemberwidget/lang/de/strings.php b/newmemberwidget/lang/de/strings.php
index 60d21bd7..77f5ad62 100644
--- a/newmemberwidget/lang/de/strings.php
+++ b/newmemberwidget/lang/de/strings.php
@@ -1,5 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
 ;
 $a->strings["New Member"] = "Neue Nutzer";
 $a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
diff --git a/newmemberwidget/lang/ro/messages.po b/newmemberwidget/lang/ro/messages.po
new file mode 100644
index 00000000..e36be7a0
--- /dev/null
+++ b/newmemberwidget/lang/ro/messages.po
@@ -0,0 +1,75 @@
+# ADDON newmemberwidget
+# Copyright (C)
+# This file is distributed under the same license as the Friendica newmemberwidget addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:59+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: newmemberwidget.php:23
+msgid "New Member"
+msgstr "Membru Nou"
+
+#: newmemberwidget.php:24
+msgid "Tips for New Members"
+msgstr "Sfaturi pentru Membrii Noi"
+
+#: newmemberwidget.php:26
+msgid "Global Support Forum"
+msgstr "Forum Global Asistentă"
+
+#: newmemberwidget.php:28
+msgid "Local Support Forum"
+msgstr "Forum Local Asistență"
+
+#: newmemberwidget.php:51
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: newmemberwidget.php:52
+msgid "Message"
+msgstr "Mesaj"
+
+#: newmemberwidget.php:52
+msgid "Your message for new members. You can use bbcode here."
+msgstr "Mesajul dumneavoastră pentru noii membri. Puteți folosi aici codul BB."
+
+#: newmemberwidget.php:53
+msgid "Add a link to global support forum"
+msgstr "Adăugați o legătură către forumul global de asistentă"
+
+#: newmemberwidget.php:53
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Ar trebui afișată o legătură către forumul global de asistență?"
+
+#: newmemberwidget.php:54
+msgid "Add a link to the local support forum"
+msgstr "Adăugați o legătură către forumul local de asistență"
+
+#: newmemberwidget.php:54
+msgid ""
+"If you have a local support forum and wand to have a link displayed in the "
+"widget, check this box."
+msgstr "Dacă dețineți un forum local de asistentă şi doriți să aveți o legătură afișată în mini-aplicația widget, bifați această casetă."
+
+#: newmemberwidget.php:55
+msgid "Name of the local support group"
+msgstr "Numele grupului local de asistență"
+
+#: newmemberwidget.php:55
+msgid ""
+"If you checked the above, specify the <em>nickname</em> of the local support"
+" group here (i.e. helpers)"
+msgstr "Dacă ați bifat mai sus, specificați aici <em>pseudonimul</em> grupului local de asistență (adică operatorii de asistență)"
diff --git a/newmemberwidget/lang/ro/strings.php b/newmemberwidget/lang/ro/strings.php
new file mode 100644
index 00000000..0a00d1a6
--- /dev/null
+++ b/newmemberwidget/lang/ro/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["New Member"] = "Membru Nou";
+$a->strings["Tips for New Members"] = "Sfaturi pentru Membrii Noi";
+$a->strings["Global Support Forum"] = "Forum Global Asistentă";
+$a->strings["Local Support Forum"] = "Forum Local Asistență";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Message"] = "Mesaj";
+$a->strings["Your message for new members. You can use bbcode here."] = "Mesajul dumneavoastră pentru noii membri. Puteți folosi aici codul BB.";
+$a->strings["Add a link to global support forum"] = "Adăugați o legătură către forumul global de asistentă";
+$a->strings["Should a link to the global support forum be displayed?"] = "Ar trebui afișată o legătură către forumul global de asistență?";
+$a->strings["Add a link to the local support forum"] = "Adăugați o legătură către forumul local de asistență";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Dacă dețineți un forum local de asistentă şi doriți să aveți o legătură afișată în mini-aplicația widget, bifați această casetă.";
+$a->strings["Name of the local support group"] = "Numele grupului local de asistență";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Dacă ați bifat mai sus, specificați aici <em>pseudonimul</em> grupului local de asistență (adică operatorii de asistență)";
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 437b47b1..59e102af 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -51,7 +51,7 @@ function newmemberwidget_plugin_admin(&$a, &$o){
 	'$submit' => t('Save Settings'),
 	'$freetext' => array( "freetext", t("Message"), get_config( "newmemberwidget", "freetext" ), t("Your message for new members. You can use bbcode here.")),
 	'$linkglobalsupport' => array( "linkglobalsupport", t('Add a link to global support forum'), get_config( 'newmemberwidget', 'linkglobalsupport'), t('Should a link to the global support forum be displayed?')." (<a href='https://helpers.pyxis.uberspace.de/profile/helpers'>@helpers</a>)"),
-	'$linklocalsupport' => array( "linklocalsupport", t('Add a link to the local support forum'), get_config( 'newmemberwidget', 'linklocalsupport'), t('If you have a local support forum and want to have a link displayed in the widget, check this box.')),
+	'$linklocalsupport' => array( "linklocalsupport", t('Add a link to the local support forum'), get_config( 'newmemberwidget', 'linklocalsupport'), t('If you have a local support forum and wand to have a link displayed in the widget, check this box.')),
 	'$localsupportname' => array( "localsupportname", t('Name of the local support group'), get_config( 'newmemberwidget', 'localsupport'), t('If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)')),
     ));
 }
diff --git a/notimeline/lang/cs/messages.po b/notimeline/lang/cs/messages.po
new file mode 100644
index 00000000..d998550f
--- /dev/null
+++ b/notimeline/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:26+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Nastavení No Timeline aktualizováno."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Nastavení No Timeline"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Znemožnit použití archivu na této profilové zdi."
+
+#: notimeline.php:64
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/notimeline/lang/cs/strings.php b/notimeline/lang/cs/strings.php
index 9dd0c6c9..9fa1344b 100644
--- a/notimeline/lang/cs/strings.php
+++ b/notimeline/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["No Timeline settings updated."] = "Nastavení No Timeline aktualizováno.";
-$a->strings["No Timeline Settings"] = "Nastavení No Timeline";
-$a->strings["Disable Archive selector on profile wall"] = "Znemožnit použití archivu na této profilové zdi.";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Nastavení No Timeline aktualizováno.";
+$a->strings["No Timeline Settings"] = "Nastavení No Timeline";
+$a->strings["Disable Archive selector on profile wall"] = "Znemožnit použití archivu na této profilové zdi.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/notimeline/lang/ro/messages.po b/notimeline/lang/ro/messages.po
new file mode 100644
index 00000000..bb871707
--- /dev/null
+++ b/notimeline/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:59+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Configurările pentru Lipsă Cronologie, au fost actualizate."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Configurări pentru Lipsă Cronologie"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Dezactivare selector Arhivă din peretele de profil"
+
+#: notimeline.php:64
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/notimeline/lang/ro/strings.php b/notimeline/lang/ro/strings.php
new file mode 100644
index 00000000..7ebfb958
--- /dev/null
+++ b/notimeline/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Configurările pentru Lipsă Cronologie, au fost actualizate.";
+$a->strings["No Timeline Settings"] = "Configurări pentru Lipsă Cronologie";
+$a->strings["Disable Archive selector on profile wall"] = "Dezactivare selector Arhivă din peretele de profil";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/nsfw/lang/cs/messages.po b/nsfw/lang/cs/messages.po
new file mode 100644
index 00000000..8f5846e5
--- /dev/null
+++ b/nsfw/lang/cs/messages.po
@@ -0,0 +1,59 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:26+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: nsfw.php:78 nsfw.php:82
+msgid "Not Safe For Work (General Purpose Content Filter)"
+msgstr "Not Safe For Work (General Purpose Content Filter)"
+
+#: nsfw.php:86
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW.  Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr."
+
+#: nsfw.php:87
+msgid "Enable Content filter"
+msgstr "Povolit Kontextový filtr"
+
+#: nsfw.php:90
+msgid "Comma separated list of keywords to hide"
+msgstr "Čárkou oddělený seznam klíčových slov ke skrytí"
+
+#: nsfw.php:94
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: nsfw.php:95
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Použít /výraz/ pro použití regulárních výrazů"
+
+#: nsfw.php:111
+msgid "NSFW Settings saved."
+msgstr "NSFW nastavení uloženo"
+
+#: nsfw.php:166
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Klikněte pro otevření/zavření"
diff --git a/nsfw/lang/cs/strings.php b/nsfw/lang/cs/strings.php
index 8f32b9c3..e9c4b0b8 100644
--- a/nsfw/lang/cs/strings.php
+++ b/nsfw/lang/cs/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe For Work (General Purpose Content Filter) nastavení";
-$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW.  Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr.";
-$a->strings["Enable Content filter"] = "Povolit Kontextový filtr";
-$a->strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Use /expression/ to provide regular expressions"] = "Použít /výraz/ pro použití regulárních výrazů";
-$a->strings["NSFW Settings saved."] = "NSFW nastavení uloženo";
-$a->strings["%s - Click to open/close"] = "%s - Klikněte pro otevření/zavření";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter)"] = "Not Safe For Work (General Purpose Content Filter)";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Tento plugin hledá v příspěvcích slova zadáná níže a skryje jakýkoliv obsah, který tyto slova obsahuje v prostředích, kde to není vhodné. Je slušné a doporučené jakékoliv příspěvky s mahotou označit s #NSFW.  Tento filtr může také vyhledávat jakékoliv Vámi specifikované slovní spojení, takže může být využit jako obecný kontextový filtr.";
+$a->strings["Enable Content filter"] = "Povolit Kontextový filtr";
+$a->strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Use /expression/ to provide regular expressions"] = "Použít /výraz/ pro použití regulárních výrazů";
+$a->strings["NSFW Settings saved."] = "NSFW nastavení uloženo";
+$a->strings["%s - Click to open/close"] = "%s - Klikněte pro otevření/zavření";
diff --git a/nsfw/lang/de/messages.po b/nsfw/lang/de/messages.po
new file mode 100644
index 00000000..8860cd7c
--- /dev/null
+++ b/nsfw/lang/de/messages.po
@@ -0,0 +1,59 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:17+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: nsfw.php:78 nsfw.php:82
+msgid "Not Safe For Work (General Purpose Content Filter)"
+msgstr "Not Safe for Work (alg. Filter für ungewollte Inhalte) Einstellungen:"
+
+#: nsfw.php:86
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."
+
+#: nsfw.php:87
+msgid "Enable Content filter"
+msgstr "Aktiviere den Inhaltsfilter"
+
+#: nsfw.php:90
+msgid "Comma separated list of keywords to hide"
+msgstr "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen"
+
+#: nsfw.php:94
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: nsfw.php:95
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"
+
+#: nsfw.php:111
+msgid "NSFW Settings saved."
+msgstr "NSFW-Einstellungen gespeichert"
+
+#: nsfw.php:166
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s – Zum Öffnen/Schließen klicken"
diff --git a/nsfw/lang/de/strings.php b/nsfw/lang/de/strings.php
index 9bc36366..4bd5bdd2 100644
--- a/nsfw/lang/de/strings.php
+++ b/nsfw/lang/de/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:";
-$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
-$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
-$a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
-$a->strings["Submit"] = "Senden";
-$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden";
-$a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
-$a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter)"] = "Not Safe for Work (alg. Filter für ungewollte Inhalte) Einstellungen:";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden.";
+$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
+$a->strings["Comma separated list of keywords to hide"] = "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden";
+$a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
+$a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
diff --git a/nsfw/lang/ro/messages.po b/nsfw/lang/ro/messages.po
new file mode 100644
index 00000000..77aa835a
--- /dev/null
+++ b/nsfw/lang/ro/messages.po
@@ -0,0 +1,58 @@
+# ADDON nsfw
+# Copyright (C)
+# This file is distributed under the same license as the Friendica nsfw addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:00+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: nsfw.php:78 nsfw.php:82
+msgid "Not Safe For Work (General Purpose Content Filter)"
+msgstr "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )"
+
+#: nsfw.php:86
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general."
+
+#: nsfw.php:87
+msgid "Enable Content filter"
+msgstr "Activare filtru de Conținut"
+
+#: nsfw.php:90
+msgid "Comma separated list of keywords to hide"
+msgstr "Lista cu separator prin virgulă a cuvintelor cheie, ce vor declanșa ascunderea"
+
+#: nsfw.php:94
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: nsfw.php:95
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Utilizați /expresia/ pentru a oferi expresii regulate"
+
+#: nsfw.php:111
+msgid "NSFW Settings saved."
+msgstr "Configurările NSFW au fost salvate."
+
+#: nsfw.php:166
+#, php-format
+msgid "%s - Click to open/close"
+msgstr "%s - Apăsați pentru a deschide/închide"
diff --git a/nsfw/lang/ro/strings.php b/nsfw/lang/ro/strings.php
new file mode 100644
index 00000000..b1fa31d8
--- /dev/null
+++ b/nsfw/lang/ro/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter)"] = "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )";
+$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general.";
+$a->strings["Enable Content filter"] = "Activare filtru de Conținut";
+$a->strings["Comma separated list of keywords to hide"] = "Lista cu separator prin virgulă a cuvintelor cheie, ce vor declanșa ascunderea";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utilizați /expresia/ pentru a oferi expresii regulate";
+$a->strings["NSFW Settings saved."] = "Configurările NSFW au fost salvate.";
+$a->strings["%s - Click to open/close"] = "%s - Apăsați pentru a deschide/închide";
diff --git a/numfriends/lang/cs/messages.po b/numfriends/lang/cs/messages.po
new file mode 100644
index 00000000..29955cb2
--- /dev/null
+++ b/numfriends/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON numfriends
+# Copyright (C)
+# This file is distributed under the same license as the Friendica numfriends addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:27+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Numfriends nastavení aktualizováno"
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Nastavení Numfriends"
+
+#: numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Kolik kontaktů zobrazit na profilovém bočním menu"
+
+#: numfriends.php:85
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/numfriends/lang/cs/strings.php b/numfriends/lang/cs/strings.php
index a9f484bc..36e0ef6d 100644
--- a/numfriends/lang/cs/strings.php
+++ b/numfriends/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno";
-$a->strings["Numfriends Settings"] = "Nastavení Numfriends";
-$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno";
+$a->strings["Numfriends Settings"] = "Nastavení Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/numfriends/lang/de/messages.po b/numfriends/lang/de/messages.po
new file mode 100644
index 00000000..92879c06
--- /dev/null
+++ b/numfriends/lang/de/messages.po
@@ -0,0 +1,36 @@
+# ADDON numfriends
+# Copyright (C)
+# This file is distributed under the same license as the Friendica numfriends addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:28+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Numfriends Einstellungen aktualisiert"
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Numfriends Einstellungen"
+
+#: numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"
+
+#: numfriends.php:85
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/numfriends/lang/de/strings.php b/numfriends/lang/de/strings.php
index 56355e61..cff51623 100644
--- a/numfriends/lang/de/strings.php
+++ b/numfriends/lang/de/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
-$a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
-$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
+$a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
+$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/numfriends/lang/ro/messages.po b/numfriends/lang/ro/messages.po
new file mode 100644
index 00000000..344a75b0
--- /dev/null
+++ b/numfriends/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON numfriends
+# Copyright (C)
+# This file is distributed under the same license as the Friendica numfriends addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:00+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Configurările NumFriends au fost actualizate."
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Configurări NumFriends"
+
+#: numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Câte contacte se afișează în bara laterală a profilului "
+
+#: numfriends.php:85
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/numfriends/lang/ro/strings.php b/numfriends/lang/ro/strings.php
new file mode 100644
index 00000000..98c2e696
--- /dev/null
+++ b/numfriends/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Numfriends settings updated."] = "Configurările NumFriends au fost actualizate.";
+$a->strings["Numfriends Settings"] = "Configurări NumFriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Câte contacte se afișează în bara laterală a profilului ";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/openstreetmap/lang/cs/messages.po b/openstreetmap/lang/cs/messages.po
new file mode 100644
index 00000000..8bfb4fe3
--- /dev/null
+++ b/openstreetmap/lang/cs/messages.po
@@ -0,0 +1,50 @@
+# ADDON openstreetmap
+# Copyright (C)
+# This file is distributed under the same license as the Friendica openstreetmap addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:27+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: openstreetmap.php:70
+msgid "Map"
+msgstr "Mapa"
+
+#: openstreetmap.php:94
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: openstreetmap.php:95
+msgid "Tile Server URL"
+msgstr "URL adresa Tile serveru"
+
+#: openstreetmap.php:95
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Seznam <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">veřejných tile serverů</a>"
+
+#: openstreetmap.php:96
+msgid "Default zoom"
+msgstr "Defaultní lupa"
+
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Defaultní nastavení lupy (1:svět, 18:nejvyšší)"
+
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/openstreetmap/lang/cs/strings.php b/openstreetmap/lang/cs/strings.php
index 3db39101..c66498e4 100644
--- a/openstreetmap/lang/cs/strings.php
+++ b/openstreetmap/lang/cs/strings.php
@@ -1,8 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Tile Server URL"] = "URL adresa Tile serveru";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Seznam <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">veřejných tile serverů</a>";
-$a->strings["Default zoom"] = "Defaultní přiblížení";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Map"] = "Mapa";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Tile Server URL"] = "URL adresa Tile serveru";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Seznam <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">veřejných tile serverů</a>";
+$a->strings["Default zoom"] = "Defaultní lupa";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní nastavení lupy (1:svět, 18:nejvyšší)";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/openstreetmap/lang/de/messages.po b/openstreetmap/lang/de/messages.po
new file mode 100644
index 00000000..a00311a1
--- /dev/null
+++ b/openstreetmap/lang/de/messages.po
@@ -0,0 +1,50 @@
+# ADDON openstreetmap
+# Copyright (C)
+# This file is distributed under the same license as the Friendica openstreetmap addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-11 06:30+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: openstreetmap.php:70
+msgid "Map"
+msgstr "Karte"
+
+#: openstreetmap.php:94
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: openstreetmap.php:95
+msgid "Tile Server URL"
+msgstr "Die URL des Servers"
+
+#: openstreetmap.php:95
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>"
+
+#: openstreetmap.php:96
+msgid "Default zoom"
+msgstr "Standard Zoom"
+
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Standard Zoo,level (1: Welt; 18: höchstes)"
+
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/openstreetmap/lang/de/strings.php b/openstreetmap/lang/de/strings.php
index ff6e58b6..f98e59fc 100644
--- a/openstreetmap/lang/de/strings.php
+++ b/openstreetmap/lang/de/strings.php
@@ -1,8 +1,14 @@
-<?php
-
-$a->strings["Submit"] = "Senden";
-$a->strings["Tile Server URL"] = "Tile Server URL";
-$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
-$a->strings["Default zoom"] = "Standard Zoom";
-$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Map"] = "Karte";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Tile Server URL"] = "Die URL des Servers";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
+$a->strings["Default zoom"] = "Standard Zoom";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoo,level (1: Welt; 18: höchstes)";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/openstreetmap/lang/ro/messages.po b/openstreetmap/lang/ro/messages.po
new file mode 100644
index 00000000..6e7edf0f
--- /dev/null
+++ b/openstreetmap/lang/ro/messages.po
@@ -0,0 +1,49 @@
+# ADDON openstreetmap
+# Copyright (C)
+# This file is distributed under the same license as the Friendica openstreetmap addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:01+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: openstreetmap.php:70
+msgid "Map"
+msgstr "Hartă"
+
+#: openstreetmap.php:94
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: openstreetmap.php:95
+msgid "Tile Server URL"
+msgstr "URL Server pentru Stratificare Hărți"
+
+#: openstreetmap.php:95
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
+"target=\"_blank\">public tile servers</a>"
+msgstr "O lista cu <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servere publice cu tipuri de hărți</a>"
+
+#: openstreetmap.php:96
+msgid "Default zoom"
+msgstr "Magnificare implicită"
+
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Nivelul implicit de magnificare. (1:nivel global, 18:cea mai mare)"
+
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Configurări actualizate."
diff --git a/openstreetmap/lang/ro/strings.php b/openstreetmap/lang/ro/strings.php
new file mode 100644
index 00000000..56dae24c
--- /dev/null
+++ b/openstreetmap/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Map"] = "Hartă";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Tile Server URL"] = "URL Server pentru Stratificare Hărți";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "O lista cu <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servere publice cu tipuri de hărți</a>";
+$a->strings["Default zoom"] = "Magnificare implicită";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivelul implicit de magnificare. (1:nivel global, 18:cea mai mare)";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/page/page.php b/page/page.php
index f81b0114..e1ca9070 100755
--- a/page/page.php
+++ b/page/page.php
@@ -6,7 +6,6 @@
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by
  * Author: Michael Vogel <ike@piratenpartei.de>
- * Status: Unsupported
  *
  */
 
diff --git a/pageheader/lang/cs/messages.po b/pageheader/lang/cs/messages.po
new file mode 100644
index 00000000..677cb402
--- /dev/null
+++ b/pageheader/lang/cs/messages.po
@@ -0,0 +1,32 @@
+# ADDON pageheader
+# Copyright (C)
+# This file is distributed under the same license as the Friendica pageheader addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:01+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr "Nastavení záhlaví stránky"
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "Nastavení záhlaví stránky uloženo."
diff --git a/pageheader/lang/cs/strings.php b/pageheader/lang/cs/strings.php
index 08053b15..e77af60d 100644
--- a/pageheader/lang/cs/strings.php
+++ b/pageheader/lang/cs/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["pageheader Settings saved."] = "Nastavení záhlaví stránky uloženo.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["pageheader Settings saved."] = "Nastavení záhlaví stránky uloženo.";
diff --git a/pageheader/lang/de/messages.po b/pageheader/lang/de/messages.po
new file mode 100644
index 00000000..398c5586
--- /dev/null
+++ b/pageheader/lang/de/messages.po
@@ -0,0 +1,32 @@
+# ADDON pageheader
+# Copyright (C)
+# This file is distributed under the same license as the Friendica pageheader addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:19+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr "\"pageheader\"-Einstellungen"
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "pageheader-Einstellungen gespeichert."
diff --git a/pageheader/lang/de/strings.php b/pageheader/lang/de/strings.php
index ea1ad805..2bd7a653 100644
--- a/pageheader/lang/de/strings.php
+++ b/pageheader/lang/de/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
-$a->strings["Submit"] = "Senden";
-$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
diff --git a/pageheader/lang/ro/messages.po b/pageheader/lang/ro/messages.po
new file mode 100644
index 00000000..b7570005
--- /dev/null
+++ b/pageheader/lang/ro/messages.po
@@ -0,0 +1,31 @@
+# ADDON pageheader
+# Copyright (C)
+# This file is distributed under the same license as the Friendica pageheader addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:01+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr "Configurări \"Pageheader\""
+
+#: pageheader.php:55
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "Configurările antetului de pagină au fost salvate."
diff --git a/pageheader/lang/ro/strings.php b/pageheader/lang/ro/strings.php
new file mode 100644
index 00000000..03dde788
--- /dev/null
+++ b/pageheader/lang/ro/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"pageheader\" Settings"] = "Configurări \"Pageheader\"";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["pageheader Settings saved."] = "Configurările antetului de pagină au fost salvate.";
diff --git a/piwik.tgz b/piwik.tgz
index 4099e2de..aaaf4375 100755
Binary files a/piwik.tgz and b/piwik.tgz differ
diff --git a/piwik/lang/cs/messages.po b/piwik/lang/cs/messages.po
new file mode 100644
index 00000000..0e24a338
--- /dev/null
+++ b/piwik/lang/cs/messages.po
@@ -0,0 +1,64 @@
+# ADDON piwik
+# Copyright (C)
+# This file is distributed under the same license as the Friendica piwik addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:01+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: piwik.php:77
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Tato webová stránka je sledována pomocí nástroje pro analýzu <a href='http://www.piwik.org'>Piwik</a>."
+
+#: piwik.php:80
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Pokud si nepřejete, aby vaše návštěvy byly takto sledovány, <a href='%s'>můžete si nastavit cookie, které zastaví sledování dalších návštěv na tomto webu</a> (opt-out)."
+
+#: piwik.php:87
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: piwik.php:88
+msgid "Piwik Base URL"
+msgstr "Piwik Base adresa URL"
+
+#: piwik.php:88
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Absolutní cesta k Vaší instalaci Piwik. (bez protokolu (http/s), s koncovým lomítkem)"
+
+#: piwik.php:89
+msgid "Site ID"
+msgstr "ID webu"
+
+#: piwik.php:90
+msgid "Show opt-out cookie link?"
+msgstr "Zobrazit odkaz opt-out cookie?"
+
+#: piwik.php:91
+msgid "Asynchronous tracking"
+msgstr "Asynchronní sledování"
+
+#: piwik.php:103
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/piwik/lang/cs/strings.php b/piwik/lang/cs/strings.php
index 0ba58f12..6aaac6e3 100644
--- a/piwik/lang/cs/strings.php
+++ b/piwik/lang/cs/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu <a href='http://www.piwik.org'>Piwik</a>.";
-$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Pokud si nepřejete, aby Vaše návštěvy byly takto sledovány, <a href='%s'>můžete si nastavit cookie, které zastaví sledování dalších návštěv na tomto webu</a> (opt-out).";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Piwik Base URL"] = "Piwik Base adresa URL";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolutní cesta k Vaší instalaci Piwik. (bez protokolu (http/s), s koncovým lomítkem)";
-$a->strings["Site ID"] = "ID webu";
-$a->strings["Show opt-out cookie link?"] = "Zobrazit odkaz opt-out cookie?";
-$a->strings["Asynchronous tracking"] = "Asynchronní sledování";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Pokud si nepřejete, aby vaše návštěvy byly takto sledovány, <a href='%s'>můžete si nastavit cookie, které zastaví sledování dalších návštěv na tomto webu</a> (opt-out).";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Piwik Base URL"] = "Piwik Base adresa URL";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absolutní cesta k Vaší instalaci Piwik. (bez protokolu (http/s), s koncovým lomítkem)";
+$a->strings["Site ID"] = "ID webu";
+$a->strings["Show opt-out cookie link?"] = "Zobrazit odkaz opt-out cookie?";
+$a->strings["Asynchronous tracking"] = "Asynchronní sledování";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/piwik/lang/de/messages.po b/piwik/lang/de/messages.po
new file mode 100644
index 00000000..99c1092f
--- /dev/null
+++ b/piwik/lang/de/messages.po
@@ -0,0 +1,64 @@
+# ADDON piwik
+# Copyright (C)
+# This file is distributed under the same license as the Friendica piwik addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:18+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: piwik.php:77
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."
+
+#: piwik.php:80
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out)."
+
+#: piwik.php:87
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: piwik.php:88
+msgid "Piwik Base URL"
+msgstr "Piwik Basis URL"
+
+#: piwik.php:88
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"
+
+#: piwik.php:89
+msgid "Site ID"
+msgstr "Seiten ID"
+
+#: piwik.php:90
+msgid "Show opt-out cookie link?"
+msgstr "Link zum Setzen des Opt-Out Cookies anzeigen?"
+
+#: piwik.php:91
+msgid "Asynchronous tracking"
+msgstr "Asynchrones Tracking"
+
+#: piwik.php:103
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/piwik/lang/de/strings.php b/piwik/lang/de/strings.php
index cb4d10bb..be17dc66 100644
--- a/piwik/lang/de/strings.php
+++ b/piwik/lang/de/strings.php
@@ -1,11 +1,16 @@
-<?php
-
-$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
-$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out).";
-$a->strings["Submit"] = "Senden";
-$a->strings["Piwik Base URL"] = "Piwik Basis URL";
-$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)";
-$a->strings["Site ID"] = "Seiten ID";
-$a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?";
-$a->strings["Asynchronous tracking"] = "Asynchrones Tracken";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out).";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Piwik Base URL"] = "Piwik Basis URL";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)";
+$a->strings["Site ID"] = "Seiten ID";
+$a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out Cookies anzeigen?";
+$a->strings["Asynchronous tracking"] = "Asynchrones Tracking";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/piwik/lang/ro/messages.po b/piwik/lang/ro/messages.po
new file mode 100644
index 00000000..2024ca32
--- /dev/null
+++ b/piwik/lang/ro/messages.po
@@ -0,0 +1,63 @@
+# ADDON piwik
+# Copyright (C)
+# This file is distributed under the same license as the Friendica piwik addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:02+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: piwik.php:77
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Acest site web este contorizat folosind instrumentul analitic <a href='http://www.piwik.org'>Piwik</a>."
+
+#: piwik.php:80
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can"
+" set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
+msgstr "Dacă nu doriți ca vizitele dumneavoastră să fie înregistrate în acest mod,<a href='%s'> puteți stabili un cookie pentru a împiedica Piwik să vă contorizeze viitoarele vizite pe site</a> (renunțare la opțiune)."
+
+#: piwik.php:87
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: piwik.php:88
+msgid "Piwik Base URL"
+msgstr "Adresa URL de Bază Piwik"
+
+#: piwik.php:88
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Calea absolută către locația de instalare Piwik. (fără protocolul (http/s), urmată de slash-uri)"
+
+#: piwik.php:89
+msgid "Site ID"
+msgstr "ID Site"
+
+#: piwik.php:90
+msgid "Show opt-out cookie link?"
+msgstr "Se afișează legătura cookie de renunțare la opțiune?"
+
+#: piwik.php:91
+msgid "Asynchronous tracking"
+msgstr "Contorizare asincronă"
+
+#: piwik.php:103
+msgid "Settings updated."
+msgstr "Configurări actualizate."
diff --git a/piwik/lang/ro/strings.php b/piwik/lang/ro/strings.php
new file mode 100644
index 00000000..0d99bf25
--- /dev/null
+++ b/piwik/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Acest site web este contorizat folosind instrumentul analitic <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Dacă nu doriți ca vizitele dumneavoastră să fie înregistrate în acest mod,<a href='%s'> puteți stabili un cookie pentru a împiedica Piwik să vă contorizeze viitoarele vizite pe site</a> (renunțare la opțiune).";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Piwik Base URL"] = "Adresa URL de Bază Piwik";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Calea absolută către locația de instalare Piwik. (fără protocolul (http/s), urmată de slash-uri)";
+$a->strings["Site ID"] = "ID Site";
+$a->strings["Show opt-out cookie link?"] = "Se afișează legătura cookie de renunțare la opțiune?";
+$a->strings["Asynchronous tracking"] = "Contorizare asincronă";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 7a1cb581..21bc7af2 100755
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -2,7 +2,7 @@
 /**
  * Name: Piwik Analytics
  * Description: Piwik Analytics Plugin for Friendica
- * Version: 1.2
+ * Version: 1.1
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Klaus Weidenbach
  */
@@ -15,9 +15,7 @@
  *   License: 3-clause BSD license
  *
  *   Configuration:
- *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this add the following lines to your .htconfig.php
- *     file:
+ *     Add the following lines to your .htconfig.php file:
  *
  *     $a->config['piwik']['baseurl'] = 'www.example.com/piwik/';
  *     $a->config['piwik']['siteid'] = '1';
@@ -64,10 +62,10 @@ function piwik_analytics($a,&$b) {
 	 *   If async is set to true use asynchronous tracking
 	 */
 	if ($async) {
-	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
+	  $a->page['htmlhead'] .= "<!-- Piwik --> <script type=\"text/javascript\">\r\nvar _paq = _paq || [];\r\n(function(){ var u=((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n_paq.push(['setSiteId', ".$siteid."]);\r\n_paq.push(['setTrackerUrl', u+'piwik.php']);\r\n_paq.push(['trackPageView']);\r\n_paq.push(['enableLinkTracking']);\r\nvar d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';\r\ng.defer=true; g.async=true; g.src=u+'piwik.js';\r\ns.parentNode.insertBefore(g,s); })();\r\n </script>\r\n<!-- End Piwik Code -->\r\n";
 	  $b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
 	} else {
-	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=false; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
+		$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n <script type=\"text/javascript\">\r\n var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\r\n </script>\r\n<script type=\"text/javascript\">\r\n try {\r\n var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", ".$siteid.");\r\n piwikTracker.trackPageView();\r\n piwikTracker.enableLinkTracking();\r\n }\r\n catch( err ) {}\r\n </script>\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
 	}
 
 	/*
@@ -79,7 +77,7 @@ function piwik_analytics($a,&$b) {
 		$b .= t("This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool.");
 		$b .= " ";
 		$the_url =  "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
-		$b .= sprintf(t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."), $the_url);
+		$b .= sprintf(t("If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."), $the_url);
 		$b .= "</div>";
 	}
 }
diff --git a/planets/lang/cs/messages.po b/planets/lang/cs/messages.po
new file mode 100644
index 00000000..dadbfb15
--- /dev/null
+++ b/planets/lang/cs/messages.po
@@ -0,0 +1,32 @@
+# ADDON planets
+# Copyright (C)
+# This file is distributed under the same license as the Friendica planets addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:01+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Planets Nastavení"
+
+#: planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Povolit Planets plugin"
+
+#: planets.php:158
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/planets/lang/cs/strings.php b/planets/lang/cs/strings.php
index f1548def..d00251e8 100644
--- a/planets/lang/cs/strings.php
+++ b/planets/lang/cs/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Planets Settings"] = "Nastavení Planets";
-$a->strings["Enable Planets Plugin"] = "Povolit Planets plugin";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Planets Settings"] = "Planets Nastavení";
+$a->strings["Enable Planets Plugin"] = "Povolit Planets plugin";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/planets/lang/de/messages.po b/planets/lang/de/messages.po
new file mode 100644
index 00000000..616e6b93
--- /dev/null
+++ b/planets/lang/de/messages.po
@@ -0,0 +1,32 @@
+# ADDON planets
+# Copyright (C)
+# This file is distributed under the same license as the Friendica planets addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-23 11:21+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Planeten Einstellungen"
+
+#: planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Planeten-Plugin aktivieren"
+
+#: planets.php:158
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/planets/lang/de/strings.php b/planets/lang/de/strings.php
index 87c3672b..7057fa3e 100644
--- a/planets/lang/de/strings.php
+++ b/planets/lang/de/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Planets Settings"] = "Planeten Einstellungen";
-$a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Planets Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Planets Plugin"] = "Planeten-Plugin aktivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/planets/lang/ro/messages.po b/planets/lang/ro/messages.po
new file mode 100644
index 00000000..a0cf60d1
--- /dev/null
+++ b/planets/lang/ro/messages.po
@@ -0,0 +1,31 @@
+# ADDON planets
+# Copyright (C)
+# This file is distributed under the same license as the Friendica planets addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:02+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Configurări Planets"
+
+#: planets.php:152
+msgid "Enable Planets Plugin"
+msgstr "Activare Modul Planets"
+
+#: planets.php:158
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/planets/lang/ro/strings.php b/planets/lang/ro/strings.php
new file mode 100644
index 00000000..7431bb56
--- /dev/null
+++ b/planets/lang/ro/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Planets Settings"] = "Configurări Planets";
+$a->strings["Enable Planets Plugin"] = "Activare Modul Planets";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/pledgie/lang/C/messages.po b/pledgie/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/poormancron/lang/C/messages.po b/poormancron/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/posterous/posterous.php b/posterous/posterous.php
index 76eaf77a..af8e72b9 100755
--- a/posterous/posterous.php
+++ b/posterous/posterous.php
@@ -6,7 +6,6 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
- * Status: Unsupported
  */
 
 function posterous_install() {
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 8a303e7b..b7c8fc7a 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -4,7 +4,6 @@
  * Name: Privacy Image Cache
  * Version: 0.1
  * Author: Tobias Hößl <https://github.com/CatoTH/>
- * Status: Unsupported
  */
 
 define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
@@ -62,7 +61,6 @@ function privacy_image_cache_init() {
 	}
 
 	$thumb = false;
-	$size = 1024;
 
 	// If the cache path isn't there, try to create it
 	if (!is_dir($_SERVER["DOCUMENT_ROOT"]."/privacy_image_cache"))
@@ -81,20 +79,6 @@ function privacy_image_cache_init() {
 		else
 			$url = $a->argv[1];
 
-		//$thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb"));
-		if (isset($a->argv[3]) and ($a->argv[3] == "thumb"))
-			$size = 200;
-
-		// thumb, small, medium and large.
-		if (substr($url, -6) == ":thumb")
-			$size = 150;
-		if (substr($url, -6) == ":small")
-			$size = 340;
-		if (substr($url, -7) == ":medium")
-			$size = 600;
-		if (substr($url, -6) == ":large")
-			$size = 1024;
-
 		$pos = strrpos($url, "=.");
 		if ($pos)
 			$url = substr($url, 0, $pos+1);
@@ -105,6 +89,7 @@ function privacy_image_cache_init() {
 
 		if ($url)
 			$_REQUEST['url'] = $url;
+		$thumb = (isset($a->argv[3]) and ($a->argv[3] == "thumb"));
 	}
 
 	if (!$direct_cache) {
@@ -157,7 +142,7 @@ function privacy_image_cache_init() {
 		$redirects = 0;
 		$img_str = fetch_url($_REQUEST['url'],true, $redirects, 10);
 
-		$tempfile = tempnam(get_temppath(), "cache");
+		$tempfile = tempnam(get_config("system","temppath"), "cache");
 		file_put_contents($tempfile, $img_str);
 		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 		unlink($tempfile);
@@ -201,10 +186,10 @@ function privacy_image_cache_init() {
 				if (!$direct_cache AND ($cachefile == ""))
 					$img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
 
-				//if ($thumb) {
-				//	$img->scaleImage(200); // Test
-				//	$img_str = $img->imageString();
-				//}
+				if ($thumb) {
+					$img->scaleImage(200); // Test
+					$img_str = $img->imageString();
+				}
 			}
 			//$mime = "image/jpeg";
 		}
@@ -214,8 +199,7 @@ function privacy_image_cache_init() {
 	if ($mime != "image/gif") {
 		$img = new Photo($img_str, $mime);
 		if($img->is_valid()) {
-			//$img->scaleImage(1024); // Test
-			$img->scaleImage($size);
+			$img->scaleImage(1024); // Test
 			$img_str = $img->imageString();
 		}
 	}
@@ -308,8 +292,8 @@ function privacy_image_cache_img_cb($matches) {
 		$matches[2] = urldecode($queryvar['url']);
 
 	// if fetching facebook pictures don't fetch the thumbnail but the big one
-	//if (((strpos($matches[2], ".fbcdn.net/") OR strpos($matches[2], "/fbcdn-photos-"))) and (substr($matches[2], -6) == "_s.jpg"))
-	//	$matches[2] = substr($matches[2], 0, -6)."_n.jpg";
+	if (((strpos($matches[2], ".fbcdn.net/") OR strpos($matches[2], "/fbcdn-photos-"))) and (substr($matches[2], -6) == "_s.jpg"))
+		$matches[2] = substr($matches[2], 0, -6)."_n.jpg";
 
 	// following line changed per bug #431
 	if (privacy_image_cache_is_local_image($matches[2]))
diff --git a/procrunner/lang/C/messages.po b/procrunner/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/public_server/lang/cs/messages.po/cs.po b/public_server/lang/cs/messages.po/cs.po
new file mode 100644
index 00000000..a4f13f05
--- /dev/null
+++ b/public_server/lang/cs/messages.po/cs.po
@@ -0,0 +1,53 @@
+# ADDON public_server
+# Copyright (C)
+# This file is distributed under the same license as the Friendica public_server addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:03+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: public_server.php:64
+msgid "Administrator"
+msgstr "Administrátor"
+
+#: public_server.php:129
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Platnost Vašeho účtu na %s vyprší během několika dní."
+
+#: public_server.php:130
+msgid "Your Friendica account is about to expire."
+msgstr "Vašemu účetu Friendica brzy vyprší platnost"
+
+#: public_server.php:131
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
+msgstr "Ahoj %1$s,\n\nVáš účet na %2$s vyprší v méně než pěti dnech. Svůj účet si zachováte, pokud se přihlásíte alespoň jednou za každých 30 dní."
+
+#: public_server.php:159
+msgid "Settings saved"
+msgstr "Nastavení uloženo"
+
+#: public_server.php:165
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: public_server.php:167
+msgid "Set any of these options to 0 to deactivate it."
+msgstr "Nastavením volby na 0 funkci deaktivujete"
diff --git a/public_server/lang/cs/strings.php b/public_server/lang/cs/strings.php
index c0311631..a4abe2da 100644
--- a/public_server/lang/cs/strings.php
+++ b/public_server/lang/cs/strings.php
@@ -1,5 +1,2 @@
-<?php
-
-$a->strings["Administrator"] = "Administrátor";
-$a->strings["Your account on %s will expire in a few days."] = "Platnost Vašeho účtu na %s vyprší během několika dní.";
-$a->strings["Your Friendica account is about to expire."] = "Vašemu účetu Friendica brzy vyprší platnost";
+<?php
+
diff --git a/public_server/lang/ro/messages.po b/public_server/lang/ro/messages.po
new file mode 100644
index 00000000..0aca56a8
--- /dev/null
+++ b/public_server/lang/ro/messages.po
@@ -0,0 +1,52 @@
+# ADDON public_server
+# Copyright (C)
+# This file is distributed under the same license as the Friendica public_server addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:03+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: public_server.php:64
+msgid "Administrator"
+msgstr "Administrator"
+
+#: public_server.php:129
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Contul dvs. de pe %s va expira în câteva zile."
+
+#: public_server.php:130
+msgid "Your Friendica account is about to expire."
+msgstr "Contul dvs. Friendica este pe cale sa expire."
+
+#: public_server.php:131
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
+msgstr "Bună ziua %1$s,\n\nContul dvs. de pe %2$s va expira în mai puțin de cinci zile. Vă puteți păstra contul conectându-vă la el, cel puțin o dată la fiecare 30 de zile"
+
+#: public_server.php:159
+msgid "Settings saved"
+msgstr "Configurări salvate"
+
+#: public_server.php:165
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: public_server.php:167
+msgid "Set any of these options to 0 to deactivate it."
+msgstr "Stabiliți oricare din aceste opțiuni de 0 pentru a-l dezactiva."
diff --git a/public_server/lang/ro/strings.php b/public_server/lang/ro/strings.php
new file mode 100644
index 00000000..3f761d11
--- /dev/null
+++ b/public_server/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Contul dvs. de pe %s va expira în câteva zile.";
+$a->strings["Your Friendica account is about to expire."] = "Contul dvs. Friendica este pe cale sa expire.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Bună ziua %1\$s,\n\nContul dvs. de pe %2\$s va expira în mai puțin de cinci zile. Vă puteți păstra contul conectându-vă la el, cel puțin o dată la fiecare 30 de zile";
+$a->strings["Settings saved"] = "Configurări salvate";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Set any of these options to 0 to deactivate it."] = "Stabiliți oricare din aceste opțiuni de 0 pentru a-l dezactiva.";
diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po
new file mode 100644
index 00000000..84ce856f
--- /dev/null
+++ b/pumpio/lang/C/messages.po
@@ -0,0 +1,100 @@
+# ADDON pumpio
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica pumpio addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pumpio.php:38
+msgid "Permission denied."
+msgstr ""
+
+#: pumpio.php:124
+#, php-format
+msgid "Unable to register the client at the pump.io server '%s'."
+msgstr ""
+
+#: pumpio.php:164
+msgid "You are now authenticated to pumpio."
+msgstr ""
+
+#: pumpio.php:165
+msgid "return to the connector page"
+msgstr ""
+
+#: pumpio.php:183
+msgid "Post to pumpio"
+msgstr ""
+
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr ""
+
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr ""
+
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr ""
+
+#: pumpio.php:246
+msgid "Authenticate your pump.io connection"
+msgstr ""
+
+#: pumpio.php:250
+msgid "Import the remote timeline"
+msgstr ""
+
+#: pumpio.php:255
+msgid "Enable pump.io Post Plugin"
+msgstr ""
+
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr ""
+
+#: pumpio.php:265
+msgid "Should posts be public?"
+msgstr ""
+
+#: pumpio.php:270
+msgid "Mirror all public posts"
+msgstr ""
+
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr ""
+
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr ""
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:875
+msgid "status"
+msgstr ""
+
+#: pumpio.php:879
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
diff --git a/pumpio/lang/cs/messages.po b/pumpio/lang/cs/messages.po
new file mode 100644
index 00000000..157699e3
--- /dev/null
+++ b/pumpio/lang/cs/messages.po
@@ -0,0 +1,102 @@
+# ADDON pumpio
+# Copyright (C)
+# This file is distributed under the same license as the Friendica pumpio addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:19+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: pumpio.php:38
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: pumpio.php:124
+#, php-format
+msgid "Unable to register the client at the pump.io server '%s'."
+msgstr "Nebylo možné registrovat klienta na pump.io serveru '%s'."
+
+#: pumpio.php:164
+msgid "You are now authenticated to pumpio."
+msgstr "Nyní jste přihlášen k pumpio."
+
+#: pumpio.php:165
+msgid "return to the connector page"
+msgstr "návrat ke stránce konektor"
+
+#: pumpio.php:183
+msgid "Post to pumpio"
+msgstr "Příspěvek na pumpio"
+
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr "Pump.oi Import/Export/Zrcadlení"
+
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "uživatelské jméno pump.io (bez jména serveru)"
+
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr "jméno serveru pump.io  (bez \"http://\" nebo \"https://\" )"
+
+#: pumpio.php:246
+msgid "Authenticate your pump.io connection"
+msgstr "Přihlásit ke spojení na pump.io"
+
+#: pumpio.php:250
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
+
+#: pumpio.php:255
+msgid "Enable pump.io Post Plugin"
+msgstr "Aktivovat pump.io Post Plugin"
+
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr "Defaultní umístění na pump.oi "
+
+#: pumpio.php:265
+msgid "Should posts be public?"
+msgstr "Mají být příspěvky veřejné?"
+
+#: pumpio.php:270
+msgid "Mirror all public posts"
+msgstr "Zrcadlit všechny veřejné příspěvky"
+
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Zaškrtnout pro smazání tohoto nastavení"
+
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Zaslání příspěvku na Pump.io selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Zaslání příspěvku na Pump.io zřejmě selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
+
+#: pumpio.php:875
+msgid "status"
+msgstr "Stav"
+
+#: pumpio.php:879
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "Uživateli %1$s se líbí příspěvek %3$s uživatele %2$s"
diff --git a/pumpio/lang/cs/strings.php b/pumpio/lang/cs/strings.php
new file mode 100644
index 00000000..6af0c813
--- /dev/null
+++ b/pumpio/lang/cs/strings.php
@@ -0,0 +1,27 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Nebylo možné registrovat klienta na pump.io serveru '%s'.";
+$a->strings["You are now authenticated to pumpio."] = "Nyní jste přihlášen k pumpio.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to pumpio"] = "Příspěvek na pumpio";
+$a->strings["Pump.io Import/Export/Mirror"] = "Pump.oi Import/Export/Zrcadlení";
+$a->strings["pump.io username (without the servername)"] = "uživatelské jméno pump.io (bez jména serveru)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "jméno serveru pump.io  (bez \"http://\" nebo \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Přihlásit ke spojení na pump.io";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Enable pump.io Post Plugin"] = "Aktivovat pump.io Post Plugin";
+$a->strings["Post to pump.io by default"] = "Defaultní umístění na pump.oi ";
+$a->strings["Should posts be public?"] = "Mají být příspěvky veřejné?";
+$a->strings["Mirror all public posts"] = "Zrcadlit všechny veřejné příspěvky";
+$a->strings["Check to delete this preset"] = "Zaškrtnout pro smazání tohoto nastavení";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Pump.io post failed. Queued for retry."] = "Zaslání příspěvku na Pump.io selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Zaslání příspěvku na Pump.io zřejmě selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
+$a->strings["status"] = "Stav";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "Uživateli %1\$s se líbí příspěvek %3\$s uživatele %2\$s";
diff --git a/pumpio/lang/ro/messages.po b/pumpio/lang/ro/messages.po
new file mode 100644
index 00000000..ae3f945b
--- /dev/null
+++ b/pumpio/lang/ro/messages.po
@@ -0,0 +1,101 @@
+# ADDON pumpio
+# Copyright (C)
+# This file is distributed under the same license as the Friendica pumpio addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:03+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: pumpio.php:38
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: pumpio.php:124
+#, php-format
+msgid "Unable to register the client at the pump.io server '%s'."
+msgstr "Imposibil de înregistrat clientul pe serverul pump.io '%s'."
+
+#: pumpio.php:164
+msgid "You are now authenticated to pumpio."
+msgstr "Acum sunteți autentificat pe pumpio."
+
+#: pumpio.php:165
+msgid "return to the connector page"
+msgstr "revenire la pagina de conectare"
+
+#: pumpio.php:183
+msgid "Post to pumpio"
+msgstr "Postați pe pumpio"
+
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr "Import/Export/Clonare Pump.io "
+
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "Utilizator pump.io (fără nume server)"
+
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr "Nume server pump.io (fără \"http://\" ori \"https://\" )"
+
+#: pumpio.php:246
+msgid "Authenticate your pump.io connection"
+msgstr "Autentificați-vă conectarea la pump.io"
+
+#: pumpio.php:250
+msgid "Import the remote timeline"
+msgstr "Importare cronologie la distanță"
+
+#: pumpio.php:255
+msgid "Enable pump.io Post Plugin"
+msgstr "Activare Modul Postare pump.io"
+
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr "Postați implicit pe pump.io"
+
+#: pumpio.php:265
+msgid "Should posts be public?"
+msgstr "Postările ar trebui sa fie publice?"
+
+#: pumpio.php:270
+msgid "Mirror all public posts"
+msgstr "Reproducere pentru toate postările publice"
+
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Bifați pentru a șterge această presetare"
+
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Postarea pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Aprecierea de pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare."
+
+#: pumpio.php:875
+msgid "status"
+msgstr "status"
+
+#: pumpio.php:879
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s apreciază %3$s lui %2$s "
diff --git a/pumpio/lang/ro/strings.php b/pumpio/lang/ro/strings.php
new file mode 100644
index 00000000..bd8bf5f1
--- /dev/null
+++ b/pumpio/lang/ro/strings.php
@@ -0,0 +1,27 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Imposibil de înregistrat clientul pe serverul pump.io '%s'.";
+$a->strings["You are now authenticated to pumpio."] = "Acum sunteți autentificat pe pumpio.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to pumpio"] = "Postați pe pumpio";
+$a->strings["Pump.io Import/Export/Mirror"] = "Import/Export/Clonare Pump.io ";
+$a->strings["pump.io username (without the servername)"] = "Utilizator pump.io (fără nume server)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nume server pump.io (fără \"http://\" ori \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Autentificați-vă conectarea la pump.io";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Enable pump.io Post Plugin"] = "Activare Modul Postare pump.io";
+$a->strings["Post to pump.io by default"] = "Postați implicit pe pump.io";
+$a->strings["Should posts be public?"] = "Postările ar trebui sa fie publice?";
+$a->strings["Mirror all public posts"] = "Reproducere pentru toate postările publice";
+$a->strings["Check to delete this preset"] = "Bifați pentru a șterge această presetare";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Pump.io post failed. Queued for retry."] = "Postarea pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Aprecierea de pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["status"] = "status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s apreciază %3\$s lui %2\$s ";
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 55d0433a..62467414 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -472,9 +472,6 @@ function pumpio_send(&$a,&$b) {
 			$inReplyTo = array("id" => $orig_post["uri"],
 					"objectType" => "note");
 
-			if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
-				$inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
-
 			$params["object"] = array(
 						'objectType' => "comment",
 						'content' => $title.$content,
@@ -521,7 +518,7 @@ function pumpio_send(&$a,&$b) {
 	}
 }
 
-function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
+function pumpio_action(&$a, $uid, $uri, $action, $content) {
 
 	// Don't do likes and other stuff if you don't import the timeline
 	if (!get_pconfig($uid,'pumpio','import'))
@@ -549,9 +546,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
 	else
 		$uri = $orig_post["uri"];
 
-	if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA)))
-		$objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
-	elseif (strstr($uri, "/api/comment/"))
+	if (strstr($uri, "/api/comment/"))
 		$objectType = "comment";
 	elseif (strstr($uri, "/api/note/"))
 		$objectType = "note";
@@ -870,6 +865,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id) {
 	$likedata['parent-uri'] = $orig_post["uri"];
 	$likedata['contact-id'] = $contactid;
 	$likedata['app'] = $post->generator->displayName;
+	$likedata['verb'] = ACTIVITY_LIKE;
 	$likedata['author-name'] = $post->actor->displayName;
 	$likedata['author-link'] = $post->actor->url;
 	$likedata['author-avatar'] = $post->actor->image->url;
@@ -1085,7 +1081,6 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	$postarray['uid'] = $uid;
 	$postarray['wall'] = 0;
 	$postarray['uri'] = $post->object->id;
-	$postarray['object-type'] = NAMESPACE_ACTIVITY_SCHEMA.strtolower($post->object->objectType);
 
 	if ($post->object->objectType != "comment") {
 		$contact_id = pumpio_get_contact($uid, $post->actor);
@@ -1243,7 +1238,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 					'to_email'     => $user[0]['email'],
 					'uid'          => $user[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+					'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
diff --git a/qcomment/lang/cs/messages.po b/qcomment/lang/cs/messages.po
new file mode 100644
index 00000000..5169cf38
--- /dev/null
+++ b/qcomment/lang/cs/messages.po
@@ -0,0 +1,54 @@
+# ADDON qcomment
+# Copyright (C)
+# This file is distributed under the same license as the Friendica qcomment addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:09+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: qcomment.php:51
+msgid "lol"
+msgstr "hlasitě se směji"
+
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Nastavení rychlých komentářů"
+
+#: qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně k poskytnutí jednoduchých odpovědí."
+
+#: qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Zadejte rychlé komentáře, každý na nový řádek"
+
+#: qcomment.php:61
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Nastavení Quick Comment uloženo."
diff --git a/qcomment/lang/cs/strings.php b/qcomment/lang/cs/strings.php
index 99ca6f8b..46d62432 100644
--- a/qcomment/lang/cs/strings.php
+++ b/qcomment/lang/cs/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings[":-)"] = ":-)";
-$a->strings[":-("] = ":-(";
-$a->strings["lol"] = "hlasitě se směji";
-$a->strings["Quick Comment Settings"] = "Nastavení rychlých komentářů";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně k poskytnutí jednoduchých odpovědí.";
-$a->strings["Enter quick comments, one per line"] = "Zadejte rychlé komentáře, každý na nový řádek";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Quick Comment settings saved."] = "Nastavení Quick Comment uloženo.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "hlasitě se směji";
+$a->strings["Quick Comment Settings"] = "Nastavení rychlých komentářů";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně k poskytnutí jednoduchých odpovědí.";
+$a->strings["Enter quick comments, one per line"] = "Zadejte rychlé komentáře, každý na nový řádek";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Quick Comment settings saved."] = "Nastavení Quick Comment uloženo.";
diff --git a/qcomment/lang/de/messages.po b/qcomment/lang/de/messages.po
new file mode 100644
index 00000000..6308581a
--- /dev/null
+++ b/qcomment/lang/de/messages.po
@@ -0,0 +1,54 @@
+# ADDON qcomment
+# Copyright (C)
+# This file is distributed under the same license as the Friendica qcomment addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:24+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Schnell-Kommentar Einstellungen"
+
+#: qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten."
+
+#: qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Gib einen Schnell-Kommentar pro Zeile ein"
+
+#: qcomment.php:61
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Schnell-Kommentare Einstellungen gespeichert"
diff --git a/qcomment/lang/de/strings.php b/qcomment/lang/de/strings.php
index d8cb3d6a..4e13bd59 100644
--- a/qcomment/lang/de/strings.php
+++ b/qcomment/lang/de/strings.php
@@ -1,10 +1,15 @@
-<?php
-
-$a->strings[":-)"] = ":-)";
-$a->strings[":-("] = ":-(";
-$a->strings["lol"] = "lol";
-$a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
-$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurzkommentare findet man in der Nähe der Kommentarboxen. Ein Klick darauf erstellt einfache Antworten.";
-$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
-$a->strings["Submit"] = "Senden";
-$a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
+$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
diff --git a/qcomment/lang/ro/messages.po b/qcomment/lang/ro/messages.po
new file mode 100644
index 00000000..453ab83c
--- /dev/null
+++ b/qcomment/lang/ro/messages.po
@@ -0,0 +1,53 @@
+# ADDON qcomment
+# Copyright (C)
+# This file is distributed under the same license as the Friendica qcomment addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:04+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: qcomment.php:51
+msgid ":-)"
+msgstr ":-)"
+
+#: qcomment.php:51
+msgid ":-("
+msgstr ":-("
+
+#: qcomment.php:51
+msgid "lol"
+msgstr "lol"
+
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Configurări Comentariu Rapid"
+
+#: qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to"
+" provide simple replies."
+msgstr "Comentariile rapide se regăsesc lângă casetele comentariilor, uneori ascunse. Apăsați pe ele pentru a posta răspunsuri simple."
+
+#: qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr "Introduceți cometarii rapide, câte unul pe linie:"
+
+#: qcomment.php:61
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Configurările pentru Comentariu Rapid au fost salvate."
diff --git a/qcomment/lang/ro/strings.php b/qcomment/lang/ro/strings.php
new file mode 100644
index 00000000..65b9a5d4
--- /dev/null
+++ b/qcomment/lang/ro/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Configurări Comentariu Rapid";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentariile rapide se regăsesc lângă casetele comentariilor, uneori ascunse. Apăsați pe ele pentru a posta răspunsuri simple.";
+$a->strings["Enter quick comments, one per line"] = "Introduceți cometarii rapide, câte unul pe linie:";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Quick Comment settings saved."] = "Configurările pentru Comentariu Rapid au fost salvate.";
diff --git a/randplace/lang/cs/messages.po b/randplace/lang/cs/messages.po
new file mode 100644
index 00000000..6cc09f7d
--- /dev/null
+++ b/randplace/lang/cs/messages.po
@@ -0,0 +1,32 @@
+# ADDON randplace
+# Copyright (C)
+# This file is distributed under the same license as the Friendica randplace addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:09+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Randplace Nastavení"
+
+#: randplace.php:171
+msgid "Enable Randplace Plugin"
+msgstr "Povolit Randplace Plugin"
+
+#: randplace.php:177
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/randplace/lang/cs/strings.php b/randplace/lang/cs/strings.php
index 6fc96617..dae496fc 100644
--- a/randplace/lang/cs/strings.php
+++ b/randplace/lang/cs/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Randplace Settings"] = "Randplace Nastavení";
-$a->strings["Enable Randplace Plugin"] = "Povolit Randplace Plugin";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Randplace Settings"] = "Randplace Nastavení";
+$a->strings["Enable Randplace Plugin"] = "Povolit Randplace Plugin";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/randplace/lang/de/messages.po b/randplace/lang/de/messages.po
new file mode 100644
index 00000000..8735e20d
--- /dev/null
+++ b/randplace/lang/de/messages.po
@@ -0,0 +1,32 @@
+# ADDON randplace
+# Copyright (C)
+# This file is distributed under the same license as the Friendica randplace addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:23+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Randplace-Einstellungen"
+
+#: randplace.php:171
+msgid "Enable Randplace Plugin"
+msgstr "Randplace-Plugin aktivieren"
+
+#: randplace.php:177
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/randplace/lang/de/strings.php b/randplace/lang/de/strings.php
index e2b2a7e2..29bec858 100644
--- a/randplace/lang/de/strings.php
+++ b/randplace/lang/de/strings.php
@@ -1,5 +1,10 @@
-<?php
-
-$a->strings["Randplace Settings"] = "Randplace-Einstellungen";
-$a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren";
-$a->strings["Submit"] = "Senden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Randplace Settings"] = "Randplace-Einstellungen";
+$a->strings["Enable Randplace Plugin"] = "Randplace-Plugin aktivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/randplace/lang/ro/messages.po b/randplace/lang/ro/messages.po
new file mode 100644
index 00000000..1138665f
--- /dev/null
+++ b/randplace/lang/ro/messages.po
@@ -0,0 +1,31 @@
+# ADDON randplace
+# Copyright (C)
+# This file is distributed under the same license as the Friendica randplace addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:04+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Configurări Randplace"
+
+#: randplace.php:171
+msgid "Enable Randplace Plugin"
+msgstr "Activare Modul Randplace"
+
+#: randplace.php:177
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/randplace/lang/ro/strings.php b/randplace/lang/ro/strings.php
new file mode 100644
index 00000000..9ef0274f
--- /dev/null
+++ b/randplace/lang/ro/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Randplace Settings"] = "Configurări Randplace";
+$a->strings["Enable Randplace Plugin"] = "Activare Modul Randplace";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/remote_permissions/lang/cs/messages.po b/remote_permissions/lang/cs/messages.po
new file mode 100644
index 00000000..b2acbf5d
--- /dev/null
+++ b/remote_permissions/lang/cs/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:09+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Nastavení Vzdálených oprávnění"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Nastavení Vzdálených opravnění aktualizováno."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Viditelné pro:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Viditelné pro"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "pouze pro část seznamu"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Globální"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individuálové"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku."
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/remote_permissions/lang/cs/strings.php b/remote_permissions/lang/cs/strings.php
index eefe8b12..e11447f7 100644
--- a/remote_permissions/lang/cs/strings.php
+++ b/remote_permissions/lang/cs/strings.php
@@ -1,14 +1,19 @@
-<?php
-
-$a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
-$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Remote Permissions settings updated."] = "Nastavení Vzdálených opravnění aktualizováno.";
-$a->strings["Visible to:"] = "Viditelné pro:";
-$a->strings["Visible to"] = "Viditelné pro";
-$a->strings["may only be a partial list"] = "pouze pro část seznamu";
-$a->strings["Global"] = "Globální";
-$a->strings["The posts of every user on this server show the post recipients"] = "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků";
-$a->strings["Individual"] = "Individuálové";
-$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku.";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Remote Permissions settings updated."] = "Nastavení Vzdálených opravnění aktualizováno.";
+$a->strings["Visible to:"] = "Viditelné pro:";
+$a->strings["Visible to"] = "Viditelné pro";
+$a->strings["may only be a partial list"] = "pouze pro část seznamu";
+$a->strings["Global"] = "Globální";
+$a->strings["The posts of every user on this server show the post recipients"] = "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků";
+$a->strings["Individual"] = "Individuálové";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/remote_permissions/lang/ro/messages.po b/remote_permissions/lang/ro/messages.po
new file mode 100644
index 00000000..27b7e040
--- /dev/null
+++ b/remote_permissions/lang/ro/messages.po
@@ -0,0 +1,69 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:05+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Configurări Permisiuni la Distanță"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Permite destinatarilor, posturile dvs. private, să-i vadă și pe ceilalți destinatari ai postărilor"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Configurările Permisiunilor la Distanță, au fost actualizate."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Vizibil pentru :"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Vizibil pentru"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "poate fi doar o listă parțială"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Global"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Postările fiecărui utilizator de pe acest server, afișează destinatarii mesajului"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individual"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Fiecare utilizator alege dacă postările lui/ei, afișează și destinatarii mesajului"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Configurări actualizate."
diff --git a/remote_permissions/lang/ro/strings.php b/remote_permissions/lang/ro/strings.php
new file mode 100644
index 00000000..9a68662a
--- /dev/null
+++ b/remote_permissions/lang/ro/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Configurări Permisiuni la Distanță";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Permite destinatarilor, posturile dvs. private, să-i vadă și pe ceilalți destinatari ai postărilor";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Remote Permissions settings updated."] = "Configurările Permisiunilor la Distanță, au fost actualizate.";
+$a->strings["Visible to:"] = "Vizibil pentru :";
+$a->strings["Visible to"] = "Vizibil pentru";
+$a->strings["may only be a partial list"] = "poate fi doar o listă parțială";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Postările fiecărui utilizator de pe acest server, afișează destinatarii mesajului";
+$a->strings["Individual"] = "Individual";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Fiecare utilizator alege dacă postările lui/ei, afișează și destinatarii mesajului";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/rendertime/lang/cs/messages.po b/rendertime/lang/cs/messages.po
new file mode 100644
index 00000000..1a2404d7
--- /dev/null
+++ b/rendertime/lang/cs/messages.po
@@ -0,0 +1,27 @@
+# ADDON rendertime
+# Copyright (C)
+# This file is distributed under the same license as the Friendica rendertime addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: rendertime.php:30
+#, php-format
+msgid ""
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Výkonnost: Databáze: %s, Síť: %s, Rendering: %s, Parser: %s, I/O: %s, Ostatní: %s, Celkem: %s"
diff --git a/rendertime/lang/cs/strings.php b/rendertime/lang/cs/strings.php
index ab4fa67a..151316c1 100644
--- a/rendertime/lang/cs/strings.php
+++ b/rendertime/lang/cs/strings.php
@@ -1,2 +1,8 @@
-<?php
-
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Výkonnost: Databáze: %s, Síť: %s, Rendering: %s, Parser: %s, I/O: %s, Ostatní: %s, Celkem: %s";
diff --git a/rendertime/lang/ro/messages.po b/rendertime/lang/ro/messages.po
new file mode 100644
index 00000000..d8686d5a
--- /dev/null
+++ b/rendertime/lang/ro/messages.po
@@ -0,0 +1,26 @@
+# ADDON rendertime
+# Copyright (C)
+# This file is distributed under the same license as the Friendica rendertime addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:06+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: rendertime.php:30
+#, php-format
+msgid ""
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Performantă: Baza de Date: %s, Rețea: %s, Procesare: %s, Analizator: %s, I/O: %s Altele: %s, Total: %s"
diff --git a/rendertime/lang/ro/strings.php b/rendertime/lang/ro/strings.php
new file mode 100644
index 00000000..2d3fd76a
--- /dev/null
+++ b/rendertime/lang/ro/strings.php
@@ -0,0 +1,8 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performantă: Baza de Date: %s, Rețea: %s, Procesare: %s, Analizator: %s, I/O: %s Altele: %s, Total: %s";
diff --git a/retriever/lang/C/messages.po b/retriever/lang/C/messages.po
new file mode 100644
index 00000000..e9d20af2
--- /dev/null
+++ b/retriever/lang/C/messages.po
@@ -0,0 +1,102 @@
+# ADDON retriever
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica retriever addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: retriever.php:445
+msgid "Retrieved"
+msgstr ""
+
+#: retriever.php:654
+msgid "Enabled"
+msgstr ""
+
+#: retriever.php:658
+msgid "URL Pattern"
+msgstr ""
+
+#: retriever.php:660
+msgid "Regular expression matching part of the URL to replace"
+msgstr ""
+
+#: retriever.php:663
+msgid "URL Replace"
+msgstr ""
+
+#: retriever.php:665
+msgid "Text to replace matching part of above regular expression"
+msgstr ""
+
+#: retriever.php:668
+msgid "Download Images"
+msgstr ""
+
+#: retriever.php:672
+msgid "Retrospectively Apply"
+msgstr ""
+
+#: retriever.php:674
+msgid "Reapply the rules to this number of posts"
+msgstr ""
+
+#: retriever.php:675
+msgid "Retrieve Feed Content"
+msgstr ""
+
+#: retriever.php:677 retriever.php:721
+msgid "Save Settings"
+msgstr ""
+
+#: retriever.php:679
+msgid "Tag"
+msgstr ""
+
+#: retriever.php:680
+msgid "Attribute"
+msgstr ""
+
+#: retriever.php:681
+msgid "Value"
+msgstr ""
+
+#: retriever.php:682
+msgid "Add"
+msgstr ""
+
+#: retriever.php:683
+msgid "Remove"
+msgstr ""
+
+#: retriever.php:684
+msgid "Include"
+msgstr ""
+
+#: retriever.php:686
+msgid "Exclude"
+msgstr ""
+
+#: retriever.php:697
+msgid "Retriever"
+msgstr ""
+
+#: retriever.php:722
+msgid "Retriever Settings"
+msgstr ""
+
+#: retriever.php:725
+msgid "All Photos"
+msgstr ""
diff --git a/showmore/lang/cs/messages.po b/showmore/lang/cs/messages.po
new file mode 100644
index 00000000..18cec5b8
--- /dev/null
+++ b/showmore/lang/cs/messages.po
@@ -0,0 +1,44 @@
+# ADDON showmore
+# Copyright (C)
+# This file is distributed under the same license as the Friendica showmore addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:11+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: showmore.php:38 showmore.php:42
+msgid "\"Show more\" Settings"
+msgstr "\"Show more\" nastavení"
+
+#: showmore.php:47
+msgid "Enable Show More"
+msgstr "Povolit Show more"
+
+#: showmore.php:50
+msgid "Cutting posts after how much characters"
+msgstr "Oříznout přízpěvky po zadaném množství znaků"
+
+#: showmore.php:54
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: showmore.php:71
+msgid "Show More Settings saved."
+msgstr "\"Show more\" nastavení uloženo."
+
+#: showmore.php:125
+msgid "show more"
+msgstr "zobrazit více"
diff --git a/showmore/lang/cs/strings.php b/showmore/lang/cs/strings.php
index 3e7bb970..622bd068 100644
--- a/showmore/lang/cs/strings.php
+++ b/showmore/lang/cs/strings.php
@@ -1,8 +1,13 @@
-<?php
-
-$a->strings["\"Show more\" Settings"] = "\"Show more\" nastavení";
-$a->strings["Enable Show More"] = "Povolit Show more";
-$a->strings["Cutting posts after how much characters"] = "Oříznout příspěvky po zadaném množství znaků";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Show More Settings saved."] = "Nastavení  \"Show more\" uloženo.";
-$a->strings["show more"] = "zobrazit více";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["\"Show more\" Settings"] = "\"Show more\" nastavení";
+$a->strings["Enable Show More"] = "Povolit Show more";
+$a->strings["Cutting posts after how much characters"] = "Oříznout přízpěvky po zadaném množství znaků";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Show More Settings saved."] = "\"Show more\" nastavení uloženo.";
+$a->strings["show more"] = "zobrazit více";
diff --git a/showmore/lang/de/messages.po b/showmore/lang/de/messages.po
new file mode 100644
index 00000000..4b4c956b
--- /dev/null
+++ b/showmore/lang/de/messages.po
@@ -0,0 +1,44 @@
+# ADDON showmore
+# Copyright (C)
+# This file is distributed under the same license as the Friendica showmore addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:22+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: showmore.php:38 showmore.php:42
+msgid "\"Show more\" Settings"
+msgstr "\"Mehr zeigen\" Einstellungen"
+
+#: showmore.php:47
+msgid "Enable Show More"
+msgstr "Aktiviere \"Mehr zeigen\""
+
+#: showmore.php:50
+msgid "Cutting posts after how much characters"
+msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
+
+#: showmore.php:54
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: showmore.php:71
+msgid "Show More Settings saved."
+msgstr "\"Mehr zeigen\" Einstellungen gesichert."
+
+#: showmore.php:125
+msgid "show more"
+msgstr "mehr anzeigen"
diff --git a/showmore/lang/de/strings.php b/showmore/lang/de/strings.php
index b3513fbf..f4df3488 100644
--- a/showmore/lang/de/strings.php
+++ b/showmore/lang/de/strings.php
@@ -1,8 +1,13 @@
-<?php
-
-$a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
-$a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
-$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
-$a->strings["Submit"] = "Senden";
-$a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
-$a->strings["show more"] = "mehr anzeigen";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
+$a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
+$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
+$a->strings["show more"] = "mehr anzeigen";
diff --git a/showmore/lang/ro/messages.po b/showmore/lang/ro/messages.po
new file mode 100644
index 00000000..3d9f3cba
--- /dev/null
+++ b/showmore/lang/ro/messages.po
@@ -0,0 +1,43 @@
+# ADDON showmore
+# Copyright (C)
+# This file is distributed under the same license as the Friendica showmore addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:06+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: showmore.php:38 showmore.php:42
+msgid "\"Show more\" Settings"
+msgstr "Configurări \"Afișează mai mult\""
+
+#: showmore.php:47
+msgid "Enable Show More"
+msgstr "Activare Afișează mai mult"
+
+#: showmore.php:50
+msgid "Cutting posts after how much characters"
+msgstr "Trunchiere postări, după câte caractere"
+
+#: showmore.php:54
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: showmore.php:71
+msgid "Show More Settings saved."
+msgstr "Configurările Afișează mai mult, au fost salvate"
+
+#: showmore.php:125
+msgid "show more"
+msgstr "afișează mai mult"
diff --git a/showmore/lang/ro/strings.php b/showmore/lang/ro/strings.php
new file mode 100644
index 00000000..a7c11992
--- /dev/null
+++ b/showmore/lang/ro/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"Show more\" Settings"] = "Configurări \"Afișează mai mult\"";
+$a->strings["Enable Show More"] = "Activare Afișează mai mult";
+$a->strings["Cutting posts after how much characters"] = "Trunchiere postări, după câte caractere";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Show More Settings saved."] = "Configurările Afișează mai mult, au fost salvate";
+$a->strings["show more"] = "afișează mai mult";
diff --git a/smiley_pack/lang/C/messages.po b/smiley_pack/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/smileybutton/lang/C/messages.po b/smileybutton/lang/C/messages.po
new file mode 100644
index 00000000..7c32045e
--- /dev/null
+++ b/smileybutton/lang/C/messages.po
@@ -0,0 +1,34 @@
+# ADDON smileybutton
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr ""
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr ""
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr ""
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr ""
diff --git a/smileybutton/lang/cs/messages.po b/smileybutton/lang/cs/messages.po
new file mode 100644
index 00000000..71059896
--- /dev/null
+++ b/smileybutton/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON smileybutton
+# Copyright (C)
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:15+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr "Smileybutton nastavení"
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr "Můžete skrýt tlačítko a zobrazit rovnou smajlíky."
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr "Skrýt tlačítko"
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/smileybutton/lang/cs/strings.php b/smileybutton/lang/cs/strings.php
new file mode 100644
index 00000000..e66f3401
--- /dev/null
+++ b/smileybutton/lang/cs/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Smileybutton settings"] = "Smileybutton nastavení";
+$a->strings["You can hide the button and show the smilies directly."] = "Můžete skrýt tlačítko a zobrazit rovnou smajlíky.";
+$a->strings["Hide the button"] = "Skrýt tlačítko";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/smileybutton/lang/ro/messages.po b/smileybutton/lang/ro/messages.po
new file mode 100644
index 00000000..b5cc27c2
--- /dev/null
+++ b/smileybutton/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON smileybutton
+# Copyright (C)
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:06+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr "Configurări Smileybutton"
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr "Puteți ascunde butonul şi afișa emoticoanele direct."
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr "Ascundeţi butonul"
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/smileybutton/lang/ro/strings.php b/smileybutton/lang/ro/strings.php
new file mode 100644
index 00000000..2a330a47
--- /dev/null
+++ b/smileybutton/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Smileybutton settings"] = "Configurări Smileybutton";
+$a->strings["You can hide the button and show the smilies directly."] = "Puteți ascunde butonul şi afișa emoticoanele direct.";
+$a->strings["Hide the button"] = "Ascundeţi butonul";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/smilies_adult/lang/C/messages.po b/smilies_adult/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/snautofollow/lang/cs/messages.po b/snautofollow/lang/cs/messages.po
new file mode 100644
index 00000000..933478c2
--- /dev/null
+++ b/snautofollow/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON snautofollow
+# Copyright (C)
+# This file is distributed under the same license as the Friendica snautofollow addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:12+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr "Nastavení automatického následování na StatusNet  aktualizováno."
+
+#: snautofollow.php:56 snautofollow.php:60
+msgid "StatusNet AutoFollow"
+msgstr "Nastavení StatusNet automatického následování (AutoFollow)"
+
+#: snautofollow.php:64
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr "Automaticky následovat jakékoliv StatusNet následníky/přispivatele"
+
+#: snautofollow.php:70
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/snautofollow/lang/cs/strings.php b/snautofollow/lang/cs/strings.php
index f293b65a..144b8d8e 100644
--- a/snautofollow/lang/cs/strings.php
+++ b/snautofollow/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["StatusNet AutoFollow settings updated."] = "Nastavení automatického následování na StatusNet  aktualizováno.";
-$a->strings["StatusNet AutoFollow Settings"] = "Nastavení StatusNet automatického následování (AutoFollow)";
-$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automaticky následovat jakékoliv StatusNet následníky/přispivatele";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["StatusNet AutoFollow settings updated."] = "Nastavení automatického následování na StatusNet  aktualizováno.";
+$a->strings["StatusNet AutoFollow"] = "Nastavení StatusNet automatického následování (AutoFollow)";
+$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automaticky následovat jakékoliv StatusNet následníky/přispivatele";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/snautofollow/lang/ro/messages.po b/snautofollow/lang/ro/messages.po
new file mode 100644
index 00000000..108b6c87
--- /dev/null
+++ b/snautofollow/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON snautofollow
+# Copyright (C)
+# This file is distributed under the same license as the Friendica snautofollow addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:07+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr "Configurări StatusNet AutoFollow actualizate."
+
+#: snautofollow.php:56 snautofollow.php:60
+msgid "StatusNet AutoFollow"
+msgstr "StatusNet AutoFollow"
+
+#: snautofollow.php:64
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr "Urmărește automat orice susținător/pe cei ce vă menționează pe StatusNet"
+
+#: snautofollow.php:70
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/snautofollow/lang/ro/strings.php b/snautofollow/lang/ro/strings.php
new file mode 100644
index 00000000..b8fb967f
--- /dev/null
+++ b/snautofollow/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["StatusNet AutoFollow settings updated."] = "Configurări StatusNet AutoFollow actualizate.";
+$a->strings["StatusNet AutoFollow"] = "StatusNet AutoFollow";
+$a->strings["Automatically follow any StatusNet followers/mentioners"] = "Urmărește automat orice susținător/pe cei ce vă menționează pe StatusNet";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/sniper/lang/C/messages.po b/sniper/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/startpage/lang/cs/messages.po b/startpage/lang/cs/messages.po
new file mode 100644
index 00000000..ae51ece9
--- /dev/null
+++ b/startpage/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON startpage
+# Copyright (C)
+# This file is distributed under the same license as the Friendica startpage addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:13+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: startpage.php:83 startpage.php:87
+msgid "Startpage"
+msgstr "Úvodní stránka"
+
+#: startpage.php:90
+msgid "Home page to load after login  - leave blank for profile wall"
+msgstr "Domácí stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné"
+
+#: startpage.php:93
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Příklady: \"síť\" nebo \"notifikace systému\""
+
+#: startpage.php:97
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/startpage/lang/cs/strings.php b/startpage/lang/cs/strings.php
index d48262c9..39d3f221 100644
--- a/startpage/lang/cs/strings.php
+++ b/startpage/lang/cs/strings.php
@@ -1,6 +1,11 @@
-<?php
-
-$a->strings["Startpage Settings"] = "Nastavení úvodní stránky";
-$a->strings["Home page to load after login  - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné";
-$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Příklady: \"síť\" nebo \"notifikace systému\"";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Startpage"] = "Úvodní stránka";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Příklady: \"síť\" nebo \"notifikace systému\"";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/startpage/lang/ro/messages.po b/startpage/lang/ro/messages.po
new file mode 100644
index 00000000..b97a0c33
--- /dev/null
+++ b/startpage/lang/ro/messages.po
@@ -0,0 +1,35 @@
+# ADDON startpage
+# Copyright (C)
+# This file is distributed under the same license as the Friendica startpage addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:07+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: startpage.php:83 startpage.php:87
+msgid "Startpage"
+msgstr "Startpage"
+
+#: startpage.php:90
+msgid "Home page to load after login  - leave blank for profile wall"
+msgstr "Pagina de întâmpinare ce va fi încărcată după autentificare - lăsați necompletat pentru perete de profil"
+
+#: startpage.php:93
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Exemple: &quot;rețea&quot; sau &quot;notificări/sistem&quot;"
+
+#: startpage.php:97
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/startpage/lang/ro/strings.php b/startpage/lang/ro/strings.php
new file mode 100644
index 00000000..701b5f9a
--- /dev/null
+++ b/startpage/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Startpage"] = "Startpage";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Pagina de întâmpinare ce va fi încărcată după autentificare - lăsați necompletat pentru perete de profil";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemple: &quot;rețea&quot; sau &quot;notificări/sistem&quot;";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/statistics_json/lang/C/messages.po b/statistics_json/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/statusnet/codebird.php b/statusnet/codebird.php
index cba5f936..14d231d7 100644
--- a/statusnet/codebird.php
+++ b/statusnet/codebird.php
@@ -820,7 +820,7 @@ class CodebirdSN
                 }
 
 		// To-Do
-		$tempfile = tempnam(get_temppath(), "mimecheck");
+		$tempfile = tempnam(get_config("system","temppath"), "mimecheck");
 		file_put_contents($tempfile, $data);
 		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 		unlink($tempfile);
diff --git a/statusnet/lang/cs/messages.po b/statusnet/lang/cs/messages.po
new file mode 100644
index 00000000..1b0afde5
--- /dev/null
+++ b/statusnet/lang/cs/messages.po
@@ -0,0 +1,171 @@
+# ADDON statusnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica statusnet addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:15+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: statusnet.php:149
+msgid "Post to StatusNet"
+msgstr "Poslat příspěvek na StatusNet"
+
+#: statusnet.php:194
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný."
+
+#: statusnet.php:223
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "S cestou, kterou jste zadali, se nebylo možné spojit s API StatusNetu."
+
+#: statusnet.php:257
+msgid "StatusNet settings updated."
+msgstr "Nastavení StatusNetu aktualizováno."
+
+#: statusnet.php:289 statusnet.php:293
+msgid "StatusNet Import/Export/Mirror"
+msgstr "StatusNet Import/Export/Zrcadlení"
+
+#: statusnet.php:308
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "Globálně dostupné StatusNet OAuth klíče"
+
+#: statusnet.php:309
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr "Jsou dostupné přednastavené OAuth páry klíčů pro některé servery StatusNetu. Pokud používáte některý z nich, použijte toto přihlášení. Pokud ne, neváhejte se připojit k jiné instanci StatusNet (viz níže)."
+
+#: statusnet.php:315 statusnet.php:332 statusnet.php:359 statusnet.php:366
+#: statusnet.php:404 statusnet.php:673
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: statusnet.php:317
+msgid "Provide your own OAuth Credentials"
+msgstr "Uveďte své vlastní OAuth přihlašovací údaje"
+
+#: statusnet.php:318
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as"
+" an desktop client on your StatusNet account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited StatusNet installation."
+msgstr "Nenalezen žádný spotřebitelský páru klíčů pro StatusNet. Zaregistrujte si svůj účet Friendica jako desktopový klient ve Vašem účtu StatusNet, zkopírujte si sem spotřebitelský páru klíčů a vložte API base root.<br />Předtím, než si zaregistrujete Váš vlastní pár klíčů OAuth, zjistěte si od Friendica administrátora, zda-li již existuje pár klíčů pro tuto instalaci Friendica pro Vaši oblíbenou StatusNet instalaci."
+
+#: statusnet.php:320
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: statusnet.php:323
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: statusnet.php:326 statusnet.php:653 statusnet.php:665
+msgid "Base API Path (remember the trailing /)"
+msgstr "Cesta k Base API  (nezapomeňte na koncové /)"
+
+#: statusnet.php:329
+msgid "StatusNet application name"
+msgstr "StatusNet název aplikace"
+
+#: statusnet.php:351
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below"
+" and submit the form. Only your <strong>public</strong> posts will be posted"
+" to StatusNet."
+msgstr "Chcete-li připojit k vašemu účtu StatusNet klikněte na tlačítko níže, abyste dostati bezpečnostní kód ze StatusNetu, který musíte zkopírovat do vstupního pole níže a odelat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou zveřejněny na StatusNetu."
+
+#: statusnet.php:352
+msgid "Log in with StatusNet"
+msgstr "Přihlásit se s StatusNet"
+
+#: statusnet.php:354
+msgid "Copy the security code from StatusNet here"
+msgstr "Zkopírujte sem bezpečnostní kód ze StatusNet"
+
+#: statusnet.php:360
+msgid "Cancel Connection Process"
+msgstr "Zrušit připojování"
+
+#: statusnet.php:362
+msgid "Current StatusNet API is"
+msgstr "Aktuální StatusNet API je"
+
+#: statusnet.php:363
+msgid "Cancel StatusNet Connection"
+msgstr "Zrušit StatusNet připojení"
+
+#: statusnet.php:374
+msgid "Currently connected to: "
+msgstr "V současné době připojen k:"
+
+#: statusnet.php:375
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
+msgstr "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související StatusNet účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."
+
+#: statusnet.php:377
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) \nodkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě StatusNet přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen."
+
+#: statusnet.php:380
+msgid "Allow posting to StatusNet"
+msgstr "Povolit zasílání příspěvků na StatusNet"
+
+#: statusnet.php:383
+msgid "Send public postings to StatusNet by default"
+msgstr "Standardně poslílat veřejné příspěvky na StatusNet"
+
+#: statusnet.php:387
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr "Zrcadlit všechny příspěvky ze statusnet, které nejsou odpověďmi nebo opakovanými zprávami"
+
+#: statusnet.php:392
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
+
+#: statusnet.php:401
+msgid "Clear OAuth configuration"
+msgstr "Vymazat konfiguraci OAuth"
+
+#: statusnet.php:664
+msgid "Site name"
+msgstr "Název webu"
+
+#: statusnet.php:666
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: statusnet.php:667
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: statusnet.php:668
+msgid "Application name"
+msgstr "Název aplikace"
diff --git a/statusnet/lang/cs/strings.php b/statusnet/lang/cs/strings.php
index 74e31eeb..277f6317 100644
--- a/statusnet/lang/cs/strings.php
+++ b/statusnet/lang/cs/strings.php
@@ -1,33 +1,39 @@
-<?php
-
-$a->strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet";
-$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný.";
-$a->strings["We could not contact the StatusNet API with the Path you entered."] = "S cestou, kterou jste zadali, se nebylo možné spojit s API StatusNetu.";
-$a->strings["StatusNet settings updated."] = "Nastavení StatusNetu aktualizováno.";
-$a->strings["StatusNet Posting Settings"] = "Nastavení zasílání příspěvků na StatusNet ";
-$a->strings["Globally Available StatusNet OAuthKeys"] = "Globálně dostupné StatusNet OAuth klíče";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Jsou dostupné přednastavené OAuth páry klíčů pro některé servery StatusNetu. Pokud používáte některý z nich, použijte toto přihlášení. Pokud ne, neváhejte se připojit k jiné instanci StatusNet (viz níže).";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Provide your own OAuth Credentials"] = "Uveďte své vlastní OAuth přihlašovací údaje";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenalezen žádný spotřebitelský páru klíčů pro StatusNet. Zaregistrujte si svůj účet Friendica jako desktopový klient ve Vašem účtu StatusNet, zkopírujte si sem spotřebitelský páru klíčů a vložte API base root.<br />Předtím, než si zaregistrujete Váš vlastní pár klíčů OAuth, zjistěte si od Friendica administrátora, zda-li již existuje pár klíčů pro tuto instalaci Friendica pro Vaši oblíbenou StatusNet instalaci.";
-$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
-$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
-$a->strings["Base API Path (remember the trailing /)"] = "Cesta k Base API  (nezapomeňte na koncový /)";
-$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Chcete-li připojit k vašemu účtu StatusNet klikněte na tlačítko níže, abyste dostati bezpečnostní kód ze StatusNetu, který musíte zkopírovat do vstupního pole níže a odelat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou zveřejněny na StatusNetu.";
-$a->strings["Log in with StatusNet"] = "Přihlásit se s StatusNet";
-$a->strings["Copy the security code from StatusNet here"] = "Zkopírujte sem bezpečnostní kód ze StatusNet";
-$a->strings["Cancel Connection Process"] = "Zrušit připojování";
-$a->strings["Current StatusNet API is"] = "Aktuální StatusNet API je";
-$a->strings["Cancel StatusNet Connection"] = "Zrušit StatusNet připojení";
-$a->strings["Currently connected to: "] = "V současné době připojen k:";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související StatusNet účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) 
-odkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě StatusNet přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen.";
-$a->strings["Allow posting to StatusNet"] = "Povolit zasílání příspěvků na StatusNet";
-$a->strings["Send public postings to StatusNet by default"] = "Standardně poslílat veřejné příspěvky na StatusNet";
-$a->strings["Send linked #-tags and @-names to StatusNet"] = "Poslat propojené #-tagy a @-jména na StatusNet";
-$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
-$a->strings["Site name"] = "Název webu";
-$a->strings["API URL"] = "API URL";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Consumer Key"] = "Consumer Key";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to StatusNet"] = "Poslat příspěvek na StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "S cestou, kterou jste zadali, se nebylo možné spojit s API StatusNetu.";
+$a->strings["StatusNet settings updated."] = "Nastavení StatusNetu aktualizováno.";
+$a->strings["StatusNet Import/Export/Mirror"] = "StatusNet Import/Export/Zrcadlení";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "Globálně dostupné StatusNet OAuth klíče";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Jsou dostupné přednastavené OAuth páry klíčů pro některé servery StatusNetu. Pokud používáte některý z nich, použijte toto přihlášení. Pokud ne, neváhejte se připojit k jiné instanci StatusNet (viz níže).";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Provide your own OAuth Credentials"] = "Uveďte své vlastní OAuth přihlašovací údaje";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nenalezen žádný spotřebitelský páru klíčů pro StatusNet. Zaregistrujte si svůj účet Friendica jako desktopový klient ve Vašem účtu StatusNet, zkopírujte si sem spotřebitelský páru klíčů a vložte API base root.<br />Předtím, než si zaregistrujete Váš vlastní pár klíčů OAuth, zjistěte si od Friendica administrátora, zda-li již existuje pár klíčů pro tuto instalaci Friendica pro Vaši oblíbenou StatusNet instalaci.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Cesta k Base API  (nezapomeňte na koncové /)";
+$a->strings["StatusNet application name"] = "StatusNet název aplikace";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Chcete-li připojit k vašemu účtu StatusNet klikněte na tlačítko níže, abyste dostati bezpečnostní kód ze StatusNetu, který musíte zkopírovat do vstupního pole níže a odelat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou zveřejněny na StatusNetu.";
+$a->strings["Log in with StatusNet"] = "Přihlásit se s StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Zkopírujte sem bezpečnostní kód ze StatusNet";
+$a->strings["Cancel Connection Process"] = "Zrušit připojování";
+$a->strings["Current StatusNet API is"] = "Aktuální StatusNet API je";
+$a->strings["Cancel StatusNet Connection"] = "Zrušit StatusNet připojení";
+$a->strings["Currently connected to: "] = "V současné době připojen k:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související StatusNet účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) \nodkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě StatusNet přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen.";
+$a->strings["Allow posting to StatusNet"] = "Povolit zasílání příspěvků na StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Standardně poslílat veřejné příspěvky na StatusNet";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Zrcadlit všechny příspěvky ze statusnet, které nejsou odpověďmi nebo opakovanými zprávami";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
+$a->strings["Site name"] = "Název webu";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Application name"] = "Název aplikace";
diff --git a/statusnet/lang/ro/messages.po b/statusnet/lang/ro/messages.po
new file mode 100644
index 00000000..c3c07e5f
--- /dev/null
+++ b/statusnet/lang/ro/messages.po
@@ -0,0 +1,170 @@
+# ADDON statusnet
+# Copyright (C)
+# This file is distributed under the same license as the Friendica statusnet addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:08+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: statusnet.php:149
+msgid "Post to StatusNet"
+msgstr "Postați pe StatusNet"
+
+#: statusnet.php:194
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
+msgstr "Vă rugăm să vă contactați administratorul de site. <br />URL-ul API furnizat, nu este valid."
+
+#: statusnet.php:223
+msgid "We could not contact the StatusNet API with the Path you entered."
+msgstr "Nu am putut conecta API pentru StatusNet la Calea pe care ați introdus-o."
+
+#: statusnet.php:257
+msgid "StatusNet settings updated."
+msgstr "Configurările StatusNet au fost actualizate."
+
+#: statusnet.php:289 statusnet.php:293
+msgid "StatusNet Import/Export/Mirror"
+msgstr "Import/Export/Clonare StatusNet"
+
+#: statusnet.php:308
+msgid "Globally Available StatusNet OAuthKeys"
+msgstr "Cheile OAuthKeys StatusNet Disponibile Global"
+
+#: statusnet.php:309
+msgid ""
+"There are preconfigured OAuth key pairs for some StatusNet servers "
+"available. If you are useing one of them, please use these credentials. If "
+"not feel free to connect to any other StatusNet instance (see below)."
+msgstr "Acolo sunt preconfigurate perechile de chei OAuthKeys pentru anumite servere StatusNet disponibile. Dacă folosiți una dintre ele, vă rugăm să utilizați aceste acreditive. Dacă nu, vă puteți conecta la orice altă instanță StatusNet (vedeți mai jos)."
+
+#: statusnet.php:315 statusnet.php:332 statusnet.php:359 statusnet.php:366
+#: statusnet.php:404 statusnet.php:673
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: statusnet.php:317
+msgid "Provide your own OAuth Credentials"
+msgstr "Furnizați propriile dvs. Acreditive OAuth"
+
+#: statusnet.php:318
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica Account as"
+" an desktop client on your StatusNet account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited StatusNet installation."
+msgstr "Nici o pereche de chei de utilizator pentru StatusNet, nu fost găsită. Înregistrați-vă Contul Friendica, ca și client  desktop, pe contul dvs. StatusNet, copiați aici pereche de chei de utilizator, şi introduceți rădăcina-bazei API. <br />Înainte să vă înregistrați propria pereche de chei OAuth, întrebați administratorul dacă nu există deja o pereche de chei, pentru această instalare Friendica, conectată la instalarea dvs. favorită StatusNet."
+
+#: statusnet.php:320
+msgid "OAuth Consumer Key"
+msgstr "Cheia Utilizatorului OAuth"
+
+#: statusnet.php:323
+msgid "OAuth Consumer Secret"
+msgstr "Cheia Secretă a Utilizatorului OAuth"
+
+#: statusnet.php:326 statusnet.php:653 statusnet.php:665
+msgid "Base API Path (remember the trailing /)"
+msgstr "Cale-Bază API (nu uitați de slash /)"
+
+#: statusnet.php:329
+msgid "StatusNet application name"
+msgstr "Numele Aplicației StatusNet"
+
+#: statusnet.php:351
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below"
+" and submit the form. Only your <strong>public</strong> posts will be posted"
+" to StatusNet."
+msgstr "Pentru a vă conecta la contul dvs. StatusNet apăsați pe butonul de mai jos pentru a obține un cod de securitate de la StatusNet, pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dvs.<strong>publice</strong> vor fi postate pe StatusNet."
+
+#: statusnet.php:352
+msgid "Log in with StatusNet"
+msgstr "Autentificare cu StatusNet"
+
+#: statusnet.php:354
+msgid "Copy the security code from StatusNet here"
+msgstr "Copiați aici codul de securitate din StatusNet"
+
+#: statusnet.php:360
+msgid "Cancel Connection Process"
+msgstr "Anulare Proces de Conectare"
+
+#: statusnet.php:362
+msgid "Current StatusNet API is"
+msgstr "Cheia API StatusNet Curentă este"
+
+#: statusnet.php:363
+msgid "Cancel StatusNet Connection"
+msgstr "Anulare Conectare StatusNet"
+
+#: statusnet.php:374
+msgid "Currently connected to: "
+msgstr "Conectat curent la:"
+
+#: statusnet.php:375
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
+msgstr "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul StatusNet asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj."
+
+#: statusnet.php:377
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către StatusNet, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat."
+
+#: statusnet.php:380
+msgid "Allow posting to StatusNet"
+msgstr "Permite postarea pe StatusNet"
+
+#: statusnet.php:383
+msgid "Send public postings to StatusNet by default"
+msgstr "Trimite postările publice pe StatusNet, ca și implicit"
+
+#: statusnet.php:387
+msgid ""
+"Mirror all posts from statusnet that are no replies or repeated messages"
+msgstr "Clonează toate postările, din StatusNet, care nu sunt răspunsuri sau mesaje repetate"
+
+#: statusnet.php:392
+msgid "Import the remote timeline"
+msgstr "Importare cronologie la distanță"
+
+#: statusnet.php:401
+msgid "Clear OAuth configuration"
+msgstr "Ștergeți configurările OAuth "
+
+#: statusnet.php:664
+msgid "Site name"
+msgstr "Numele saitului"
+
+#: statusnet.php:666
+msgid "Consumer Secret"
+msgstr "Cheia Secretă a Utilizatorului"
+
+#: statusnet.php:667
+msgid "Consumer Key"
+msgstr "Cheia Utilizatorului"
+
+#: statusnet.php:668
+msgid "Application name"
+msgstr "Numele aplicației"
diff --git a/statusnet/lang/ro/strings.php b/statusnet/lang/ro/strings.php
new file mode 100644
index 00000000..c5a8fff8
--- /dev/null
+++ b/statusnet/lang/ro/strings.php
@@ -0,0 +1,39 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to StatusNet"] = "Postați pe StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Vă rugăm să vă contactați administratorul de site. <br />URL-ul API furnizat, nu este valid.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Nu am putut conecta API pentru StatusNet la Calea pe care ați introdus-o.";
+$a->strings["StatusNet settings updated."] = "Configurările StatusNet au fost actualizate.";
+$a->strings["StatusNet Import/Export/Mirror"] = "Import/Export/Clonare StatusNet";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "Cheile OAuthKeys StatusNet Disponibile Global";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Acolo sunt preconfigurate perechile de chei OAuthKeys pentru anumite servere StatusNet disponibile. Dacă folosiți una dintre ele, vă rugăm să utilizați aceste acreditive. Dacă nu, vă puteți conecta la orice altă instanță StatusNet (vedeți mai jos).";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Provide your own OAuth Credentials"] = "Furnizați propriile dvs. Acreditive OAuth";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nici o pereche de chei de utilizator pentru StatusNet, nu fost găsită. Înregistrați-vă Contul Friendica, ca și client  desktop, pe contul dvs. StatusNet, copiați aici pereche de chei de utilizator, şi introduceți rădăcina-bazei API. <br />Înainte să vă înregistrați propria pereche de chei OAuth, întrebați administratorul dacă nu există deja o pereche de chei, pentru această instalare Friendica, conectată la instalarea dvs. favorită StatusNet.";
+$a->strings["OAuth Consumer Key"] = "Cheia Utilizatorului OAuth";
+$a->strings["OAuth Consumer Secret"] = "Cheia Secretă a Utilizatorului OAuth";
+$a->strings["Base API Path (remember the trailing /)"] = "Cale-Bază API (nu uitați de slash /)";
+$a->strings["StatusNet application name"] = "Numele Aplicației StatusNet";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Pentru a vă conecta la contul dvs. StatusNet apăsați pe butonul de mai jos pentru a obține un cod de securitate de la StatusNet, pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dvs.<strong>publice</strong> vor fi postate pe StatusNet.";
+$a->strings["Log in with StatusNet"] = "Autentificare cu StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Copiați aici codul de securitate din StatusNet";
+$a->strings["Cancel Connection Process"] = "Anulare Proces de Conectare";
+$a->strings["Current StatusNet API is"] = "Cheia API StatusNet Curentă este";
+$a->strings["Cancel StatusNet Connection"] = "Anulare Conectare StatusNet";
+$a->strings["Currently connected to: "] = "Conectat curent la:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul StatusNet asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către StatusNet, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.";
+$a->strings["Allow posting to StatusNet"] = "Permite postarea pe StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Trimite postările publice pe StatusNet, ca și implicit";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Clonează toate postările, din StatusNet, care nu sunt răspunsuri sau mesaje repetate";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Clear OAuth configuration"] = "Ștergeți configurările OAuth ";
+$a->strings["Site name"] = "Numele saitului";
+$a->strings["Consumer Secret"] = "Cheia Secretă a Utilizatorului";
+$a->strings["Consumer Key"] = "Cheia Utilizatorului";
+$a->strings["Application name"] = "Numele aplicației";
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c3591356..b619a042 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -118,7 +118,6 @@ function statusnet_install() {
 	register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	register_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
-	register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
 	logger("installed statusnet");
 }
 
@@ -130,7 +129,6 @@ function statusnet_uninstall() {
 	unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	unregister_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
-	unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
@@ -308,7 +306,7 @@ function statusnet_settings(&$a,&$s) {
 		 */
 		if (! $globalsn == null) {
 			$s .= '<h4>' . t('Globally Available StatusNet OAuthKeys') . '</h4>';
-			$s .= '<p>'. t("There are preconfigured OAuth key pairs for some StatusNet servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other StatusNet instance \x28see below\x29.") .'</p>';
+			$s .= '<p>'. t("There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance \x28see below\x29.") .'</p>';
 			$s .= '<div id="statusnet-preconf-wrapper">';
 			foreach ($globalsn as $asn) {
 				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
@@ -496,13 +494,8 @@ function statusnet_post_hook(&$a,&$b) {
 			$orig_post = $r[0];
 		}
 
-		//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
-		//$nicknameplain = "@".$orig_post["contact_nick"];
-
-		$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
-
-		$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
-		$nicknameplain = "@".$nick;
+		$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
+		$nicknameplain = "@".$orig_post["contact_nick"];
 
 		logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
 		if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
@@ -555,12 +548,10 @@ function statusnet_post_hook(&$a,&$b) {
 		$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent
 
-		set_pconfig($b['uid'], 'statusnet', 'max_char', $max_char);
-
 		$tempfile = "";
 		require_once("include/plaintext.php");
 		require_once("include/network.php");
-		$msgarr = plaintext($a, $b, $max_char, true, 7);
+		$msgarr = plaintext($a, $b, $max_char, true);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") AND isset($msgarr["title"]))
@@ -574,12 +565,12 @@ function statusnet_post_hook(&$a,&$b) {
 				$msg .= " \n".short_link($msgarr["url"]);
 			else
 				$msg .= " \n".$msgarr["url"];
-		} elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
+		} elseif (isset($msgarr["image"]))
 			$image = $msgarr["image"];
 
 		if ($image != "") {
 			$img_str = fetch_url($image);
-			$tempfile = tempnam(get_temppath(), "cache");
+			$tempfile = tempnam(get_config("system","temppath"), "cache");
 			file_put_contents($tempfile, $img_str);
 			$postdata = array("status" => $msg, "media[]" => $tempfile);
 		} else
@@ -684,53 +675,6 @@ function statusnet_plugin_admin(&$a, &$o){
 	));
 }
 
-function statusnet_prepare_body(&$a,&$b) {
-        if ($b["item"]["network"] != NETWORK_STATUSNET)
-                return;
-
-        if ($b["preview"]) {
-		$max_char = get_pconfig(local_user(),'statusnet','max_char');
-		if (intval($max_char) == 0)
-			$max_char = 140;
-
-                require_once("include/plaintext.php");
-                $item = $b["item"];
-                $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
-
-		$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
-                        FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-                        WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
-                        dbesc($item["thr-parent"]),
-                        intval(local_user()));
-
-                if(count($r)) {
-                        $orig_post = $r[0];
-			//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
-			//$nicknameplain = "@".$orig_post["contact_nick"];
-
-			$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
-
-			$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
-			$nicknameplain = "@".$nick;
-
-	                if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
-	                        $item["body"] = $nickname." ".$item["body"];
-                }
-
-
-                $msgarr = plaintext($a, $item, $max_char, true, 7);
-                $msg = $msgarr["text"];
-
-                if (isset($msgarr["url"]))
-                        $msg .= " ".$msgarr["url"];
-
-                if (isset($msgarr["image"]))
-                        $msg .= " ".$msgarr["image"];
-
-                $b['html'] = nl2br(htmlspecialchars($msg));
-        }
-}
-
 function statusnet_cron($a,$b) {
 	$last = get_config('statusnet','last_poll');
 
@@ -1054,8 +998,6 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 
 	require_once("include/html2bbcode.php");
 
-	logger("statusnet_createpost: start", LOGGER_DEBUG);
-
 	$api = get_pconfig($uid, 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
@@ -1064,14 +1006,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	$postarray['gravity'] = 0;
 	$postarray['uid'] = $uid;
 	$postarray['wall'] = 0;
-
-	if (is_object($post->retweeted_status)) {
-		$content = $post->retweeted_status;
-		statusnet_fetch_contact($uid, $content->user, false);
-	} else
-		$content = $post;
-
-	$postarray['uri'] = $hostname."::".$content->id;
+	$postarray['uri'] = $hostname."::".$post->id;
 
 	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($postarray['uri']),
@@ -1083,9 +1018,9 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 
 	$contactid = 0;
 
-	if ($content->in_reply_to_status_id != "") {
+	if ($post->in_reply_to_status_id != "") {
 
-		$parent = $hostname."::".$content->in_reply_to_status_id;
+		$parent = $hostname."::".$post->in_reply_to_status_id;
 
 		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent),
@@ -1094,8 +1029,6 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		if (count($r)) {
 			$postarray['thr-parent'] = $r[0]["uri"];
 			$postarray['parent-uri'] = $r[0]["parent-uri"];
-			$postarray['parent'] = $r[0]["parent"];
-			$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 		} else {
 			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($parent),
@@ -1104,19 +1037,16 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			if (count($r)) {
 				$postarray['thr-parent'] = $r[0]['uri'];
 				$postarray['parent-uri'] = $r[0]['parent-uri'];
-				$postarray['parent'] = $r[0]['parent'];
-				$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 			} else {
 				$postarray['thr-parent'] = $postarray['uri'];
 				$postarray['parent-uri'] = $postarray['uri'];
-				$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
 			}
 		}
 
 		// Is it me?
 		$own_url = get_pconfig($uid, 'statusnet', 'own_url');
 
-		if ($content->user->id == $own_url) {
+		if ($post->user->id == $own_url) {
 			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 				intval($uid));
 
@@ -1129,12 +1059,8 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			} else
 				return(array());
 		}
-		// Don't create accounts of people who just comment something
-		$create_user = false;
-	} else {
+	} else
 		$postarray['parent-uri'] = $postarray['uri'];
-		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
-	}
 
 	if ($contactid == 0) {
 		$contactid = statusnet_fetch_contact($uid, $post->user, $create_user);
@@ -1150,44 +1076,43 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	$postarray['contact-id'] = $contactid;
 
 	$postarray['verb'] = ACTIVITY_POST;
-
-	$postarray['author-name'] = $content->user->name;
-	$postarray['author-link'] = $content->user->statusnet_profile_url;
-	$postarray['author-avatar'] = $content->user->profile_image_url;
+	$postarray['author-name'] = $postarray['owner-name'];
+	$postarray['author-link'] = $postarray['owner-link'];
+	$postarray['author-avatar'] = $postarray['owner-avatar'];
 
 	// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
 	$hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi'));
 
-	$postarray['plink'] = $hostname.$content->id;
-	$postarray['app'] = strip_tags($content->source);
+	$postarray['plink'] = $hostname.$post->id;
+	$postarray['app'] = strip_tags($post->source);
 
-	if ($content->user->protected) {
+	if ($post->user->protected) {
 		$postarray['private'] = 1;
 		$postarray['allow_cid'] = '<' . $self['id'] . '>';
 	}
 
-	$postarray['body'] = html2bbcode($content->statusnet_html);
+	$postarray['body'] = html2bbcode($post->statusnet_html);
 
 	$converted = statusnet_convertmsg($a, $postarray['body'], false);
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
 
-	$postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
-	$postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
+	$postarray['created'] = datetime_convert('UTC','UTC',$post->created_at);
+	$postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at);
 
-	if (is_string($content->place->name))
-		$postarray["location"] = $content->place->name;
+	if (is_string($post->place->name))
+		$postarray["location"] = $post->place->name;
 
-	if (is_string($content->place->full_name))
-		$postarray["location"] = $content->place->full_name;
+	if (is_string($post->place->full_name))
+		$postarray["location"] = $post->place->full_name;
 
-	if (is_array($content->geo->coordinates))
-		$postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
+	if (is_array($post->geo->coordinates))
+		$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
 
-	if (is_array($content->coordinates->coordinates))
-		$postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->coordinates->coordinates[0];
+	if (is_array($post->coordinates->coordinates))
+		$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
 
-	/*if (is_object($post->retweeted_status)) {
+	if (is_object($post->retweeted_status)) {
 		$postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html);
 
 		$converted = statusnet_convertmsg($a, $postarray['body'], false);
@@ -1200,15 +1125,12 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		$postarray['author-name'] = $post->retweeted_status->user->name;
 		$postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url;
 		$postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url;
-	}*/
-	logger("statusnet_createpost: end", LOGGER_DEBUG);
+	}
 	return($postarray);
 }
 
 function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) {
 
-	// This function necer worked and need cleanup
-
 	$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($uid)
 		);
@@ -1257,7 +1179,7 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 				'to_email'     => $user[0]['email'],
 				'uid'          => $user[0]['uid'],
 				'item'         => $postarray,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+				'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
 				'source_name'  => $postarray['author-name'],
 				'source_link'  => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
@@ -1425,10 +1347,8 @@ function statusnet_fetchhometimeline($a, $uid) {
 				dbesc($postarray['uri']),
 				intval($uid)
 			);
-			if (count($r)) {
+			if (count($r))
 				$item = $r[0]['id'];
-				$parent_id = $r[0]['parent'];
-			}
 
 			if ($item != 0) {
 				require_once('include/enotify.php');
@@ -1440,13 +1360,12 @@ function statusnet_fetchhometimeline($a, $uid) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
 					'verb'         => ACTIVITY_TAG,
-					'otype'        => 'item',
-					'parent'       => $parent_id,
+					'otype'        => 'item'
 				));
 			}
 		}
@@ -1473,7 +1392,7 @@ function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $
 		$posts = array_reverse($items);
 
 		foreach($posts AS $post) {
-			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
+			$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
 
 			if (trim($postarray['body']) == "")
 				continue;
@@ -1495,8 +1414,6 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 	require_once("include/items.php");
 	require_once("include/network.php");
 
-	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism","$1.$2.$3.$4/$5",$body);
-
 	$URLSearchString = "^\[\]";
 	$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER);
 
@@ -1509,16 +1426,10 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 		foreach ($matches AS $match) {
 			$search = "[url=".$match[1]."]".$match[2]."[/url]";
 
-			logger("statusnet_convertmsg: expanding url ".$match[1], LOGGER_DEBUG);
-
 			$expanded_url = original_url($match[1]);
 
-			logger("statusnet_convertmsg: fetching data for ".$expanded_url, LOGGER_DEBUG);
-
 			$oembed_data = oembed_fetch_url($expanded_url, true);
 
-			logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
-
 			if ($type == "")
 				$type = $oembed_data->type;
 			if ($oembed_data->type == "video") {
@@ -1535,7 +1446,7 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 			else {
 				$img_str = fetch_url($expanded_url, true, $redirects, 4);
 
-				$tempfile = tempnam(get_temppath(), "cache");
+				$tempfile = tempnam(get_config("system","temppath"), "cache");
 				file_put_contents($tempfile, $img_str);
 				$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 				unlink($tempfile);
@@ -1559,7 +1470,7 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 		if (($footerlink != "") AND (trim($footer) != "")) {
 			$removedlink = trim(str_replace($footerlink, "", $body));
 
-			if (($removedlink == "") OR strstr($body, $removedlink))
+			if (strstr($body, $removedlink))
 				$body = $removedlink;
 
 			$body .= $footer;
diff --git a/superblock/lang/cs/messages.po b/superblock/lang/cs/messages.po
new file mode 100644
index 00000000..a6193817
--- /dev/null
+++ b/superblock/lang/cs/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:16+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: superblock.php:52
+msgid "\"Superblock\" Settings"
+msgstr "\"Superblock\" Nastavení"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Čárkou oddělené URL adresy profilů určených k ignorování"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "SUPERBLOCK nastavení uloženo."
+
+#: superblock.php:143
+msgid "Block Completely"
+msgstr "Kompletně blokovat "
+
+#: superblock.php:163
+msgid "superblock settings updated"
+msgstr "superblock nastavení aktualizováno."
diff --git a/superblock/lang/cs/strings.php b/superblock/lang/cs/strings.php
index 174abc63..b693d3a9 100644
--- a/superblock/lang/cs/strings.php
+++ b/superblock/lang/cs/strings.php
@@ -1,10 +1,13 @@
-<?php
-
-$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Nastavení";
-$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["BLOCKEM Settings saved."] = "BLOCKEM nastavení uloženo.";
-$a->strings["Blocked %s - Click to open/close"] = "Blokován %s - Klikněte pro otevření/zavření";
-$a->strings["Unblock Author"] = "Odblokovat autora";
-$a->strings["Block Author"] = "Zablokovat autora";
-$a->strings["blockem settings updated"] = "blockem nastavení aktualizováno";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["\"Superblock\" Settings"] = "\"Superblock\" Nastavení";
+$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK nastavení uloženo.";
+$a->strings["Block Completely"] = "Kompletně blokovat ";
+$a->strings["superblock settings updated"] = "superblock nastavení aktualizováno.";
diff --git a/superblock/lang/ro/messages.po b/superblock/lang/ro/messages.po
new file mode 100644
index 00000000..1959c7d0
--- /dev/null
+++ b/superblock/lang/ro/messages.po
@@ -0,0 +1,43 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:08+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: superblock.php:52
+msgid "\"Superblock\" Settings"
+msgstr "Configurări \"Superblock\""
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Adresele URL de profil, de blocat, separate prin virgulă"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Configurările SUPERBLOCK au fost salvate."
+
+#: superblock.php:143
+msgid "Block Completely"
+msgstr "Blocare Completă"
+
+#: superblock.php:163
+msgid "superblock settings updated"
+msgstr "Configurările superblock au fost actualizate"
diff --git a/superblock/lang/ro/strings.php b/superblock/lang/ro/strings.php
new file mode 100644
index 00000000..ee0dfee0
--- /dev/null
+++ b/superblock/lang/ro/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"Superblock\" Settings"] = "Configurări \"Superblock\"";
+$a->strings["Comma separated profile URLS to block"] = "Adresele URL de profil, de blocat, separate prin virgulă";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["SUPERBLOCK Settings saved."] = "Configurările SUPERBLOCK au fost salvate.";
+$a->strings["Block Completely"] = "Blocare Completă";
+$a->strings["superblock settings updated"] = "Configurările superblock au fost actualizate";
diff --git a/testdrive/lang/cs/messages.po b/testdrive/lang/cs/messages.po
new file mode 100644
index 00000000..ec29d51d
--- /dev/null
+++ b/testdrive/lang/cs/messages.po
@@ -0,0 +1,41 @@
+# ADDON testdrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica testdrive addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:16+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: testdrive.php:67
+msgid "Administrator"
+msgstr "Administrátor"
+
+#: testdrive.php:94
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Platnost Vašeho účtu na %s vyprší během několika dní."
+
+#: testdrive.php:95
+msgid "Your Friendica test account is about to expire."
+msgstr "Váš Friendica testovací účet brzy vyprší."
+
+#: testdrive.php:96
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Ahoj %1$s,\n\nplatnost Vašeho testovacího účtu na %2$s vyprší za méně než 5 dní. Doufáme, že jste si testovací jízdu užili a že se Vám povedlo najít trvalý Friendica server pro Vaši integrovanou sociální komunikaci. List veřejně dostupných serverů je k dispozici na http://dir.friendica.com/siteinfo - a pro více informací, jak si vytvořit svůj vlastní server, navštivte stránky projektu Friendica na adrese http://friendica.com."
diff --git a/testdrive/lang/cs/strings.php b/testdrive/lang/cs/strings.php
index b541391d..d2d36aab 100644
--- a/testdrive/lang/cs/strings.php
+++ b/testdrive/lang/cs/strings.php
@@ -1,5 +1,11 @@
-<?php
-
-$a->strings["Administrator"] = "Administrátor";
-$a->strings["Your account on %s will expire in a few days."] = "Platnost Vašeho účtu na %s vyprší během několika dní.";
-$a->strings["Your Friendica test account is about to expire."] = "Váš Friendica testovací účet brzy vyprší.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Administrator"] = "Administrátor";
+$a->strings["Your account on %s will expire in a few days."] = "Platnost Vašeho účtu na %s vyprší během několika dní.";
+$a->strings["Your Friendica test account is about to expire."] = "Váš Friendica testovací účet brzy vyprší.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Ahoj %1\$s,\n\nplatnost Vašeho testovacího účtu na %2\$s vyprší za méně než 5 dní. Doufáme, že jste si testovací jízdu užili a že se Vám povedlo najít trvalý Friendica server pro Vaši integrovanou sociální komunikaci. List veřejně dostupných serverů je k dispozici na http://dir.friendica.com/siteinfo - a pro více informací, jak si vytvořit svůj vlastní server, navštivte stránky projektu Friendica na adrese http://friendica.com.";
diff --git a/testdrive/lang/ro/messages.po b/testdrive/lang/ro/messages.po
new file mode 100644
index 00000000..1576dcb3
--- /dev/null
+++ b/testdrive/lang/ro/messages.po
@@ -0,0 +1,40 @@
+# ADDON testdrive
+# Copyright (C)
+# This file is distributed under the same license as the Friendica testdrive addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:09+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: testdrive.php:67
+msgid "Administrator"
+msgstr "Administrator"
+
+#: testdrive.php:94
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr "Contul dvs. de pe %s va expira în câteva zile."
+
+#: testdrive.php:95
+msgid "Your Friendica test account is about to expire."
+msgstr "Contul dvs. de testare Friendica, este pe cale sa expire."
+
+#: testdrive.php:96
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Bună ziua %1$s,\n\nContul dumneavoastră de testare de pe %2$s va expira în mai puțin de cinci zile. Sperăm că v-ați bucurat de această perioadă de testare, şi că veți folosi această oportunitate pentru a găsi un site Friendica permanent, pentru integrarea comunicațiilor dvs. sociale. O listă a site-urilor publice este disponibilă pe http://dir.friendica.com/siteinfo - şi pentru mai multe informații referitoare la configurarea propriului server Friendica, vă rugăm să consultați site-ul web al proiectului Friendica, pe http://friendica.com."
diff --git a/testdrive/lang/ro/strings.php b/testdrive/lang/ro/strings.php
new file mode 100644
index 00000000..c647c3c7
--- /dev/null
+++ b/testdrive/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Contul dvs. de pe %s va expira în câteva zile.";
+$a->strings["Your Friendica test account is about to expire."] = "Contul dvs. de testare Friendica, este pe cale sa expire.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Bună ziua %1\$s,\n\nContul dumneavoastră de testare de pe %2\$s va expira în mai puțin de cinci zile. Sperăm că v-ați bucurat de această perioadă de testare, şi că veți folosi această oportunitate pentru a găsi un site Friendica permanent, pentru integrarea comunicațiilor dvs. sociale. O listă a site-urilor publice este disponibilă pe http://dir.friendica.com/siteinfo - şi pentru mai multe informații referitoare la configurarea propriului server Friendica, vă rugăm să consultați site-ul web al proiectului Friendica, pe http://friendica.com.";
diff --git a/tictac/lang/cs/messages.po b/tictac/lang/cs/messages.po
new file mode 100644
index 00000000..7e2725da
--- /dev/null
+++ b/tictac/lang/cs/messages.po
@@ -0,0 +1,74 @@
+# ADDON tictac
+# Copyright (C)
+# This file is distributed under the same license as the Friendica tictac addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:18+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Trojrozměrné Tic-Tac-Toe"
+
+#: tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
+
+#: tictac.php:58
+msgid "New game"
+msgstr "Nová hra"
+
+#: tictac.php:59
+msgid "New game with handicap"
+msgstr "Nová hra s handicapem"
+
+#: tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "Trojrozměrné tic-tac-toe je podobná této tradiční hře kromě toho, že se hraje na více úrovních současně."
+
+#: tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních."
+
+#: tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu."
+
+#: tictac.php:182
+msgid "You go first..."
+msgstr "Vy začněte ..."
+
+#: tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Tentokrát začnu já..."
+
+#: tictac.php:193
+msgid "You won!"
+msgstr "Vyhrál jste!"
+
+#: tictac.php:199 tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "Pat hra!"
+
+#: tictac.php:222
+msgid "I won!"
+msgstr "Vyhrál jsem!"
diff --git a/tictac/lang/cs/strings.php b/tictac/lang/cs/strings.php
index d53b4bf9..3913f06d 100644
--- a/tictac/lang/cs/strings.php
+++ b/tictac/lang/cs/strings.php
@@ -1,14 +1,19 @@
-<?php
-
-$a->strings["Three Dimensional Tic-Tac-Toe"] = "Trojrozměrné Tic-Tac-Toe";
-$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
-$a->strings["New game"] = "Nová hra";
-$a->strings["New game with handicap"] = "Nová hra s handicapem";
-$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Trojrozměrné tic-tac-toe je podobná této tradiční hře kromě toho, že se hraje na více úrovních současně.";
-$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních.";
-$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu.";
-$a->strings["You go first..."] = "Vy začněte ...";
-$a->strings["I'm going first this time..."] = "Tentokrát začnu já...";
-$a->strings["You won!"] = "Vyhrál jste!";
-$a->strings["\"Cat\" game!"] = "\"Kočičí\" hra!";
-$a->strings["I won!"] = "Vyhrál jsem!";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Trojrozměrné Tic-Tac-Toe";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Nová hra";
+$a->strings["New game with handicap"] = "Nová hra s handicapem";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Trojrozměrné tic-tac-toe je podobná této tradiční hře kromě toho, že se hraje na více úrovních současně.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu.";
+$a->strings["You go first..."] = "Vy začněte ...";
+$a->strings["I'm going first this time..."] = "Tentokrát začnu já...";
+$a->strings["You won!"] = "Vyhrál jste!";
+$a->strings["\"Cat\" game!"] = "Pat hra!";
+$a->strings["I won!"] = "Vyhrál jsem!";
diff --git a/tictac/lang/ro/messages.po b/tictac/lang/ro/messages.po
new file mode 100644
index 00000000..03076bef
--- /dev/null
+++ b/tictac/lang/ro/messages.po
@@ -0,0 +1,73 @@
+# ADDON tictac
+# Copyright (C)
+# This file is distributed under the same license as the Friendica tictac addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:09+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Tic-Tac-Toe Tridimensional"
+
+#: tictac.php:53
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
+
+#: tictac.php:58
+msgid "New game"
+msgstr "Joc nou"
+
+#: tictac.php:59
+msgid "New game with handicap"
+msgstr "Joc nou cu handicap"
+
+#: tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr "Tic-tac-toe Tridimensional este exact ca și jocul tradițional cu excepția faptului că acesta este jucat simultan pe multiple niveluri."
+
+#: tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr "În acest caz există trei niveluri. Câștigați prin obținerea a trei marcaje per line, la orice nivel, precum şi în sus, în jos, sau pe diagonală pe diferite niveluri."
+
+#: tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr "Jocul cu handicap, dezactivează poziția centrală din nivelul mediu, deoarece jucătorul consideră că acest pătrat are adeseori un avantaj incorect."
+
+#: tictac.php:182
+msgid "You go first..."
+msgstr "Bifează tu primul..."
+
+#: tictac.php:187
+msgid "I'm going first this time..."
+msgstr "Bifez eu primul, de data aceasta ..."
+
+#: tictac.php:193
+msgid "You won!"
+msgstr "Ai câştigat!"
+
+#: tictac.php:199 tictac.php:224
+msgid "\"Cat\" game!"
+msgstr "Joc \"Pisică\" !"
+
+#: tictac.php:222
+msgid "I won!"
+msgstr "Am câştigat!"
diff --git a/tictac/lang/ro/strings.php b/tictac/lang/ro/strings.php
new file mode 100644
index 00000000..5b0c79e6
--- /dev/null
+++ b/tictac/lang/ro/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe Tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Joc nou";
+$a->strings["New game with handicap"] = "Joc nou cu handicap";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tic-tac-toe Tridimensional este exact ca și jocul tradițional cu excepția faptului că acesta este jucat simultan pe multiple niveluri.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "În acest caz există trei niveluri. Câștigați prin obținerea a trei marcaje per line, la orice nivel, precum şi în sus, în jos, sau pe diagonală pe diferite niveluri.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Jocul cu handicap, dezactivează poziția centrală din nivelul mediu, deoarece jucătorul consideră că acest pătrat are adeseori un avantaj incorect.";
+$a->strings["You go first..."] = "Bifează tu primul...";
+$a->strings["I'm going first this time..."] = "Bifez eu primul, de data aceasta ...";
+$a->strings["You won!"] = "Ai câştigat!";
+$a->strings["\"Cat\" game!"] = "Joc \"Pisică\" !";
+$a->strings["I won!"] = "Am câştigat!";
diff --git a/tumblr/README b/tumblr/README
index 9b77bdcd..62d7fd04 100644
--- a/tumblr/README
+++ b/tumblr/README
@@ -1,7 +1,9 @@
-Register an application at this address:
-http://www.tumblr.com/oauth/apps
+Define in your .htconfig.php:
+$a->config['tumblr']['consumer_key'] = "your-consumer-key";
+$a->config['tumblr']['consumer_secret'] = "your-consumer-secret";
 
-use (your server name)addon/tumblr/callback.php as callback URL
+You can get it here:
+http://www.tumblr.com/oauth/apps
 
 Tumblr-OAuth-Library:
 https://groups.google.com/d/msg/tumblr-api/g6SeIBWvsnE/gnWqT9jFSlEJ
diff --git a/tumblr/lang/cs/messages.po b/tumblr/lang/cs/messages.po
new file mode 100644
index 00000000..83d24f70
--- /dev/null
+++ b/tumblr/lang/cs/messages.po
@@ -0,0 +1,64 @@
+# ADDON tumblr
+# Copyright (C)
+# This file is distributed under the same license as the Friendica tumblr addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-07 19:28+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: tumblr.php:35
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: tumblr.php:145
+msgid "You are now authenticated to tumblr."
+msgstr "Nyní jste přihlášen k tumblr."
+
+#: tumblr.php:146
+msgid "return to the connector page"
+msgstr "návrat ke stránce konektor"
+
+#: tumblr.php:159
+msgid "Post to Tumblr"
+msgstr "Příspěvek na Tumbir"
+
+#: tumblr.php:186 tumblr.php:190
+msgid "Tumblr Export"
+msgstr "Tumbir export"
+
+#: tumblr.php:194
+msgid "(Re-)Authenticate your tumblr page"
+msgstr "(Znovu) přihlásit k Vaší tumblr stránce"
+
+#: tumblr.php:198
+msgid "Enable Tumblr Post Plugin"
+msgstr "Povolit rozšíření Tumbir"
+
+#: tumblr.php:203
+msgid "Post to Tumblr by default"
+msgstr "Standardně posílat příspěvky na Tumbir"
+
+#: tumblr.php:223
+msgid "Post to page:"
+msgstr "Příspěvek ke stránce:"
+
+#: tumblr.php:235
+msgid "You are not authenticated to tumblr"
+msgstr "Nyní nejste přihlášen k tumblr."
+
+#: tumblr.php:240
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/tumblr/lang/cs/strings.php b/tumblr/lang/cs/strings.php
index dafa9fc4..43673188 100644
--- a/tumblr/lang/cs/strings.php
+++ b/tumblr/lang/cs/strings.php
@@ -1,13 +1,18 @@
-<?php
-
-$a->strings["Permission denied."] = "Přístup odmítnut.";
-$a->strings["You are now authenticated to tumblr."] = "Nyní jste přihlášen k tumblr.";
-$a->strings["return to the connector page"] = "návrat ke stránce konektor";
-$a->strings["Post to Tumblr"] = "Příspěvek na Tumbir";
-$a->strings["Tumblr Post Settings"] = "Nastavení příspěvků na Tumbir";
-$a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce";
-$a->strings["Enable Tumblr Post Plugin"] = "Povolit rozšíření Tumbir";
-$a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
-$a->strings["Post to page:"] = "Příspěvek ke stránce:";
-$a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr.";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["You are now authenticated to tumblr."] = "Nyní jste přihlášen k tumblr.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to Tumblr"] = "Příspěvek na Tumbir";
+$a->strings["Tumblr Export"] = "Tumbir export";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce";
+$a->strings["Enable Tumblr Post Plugin"] = "Povolit rozšíření Tumbir";
+$a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
+$a->strings["Post to page:"] = "Příspěvek ke stránce:";
+$a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/tumblr/lang/ro/messages.po b/tumblr/lang/ro/messages.po
new file mode 100644
index 00000000..46748edd
--- /dev/null
+++ b/tumblr/lang/ro/messages.po
@@ -0,0 +1,63 @@
+# ADDON tumblr
+# Copyright (C)
+# This file is distributed under the same license as the Friendica tumblr addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:10+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: tumblr.php:35
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: tumblr.php:145
+msgid "You are now authenticated to tumblr."
+msgstr "Acum sunteți autentificat pe tumblr."
+
+#: tumblr.php:146
+msgid "return to the connector page"
+msgstr "revenire la pagina de conectare"
+
+#: tumblr.php:159
+msgid "Post to Tumblr"
+msgstr "Postați pe Tumblr"
+
+#: tumblr.php:186 tumblr.php:190
+msgid "Tumblr Export"
+msgstr "Export Tumblr"
+
+#: tumblr.php:194
+msgid "(Re-)Authenticate your tumblr page"
+msgstr "(Re- )Autentificare pagină tumblr "
+
+#: tumblr.php:198
+msgid "Enable Tumblr Post Plugin"
+msgstr "Activare Modul Postare pe Tumblr "
+
+#: tumblr.php:203
+msgid "Post to Tumblr by default"
+msgstr "Postați implicit pe Tumblr"
+
+#: tumblr.php:223
+msgid "Post to page:"
+msgstr "Postare pe pagina:"
+
+#: tumblr.php:235
+msgid "You are not authenticated to tumblr"
+msgstr "Nu sunteți autentificat pe tumblr."
+
+#: tumblr.php:240
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/tumblr/lang/ro/strings.php b/tumblr/lang/ro/strings.php
new file mode 100644
index 00000000..7262ca4c
--- /dev/null
+++ b/tumblr/lang/ro/strings.php
@@ -0,0 +1,18 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["You are now authenticated to tumblr."] = "Acum sunteți autentificat pe tumblr.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to Tumblr"] = "Postați pe Tumblr";
+$a->strings["Tumblr Export"] = "Export Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re- )Autentificare pagină tumblr ";
+$a->strings["Enable Tumblr Post Plugin"] = "Activare Modul Postare pe Tumblr ";
+$a->strings["Post to Tumblr by default"] = "Postați implicit pe Tumblr";
+$a->strings["Post to page:"] = "Postare pe pagina:";
+$a->strings["You are not authenticated to tumblr"] = "Nu sunteți autentificat pe tumblr.";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/tumblr/templates/admin.tpl b/tumblr/templates/admin.tpl
deleted file mode 100644
index b361f182..00000000
--- a/tumblr/templates/admin.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{include file="field_input.tpl" field=$consumer_key}}
-{{include file="field_input.tpl" field=$consumer_secret}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 619ff16e..cd9713cf 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -54,25 +54,6 @@ function tumblr_content(&$a) {
 	return $o;
 }
 
-function tumblr_plugin_admin(&$a, &$o){
-        $t = get_markup_template( "admin.tpl", "addon/tumblr/" );
-
-        $o = replace_macros($t, array(
-                '$submit' => t('Save Settings'),
-                                                                // name, label, value, help, [extra values]
-                '$consumer_key' => array('consumer_key', t('Consumer Key'),  get_config('tumblr', 'consumer_key' ), ''),
-                '$consumer_secret' => array('consumer_secret', t('Consumer Secret'),  get_config('tumblr', 'consumer_secret' ), ''),
-        ));
-}
-
-function tumblr_plugin_admin_post(&$a){
-        $consumer_key     =       ((x($_POST,'consumer_key'))              ? notags(trim($_POST['consumer_key']))   : '');
-        $consumer_secret =       ((x($_POST,'consumer_secret'))   ? notags(trim($_POST['consumer_secret'])): '');
-        set_config('tumblr','consumer_key',$consumer_key);
-        set_config('tumblr','consumer_secret',$consumer_secret);
-        info( t('Settings updated.'). EOL );
-}
-
 function tumblr_connect($a) {
 	// Start a session.  This is necessary to hold on to  a few keys the callback script will also need
 	session_start();
diff --git a/twitter/lang/cs/messages.po b/twitter/lang/cs/messages.po
new file mode 100644
index 00000000..f893d731
--- /dev/null
+++ b/twitter/lang/cs/messages.po
@@ -0,0 +1,127 @@
+# ADDON twitter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica twitter addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-07 19:31+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: twitter.php:146
+msgid "Post to Twitter"
+msgstr "Poslat příspěvek na Twitter"
+
+#: twitter.php:203
+msgid "Twitter settings updated."
+msgstr "Nastavení Twitteru aktualizováno."
+
+#: twitter.php:233 twitter.php:237
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter Import/Export/Zrcadlení"
+
+#: twitter.php:245
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu."
+
+#: twitter.php:264
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše <strong>veřejné</strong> příspěvky budou zaslány na Twitter."
+
+#: twitter.php:265
+msgid "Log in with Twitter"
+msgstr "Přihlásit se s Twitter"
+
+#: twitter.php:267
+msgid "Copy the PIN from Twitter here"
+msgstr "Zkopírujte sem PIN z Twitteru"
+
+#: twitter.php:272 twitter.php:311 twitter.php:569
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: twitter.php:281
+msgid "Currently connected to: "
+msgstr "V současné době připojen k:"
+
+#: twitter.php:282
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související Twitter účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."
+
+#: twitter.php:284
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) \nodkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě Twitter přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen."
+
+#: twitter.php:287
+msgid "Allow posting to Twitter"
+msgstr "Povolit odesílání na Twitter"
+
+#: twitter.php:290
+msgid "Send public postings to Twitter by default"
+msgstr "Defaultně zasílat veřejné komentáře na Twitter"
+
+#: twitter.php:294
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Zrcadlit všechny příspěvky z twitteru, které nejsou odpověďmi"
+
+#: twitter.php:299
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
+
+#: twitter.php:303
+msgid "Automatically create contacts"
+msgstr "Automaticky vytvářet kontakty"
+
+#: twitter.php:308
+msgid "Clear OAuth configuration"
+msgstr "Vymazat konfiguraci OAuth"
+
+#: twitter.php:539
+msgid "Twitter post failed. Queued for retry."
+msgstr "Zaslání příspěvku na Twitter selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
+
+#: twitter.php:563
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: twitter.php:571
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: twitter.php:572
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#: twitter.php:573
+msgid "Name of the Twitter Application"
+msgstr "Název aplikace Twitter"
+
+#: twitter.php:573
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr "použijte toto pro zabránění zrcadlení příspvků z Friedica zpět do Friendica"
diff --git a/twitter/lang/cs/strings.php b/twitter/lang/cs/strings.php
index 1e4f927c..8de4b130 100644
--- a/twitter/lang/cs/strings.php
+++ b/twitter/lang/cs/strings.php
@@ -1,21 +1,30 @@
-<?php
-
-$a->strings["Post to Twitter"] = "Poslat příspěvek na Twitter";
-$a->strings["Twitter settings updated."] = "Nastavení Twitteru aktualizováno.";
-$a->strings["Twitter Posting Settings"] = "Nastavení zasílání příspěvků na Twitter ";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu.";
-$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše <strong>veřejné</strong> příspěvky budou zaslány na Twitter.";
-$a->strings["Log in with Twitter"] = "Přihlásit se s Twitter";
-$a->strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Currently connected to: "] = "V současné době připojen k:";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související Twitter účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) 
-odkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě Twitter přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen.";
-$a->strings["Allow posting to Twitter"] = "Povolit odesílání na Twitter";
-$a->strings["Send public postings to Twitter by default"] = "Defaultně zasílat veřejné komentáře na Twitter";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "Poslat propojené #-tagy a @-jména na Twitter";
-$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
-$a->strings["Settings updated."] = "Nastavení aktualizováno.";
-$a->strings["Consumer key"] = "Consumer key";
-$a->strings["Consumer secret"] = "Consumer secret";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Twitter"] = "Poslat příspěvek na Twitter";
+$a->strings["Twitter settings updated."] = "Nastavení Twitteru aktualizováno.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Zrcadlení";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Na této Friendica instanci je sice povolen Twitter plugin, ale vy jste si ještě nenastavili svůj Twitter účet. Svůj účet si můžete nastavit kliknutím na tlačítko níže k získání PINu z Vašeho Twitteru, který si zkopírujte do níže uvedeného vstupního pole a odešlete formulář. Pouze vaše <strong>veřejné</strong> příspěvky budou zaslány na Twitter.";
+$a->strings["Log in with Twitter"] = "Přihlásit se s Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Currently connected to: "] = "V současné době připojen k:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zaslány na související Twitter účet. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Upozornění</strong>: Z důvodů Vašeho nastavení ochrany soukromí (<em> Skrýt Vaše profilové detaily před neznámými čtenáři?</em>) \nodkaz potenciálně zahrnutý ve Vašich veřejných příspěvcích poslaných do sítě Twitter přesměruje návštěvníky na prázdnou stránku informující návštěvníky, že přístup k vašemu profilu je omezen.";
+$a->strings["Allow posting to Twitter"] = "Povolit odesílání na Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Defaultně zasílat veřejné komentáře na Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Zrcadlit všechny příspěvky z twitteru, které nejsou odpověďmi";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Automatically create contacts"] = "Automaticky vytvářet kontakty";
+$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
+$a->strings["Twitter post failed. Queued for retry."] = "Zaslání příspěvku na Twitter selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
+$a->strings["Name of the Twitter Application"] = "Název aplikace Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "použijte toto pro zabránění zrcadlení příspvků z Friedica zpět do Friendica";
diff --git a/twitter/lang/de/messages.po b/twitter/lang/de/messages.po
new file mode 100644
index 00000000..5ec80d64
--- /dev/null
+++ b/twitter/lang/de/messages.po
@@ -0,0 +1,127 @@
+# ADDON twitter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica twitter addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-09-06 11:55+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: twitter.php:146
+msgid "Post to Twitter"
+msgstr "An Twitter senden"
+
+#: twitter.php:203
+msgid "Twitter settings updated."
+msgstr "Twitter Einstellungen aktualisiert."
+
+#: twitter.php:233 twitter.php:237
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter Import/Export/Spiegeln"
+
+#: twitter.php:245
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."
+
+#: twitter.php:264
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
+
+#: twitter.php:265
+msgid "Log in with Twitter"
+msgstr "bei Twitter anmelden"
+
+#: twitter.php:267
+msgid "Copy the PIN from Twitter here"
+msgstr "Kopiere die Twitter-PIN hier her"
+
+#: twitter.php:272 twitter.php:311 twitter.php:569
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: twitter.php:281
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit: "
+
+#: twitter.php:282
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
+
+#: twitter.php:284
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
+
+#: twitter.php:287
+msgid "Allow posting to Twitter"
+msgstr "Veröffentlichung bei Twitter erlauben"
+
+#: twitter.php:290
+msgid "Send public postings to Twitter by default"
+msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
+
+#: twitter.php:294
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind"
+
+#: twitter.php:299
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Zeitleiste"
+
+#: twitter.php:303
+msgid "Automatically create contacts"
+msgstr "Automatisch Kontakte anlegen"
+
+#: twitter.php:308
+msgid "Clear OAuth configuration"
+msgstr "OAuth Konfiguration löschen"
+
+#: twitter.php:539
+msgid "Twitter post failed. Queued for retry."
+msgstr "Twitter post failed. Queued for retry."
+
+#: twitter.php:563
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: twitter.php:571
+msgid "Consumer key"
+msgstr "Consumer Key"
+
+#: twitter.php:572
+msgid "Consumer secret"
+msgstr "Consumer Secret"
+
+#: twitter.php:573
+msgid "Name of the Twitter Application"
+msgstr "Name der Twitter Anwendung"
+
+#: twitter.php:573
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr "Setze dies um eine Spiegelung von ~friendica zu ~friendica zu vermeiden"
diff --git a/twitter/lang/de/strings.php b/twitter/lang/de/strings.php
index 29d0fde9..997bf55f 100644
--- a/twitter/lang/de/strings.php
+++ b/twitter/lang/de/strings.php
@@ -1,24 +1,30 @@
-<?php
-
-$a->strings["Post to Twitter"] = "Bei Twitter veröffentlichen";
-$a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert.";
-$a->strings["Twitter Posting Settings"] = "Twitter-Beitragseinstellungen";
-$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
-$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht.";
-$a->strings["Log in with Twitter"] = "bei Twitter anmelden";
-$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her";
-$a->strings["Submit"] = "Senden";
-$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
-$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
-$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
-$a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
-$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
-$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind";
-$a->strings["Shortening method that optimizes the tweet"] = "Kürzungsverfahren, das den Tweet optimiert";
-$a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter";
-$a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Consumer key"] = "Consumer Key";
-$a->strings["Consumer secret"] = "Consumer Secret";
-$a->strings["Name of the Twitter Application"] = "Name der Twitter Anwendung";
-$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Setze dies um eine Spiegelung von ~friendica zu ~friendica zu vermeiden";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Twitter"] = "An Twitter senden";
+$a->strings["Twitter settings updated."] = "Twitter Einstellungen aktualisiert.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Spiegeln";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Plugin aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du dann in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht.";
+$a->strings["Log in with Twitter"] = "bei Twitter anmelden";
+$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
+$a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
+$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Spiegle alle Beiträge von Twitter die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste";
+$a->strings["Automatically create contacts"] = "Automatisch Kontakte anlegen";
+$a->strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
+$a->strings["Twitter post failed. Queued for retry."] = "Twitter post failed. Queued for retry.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Consumer key"] = "Consumer Key";
+$a->strings["Consumer secret"] = "Consumer Secret";
+$a->strings["Name of the Twitter Application"] = "Name der Twitter Anwendung";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Setze dies um eine Spiegelung von ~friendica zu ~friendica zu vermeiden";
diff --git a/twitter/lang/ro/messages.po b/twitter/lang/ro/messages.po
new file mode 100644
index 00000000..27e0d553
--- /dev/null
+++ b/twitter/lang/ro/messages.po
@@ -0,0 +1,126 @@
+# ADDON twitter
+# Copyright (C)
+# This file is distributed under the same license as the Friendica twitter addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:10+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: twitter.php:146
+msgid "Post to Twitter"
+msgstr "Postați pe Twitter"
+
+#: twitter.php:203
+msgid "Twitter settings updated."
+msgstr "Configurările Twitter au fost actualizate."
+
+#: twitter.php:233 twitter.php:237
+msgid "Twitter Import/Export/Mirror"
+msgstr "Import/Export/Clonare Twitter"
+
+#: twitter.php:245
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. Vă rugăm să vă contactați administratorul de site."
+
+#: twitter.php:264
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră <strong>publice</strong> vor fi postate pe Twitter."
+
+#: twitter.php:265
+msgid "Log in with Twitter"
+msgstr "Autentificare prin Twitter"
+
+#: twitter.php:267
+msgid "Copy the PIN from Twitter here"
+msgstr "Copiați aici PIN-ul de la Twitter"
+
+#: twitter.php:272 twitter.php:311 twitter.php:569
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: twitter.php:281
+msgid "Currently connected to: "
+msgstr "Conectat curent la:"
+
+#: twitter.php:282
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for"
+" every posting separately in the posting options when writing the entry."
+msgstr "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul Twitter asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj."
+
+#: twitter.php:284
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către Twitter, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat."
+
+#: twitter.php:287
+msgid "Allow posting to Twitter"
+msgstr "Permite postarea pe Twitter"
+
+#: twitter.php:290
+msgid "Send public postings to Twitter by default"
+msgstr "Trimite postările publice pe Twitter, ca și implicit"
+
+#: twitter.php:294
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Clonează toate postările, din Twitter, care nu sunt răspunsuri"
+
+#: twitter.php:299
+msgid "Import the remote timeline"
+msgstr "Importare cronologie la distanță"
+
+#: twitter.php:303
+msgid "Automatically create contacts"
+msgstr "Creați Automat contactele"
+
+#: twitter.php:308
+msgid "Clear OAuth configuration"
+msgstr "Ștergeți configurările OAuth"
+
+#: twitter.php:539
+msgid "Twitter post failed. Queued for retry."
+msgstr "Postarea pe Twitter a eșuat. S-a pus în așteptare pentru reîncercare."
+
+#: twitter.php:563
+msgid "Settings updated."
+msgstr "Configurări actualizate."
+
+#: twitter.php:571
+msgid "Consumer key"
+msgstr "Cheia Utilizatorului"
+
+#: twitter.php:572
+msgid "Consumer secret"
+msgstr "Cheia Secretă a Utilizatorului"
+
+#: twitter.php:573
+msgid "Name of the Twitter Application"
+msgstr "Numele Aplicației Twitter"
+
+#: twitter.php:573
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr "stabiliți aceasta pentru a evita clonarea postărilor din ~friendica înapoi la ~friendica"
diff --git a/twitter/lang/ro/strings.php b/twitter/lang/ro/strings.php
new file mode 100644
index 00000000..d941d001
--- /dev/null
+++ b/twitter/lang/ro/strings.php
@@ -0,0 +1,30 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Twitter"] = "Postați pe Twitter";
+$a->strings["Twitter settings updated."] = "Configurările Twitter au fost actualizate.";
+$a->strings["Twitter Import/Export/Mirror"] = "Import/Export/Clonare Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. Vă rugăm să vă contactați administratorul de site.";
+$a->strings["At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră <strong>publice</strong> vor fi postate pe Twitter.";
+$a->strings["Log in with Twitter"] = "Autentificare prin Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copiați aici PIN-ul de la Twitter";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Currently connected to: "] = "Conectat curent la:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul Twitter asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către Twitter, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.";
+$a->strings["Allow posting to Twitter"] = "Permite postarea pe Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Trimite postările publice pe Twitter, ca și implicit";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Clonează toate postările, din Twitter, care nu sunt răspunsuri";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Automatically create contacts"] = "Creați Automat contactele";
+$a->strings["Clear OAuth configuration"] = "Ștergeți configurările OAuth";
+$a->strings["Twitter post failed. Queued for retry."] = "Postarea pe Twitter a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Consumer key"] = "Cheia Utilizatorului";
+$a->strings["Consumer secret"] = "Cheia Secretă a Utilizatorului";
+$a->strings["Name of the Twitter Application"] = "Numele Aplicației Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "stabiliți aceasta pentru a evita clonarea postărilor din ~friendica înapoi la ~friendica";
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 1919e28c..7c167459 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -73,7 +73,6 @@ function twitter_install() {
 	register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
 	register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 	register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
-	register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
 	logger("installed twitter");
 }
 
@@ -88,7 +87,6 @@ function twitter_uninstall() {
 	unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
 	unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 	unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
-	unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -464,7 +462,7 @@ function twitter_post_hook(&$a,&$b) {
 
 		$max_char = 140;
 		require_once("include/plaintext.php");
-		$msgarr = plaintext($a, $b, $max_char, true, 8);
+		$msgarr = plaintext($a, $b, $max_char, true);
 		$msg = $msgarr["text"];
 
 		if (($msg == "") AND isset($msgarr["title"]))
@@ -474,14 +472,14 @@ function twitter_post_hook(&$a,&$b) {
 
 		if (isset($msgarr["url"]))
 			$msg .= "\n".$msgarr["url"];
-		elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
+		elseif (isset($msgarr["image"]))
 			$image = $msgarr["image"];
 
 		// and now tweet it :-)
 		if(strlen($msg) and ($image != "")) {
 			$img_str = fetch_url($image);
 
-			$tempfile = tempnam(get_temppath(), "cache");
+			$tempfile = tempnam(get_config("system","temppath"), "cache");
 			file_put_contents($tempfile, $img_str);
 
 			// Twitter had changed something so that the old library doesn't work anymore
@@ -654,45 +652,6 @@ function twitter_expire($a,$b) {
 	logger('twitter_expire: expire_end');
 }
 
-function twitter_prepare_body(&$a,&$b) {
-	if ($b["item"]["network"] != NETWORK_TWITTER)
-		return;
-
-	if ($b["preview"]) {
-		$max_char = 140;
-		require_once("include/plaintext.php");
-		$item = $b["item"];
-		$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
-
-		$r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
-			dbesc($item["thr-parent"]),
-			intval(local_user()));
-
-		if(count($r)) {
-			$orig_post = $r[0];
-
-			$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-			$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-			$nicknameplain = "@".$nicknameplain;
-
-			if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
-				$item["body"] = $nickname." ".$item["body"];
-		}
-
-
-		$msgarr = plaintext($a, $item, $max_char, true, 8);
-		$msg = $msgarr["text"];
-
-		if (isset($msgarr["url"]))
-			$msg .= " ".$msgarr["url"];
-
-		if (isset($msgarr["image"]))
-			$msg .= " ".$msgarr["image"];
-
-                $b['html'] = nl2br(htmlspecialchars($msg));
-	}
-}
-
 function twitter_fetchtimeline($a, $uid) {
 	$ckey    = get_config('twitter', 'consumerkey');
 	$csecret = get_config('twitter', 'consumersecret');
@@ -753,23 +712,19 @@ function twitter_fetchtimeline($a, $uid) {
 
 				$_REQUEST['body'] = $post->retweeted_status->text;
 
-				$picture = "";
-
 				// media
 				if (is_array($post->retweeted_status->entities->media)) {
 					foreach($post->retweeted_status->entities->media AS $media) {
 						switch($media->type) {
 							case 'photo':
-								//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
-								//$has_picture = true;
-								$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
-								$picture = $media->media_url_https;
+								$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+								$has_picture = true;
 								break;
 						}
 					}
 				}
 
-				$converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $picture);
+				$converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $has_picture);
 				$_REQUEST['body'] = $converted["body"];
 
 				$_REQUEST['body'] = "[share author='".$post->retweeted_status->user->name.
@@ -781,22 +736,18 @@ function twitter_fetchtimeline($a, $uid) {
 			} else {
 				$_REQUEST["body"] = $post->text;
 
-				$picture = "";
-
 				if (is_array($post->entities->media)) {
 					foreach($post->entities->media AS $media) {
 						switch($media->type) {
 							case 'photo':
-								//$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
-								//$has_picture = true;
-								$_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
-								$picture = $media->media_url_https;
+								$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+								$has_picture = true;
 								break;
 						}
 					}
 				}
 
-				$converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $picture);
+				$converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $has_picture);
 				$_REQUEST['body'] = $converted["body"];
 			}
 
@@ -890,13 +841,6 @@ function twitter_queue_hook(&$a,&$b) {
 }
 
 function twitter_fetch_contact($uid, $contact, $create_user) {
-	require_once("include/Photo.php");
-
-	$avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
-
-	$info = get_photo_info($avatar);
-	if (!$info)
-		$avatar = $contact->profile_image_url_https;
 
 	// Check if the unique contact is existing
 	// To-Do: only update once a while
@@ -908,12 +852,12 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 			dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
 			dbesc($contact->name),
 			dbesc($contact->screen_name),
-			dbesc($avatar));
+			dbesc($contact->profile_image_url_https));
 	else
 		q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
 			dbesc($contact->name),
 			dbesc($contact->screen_name),
-			dbesc($avatar),
+			dbesc($contact->profile_image_url_https),
 			dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
@@ -943,7 +887,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 			dbesc("twitter::".$contact->id_str),
 			dbesc($contact->name),
 			dbesc($contact->screen_name),
-			dbesc($avatar),
+			dbesc($contact->profile_image_url_https),
 			dbesc(NETWORK_TWITTER),
 			intval(CONTACT_IS_FRIEND),
 			intval(1),
@@ -971,7 +915,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 		require_once("Photo.php");
 
-		$photos = import_profile_photo($avatar,$uid,$contact_id);
+		$photos = import_profile_photo($contact->profile_image_url_https,$uid,$contact_id);
 
 		q("UPDATE `contact` SET `photo` = '%s',
 					`thumb` = '%s',
@@ -1003,7 +947,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 			require_once("Photo.php");
 
-			$photos = import_profile_photo($avatar, $uid, $r[0]['id']);
+			$photos = import_profile_photo($contact->profile_image_url_https, $uid, $r[0]['id']);
 
 			q("UPDATE `contact` SET `photo` = '%s',
 						`thumb` = '%s',
@@ -1075,7 +1019,7 @@ function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
 	return $contact_id;
 }
 
-function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
+function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontincludemedia) {
 	require_once("include/oembed.php");
 	require_once("include/network.php");
 
@@ -1110,12 +1054,11 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 					$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
 
 					$body = str_replace($url->url, $footerlink, $body);
-				//} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
-				} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url)) {
+				} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
 					$body = str_replace($url->url,
 							"[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
 							$body);
-					//$dontincludemedia = true;
+					$dontincludemedia = true;
 				} elseif ($oembed_data->type != "link")
 					$body = str_replace($url->url,
 							"[url=".$expanded_url."]".$expanded_url."[/url]",
@@ -1123,7 +1066,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 				else {
 					$img_str = fetch_url($expanded_url, true, $redirects, 4);
 
-					$tempfile = tempnam(get_temppath(), "cache");
+					$tempfile = tempnam(get_config("system","temppath"), "cache");
 					file_put_contents($tempfile, $img_str);
 					$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 					unlink($tempfile);
@@ -1131,7 +1074,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 					if (substr($mime, 0, 6) == "image/") {
 						$type = "photo";
 						$body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
-						//$dontincludemedia = true;
+						$dontincludemedia = true;
 					} else {
 						$type = $oembed_data->type;
 						$footerurl = $expanded_url;
@@ -1144,20 +1087,17 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 		}
 
 		if ($footerurl != "")
-			$footer = add_page_info($footerurl, false, $picture);
+			$footer = add_page_info($footerurl);
 
 		if (($footerlink != "") AND (trim($footer) != "")) {
 			$removedlink = trim(str_replace($footerlink, "", $body));
 
-			if (($removedlink == "") OR strstr($body, $removedlink))
+			if (strstr($body, $removedlink))
 				$body = $removedlink;
 
 			$body .= $footer;
 		}
 
-		if (($footer == "") AND ($picture != ""))
-			$body .= "\n\n[img]".$picture."[/img]\n";
-
 		if ($no_tags)
 			return(array("body" => $body, "tags" => ""));
 
@@ -1250,8 +1190,6 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		if (count($r)) {
 			$postarray['thr-parent'] = $r[0]["uri"];
 			$postarray['parent-uri'] = $r[0]["parent-uri"];
-			$postarray['parent'] = $r[0]["parent"];
-			$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 		} else {
 			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($parent),
@@ -1260,12 +1198,9 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			if (count($r)) {
 				$postarray['thr-parent'] = $r[0]['uri'];
 				$postarray['parent-uri'] = $r[0]['parent-uri'];
-				$postarray['parent'] = $r[0]['parent'];
-				$postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
 			} else {
 				$postarray['thr-parent'] = $postarray['uri'];
 				$postarray['parent-uri'] = $postarray['uri'];
-				$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
 			}
 		}
 
@@ -1285,12 +1220,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			} else
 				return(array());
 		}
-		// Don't create accounts of people who just comment something
-		$create_user = false;
-	} else {
+	} else
 		$postarray['parent-uri'] = $postarray['uri'];
-		$postarray['object-type'] = ACTIVITY_OBJ_NOTE;
-	}
 
 	if ($contactid == 0) {
 		$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
@@ -1321,18 +1252,13 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
 	$postarray['body'] = $post->text;
 
-	$picture = "";
-
 	// media
 	if (is_array($post->entities->media)) {
 		foreach($post->entities->media AS $media) {
 			switch($media->type) {
 				case 'photo':
-					//$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
-					//$has_picture = true;
-					$postarray['body'] = str_replace($media->url, "", $postarray['body']);
-					$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
-					$picture = $media->media_url_https;
+					$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+					$has_picture = true;
 					break;
 				default:
 					$postarray['body'] .= print_r($media, true);
@@ -1340,7 +1266,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		}
 	}
 
-	$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
+	$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $has_picture);
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
 
@@ -1363,18 +1289,13 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
 		$postarray['body'] = $post->retweeted_status->text;
 
-		$picture = "";
-
 		// media
 		if (is_array($post->retweeted_status->entities->media)) {
 			foreach($post->retweeted_status->entities->media AS $media) {
 				switch($media->type) {
 					case 'photo':
-						//$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
-						//$has_picture = true;
-						$postarray['body'] = str_replace($media->url, "", $postarray['body']);
-						$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
-						$picture = $media->media_url_https;
+						$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+						$has_picture = true;
 						break;
 					default:
 						$postarray['body'] .= print_r($media, true);
@@ -1382,7 +1303,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			}
 		}
 
-		$converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $picture);
+		$converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $has_picture);
 		$postarray['body'] = $converted["body"];
 		$postarray['tag'] = $converted["tags"];
 
@@ -1413,8 +1334,6 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
 function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
 
-	// this whole function doesn't seem to work. Needs complete check
-
 	$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($uid)
 		);
@@ -1463,7 +1382,7 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
 				'to_email'     => $user[0]['email'],
 				'uid'          => $user[0]['uid'],
 				'item'         => $postarray,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+				'link'             => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
 				'source_name'  => $postarray['author-name'],
 				'source_link'  => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
@@ -1603,9 +1522,6 @@ function twitter_fetchhometimeline($a, $uid) {
 
 			$item = item_store($postarray);
 
-			if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0))
-				$postarray["parent"] = $item;
-
 			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
 
 			if ($item == 0) {
@@ -1613,12 +1529,9 @@ function twitter_fetchhometimeline($a, $uid) {
 					dbesc($postarray['uri']),
 					intval($uid)
 				);
-				if (count($r)) {
+				if (count($r))
 					$item = $r[0]['id'];
-					$parent_id = $r[0]['parent'];
-				}
-			} else
-				$parent_id = $postarray['parent'];
+			}
 
 			if ($item != 0) {
 				require_once('include/enotify.php');
@@ -1630,13 +1543,12 @@ function twitter_fetchhometimeline($a, $uid) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'         => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
 					'verb'         => ACTIVITY_TAG,
-					'otype'        => 'item',
-					'parent'       => $parent_id
+					'otype'        => 'item'
 				));
 			}
 		}
diff --git a/uhremotestorage/lang/cs/messages.po b/uhremotestorage/lang/cs/messages.po
new file mode 100644
index 00000000..599ff2bb
--- /dev/null
+++ b/uhremotestorage/lang/cs/messages.po
@@ -0,0 +1,45 @@
+# ADDON uhremotestorage
+# Copyright (C)
+# This file is distributed under the same license as the Friendica uhremotestorage addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-07 19:28+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Umožnit využití friendica id (%s) k napojení na externí úložiště (unhosted-enabled) (jako ownCloud). Více informací na <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+
+#: uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "Dočasná URL adresa (s {category})"
+
+#: uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "OAuth end-point"
+
+#: uhremotestorage.php:87
+msgid "Api"
+msgstr "Api"
+
+#: uhremotestorage.php:89
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
diff --git a/uhremotestorage/lang/cs/strings.php b/uhremotestorage/lang/cs/strings.php
index 113ff721..0c31cc4b 100644
--- a/uhremotestorage/lang/cs/strings.php
+++ b/uhremotestorage/lang/cs/strings.php
@@ -1,7 +1,12 @@
-<?php
-
-$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Umožnit využití friendica id (%s) k napojení na externí úložiště (unhosted-enabled) (jako ownCloud). Více informací na <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
-$a->strings["Template URL (with {category})"] = "Dočasná URL adresa (s {category})";
-$a->strings["OAuth end-point"] = "OAuth end-point";
-$a->strings["Api"] = "Api";
-$a->strings["Submit"] = "Odeslat";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Umožnit využití friendica id (%s) k napojení na externí úložiště (unhosted-enabled) (jako ownCloud). Více informací na <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "Dočasná URL adresa (s {category})";
+$a->strings["OAuth end-point"] = "OAuth end-point";
+$a->strings["Api"] = "Api";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/uhremotestorage/lang/ro/messages.po b/uhremotestorage/lang/ro/messages.po
new file mode 100644
index 00000000..7eeadf49
--- /dev/null
+++ b/uhremotestorage/lang/ro/messages.po
@@ -0,0 +1,44 @@
+# ADDON uhremotestorage
+# Copyright (C)
+# This file is distributed under the same license as the Friendica uhremotestorage addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:11+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: uhremotestorage.php:84
+#, php-format
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled"
+" storage (like ownCloud). See <a "
+"href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage"
+" WebFinger</a>"
+msgstr "Permiteți utilizarea id-ului dvs. friendica (%s) să se conecteze cu medii de stocare externe de tip unhosted (precum ownCloud). Consultați <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+
+#: uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr "URL șablon (cu {categorie})"
+
+#: uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr "Punct-final OAuth "
+
+#: uhremotestorage.php:87
+msgid "Api"
+msgstr "Api"
+
+#: uhremotestorage.php:89
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/uhremotestorage/lang/ro/strings.php b/uhremotestorage/lang/ro/strings.php
new file mode 100644
index 00000000..7db8edad
--- /dev/null
+++ b/uhremotestorage/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Permiteți utilizarea id-ului dvs. friendica (%s) să se conecteze cu medii de stocare externe de tip unhosted (precum ownCloud). Consultați <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Template URL (with {category})"] = "URL șablon (cu {categorie})";
+$a->strings["OAuth end-point"] = "Punct-final OAuth ";
+$a->strings["Api"] = "Api";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php
index 76320f5c..8dfecc74 100755
--- a/uhremotestorage/uhremotestorage.php
+++ b/uhremotestorage/uhremotestorage.php
@@ -4,7 +4,6 @@
  * Description: Expose in user XRD the link to external user's unhosted-enabled storage
  * Version: 1.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
- * Status: Unsupported
  */
  
  function uhremotestorage_install() {
diff --git a/webrtc/lang/C/messages.po b/webrtc/lang/C/messages.po
new file mode 100644
index 00000000..a690269d
--- /dev/null
+++ b/webrtc/lang/C/messages.po
@@ -0,0 +1,57 @@
+# ADDON webrtc
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica webrtc addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: webrtc.php:20
+msgid "WebRTC Videochat"
+msgstr ""
+
+#: webrtc.php:26
+msgid "Save Settings"
+msgstr ""
+
+#: webrtc.php:27
+msgid "WebRTC Base URL"
+msgstr ""
+
+#: webrtc.php:27
+msgid ""
+"Page your users will create a WebRTC chat room on. For example you could use "
+"https://live.mayfirst.org ."
+msgstr ""
+
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr ""
+
+#: webrtc.php:47
+msgid "Video Chat"
+msgstr ""
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr ""
+
+#: webrtc.php:50
+msgid ""
+"Please contact your friendica admin and send a reminder to configure the "
+"WebRTC addon."
+msgstr ""
diff --git a/webrtc/lang/cs/messages.po b/webrtc/lang/cs/messages.po
new file mode 100644
index 00000000..217385f8
--- /dev/null
+++ b/webrtc/lang/cs/messages.po
@@ -0,0 +1,59 @@
+# ADDON webrtc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica webrtc addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-02 15:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: webrtc.php:20
+msgid "WebRTC Videochat"
+msgstr "WebRTC Videochat"
+
+#: webrtc.php:26
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: webrtc.php:27
+msgid "WebRTC Base URL"
+msgstr "WebRTC Base adresa URL"
+
+#: webrtc.php:27
+msgid ""
+"Page your users will create a WebRTC chat room on. For example you could use"
+" https://live.mayfirst.org ."
+msgstr "Stránka, na které budou vaši uživatelé vytvářet  WebRTC chatovací místnosti. Například můžete zadat https://live.mayfirst.org."
+
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: webrtc.php:47
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC je video a audio konferenční nástroj který funguje s prohlížeči Firefox (verze 21 a vyšší) a Chrome/Chromium (verze 25 a vyšší). Stačí vytvořit novou chatovací místnost a poslat link někomu, se kterým chcete chatovat."
+
+#: webrtc.php:50
+msgid ""
+"Please contact your friendica admin and send a reminder to configure the "
+"WebRTC addon."
+msgstr "Prosím kontaktujte vašeho administrátora serveru friendica a požádejte ho o konfiguraci WebRTC rozšíření."
diff --git a/webrtc/lang/cs/strings.php b/webrtc/lang/cs/strings.php
new file mode 100644
index 00000000..e8a97315
--- /dev/null
+++ b/webrtc/lang/cs/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["WebRTC Base URL"] = "WebRTC Base adresa URL";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Stránka, na které budou vaši uživatelé vytvářet  WebRTC chatovací místnosti. Například můžete zadat https://live.mayfirst.org.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC je video a audio konferenční nástroj který funguje s prohlížeči Firefox (verze 21 a vyšší) a Chrome/Chromium (verze 25 a vyšší). Stačí vytvořit novou chatovací místnost a poslat link někomu, se kterým chcete chatovat.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Prosím kontaktujte vašeho administrátora serveru friendica a požádejte ho o konfiguraci WebRTC rozšíření.";
diff --git a/webrtc/lang/de/messages.po b/webrtc/lang/de/messages.po
new file mode 100644
index 00000000..b6abd14f
--- /dev/null
+++ b/webrtc/lang/de/messages.po
@@ -0,0 +1,59 @@
+# ADDON webrtc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica webrtc addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-11 05: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: webrtc.php:20
+msgid "WebRTC Videochat"
+msgstr "WebRTC Videochat"
+
+#: webrtc.php:26
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: webrtc.php:27
+msgid "WebRTC Base URL"
+msgstr "Basis-URL des WebRTC Servers"
+
+#: webrtc.php:27
+msgid ""
+"Page your users will create a WebRTC chat room on. For example you could use"
+" https://live.mayfirst.org ."
+msgstr "Auf welcher Seite sollten deine Nutzer einen WebRTC Chatraum anlegen. Z.B. könntest du https://live.mayfirst.org verwenden."
+
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: webrtc.php:47
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC ist ein Werkzeug für Audio- und Videokonferenzen das mit Firefox (Version 21 und höher) und Chrome/Chromium (Versionen 25 und höher) funktioniert. Lege einfach einen neuen Chatraum an und sende den Link an die Personen mit denen du chatten willst."
+
+#: webrtc.php:50
+msgid ""
+"Please contact your friendica admin and send a reminder to configure the "
+"WebRTC addon."
+msgstr "Bitte schicke eine Erinnerung an deinen friendica Admin, dass WebRTC noch nicht richtig konfiguriert ist."
diff --git a/webrtc/lang/de/strings.php b/webrtc/lang/de/strings.php
new file mode 100644
index 00000000..c94de480
--- /dev/null
+++ b/webrtc/lang/de/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["WebRTC Base URL"] = "Basis-URL des WebRTC Servers";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Auf welcher Seite sollten deine Nutzer einen WebRTC Chatraum anlegen. Z.B. könntest du https://live.mayfirst.org verwenden.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC ist ein Werkzeug für Audio- und Videokonferenzen das mit Firefox (Version 21 und höher) und Chrome/Chromium (Versionen 25 und höher) funktioniert. Lege einfach einen neuen Chatraum an und sende den Link an die Personen mit denen du chatten willst.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Bitte schicke eine Erinnerung an deinen friendica Admin, dass WebRTC noch nicht richtig konfiguriert ist.";
diff --git a/webrtc/lang/ro/messages.po b/webrtc/lang/ro/messages.po
new file mode 100644
index 00000000..af6e3802
--- /dev/null
+++ b/webrtc/lang/ro/messages.po
@@ -0,0 +1,58 @@
+# ADDON webrtc
+# Copyright (C)
+# This file is distributed under the same license as the Friendica webrtc addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:11+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: webrtc.php:20
+msgid "WebRTC Videochat"
+msgstr "Videochat WebRTC "
+
+#: webrtc.php:26
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: webrtc.php:27
+msgid "WebRTC Base URL"
+msgstr "Adresa URL de Bază WebRTC "
+
+#: webrtc.php:27
+msgid ""
+"Page your users will create a WebRTC chat room on. For example you could use"
+" https://live.mayfirst.org ."
+msgstr "Pagina pe care utilizatorii dvs vor crea o camera de chat WebRTC . De exemplu, a-ți putea utiliza https://live.mayfirst.org ."
+
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Configurări actualizate."
+
+#: webrtc.php:47
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC este un instrument de conferințe audio-video care funcționează cu Firefox (versiunea 21 şi superioară) şi Chrome/Chromium (versiunea 25 şi superioară). Trebuie doar să creați o nouă cameră de chat şi să trimiteți legătura cuiva cu care doriţi să conversați."
+
+#: webrtc.php:50
+msgid ""
+"Please contact your friendica admin and send a reminder to configure the "
+"WebRTC addon."
+msgstr "Vă rugăm să vă contactați administratorul friendica şi să-i trimiteți un memento pentru a configura suplimentul WebRTC."
diff --git a/webrtc/lang/ro/strings.php b/webrtc/lang/ro/strings.php
new file mode 100644
index 00000000..6afbbc93
--- /dev/null
+++ b/webrtc/lang/ro/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["WebRTC Videochat"] = "Videochat WebRTC ";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["WebRTC Base URL"] = "Adresa URL de Bază WebRTC ";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Pagina pe care utilizatorii dvs vor crea o camera de chat WebRTC . De exemplu, a-ți putea utiliza https://live.mayfirst.org .";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC este un instrument de conferințe audio-video care funcționează cu Firefox (versiunea 21 şi superioară) şi Chrome/Chromium (versiunea 25 şi superioară). Trebuie doar să creați o nouă cameră de chat şi să trimiteți legătura cuiva cu care doriţi să conversați.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Vă rugăm să vă contactați administratorul friendica şi să-i trimiteți un memento pentru a configura suplimentul WebRTC.";
diff --git a/wppost/lang/cs/messages.po b/wppost/lang/cs/messages.po
new file mode 100644
index 00000000..992a95db
--- /dev/null
+++ b/wppost/lang/cs/messages.po
@@ -0,0 +1,68 @@
+# ADDON wppost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica wppost addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-02 15:14+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Příspěvky do WordPress"
+
+#: wppost.php:79 wppost.php:83
+msgid "Wordpress Export"
+msgstr "Wordpress Export"
+
+#: wppost.php:86
+msgid "Enable WordPress Post Plugin"
+msgstr "Povolit rozšíření na WordPress"
+
+#: wppost.php:91
+msgid "WordPress username"
+msgstr "WordPress uživatelské jméno"
+
+#: wppost.php:96
+msgid "WordPress password"
+msgstr "WordPress heslo"
+
+#: wppost.php:101
+msgid "WordPress API URL"
+msgstr "URL adresa API WordPress"
+
+#: wppost.php:106
+msgid "Post to WordPress by default"
+msgstr "standardně posílat příspěvky na WordPress"
+
+#: wppost.php:111
+msgid "Provide a backlink to the Friendica post"
+msgstr "Poskytuje zpětný link na Friendica příspěvek"
+
+#: wppost.php:116
+msgid "Don't post messages that are too short"
+msgstr "Neposílat zprávy, které jsou příliš krátké"
+
+#: wppost.php:122
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: wppost.php:243
+msgid "Post from Friendica"
+msgstr "Příspěvek z Friendica"
+
+#: wppost.php:255
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Přečíst si originální příspěvek a komentáře na Friendica"
diff --git a/wppost/lang/cs/strings.php b/wppost/lang/cs/strings.php
index 0fea0e0b..00352ce7 100644
--- a/wppost/lang/cs/strings.php
+++ b/wppost/lang/cs/strings.php
@@ -1,13 +1,19 @@
-<?php
-
-$a->strings["Post to Wordpress"] = "Příspěvky do WordPress";
-$a->strings["WordPress Post Settings"] = "WordPress Post nastavení";
-$a->strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress";
-$a->strings["WordPress username"] = "WordPress uživatelské jméno";
-$a->strings["WordPress password"] = "WordPress heslo";
-$a->strings["WordPress API URL"] = "URL adresa API WordPress";
-$a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress";
-$a->strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
-$a->strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["Post to Wordpress"] = "Příspěvky do WordPress";
+$a->strings["Wordpress Export"] = "Wordpress Export";
+$a->strings["Enable WordPress Post Plugin"] = "Povolit rozšíření na WordPress";
+$a->strings["WordPress username"] = "WordPress uživatelské jméno";
+$a->strings["WordPress password"] = "WordPress heslo";
+$a->strings["WordPress API URL"] = "URL adresa API WordPress";
+$a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress";
+$a->strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek";
+$a->strings["Don't post messages that are too short"] = "Neposílat zprávy, které jsou příliš krátké";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica";
diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po
new file mode 100644
index 00000000..d0971910
--- /dev/null
+++ b/wppost/lang/de/messages.po
@@ -0,0 +1,68 @@
+# ADDON wppost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica wppost addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-11 06: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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Bei WordPress veröffentlichen"
+
+#: wppost.php:79 wppost.php:83
+msgid "Wordpress Export"
+msgstr "WordPress-Passwort"
+
+#: wppost.php:86
+msgid "Enable WordPress Post Plugin"
+msgstr "WordPress Plugin aktivieren"
+
+#: wppost.php:91
+msgid "WordPress username"
+msgstr "WordPress-Benutzername"
+
+#: wppost.php:96
+msgid "WordPress password"
+msgstr "WordPress-Passwort"
+
+#: wppost.php:101
+msgid "WordPress API URL"
+msgstr "WordPress-API-URL"
+
+#: wppost.php:106
+msgid "Post to WordPress by default"
+msgstr "Standardmäßig auf WordPress veröffentlichen"
+
+#: wppost.php:111
+msgid "Provide a backlink to the Friendica post"
+msgstr "Einen zurück zum Friendica-Beitrag hinzufügen"
+
+#: wppost.php:116
+msgid "Don't post messages that are too short"
+msgstr "Beiträge die zu kurz sind nicht veröffentlichen"
+
+#: wppost.php:122
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: wppost.php:243
+msgid "Post from Friendica"
+msgstr "Post via Friendica"
+
+#: wppost.php:255
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Den Original-Beitrag samt Kommentaren bei Friendica lesen"
diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php
index 75f53382..c74e1c5f 100644
--- a/wppost/lang/de/strings.php
+++ b/wppost/lang/de/strings.php
@@ -1,13 +1,19 @@
-<?php
-
-$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
-$a->strings["WordPress Post Settings"] = "WordPress-Beitragseinstellungen";
-$a->strings["Enable WordPress Post Plugin"] = "WordPress-Plugin aktivieren.";
-$a->strings["WordPress username"] = "WordPress-Benutzername";
-$a->strings["WordPress password"] = "WordPress-Passwort";
-$a->strings["WordPress API URL"] = "WordPress-API-URL";
-$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
-$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen";
-$a->strings["Submit"] = "Senden";
-$a->strings["Post from Friendica"] = "Beitrag via Friendica";
-$a->strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
+$a->strings["Wordpress Export"] = "WordPress-Passwort";
+$a->strings["Enable WordPress Post Plugin"] = "WordPress Plugin aktivieren";
+$a->strings["WordPress username"] = "WordPress-Benutzername";
+$a->strings["WordPress password"] = "WordPress-Passwort";
+$a->strings["WordPress API URL"] = "WordPress-API-URL";
+$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
+$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Don't post messages that are too short"] = "Beiträge die zu kurz sind nicht veröffentlichen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Post from Friendica"] = "Post via Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen";
diff --git a/wppost/lang/ro/messages.po b/wppost/lang/ro/messages.po
new file mode 100644
index 00000000..d329836d
--- /dev/null
+++ b/wppost/lang/ro/messages.po
@@ -0,0 +1,67 @@
+# ADDON wppost
+# Copyright (C)
+# This file is distributed under the same license as the Friendica wppost addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:12+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: wppost.php:42
+msgid "Post to Wordpress"
+msgstr "Postați pe Wordpress"
+
+#: wppost.php:79 wppost.php:83
+msgid "Wordpress Export"
+msgstr "Export pe Wordpress"
+
+#: wppost.php:86
+msgid "Enable WordPress Post Plugin"
+msgstr "Activare Modul Postare pe Wordpress"
+
+#: wppost.php:91
+msgid "WordPress username"
+msgstr "Utilizator WordPress "
+
+#: wppost.php:96
+msgid "WordPress password"
+msgstr "Parolă WordPress "
+
+#: wppost.php:101
+msgid "WordPress API URL"
+msgstr "URL Cheie API WordPress"
+
+#: wppost.php:106
+msgid "Post to WordPress by default"
+msgstr "Postați implicit pe Wordpress"
+
+#: wppost.php:111
+msgid "Provide a backlink to the Friendica post"
+msgstr "Oferiți un backlink către postarea de pe Friendica"
+
+#: wppost.php:116
+msgid "Don't post messages that are too short"
+msgstr "Nu publica mesajele prea scurte"
+
+#: wppost.php:122
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: wppost.php:243
+msgid "Post from Friendica"
+msgstr "Postați din Friendica"
+
+#: wppost.php:255
+msgid "Read the original post and comment stream on Friendica"
+msgstr "Citiți publicația originală și fluxul de comentarii, pe Friendica"
diff --git a/wppost/lang/ro/strings.php b/wppost/lang/ro/strings.php
new file mode 100644
index 00000000..86835bc3
--- /dev/null
+++ b/wppost/lang/ro/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to Wordpress"] = "Postați pe Wordpress";
+$a->strings["Wordpress Export"] = "Export pe Wordpress";
+$a->strings["Enable WordPress Post Plugin"] = "Activare Modul Postare pe Wordpress";
+$a->strings["WordPress username"] = "Utilizator WordPress ";
+$a->strings["WordPress password"] = "Parolă WordPress ";
+$a->strings["WordPress API URL"] = "URL Cheie API WordPress";
+$a->strings["Post to WordPress by default"] = "Postați implicit pe Wordpress";
+$a->strings["Provide a backlink to the Friendica post"] = "Oferiți un backlink către postarea de pe Friendica";
+$a->strings["Don't post messages that are too short"] = "Nu publica mesajele prea scurte";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Post from Friendica"] = "Postați din Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Citiți publicația originală și fluxul de comentarii, pe Friendica";
diff --git a/yourls/lang/cs/messages.po b/yourls/lang/cs/messages.po
new file mode 100644
index 00000000..043ed4b0
--- /dev/null
+++ b/yourls/lang/cs/messages.po
@@ -0,0 +1,48 @@
+# ADDON yourls
+# Copyright (C)
+# This file is distributed under the same license as the Friendica yourls addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-02 15:15+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: yourls.php:55 yourls.php:59
+msgid "YourLS"
+msgstr "YourLS"
+
+#: yourls.php:63
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: yourls.php:68
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: yourls.php:73
+msgid "Password:"
+msgstr "Heslo: "
+
+#: yourls.php:78
+msgid "Use SSL "
+msgstr "Použít SSL"
+
+#: yourls.php:82
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: yourls.php:98
+msgid "yourls Settings saved."
+msgstr "yourls nastavení uloženo."
diff --git a/yourls/lang/cs/strings.php b/yourls/lang/cs/strings.php
index c1fb86a3..dbc61f1a 100644
--- a/yourls/lang/cs/strings.php
+++ b/yourls/lang/cs/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["YourLS Settings"] = "YourLS nastavení";
-$a->strings["URL: http://"] = "URL: http://";
-$a->strings["Username:"] = "Uživatelské jméno:";
-$a->strings["Password:"] = "heslo:";
-$a->strings["Use SSL "] = "Použít SSL";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["yourls Settings saved."] = "yourls nastavení uloženo.";
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["YourLS"] = "YourLS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Uživatelské jméno:";
+$a->strings["Password:"] = "Heslo: ";
+$a->strings["Use SSL "] = "Použít SSL";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["yourls Settings saved."] = "yourls nastavení uloženo.";
diff --git a/yourls/lang/de/messages.po b/yourls/lang/de/messages.po
new file mode 100644
index 00000000..f05ec527
--- /dev/null
+++ b/yourls/lang/de/messages.po
@@ -0,0 +1,48 @@
+# ADDON yourls
+# Copyright (C)
+# This file is distributed under the same license as the Friendica yourls addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-06 12:12+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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: yourls.php:55 yourls.php:59
+msgid "YourLS"
+msgstr "YourLS"
+
+#: yourls.php:63
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: yourls.php:68
+msgid "Username:"
+msgstr "Nutzername:"
+
+#: yourls.php:73
+msgid "Password:"
+msgstr "Passwort:"
+
+#: yourls.php:78
+msgid "Use SSL "
+msgstr "SSL verwenden"
+
+#: yourls.php:82
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: yourls.php:98
+msgid "yourls Settings saved."
+msgstr "yourls Einstellungen gespeichert"
diff --git a/yourls/lang/de/strings.php b/yourls/lang/de/strings.php
index 7a29185e..94ee0099 100644
--- a/yourls/lang/de/strings.php
+++ b/yourls/lang/de/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["YourLS Settings"] = "YourLS Einstellungen";
-$a->strings["URL: http://"] = "URL: http://";
-$a->strings["Username:"] = "Nutzername:";
-$a->strings["Password:"] = "Passwort:";
-$a->strings["Use SSL "] = "SSL Verwenden ";
-$a->strings["Submit"] = "Senden";
-$a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["YourLS"] = "YourLS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Nutzername:";
+$a->strings["Password:"] = "Passwort:";
+$a->strings["Use SSL "] = "SSL verwenden";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["yourls Settings saved."] = "yourls Einstellungen gespeichert";
diff --git a/yourls/lang/fr/messages.po b/yourls/lang/fr/messages.po
new file mode 100644
index 00000000..f54ace2c
--- /dev/null
+++ b/yourls/lang/fr/messages.po
@@ -0,0 +1,48 @@
+# ADDON yourls
+# Copyright (C)
+# This file is distributed under the same license as the Friendica yourls addon package.
+# 
+# 
+# Translators:
+# Tubuntu <tubuntu@testimonium.be>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-06-25 14:21+0000\n"
+"Last-Translator: Tubuntu <tubuntu@testimonium.be>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: yourls.php:55 yourls.php:59
+msgid "YourLS"
+msgstr "YourLS"
+
+#: yourls.php:63
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: yourls.php:68
+msgid "Username:"
+msgstr "Nom d'utilisateur :"
+
+#: yourls.php:73
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: yourls.php:78
+msgid "Use SSL "
+msgstr "Utiliser SSL"
+
+#: yourls.php:82
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: yourls.php:98
+msgid "yourls Settings saved."
+msgstr "paramètres YourLS sauvegardés."
diff --git a/yourls/lang/fr/strings.php b/yourls/lang/fr/strings.php
index 6ee57d81..2d8a57a8 100644
--- a/yourls/lang/fr/strings.php
+++ b/yourls/lang/fr/strings.php
@@ -1,9 +1,14 @@
-<?php
-
-$a->strings["YourLS Settings"] = "Réglages de YourLS";
-$a->strings["URL: http://"] = "URL: http://";
-$a->strings["Username:"] = "Nom d'utilisateur";
-$a->strings["Password:"] = "Mot de passe :";
-$a->strings["Use SSL "] = "Utiliser SSL ";
-$a->strings["Submit"] = "Envoyer";
-$a->strings["yourls Settings saved."] = "Réglages yourls sauvés.";
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["YourLS"] = "YourLS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Nom d'utilisateur :";
+$a->strings["Password:"] = "Mot de passe :";
+$a->strings["Use SSL "] = "Utiliser SSL";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["yourls Settings saved."] = "paramètres YourLS sauvegardés.";
diff --git a/yourls/lang/ro/messages.po b/yourls/lang/ro/messages.po
new file mode 100644
index 00000000..3cd9388b
--- /dev/null
+++ b/yourls/lang/ro/messages.po
@@ -0,0 +1,47 @@
+# ADDON yourls
+# Copyright (C)
+# This file is distributed under the same license as the Friendica yourls addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:12+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: yourls.php:55 yourls.php:59
+msgid "YourLS"
+msgstr "YourLS"
+
+#: yourls.php:63
+msgid "URL: http://"
+msgstr "URL: http://"
+
+#: yourls.php:68
+msgid "Username:"
+msgstr "Utilizator:"
+
+#: yourls.php:73
+msgid "Password:"
+msgstr "Parola:"
+
+#: yourls.php:78
+msgid "Use SSL "
+msgstr "Utilizează SSL"
+
+#: yourls.php:82
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: yourls.php:98
+msgid "yourls Settings saved."
+msgstr "Configurările YourLS au fost salvate."
diff --git a/yourls/lang/ro/strings.php b/yourls/lang/ro/strings.php
new file mode 100644
index 00000000..9f60949e
--- /dev/null
+++ b/yourls/lang/ro/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["YourLS"] = "YourLS";
+$a->strings["URL: http://"] = "URL: http://";
+$a->strings["Username:"] = "Utilizator:";
+$a->strings["Password:"] = "Parola:";
+$a->strings["Use SSL "] = "Utilizează SSL";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["yourls Settings saved."] = "Configurările YourLS au fost salvate.";