diff --git a/boot.php b/boot.php
index 1dc769180..7dbcff93d 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.0.1499' );
+define ( 'FRIENDICA_VERSION', '3.0.1500' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1156 );
diff --git a/htconfig.php b/htconfig.php
index de7674c9a..ab9a7ca50 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -54,8 +54,8 @@ $a->config['php_path'] = 'php';
// You shouldn't need to change anything else.
// Location of global directory submission page.
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
diff --git a/images/friendika-128.jpg b/images/friendika-128.jpg
deleted file mode 100644
index f7d86ae50..000000000
Binary files a/images/friendika-128.jpg and /dev/null differ
diff --git a/images/friendika-128.png b/images/friendika-128.png
deleted file mode 100644
index d2792ab54..000000000
Binary files a/images/friendika-128.png and /dev/null differ
diff --git a/images/friendika-16.jpg b/images/friendika-16.jpg
deleted file mode 100644
index ce59a70a0..000000000
Binary files a/images/friendika-16.jpg and /dev/null differ
diff --git a/images/friendika-16.png b/images/friendika-16.png
deleted file mode 100644
index 745b7ac6c..000000000
Binary files a/images/friendika-16.png and /dev/null differ
diff --git a/images/friendika-1600.png b/images/friendika-1600.png
deleted file mode 100644
index 615a81dd9..000000000
Binary files a/images/friendika-1600.png and /dev/null differ
diff --git a/images/friendika-256.jpg b/images/friendika-256.jpg
deleted file mode 100644
index 182810d62..000000000
Binary files a/images/friendika-256.jpg and /dev/null differ
diff --git a/images/friendika-256.png b/images/friendika-256.png
deleted file mode 100644
index e965fbaba..000000000
Binary files a/images/friendika-256.png and /dev/null differ
diff --git a/images/friendika-32.jpg b/images/friendika-32.jpg
deleted file mode 100644
index 4e697411d..000000000
Binary files a/images/friendika-32.jpg and /dev/null differ
diff --git a/images/friendika-32.png b/images/friendika-32.png
deleted file mode 100644
index 61764bf20..000000000
Binary files a/images/friendika-32.png and /dev/null differ
diff --git a/images/friendika-48.png b/images/friendika-48.png
deleted file mode 100644
index f858d9a81..000000000
Binary files a/images/friendika-48.png and /dev/null differ
diff --git a/images/friendika-64.jpg b/images/friendika-64.jpg
deleted file mode 100644
index 050830fff..000000000
Binary files a/images/friendika-64.jpg and /dev/null differ
diff --git a/images/friendika-64.png b/images/friendika-64.png
deleted file mode 100644
index 88cb8b016..000000000
Binary files a/images/friendika-64.png and /dev/null differ
diff --git a/images/friendika-96.png b/images/friendika-96.png
deleted file mode 100644
index 76a102ef2..000000000
Binary files a/images/friendika-96.png and /dev/null differ
diff --git a/images/friendika.svg b/images/friendika.svg
deleted file mode 100644
index 2155d0b00..000000000
--- a/images/friendika.svg
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="96"
- height="96"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.0 r9654"
- sodipodi:docname="friendika.svg"
- inkscape:export-filename="/home/meta/Documents/My random images/friendika.png"
- inkscape:export-xdpi="80.552788"
- inkscape:export-ydpi="80.552788">
- <defs
- id="defs4">
- <linearGradient
- id="highlightgradient">
- <stop
- id="stop3833"
- offset="0"
- style="stop-color:#ffffff;stop-opacity:0.74374998;" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3829" />
- </linearGradient>
- <linearGradient
- id="shadowgradient">
- <stop
- id="stop3833-5"
- offset="0"
- style="stop-color:#000000;stop-opacity:0.5;" />
- <stop
- style="stop-color:#818080;stop-opacity:0;"
- offset="1"
- id="stop3829-9" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#highlightgradient"
- id="linearGradient4011"
- x1="44.948269"
- y1="0"
- x2="54.103466"
- y2="46.797421"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1,0.54545455)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#shadowgradient"
- id="linearGradient4021"
- x1="52.016712"
- y1="96"
- x2="42.867535"
- y2="41.837971"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1,0,0,0.5,0,48)" />
- <filter
- inkscape:collect="always"
- id="filter4055"
- x="-0.03"
- width="1.06"
- y="-0.12"
- height="1.24">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.2"
- id="feGaussianBlur4057" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter4059"
- x="-0.029877551"
- width="1.0597551"
- y="-0.122"
- height="1.244">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.22"
- id="feGaussianBlur4061" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.9132799"
- inkscape:cx="53.033009"
- inkscape:cy="2.8284271"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="true"
- width="256px"
- inkscape:snap-global="true"
- inkscape:window-width="1680"
- inkscape:window-height="1010"
- inkscape:window-x="194"
- inkscape:window-y="0"
- inkscape:window-maximized="0">
- <inkscape:grid
- type="xygrid"
- id="grid2985"
- empspacing="3"
- visible="true"
- enabled="true"
- snapvisiblegridlinesonly="true"
- spacingx="2px"
- spacingy="2px" />
- </sodipodi:namedview>
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Colors"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-956.3622)"
- style="display:inline">
- <path
- style="fill:#ffc019;fill-opacity:1;stroke:none"
- d="M 16,0 C 7.0091019,0.04308252 0,7.0521845 0,16 0,16 0,57.499123 0,80 0,89.120146 7.0091019,96 16,96 L 32,96 32,70 64,70 63.916016,46.068359 32,46.236328 32,26 64,26 64,0 C 64,0 24,0 16,0 z"
- transform="translate(0,956.3622)"
- id="rect2993"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccsccccccccc" />
- <path
- style="fill:#1872a2;fill-opacity:1;stroke:none"
- d="m 80,1052.3622 c 8.990898,0 16.086165,-6.966 16,-16 0,0 0,-41.4991 0,-64 0.07767,-9.01639 -7.067354,-16 -16,-16 l -16,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26 c 0,0 32,0 48,0 z"
- id="rect2993-6"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccsccccccccc" />
- </g>
- <g
- style="display:inline"
- inkscape:label="Lines as original logo"
- id="g3997"
- inkscape:groupmode="layer">
- <path
- sodipodi:nodetypes="cccccccc"
- inkscape:connector-curvature="0"
- id="path3999"
- d="m 64,0 0,26 -32,0 0,22 m 32,0 0,22 -32,0 0,26"
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <rect
- ry="16"
- rx="16"
- y="0"
- x="0"
- height="96"
- width="96"
- id="rect4001"
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="Lines with center break"
- style="display:none">
- <path
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 64,0 0,26 -32,0 0,22 32,0 0,22 -32,0 0,26"
- id="path3926"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccc" />
- <rect
- style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="rect3928"
- width="96"
- height="96"
- x="0"
- y="0"
- rx="16"
- ry="16" />
- </g>
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="Effects"
- style="display:inline">
- <rect
- style="fill:url(#linearGradient3930);fill-opacity:1;stroke:none"
- id="rect3823"
- width="96"
- height="48.04369"
- x="-3.1086245e-15"
- y="1.8024861e-14"
- ry="15.215644"
- rx="15.214664" />
- <rect
- style="fill:url(#linearGradient3904);fill-opacity:1;stroke:none"
- id="rect3823-8"
- width="96"
- height="47.86721"
- x="1.5376101e-14"
- y="-96"
- ry="15.159752"
- rx="15.214664"
- transform="scale(1,-1)" />
- <rect
- style="fill:url(#linearGradient4011);fill-opacity:1;stroke:none;filter:url(#filter4059)"
- id="rect4003"
- width="98"
- height="24"
- x="0"
- y="0"
- rx="15.214664"
- ry="8.2994423"
- transform="matrix(1.0296115,0,0,1.1963836,-2.901924,-4.7132067)" />
- <rect
- style="opacity:0.56746030000000003;fill:url(#linearGradient4021);fill-opacity:1;stroke:none;filter:url(#filter4055)"
- id="rect4013"
- width="96"
- height="24"
- x="0"
- y="72"
- rx="14.008356"
- ry="12"
- transform="matrix(0.9768331,0,0,0.91974646,1.1649641,8.098115)" />
- </g>
-</svg>
diff --git a/include/text.php b/include/text.php
index 23e3e5061..0e33c678c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -826,7 +826,6 @@ function smilies($s, $sample = false) {
':facepalm',
':like',
':dislike',
- '~friendika',
'~friendica'
);
@@ -864,7 +863,6 @@ function smilies($s, $sample = false) {
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
- '<a href="http://project.friendika.com">~friendika <img class="smiley" src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
);
diff --git a/mod/friendika.php b/mod/friendika.php
deleted file mode 100644
index 1f3df565d..000000000
--- a/mod/friendika.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require_once('mod/friendica.php');
-
-function friendika_init(&$a) {
- friendica_init($a);
-}
-
-function friendika_content(&$a) {
- return friendica_content($a);
-}
diff --git a/mod/localtime.php b/mod/localtime.php
index c03eae1b0..d1453bc52 100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -23,7 +23,7 @@ function localtime_content(&$a) {
$o .= '<h3>' . t('Time Conversion') . '</h3>';
- $o .= '<p>' . t('Friendika provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
+ $o .= '<p>' . t('Friendica provides this service for sharing events with other networks and friends in unknown timezones.') . '</p>';
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index 5bf4663fd..f4984f0f0 100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
@@ -7,8 +7,8 @@ function rsd_xml_content(&$a) {
echo '<?xml version="1.0" encoding="UTF-8"?>
<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
<service>
- <engineName>Friendika</engineName>
- <engineLink>http://friendika.com/</engineLink>
+ <engineName>Friendica</engineName>
+ <engineLink>http://friendica.com/</engineLink>
<apis>
<api name="Twitter" preferred="true" apiLink="'.$a->get_baseurl().'/api/" blogID="">
<settings>
diff --git a/util/fpostit/fpostit.php b/util/fpostit/fpostit.php
index 491d81f6d..ce0b45fb7 100644
--- a/util/fpostit/fpostit.php
+++ b/util/fpostit/fpostit.php
@@ -1,8 +1,8 @@
<?php
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
- setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
- setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300);
+ setcookie("password", $_POST["friendica_password"], time()+60*60*24*300);
}
?>
@@ -59,14 +59,14 @@ if ((isset($title)) && (isset($text)) && (isset($url))) {
if (isset($_POST['submit'])) {
- if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
- $acctname = $_POST["friendika_acct_name"];
+ if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) {
+ $acctname = $_POST["friendica_acct_name"];
$tmp_account_array = explode("@", $acctname);
if (isset($tmp_account_array[1])) {
$username = $tmp_account_array[0];
$hostname = $tmp_account_array[1];
}
- $password = $_POST["friendika_password"];
+ $password = $_POST["friendica_password"];
$content = $_POST["content"];
$url = "http://" . $hostname . '/api/statuses/update';
@@ -106,15 +106,15 @@ function showForm($error, $content) {
echo <<<EOF
<div class='wrap1'>
- <h2><img class='logo' src='friendika-32.png' align='middle';/>
- Friendika Bookmarklet</h2>
+ <h2><img class='logo' src='friendica-32.png' align='middle';/>
+ Friendica Bookmarklet</h2>
</div>
<div class="wrap2">
<form method="post" action="{$_SERVER['PHP_SELF']}">
- Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
- Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
- Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+ Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
+ Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50"/><br />
+ Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50"/><br />
<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
<input type="submit" value="PostIt!" name="submit" /> <span class='error'>$error</span>
</form>
diff --git a/util/messages.po b/util/messages.po
index da8f4500c..15d84ac52 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 3.0.1499\n"
+"Project-Id-Version: 3.0.1500\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-17 10:03-0700\n"
+"POT-Creation-Date: 2012-10-18 10:00-0700\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"
@@ -178,8 +178,8 @@ msgstr ""
#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
#: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:757
-#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/config.php:152
#: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
#: ../../addon.old/facebook/facebook.php:619
@@ -285,7 +285,7 @@ msgstr ""
msgid "link to source"
msgstr ""
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
#: ../../include/nav.php:52 ../../boot.php:1701
msgid "Events"
msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:598
+#: ../../view/theme/diabook/theme.php:492
#: ../../addon.old/communityhome/communityhome.php:110
msgid "Contact Photos"
msgstr ""
@@ -460,7 +460,7 @@ msgstr ""
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
#: ../../include/user.php:331 ../../include/user.php:338
#: ../../addon.old/communityhome/communityhome.php:111
msgid "Profile Photos"
@@ -484,7 +484,7 @@ msgstr ""
#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
#: ../../include/conversation.php:253
#: ../../addon.old/communityhome/communityhome.php:163
@@ -695,7 +695,7 @@ msgstr ""
msgid "Not available."
msgstr ""
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:133
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
#: ../../include/nav.php:101
msgid "Community"
msgstr ""
@@ -1537,7 +1537,7 @@ msgstr ""
msgid "Personal"
msgstr ""
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:127
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
#: ../../include/nav.php:77 ../../include/nav.php:115
msgid "Home"
msgstr ""
@@ -1982,7 +1982,7 @@ msgstr ""
msgid "Edit contact"
msgstr ""
-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
#: ../../include/nav.php:139
msgid "Contacts"
msgstr ""
@@ -2109,8 +2109,8 @@ msgstr ""
#: ../../mod/settings.php:69 ../../mod/newmember.php:22
#: ../../mod/admin.php:785 ../../mod/admin.php:990
#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
#: ../../addon.old/dav/friendica/layout.fnk.php:225
#: ../../addon.old/mathjax/mathjax.php:36
msgid "Settings"
@@ -2855,7 +2855,7 @@ msgid ""
msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1684
msgid "Profile"
@@ -3180,8 +3180,8 @@ msgstr ""
#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1835
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
#: ../../include/conversation.php:120 ../../include/conversation.php:129
#: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../addon.old/facebook/facebook.php:1598
@@ -3192,7 +3192,7 @@ msgstr ""
#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
#: ../../include/conversation.php:136
#: ../../addon.old/facebook/facebook.php:1602
#: ../../addon.old/communityhome/communityhome.php:172
@@ -3215,7 +3215,7 @@ msgstr ""
msgid "Access denied."
msgstr ""
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
#: ../../include/nav.php:51 ../../boot.php:1691
msgid "Photos"
msgstr ""
@@ -4607,7 +4607,7 @@ msgstr ""
msgid "diaspora2bb: "
msgstr ""
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@@ -4622,7 +4622,7 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:624
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
msgid "Global Directory"
msgstr ""
@@ -5560,7 +5560,7 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
#: ../../include/conversation.php:117 ../../include/conversation.php:245
#: ../../addon.old/communityhome/communityhome.php:155
msgid "event"
@@ -7554,7 +7554,7 @@ msgid "Post to Posterous by default"
msgstr ""
#: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/diabook/config.php:154
#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
msgid "Theme settings"
msgstr ""
@@ -7564,7 +7564,7 @@ msgid "Set resize level for images in posts and comments (width and height)"
msgstr ""
#: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/diabook/config.php:155
#: ../../view/theme/dispy/config.php:73
msgid "Set font-size for posts and comments"
msgstr ""
@@ -7578,174 +7578,158 @@ msgstr ""
msgid "Color scheme"
msgstr ""
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
#: ../../include/nav.php:115
msgid "Your posts and conversations"
msgstr ""
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
msgid "Your profile page"
msgstr ""
-#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:89
msgid "Your contacts"
msgstr ""
-#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
msgid "Your photos"
msgstr ""
-#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
msgid "Your events"
msgstr ""
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
msgid "Personal notes"
msgstr ""
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
msgid "Your personal photos"
msgstr ""
-#: ../../view/theme/diabook/theme.php:134
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:747
-#: ../../view/theme/diabook/config.php:201
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/config.php:163
msgid "Community Pages"
msgstr ""
-#: ../../view/theme/diabook/theme.php:490
-#: ../../view/theme/diabook/theme.php:749
-#: ../../view/theme/diabook/config.php:203
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/config.php:165
msgid "Community Profiles"
msgstr ""
-#: ../../view/theme/diabook/theme.php:511
-#: ../../view/theme/diabook/theme.php:754
-#: ../../view/theme/diabook/config.php:208
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/config.php:170
msgid "Last users"
msgstr ""
-#: ../../view/theme/diabook/theme.php:540
-#: ../../view/theme/diabook/theme.php:756
-#: ../../view/theme/diabook/config.php:210
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/config.php:172
msgid "Last likes"
msgstr ""
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/theme.php:755
-#: ../../view/theme/diabook/config.php:209
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/config.php:171
msgid "Last photos"
msgstr ""
-#: ../../view/theme/diabook/theme.php:622
-#: ../../view/theme/diabook/theme.php:752
-#: ../../view/theme/diabook/config.php:206
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/config.php:168
msgid "Find Friends"
msgstr ""
-#: ../../view/theme/diabook/theme.php:623
+#: ../../view/theme/diabook/theme.php:517
msgid "Local Directory"
msgstr ""
-#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
-#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
-#: ../../view/theme/diabook/theme.php:678
-#: ../../view/theme/diabook/theme.php:748
-#: ../../view/theme/diabook/config.php:202
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/config.php:164
msgid "Earth Layers"
msgstr ""
-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:577
msgid "Set zoomfactor for Earth Layers"
msgstr ""
-#: ../../view/theme/diabook/theme.php:684
-#: ../../view/theme/diabook/config.php:199
+#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/config.php:161
msgid "Set longitude (X) for Earth Layers"
msgstr ""
-#: ../../view/theme/diabook/theme.php:685
-#: ../../view/theme/diabook/config.php:200
+#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/config.php:162
msgid "Set latitude (Y) for Earth Layers"
msgstr ""
-#: ../../view/theme/diabook/theme.php:698
-#: ../../view/theme/diabook/theme.php:750
-#: ../../view/theme/diabook/config.php:204
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/config.php:166
msgid "Help or @NewHere ?"
msgstr ""
-#: ../../view/theme/diabook/theme.php:705
-#: ../../view/theme/diabook/theme.php:751
-#: ../../view/theme/diabook/config.php:205
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/config.php:167
msgid "Connect Services"
msgstr ""
-#: ../../view/theme/diabook/theme.php:712
-#: ../../view/theme/diabook/theme.php:753
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
msgid "Last Tweets"
msgstr ""
-#: ../../view/theme/diabook/theme.php:715
-#: ../../view/theme/diabook/config.php:197
+#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/config.php:159
msgid "Set twitter search term"
msgstr ""
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
msgid "don't show"
msgstr ""
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
msgid "show"
msgstr ""
-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:630
msgid "Show/hide boxes at right-hand column:"
msgstr ""
-#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/diabook/config.php:156
#: ../../view/theme/dispy/config.php:74
msgid "Set line-height for posts and comments"
msgstr ""
-#: ../../view/theme/diabook/config.php:195
+#: ../../view/theme/diabook/config.php:157
msgid "Set resolution for middle column"
msgstr ""
-#: ../../view/theme/diabook/config.php:196
+#: ../../view/theme/diabook/config.php:158
msgid "Set color scheme"
msgstr ""
-#: ../../view/theme/diabook/config.php:198
+#: ../../view/theme/diabook/config.php:160
msgid "Set zoomfactor for Earth Layer"
msgstr ""
-#: ../../view/theme/diabook/config.php:207
+#: ../../view/theme/diabook/config.php:169
msgid "Last tweets"
msgstr ""
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
index fb4f51f59..3db91573e 100644
--- a/view/api_timeline_atom.tpl
+++ b/view/api_timeline_atom.tpl
@@ -1,8 +1,8 @@
<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
<generator uri="http://status.net" version="0.9.7">StatusNet</generator>
<id>$rss.self</id>
- <title>Friendika</title>
- <subtitle>Friendika API feed</subtitle>
+ <title>Friendica</title>
+ <subtitle>Friendica API feed</subtitle>
<logo>$rss.logo</logo>
<updated>$rss.atom_updated</updated>
<link type="text/html" rel="alternate" href="$rss.alternate"/>
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
index 40239273c..99279ec37 100644
--- a/view/api_timeline_rss.tpl
+++ b/view/api_timeline_rss.tpl
@@ -1,9 +1,9 @@
<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
<channel>
- <title>Friendika</title>
+ <title>Friendica</title>
<link>$rss.alternate</link>
<atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
- <description>Friendika timeline</description>
+ <description>Friendica timeline</description>
<language>$rss.language</language>
<ttl>40</ttl>
<image>
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
index 28446f3df..1e6e2365a 100644
--- a/view/ca/htconfig.tpl
+++ b/view/ca/htconfig.tpl
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
// Location of global directory submission page.
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl
index 64eee0bf1..c3a74054f 100644
--- a/view/ca/mail_received_html_body_eml.tpl
+++ b/view/ca/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Has rebut un nou missatge privat de '$from' en $siteName.</td></tr>
diff --git a/view/ca/messages.po b/view/ca/messages.po
index 2abf83b96..d7c83d932 100644
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@@ -1216,7 +1216,7 @@ msgstr "Temps de Conversió"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes."
diff --git a/view/ca/strings.php b/view/ca/strings.php
index ce3826a42..dc7207bb7 100644
--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Que es següent</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: necessitarà configurar [manualment] el programar una tasca pel sondejador (poller.php)";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Temps de Conversió";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofereix aquest servei per compartir esdeveniments amb altres xarxes i amics a les zones horàries desconegudes.";
$a->strings["UTC time: %s"] = "hora UTC: %s";
$a->strings["Current timezone: %s"] = "Zona horària actual: %s";
$a->strings["Converted localtime: %s"] = "Conversión de hora local: %s";
diff --git a/view/cs/cmnt_received_html_body_eml.tpl b/view/cs/cmnt_received_html_body_eml.tpl
index 6b6318743..e18129697 100644
--- a/view/cs/cmnt_received_html_body_eml.tpl
+++ b/view/cs/cmnt_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Friendika zpráva</title>
+ <title>Friendica zpráva</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from okomentoval položku/konverzaci, kterou následujete.</td></tr>
diff --git a/view/cs/mail_received_html_body_eml.tpl b/view/cs/mail_received_html_body_eml.tpl
index 427c6c98d..be59ecd22 100644
--- a/view/cs/mail_received_html_body_eml.tpl
+++ b/view/cs/mail_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Friendika Zpráva</title>
+ <title>Friendica Zpráva</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from Vám poslal(a) novou soukromou zprávu na $siteName.</td></tr>
diff --git a/view/cs/messages.po b/view/cs/messages.po
index 1c42585d6..2ea36d0c6 100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -1236,9 +1236,9 @@ msgstr "Časová konverze"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
-msgstr "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem."
+msgstr "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem."
#: ../../mod/localtime.php:30
#, php-format
@@ -2816,7 +2816,7 @@ msgid ""
"Set some public keywords for your default profile which describe your "
"interests. We may be able to find other people with similar interests and "
"suggest friendships."
-msgstr "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendika Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství."
+msgstr "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendica Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství."
#: ../../mod/newmember.php:44
msgid "Connecting"
@@ -2924,7 +2924,7 @@ msgstr "Navštivte sekci nápovědy"
msgid ""
"Our <strong>help</strong> pages may be consulted for detail on other program"
" features and resources."
-msgstr "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací."
+msgstr "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendica ale také další zdroje informací."
#: ../../mod/attach.php:8
msgid "Item not available."
diff --git a/view/cs/strings.php b/view/cs/strings.php
index 6286d3846..f2d098f29 100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -256,7 +256,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Co dál<h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Časová konverze";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem.";
$a->strings["UTC time: %s"] = "UTC čas: %s";
$a->strings["Current timezone: %s"] = "Aktuální časové pásmo: %s";
$a->strings["Converted localtime: %s"] = "Převedený lokální čas : %s";
@@ -633,7 +633,7 @@ $a->strings["Upload a profile photo if you have not done so already. Studies hav
$a->strings["Edit Your Profile"] = "Editujte Váš profil";
$a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Upravit <strong>výchozí</strong> profil podle vašich představ. Prověřte nastavení pro skrytí Vašeho seznamu přátel a skrytí profilu před neznámými návštěvníky.";
$a->strings["Profile Keywords"] = "Profilová klíčová slova";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendika Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendica Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství.";
$a->strings["Connecting"] = "Probíhá pokus o připojení";
$a->strings["Facebook"] = "Facebook";
$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Jestliže máte účet na Facebooku, povolte konektor na Facebook a bude možné (na přání) importovat všechny Vaš přátele na Facebooku a všechny Vaše konverzace.";
@@ -653,7 +653,7 @@ $a->strings["Why Aren't My Posts Public?"] = "Proč nejsou mé příspěvky veř
$a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektuje Vaše soukromí. Defaultně jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu";
$a->strings["Getting Help"] = "Získání nápovědy";
$a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendica ale také další zdroje informací.";
$a->strings["Item not available."] = "Položka není k dispozici.";
$a->strings["Item was not found."] = "Položka nebyla nalezena.";
$a->strings["Group created."] = "Skupina vytvořena.";
diff --git a/view/cs/wall_received_html_body_eml.tpl b/view/cs/wall_received_html_body_eml.tpl
index 893eec20c..043d5f8d2 100644
--- a/view/cs/wall_received_html_body_eml.tpl
+++ b/view/cs/wall_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Friendika zpráva</title>
+ <title>Friendica zpráva</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from obohatil Vaši profilovou zeď.</td></tr>
diff --git a/view/de/messages.po b/view/de/messages.po
index 97675edb6..e5558bae7 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -1249,7 +1249,7 @@ msgstr "Zeitumrechnung"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."
diff --git a/view/de/strings.php b/view/de/strings.php
index e7eb71444..adac310aa 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Zeitumrechnung";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
$a->strings["UTC time: %s"] = "UTC Zeit: %s";
$a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
$a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
diff --git a/view/eo/messages.po b/view/eo/messages.po
index 6729ca86a..68121ba22 100644
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
@@ -1216,7 +1216,7 @@ msgstr "Konverto de tempo"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj."
diff --git a/view/eo/strings.php b/view/eo/strings.php
index 1f95332ee..bc31c1a2d 100644
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Kio sekvas nun?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "GRAVA: Vi bezonas [mane] agordi planitan taskon por la Friendica poller.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Konverto de tempo";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provizas tiun servon por kunhavigi okazojn kun aliaj retoj kaj amikoj en aliaj horzonoj.";
$a->strings["UTC time: %s"] = "UTC horo: %s";
$a->strings["Current timezone: %s"] = "Aktuala horzono: %s";
$a->strings["Converted localtime: %s"] = "Konvertita loka horo: %s";
diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl
index 5086ec246..fe2f26742 100644
--- a/view/es/mail_received_html_body_eml.tpl
+++ b/view/es/mail_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Mensaje de Friendika</title>
+ <title>Mensaje de Friendica</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Has recibido un nuevo mensaje privado de '$from' en $siteName.</td></tr>
diff --git a/view/es/messages.po b/view/es/messages.po
index 3487e558b..0d2fa97c8 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -1221,7 +1221,7 @@ msgstr "Conversión horária"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas."
diff --git a/view/es/strings.php b/view/es/strings.php
index e8c617086..fb8805389 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversión horária";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
$a->strings["UTC time: %s"] = "Tiempo UTC: %s";
$a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
$a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl
index b56ef9e64..9da52dd61 100644
--- a/view/fr/cmnt_received_html_body_eml.tpl
+++ b/view/fr/cmnt_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from a commenté un élément ou une conversation que vous suivez.</td></tr>
diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl
index 9961a0c01..74956ea80 100644
--- a/view/fr/mail_received_html_body_eml.tpl
+++ b/view/fr/mail_received_html_body_eml.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendica</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from vous a envoyé un message à $siteName.</td></tr>
diff --git a/view/fr/messages.po b/view/fr/messages.po
index 816bf14a7..40ab0b2b4 100644
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@@ -1236,7 +1236,7 @@ msgstr "Conversion temporelle"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire."
diff --git a/view/fr/strings.php b/view/fr/strings.php
index 2c6c5c9ce..cb1c6894e 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Ensuite</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANT: Vous devez configurer [manuellement] une tâche programmée pour le 'poller'.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "Conversion temporelle";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fournit ce service pour partager des événements avec d'autres réseaux et amis indépendament de leur fuseau horaire.";
$a->strings["UTC time: %s"] = "Temps UTC : %s";
$a->strings["Current timezone: %s"] = "Zone de temps courante : %s";
$a->strings["Converted localtime: %s"] = "Temps local converti : %s";
diff --git a/view/is/messages.po b/view/is/messages.po
index b020998b4..2c1fcb2d8 100644
--- a/view/is/messages.po
+++ b/view/is/messages.po
@@ -1218,7 +1218,7 @@ msgstr "Tíma leiðréttir"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum."
diff --git a/view/is/strings.php b/view/is/strings.php
index 05f43486d..5af232362 100644
--- a/view/is/strings.php
+++ b/view/is/strings.php
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "MIKILVÆGT: Þú þarft að [handvirkt] setja upp sjálfvirka keyrslu á poller.";
$a->strings["l F d, Y \\@ g:i A"] = "";
$a->strings["Time Conversion"] = "Tíma leiðréttir";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica veitir þessa þjónustu til að deila atburðum milli neta og vina í óþekktum tímabeltum.";
$a->strings["UTC time: %s"] = "Máltími: %s";
$a->strings["Current timezone: %s"] = "Núverandi tímabelti: %s";
$a->strings["Converted localtime: %s"] = "Umbreyttur staðartími: %s";
diff --git a/view/it/cmnt_received_html_body_eml.tpl b/view/it/cmnt_received_html_body_eml.tpl
index 5f2edb84b..02d67bd4a 100644
--- a/view/it/cmnt_received_html_body_eml.tpl
+++ b/view/it/cmnt_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Friendika Messaggio</title>
+ <title>Friendica Messaggio</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from ha commentato un elemeto/conversazione che stai seguendo.</td></tr>
diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl
index 847954550..d8111da03 100644
--- a/view/it/mail_received_html_body_eml.tpl
+++ b/view/it/mail_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Friendika Messsaggio</title>
+ <title>Friendica Messsaggio</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
diff --git a/view/it/messages.po b/view/it/messages.po
index 9dfe40dc5..3983cc3f9 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -1090,7 +1090,7 @@ msgstr "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in gra
msgid ""
"If running under Windows, please see "
"\"http://www.php.net/manual/en/openssl.installation.php\"."
-msgstr "Se stai eseguendo friendika su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr "Se stai eseguendo friendica su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
#: ../../mod/install.php:364
msgid "Generate encryption keys"
@@ -1215,9 +1215,9 @@ msgstr "Conversione Ora"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
-msgstr "Friendika fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti."
+msgstr "Friendica fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti."
#: ../../mod/localtime.php:30
#, php-format
diff --git a/view/it/strings.php b/view/it/strings.php
index 7959a67e5..945ed863f 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -222,7 +222,7 @@ $a->strings["The command line version of PHP on your system does not have \"regi
$a->strings["This is required for message delivery to work."] = "E' obbligatorio per far funzionare la consegna dei messaggi.";
$a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in grado di generare le chiavi di criptazione";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se stai eseguendo friendika su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se stai eseguendo friendica su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\".";
$a->strings["Generate encryption keys"] = "Genera chiavi di criptazione";
$a->strings["libCurl PHP module"] = "modulo PHP libCurl";
$a->strings["GD graphics PHP module"] = "modulo PHP GD graphics";
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del poller.";
$a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
$a->strings["Time Conversion"] = "Conversione Ora";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti.";
$a->strings["UTC time: %s"] = "Ora UTC: %s";
$a->strings["Current timezone: %s"] = "Fuso orario corrente: %s";
$a->strings["Converted localtime: %s"] = "Ora locale convertita: %s";
diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl
index cdc05cfa3..62a7f5a62 100644
--- a/view/it/wall_received_html_body_eml.tpl
+++ b/view/it/wall_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Messaggio da Friendika</title>
+ <title>Messaggio da Friendica</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendika-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendika</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">Friendica</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from ha scritto sulla tua bacheca.</td></tr>
diff --git a/view/nav.tpl b/view/nav.tpl
index 4675c3e5c..8969accb7 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -10,7 +10,7 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
diff --git a/view/nb-no/messages.po b/view/nb-no/messages.po
index c114c2e18..e94d1a912 100644
--- a/view/nb-no/messages.po
+++ b/view/nb-no/messages.po
@@ -1211,7 +1211,7 @@ msgstr "Tidskonvertering"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner."
diff --git a/view/nb-no/strings.php b/view/nb-no/strings.php
index 88b5bc5a8..8ac2b58f8 100644
--- a/view/nb-no/strings.php
+++ b/view/nb-no/strings.php
@@ -249,7 +249,7 @@ $a->strings["<h1>What next</h1>"] = "";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "VIKTIG: Du må [manuelt] sette opp en planlagt oppgave for oppdatering.";
$a->strings["l F d, Y \\@ g:i A"] = "";
$a->strings["Time Conversion"] = "Tidskonvertering";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica har denne tjenesten for å dele hendelser med andre nettverk og venner i ukjente tidssoner.";
$a->strings["UTC time: %s"] = "UTC tid: %s";
$a->strings["Current timezone: %s"] = "Gjeldende tidssone: %s";
$a->strings["Converted localtime: %s"] = "Konvertert lokaltid: %s";
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
index c7e6df498..6735a3e04 100644
--- a/view/oexchange_xrd.tpl
+++ b/view/oexchange_xrd.tpl
@@ -4,23 +4,23 @@
<Subject>$base</Subject>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
<Property
- type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+ type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
<Link
rel="icon"
- href="$base/images/friendika-16.png"
+ href="$base/images/friendica-16.png"
type="image/png"
/>
<Link
rel="icon32"
- href="$base/images/friendika-32.png"
+ href="$base/images/friendica-32.png"
type="image/png"
/>
diff --git a/view/pt-br/messages.po b/view/pt-br/messages.po
index 52d79fb84..d60432884 100644
--- a/view/pt-br/messages.po
+++ b/view/pt-br/messages.po
@@ -1216,7 +1216,7 @@ msgid ""
"The database configuration file \".htconfig.php\" could not be written. "
"Please use the enclosed text to create a configuration file in your web "
"server root."
-msgstr "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web."
+msgstr "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendica em seu servidor web."
#: ../../mod/install.php:475
msgid "Errors encountered creating database tables."
@@ -1243,7 +1243,7 @@ msgstr "Conversão de tempo"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes."
diff --git a/view/pt-br/strings.php b/view/pt-br/strings.php
index d1901dbe7..7d96b0b8c 100644
--- a/view/pt-br/strings.php
+++ b/view/pt-br/strings.php
@@ -249,13 +249,13 @@ $a->strings["You can alternatively skip this procedure and perform a manual inst
$a->strings[".htconfig.php is writable"] = ".htconfig.php tem permissão de escrita";
$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "A reescrita de URLs definida no .htaccess não está funcionando. Por favor, verifique as configurações do seu servidor.";
$a->strings["Url rewrite is working"] = "A reescrita de URLs está funcionando";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendika em seu servidor web.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Não foi possível gravar o arquivo de configuração \".htconfig.php\". Por favor, use o texto incluso para criar um arquivo de configuração na raiz da instalação do Friendica em seu servidor web.";
$a->strings["Errors encountered creating database tables."] = "Foram encontrados erros durante a criação das tabelas do banco de dados.";
$a->strings["<h1>What next</h1>"] = "<h1>A seguir</h1>";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Você deve configurar [manualmente] uma tarefa agendada para o captador.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ H:i";
$a->strings["Time Conversion"] = "Conversão de tempo";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornece este serviço para compartilhar eventos com outras redes e amigos em fusos horários diferentes.";
$a->strings["UTC time: %s"] = "Hora UTC: %s";
$a->strings["Current timezone: %s"] = "Fuso horário atual: %s";
$a->strings["Converted localtime: %s"] = "Horário local convertido: %s";
diff --git a/view/ru/messages.po b/view/ru/messages.po
index 49f91a500..354c436fc 100644
--- a/view/ru/messages.po
+++ b/view/ru/messages.po
@@ -906,7 +906,7 @@ msgstr "Запрос в друзья / на подключение"
msgid ""
"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
"testuser@identi.ca"
-msgstr "Примеры: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"
+msgstr "Примеры: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
#: ../../mod/dfrn_request.php:833
msgid "Please answer the following:"
@@ -1214,7 +1214,7 @@ msgstr "История общения"
#: ../../mod/localtime.php:26
msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
"friends in unknown timezones."
msgstr ""
diff --git a/view/ru/strings.php b/view/ru/strings.php
index 6559f8fd4..91c7c4eae 100644
--- a/view/ru/strings.php
+++ b/view/ru/strings.php
@@ -184,7 +184,7 @@ $a->strings["Please enter your 'Identity Address' from one of the following supp
$a->strings["<strike>Connect as an email follower</strike> (Coming soon)"] = "";
$a->strings["If you are not yet a member of the free social web, <a href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
$a->strings["Friend/Connection Request"] = "Запрос в друзья / на подключение";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Примеры: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Примеры: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
$a->strings["Please answer the following:"] = "Пожалуйста, ответьте следующее:";
$a->strings["Does %s know you?"] = "%s знает вас?";
$a->strings["Add a personal note:"] = "Добавить личную заметку:";
@@ -250,7 +250,7 @@ $a->strings["<h1>What next</h1>"] = "";
$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "ВАЖНО: Вам нужно будет [вручную] установить запланированное задание для регистратора.";
$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
$a->strings["Time Conversion"] = "История общения";
-$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
$a->strings["UTC time: %s"] = "UTC время: %s";
$a->strings["Current timezone: %s"] = "Ваш часовой пояс: %s";
$a->strings["Converted localtime: %s"] = "Ваше изменённое время: %s";
diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl
index fee08bdca..41cd34831 100644
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
@@ -1,6 +1,6 @@
$myname,
-'$requestor' på $sitename vill följa dina uppdateringar här på Friendika.
+'$requestor' på $sitename vill följa dina uppdateringar här på Friendica.
Besök dennes profil på $url.
diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl
index a9a34c23a..f72e4af5c 100644
--- a/view/sv/mail_received_html_body_eml.tpl
+++ b/view/sv/mail_received_html_body_eml.tpl
@@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
<html>
<head>
- <title>Meddelande på Friendika</title>
+ <title>Meddelande på Friendica</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
</head>
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendika-32.png'><span style="padding:7px;">Friendika</span></td></tr>
+ <tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$siteurl/images/friendica-32.png'><span style="padding:7px;">Friendica</span></td></tr>
<tr><td style="padding-top:22px;" colspan="2">$from har skickat ett personligt meddelande till dig på $siteName.</td></tr>
diff --git a/view/sv/strings.php b/view/sv/strings.php
index eb434df66..55df46281 100644
--- a/view/sv/strings.php
+++ b/view/sv/strings.php
@@ -204,14 +204,14 @@ $a->strings['Confirm'] = 'Bekräfta';
$a->strings['[Name Withheld]'] = '[Namnet visas inte]';
$a->strings["Introduction received at "] = "Inkommen kontaktförfrågan/presentation - ";
$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan';
-$a->strings['Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca';
+$a->strings['Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca';
$a->strings['Please answer the following:'] = 'Var vänlig besvara följande:';
$a->strings['Does $name know you?'] = 'Känner $name dig?';
$a->strings['Yes'] = 'Ja';
$a->strings['No'] = 'Nej';
$a->strings['Add a personal note:'] = 'Lägg till ett personligt meddelande:';
$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Ange din adress, ditt ID, på ett av följande sociala nätverk:";
-$a->strings['Friendika'] = 'Friendika';
+$a->strings['Friendica'] = 'Friendica';
$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
$a->strings["Private \x28secure\x29 network"] = "Privat (säkert) nätverk";
$a->strings["Public \x28insecure\x29 network"] = "Offentligt (osäkert) nätverk";
@@ -236,12 +236,12 @@ $a->strings['The profile address specified does not provide adequate information
$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Begränsad profil. Den här personen kommer inte att kunna ta emot personliga meddelanden från dig.';
$a->strings['Unable to retrieve contact information.'] = 'Det gick inte att komma åt kontaktinformationen.';
$a->strings['following'] = 'följer';
-$a->strings['This is Friendika version'] = 'Det här är Friendika version';
+$a->strings['This is Friendica version'] = 'Det här är Friendica version';
$a->strings['running at web location'] = 'som körs på';
-$a->strings['Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Innehåll som publiceras inom Friendikanätverket omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
-$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'Gå till <a href="http://project.friendika.com">Project.Friendika.com</a> om du vill läsa mer om friendikaprojektet.';
+$a->strings['Shared content within the Friendica network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Innehåll som publiceras inom Friendicanätverket omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
+$a->strings['Please visit <a href="http://project.friendica.com">Project.Friendica.com</a> to learn more about the Friendica project.'] = 'Gå till <a href="http://project.friendica.com">Project.Friendica.com</a> om du vill läsa mer om friendicaprojektet.';
$a->strings['Bug reports and issues: please visit'] = 'Anmäl buggar eller andra problem, gå till';
-$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Förslag, beröm, donationer, etc. - skicka e-post till "info at friendika punkt com" ';
+$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com'] = 'Förslag, beröm, donationer, etc. - skicka e-post till "info at friendica punkt com" ';
$a->strings['Installed plugins/addons/apps'] = 'Installerade insticksprogram/applikationer';
$a->strings['No installed plugins/addons/apps'] = 'Inga installerade insticksprogram/applikationer';
$a->strings['Group created.'] = 'Gruppen har skapats.';
@@ -263,16 +263,16 @@ $a->strings["Welcome to %s"] = "Välkommen till %s";
$a->strings['Could not create/connect to database.'] = 'Det gick inte att skapa eller ansluta till databasen.';
$a->strings['Connected to database.'] = 'Ansluten till databasen.';
$a->strings['Proceed with Installation'] = 'Fortsätt med installationen';
-$a->strings['Your Friendika site database has been installed.'] = 'Databasen för din friendikasajt har installerats.';
+$a->strings['Your Friendica site database has been installed.'] = 'Databasen för din friendicasajt har installerats.';
$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
$a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".';
$a->strings['Proceed to registration'] = 'Gå vidare till registreringen';
$a->strings['Database import failed.'] = 'Det gick inte att importera databasen.';
$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Du kanske måste importera filen "database.sql" manuellt med phpmyadmin eller mysql.';
-$a->strings['Welcome to Friendika.'] = 'Välkommen till Friendika.';
-$a->strings['Friendika Social Network'] = 'Det sociala nätverket Friendika';
+$a->strings['Welcome to Friendica.'] = 'Välkommen till Friendica.';
+$a->strings['Friendica Social Network'] = 'Det sociala nätverket Friendica';
$a->strings['Installation'] = 'Installation';
-$a->strings['In order to install Friendika we need to know how to contact your database.'] = 'In order to install Friendika we need to know how to contact your database.';
+$a->strings['In order to install Friendica we need to know how to contact your database.'] = 'In order to install Friendica we need to know how to contact your database.';
$a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Please contact your hosting provider or site administrator if you have questions about these settings.';
$a->strings['The database you specify below must already exist. If it does not, please create it before continuing.'] = 'The database you specify below must already exist. If it does not, please create it before continuing.';
$a->strings['Database Server Name'] = 'Database Server Name';
@@ -732,7 +732,7 @@ $a->strings['Randplace Settings'] = 'Randplace Settings';
$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet';
$a->strings['StatusNet Posting Settings'] = 'Inställningar för inlägg på StatusNet';
-$a->strings['No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika 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 Friendika installation at your favorited StatusNet installation.';
+$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.'] = '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.';
$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
$a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29";
@@ -758,7 +758,7 @@ $a->strings['I won!'] = 'Jag vann!';
$a->strings['Post to Twitter'] = 'Lägg in på Twitter';
$a->strings['Twitter Posting Settings'] = 'Inställningar för inlägg på Twitter';
$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$a->strings['At this Friendika 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.'] = 'At this Friendika 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.';
+$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.'] = '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.';
$a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden från Twitter här';
$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
index 65f018591..981f975c9 100644
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@@ -43,7 +43,7 @@
<span id="nav-link-wrapper">
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 1424c0e39..92ce03cb4 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -68,7 +68,7 @@
<ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
- {{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
+ {{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
@@ -158,7 +158,7 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
diff --git a/view/theme/diabook/right_aside.tpl b/view/theme/diabook/right_aside.tpl
index a65677696..18d5f6fd5 100644
--- a/view/theme/diabook/right_aside.tpl
+++ b/view/theme/diabook/right_aside.tpl
@@ -11,7 +11,7 @@
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
- <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index c993751b1..cf4544175 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -520,7 +520,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
$nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", "");
$nv['invite'] = Array('invite', t('Invite Friends'), "", "");
- $nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendika.com/directory">
+ $nv['search'] = '<form name="simple_bar" method="get" action="http://dir.friendica.com/directory">
<span class="sbox_l"></span>
<span class="sbox">
<input type="text" name="search" size="13" maxlength="50">
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index 257822df4..373fb2d36 100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -10,7 +10,7 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index ba5afea94..994725a38 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -194,7 +194,7 @@ aside {
border-radius: 5px;
padding: 5px;
font-weight: bold;
- background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+ background: #3465a4 url('friendica-16.png') no-repeat 95% center;
}
#wallmessage-link {
display: block;
@@ -438,7 +438,7 @@ div.wall-item-content-wrapper.shiny {
input#dfrn-url {
float: left;
- background: url(friendika-16.png) no-repeat;
+ background: url(friendica-16.png) no-repeat;
background-position: 2px center;
font-size: 17px;
padding-left: 21px;
diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl
index 4675c3e5c..8969accb7 100644
--- a/view/theme/facepark/nav.tpl
+++ b/view/theme/facepark/nav.tpl
@@ -10,7 +10,7 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
- {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+ {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
diff --git a/view/theme/facepark/style.css b/view/theme/facepark/style.css
index 6680a6434..9d87a3a10 100644
--- a/view/theme/facepark/style.css
+++ b/view/theme/facepark/style.css
@@ -202,7 +202,7 @@ aside {
border-radius: 5px;
padding: 5px;
font-weight: bold;
- background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+ background: #3465a4 url('friendica-16.png') no-repeat 95% center;
}
/* section */
@@ -434,7 +434,7 @@ div.wall-item-content-wrapper.shiny {
input#dfrn-url {
float: left;
- background: url(friendika-16.png) no-repeat;
+ background: url(friendica-16.png) no-repeat;
background-position: 2px center;
font-size: 17px;
padding-left: 21px;
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index 03c8176c3..be48165c1 100644
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -11,7 +11,7 @@
<?php if( $a->module === 'home' ) { ?>
<center>
<div class="login-button">
- <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+ <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
</div>
</center>
diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl
index 941ba9625..38f78c5c7 100644
--- a/view/theme/frost-mobile/nav.tpl
+++ b/view/theme/frost-mobile/nav.tpl
@@ -44,7 +44,7 @@
{{ endif }}
{{ if $nav.help }}
- <li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+ <li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
{{ endif }}
{{ if $nav.logout }}
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index 15b9fa8d6..0fe0efd73 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -308,7 +308,7 @@ div.main-container {
border-radius: 5px;
padding: 5px;
font-weight: bold;
- background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+ background: #3465a4 url('friendica-16.png') no-repeat 95% center;
}
#wallmessage-link {
display: block;
@@ -589,7 +589,7 @@ footer {
input#dfrn-url {
float: left;
- background: url(friendika-16.png) no-repeat;
+ background: url(friendica-16.png) no-repeat;
background-position: 2px center;
font-size: 17px;
padding-left: 21px;
diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php
index 06ca40c17..7ca960307 100644
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/default.php
@@ -11,7 +11,7 @@
<?php if( $a->module === 'home' ) { ?>
<center>
<div class="login-button">
- <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
+ <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>
</div>
</center>
diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index 755f8a628..1e14b1e72 100644
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -44,7 +44,7 @@
{{ endif }}
{{ if $nav.help }}
- <li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
+ <li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
{{ endif }}
{{ if $nav.logout }}
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index c12e14de7..ede5d7cc7 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -284,7 +284,7 @@ aside {
border-radius: 5px;
padding: 5px;
font-weight: bold;
- background: #3465a4 url('friendika-16.png') no-repeat 95% center;
+ background: #3465a4 url('friendica-16.png') no-repeat 95% center;
}
#wallmessage-link {
display: block;
@@ -551,7 +551,7 @@ div.wall-item-content-wrapper.shiny {
input#dfrn-url {
float: left;
- background: url(friendika-16.png) no-repeat;
+ background: url(friendica-16.png) no-repeat;
background-position: 2px center;
font-size: 17px;
padding-left: 21px;
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
index af1fc9414..bde9847fc 100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@@ -64,7 +64,7 @@
{{ if $nav.help }}
<li id="nav-help-link" class="nav-menu $sel.help">
- <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+ <a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
</li>
{{ endif }}
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 1c986e4c8..62f67e42e 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -4,7 +4,7 @@
* Version: 0.5
* Author: Fabio <http://kirgroup.com/profile/fabrixxm>
* Maintainer: Fabio <http://kirgroup.com/profile/fabrixxm>
- * Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
*/
$a->theme_info = array();
diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl
index 8c872864c..bb3ce2016 100644
--- a/view/theme/vier/nav.tpl
+++ b/view/theme/vier/nav.tpl
@@ -64,7 +64,7 @@
{{ if $nav.help }}
<li id="nav-help-link" class="nav-menu $sel.help">
- <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+ <a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
</li>
{{ endif }}
@@ -101,7 +101,7 @@
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}