diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-25 12:47:36 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-25 12:47:36 +0100 |
| commit | af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd (patch) | |
| tree | c11a37fd0e816705f27d2ac97d9703e65a50a65e | |
| parent | bd60e2ec3f316f58b4fd644e01a5ced13f73865e (diff) | |
| parent | ca113bfaa05fdf90a904c3a286a4e69b3a2d2082 (diff) | |
| download | volse-hubzilla-af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd.tar.gz volse-hubzilla-af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd.tar.bz2 volse-hubzilla-af0f3a7e05a76f50b0f6a8c9091e46faf5d37fcd.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
61 files changed, 1070 insertions, 806 deletions
@@ -1,7 +1,7 @@ - ********* - Friendika - ********* + ************* + * Friendika * + ************* Distributed Social Network @@ -79,11 +79,6 @@ only able to see the side of you that you wish to present. If you send a private message to your aunt Mary, we will encrypt it with military grade encryption. - Other distributed social network projects talk about privacy and offering -a feature-rich social networking alternative, but all they can deliver is -vapour and vague promises. Things like "Private mail will be in the next -release". - Friendika delivers. We've got an incredibly rich social communications interface you can make use of *right now*. @@ -94,6 +89,13 @@ But we're creating something completely different. Something better. + Start with richer communications. Adorn your text, colour it. We've got a +text counter in case you're sending across to one of the primitive social +networks, but we don't think you should have to squeeze your communications +into some arbitrary limit. Free yourself from thinking how to squeeze your +message into 140 or 420 characters, or sending messages in some strange +short-hand code. Even edit your text after you send it. It's OK. + A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. You could even run Friendika on an old PC in your closet or garage. Each of these people are able @@ -2,9 +2,9 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.925' ); +define ( 'FRIENDIKA_VERSION', '2.1.928' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -2019,7 +2019,7 @@ function contact_block() { intval($shown) ); if(count($r)) { - $o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">'; + $o .= '<h4 class="contact-h4">' . sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">'; foreach($r as $rr) { $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id']; if(local_user() && ($rr['uid'] == local_user()) @@ -2665,4 +2665,4 @@ function extract_item_authors($arr,$uid) { } } return array(); -}}
\ No newline at end of file +}} diff --git a/database.sql b/database.sql index 0a718c8c2..114f0d3d9 100644 --- a/database.sql +++ b/database.sql @@ -315,7 +315,9 @@ CREATE TABLE IF NOT EXISTS `profile` ( `thumb` char(255) NOT NULL, `publish` tinyint(1) NOT NULL DEFAULT '0', `net-publish` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + FULLTEXT KEY `pub_keywords` (`pub_keywords`), + FULLTEXT KEY `prv_keywords` (`prv_keywords`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/include/nav.php b/include/nav.php index 4104cf3cf..db3b909af 100644 --- a/include/nav.php +++ b/include/nav.php @@ -124,7 +124,7 @@ function nav(&$a) { $banner = get_config('system','banner'); if($banner === false) - $banner .= '<a href="http://friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendika.com">Friendika</a></span>'; + $banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>'; $a->page['nav'] .= '<span id="banner">' . $banner . '</span>'; diff --git a/mod/directory.php b/mod/directory.php index 825e2a375..72c30fb31 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -86,10 +86,10 @@ function directory_content(&$a) { } if(strlen($rr['dob'])) { if(($years = age($rr['dob'],$rr['timezone'],'')) != 0) - $details .= "<br />Age: $years" ; + $details .= '<br />' . t('Age: ') . $years ; } if(strlen($rr['gender'])) - $details .= '<br />Gender: ' . $rr['gender']; + $details .= '<br />' . t('Gender: ') . $rr['gender']; $entry = replace_macros($tpl,array( '$id' => $rr['id'], @@ -115,7 +115,7 @@ function directory_content(&$a) { } else - notice("No entries (some entries may be hidden)."); + notice( t("No entries \x28some entries may be hidden\x29.") . EOL); return $o; }
\ No newline at end of file diff --git a/mod/match.php b/mod/match.php index 7228529d7..092595a09 100644 --- a/mod/match.php +++ b/mod/match.php @@ -39,11 +39,12 @@ function match_content(&$a) { if(count($j->results)) { foreach($j->results as $jj) { $o .= '<div class="profile-match-wrapper"><div class="profile-match-photo">'; - $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" /></a></div>'; + $o .= '<a href="' . $jj->url . '">' . '<img src="' . $jj->photo . '" alt="' . $jj->name . '" title="' . $jj->name . '[' . $jj->url . ']' . '" /></a></div>'; $o .= '<div class="profile-match-break"></div>'; - $o .= '<div class="profile-match-name"><a href="' . $jj->url . '">' . $jj->name . '</a></div>'; + $o .= '<div class="profile-match-name"><a href="' . $jj->url . '" title="' . $jj->name . '[' . $jj->url .']' . '">' . $jj->name . '</a></div>'; $o .= '<div class="profile-match-end"></div></div>'; } + $o .= '<div id="profile-match-wrapper-end"></div>'; } else { notice( t('No matches') . EOL); diff --git a/mod/profile.php b/mod/profile.php index 4b5f92a1f..d33c9aeb2 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -437,6 +437,5 @@ function profile_content(&$a, $update = 0) { $o .= paginate($a); $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>'; - return $o; } diff --git a/mod/register.php b/mod/register.php index 95e9d581f..06ed1e0f1 100644 --- a/mod/register.php +++ b/mod/register.php @@ -199,6 +199,24 @@ function register_post(&$a) { return; } + /** + * if somebody clicked submit twice very quickly, they could end up with two accounts + * due to race condition. Remove this one. + */ + + $r = q("SELECT `uid` FROM `user` + WHERE `nickname` = '%s' ", + dbesc($nickname) + ); + if((count($r) > 1) && $newuid) { + $err .= t('Nickname is already registered. Please choose another.') . EOL; + q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1", + intval($newuid) + ); + notice ($err); + return; + } + if(x($newuid) !== false) { $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` ) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ", diff --git a/mod/settings.php b/mod/settings.php index 6a2733d7c..b20f4d11b 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -5,6 +5,7 @@ function settings_init(&$a) { if(local_user()) { profile_load($a,$a->user['nickname']); } + } @@ -341,9 +342,13 @@ function settings_content(&$a) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $uexport = '<div id="uexport-link"><a href="uexport" >' . t('Export Personal Data') . '</a></div>'; + + $o .= replace_macros($stpl,array( '$baseurl' => $a->get_baseurl(), '$oidhtml' => $oidhtml, + '$uexport' => $uexport, '$uid' => local_user(), '$username' => $username, '$openid' => $openid, diff --git a/mod/uexport.php b/mod/uexport.php new file mode 100644 index 000000000..96f062c41 --- /dev/null +++ b/mod/uexport.php @@ -0,0 +1,72 @@ +<?php + +function uexport_init(&$a) { + + if(! local_user()) + killme(); + + $user = array(); + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", + local_user() + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $user[$k] = $v; + + } + $contact = array(); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d ", + intval(local_user()) + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $contact[][$k] = $v; + + } + + $profile = array(); + $r = q("SELECT * FROM `profile` WHERE `uid` = %d ", + intval(local_user()) + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $profile[][$k] = $v; + } + + $output = array('user' => $user, 'contact' => $contact, 'profile' => $profile ); + + header("Content-type: application/json"); + echo str_replace('\\/','/',json_encode($output)); + + $r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ", + intval(local_user()) + ); + if(count($r)) + $total = $r[0]['total']; + + // chunk the output to avoid exhausting memory + + for($x = 0; $x < $total; $x += 500) { + $item = array(); + $r = q("SELECT * FROM `item` WHERE `uid` = %d LIMIT %d, %d", + intval(local_user()), + intval($x), + intval(500) + ); + if(count($r)) { + foreach($r as $rr) + foreach($rr as $k => $v) + $item[][$k] = $v; + } + + $output = array('item' => $item); + echo str_replace('\\/','/',json_encode($output)); + } + + + killme(); + +}
\ No newline at end of file diff --git a/update.php b/update.php index 9f94cd511..3672b2bfe 100644 --- a/update.php +++ b/update.php @@ -410,3 +410,11 @@ function update_1042() { function update_1043() { q("ALTER TABLE `user` ADD `blockwall` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocked` "); } + +function update_1044() { + q("ALTER TABLE `profile` ADD FULLTEXT ( `pub_keywords` ) "); + q("ALTER TABLE `profile` ADD FULLTEXT ( `prv_keywords` ) "); +} + + +
\ No newline at end of file diff --git a/util/messages.po b/util/messages.po index 44638bd9c..beff3e4b6 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.913\n" +"Project-Id-Version: 2.1.925\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 11:02+0100\n" +"POT-Creation-Date: 2011-03-23 14:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,32 +18,32 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../index.php:187 +#: ../../index.php:194 msgid "Not Found" msgstr "" -#: ../../index.php:188 +#: ../../index.php:195 msgid "Page not found." msgstr "" -#: ../../index.php:243 ../../mod/group.php:88 +#: ../../index.php:250 ../../mod/group.php:88 msgid "Permission denied" msgstr "" -#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 +#: ../../index.php:251 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 #: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139 #: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:224 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:227 #: ../../mod/settings.php:14 ../../mod/settings.php:19 -#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772 -#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50 -#: ../../mod/contacts.php:101 ../../mod/register.php:25 -#: ../../mod/network.php:6 ../../mod/notifications.php:56 -#: ../../mod/item.php:57 ../../mod/item.php:616 ../../mod/message.php:8 -#: ../../mod/message.php:116 ../../mod/dfrn_confirm.php:53 -#: ../../mod/viewcontacts.php:13 ../../mod/group.php:19 -#: ../../addon/facebook/facebook.php:110 +#: ../../mod/settings.php:210 ../../mod/photos.php:85 ../../mod/photos.php:773 +#: ../../mod/display.php:308 ../../mod/editpost.php:10 ../../mod/invite.php:13 +#: ../../mod/invite.php:50 ../../mod/contacts.php:106 +#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6 +#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668 +#: ../../mod/message.php:8 ../../mod/message.php:116 +#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13 +#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110 msgid "Permission denied." msgstr "" @@ -51,7 +51,7 @@ msgstr "" msgid "Create a New Account" msgstr "" -#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61 +#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61 msgid "Register" msgstr "" @@ -103,180 +103,185 @@ msgstr "" msgid "next" msgstr "" -#: ../../boot.php:1831 +#: ../../boot.php:1837 #, php-format msgid "%s likes this." msgstr "" -#: ../../boot.php:1831 +#: ../../boot.php:1837 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../boot.php:1835 +#: ../../boot.php:1841 ../../test.php:8 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../boot.php:1837 +#: ../../boot.php:1843 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../boot.php:1843 +#: ../../boot.php:1849 msgid "and" msgstr "" -#: ../../boot.php:1846 +#: ../../boot.php:1852 #, php-format msgid ", and %d other people" msgstr "" -#: ../../boot.php:1847 +#: ../../boot.php:1853 #, php-format msgid "%s like this." msgstr "" -#: ../../boot.php:1847 +#: ../../boot.php:1853 #, php-format msgid "%s don't like this." msgstr "" -#: ../../boot.php:2008 +#: ../../boot.php:2014 msgid "No contacts" msgstr "" -#: ../../boot.php:2016 ../../mod/contacts.php:303 -#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155 -#: ../../include/nav.php:111 -msgid "Contacts" -msgstr "" +#: ../../boot.php:2022 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" -#: ../../boot.php:2032 ../../mod/viewcontacts.php:17 +#: ../../boot.php:2038 ../../mod/viewcontacts.php:17 msgid "View Contacts" msgstr "" -#: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67 +#: ../../boot.php:2055 ../../mod/search.php:17 ../../include/nav.php:67 msgid "Search" msgstr "" -#: ../../boot.php:2204 ../../mod/profile.php:8 +#: ../../boot.php:2210 ../../mod/profile.php:8 msgid "No profile" msgstr "" -#: ../../boot.php:2261 +#: ../../boot.php:2267 msgid "Connect" msgstr "" -#: ../../boot.php:2271 +#: ../../boot.php:2277 msgid "Location:" msgstr "" -#: ../../boot.php:2275 +#: ../../boot.php:2281 msgid ", " msgstr "" -#: ../../boot.php:2283 +#: ../../boot.php:2289 msgid "Gender:" msgstr "" -#: ../../boot.php:2287 +#: ../../boot.php:2293 msgid "Status:" msgstr "" -#: ../../boot.php:2289 +#: ../../boot.php:2295 msgid "Homepage:" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Monday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Tuesday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Wednesday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Thursday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Friday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Saturday" msgstr "" -#: ../../boot.php:2380 +#: ../../boot.php:2386 msgid "Sunday" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "January" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "February" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "March" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "April" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "May" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "June" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "July" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "August" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "September" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "October" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "November" msgstr "" -#: ../../boot.php:2384 +#: ../../boot.php:2390 msgid "December" msgstr "" -#: ../../boot.php:2413 +#: ../../boot.php:2424 +msgid "Birthday Reminders" +msgstr "" + +#: ../../boot.php:2425 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:2414 +#: ../../boot.php:2426 msgid "(Adjusted for local time)" msgstr "" -#: ../../boot.php:2423 +#: ../../boot.php:2437 msgid "[today]" msgstr "" -#: ../../boot.php:2620 +#: ../../boot.php:2634 msgid "link to source" msgstr "" @@ -299,8 +304,8 @@ msgstr "" msgid "Select an identity to manage: " msgstr "" -#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857 -#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109 +#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858 +#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:123 #: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175 #: ../../addon/statusnet/statusnet.php:163 #: ../../addon/statusnet/statusnet.php:189 @@ -316,18 +321,18 @@ msgid "Image exceeds size limit of %d" msgstr "" #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118 -#: ../../mod/photos.php:570 +#: ../../mod/photos.php:571 msgid "Unable to process image." msgstr "" #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88 -#: ../../mod/wall_upload.php:95 ../../mod/item.php:184 +#: ../../mod/wall_upload.php:95 ../../mod/item.php:212 #: ../../mod/message.php:93 msgid "Wall Photos" msgstr "" #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230 -#: ../../mod/photos.php:588 +#: ../../mod/photos.php:589 msgid "Image upload failed." msgstr "" @@ -335,8 +340,8 @@ msgstr "" #: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93 #: ../../mod/register.php:311 ../../mod/register.php:348 #: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39 -#: ../../mod/item.php:423 ../../mod/item.php:446 -#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350 +#: ../../mod/item.php:475 ../../mod/item.php:498 +#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373 msgid "Administrator" msgstr "" @@ -353,105 +358,164 @@ msgstr "" msgid "%s commented on an item at %s" msgstr "" -#: ../../mod/profile.php:151 ../../mod/network.php:91 +#: ../../mod/profile.php:102 +msgid "Status" +msgstr "" + +#: ../../mod/profile.php:103 +msgid "Profile" +msgstr "" + +#: ../../mod/profile.php:104 +msgid "Photos" +msgstr "" + +#: ../../mod/profile.php:137 ../../mod/network.php:69 +#: ../../mod/message.php:172 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../mod/profile.php:138 ../../mod/network.php:70 +msgid "Please enter a YouTube link:" +msgstr "" + +#: ../../mod/profile.php:139 ../../mod/network.php:71 +msgid "Please enter a video(.ogg) link/URL:" +msgstr "" + +#: ../../mod/profile.php:140 ../../mod/network.php:72 +msgid "Please enter an audio(.ogg) link/URL:" +msgstr "" + +#: ../../mod/profile.php:141 ../../mod/network.php:73 +msgid "Where are you right now?" +msgstr "" + +#: ../../mod/profile.php:164 ../../mod/profile.php:325 +#: ../../mod/photos.php:1086 ../../mod/display.php:158 +#: ../../mod/network.php:96 ../../mod/network.php:375 msgid "Share" msgstr "" -#: ../../mod/profile.php:152 ../../mod/network.php:92 -#: ../../mod/message.php:185 ../../mod/message.php:319 +#: ../../mod/profile.php:165 ../../mod/editpost.php:63 +#: ../../mod/network.php:97 ../../mod/message.php:186 +#: ../../mod/message.php:320 msgid "Upload photo" msgstr "" -#: ../../mod/profile.php:153 ../../mod/network.php:93 -#: ../../mod/message.php:186 ../../mod/message.php:320 +#: ../../mod/profile.php:166 ../../mod/editpost.php:64 +#: ../../mod/network.php:98 ../../mod/message.php:187 +#: ../../mod/message.php:321 msgid "Insert web link" msgstr "" -#: ../../mod/profile.php:154 ../../mod/network.php:94 +#: ../../mod/profile.php:167 ../../mod/editpost.php:65 +#: ../../mod/network.php:99 msgid "Insert YouTube video" msgstr "" -#: ../../mod/profile.php:155 ../../mod/network.php:95 +#: ../../mod/profile.php:168 ../../mod/editpost.php:66 +#: ../../mod/network.php:100 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../mod/profile.php:169 ../../mod/editpost.php:67 +#: ../../mod/network.php:101 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + +#: ../../mod/profile.php:170 ../../mod/editpost.php:68 +#: ../../mod/network.php:102 msgid "Set your location" msgstr "" -#: ../../mod/profile.php:156 ../../mod/network.php:96 +#: ../../mod/profile.php:171 ../../mod/editpost.php:69 +#: ../../mod/network.php:103 msgid "Clear browser location" msgstr "" -#: ../../mod/profile.php:157 ../../mod/profile.php:309 -#: ../../mod/photos.php:1052 ../../mod/display.php:158 -#: ../../mod/network.php:97 ../../mod/network.php:367 -#: ../../mod/message.php:187 ../../mod/message.php:321 +#: ../../mod/profile.php:172 ../../mod/profile.php:326 +#: ../../mod/photos.php:1087 ../../mod/display.php:159 +#: ../../mod/editpost.php:70 ../../mod/network.php:104 +#: ../../mod/network.php:376 ../../mod/message.php:188 +#: ../../mod/message.php:322 msgid "Please wait" msgstr "" -#: ../../mod/profile.php:158 ../../mod/network.php:98 +#: ../../mod/profile.php:173 ../../mod/editpost.php:71 +#: ../../mod/network.php:105 msgid "Permission settings" msgstr "" -#: ../../mod/profile.php:165 ../../mod/network.php:104 +#: ../../mod/profile.php:180 ../../mod/editpost.php:77 +#: ../../mod/network.php:111 msgid "CC: email addresses" msgstr "" -#: ../../mod/profile.php:167 ../../mod/network.php:106 +#: ../../mod/profile.php:182 ../../mod/editpost.php:79 +#: ../../mod/network.php:113 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/profile.php:300 ../../mod/photos.php:935 -#: ../../mod/display.php:149 ../../mod/network.php:321 +#: ../../mod/profile.php:316 ../../mod/photos.php:962 +#: ../../mod/display.php:149 ../../mod/network.php:329 msgid "Private Message" msgstr "" -#: ../../mod/profile.php:307 ../../mod/photos.php:1050 -#: ../../mod/display.php:156 ../../mod/network.php:365 +#: ../../mod/profile.php:323 ../../mod/photos.php:1084 +#: ../../mod/display.php:156 ../../mod/network.php:373 msgid "I like this (toggle)" msgstr "" -#: ../../mod/profile.php:308 ../../mod/photos.php:1051 -#: ../../mod/display.php:157 ../../mod/network.php:366 +#: ../../mod/profile.php:324 ../../mod/photos.php:1085 +#: ../../mod/display.php:157 ../../mod/network.php:374 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/profile.php:321 ../../mod/photos.php:1071 -#: ../../mod/photos.php:1111 ../../mod/photos.php:1140 -#: ../../mod/display.php:170 ../../mod/network.php:380 +#: ../../mod/profile.php:338 ../../mod/photos.php:1106 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1175 +#: ../../mod/display.php:171 ../../mod/network.php:389 msgid "This is you" msgstr "" -#: ../../mod/profile.php:361 ../../mod/photos.php:1168 -#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137 +#: ../../mod/profile.php:362 ../../mod/display.php:222 +#: ../../mod/editpost.php:62 ../../mod/network.php:397 +msgid "Edit" +msgstr "" + +#: ../../mod/profile.php:384 ../../mod/photos.php:1203 +#: ../../mod/display.php:238 ../../mod/network.php:398 ../../mod/group.php:137 msgid "Delete" msgstr "" -#: ../../mod/profile.php:382 ../../mod/search.php:116 -#: ../../mod/display.php:258 ../../mod/network.php:272 -#: ../../mod/network.php:434 +#: ../../mod/profile.php:405 ../../mod/search.php:116 +#: ../../mod/display.php:262 ../../mod/network.php:280 +#: ../../mod/network.php:446 msgid "View $name's profile" msgstr "" -#: ../../mod/profile.php:414 ../../mod/display.php:312 -#: ../../mod/register.php:422 ../../mod/network.php:471 +#: ../../mod/profile.php:438 ../../mod/display.php:317 +#: ../../mod/register.php:424 ../../mod/network.php:484 msgid "" "Shared content is covered by the <a href=\"http://creativecommons.org/" "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." msgstr "" -#: ../../mod/follow.php:167 +#: ../../mod/follow.php:173 msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/follow.php:173 +#: ../../mod/follow.php:179 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: ../../mod/follow.php:224 +#: ../../mod/follow.php:230 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:270 +#: ../../mod/follow.php:276 msgid "following" msgstr "" @@ -462,8 +526,8 @@ msgstr "" #: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 #: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155 #: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234 -#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849 -#: ../../mod/photos.php:864 ../../mod/register.php:267 +#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850 +#: ../../mod/photos.php:865 ../../mod/register.php:267 #: ../../mod/register.php:274 ../../mod/register.php:281 msgid "Profile Photos" msgstr "" @@ -505,8 +569,8 @@ msgstr "" msgid "Account approved." msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:234 -#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:237 +#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -514,37 +578,37 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:196 +#: ../../mod/profiles.php:199 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:251 +#: ../../mod/profiles.php:254 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:267 ../../mod/profiles.php:298 +#: ../../mod/profiles.php:270 ../../mod/profiles.php:301 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:286 ../../mod/profiles.php:325 +#: ../../mod/profiles.php:289 ../../mod/profiles.php:328 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:304 +#: ../../mod/profiles.php:307 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:367 +#: ../../mod/profiles.php:370 msgid "" "This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:377 +#: ../../mod/profiles.php:380 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:418 +#: ../../mod/profiles.php:422 msgid "Profile Image" msgstr "" @@ -564,55 +628,59 @@ msgstr "" msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:95 +#: ../../mod/settings.php:97 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:99 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:103 +#: ../../mod/settings.php:105 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:105 +#: ../../mod/settings.php:107 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:161 +#: ../../mod/settings.php:165 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:211 +#: ../../mod/settings.php:215 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:212 +#: ../../mod/settings.php:216 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:218 +#: ../../mod/settings.php:222 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:269 msgid "OpenID: " msgstr "" -#: ../../mod/settings.php:263 +#: ../../mod/settings.php:269 msgid " (Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:295 +#: ../../mod/settings.php:301 msgid "Profile is <strong>not published</strong>." msgstr "" -#: ../../mod/settings.php:352 +#: ../../mod/settings.php:358 msgid "Default Post Permissions" msgstr "" -#: ../../mod/search.php:131 ../../mod/network.php:287 +#: ../../mod/search.php:54 +msgid "No results." +msgstr "" + +#: ../../mod/search.php:131 ../../mod/network.php:295 msgid "View in context" msgstr "" @@ -620,12 +688,12 @@ msgstr "" msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780 -#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198 -#: ../../mod/photos.php:1209 ../../include/Photo.php:225 +#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781 +#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233 +#: ../../mod/photos.php:1244 ../../include/Photo.php:225 #: ../../include/Photo.php:232 ../../include/Photo.php:239 -#: ../../include/items.php:959 ../../include/items.php:962 -#: ../../include/items.php:965 +#: ../../include/items.php:982 ../../include/items.php:985 +#: ../../include/items.php:988 msgid "Contact Photos" msgstr "" @@ -637,134 +705,150 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:134 ../../mod/photos.php:858 +#: ../../mod/photos.php:134 ../../mod/photos.php:859 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:197 ../../mod/photos.php:1033 +#: ../../mod/photos.php:197 ../../mod/photos.php:1067 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:468 +#: ../../mod/photos.php:469 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:468 ../../mod/like.php:110 +#: ../../mod/photos.php:469 ../../mod/like.php:110 msgid "photo" msgstr "" -#: ../../mod/photos.php:468 +#: ../../mod/photos.php:469 msgid "by" msgstr "" -#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306 +#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:660 +#: ../../mod/photos.php:661 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:807 +#: ../../mod/photos.php:808 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:810 ../../mod/photos.php:853 +#: ../../mod/photos.php:811 ../../mod/photos.php:854 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:811 +#: ../../mod/photos.php:812 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:813 ../../mod/photos.php:1028 +#: ../../mod/photos.php:814 ../../mod/photos.php:1062 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:868 +#: ../../mod/photos.php:869 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:878 ../../mod/photos.php:1228 +#: ../../mod/photos.php:879 ../../mod/photos.php:1263 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:908 +#: ../../mod/photos.php:909 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:929 +#: ../../mod/photos.php:956 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:931 +#: ../../mod/photos.php:958 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:944 +#: ../../mod/photos.php:969 +msgid "<< Prev" +msgstr "" + +#: ../../mod/photos.php:973 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1002 +#: ../../mod/photos.php:977 +msgid "Next >>" +msgstr "" + +#: ../../mod/photos.php:1036 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1012 +#: ../../mod/photos.php:1046 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1055 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1058 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1026 +#: ../../mod/photos.php:1060 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1030 +#: ../../mod/photos.php:1064 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1214 +#: ../../mod/photos.php:1249 msgid "Recent Photos" msgstr "" -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:1253 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:1269 msgid "View Album" msgstr "" -#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546 +#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598 msgid "Item not found." msgstr "" -#: ../../mod/display.php:259 ../../mod/network.php:435 +#: ../../mod/display.php:263 ../../mod/network.php:447 msgid "View $owner_name's profile" msgstr "" -#: ../../mod/display.php:260 ../../mod/network.php:436 +#: ../../mod/display.php:264 ../../mod/network.php:448 msgid "to" msgstr "" -#: ../../mod/display.php:261 ../../mod/network.php:437 +#: ../../mod/display.php:265 ../../mod/network.php:449 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/display.php:262 ../../mod/network.php:438 +#: ../../mod/display.php:266 ../../mod/network.php:450 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/display.php:300 +#: ../../mod/display.php:305 msgid "Item has been removed." msgstr "" +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" +msgstr "" + +#: ../../mod/editpost.php:32 +msgid "Edit post" +msgstr "" + #: ../../mod/invite.php:28 #, php-format msgid "%s : Not a valid email address." @@ -795,7 +879,7 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316 +#: ../../mod/invite.php:59 ../../mod/message.php:183 ../../mod/message.php:317 msgid "Your message:" msgstr "" @@ -817,163 +901,180 @@ msgstr "" msgid "Invite Friends" msgstr "" -#: ../../mod/contacts.php:16 +#: ../../mod/contacts.php:15 +msgid "Find People With Shared Interests" +msgstr "" + +#: ../../mod/contacts.php:19 msgid "Connect/Follow" msgstr "" -#: ../../mod/contacts.php:17 +#: ../../mod/contacts.php:20 msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../mod/contacts.php:18 +#: ../../mod/contacts.php:21 msgid "Follow" msgstr "" -#: ../../mod/contacts.php:38 ../../mod/contacts.php:119 +#: ../../mod/contacts.php:43 ../../mod/contacts.php:124 msgid "Could not access contact record." msgstr "" -#: ../../mod/contacts.php:52 +#: ../../mod/contacts.php:57 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:83 +#: ../../mod/contacts.php:88 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402 +#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402 msgid "Failed to update contact record." msgstr "" -#: ../../mod/contacts.php:141 +#: ../../mod/contacts.php:146 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:141 +#: ../../mod/contacts.php:146 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:155 +#: ../../mod/contacts.php:160 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:155 +#: ../../mod/contacts.php:160 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:176 +#: ../../mod/contacts.php:181 msgid "stopped following" msgstr "" -#: ../../mod/contacts.php:195 +#: ../../mod/contacts.php:200 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114 +#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114 msgid "Contact not found." msgstr "" -#: ../../mod/contacts.php:223 ../../mod/contacts.php:344 +#: ../../mod/contacts.php:228 ../../mod/contacts.php:352 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:227 ../../mod/contacts.php:348 +#: ../../mod/contacts.php:232 ../../mod/contacts.php:356 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:232 ../../mod/contacts.php:352 +#: ../../mod/contacts.php:237 ../../mod/contacts.php:360 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:248 +#: ../../mod/contacts.php:252 +msgid "Privacy Unavailable" +msgstr "" + +#: ../../mod/contacts.php:253 +msgid "Private communications are not available for this contact." +msgstr "" + +#: ../../mod/contacts.php:256 msgid "Never" msgstr "" -#: ../../mod/contacts.php:252 +#: ../../mod/contacts.php:260 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:252 +#: ../../mod/contacts.php:260 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:255 +#: ../../mod/contacts.php:263 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:256 +#: ../../mod/contacts.php:264 msgid "Visit $name's profile" msgstr "" -#: ../../mod/contacts.php:257 +#: ../../mod/contacts.php:265 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:258 +#: ../../mod/contacts.php:266 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:259 +#: ../../mod/contacts.php:267 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:261 +#: ../../mod/contacts.php:269 msgid "Last updated: " msgstr "" -#: ../../mod/contacts.php:262 +#: ../../mod/contacts.php:270 msgid "Update public posts: " msgstr "" -#: ../../mod/contacts.php:264 +#: ../../mod/contacts.php:272 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:275 msgid "Unblock this contact" msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:275 msgid "Block this contact" msgstr "" -#: ../../mod/contacts.php:268 +#: ../../mod/contacts.php:276 msgid "Unignore this contact" msgstr "" -#: ../../mod/contacts.php:268 +#: ../../mod/contacts.php:276 msgid "Ignore this contact" msgstr "" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:279 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:272 +#: ../../mod/contacts.php:280 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140 +#: ../../include/acl_selectors.php:155 ../../include/nav.php:111 +msgid "Contacts" +msgstr "" + +#: ../../mod/contacts.php:313 msgid "Show Blocked Connections" msgstr "" -#: ../../mod/contacts.php:305 +#: ../../mod/contacts.php:313 msgid "Hide Blocked Connections" msgstr "" -#: ../../mod/contacts.php:307 ../../mod/directory.php:38 +#: ../../mod/contacts.php:315 ../../mod/directory.php:38 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:308 +#: ../../mod/contacts.php:316 msgid "Find" msgstr "" -#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44 +#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44 msgid "Visit $username's profile" msgstr "" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:377 msgid "Edit contact" msgstr "" @@ -1077,168 +1178,170 @@ msgstr "" msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:404 -msgid "" -"Members of this network prefer to communicate with real people who use their " -"real names." -msgstr "" - -#: ../../mod/register.php:413 +#: ../../mod/register.php:415 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618 +#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618 msgid "Yes" msgstr "" -#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619 +#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619 msgid "No" msgstr "" -#: ../../mod/register.php:429 +#: ../../mod/register.php:431 msgid "Registration" msgstr "" -#: ../../mod/register.php:437 +#: ../../mod/register.php:439 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:438 +#: ../../mod/register.php:440 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:439 +#: ../../mod/register.php:441 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be '<strong>nickname@$sitename</" "strong>'." msgstr "" -#: ../../mod/register.php:440 +#: ../../mod/register.php:442 msgid "Choose a nickname: " msgstr "" -#: ../../mod/install.php:30 +#: ../../mod/install.php:33 msgid "Could not create/connect to database." msgstr "" -#: ../../mod/install.php:35 +#: ../../mod/install.php:38 msgid "Connected to database." msgstr "" -#: ../../mod/install.php:66 -msgid "Database import succeeded." +#: ../../mod/install.php:72 +msgid "Proceed with Installation" msgstr "" -#: ../../mod/install.php:67 +#: ../../mod/install.php:74 +msgid "Your Friendika site database has been installed." +msgstr "" + +#: ../../mod/install.php:75 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175 +#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189 msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: ../../mod/install.php:73 +#: ../../mod/install.php:78 +msgid "Proceed to registration" +msgstr "" + +#: ../../mod/install.php:84 msgid "Database import failed." msgstr "" -#: ../../mod/install.php:74 +#: ../../mod/install.php:85 msgid "" "You may need to import the file \"database.sql\" manually using phpmyadmin " "or mysql." msgstr "" -#: ../../mod/install.php:84 +#: ../../mod/install.php:98 msgid "Welcome to Friendika." msgstr "" -#: ../../mod/install.php:124 +#: ../../mod/install.php:138 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/install.php:125 +#: ../../mod/install.php:139 msgid "" "This is required. Please adjust the configuration file .htconfig.php " "accordingly." msgstr "" -#: ../../mod/install.php:132 +#: ../../mod/install.php:146 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/install.php:133 +#: ../../mod/install.php:147 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/install.php:155 +#: ../../mod/install.php:169 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/install.php:156 +#: ../../mod/install.php:170 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/install.php:165 +#: ../../mod/install.php:179 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/install.php:167 +#: ../../mod/install.php:181 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/install.php:169 +#: ../../mod/install.php:183 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/install.php:171 +#: ../../mod/install.php:185 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/install.php:173 +#: ../../mod/install.php:187 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/install.php:184 +#: ../../mod/install.php:198 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/install.php:185 +#: ../../mod/install.php:199 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../mod/install.php:186 +#: ../../mod/install.php:200 msgid "" "Please check with your site documentation or support people to see if this " "situation can be corrected." msgstr "" -#: ../../mod/install.php:187 +#: ../../mod/install.php:201 msgid "" "If not, you may be required to perform a manual installation. Please see the " "file \"INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/install.php:196 +#: ../../mod/install.php:210 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 "" -#: ../../mod/install.php:211 +#: ../../mod/install.php:225 msgid "Errors encountered creating database tables." msgstr "" @@ -1250,15 +1353,15 @@ msgstr "" msgid "New Item View" msgstr "" -#: ../../mod/network.php:149 +#: ../../mod/network.php:156 msgid "No such group" msgstr "" -#: ../../mod/network.php:160 +#: ../../mod/network.php:167 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:164 +#: ../../mod/network.php:171 msgid "Group: " msgstr "" @@ -1417,7 +1520,7 @@ msgid "" "strong> profile." msgstr "" -#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341 +#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364 msgid "[Name Withheld]" msgstr "" @@ -1521,41 +1624,41 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:98 +#: ../../mod/item.php:126 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:422 +#: ../../mod/item.php:474 #, php-format msgid "%s commented on your item at %s" msgstr "" -#: ../../mod/item.php:445 +#: ../../mod/item.php:497 #, php-format msgid "%s posted on your profile wall at %s" msgstr "" -#: ../../mod/item.php:471 +#: ../../mod/item.php:523 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:489 +#: ../../mod/item.php:541 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendika social network." msgstr "" -#: ../../mod/item.php:491 +#: ../../mod/item.php:543 msgid "You may visit them online at" msgstr "" -#: ../../mod/item.php:493 +#: ../../mod/item.php:545 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:495 +#: ../../mod/item.php:547 #, php-format msgid "%s posted an update." msgstr "" @@ -1620,35 +1723,35 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:177 +#: ../../mod/message.php:178 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:178 ../../mod/message.php:312 +#: ../../mod/message.php:179 ../../mod/message.php:313 msgid "To:" msgstr "" -#: ../../mod/message.php:179 ../../mod/message.php:313 +#: ../../mod/message.php:180 ../../mod/message.php:314 msgid "Subject:" msgstr "" -#: ../../mod/message.php:221 +#: ../../mod/message.php:222 msgid "No messages." msgstr "" -#: ../../mod/message.php:234 +#: ../../mod/message.php:235 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:264 +#: ../../mod/message.php:265 msgid "Message not available." msgstr "" -#: ../../mod/message.php:301 +#: ../../mod/message.php:302 msgid "Delete message" msgstr "" -#: ../../mod/message.php:311 +#: ../../mod/message.php:312 msgid "Send Reply" msgstr "" @@ -1767,6 +1870,14 @@ msgstr "" msgid "Unable to remove group." msgstr "" +#: ../../mod/match.php:10 +msgid "Profile Match" +msgstr "" + +#: ../../mod/match.php:49 +msgid "No matches" +msgstr "" + #: ../../addon/twitter/twitter.php:64 msgid "Post to Twitter" msgstr "" @@ -2390,11 +2501,16 @@ msgstr "" msgid "Profiles" msgstr "" -#: ../../include/items.php:1004 +#: ../../include/dba.php:31 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: ../../include/items.php:1027 msgid "Birthday:" msgstr "" -#: ../../include/items.php:1348 +#: ../../include/items.php:1371 msgid "You have a new follower at " msgstr "" diff --git a/util/strings.php b/util/strings.php index 907bfb6df..a1f8f9a15 100644 --- a/util/strings.php +++ b/util/strings.php @@ -31,7 +31,6 @@ $a->strings[', and %d other people'] = ', and %d other people'; $a->strings['%s like this.'] = '%s like this.'; $a->strings['%s don\'t like this.'] = '%s don\'t like this.'; $a->strings['No contacts'] = 'No contacts'; -$a->strings['Contacts'] = 'Contacts'; $a->strings['View Contacts'] = 'View Contacts'; $a->strings['Search'] = 'Search'; $a->strings['No profile'] = 'No profile'; @@ -67,6 +66,7 @@ $a->strings['[today]'] = '[today]'; $a->strings['link to source'] = 'link to source'; $a->strings['Applications'] = 'Applications'; $a->strings["Invite Friends"] = "Invite Friends"; +$a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests'; $a->strings['Connect/Follow'] = 'Connect/Follow'; $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara'; $a->strings['Follow'] = 'Follow'; @@ -106,6 +106,7 @@ $a->strings['Unignore this contact'] = 'Unignore this contact'; $a->strings['Ignore this contact'] = 'Ignore this contact'; $a->strings['Currently blocked'] = 'Currently blocked'; $a->strings['Currently ignored'] = 'Currently ignored'; +$a->strings['Contacts'] = 'Contacts'; $a->strings['Show Blocked Connections'] = 'Show Blocked Connections'; $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections'; $a->strings['Finding: '] = 'Finding: '; @@ -213,9 +214,11 @@ $a->strings['Unable to remove group.'] = 'Unable to remove group.'; $a->strings["Welcome to %s"] = "Welcome to %s"; $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; $a->strings['Connected to database.'] = 'Connected to database.'; -$a->strings['Database import succeeded.'] = 'Database import succeeded.'; +$a->strings['Proceed with Installation'] = 'Proceed with Installation'; +$a->strings['Your Friendika site database has been installed.'] = 'Your Friendika site database has been installed.'; $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".'] = 'Please see the file "INSTALL.txt".'; +$a->strings['Proceed to registration'] = 'Proceed to registration'; $a->strings['Database import failed.'] = 'Database import failed.'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; @@ -268,6 +271,8 @@ $a->strings["Welcome back %s"] = "Welcome back %s"; $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages'; $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; $a->strings['Select an identity to manage: '] = 'Select an identity to manage: '; +$a->strings['Profile Match'] = 'Profile Match'; +$a->strings['No matches'] = 'No matches'; $a->strings['No recipient selected.'] = 'No recipient selected.'; $a->strings['[no subject]'] = '[no subject]'; $a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.'; @@ -720,7 +725,6 @@ $a->strings['America/Managua'] = 'America/Managua'; $a->strings['America/Manaus'] = 'America/Manaus'; $a->strings['America/Marigot'] = 'America/Marigot'; $a->strings['America/Martinique'] = 'America/Martinique'; -$a->strings['America/Matamoros'] = 'America/Matamoros'; $a->strings['America/Mazatlan'] = 'America/Mazatlan'; $a->strings['America/Mendoza'] = 'America/Mendoza'; $a->strings['America/Menominee'] = 'America/Menominee'; @@ -739,7 +743,6 @@ $a->strings['America/Nome'] = 'America/Nome'; $a->strings['America/Noronha'] = 'America/Noronha'; $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center'; $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem'; -$a->strings['America/Ojinaga'] = 'America/Ojinaga'; $a->strings['America/Panama'] = 'America/Panama'; $a->strings['America/Pangnirtung'] = 'America/Pangnirtung'; $a->strings['America/Paramaribo'] = 'America/Paramaribo'; @@ -756,7 +759,6 @@ $a->strings['America/Regina'] = 'America/Regina'; $a->strings['America/Resolute'] = 'America/Resolute'; $a->strings['America/Rio_Branco'] = 'America/Rio_Branco'; $a->strings['America/Rosario'] = 'America/Rosario'; -$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel'; $a->strings['America/Santarem'] = 'America/Santarem'; $a->strings['America/Santiago'] = 'America/Santiago'; $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo'; @@ -785,7 +787,6 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife'; $a->strings['Antarctica/Casey'] = 'Antarctica/Casey'; $a->strings['Antarctica/Davis'] = 'Antarctica/Davis'; $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville'; -$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie'; $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson'; $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo'; $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer'; @@ -848,7 +849,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar'; $a->strings['Asia/Manila'] = 'Asia/Manila'; $a->strings['Asia/Muscat'] = 'Asia/Muscat'; $a->strings['Asia/Nicosia'] = 'Asia/Nicosia'; -$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk'; $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk'; $a->strings['Asia/Omsk'] = 'Asia/Omsk'; $a->strings['Asia/Oral'] = 'Asia/Oral'; diff --git a/view/de/settings.tpl b/view/de/settings.tpl index 5f700ff8b..170939991 100644 --- a/view/de/settings.tpl +++ b/view/de/settings.tpl @@ -2,6 +2,8 @@ <div id="plugin-settings-link"><a href="settings/addon">Plugin Einstellungen</a></div> +$uexport + $nickname_block diff --git a/view/en/settings.tpl b/view/en/settings.tpl index 45060e1c4..134fffaf9 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -2,6 +2,8 @@ <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div> +$uexport + $nickname_block diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl index e0334842a..9846219ed 100644 --- a/view/fr/settings.tpl +++ b/view/fr/settings.tpl @@ -2,6 +2,8 @@ <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div> +$uexport + $nickname_block diff --git a/view/it/messages.po b/view/it/messages.po index 73ee9e3ad..11813a3d8 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -6,13 +6,13 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.913\n" +"Project-Id-Version: 2.1.921\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-18 10:32+0100\n" +"POT-Creation-Date: 2011-03-23 13:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n" "Language-Team: Italian <fabrix.xm@gmail.com>\n" -"Language: it-IT\n" +"Language: It\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -118,7 +118,7 @@ msgstr "Piace a %s." msgid "%s doesn't like this." msgstr "Non piace a %s." -#: ../../boot.php:1835 +#: ../../boot.php:1835 ../../test.php:8 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "Piace a <span %1$s>%2$d persone</span>." @@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio" #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Non trovo le informazioni DNS per il database server '%s'" + +#: ../../boot.php:2016 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d Contatto" +msgstr[1] "%d Contatti" diff --git a/view/it/settings.tpl b/view/it/settings.tpl index d1e25da81..6679e28fe 100644 --- a/view/it/settings.tpl +++ b/view/it/settings.tpl @@ -2,6 +2,7 @@ <div id="plugin-settings-link"><a href="settings/addon">Impostazioni Plugin</a></div> +$uexport $nickname_block diff --git a/view/it/strings.php b/view/it/strings.php index a771f933d..1e0840dd7 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -581,3 +581,7 @@ $a->strings["Next >>"] = "Succ >>"; $a->strings["Item not found"] = "Elemento non trovato"; $a->strings["Edit post"] = "Modifica messaggio"; $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'"; +$a->strings["%d Contact"] = array( + 0 => "%d Contatto", + 1 => "%d Contatti", +); diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index 60a5711ea..d87c7a1d1 100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl @@ -1,7 +1,7 @@ $username, - '$from' har kommenterat nÃ¥got som du följer. +'$from' har kommenterat nÃ¥got som du följer. ----- $body @@ -11,8 +11,7 @@ Logga in pÃ¥ $siteurl för att se hela konversationen: $display -Tack, - $sitename admin +Hälsningar, +$sitename admin - diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl index 40a751073..f7a0d9af1 100644 --- a/view/sv/contact_edit.tpl +++ b/view/sv/contact_edit.tpl @@ -1,4 +1,3 @@ - <h2>$header</h2> <div id="contact-edit-banner-name">$name</div> @@ -28,7 +27,7 @@ <div id="contact-edit-poll-wrapper"> - <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div> + <div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div> <div id="contact-edit-poll-text">$updpub</div> $poll_interval <div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div> @@ -46,7 +45,7 @@ $ignored </div> <div id="contact-edit-info-end"></div> -<input class="contact-edit-submit" type="submit" name="submit" value="Submit" /> +<input class="contact-edit-submit" type="submit" name="submit" value="Spara" /> <div id="contact-edit-profile-select-text"> <h4>Profilvisning</h4> @@ -56,7 +55,7 @@ $ignored $profile_select <div id="contact-edit-profile-select-end"></div> -<input class="contact-edit-submit" type="submit" name="submit" value="Submit" /> +<input class="contact-edit-submit" type="submit" name="submit" value="Spara" /> <div id="contact-edit-rating-wrapper"> @@ -69,13 +68,13 @@ $rating </div> <div id="contact-edit-rating-explain"> <p> -Var vänlig spendera tid på att fylla i något här om du känner att det kan vara till någon hjälp för andra. +Var vänlig ägna en liten stund åt att fylla i något som du känner kan vara till hjälp för andra. </p> <textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea> </div> </div> $groups -<input class="contact-edit-submit" type="submit" name="submit" value="Submit" /> +<input class="contact-edit-submit" type="submit" name="submit" value="Skicka" /> </form> -</div> +</div>
\ No newline at end of file diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl index 39395af8e..a91a7eafc 100644 --- a/view/sv/cropbody.tpl +++ b/view/sv/cropbody.tpl @@ -1,6 +1,6 @@ -<h1>Crop Image</h1> +<h1>Beskär bilden</h1> <p id="cropimage-desc"> -Please adjust the image cropping for optimum viewing. +Välj hur du vill att bilden ska beskäras. </p> <div id="cropimage-wrapper"> <img src="$image_url" id="croppa" class="imgCrop" alt="" /> @@ -51,7 +51,7 @@ Please adjust the image cropping for optimum viewing. <input type="hidden" name="width" id="width" /> <div id="crop-image-submit-wrapper" > -<input type="submit" name="submit" value="Done Editing" /> +<input type="submit" name="submit" value="Spara" /> </div> -</form> +</form>
\ No newline at end of file diff --git a/view/sv/dfrn_req_confirm.tpl b/view/sv/dfrn_req_confirm.tpl index f053f22af..7f8c977ce 100644 --- a/view/sv/dfrn_req_confirm.tpl +++ b/view/sv/dfrn_req_confirm.tpl @@ -1,8 +1,7 @@ - <p id="dfrn-request-homecoming" > -Welcome home $username. +Välkommen hem, $username. <br /> -Please confirm your introduction to $dfrn_url. +Här kan du bekräfta kontaktförfrågan till $dfrn_url. </p> <form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> @@ -12,6 +11,6 @@ Please confirm your introduction to $dfrn_url. $aes_allow <div id="dfrn-request-homecoming-submit-wrapper" > -<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" /> +<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Bekräfta" /> </div> </form>
\ No newline at end of file diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl index 03eed62b3..0623a21b0 100644 --- a/view/sv/directory_header.tpl +++ b/view/sv/directory_header.tpl @@ -1,4 +1,4 @@ -<h1>Site Directory</h1> +<h1>Medlemskatalog för denna webbplats (ej global)</h1> $globaldir @@ -7,8 +7,7 @@ $finding <div id="directory-search-wrapper"> <form id="directory-search-form" action="directory" method="get" > <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Find" /> +<input type="submit" name="submit" id="directory-search-submit" value="Sök" /> </form> </div> <div id="directory-search-end"></div> - diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index ae758c9a8..fee08bdca 100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl @@ -1,14 +1,12 @@ +$myname, -Dear $myname, +'$requestor' pÃ¥ $sitename vill följa dina uppdateringar här pÃ¥ Friendika. -You have a new follower at $sitename - '$requestor'. +Besök dennes profil pÃ¥ $url. -You may visit their profile at $url. - -Please login to your site to approve or ignore/cancel the request. +Logga in för att godkänna eller avslÃ¥ förfrÃ¥gan. $siteurl -Regards, - - $sitename administrator
\ No newline at end of file +Hälsningar, +$sitename admin diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index ab12fcb6b..2b8b0238e 100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl @@ -1,22 +1,17 @@ +$username, -Dear $username, +Goda nyheter... '$fn' pÃ¥ '$dfrn_url' har accepterat din kontaktförfrÃ¥gan pÃ¥ '$sitename'. - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. +Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden +utan begränsningar. -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at $sitename if you wish to make -any changes to this relationship. +GÃ¥ in pÃ¥ din sida 'Kontakter' pÃ¥ $sitename om du vill göra nÃ¥gra +ändringar när det gäller denna kontakt. $siteurl -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$fn']. - -Sincerely, - - $sitename Administrator +[Du kan exempelvis skapa en separat profil med information som inte +är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. - +Hälsningar, +$sitename admin diff --git a/view/sv/group_edit.tpl b/view/sv/group_edit.tpl index e6c7afb49..12e650597 100644 --- a/view/sv/group_edit.tpl +++ b/view/sv/group_edit.tpl @@ -1,22 +1,22 @@ -<h2>Group Editor</h2> +<h2>Gruppredigering</h2> <div id="group-edit-wrapper" > <form action="group/$gid" id="group-edit-form" method="post" > <div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label> +<label id="group-edit-name-label" for="group-edit-name" >Gruppnamn: </label> <input type="text" id="group-edit-name" name="groupname" value="$name" /> </div> <div id="group-edit-name-end"></div> <div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Members:</label> +<label id="group_members_select_label" for="group_members_select" >Medlemmar:</label> $selector </div> $drop <div id="group_members_select_end"></div> <div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Submit" > +<input type="submit" name="submit" value="Spara" > </div> <div id="group-edit-select-end" ></div> diff --git a/view/sv/group_new.tpl b/view/sv/group_new.tpl index a1efa7717..cda937ede 100644 --- a/view/sv/group_new.tpl +++ b/view/sv/group_new.tpl @@ -1,23 +1,20 @@ - <div id="group-new-wrapper" > <form action="group/new" method="post"> <div id="group-new-text"> <p> -Create a group of contacts/friends. +Skapa en grupp med kontakter/vänner. <div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Group Name: </label> +<label id="group-new-label" for="group-new-name" >Gruppnamn: </label> <input name="groupname" id="group-new-name" /> </div> <div id="group-new-input-end" ></div> <div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Submit" /> +<input type="submit" name="submit" value="Spara" /> </form> </div> <div id="group-new-end"></div> - -
\ No newline at end of file diff --git a/view/sv/head.tpl b/view/sv/head.tpl index 8f97a11e5..828fcb13d 100644 --- a/view/sv/head.tpl +++ b/view/sv/head.tpl @@ -11,7 +11,7 @@ <script type="text/javascript" src="$baseurl/include/main.js" ></script> <script> - function confirmDelete() { return confirm("Delete this item?"); } + function confirmDelete() { return confirm("Ta bort?"); } function commentOpen(obj,id) { if(obj.value == 'Comment') { obj.value = ''; @@ -28,5 +28,3 @@ } </script> - - diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl index c413689c2..fb66ef29b 100644 --- a/view/sv/install_db.tpl +++ b/view/sv/install_db.tpl @@ -1,33 +1,32 @@ - -<h3>Friendika Social Network</h3> +<h3>Det sociala nätverket Friendika</h3> <h3>Installation</h3> <p> -In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. +För att kunna installera Friendika måste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministratör om du har frågor om dessa inställningar. Databasen du specar nedan måste finnas. Skapa databasen innan du fortsätter, om det inte redan är gjort. </p> <form id="install-form" action="$baseurl/install" method="post"> <input type="hidden" name="phpath" value="$phpath" /> -<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label> +<label for="install-dbhost" id="install-dbhost-label">Servernamn där databasen finns</label> <input type="text" name="dbhost" id="install-dbhost" value="$dbhost" /> <div id="install-dbhost-end"></div> -<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label> +<label for="install-dbuser" id="install-dbuser-label">Inloggningsnamn för databasen</label> <input type="text" name="dbuser" id="install-dbuser" value="$dbuser" /> <div id="install-dbuser-end"></div> -<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label> +<label for="install-dbpass" id="install-dbpass-label">Lösenord för databasen</label> <input type="password" name="dbpass" id="install-dbpass" value="$dbpass" /> <div id="install-dbpass-end"></div> -<label for="install-dbdata" id="install-dbdata-label">Database Name</label> +<label for="install-dbdata" id="install-dbdata-label">Databasens namn</label> <input type="text" name="dbdata" id="install-dbdata" value="$dbdata" /> <div id="install-dbdata-end"></div> <div id="install-tz-desc"> -Please select a default timezone for your website +Ange vilken tidszon som ska vara förvald på din webbplats </div> $tzselect @@ -37,4 +36,3 @@ $tzselect </form> <div id="install-end" ></div> - diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index a60745ec5..1f24af25f 100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl @@ -1,22 +1,19 @@ +$username, -Dear $username, +'$fn' pÃ¥ '$dfrn_url' har accepterat din kontaktförfrÃ¥gan pÃ¥ '$sitename'. - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. +'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar +i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion +mellan profiler. Om detta är en kändis eller en gemenskap sÃ¥ har dessa inställningar gjorts +per automatik. - '$fn' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. +'$fn' kan välja att utöka detta till vanlig tvÃ¥vägskommunikation eller nÃ¥gon annan mer +tillÃ¥tande kommunikationsform i framtiden. - '$fn' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '$fn', -which will appear on your 'Network' page at +Du kommer hädanefter att fÃ¥ statusuppdateringar frÃ¥n '$fn', +vilka kommer att synas pÃ¥ din Nätverk-sida pÃ¥ $siteurl -Sincerely, - - $sitename Administrator +Hälsningar, +$sitename admin diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl index d8b7394a4..0aa01c5da 100644 --- a/view/sv/intros-top.tpl +++ b/view/sv/intros-top.tpl @@ -1,7 +1,6 @@ -<h1>Pending Friend/Connect Notifications</h1> +<h1>Väntande förfrågningar om vänskap/kontakt</h1> <div id="notification-show-hide-wrapper" > <a href="$hide_url" id="notification-show-hide-link">$hide_text</a> </div> - diff --git a/view/sv/lostpass.tpl b/view/sv/lostpass.tpl index a7040c149..9294fb261 100644 --- a/view/sv/lostpass.tpl +++ b/view/sv/lostpass.tpl @@ -1,18 +1,17 @@ -<h3>Forgot your Password?</h3> +<h3>Har du glömt lösenordet?</h3> <p id="lostpass-desc"> -Enter your email address and submit to have your password reset. Then check your email for further instructions. +Skriv in och skicka din e-postadress för att återställa lösenordet. Kolla sedan din e-post för vidare instruktioner. </p> <form action="lostpass" method="post" > <div id="login-name-wrapper"> - <label for="login-name" id="label-login-name">Nickname or Email: </label> + <label for="login-name" id="label-login-name">Användarnamn eller e-postadress: </label> <input type="text" maxlength="60" name="login-name" id="login-name" value="" /> </div> <div id="login-extra-end"></div> <div id="login-submit-wrapper" > - <input type="submit" name="submit" id="lostpass-submit-button" value="Reset" /> + <input type="submit" name="submit" id="lostpass-submit-button" value="Skicka" /> </div> <div id="login-submit-end"></div> </form> - diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index c350236a4..df338fa69 100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl @@ -1,32 +1,29 @@ +$username, -Dear $username, - A request was recently received at $sitename to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. +En begäran om Ã¥terställning av lösenord pÃ¥ $sitename har mottagits. +GÃ¥ till adressen nedan för att bekräfta denna begäran. Du kan ocksÃ¥ +klistra in länken i adressfältet i din webbläsare. -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. +GÃ¥ INTE till länken nedan om du INTE har begärt lösenordsÃ¥terställning. +DÃ¥ kan du ignorera det här meddelandet. -Your password will not be changed unless we can verify that you -issued this request. +Ditt lösenord kommer inte att Ã¥terställas om vi inte kan säkerställa att du +initierat detta. -Follow this link to verify your identity: +Med den här länken kan du bekräfta din identitet: $reset_link -You will then receive a follow-up message containing the new password. +Sedan kommer du att fÃ¥ ett meddelande med ett nytt lösenord. -You may change that password from your account settings page after logging in. +Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. -The login details are as follows: +Detaljerna ser ut sÃ¥ här: -Site Location: $siteurl -Login Name: $email +Webbplats: $siteurl +Inloggningsnamn: $email +Hälsningar, +$sitename admin - - -Sincerely, - $sitename Administrator - - +
\ No newline at end of file diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl index 6b7eb8873..a9a34c23a 100644 --- a/view/sv/mail_received_html_body_eml.tpl +++ b/view/sv/mail_received_html_body_eml.tpl @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> - <title>Friendika Message</title> + <title>Meddelande på Friendika</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> </head> <body> @@ -9,16 +9,16 @@ <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 style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr> + <tr><td style="padding-top:22px;" colspan="2">$from har skickat ett personligt meddelande till dig på $siteName.</td></tr> <tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td> <td style="padding-top:22px;"><a href="$url">$from</a></td></tr> <tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr> <tr><td style="padding-right:22px;">$htmlversion</td></tr> - <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> to read and reply to your private messages.</td></tr> - <tr><td></td><td>Thank You,</td></tr> - <tr><td></td><td>$siteName Administrator</td></tr> + <tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Logga in på <a href="$siteurl">$siteurl</a> för att läsa och svara på personliga meddelanden.</td></tr> + <tr><td></td><td>Hälsningar,</td></tr> + <tr><td></td><td>$siteName admin</td></tr> </tbody> </table> </body> diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl index 023867304..ac2857b58 100644 --- a/view/sv/mail_received_text_body_eml.tpl +++ b/view/sv/mail_received_text_body_eml.tpl @@ -1,10 +1,10 @@ -$from sent you a new private message at $siteName. +$from har skickat ett personligt meddelande till dig pÃ¥ $siteName. $title $textversion -Please login at $siteurl to read and reply to your private messages. +Logga in pÃ¥ $siteurl för att läsa och svara pÃ¥ personliga meddelanden. -Thank you, -$siteName administrator +Hälsningar, +$siteName admin diff --git a/view/sv/pagetypes.tpl b/view/sv/pagetypes.tpl index 2036614ab..2d576f5ac 100644 --- a/view/sv/pagetypes.tpl +++ b/view/sv/pagetypes.tpl @@ -1,25 +1,25 @@ <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Normal Profile</label> + <label id="settings-normal-label" for="settings-normal">Normal profil</label> <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">This account is a normal personal profile</span> + <span id="settings-normal-desc">Detta konto är en normal personlig profil</span> </div> <div id="settings-normal-break" ></div> <div id="settings-soapbox-wrapper"> <label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label> <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span> + <span id="settings-soapbox-desc">Godkänn automatiskt alla kontaktförfrågningar som fans med läsrättigheter</span> </div> <div id="settings-soapbox-break" ></div> <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label> + <label id="settings-community-label" for="settings-community">Gemenskap/Kändisprofil</label> <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span> + <span id="settings-community-desc">Godkänn automatiskt alla kontaktförfrågningar som fans med läs- och skrivrättigheter</span> </div> <div id="settings-community-break" ></div> <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label> + <label id="settings-freelove-label" for="settings-freelove">Automatisk vännerprofil</label> <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span> + <span id="settings-freelove-desc">Godkänn automatiskt alla kontaktförfrågningar som vänner</span> </div> - <div id="settings-freelove-break" ></div> + <div id="settings-freelove-break" ></div>
\ No newline at end of file diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 9692159e1..590462468 100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl @@ -1,20 +1,18 @@ -Dear $username, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). +$username, +Lösenordet har ändrats enligt din begäran. BehÃ¥ll den här +informationen om den skulle behövas i framtiden. (eller ändra lösenord +pÃ¥ en gÃ¥ng till nÃ¥got som du kommer ihÃ¥g). -Your login details are as follows: -Site Location: $siteurl -Login Name: $email -Password: $new_password +Här är dina inloggningsuppgifter: -You may change that password from your account settings page after logging in. +Webbplats: $siteurl +Användarnamn: $email +Lösenord: $new_password +När du loggat in kan du byta lösenord bland inställningarna. -Sincerely, - $sitename Administrator - - +Hälsningar, +$sitename admin diff --git a/view/sv/profile-hide-friends.tpl b/view/sv/profile-hide-friends.tpl index 54ade00fe..367c4317f 100644 --- a/view/sv/profile-hide-friends.tpl +++ b/view/sv/profile-hide-friends.tpl @@ -1,16 +1,16 @@ <p id="hide-friends-text"> -Hide my contact/friend list from viewers of this profile? +Dölj kontaktlista/vänlista för de som ser denna profil? </p> <div id="hide-friends-yes-wrapper"> - <label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label> + <label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label> <input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" /> <div id="hide-friends-break" ></div> </div> <div id="hide-friends-no-wrapper"> - <label id="hide-friends-no-label" for="hide-friends-no">No</label> + <label id="hide-friends-no-label" for="hide-friends-no">Nej</label> <input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0" /> <div id="hide-friends-end"></div> - </div> + </div>
\ No newline at end of file diff --git a/view/sv/profile-in-directory.tpl b/view/sv/profile-in-directory.tpl index 98af3e59a..982fe990e 100644 --- a/view/sv/profile-in-directory.tpl +++ b/view/sv/profile-in-directory.tpl @@ -1,16 +1,16 @@ <p id="profile-in-directory"> -Publish your default profile in site directory? +Publicera din huvudsakliga profil (default) i webbplatsens medlemskatalog? </p> <div id="profile-in-dir-yes-wrapper"> - <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label> + <label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label> <input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" /> <div id="profile-in-dir-break" ></div> </div> <div id="profile-in-dir-no-wrapper"> - <label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label> + <label id="profile-in-dir-no-label" for="profile-in-dir-no">Nej</label> <input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0" /> <div id="profile-in-dir-end"></div> - </div> + </div>
\ No newline at end of file diff --git a/view/sv/profile-in-netdir.tpl b/view/sv/profile-in-netdir.tpl index be111aa67..430173511 100644 --- a/view/sv/profile-in-netdir.tpl +++ b/view/sv/profile-in-netdir.tpl @@ -1,16 +1,16 @@ <p id="profile-in-directory"> -Publish your default profile in global social directory? +Publicera din huvudsakliga profil (default) i den globala medlemskatalogen? </p> <div id="profile-in-netdir-yes-wrapper"> - <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label> + <label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label> <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" /> <div id="profile-in-netdir-break" ></div> </div> <div id="profile-in-netdir-no-wrapper"> - <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label> + <label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nej</label> <input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0" /> <div id="profile-in-netdir-end"></div> - </div> + </div>
\ No newline at end of file diff --git a/view/sv/profile.php b/view/sv/profile.php index fa7372668..6c551e185 100644 --- a/view/sv/profile.php +++ b/view/sv/profile.php @@ -1,72 +1,71 @@ -<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
- <title><?php if(x($page,'title')) echo $page['title']; ?></title>
- <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
- <?php if(strlen($profile['name'])) { ?>
- <div class="fn"><?php echo $profile['name']; ?></div>
- <?php } ?>
-
- <?php if(strlen($profile['photo'])) { ?>
- <div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
- <?php } ?>
-
- <div id="profile-extra-links">
- <ul>
- <?php if($profile['uid'] != $_SESSION['uid']) { ?>
- <li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
- <?php } ?>
- </ul>
-
- </div>
-
- <?php if ( (strlen($profile['address']))
- || (strlen($profile['locality']))
- || (strlen($profile['region']))
- || (strlen($profile['postal-code']))
- || (strlen($profile['country-name']))) { ?>
- <div class="location">Location:
- <div class="adr">
- <div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
- <span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
- <span class="country-name"><?php echo $profile['country-name']; ?></span>
- </div>
- </div>
-
- <?php } ?>
-
- <?php if(strlen($profile['gender'])) { ?>
- <div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
- <?php } ?>
-
- <?php if(strlen($profile['pubkey'])) { ?>
- <div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
- <?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">♥</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
+<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?> +<html> +<head> + <title><?php if(x($page,'title')) echo $page['title']; ?></title> + <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?> +</head> +<body> +<header><?php if(x($page,'header')) echo $page['header']; ?></header> +<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav> +<aside> +<?php if((is_array($profile)) && count($profile)) { ?> +<div class="vcard"> + <?php if(strlen($profile['name'])) { ?> + <div class="fn"><?php echo $profile['name']; ?></div> + <?php } ?> + + <?php if(strlen($profile['photo'])) { ?> + <div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div> + <?php } ?> + + <div id="profile-extra-links"> + <ul> + <?php if($profile['uid'] != $_SESSION['uid']) { ?> + <li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li> + <?php } ?> + </ul> + + </div> + + <?php if ( (strlen($profile['address'])) + || (strlen($profile['locality'])) + || (strlen($profile['region'])) + || (strlen($profile['postal-code'])) + || (strlen($profile['country-name']))) { ?> + <div class="location">Plats: + <div class="adr"> + <div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div> + <span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span> + <span class="country-name"><?php echo $profile['country-name']; ?></span> + </div> + </div> + + <?php } ?> + + <?php if(strlen($profile['gender'])) { ?> + <div class="mf">Kön: <span class="x-gender"><?php echo $profile['gender']; ?></span></div> + + <?php } ?> + + <?php if(strlen($profile['pubkey'])) { ?> + <div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div> + <?php } ?> +</div> +<?php } ?> +<?php if(strlen($profile['marital'])) { ?> +<div class="marital"><span class="marital-label"><span class="heart">♥</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div> +<?php } ?> +<?php if(strlen($profile['homepage'])) { ?> +<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div> +<?php } ?> +<?php if(x($page,'aside')) echo $page['aside'] ?> +</aside> +<section> +<?php if(x($page,'content')) echo $page['content']; ?> +<div id="page-footer"></div> +</section> +<footer> +<?php if(x($page,'footer')) echo $page['footer']; ?> +</footer> +</body> +</html> diff --git a/view/sv/profile_advanced.php b/view/sv/profile_advanced.php index 6d2ecba4d..0891d7ff1 100644 --- a/view/sv/profile_advanced.php +++ b/view/sv/profile_advanced.php @@ -12,7 +12,7 @@ EOT; if($a->profile['name']) { $o .= <<< EOT <div id="advanced-profile-name-wrapper" > -<div id="advanced-profile-name-text">Full Name:</div> +<div id="advanced-profile-name-text">Fullständigt namn:</div> <div id="advanced-profile-name">{$a->profile['name']}</div> </div> <div id="advanced-profile-name-end"></div> @@ -22,7 +22,7 @@ EOT; if($a->profile['gender']) { $o .= <<< EOT <div id="advanced-profile-gender-wrapper" > -<div id="advanced-profile-gender-text">Gender:</div> +<div id="advanced-profile-gender-text">Kön:</div> <div id="advanced-profile-gender">{$a->profile['gender']}</div> </div> <div id="advanced-profile-gender-end"></div> @@ -32,7 +32,7 @@ EOT; if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { $o .= <<< EOT <div id="advanced-profile-dob-wrapper" > -<div id="advanced-profile-dob-text">Birthday:</div> +<div id="advanced-profile-dob-text">Födelsedag:</div> EOT; // If no year, add an arbitrary one so just we can parse the month and day. @@ -50,7 +50,7 @@ $o .= '<div id="advanced-profile-dob-end"></div>'; if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { $o .= <<< EOT <div id="advanced-profile-age-wrapper" > -<div id="advanced-profile-age-text">Age:</div> +<div id="advanced-profile-age-text">Ålder:</div> <div id="advanced-profile-age">$age</div> </div> <div id="advanced-profile-age-end"></div> @@ -60,7 +60,7 @@ EOT; if($a->profile['marital']) { $o .= <<< EOT <div id="advanced-profile-marital-wrapper" > -<div id="advanced-profile-marital-text"><span class="heart">♥</span> Status:</div> +<div id="advanced-profile-marital-text"><span class="heart">♥</span> Civilstatus:</div> <div id="advanced-profile-marital">{$a->profile['marital']}</div> EOT; @@ -75,7 +75,7 @@ EOT; if($a->profile['sexual']) { $o .= <<< EOT <div id="advanced-profile-sexual-wrapper" > -<div id="advanced-profile-sexual-text">Sexual Preference:</div> +<div id="advanced-profile-sexual-text">Sexuell läggning:</div> <div id="advanced-profile-sexual">{$a->profile['sexual']}</div> </div> <div id="advanced-profile-sexual-end"></div> @@ -86,7 +86,7 @@ if($a->profile['homepage']) { $homepage = linkify($a->profile['homepage']); $o .= <<< EOT <div id="advanced-profile-homepage-wrapper" > -<div id="advanced-profile-homepage-text">Homepage:</div> +<div id="advanced-profile-homepage-text">Hemsida URL:</div> <div id="advanced-profile-homepage">$homepage</div> </div> <div id="advanced-profile-homepage-end"></div> @@ -96,7 +96,7 @@ EOT; if($a->profile['politic']) { $o .= <<< EOT <div id="advanced-profile-politic-wrapper" > -<div id="advanced-profile-politic-text">Political Views:</div> +<div id="advanced-profile-politic-text">Politisk åskådning:</div> <div id="advanced-profile-politic">{$a->profile['politic']}</div> </div> <div id="advanced-profile-politic-end"></div> @@ -115,7 +115,7 @@ EOT; if($txt = prepare_text($a->profile['about'])) { $o .= <<< EOT <div id="advanced-profile-about-wrapper" > -<div id="advanced-profile-about-text">About:</div> +<div id="advanced-profile-about-text">Om:</div> <br /> <div id="advanced-profile-about">$txt</div> </div> @@ -126,7 +126,7 @@ EOT; if($txt = prepare_text($a->profile['interest'])) { $o .= <<< EOT <div id="advanced-profile-interest-wrapper" > -<div id="advanced-profile-interest-text">Hobbies/Interests:</div> +<div id="advanced-profile-interest-text">Hobbys/Intressen:</div> <br /> <div id="advanced-profile-interest">$txt</div> </div> @@ -137,7 +137,7 @@ EOT; if($txt = prepare_text($a->profile['contact'])) { $o .= <<< EOT <div id="advanced-profile-contact-wrapper" > -<div id="advanced-profile-contact-text">Contact information and Social Networks:</div> +<div id="advanced-profile-contact-text">Kontaktuppgifter och sociala nätverk:</div> <br /> <div id="advanced-profile-contact">$txt</div> </div> @@ -148,7 +148,7 @@ EOT; if($txt = prepare_text($a->profile['music'])) { $o .= <<< EOT <div id="advanced-profile-music-wrapper" > -<div id="advanced-profile-music-text">Musical interests:</div> +<div id="advanced-profile-music-text">Musik:</div> <br /> <div id="advanced-profile-music">$txt</div> </div> @@ -159,7 +159,7 @@ EOT; if($txt = prepare_text($a->profile['book'])) { $o .= <<< EOT <div id="advanced-profile-book-wrapper" > -<div id="advanced-profile-book-text">Books, literature:</div> +<div id="advanced-profile-book-text">Böcker, litteratur:</div> <br /> <div id="advanced-profile-book">$txt</div> </div> @@ -170,7 +170,7 @@ EOT; if($txt = prepare_text($a->profile['tv'])) { $o .= <<< EOT <div id="advanced-profile-tv-wrapper" > -<div id="advanced-profile-tv-text">Television:</div> +<div id="advanced-profile-tv-text">TV:</div> <br /> <div id="advanced-profile-tv">$txt</div> </div> @@ -181,7 +181,7 @@ EOT; if($txt = prepare_text($a->profile['film'])) { $o .= <<< EOT <div id="advanced-profile-film-wrapper" > -<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div> +<div id="advanced-profile-film-text">Film/dans/kultur/underhållning:</div> <br /> <div id="advanced-profile-film">$txt</div> </div> @@ -192,7 +192,7 @@ EOT; if($txt = prepare_text($a->profile['romance'])) { $o .= <<< EOT <div id="advanced-profile-romance-wrapper" > -<div id="advanced-profile-romance-text">Love/romance:</div> +<div id="advanced-profile-romance-text">Kärlek/romantik:</div> <br /> <div id="advanced-profile-romance">$txt</div> </div> @@ -203,7 +203,7 @@ EOT; if($txt = prepare_text($a->profile['work'])) { $o .= <<< EOT <div id="advanced-profile-work-wrapper" > -<div id="advanced-profile-work-text">Work/employment:</div> +<div id="advanced-profile-work-text">Arbete:</div> <br /> <div id="advanced-profile-work">$txt</div> </div> @@ -214,12 +214,10 @@ EOT; if($txt = prepare_text($a->profile['education'])) { $o .= <<< EOT <div id="advanced-profile-education-wrapper" > -<div id="advanced-profile-education-text">School/education:</div> +<div id="advanced-profile-education-text">Skola/utbildning:</div> <br /> <div id="advanced-profile-education">$txt</div> </div> <div id="advanced-profile-education-end"></div> EOT; } - - diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl index 6c7d74daf..9b66f109e 100644 --- a/view/sv/profile_edit.tpl +++ b/view/sv/profile_edit.tpl @@ -1,11 +1,11 @@ -<h1>Edit Profile Details</h1> +<h1>Ändra i profil</h1> <div id="profile-edit-links"> <ul> -<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li> -<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li> +<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Visa denna profil</a></li> +<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Klona denna profil</a></li> <li></li> -<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li> +<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Ta bort denna profil</a></li> </ul> </div> @@ -18,32 +18,32 @@ $default <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" > <div id="profile-edit-profile-name-wrapper" > -<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label> +<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profilnamn: </label> <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div> </div> <div id="profile-edit-profile-name-end"></div> <div id="profile-edit-name-wrapper" > -<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label> +<label id="profile-edit-name-label" for="profile-edit-name" >Fullständigt namn: </label> <input type="text" size="32" name="name" id="profile-edit-name" value="$name" /> </div> <div id="profile-edit-name-end"></div> <div id="profile-edit-pdesc-wrapper" > -<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label> +<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titel/Beskrivning: </label> <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" /> </div> <div id="profile-edit-pdesc-end"></div> <div id="profile-edit-gender-wrapper" > -<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label> +<label id="profile-edit-gender-label" for="gender-select" >Kön: </label> $gender </div> <div id="profile-edit-gender-end"></div> <div id="profile-edit-dob-wrapper" > -<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label> +<label id="profile-edit-dob-label" for="dob-select" >Födelsedag (å/m/d): </label> <div id="profile-edit-dob" > $dob $age </div> @@ -53,32 +53,32 @@ $dob $age $hide_friends <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> <div id="profile-edit-address-wrapper" > -<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label> +<label id="profile-edit-address-label" for="profile-edit-address" >Gatuadress: </label> <input type="text" size="32" name="address" id="profile-edit-address" value="$address" /> </div> <div id="profile-edit-address-end"></div> <div id="profile-edit-locality-wrapper" > -<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label> +<label id="profile-edit-locality-label" for="profile-edit-locality" >Plats/Stad: </label> <input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" /> </div> <div id="profile-edit-locality-end"></div> <div id="profile-edit-postal-code-wrapper" > -<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label> +<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postnummer: </label> <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" /> </div> <div id="profile-edit-postal-code-end"></div> <div id="profile-edit-country-name-wrapper" > -<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label> +<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Land: </label> <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');"> <option selected="selected" >$country_name</option> <option>temp</option> @@ -87,7 +87,7 @@ $hide_friends <div id="profile-edit-country-name-end"></div> <div id="profile-edit-region-wrapper" > -<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label> +<label id="profile-edit-region-label" for="profile-edit-region" >Region: </label> <select name="region" id="profile-edit-region" onChange="Update_Globals();" > <option selected="selected" >$region</option> <option>temp</option> @@ -96,20 +96,20 @@ $hide_friends <div id="profile-edit-region-end"></div> <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> <div id="profile-edit-marital-wrapper" > -<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">♥</span> (Marital) Status: </label> +<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">♥</span> Civilstatus: </label> $marital </div> -<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label> +<label id="profile-edit-with-label" for="profile-edit-with" > Vem: (om aktuellt) </label> <input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" /> <div id="profile-edit-marital-end"></div> <div id="profile-edit-sexual-wrapper" > -<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label> +<label id="profile-edit-sexual-label" for="sexual-select" >Sexuell läggning: </label> $sexual </div> <div id="profile-edit-sexual-end"></div> @@ -117,13 +117,13 @@ $sexual <div id="profile-edit-homepage-wrapper" > -<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label> +<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Hemsida URL: </label> <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" /> </div> <div id="profile-edit-homepage-end"></div> <div id="profile-edit-politic-wrapper" > -<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label> +<label id="profile-edit-politic-label" for="profile-edit-politic" >Politisk åskådning: </label> <input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" /> </div> <div id="profile-edit-politic-end"></div> @@ -135,26 +135,25 @@ $sexual <div id="profile-edit-religion-end"></div> <div id="profile-edit-pubkeywords-wrapper" > -<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label> -<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" /> +<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label> +<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" /> </div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div> <div id="profile-edit-pubkeywords-end"></div> <div id="profile-edit-prvkeywords-wrapper" > -<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label> -<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> -</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> +<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label> +<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Används vid profilsökning, visas inte för andra)</div> <div id="profile-edit-prvkeywords-end"></div> - <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> <div id="about-jot-wrapper" > <p id="about-jot-desc" > -Tell us about yourself... +Beskriv dig själv... </p> <textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea> @@ -166,7 +165,7 @@ Tell us about yourself... <div id="interest-jot-wrapper" > <p id="interest-jot-desc" > -Hobbies/Interests +Hobbys/Intressen </p> <textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea> @@ -178,7 +177,7 @@ Hobbies/Interests <div id="contact-jot-wrapper" > <p id="contact-jot-desc" > -Contact information and Social Networks +Kontaktuppgifter och sociala nätverk </p> <textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea> @@ -189,14 +188,14 @@ Contact information and Social Networks <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> <div id="music-jot-wrapper" > <p id="music-jot-desc" > -Musical interests +Musik </p> <textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea> @@ -207,7 +206,7 @@ Musical interests <div id="book-jot-wrapper" > <p id="book-jot-desc" > -Books, literature +Böcker, litteratur </p> <textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea> @@ -220,7 +219,7 @@ Books, literature <div id="tv-jot-wrapper" > <p id="tv-jot-desc" > -Television +TV </p> <textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea> @@ -233,7 +232,7 @@ Television <div id="film-jot-wrapper" > <p id="film-jot-desc" > -Film/dance/culture/entertainment +Film/dans/kultur/underhållning </p> <textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea> @@ -244,14 +243,14 @@ Film/dance/culture/entertainment <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> <div id="romance-jot-wrapper" > <p id="romance-jot-desc" > -Love/romance +Kärlek/romantik </p> <textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea> @@ -264,7 +263,7 @@ Love/romance <div id="work-jot-wrapper" > <p id="work-jot-desc" > -Work/employment +Arbete </p> <textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea> @@ -277,7 +276,7 @@ Work/employment <div id="education-jot-wrapper" > <p id="education-jot-desc" > -School/education +Skola/utbildning </p> <textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea> @@ -289,7 +288,7 @@ School/education <div class="profile-edit-submit-wrapper" > -<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" /> </div> <div class="profile-edit-submit-end"></div> diff --git a/view/sv/profile_entry_default.tpl b/view/sv/profile_entry_default.tpl index 651199918..dff6b53f7 100644 --- a/view/sv/profile_entry_default.tpl +++ b/view/sv/profile_entry_default.tpl @@ -1,7 +1,7 @@ <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > -<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a> +<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a> </div> <div class="profile-listing-photo-end" ></div> <div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div> diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl index d4b139a69..ce81dd279 100644 --- a/view/sv/profile_listing_header.tpl +++ b/view/sv/profile_listing_header.tpl @@ -1,8 +1,7 @@ -<h1>Profiles</h1> +<h1>Profiler</h1> <p id="profile-listing-desc" > -<a href="profile_photo" >Change profile photo</a> +<a href="profile_photo" >Byt profilbild</a> </p> <div id="profile-listing-new-link-wrapper" > -<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a> +<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Skapa ny profil</a> </div> - diff --git a/view/sv/profile_photo.tpl b/view/sv/profile_photo.tpl index 30e51210a..b849a270d 100644 --- a/view/sv/profile_photo.tpl +++ b/view/sv/profile_photo.tpl @@ -1,18 +1,18 @@ -<h1>Upload Profile Photo</h1> +<h1>Ladda upp profilbild</h1> <form enctype="multipart/form-data" action="profile_photo" method="post"> <div id="profile-photo-upload-wrapper"> -<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label> +<label id="profile-photo-upload-label" for="profile-photo-upload">Ladda upp fil: </label> <input name="userfile" type="file" id="profile-photo-upload" size="48" /> </div> <div id="profile-photo-submit-wrapper"> -<input type="submit" name="submit" id="profile-photo-submit" value="Upload"> +<input type="submit" name="submit" id="profile-photo-submit" value="Ladda upp"> </div> </form> <div id="profile-photo-link-select-wrapper"> -or <a href='photos/$user'>select a photo from albums</a> +eller <a href='photos/$user'>välj bild i ett album</a> </div>
\ No newline at end of file diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl index dd609f061..2c2d9e7e6 100644 --- a/view/sv/pwdreset.tpl +++ b/view/sv/pwdreset.tpl @@ -1,16 +1,16 @@ -<h3>Password Reset</h3> +<h3>Återställning av lösenord</h3> <p> -Your password has been reset as requested. +Ditt lösenord har återställts enligt önskemål. </p> <p> -Your new password is +Ditt nya lösenord är </p> <p> $newpass </p> <p> -Save or copy your new password - and then <a href="$baseurl" >click here to login</a>. +Håll koll på det nya lösenordet och <a href="$baseurl" >klicka sedan här för att logga in</a>. </p> <p> -Your password may be changed from the 'Settings' page after successful login.
\ No newline at end of file +Lösenordet kan ändras på sidan Inställningar efter att du loggat in.
\ No newline at end of file diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 8a00f21e9..0c7cb2496 100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl @@ -1,21 +1,17 @@ +$username, +Tack för att du registrerat dig pÃ¥ $sitename. Kontot har skapats. +Här är dina inloggningsuppgifter: -Dear $username, - Thank you for registering at $sitename. Your account has been created. -The login details are as follows: +Webbplats: $siteurl +Användarnamn: $email +Lösenord: $password +Lösenordet kan ändras pÃ¥ sidan Inställningar efter att du loggat in. -Site Location: $siteurl -Login Name: $email -Password: $password +Ägna en liten stund Ã¥t att gÃ¥ igenom alla kontoinställningar där. -You may change your password from your account "Settings" page after logging -in. +Tack, och välkommen till $sitename. -Please take a few moments to review the other account settings on that page. +Hälsningar, +$sitename admin -Thank you and welcome to $sitename. - -Sincerely, - $sitename Administrator - - diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index 60c38d800..f3e4ca9ff 100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl @@ -1,26 +1,18 @@ -A new user registration request was received at $sitename which requires -your approval. +En registreringsförfrÃ¥gan som kräver svar har mottagits +pÃ¥ $sitename -The login details are as follows: +Här är inloggningsuppgifterna: -Full Name: $username -Site Location: $siteurl -Login Name: $email - - -To approve this request please visit the following link: +Fullständigt namn: $username +Webbplats: $siteurl +Användarnamn: $email +GÃ¥ till denna adress om du vill godkänna: $siteurl/regmod/allow/$hash - -To deny the request and remove the account, please visit: - - +GÃ¥ till denna adress om du vill avslÃ¥ förfrÃ¥gan och ta bort kontot: $siteurl/regmod/deny/$hash - -Thank you. - diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl index d8faf3439..24e13abca 100644 --- a/view/sv/registrations-top.tpl +++ b/view/sv/registrations-top.tpl @@ -1,3 +1 @@ -<h1>User registrations waiting for confirm</h1> - - +<h1>Registreringar frÃ¥n användare som inväntar godkännande</h1> diff --git a/view/sv/registrations.tpl b/view/sv/registrations.tpl index c8646043e..869fa1a90 100644 --- a/view/sv/registrations.tpl +++ b/view/sv/registrations.tpl @@ -1 +1 @@ -<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li> +<li>$fullname ($email) : <a href="$approvelink">Godkänn</a> - <a href="$denylink">Avslå</a></li> diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 9eef7a61e..893bce17c 100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl @@ -1,17 +1,13 @@ +$myname, -Dear $myname, +Du har just fÃ¥tt en kontaktförfrÃ¥gan pÃ¥ $sitename frÃ¥n '$requestor' -You have just received a connection request at $sitename +Profilen finns pÃ¥ $url. -from '$requestor'. - -You may visit their profile at $url. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. +Logga in för att se hela förfrÃ¥gan och godkänna eller +avslÃ¥ den. $siteurl -Regards, - - $sitename administrator
\ No newline at end of file +Hälsningar, +$sitename admin diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl index d5b8d5b3f..a1fff52eb 100644 --- a/view/sv/settings.tpl +++ b/view/sv/settings.tpl @@ -1,6 +1,8 @@ -<h1>Account Settings</h1> +<h1>Kontoinställningar</h1> -<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div> +<div id="plugin-settings-link"><a href="settings/addon">Inställningar för insticksprogram</a></div> + +$uexport $nickname_block @@ -8,16 +10,16 @@ $nickname_block <form action="settings" id="settings-form" method="post" autocomplete="off" > -<h3 class="settings-heading">Basic Settings</h3> +<h3 class="settings-heading">Grundläggande inställningar</h3> <div id="settings-username-wrapper" > -<label id="settings-username-label" for="settings-username" >Full Name: </label> +<label id="settings-username-label" for="settings-username" >Fullständigt namn: </label> <input type="text" name="username" id="settings-username" value="$username" /> </div> <div id="settings-username-end" ></div> <div id="settings-email-wrapper" > -<label id="settings-email-label" for="settings-email" >Email Address: </label> +<label id="settings-email-label" for="settings-email" >E-postadress: </label> <input type="text" name="email" id="settings-email" value="$email" /> </div> <div id="settings-email-end" ></div> @@ -25,19 +27,19 @@ $nickname_block <div id="settings-timezone-wrapper" > -<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label> +<label id="settings-timezone-label" for="timezone_select" >Tidszon: </label> $zoneselect </div> <div id="settings-timezone-end" ></div> <div id="settings-defloc-wrapper" > -<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label> +<label id="settings-defloc-label" for="settings-defloc" >Förvald plats: </label> <input type="text" name="defloc" id="settings-defloc" value="$defloc" /> </div> <div id="settings-defloc-end" ></div> <div id="settings-allowloc-wrapper" > -<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label> +<label id="settings-allowloc-label" for="settings-allowloc" >Använd webbläsarens positioneringsfunktion: </label> <input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked /> </div> <div id="settings-allowloc-end" ></div> @@ -46,25 +48,25 @@ $zoneselect <div id="settings-theme-select"> -<label id="settings-theme-label" for="theme-select" >Display Theme: </label> +<label id="settings-theme-label" for="theme-select" >Tema för layout: </label> $theme </div> <div id="settings-theme-end"></div> <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="Spara" /> </div> -<h3 class="settings-heading">Security and Privacy Settings</h3> +<h3 class="settings-heading">Säkerhets- och sekretessinställningar</h3> <input type="hidden" name="visibility" value="$visibility" /> <div id="settings-maxreq-wrapper"> -<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label> +<label id="settings-maxreq-label" for="settings-maxreq" >Max antal vänförfrågningar/dag</label> <input id="settings-maxreq" name="maxreq" value="$maxreq" /> -<div id="settings-maxreq-desc">(to prevent spam abuse)</div> +<div id="settings-maxreq-desc">(spamskydd)</div> </div> <div id="settings-maxreq-end"></div> @@ -103,53 +105,53 @@ $profile_in_net_dir <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="Spara" /> </div> -<h3 class="settings-heading">Notification Settings</h3> +<h3 class="settings-heading">Inställningar för aviseringar</h3> <div id="settings-notify-wrapper"> -<div id="settings-notify-desc">Send a notification email when: </div> -<label for="notify1" id="settings-label-notify1">You receive an introduction</label> +<div id="settings-notify-desc">Skicka avisering via e-post när: </div> +<label for="notify1" id="settings-label-notify1">Ny kontaktförfrågan kommer</label> <input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" /> <div id="notify1-end"></div> -<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label> +<label for="notify2" id="settings-label-notify2">Egen förfrågan har godkänts</label> <input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" /> <div id="notify2-end"></div> -<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label> +<label for="notify3" id="settings-label-notify3">Någon skriver på din profilsida</label> <input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" /> <div id="notify3-end"></div> -<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label> +<label for="notify4" id="settings-label-notify4">Någon skriver en kommentar direkt efter din</label> <input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" /> <div id="notify4-end"></div> -<label for="notify5" id="settings-label-notify5">You receive a private message</label> +<label for="notify5" id="settings-label-notify5">Du får ett personligt meddelande</label> <input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" /> <div id="notify5-end"></div> </div> <div id="settings=notify-end"></div> <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="Spara" /> </div> -<h3 class="settings-heading">Password Settings</h3> +<h3 class="settings-heading">Lösenordsinställningar</h3> <div id="settings-password-wrapper" > <p id="settings-password-desc" > -Leave password fields blank unless changing +Lämna fältet tomt om du inte vill byta lösenord </p> -<label id="settings-password-label" for="settings-password" >New Password: </label> +<label id="settings-password-label" for="settings-password" >Nytt lösenord: </label> <input type="password" id="settings-password" name="npassword" /> </div> <div id="settings-password-end" ></div> <div id="settings-confirm-wrapper" > -<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label> +<label id="settings-confirm-label" for="settings-confirm" >Bekräfta (upprepa): </label> <input type="password" id="settings-confirm" name="confirm" /> </div> <div id="settings-confirm-end" ></div> @@ -161,16 +163,14 @@ Leave password fields blank unless changing <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="Spara" /> </div> -<h3 class="settings-heading">Advanced Page Settings</h3> +<h3 class="settings-heading">Avancerade inställningar</h3> $pagetype <div class="settings-submit-wrapper" > -<input type="submit" name="submit" class="settings-submit" value="Submit" /> +<input type="submit" name="submit" class="settings-submit" value="Spara" /> </div> - - diff --git a/view/sv/settings_nick_set.tpl b/view/sv/settings_nick_set.tpl index a36b3b9a2..34cb36e49 100644 --- a/view/sv/settings_nick_set.tpl +++ b/view/sv/settings_nick_set.tpl @@ -1,7 +1,6 @@ - <div id="settings-nick-wrapper" > <p id="settings-nickname-desc"> -<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span> +<span class="error-message">Din profiladress är <strong>'$nickname@$basepath'</strong></span> </p> $subdir diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl index 303c24df7..2702708ab 100644 --- a/view/sv/settings_nick_subdir.tpl +++ b/view/sv/settings_nick_subdir.tpl @@ -1,6 +1,6 @@ <p> -It appears that your website is located in a subdirectory of the<br /> -$hostname website, so this setting may not work reliably.<br /> +Det verkar som att din webbsida finns i en undermapp på webbplatsen<br /> +$hostname, så eventuellt kommer inte denna inställning att fungera tillförlitligt.<br /> </p> -<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'. +<p>Om problem uppstår är det möjligt att problemen kan lösas genom att använda<br /> profiladressen '<strong>$baseurl/profile/$nickname</strong>' istället. </p>
\ No newline at end of file diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl index 903768b59..5e115ff68 100644 --- a/view/sv/settings_nick_unset.tpl +++ b/view/sv/settings_nick_unset.tpl @@ -1,14 +1,12 @@ - <div id="settings-nick-wrapper" > <p id="settings-nickname-desc"> -Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>. -Setting a nickname will allow a friendly profile URL such as +Din profiladress är för närvarande<strong>'$baseurl/profile/$uid'</strong>. +Genom att ange ett smeknamn/nick kan din adress bli enklare, så här: <strong>'nickname@$basepath'</strong>. <br /> -Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed. +När smeknamn/nick har angetts kan det <strong>inte</strong> ändras. Det <strong>måste</strong> inledas med en bokstav, och bara bokstäver, siffror, bindestreck och understrykningstecken får användas. </p> -<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label> +<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label> <input type="text" name="nick" id="settings-nick" value="$nickname" /> </div> <div id="settings-nick-end" ></div> - diff --git a/view/sv/strings.php b/view/sv/strings.php index 6685130bb..82cd7feeb 100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php @@ -1,32 +1,35 @@ <?php -$a->strings['Not Found'] = 'Hittades inte'; + +function string_plural_select($n){ + return ($n != 1); +} + +$a->strings['Not Found'] = 'Hittar inte'; $a->strings['Page not found.' ] = 'Sidan hittades inte.' ; $a->strings['Permission denied'] = 'Ã…tkomst nekad'; $a->strings['Permission denied.'] = 'Ã…tkomst nekad.'; -$a->strings['Create a New Account'] = 'Skapa nytt konto'; +$a->strings['Create a New Account'] = 'Skapa ett nytt konto'; $a->strings['Register'] = 'Registrera'; $a->strings['Nickname or Email address: '] = 'Användarnamn eller e-postadress: '; $a->strings['Password: '] = 'Lösenord: '; $a->strings['Login'] = 'Logga in'; -$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/E-post/OpenID: '; +$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/e-post/OpenID: '; $a->strings["Password \x28if not OpenID\x29: "] = "Lösenord \x28om inget OpenID\x29: "; -$a->strings['Forgot your password?'] = 'Glömt lösenordet?'; -$a->strings['Password Reset'] = 'Ã…terställ lösenord'; +$a->strings['Forgot your password?'] = 'Har du glömt lösenordet?'; +$a->strings['Password Reset'] = 'Ã…terställ lösenordet'; $a->strings['Logout'] = 'Logga ut'; $a->strings['prev'] = 'föreg'; $a->strings['first'] = 'första'; $a->strings['last'] = 'sista'; $a->strings['next'] = 'nästa'; -$a->strings[' likes this.'] = ' gillar detta.'; -$a->strings[' doesn\'t like this.'] = ' ogillar detta.'; -$a->strings['people'] = 'personer'; -$a->strings['like this.'] = 'gilla detta.'; -$a->strings['don\'t like this.'] = 'ogilla detta.'; +$a->strings['%s likes this.'] = '%s gillar det här.'; +$a->strings['%s doesn\'t like this.'] = '%s ogillar det här.'; +$a->strings['<span %1$s>%2$d people</span> like this.'] = '<span %1$s>%2$d personer</span> gillar det här.'; +$a->strings['<span %1$s>%2$d people</span> don\'t like this.'] = '<span %1$s>%2$d personer</span> ogillar det här.'; $a->strings['and'] = 'och'; -$a->strings[', and '] = ', och '; -$a->strings[' other people'] = ' personer till'; -$a->strings[' like this.'] = ' gillar detta.'; -$a->strings[' don\'t like this.'] = ' ogillar detta.'; +$a->strings[', and %d other people'] = ', och ytterligare %d personer'; +$a->strings['%s like this.'] = '%s gillar det här.'; +$a->strings['%s don\'t like this.'] = '%s ogillar det här.'; $a->strings['No contacts'] = 'Inga kontakter'; $a->strings['Contacts'] = 'Kontakter'; $a->strings['View Contacts'] = 'Visa kontakter'; @@ -57,10 +60,11 @@ $a->strings['September'] = 'september'; $a->strings['October'] = 'oktober'; $a->strings['November'] = 'november'; $a->strings['December'] = 'december'; +$a->strings['Birthday Reminders'] = 'FödelsedagspÃ¥minnelser'; $a->strings['Birthdays this week:'] = 'Födelsedagar denna vecka:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Justerad till lokal tid\x29"; $a->strings['[today]'] = '[today]'; -$a->strings['link to source'] = 'link to source'; +$a->strings['link to source'] = 'länk till källa'; $a->strings['No recipient selected.'] = 'Ingen mottagare vald.'; $a->strings['[no subject]'] = '[no subject]'; $a->strings['Unable to locate contact information.'] = 'Hittar inga kontaktuppgifter.'; @@ -94,17 +98,21 @@ $a->strings['Could not access contact record.'] = 'Could not access contact reco $a->strings['Could not locate selected profile.'] = 'Hittade inte vald profil.'; $a->strings['Contact updated.'] = 'Kontakten har uppdaterats.'; $a->strings['Failed to update contact record.'] = 'Failed to update contact record.'; -$a->strings['Contact has been '] = 'Kontakt '; +$a->strings['Contact has been '] = 'Kontakten '; $a->strings['blocked'] = 'spärrad'; $a->strings['unblocked'] = 'inte längre spärrad'; -$a->strings['ignored'] = 'ignoreras'; -$a->strings['unignored'] = 'ignoreras inte längre'; -$a->strings['stopped following'] = 'stopped following'; +$a->strings['Contact has been blocked'] = 'Kontakten har spärrats'; +$a->strings['Contact has been unblocked'] = 'Kontakten är inte längre spärrad'; +$a->strings['Contact has been ignored'] = 'Kontakten ignoreras'; +$a->strings['Contact has been unignored'] = 'Kontakten ignoreras inte längre'; +$a->strings['stopped following'] = 'följer inte längre'; $a->strings['Contact has been removed.'] = 'Kontakten har tagits bort.'; $a->strings['Contact not found.'] = 'Kontakten hittades inte.'; $a->strings['Mutual Friendship'] = 'Ömsesidig vänskap'; $a->strings['is a fan of yours'] = 'är ett fan till dig'; $a->strings['you are a fan of'] = 'du är fan till'; +$a->strings['Privacy Unavailable'] = 'Privacy Unavailable'; +$a->strings['Private communications are not available for this contact.'] = 'Det gÃ¥r inte att utbyta personliga meddelanden med den här kontakten.'; $a->strings['Never'] = 'Aldrig'; $a->strings["\x28Update was successful\x29"] = "\x28Uppdateringen lyckades\x29"; $a->strings["\x28Update was not successful\x29"] = "\x28Uppdateringen lyckades inte\x29"; @@ -124,8 +132,8 @@ $a->strings['Currently blocked'] = 'Spärrad'; $a->strings['Currently ignored'] = 'Ignoreras'; $a->strings['Show Blocked Connections'] = 'Visa spärrade kontakter'; $a->strings['Hide Blocked Connections'] = 'Dölj spärrade kontakter'; -$a->strings['Finding: '] = 'Finding: '; -$a->strings['Find'] = 'Find'; +$a->strings['Finding: '] = 'Hittar: '; +$a->strings['Find'] = 'Sök'; $a->strings['Visit '] = 'Besök '; $a->strings['\'s profile'] = 's profil'; $a->strings['Edit contact'] = 'Ändra kontakt'; @@ -142,40 +150,45 @@ $a->strings['No user record found for '] = 'No user record found for '; $a->strings['Our site encryption key is apparently messed up.'] = 'Det är nÃ¥got fel pÃ¥ webbplatsens krypteringsnyckel.'; $a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.'; $a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.'; -$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.'; +$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'Det ID som angavs av ditt system är samma som pÃ¥ vÃ¥rt system. Det borde fungera om du provar igen.'; $a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.'; $a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system'; -$a->strings["Connection accepted at "] = "Connection accepted at "; +$a->strings["Connection accepted at %s"] = "Anslutningen accepterades %s"; +$a->strings["Connection accepted at "] = "Anslutningen accepterades "; $a->strings['Administrator'] = 'Administratör'; $a->strings['noreply'] = 'noreply'; -$a->strings[' commented on an item at '] = ' skrev en kommentar pÃ¥ '; -$a->strings[" commented on an item at "] = " skrev en kommentar pÃ¥ "; +$a->strings["%s commented on an item at %s"] = "%s har kommenterat nÃ¥got %s"; +$a->strings[' commented on an item at '] = ' har kommenterat '; +$a->strings[" commented on an item at "] = " har kommenterat "; $a->strings[' welcomes '] = ' välkomnar '; -$a->strings["This introduction has already been accepted."] = "This introduction has already been accepted."; +$a->strings["This introduction has already been accepted."] = "Den här förfrÃ¥gan har redan accepterats."; $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profiladressen är ogiltig eller innehÃ¥ller ingen profilinformation.'; $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.'; -$a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.'; +$a->strings['Warning: profile location has no profile photo.'] = 'Varning: I den profilen finns ingen profilbild.'; +$a->strings["Introduction complete."] = "Presentationen är klar."; $a->strings[' required parameter'] = ' obligatoriskt fält'; -$a->strings[" was "] = " was "; -$a->strings["s were "] = "s were "; +$a->strings[" was "] = " var "; +$a->strings["s were "] = " var "; $a->strings["not found at the given location."] = "finns inte pÃ¥ platsen som angavs."; $a->strings["Introduction complete."] = "Presentationen klar."; -$a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.'; +$a->strings['Unrecoverable protocol error.'] = 'Irreparabelt protokollfel.'; $a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.'; -$a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.'; -$a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.'; +$a->strings['%s has received too many connection requests today.'] = '%s har tagit emot för mÃ¥nga förfrÃ¥gningar idag.'; +$a->strings[' has received too many connection requests today.'] = ' har tagit emot för mÃ¥nga förfrÃ¥gningar idag.'; +$a->strings['Spam protection measures have been invoked.'] = 'Ã…tgärder för skydd mot spam har aktiverats.'; $a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.'; $a->strings["Invalid locator"] = "Invalid locator"; $a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location."; $a->strings['You have already introduced yourself here.'] = 'Du har redan presenterat dig här.'; $a->strings['Apparently you are already friends with .'] = 'Du är tydligen redan vän med .'; $a->strings['Invalid profile URL.'] = 'Ogiltig profil-URL.'; -$a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.'; +$a->strings['Disallowed profile URL.'] = 'OtillÃ¥ten profil-URL.'; $a->strings['Your introduction has been sent.'] = 'Presentationen har skickats.'; -$a->strings["Please login to confirm introduction."] = "Please login to confirm introduction."; +$a->strings["Please login to confirm introduction."] = "Logga in för att acceptera förfrÃ¥gan."; $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile."; $a->strings['[Name Withheld]'] = '[Name Withheld]'; -$a->strings['Friend/Connection Request'] = 'Friend/Connection Request'; +$a->strings["Introduction received at "] = "Presentationen ankom "; +$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrÃ¥gan'; $a->strings['Please answer the following:'] = 'Besvara följande, tack:'; $a->strings['Does $name know you?'] = 'Känner $name dig?'; $a->strings['Yes'] = 'Ja'; @@ -189,12 +202,19 @@ $a->strings["Public \x28insecure\x29 network"] = "Offentligt \x28osäkert\x29 nà $a->strings['Your profile address:'] = 'Din profiladress:'; $a->strings['Submit Request'] = 'Skicka begäran'; $a->strings['Cancel'] = 'Avbryt'; -$a->strings['Global Directory'] = 'Global katalog'; +$a->strings["%d required parameter was not found at the given location"] = array( + 0 => "%d required parameter was not found at the given location", + 1 => "%d required parameters were not found at the given location", +); +$a->strings['Global Directory'] = 'Global medlemskatalog'; $a->strings['Item not found.'] = 'Hittades inte.'; $a->strings['Private Message'] = 'Personligt meddelande'; $a->strings["I like this \x28toggle\x29"] = "Jag gillar detta \x28toggle\x29"; $a->strings["I don't like this \x28toggle\x29"] = "Jag ogillar detta \x28toggle\x29"; +$a->strings['Share'] = 'Dela med dig'; +$a->strings['Please wait'] = 'Vänta'; $a->strings['This is you'] = 'Det här är du'; +$a->strings['Edit'] = 'Ändra'; $a->strings['Delete'] = 'Ta bort'; $a->strings['View $name\'s profile'] = 'Visa $name s profil'; $a->strings['View $owner_name\'s profile'] = 'Visa $owner_name s profil'; @@ -203,6 +223,16 @@ $a->strings['Wall-to-Wall'] = 'Logg-till-logg'; $a->strings['via Wall-To-Wall:'] = 'via Logg-till-logg:'; $a->strings['Item has been removed.'] = 'Har tagits bort.'; $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'InnehÃ¥llet omfattas av licensen <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a>.'; +$a->strings['Item not found'] = 'Hittades inte'; +$a->strings['Edit post'] = 'Ändra inlägg'; +$a->strings['Upload photo'] = 'Ladda upp foto'; +$a->strings['Insert web link'] = 'Infoga länk'; +$a->strings['Insert YouTube video'] = 'Infoga video frÃ¥n YouTube'; +$a->strings['Insert Vorbis [.ogg] video'] = 'Lägg in video i format Vorbis [.ogg]'; +$a->strings['Insert Vorbis [.ogg] audio'] = 'Lägg in ljud i format Vorbis [.ogg]'; +$a->strings['Set your location'] = 'Ange plats'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Inställning av rättigheter'; $a->strings['CC: email addresses'] = 'CC: e-postadresser'; $a->strings['Example: bob@example.com, mary@example.com'] = 'Exempel: adam@exempel.com, bertil@exempel.com'; $a->strings['The profile address specified does not provide adequate information.'] = 'Angiven profiladress ger inte tillräcklig information.'; @@ -216,6 +246,7 @@ $a->strings['Group name changed.'] = 'Gruppens namn har ändrats.'; $a->strings['Membership list updated.'] = 'Medlemslistan har uppdaterats.'; $a->strings['Group removed.'] = 'Gruppen har tagits bort.'; $a->strings['Unable to remove group.'] = 'Gruppen kunde inte tas bort.'; +$a->strings["Welcome to %s"] = "Välkommen till %s"; $a->strings["Welcome to "] = "Välkommen till "; $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.'; @@ -225,7 +256,7 @@ $a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".'; $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['Submit'] = 'Skicka'; +$a->strings['Submit'] = 'Spara'; $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; @@ -243,7 +274,8 @@ $a->strings['Please check with your site documentation or support people to see $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'; $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.'] = '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.'; $a->strings['Errors encountered creating database tables.'] = 'Fel vid skapandet av databastabeller.'; -$a->strings[' : '] = ' : '; +$a->strings['%s : Not a valid email address.'] = '%s : Ogiltig e-postadress.'; +$a->strings['%s : Message delivery failed.'] = '%s : Meddelandet kom inte fram.'; $a->strings['Not a valid email address.'] = 'Ogiltig e-postadress.'; $a->strings['Please join my network on '] = 'GÃ¥ med i mitt nätverk pÃ¥ '; $a->strings['Message delivery failed.'] = 'Meddelandet kom inte fram.'; @@ -251,50 +283,76 @@ $a->strings[' messages sent.'] = ' meddelanden har skickats.'; $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Ange e-postadresser, en per rad:'; $a->strings['Please join my social network on '] = 'GÃ¥ med i mitt sociala nätverk pÃ¥ '; +$a->strings['Your message:'] = 'Ditt meddelande:'; $a->strings['To accept this invitation, please visit:'] = 'GÃ¥ hit för att tacka ja till inbjudan:'; $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; +$a->strings["%d message sent."] = array( + 0 => "%d meddelande skickat.", + 1 => "%d meddelanden skickade.", +); $a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; -$a->strings['Empty post discarded.'] = 'Empty post discarded.'; -$a->strings[" commented on your item at "] = " commented on your item at "; -$a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; -$a->strings['System error. Post not saved.'] = 'Systemfel. Inlägget sparades inte.'; -$a->strings['This message was sent to you by '] = 'Du har fÃ¥tt det här meddelandet av '; -$a->strings[', a member of the Friendika social network.'] = ', medlem i det sociala nätverket Friendika.'; +$a->strings['Empty post discarded.'] = 'Tomt inlägg. Inte sparat.'; +$a->strings['Wall Photos'] = 'Loggfoton'; +$a->strings["%s commented on your item at %s"] = "%s har kommenterat nÃ¥got %s"; +$a->strings["Administrator"] = "Administratör"; +$a->strings["%s posted on your profile wall at %s"] = "%s har gjort ett inlägg pÃ¥ din logg %s"; +$a->strings['System error. Post not saved.'] = 'NÃ¥got gick fel. Inlägget sparades inte.'; $a->strings['You may visit them online at'] = 'Besök online pÃ¥'; $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Kontakta avsändaren genom att svara pÃ¥ det här meddelandet om du inte vill ha sÃ¥dana här meddelanden.'; -$a->strings['posted an update.'] = 'gjorde en uppdatering.'; +$a->strings['%s posted an update.'] = '%s har uppdaterat nÃ¥got.'; $a->strings['photo'] = 'foto'; $a->strings['status'] = 'status'; -$a->strings['likes'] = 'gillar'; -$a->strings['doesn\'t like'] = 'ogillar'; -$a->strings['\'s'] = 's'; +$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s gillar %2$s\'s %3$s'; +$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s ogillar %2$s\'s %3$s'; $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; $a->strings['Visible to:'] = 'Synlig för:'; -$a->strings['Password reset requested at '] = 'LösenordsÃ¥terställning begärd kl '; +$a->strings["Welcome back %s"] = "Välkommen tillbaka, %s"; +$a->strings['Password reset requested at '] = 'LösenordsÃ¥terställning begärd '; $a->strings["Welcome back "] = "Välkommen tillbaka "; -$a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages'; +$a->strings['Manage Identities and/or Pages'] = 'Ändra identiteter eller sidor'; $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; -$a->strings['Select an identity to manage: '] = 'Select an identity to manage: '; +$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill ändra: '; +$a->strings['No recipient selected.'] = 'Ingen mottagare har valts.'; +$a->strings['[no subject]'] = '[no subject]'; +$a->strings['Unable to locate contact information.'] = 'Det gick inte att hitta kontaktuppgifterna.'; +$a->strings['Message sent.'] = 'Meddelandet har skickats.'; +$a->strings['Message could not be sent.'] = 'Det gick inte att skicka meddelandet.'; +$a->strings['Messages'] = 'Meddelanden'; +$a->strings['Inbox'] = 'Inkorg'; +$a->strings['Outbox'] = 'Utkorg'; +$a->strings['New Message'] = 'Nytt meddelande'; +$a->strings['Message deleted.'] = 'Meddelandet togs bort.'; +$a->strings['Conversation removed.'] = 'Konversationen togs bort.'; +$a->strings['Please enter a link URL:'] = 'Ange en länk (URL):'; +$a->strings['Send Private Message'] = 'Skicka ett personligt meddelande'; +$a->strings['To:'] = 'Till:'; +$a->strings['Subject:'] = 'Ämne:'; +$a->strings['No messages.'] = 'Inga meddelanden.'; +$a->strings['Delete conversation'] = 'Ta bort konversation'; +$a->strings['Message not available.'] = 'Meddelandet är inte tillgängligt.'; +$a->strings['Delete message'] = 'Ta bort meddelande'; +$a->strings['Send Reply'] = 'Skicka svar'; $a->strings['Normal View'] = 'Normal vy'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['Share'] = 'Dela'; +$a->strings['Share'] = 'Dela med dig'; $a->strings['Insert YouTube video'] = 'Infoga klipp frÃ¥n YouTube'; -$a->strings['Set your location'] = 'Ange plats'; -$a->strings['Clear browser location'] = 'Clear browser location'; -$a->strings['Permission settings'] = 'Permission settings'; +$a->strings['Please enter a YouTube link:'] = 'Ange en YouTube-länk:'; +$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; +$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; +$a->strings['Where are you right now?'] = 'Var är du just nu?'; $a->strings['No such group'] = 'Gruppen finns inte'; $a->strings['Group is empty'] = 'Gruppen är tom'; $a->strings['Group: '] = 'Grupp: '; -$a->strings['View in context'] = 'Se i sitt sammanhang'; +$a->strings['View in context'] = 'Visa i sitt sammanhang'; $a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; $a->strings['Discard'] = 'Kasta bort'; $a->strings['Ignore'] = 'Ignorera'; -$a->strings['Show Ignored Requests'] = 'Show Ignored Requests'; -$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests'; -$a->strings['Claims to be known to you: '] = 'Claims to be known to you: '; +$a->strings['Show Ignored Requests'] = 'Visa förfrÃ¥gningar du ignorerat'; +$a->strings['Hide Ignored Requests'] = 'Dölj förfrÃ¥gningar du ignorerat'; +$a->strings['Claims to be known to you: '] = 'Hävdar att du vet vem han/hon är: '; $a->strings['yes'] = 'ja'; $a->strings['no'] = 'nej'; -$a->strings['Approve as: '] = 'Approve as: '; +$a->strings['Approve as: '] = 'Godkänn som: '; $a->strings['Friend'] = 'Vän'; $a->strings['Fan/Admirer'] = 'Fan/Beundrare'; $a->strings['Notification type: '] = 'Notification type: '; @@ -304,6 +362,7 @@ $a->strings['Approve'] = 'Godkänn'; $a->strings['No notifications.'] = 'Inga aviseringar.'; $a->strings['No registrations.'] = 'Inga registreringar.'; $a->strings['Login failed.'] = 'Inloggningen misslyckades.'; +$a->strings["Welcome back "] = "Välkommen tillbaka, "; $a->strings['Photo Albums'] = 'Fotoalbum'; $a->strings['Contact Photos'] = 'Contact Photos'; $a->strings['Contact information unavailable'] = 'Kontaktinformationen är inte tillgänglig'; @@ -311,7 +370,7 @@ $a->strings['Profile Photos'] = 'Profilbilder'; $a->strings['Album not found.'] = 'Albumet finns inte.'; $a->strings['Delete Album'] = 'Ta bort album'; $a->strings['Delete Photo'] = 'Ta bort foto'; -$a->strings['was tagged in a'] = 'was tagged in a'; +$a->strings['was tagged in a'] = 'har taggats i'; $a->strings['by'] = 'av'; $a->strings['Image exceeds size limit of '] = 'Bilden överskrider den tillÃ¥tna storleken '; $a->strings['Unable to process image.'] = 'Bilden kunde inte bahandlas.'; @@ -320,18 +379,20 @@ $a->strings['No photos selected'] = 'Inga foton har valts'; $a->strings['Upload Photos'] = 'Ladda upp foton'; $a->strings['New album name: '] = 'Nytt album med namn: '; $a->strings['or existing album name: '] = 'eller befintligt album med namn: '; -$a->strings['Permissions'] = 'Permissions'; +$a->strings['Permissions'] = 'Ã…tkomst'; $a->strings['Edit Album'] = 'Redigera album'; $a->strings['View Photo'] = 'Visa foto'; $a->strings['Photo not available'] = 'Fotot är inte tillgängligt'; -$a->strings['Edit photo'] = 'Redigera foto'; +$a->strings['Edit photo'] = 'Ändra foto'; +$a->strings['<< Prev'] = '<< Föreg'; $a->strings['View Full Size'] = 'Visa fullstor'; +$a->strings['Next >>'] = 'Nästa >>'; $a->strings['Tags: '] = 'Taggar: '; $a->strings['[Remove any tag]'] = '[Remove any tag]'; -$a->strings['New album name'] = 'New album name'; +$a->strings['New album name'] = 'Nytt album med namn'; $a->strings['Caption'] = 'Caption'; $a->strings['Add a Tag'] = 'Lägg till tagg'; -$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'; +$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping'; $a->strings['Recent Photos'] = 'Nyligen tillagda foton'; $a->strings['Upload New Photos'] = 'Ladda upp foton'; $a->strings['View Album'] = 'Titta i album'; @@ -342,7 +403,7 @@ $a->strings['Image size reduction [48] failed.'] = 'Fel när bildstorlek skulle $a->strings['Unable to process image'] = 'Det gick inte att behandla bilden'; $a->strings['Image uploaded successfully.'] = 'Bilden har laddats upp.'; $a->strings['Image size reduction [640] failed.'] = 'Fel när bildstorlek skulle minskas [640].'; -$a->strings['Profile Name is required.'] = 'Profile Name is required.'; +$a->strings['Profile Name is required.'] = 'Profilen mÃ¥ste ha ett namn.'; $a->strings['Profile updated.'] = 'Profilen har uppdaterats.'; $a->strings['Profile deleted.'] = 'Profilen har tagits bort.'; $a->strings['Profile-'] = 'Profil-'; @@ -351,7 +412,7 @@ $a->strings['Profile unavailable to clone.'] = 'Det gick inte att klona profilen $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'Det här är din <strong>offentliga</strong> profil.<br />Den <strong>kan</strong> vara synlig för vem som helst pÃ¥ internet.'; $a->strings['Age: '] = 'Ã…lder: '; $a->strings['Profile Image'] = 'Profilbild'; -$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-url'; +$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL'; $a->strings['Please enter the required information.'] = 'Fyll i alla obligatoriska fält.'; $a->strings['Please use a shorter name.'] = 'Välj ett kortare namn.'; $a->strings['Name too short.'] = 'Namnet är för kort.'; @@ -362,15 +423,15 @@ $a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and mu $a->strings['Nickname is already registered. Please choose another.'] = 'Användarnamnet är upptaget. Välj ett annat.'; $a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.'; $a->strings['An error occurred during registration. Please try again.'] = 'NÃ¥got gick fel vid registreringen. Försök igen.'; -$a->strings['An error occurred creating your default profile. Please try again.'] = 'An error occurred creating your default profile. Please try again.'; -$a->strings['Registration details for '] = 'Registration details for '; +$a->strings['An error occurred creating your default profile. Please try again.'] = 'Det blev fel när din huvudsakliga profil (default) skulle skapas. Prova igen.'; +$a->strings['Registration details for '] = 'Detaljer i registreringen av '; $a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrering klar. Kolla din e-post för vidare instruktioner.'; $a->strings['Failed to send email message. Here is the message that failed.'] = 'Det gick inte att skicka e-brevet. Här är meddelandet som inte kunde skickas.'; $a->strings['Your registration can not be processed.'] = 'Det gÃ¥r inte att behandla registreringen.'; $a->strings['Registration request at '] = 'Registration request at '; $a->strings['Your registration is pending approval by the site owner.'] = 'Din registrering inväntar godkännande av webbplatsens ägare.'; -$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; -$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte känner till OpenID kan du lämna det fältet tomt och fylla i resten.'; +$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Om du vill kan du fylla i detta formulär via OpenID genom att ange ditt OpenID och klicka pÃ¥ 'Registrera'."; +$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte vet vad OpenID är kan du lämna det fältet tomt och fylla i resten.'; $a->strings["Your OpenID \x28optional\x29: "] = "Ditt OpenID \x28krävs ej\x29: "; $a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Medlemmarna i det här nätverket föredrar att kommunicera med riktiga människor som använder sina riktiga namn.'; $a->strings['Include your profile in member directory?'] = 'Inkludera din profil i medlemskatalogen?'; @@ -381,7 +442,7 @@ $a->strings['Choose a profile nickname. This must begin with a text character. Y $a->strings['Choose a nickname: '] = 'Välj ett användarnamn: '; $a->strings['Please login.'] = 'Logga in.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; -$a->strings['Account approved.'] = 'Account approved.'; +$a->strings['Account approved.'] = 'Kontot har godkänts.'; $a->strings['Remove My Account'] = 'Ta bort mitt konto'; $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Detta kommer att ta bort kontot helt och hÃ¥llet. Efter att det är gjort gÃ¥r det inte att Ã¥terställa.'; $a->strings['Please enter your password for verification:'] = 'Ange lösenordet igen för jämförelse:'; @@ -394,16 +455,16 @@ $a->strings[' Name too short.'] = ' Namnet är för kort.'; $a->strings[' Not valid email.'] = ' Ogiltig e-postadress.'; $a->strings[' Cannot change to that email.'] = ' Ändring till den e-postadressen görs inte.'; $a->strings['Settings updated.'] = 'Inställningarna har uppdaterats.'; -$a->strings['Plugin Settings'] = 'Plugin Settings'; +$a->strings['Plugin Settings'] = 'Inställningar för insticksprogram \x28plugins\x29'; $a->strings['Account Settings'] = 'Kontoinställningar'; $a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; $a->strings['OpenID: '] = 'OpenID: '; -$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; +$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Valfritt\x29 TillÃ¥t inloggning med detta OpenID pÃ¥ det här kontot."; $a->strings['Profile is <strong>not published</strong>.'] = 'Profilen är <strong>inte publicerad</strong>.'; $a->strings['Default Post Permissions'] = 'Default Post Permissions'; $a->strings['Tag removed'] = 'Taggen har tagits bort'; -$a->strings['Remove Item Tag'] = 'Remove Item Tag'; -$a->strings['Select a tag to remove: '] = 'Välj tagg som ska tas bort: '; +$a->strings['Remove Item Tag'] = 'Ta bort tagg'; +$a->strings['Select a tag to remove: '] = 'Välj vilken tagg som ska tas bort: '; $a->strings['Remove'] = 'Ta bort'; $a->strings['No contacts.'] = 'Inga kontakter.'; $a->strings['Visible To:'] = 'Synlig för:'; @@ -439,12 +500,13 @@ $a->strings['minutes'] = 'minuter'; $a->strings['second'] = 'sekund'; $a->strings['seconds'] = 'sekunder'; $a->strings[' ago'] = ' sedan'; +$a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\''; $a->strings['Create a new group'] = 'Skapa ny grupp'; $a->strings['Everybody'] = 'Alla'; $a->strings['Birthday:'] = 'Födelsedatum:'; $a->strings['Home'] = 'Hem'; $a->strings['Apps'] = 'Apps'; -$a->strings['Directory'] = 'Katalog'; +$a->strings['Directory'] = 'Medlemskatalog'; $a->strings['Network'] = 'Nätverk'; $a->strings['Notifications'] = 'Aviseringar'; $a->strings['Manage'] = 'Hantera'; @@ -464,9 +526,9 @@ $a->strings['Hermaphrodite'] = 'Hermafrodit'; $a->strings['Neuter'] = 'Neuter'; $a->strings['Non-specific'] = 'Non-specific'; $a->strings['Other'] = 'Annat'; -$a->strings['Undecided'] = 'Undecided'; -$a->strings['Males'] = 'Males'; -$a->strings['Females'] = 'Females'; +$a->strings['Undecided'] = 'Obestämt'; +$a->strings['Males'] = 'Män'; +$a->strings['Females'] = 'Kvinnor'; $a->strings['Gay'] = 'Bög'; $a->strings['Lesbian'] = 'Lesbisk'; $a->strings['No Preference'] = 'No Preference'; @@ -477,7 +539,7 @@ $a->strings['Virgin'] = 'Oskuld'; $a->strings['Deviant'] = 'Avvikande'; $a->strings['Fetish'] = 'Fetish'; $a->strings['Oodles'] = 'Oodles'; -$a->strings['Nonsexual'] = 'Nonsexual'; +$a->strings['Nonsexual'] = 'Asexuell'; $a->strings['Single'] = 'Singel'; $a->strings['Lonely'] = 'Ensam'; $a->strings['Available'] = 'Tillgänglig'; @@ -492,29 +554,30 @@ $a->strings['Engaged'] = 'Förlovad'; $a->strings['Married'] = 'Gift'; $a->strings['Partners'] = 'I partnerskap'; $a->strings['Cohabiting'] = 'Cohabiting'; -$a->strings['Happy'] = 'Glad'; +$a->strings['Happy'] = 'Nöjd'; $a->strings['Not Looking'] = 'Letar inte'; $a->strings['Swinger'] = 'Swinger'; $a->strings['Betrayed'] = 'Bedragen'; $a->strings['Separated'] = 'Separerat'; -$a->strings['Unstable'] = 'Unstable'; +$a->strings['Unstable'] = 'Instabilt'; $a->strings['Divorced'] = 'Skiljd'; -$a->strings['Widowed'] = 'Widowed'; -$a->strings['Uncertain'] = 'Uncertain'; +$a->strings['Widowed'] = 'Änka/änkling'; +$a->strings['Uncertain'] = 'Oklart'; $a->strings['Complicated'] = 'Komplicerat'; -$a->strings['Don\'t care'] = 'Don\'t care'; +$a->strings['Don\'t care'] = 'Bryr mig inte'; $a->strings['Ask me'] = 'FrÃ¥ga mig'; $a->strings['Facebook disabled'] = 'Facebook disabled'; $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; $a->strings['Facebook Connect'] = 'Facebook Connect'; $a->strings['Install Facebook post connector'] = 'Install Facebook post connector'; $a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector'; +$a->strings['Post to Facebook by default'] = 'Lägg alltid in pÃ¥ Facebook'; $a->strings['Facebook'] = 'Facebook'; $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings'; -$a->strings['Post to Facebook'] = 'Post to Facebook'; +$a->strings['Post to Facebook'] = 'Lägg in pÃ¥ Facebook'; $a->strings['Image: '] = 'Bild: '; $a->strings['Select files to upload: '] = 'Välj filer att ladda upp: '; -$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.'; +$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Använd följande bara om javauppladdaren ovanför inte startar.'; $a->strings['Upload a file'] = 'Ladda upp fil'; $a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit'; $a->strings['Failed'] = 'Misslyckades'; @@ -525,36 +588,36 @@ $a->strings['File has an invalid extension, it should be one of '] = 'OtillÃ¥ten $a->strings['Upload was cancelled, or server error encountered'] = 'Serverfel eller avbruten uppladdning'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; -$a->strings['Post to StatusNet'] = 'Post to StatusNet'; +$a->strings['Post to StatusNet'] = 'Lägg in pÃ¥ StatusNet'; $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; $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['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"; $a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'; -$a->strings['Log in with StatusNet'] = 'Log in with StatusNet'; +$a->strings['Log in with StatusNet'] = 'Logga in med StatusNet'; $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; -$a->strings['Currently connected to: '] = 'Currently connected to: '; +$a->strings['Currently connected to: '] = 'Ansluten till: '; $a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'; $a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; $a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tredimensionellt luffarschack'; $a->strings['3D Tic-Tac-Toe'] = '3D-luffarschack'; -$a->strings['New game'] = 'New game'; -$a->strings['New game with handicap'] = 'New game with handicap'; -$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '; -$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'; -$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'; -$a->strings['You go first...'] = 'You go first...'; -$a->strings['I\'m going first this time...'] = 'I\'m going first this time...'; -$a->strings['You won!'] = 'You won!'; +$a->strings['New game'] = 'Ny spelomgÃ¥ng'; +$a->strings['New game with handicap'] = 'Ny spelomgÃ¥ng med handikapp'; +$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Det tredimensionella luffarschacket är precis som vanligt luffarschack förutom att det spelas i flera nivÃ¥er samtidigt. '; +$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Här är det tre nivÃ¥er. Man vinner om man fÃ¥r tre i rad pÃ¥ vilken nivÃ¥ som helst, eller uppÃ¥t, nedÃ¥t eller diagonalt pÃ¥ flera nivÃ¥er.'; +$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Om man spelar med handikapp sÃ¥ stängs mittenpositionen pÃ¥ mittennivÃ¥n av eftersom spelare som väljer den positionen ofta fÃ¥r övertaget.'; +$a->strings['You go first...'] = 'Du börjar...'; +$a->strings['I\'m going first this time...'] = 'Jag börjar den här gÃ¥ngen...'; +$a->strings['You won!'] = 'Du vann!'; $a->strings['"Cat" game!'] = '"Cat" game!'; -$a->strings['I won!'] = 'I won!'; -$a->strings['Post to Twitter'] = 'Post to Twitter'; +$a->strings['I won!'] = 'Jag vann!'; +$a->strings['Post to Twitter'] = 'Lägg in pÃ¥ Twitter'; $a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; $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['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here'; +$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'; $a->strings['Africa/Abidjan'] = 'Afrika/Abidjan'; @@ -1045,7 +1108,7 @@ $a->strings['Israel'] = 'Israel'; $a->strings['Jamaica'] = 'Jamaica'; $a->strings['Japan'] = 'Japan'; $a->strings['Kwajalein'] = 'Kwajalein'; -$a->strings['Libya'] = 'Libya'; +$a->strings['Libya'] = 'Libyen'; $a->strings['MET'] = 'MET'; $a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; $a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; @@ -1095,7 +1158,7 @@ $a->strings['Pacific/Truk'] = 'Pacific/Truk'; $a->strings['Pacific/Wake'] = 'Pacific/Wake'; $a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; $a->strings['Pacific/Yap'] = 'Pacific/Yap'; -$a->strings['Poland'] = 'Poland'; +$a->strings['Poland'] = 'Polen'; $a->strings['Portugal'] = 'Portugal'; $a->strings['PRC'] = 'PRC'; $a->strings['PST8PDT'] = 'PST8PDT'; diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl index c296de785..fc450a06d 100644 --- a/view/sv/wall_received_eml.tpl +++ b/view/sv/wall_received_eml.tpl @@ -1,18 +1,16 @@ +$username, -Dear $username, - - '$from' posted something to your profile wall. +'$from' har skrivit pÃ¥ din profilsida. ----- $body ----- -Please login at $siteurl to view or delete the item: +Logga in pÃ¥ $siteurl för att kolla eller ta bort: $display -Thank you, - $sitename administrator +Hälsningar, +$sitename admin - diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 4f6d6c196..7ab85344d 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -16,7 +16,7 @@ body { } -a, a:visited { color: #3465a4; text-decoration: none; } +a, a:visited, a:link { color: #3465a4; text-decoration: none; } a:hover {text-decoration: underline; } input { @@ -218,7 +218,7 @@ div.wall-item-content-wrapper.shiny { cursor: pointer; } -.fakelink, .fakelink:visited { +.fakelink, .fakelink:visited, .fakelink:link { color: #3465a4; text-decoration: none; cursor: pointer; @@ -372,6 +372,7 @@ input#dfrn-url { } #settings-nick-wrapper { + margin-top: 20px; margin-bottom: 30px; } @@ -1843,7 +1844,7 @@ a.mail-list-link { margin-bottom: 15px; } -#photos-upload-perms-menu, #photos-upload-perms-menu:visited { +#photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; text-decoration: none; cursor: pointer; @@ -2044,8 +2045,8 @@ a.mail-list-link { } -#plugin-settings-link, #account-settings-link { - margin-bottom: 25px; +#plugin-settings-link, #account-settings-link, #uexport-link { + margin-bottom: 10px; } /* end from defautlt */ @@ -2162,6 +2163,13 @@ a.mail-list-link { clear: both; } +.profile-match-wrapper { + float: left; + padding: 10px; +} +#profile-match-wrapper-end { + clear: both; +} .side-link { margin-bottom: 15px; } diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 49c83c83c..4d2ca6d63 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -505,7 +505,7 @@ input#dfrn-url { } #settings-nick-wrapper { - margin-bottom: 30px; + margin-bottom: 15px; } #settings-expire-end { @@ -608,7 +608,7 @@ input#dfrn-url { } #settings-nick { - margin-bottom: 50px; + margin-bottom: 30px; } #cropimage-wrapper, #cropimage-preview-wrapper { @@ -2079,8 +2079,8 @@ a.mail-list-link { } -#plugin-settings-link, #account-settings-link { - margin-bottom: 25px; +#plugin-settings-link, #account-settings-link, #uexport-link { + margin-bottom: 10px; } @@ -2188,6 +2188,14 @@ a.mail-list-link { clear: both; } +.profile-match-wrapper { + float: left; + padding: 10px; +} +#profile-match-wrapper-end { + clear: both; +} + .side-link { margin-bottom: 15px; } |