From 3d866e89757b8aafe58489f9575f6895029090d1 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jul 2023 19:55:08 +0000 Subject: update date --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 44eac8349..2c721afe4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Hubzilla 8.6 (2023-07-??) +Hubzilla 8.6 (2023-07-11) - Update fullcalendar library - Improve and unify selection of deliverable abook xchans - Remove unused pseudo_abook() -- cgit v1.2.3 From b0b0973e2dce0f430639aaf73b0fc538e1df44ab Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 2 Jul 2023 19:12:09 +0200 Subject: unit tests: Cosmetic fixes in AntiXSSTest.php - Start comments with capital letter - Fix indentation - Add missing doc comments --- tests/unit/AntiXSSTest.php | 54 +++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/unit/AntiXSSTest.php b/tests/unit/AntiXSSTest.php index 09642726f..f4ee984bc 100644 --- a/tests/unit/AntiXSSTest.php +++ b/tests/unit/AntiXSSTest.php @@ -1,6 +1,6 @@ '; @@ -24,28 +24,30 @@ class AntiXSSTest extends TestCase { $this->assertEquals("<submit type="button" onclick="alert('failed!');" />", $escapedString); } - /** - * @dataProvider urlTestProvider - */ - public function testEscapeURL($url, $expected) : void { - $this->assertEquals($expected, escape_url($url)); - } - - public function urlTestProvider() : array { - return [ - [ - "https://example.com/settings/calendar/?f=&rpath=https://example.com/cdav/calendar'>", - "https://example.com/settings/calendar/?f=&rpath=https://example.com/cdav/calendar'><script>alert('boom')</script>" - ], - [ - "settings/calendar/?f=&rpath=https://example.com'+accesskey=x+onclick=alert(/boom/);a='", - "settings/calendar/?f=&rpath=https://example.com'+accesskey=x+onclick=alert(/boom/);a='" - ], - ]; - } + /** + * Test escaping URL's to make them safe for use in html and attributes. + * + * @dataProvider urlTestProvider + */ + public function testEscapeURL($url, $expected) : void { + $this->assertEquals($expected, escape_url($url)); + } + + public function urlTestProvider() : array { + return [ + [ + "https://example.com/settings/calendar/?f=&rpath=https://example.com/cdav/calendar'>", + "https://example.com/settings/calendar/?f=&rpath=https://example.com/cdav/calendar'><script>alert('boom')</script>" + ], + [ + "settings/calendar/?f=&rpath=https://example.com'+accesskey=x+onclick=alert(/boom/);a='", + "settings/calendar/?f=&rpath=https://example.com'+accesskey=x+onclick=alert(/boom/);a='" + ], + ]; + } /** - *xmlify and unxmlify + * Test xmlify and unxmlify */ public function testXmlify() { $text="I want to break\n this!11!"; @@ -56,7 +58,7 @@ class AntiXSSTest extends TestCase { } /** - * xmlify and put in a document + * Test xmlify and put in a document */ public function testXmlifyDocument() { $tag="I want to break"; @@ -65,7 +67,9 @@ class AntiXSSTest extends TestCase { $xml_parser=xml_parser_create(); //should be possible to parse it - $values=array(); $index=array(); + $values=array(); + $index=array(); + $this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); $this->assertEquals(array('TEXT'=>array(0)), @@ -77,7 +81,7 @@ class AntiXSSTest extends TestCase { } /** - * test hex2bin and reverse + * Test hex2bin and reverse */ public function testHex2Bin() { $this->assertEquals(-3, hex2bin(bin2hex(-3))); -- cgit v1.2.3 From 7bd2de996750830aca191853345e0b798d68f16a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 2 Jul 2023 19:33:23 +0200 Subject: unit-tests: There's no need to test builtin func hex2bin --- tests/unit/AntiXSSTest.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/unit/AntiXSSTest.php b/tests/unit/AntiXSSTest.php index f4ee984bc..6b24cc9e3 100644 --- a/tests/unit/AntiXSSTest.php +++ b/tests/unit/AntiXSSTest.php @@ -80,16 +80,6 @@ class AntiXSSTest extends TestCase { xml_parser_free($xml_parser); } - /** - * Test hex2bin and reverse - */ - public function testHex2Bin() { - $this->assertEquals(-3, hex2bin(bin2hex(-3))); - $this->assertEquals(0, hex2bin(bin2hex(0))); - $this->assertEquals(12, hex2bin(bin2hex(12))); - $this->assertEquals(PHP_INT_MAX, hex2bin(bin2hex(PHP_INT_MAX))); - } - //function qp, quick and dirty?? //get_mentions //get_contact_block, bis Zeile 538 -- cgit v1.2.3 From 6f13cabfba7fb3b64ccc9647f1c58ad4a8ec5286 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 5 Jul 2023 20:44:49 +0200 Subject: tests: Don't explicitly require CUT in AntiXSSTest. Rely on PHPUnit config to load the app and the code under test. --- tests/unit/AntiXSSTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/unit/AntiXSSTest.php b/tests/unit/AntiXSSTest.php index 6b24cc9e3..1de9d54cd 100644 --- a/tests/unit/AntiXSSTest.php +++ b/tests/unit/AntiXSSTest.php @@ -7,8 +7,6 @@ use PHPUnit\Framework\TestCase; -require_once('include/text.php'); - class AntiXSSTest extends TestCase { /** -- cgit v1.2.3 From 9beceb9b020363f1d85a69177c1cb1a484a6cec5 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 5 Jul 2023 20:46:40 +0200 Subject: tests: Cleanup Autoname test. Not sure if this test is actually useful, but leave it for now. --- tests/unit/AutonameTest.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/unit/AutonameTest.php b/tests/unit/AutonameTest.php index 566fe6149..b79a600c5 100644 --- a/tests/unit/AutonameTest.php +++ b/tests/unit/AutonameTest.php @@ -1,24 +1,21 @@ Date: Wed, 5 Jul 2023 20:47:45 +0200 Subject: tests: Cleanup ContainsAttribute test. Mostly cosmetic to satisfy phpcs + remove explicit require. --- tests/unit/ContainsAttributeTest.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/unit/ContainsAttributeTest.php b/tests/unit/ContainsAttributeTest.php index 0930d9837..db9618826 100644 --- a/tests/unit/ContainsAttributeTest.php +++ b/tests/unit/ContainsAttributeTest.php @@ -1,24 +1,21 @@ assertFalse(attribute_contains($testAttr, "class2")); } -} \ No newline at end of file +} -- cgit v1.2.3 From e80d3653c9e2aac2b114eb1c77b1e717dc90efb9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 5 Jul 2023 20:48:39 +0200 Subject: test: Enable and cleanup GetTagsTest. These tests actually tests both the get_tags() function, and the handle_tags() function. The latter don't work, and should probably be split into it's own test cases. There's also some stubs here that we may want to deal with in another way. Also removed meaningless "test" of intval() builtin function. It behaves as documented, no need for us to test it. --- tests/unit/GetTagsTest.php | 281 ++++++++++++++++++++++++++++++++++++++ tests/unit/get_tags_test.php | 317 ------------------------------------------- 2 files changed, 281 insertions(+), 317 deletions(-) create mode 100644 tests/unit/GetTagsTest.php delete mode 100644 tests/unit/get_tags_test.php diff --git a/tests/unit/GetTagsTest.php b/tests/unit/GetTagsTest.php new file mode 100644 index 000000000..418d32c47 --- /dev/null +++ b/tests/unit/GetTagsTest.php @@ -0,0 +1,281 @@ +15, + 'attag'=>'', 'network'=>'dfrn', + 'name'=>'Mike Lastname', 'alias'=>'Mike', + 'nick'=>'Mike', 'url'=>"http://justatest.de")); + + $args=func_get_args(); + + //last parameter is always (in this test) uid, so, it should be 11 + if($args[count($args)-1]!=11) { + return; + } + + + if(3==count($args)) { + //first call in handle_body, id only + if($result[0]['id']==$args[1]) { + return $result; + } + //second call in handle_body, name + if($result[0]['name']===$args[1]) { + return $result; + } + } + //third call in handle_body, nick or attag + if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) { + return $result; + } +} + +/** + * Replacement for dbesc. + * I don't want to test dbesc here, so + * I just return the input. It won't be a problem, because + * the test does not use a real database. + * + * DON'T USE HAT FUNCTION OUTSIDE A TEST! + * + * @param string $str + * + * @return input + */ +function dbesc($str) { + return $str; +} + +/** + * TestCase for tag handling. + * + * @author alexander + * @package test.util + */ +class GetTagsTest extends Zotlabs\Tests\Unit\UnitTestCase { + /** + * The mock to use as app + */ + private $a; + + /** + * Initialize the test. That's a phpUnit function, + * don't change its name. + */ + public function setUp() : void { + $this->a = new MockApp(); + } + + /** + * Test with one Person tag + */ + public function testGetTagsShortPerson() { + $text="hi @Mike"; + + $tags=get_tags($text); + + $str_tags=''; + foreach($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } + + //correct tags found? + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + + //correct output from handle_tag? + //$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); + //$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); + } + + /** + * Test with one Person tag. + * There's a minor spelling mistake... + */ + public function testGetTagsShortPersonSpelling() { + $text="hi @Mike.because"; + + $tags=get_tags($text); + + //correct tags found? + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@Mike.because", $tags)); + + $str_tags=''; + handle_tag($text, $str_tags, 11, $tags[0]); + + // (mike) - This is a tricky case. + // we support mentions as in @mike@example.com - which contains a period. + // This shouldn't match anything unless you have a contact named "Mike.because". + // We may need another test for "@Mike. because" - which should return the contact + // as we ignore trailing periods in tags. + +// $this->assertEquals("cid:15", $inform); +// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); +// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); + + $this->assertEquals("", $str_tags); + + } + + /** + * Test with one hash tag. + */ + public function testGetTagsShortTag() { + $text="This is a #test_case"; + + $tags=get_tags($text); + + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("#test_case", $tags)); + } + + /** + * Test with a person and a hash tag + */ + public function testGetTagsShortTagAndPerson() { + $text="hi @Mike This is a #test_case"; + + $tags=get_tags($text); + + $this->assertEquals(2, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_case", $tags)); + + $str_tags=''; + foreach($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } + + //$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); + //$this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); + + } + + /** + * Test with a person, a hash tag and some special chars. + */ + public function testGetTagsShortTagAndPersonSpecialChars() { + $text="hi @Mike, This is a #test_case."; + + $tags=get_tags($text); + + $this->assertEquals(2, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_case", $tags)); + } + + /** + * Test with a person tag and text behind it. + */ + public function testGetTagsPersonOnly() { + $text="@Test I saw the Theme Dev group was created."; + + $tags=get_tags($text); + + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@Test", $tags)); + } + + /** + * Test a tag with an id in it + */ + public function testIdTag() { + $text="Test with @mike+15 id tag"; + + $tags=get_tags($text); + + $this->assertEquals(1, count($tags)); + $this->assertTrue(in_array("@mike+15", $tags)); + + $str_tags=''; + foreach($tags as $tag) { + handle_tag($text, $str_tags, 11, $tag); + } + + //$this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); + //$this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); + } + + /** + * Test with two persons and one special tag. + */ + public function testGetTags2Persons1TagSpecialChars() { + $text="hi @Mike, I'm just writing #test_cases, so" + . " so @somebody@friendica.com may change #things."; + + $tags=get_tags($text); + + $this->assertEquals(4, count($tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_cases", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("#things", $tags)); + } + + /** + * Test with a long text. + */ + public function testGetTags() { + $text="hi @Mike, I'm just writing #test_cases, " + . " so @somebody@friendica.com may change #things. Of course I " + . "look for a lot of #pitfalls, like #tags at the end of a sentence " + . "@comment. I hope noone forgets about @fullstops.because that might" + . " break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " + . "Now, add a @first_last tag. "; + + $tags=get_tags($text); + + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#test_cases", $tags)); + $this->assertTrue(in_array("@somebody@friendica.com", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("#pitfalls", $tags)); + $this->assertTrue(in_array("#tags", $tags)); + $this->assertTrue(in_array("@comment", $tags)); + $this->assertTrue(in_array("@fullstops.because", $tags)); + $this->assertTrue(in_array("#things", $tags)); + $this->assertTrue(in_array("@Mike", $tags)); + $this->assertTrue(in_array("#nice", $tags)); + $this->assertTrue(in_array("@first_last", $tags)); + + //right now, none of the is matched (unsupported) +// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); +// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); + } + + /** + * Test with an empty string + */ + public function testGetTagsEmpty() { + $tags=get_tags(""); + $this->assertEquals(0, count($tags)); + } +} diff --git a/tests/unit/get_tags_test.php b/tests/unit/get_tags_test.php deleted file mode 100644 index bdffd8311..000000000 --- a/tests/unit/get_tags_test.php +++ /dev/null @@ -1,317 +0,0 @@ -15, - 'attag'=>'', 'network'=>'dfrn', - 'name'=>'Mike Lastname', 'alias'=>'Mike', - 'nick'=>'Mike', 'url'=>"http://justatest.de")); - - $args=func_get_args(); - - //last parameter is always (in this test) uid, so, it should be 11 - if($args[count($args)-1]!=11) { - return; - } - - - if(3==count($args)) { - //first call in handle_body, id only - if($result[0]['id']==$args[1]) { - return $result; - } - //second call in handle_body, name - if($result[0]['name']===$args[1]) { - return $result; - } - } - //third call in handle_body, nick or attag - if($result[0]['nick']===$args[2] || $result[0]['attag']===$args[1]) { - return $result; - } -} - -/** - * replacement for dbesc. - * I don't want to test dbesc here, so - * I just return the input. It won't be a problem, because - * the test does not use a real database. - * - * DON'T USE HAT FUNCTION OUTSIDE A TEST! - * - * @param string $str - * @return input - */ -function dbesc($str) { - return $str; -} - -/** - * TestCase for tag handling. - * - * @author alexander - * @package test.util - */ -class GetTagsTest extends PHPUnit_Framework_TestCase { - /** the mock to use as app */ - private $a; - - /** - * initialize the test. That's a phpUnit function, - * don't change its name. - */ - public function setUp() { - $this->a=new MockApp(); - } - - /** - * test with one Person tag - */ - public function testGetTagsShortPerson() { - $text="hi @Mike"; - - $tags=get_tags($text); - - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } - - //correct tags found? - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - - //correct output from handle_tag? - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url]", $text); - } - - /** - * test with one Person tag. - * There's a minor spelling mistake... - */ - public function testGetTagsShortPersonSpelling() { - $text="hi @Mike.because"; - - $tags=get_tags($text); - - //correct tags found? - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("@Mike.because", $tags)); - - $str_tags=''; - handle_tag($text, $str_tags, 11, $tags[0]); - - // (mike) - This is a tricky case. - // we support mentions as in @mike@example.com - which contains a period. - // This shouldn't match anything unless you have a contact named "Mike.because". - // We may need another test for "@Mike. because" - which should return the contact - // as we ignore trailing periods in tags. - -// $this->assertEquals("cid:15", $inform); -// $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); -// $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url].because", $text); - - $this->assertEquals("", $str_tags); - - } - - /** - * test with two Person tags. - * There's a minor spelling mistake... - */ - - public function testGetTagsPerson2Spelling() { - $text="hi @Mike@campino@friendica.eu"; - - $tags=get_tags($text); - -// This construct is not supported. Results are indeterminate -// $this->assertEquals(2, count($tags)); -// $this->assertTrue(in_array("@Mike", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); - } - - /** - * Test with one hash tag. - */ - public function testGetTagsShortTag() { - $text="This is a #test_case"; - - $tags=get_tags($text); - - $this->assertEquals(1, count($tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } - - /** - * test with a person and a hash tag - */ - public function testGetTagsShortTagAndPerson() { - $text="hi @Mike This is a #test_case"; - - $tags=get_tags($text); - - $this->assertEquals(3, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("@Mike This", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); - - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } - - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url],#[url=baseurl/search?tag=test%20case]test case[/url]", $str_tags); - $this->assertEquals("hi @[url=http://justatest.de]Mike Lastname[/url] This is a #[url=baseurl/search?tag=test%20case]test case[/url]", $text); - - } - - /** - * test with a person, a hash tag and some special chars. - */ - public function testGetTagsShortTagAndPersonSpecialChars() { - $text="hi @Mike, This is a #test_case."; - - $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_case", $tags)); - } - - /** - * Test with a person tag and text behind it. - */ - public function testGetTagsPersonOnly() { - $text="@Test I saw the Theme Dev group was created."; - - $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@Test I", $tags)); - $this->assertTrue(in_array("@Test", $tags)); - } - - /** - * this test demonstrates strange behaviour by intval. - * It makes the next test fail. - */ - public function testIntval() { - $this->assertEquals(15, intval("15 it")); - } - - /** - * test a tag with an id in it - */ - public function testIdTag() { - $text="Test with @mike+15 id tag"; - - $tags=get_tags($text); - - $this->assertEquals(2, count($tags)); - $this->assertTrue(in_array("@mike+15", $tags)); - - //happens right now, but it shouldn't be necessary - $this->assertTrue(in_array("@mike+15 id", $tags)); - - $str_tags=''; - foreach($tags as $tag) { - handle_tag($text, $str_tags, 11, $tag); - } - - $this->assertEquals("Test with @[url=http://justatest.de]Mike Lastname[/url] id tag", $text); - $this->assertEquals("@[url=http://justatest.de]Mike Lastname[/url]", $str_tags); - } - - /** - * test with two persons and one special tag. - */ - public function testGetTags2Persons1TagSpecialChars() { - $text="hi @Mike, I'm just writing #test_cases, so" - ." so @somebody@friendica.com may change #things."; - - $tags=get_tags($text); - - $this->assertEquals(5, count($tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com may", $tags)); - $this->assertTrue(in_array("#things", $tags)); - } - - /** - * test with a long text. - */ - public function testGetTags() { - $text="hi @Mike, I'm just writing #test_cases, " - ." so @somebody@friendica.com may change #things. Of course I " - ."look for a lot of #pitfalls, like #tags at the end of a sentence " - ."@comment. I hope noone forgets about @fullstops.because that might" - ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? " - ."Now, add a @first_last tag. "; - - $tags=get_tags($text); - - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#test_cases", $tags)); - $this->assertTrue(in_array("@somebody@friendica.com", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("#pitfalls", $tags)); - $this->assertTrue(in_array("#tags", $tags)); - $this->assertTrue(in_array("@comment", $tags)); - $this->assertTrue(in_array("@fullstops.because", $tags)); - $this->assertTrue(in_array("#things", $tags)); - $this->assertTrue(in_array("@Mike", $tags)); - $this->assertTrue(in_array("#nice", $tags)); - $this->assertTrue(in_array("@first_last", $tags)); - - //right now, none of the is matched (unsupported) -// $this->assertFalse(in_array("@Mike@campino@friendica.eu", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu", $tags)); -// $this->assertTrue(in_array("@campino@friendica.eu is", $tags)); - } - - /** - * test with an empty string - */ - public function testGetTagsEmpty() { - $tags=get_tags(""); - $this->assertEquals(0, count($tags)); - } -} \ No newline at end of file -- cgit v1.2.3 From d5c1a4998489c73acbf9121edccb1ff797331a1b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jul 2023 21:38:10 +0200 Subject: tests: AccessListTest collect defaults in one testcase. Just no need to have them spread around in various other tests cases. --- tests/unit/Access/AccessListTest.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index 3c8d3e859..0ae024640 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -69,23 +69,24 @@ class AccessListTest extends UnitTestCase { // Causes: "Illegal string offset 'channel_allow_cid'" } */ - public function testDefaultGetExplicit() { + /** + * Test that the defaults are as expected when constructed with + * an empty array. + */ + public function testDefaults() { $accessList = new AccessList([]); $this->assertFalse($accessList->get_explicit()); - } + $this->assertFalse($accessList->is_private()); - public function testDefaultGet() { - $arr = [ + $expected = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; - $accessList = new AccessList([]); - - $this->assertEquals($arr, $accessList->get()); + $this->assertEquals($expected, $accessList->get()); } public function testSet() { @@ -161,9 +162,6 @@ class AccessListTest extends UnitTestCase { * @dataProvider isprivateProvider */ public function testIsPrivate($channel) { - $accessListPublic = new AccessList([]); - $this->assertFalse($accessListPublic->is_private()); - $accessListPrivate = new AccessList($channel); $this->assertTrue($accessListPrivate->is_private()); } -- cgit v1.2.3 From 09fe271b25895c38f823fb4820cdfa9836ee9a8b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jul 2023 21:39:37 +0200 Subject: tests: AccessListTests nitpicking on doc comment. --- tests/unit/Access/AccessListTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index 0ae024640..0952949f5 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -124,7 +124,9 @@ class AccessListTest extends UnitTestCase { */ /** - * set_from_array() calls some other functions, too which are not yet unit tested. + * The set_from_array() function calls some other functions, too which are + * not yet unit tested. + * * @uses ::perms2str * @uses ::sanitise_acl * @uses ::notags -- cgit v1.2.3 From 3f9d5e11d1b2c47a69a929bb63479c49f6a52d7a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jul 2023 21:56:09 +0200 Subject: tests: AccessListTest move type annotation to code This cleans up the doc comment. Should probably try to do this everywhere. --- tests/unit/Access/AccessListTest.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index 0952949f5..1b18a8340 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -34,10 +34,9 @@ use Zotlabs\Access\AccessList; class AccessListTest extends UnitTestCase { /** - * @brief Expected result for most tests. - * @var array + * Expected result for most tests. */ - protected $expectedResult = [ + protected array $expectedResult = [ 'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', -- cgit v1.2.3 From b04e0d0fd4173f77f5035860df74ee43097b9256 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 12 Jul 2023 21:57:27 +0200 Subject: tests: AccessListTest expand is_private test. --- tests/unit/Access/AccessListTest.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index 1b18a8340..2f185db17 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -160,6 +160,8 @@ class AccessListTest extends UnitTestCase { } /** + * The AccessList should be private if any of the fields are set, + * * @dataProvider isprivateProvider */ public function testIsPrivate($channel) { @@ -175,12 +177,30 @@ class AccessListTest extends UnitTestCase { 'channel_deny_cid' => '', 'channel_deny_gid' => '' ]], - 'only one set' => [[ + 'only allow_cid set' => [[ 'channel_allow_cid' => '', 'channel_allow_gid' => '', 'channel_deny_cid' => '', 'channel_deny_gid' => '' ]], + 'only allow_gid set' => [[ + 'channel_allow_cid' => '', + 'channel_allow_gid' => '', + 'channel_deny_cid' => '', + 'channel_deny_gid' => '' + ]], + 'only deny_cid set' => [[ + 'channel_allow_cid' => '', + 'channel_allow_gid' => '', + 'channel_deny_cid' => '', + 'channel_deny_gid' => '' + ]], + 'only deny_gid set' => [[ + 'channel_allow_cid' => '', + 'channel_allow_gid' => '', + 'channel_deny_cid' => '', + 'channel_deny_gid' => '' + ]], 'acid+null' => [[ 'channel_allow_cid' => '', 'channel_allow_gid' => null, -- cgit v1.2.3 From 70b8c57d220aaaa361967343e2ca7dfa62632569 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 13 Jul 2023 09:47:50 +0000 Subject: basic per item rtl language support - issue ##1780 --- Zotlabs/Lib/ThreadItem.php | 3 ++- include/language.php | 17 +++++++++++++++++ view/tpl/conv_item.tpl | 2 +- view/tpl/conv_list.tpl | 2 +- view/tpl/search_item.tpl | 2 +- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 14c9500ff..7fa621470 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -506,7 +506,8 @@ class ThreadItem { 'contact_id' => (($contact) ? $contact['abook_id'] : ''), 'moderate' => ($item['item_blocked'] == ITEM_MODERATED), 'moderate_approve' => t('Approve'), - 'moderate_delete' => t('Delete') + 'moderate_delete' => t('Delete'), + 'rtl' => in_array($item['lang'], rtl_languages()) ); diff --git a/include/language.php b/include/language.php index e7363cffb..d84f02a36 100644 --- a/include/language.php +++ b/include/language.php @@ -451,3 +451,20 @@ function lang_selector() { return $o; } +function rtl_languages() { + return [ + 'ar', + 'arc', + 'ckb', + 'dv', + 'fa', + 'ha', + 'he', + 'khw', + 'ks', + 'ps', + 'sd', + 'ur', + 'yi' + ]; +} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 5f6c4f6c6..d4299812d 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -89,7 +89,7 @@ {{/if}} {{if $item.body}}
-
+
{{$item.body}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 0024ec382..43133027f 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -89,7 +89,7 @@ {{/if}} {{if $item.body}}
-
+
{{$item.body}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index da5bac5dc..2c4aab9f4 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -88,7 +88,7 @@ {{/if}} {{if $item.body}}
-
+
{{$item.body}}
-- cgit v1.2.3 From ba2d7752152ba061302db747780d157dfb3383d9 Mon Sep 17 00:00:00 2001 From: "DM42.Net Hubzilla Development" Date: Mon, 17 Jul 2023 20:34:16 -0400 Subject: Skip logging when DB functions are not yet loaded (logging requires db lookup). --- boot.php | 4 ++-- include/network.php | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 18addbb6f..0013ef7c7 100644 --- a/boot.php +++ b/boot.php @@ -949,7 +949,7 @@ class App { $staticfilecwd = getcwd(); $staticfilerealpath = realpath(self::$cmd); if (strpos($staticfilerealpath, $staticfilecwd) !== 0) { - http_status_exit(404, 'not found'); + http_status_exit(404, 'not found', 1); } $staticfileetag = '"' . md5($staticfilerealpath . filemtime(self::$cmd)) . '"'; @@ -959,7 +959,7 @@ class App { // If HTTP_IF_NONE_MATCH is same as the generated ETag => content is the same as browser cache // So send a 304 Not Modified response header and exit if ($_SERVER['HTTP_IF_NONE_MATCH'] == $staticfileetag) { - http_status_exit(304, 'not modified'); + http_status_exit(304, 'not modified', 1); } } header("Content-type: " . $serve_rawfiles[$filext]); diff --git a/include/network.php b/include/network.php index b34fdffcc..d2b5a8b73 100644 --- a/include/network.php +++ b/include/network.php @@ -456,13 +456,14 @@ function as_return_and_die($obj,$channel) { * @param string $msg * optional message */ -function http_status($val, $msg = '') { +function http_status($val, $msg = '',$skiplog = 0) { if ($val >= 400) $msg = (($msg) ? $msg : 'Error'); if ($val >= 200 && $val < 300) $msg = (($msg) ? $msg : 'OK'); - logger(\App::$query_string . ':' . $val . ' ' . $msg); + if (!$skiplog) + logger(\App::$query_string . ':' . $val . ' ' . $msg); header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg); } @@ -476,8 +477,8 @@ function http_status($val, $msg = '') { * optional message * @return void does not return, process is terminated */ -function http_status_exit($val, $msg = '') { - http_status($val, $msg); +function http_status_exit($val, $msg = '',$skiplog = 0) { + http_status($val, $msg, $skiplog); killme(); } -- cgit v1.2.3 From ef6ea4484eb03d80c96f4d67002e567cebc8ccae Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jul 2023 09:57:38 +0000 Subject: fix hcard addon regression --- view/tpl/profile_vcard.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 37339a40a..df0550273 100644 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -94,8 +94,8 @@
{{$profile.homepage}}
{{/if}} -
+
{{/if}}
{{if $details}} -- cgit v1.2.3 From c412c01a657fbac49f611b94b4c88cf63f4fff77 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jul 2023 11:00:21 +0000 Subject: fix admin table highlight by adding the correct classes --- view/css/mod_admin.css | 17 ----------------- view/theme/redbasic/css/style.css | 4 ---- view/tpl/admin_accounts.tpl | 13 ++++++++----- view/tpl/admin_channels.tpl | 26 ++++++++++++++++---------- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css index fa8f84d83..ad13c296a 100644 --- a/view/css/mod_admin.css +++ b/view/css/mod_admin.css @@ -54,23 +54,6 @@ margin-right: 1em; } -#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} -#adminpage table th { text-align: left;} -#adminpage td .icon { float: left;} -#adminpage table#users img { width: 16px; height: 16px; } -#adminpage table tr:hover { background-color: #bbc7d7; } -#adminpage .selectall { text-align: right; } - -.checkbox_bulkedit { - width: 1.2em; - height: 1.2em; -} - -.channels_ckbx, .pending_ckbx, .users_ckbx { - margin-top: 0px !important; - margin-left: 0px !important; -} - tr.zebra9 { background-color: #eafaf1; } tr.zebra0 { background-color: #fbeee6; } tr.zebra1 { background-color: #fef9e7; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 658a3cf6e..b20977f28 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -924,10 +924,6 @@ a .drop-icons:hover { list-style-type: none; } -#adminpage table tr:hover { - background-color: #BBC7D7; -} - table { border-spacing: 2px; max-width: 100%; diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index 78a68a8a1..1f5617f00 100644 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -7,7 +7,7 @@

{{$h_pending}}

{{if $debug}}
{{$debug}}
{{/if}} {{if $pending}} - +
{{foreach $th_pending as $th}}{{/foreach}} @@ -53,12 +53,13 @@

{{$h_users}}

{{if $users}} -
{{$th}}
+
{{foreach $th_users as $th}}{{/foreach}} + @@ -75,10 +76,12 @@ - + + {{/foreach}} diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index f8584c84a..75db77593 100644 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -12,18 +12,20 @@

{{$title}} - {{$page}}

- +
- +

{{$h_channels}}

{{if $channels}} -
{{$th.0}}
{{$u.account_service_class}} + + - - +
+
{{foreach $th_channels as $th}}{{/foreach}} + + @@ -32,11 +34,15 @@ - + + + {{/foreach}} @@ -44,10 +50,10 @@
{{$th.0}}
{{$c.channel_id}} {{$c.channel_name}} {{$c.channel_address}} + + + + - - - +
- - + + -
+
{{else}} NO CHANNELS?!? {{/if}} -- cgit v1.2.3 From 330add963dbe2195e0613f35b8f63c15eee585a0 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 18 Jul 2023 13:04:34 +0000 Subject: changelog --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2c721afe4..6edf1847a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Hubzilla 8.6.1 (2023-07-18) + - Fix diaspora discovery + + Hubzilla 8.6 (2023-07-11) - Update fullcalendar library - Improve and unify selection of deliverable abook xchans -- cgit v1.2.3 From a06e8bfaee7de3bc8c2691e8d6462a52d5345e09 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 18 Jul 2023 20:18:42 +0200 Subject: Zotlabs: Improve type safety for AccessList class. Add type annotations for constructor and set* methods, and throw an exception if the passed in arrays are missing required keys. This means that both invalid input types and missing keys will throw and exception rather than just die with a runtime error. There's not checks to verify that the contents of the required array keys are valid or make sense, though. They are just assigned, and returned as is by the get method when requested. Also, the set_from_array method is not well tested at the moment. --- Zotlabs/Access/AccessList.php | 40 +++++++++++++++++++++++++++++++++--- tests/unit/Access/AccessListTest.php | 36 +++++++++++++++++++++++--------- 2 files changed, 63 insertions(+), 13 deletions(-) diff --git a/Zotlabs/Access/AccessList.php b/Zotlabs/Access/AccessList.php index 790ef4745..a7da1274f 100644 --- a/Zotlabs/Access/AccessList.php +++ b/Zotlabs/Access/AccessList.php @@ -2,6 +2,7 @@ namespace Zotlabs\Access; + /** * @brief AccessList class which represents individual content ACLs. * @@ -40,6 +41,25 @@ class AccessList { */ private $explicit; + /** + * @brief Keys required by the constructor if the channel array is given. + */ + private const REQUIRED_KEYS_CONSTRUCTOR = [ + 'channel_allow_cid', + 'channel_allow_gid', + 'channel_deny_cid', + 'channel_deny_gid' + ]; + + /** + * @brief Keys required by the set method. + */ + private const REQUIRED_KEYS_SET = [ + 'allow_cid', + 'allow_gid', + 'deny_cid', + 'deny_gid' + ]; /** * @brief Constructor for AccessList class. @@ -53,8 +73,9 @@ class AccessList { * * \e string \b channel_deny_cid => string of denied cids * * \e string \b channel_deny_gid => string of denied gids */ - function __construct($channel) { + function __construct(array $channel) { if ($channel) { + $this->validate_input_array($channel, self::REQUIRED_KEYS_CONSTRUCTOR); $this->allow_cid = $channel['channel_allow_cid']; $this->allow_gid = $channel['channel_allow_gid']; $this->deny_cid = $channel['channel_deny_cid']; @@ -70,6 +91,17 @@ class AccessList { $this->explicit = false; } + private function validate_input_array(array $arr, array $required_keys) { + $missing_keys = array_diff($required_keys, array_keys($arr)); + + if (!empty($missing_keys)) { + throw new \Exception( + 'Invalid AccessList object: Expected array with keys: ' + . implode(', ', $missing_keys) + ); + } + } + /** * @brief Get if we are using the default constructor values * or values that have been set explicitly. @@ -94,7 +126,9 @@ class AccessList { * * \e string \b deny_gid => string of denied gids * @param boolean $explicit (optional) default true */ - function set($arr, $explicit = true) { + function set(array $arr, bool $explicit = true) { + $this->validate_input_array($arr, self::REQUIRED_KEYS_SET); + $this->allow_cid = $arr['allow_cid']; $this->allow_gid = $arr['allow_gid']; $this->deny_cid = $arr['deny_cid']; @@ -138,7 +172,7 @@ class AccessList { * * \e array|string \b group_deny => array with gids or comma-seperated string * @param boolean $explicit (optional) default true */ - function set_from_array($arr, $explicit = true) { + function set_from_array(array $arr, bool $explicit = true) { $arr['contact_allow'] = $arr['contact_allow'] ?? []; $arr['group_allow'] = $arr['group_allow'] ?? []; $arr['contact_deny'] = $arr['contact_deny'] ?? []; diff --git a/tests/unit/Access/AccessListTest.php b/tests/unit/Access/AccessListTest.php index 2f185db17..635f09930 100644 --- a/tests/unit/Access/AccessListTest.php +++ b/tests/unit/Access/AccessListTest.php @@ -60,14 +60,24 @@ class AccessListTest extends UnitTestCase { } /** - * @expectedException PHPUnit\Framework\Error\Error + * AccessList constructor should throw an exception if input is not + * an array. */ -/* - public function testPHPErrorOnInvalidConstructor() { + public function testConstructorThrowsOnInvalidInputType() { + $this->expectException("TypeError"); $accessList = new AccessList('invalid'); - // Causes: "Illegal string offset 'channel_allow_cid'" } -*/ + + /** + * AccessList constructor should throw an exception on + * invalid input. + */ + public function testConstructorThrowsOnMissingKeysInArray() { + $this->expectException("Exception"); + $this->expectExceptionMessage("Invalid AccessList object"); + $accessList = new AccessList(['something_else' => 'should_this_fail?']); + } + /** * Test that the defaults are as expected when constructed with * an empty array. @@ -111,16 +121,22 @@ class AccessListTest extends UnitTestCase { } /** - * @expectedException PHPUnit\Framework\Error\Error + * The set method should throw an exception if input is not an array. */ -/* - public function testPHPErrorOnInvalidSet() { + public function testSetThrowsOnInvalidInputType() { + $this->expectException('TypeError'); $accessList = new AccessList([]); $accessList->set('invalid'); - // Causes: "Illegal string offset 'allow_cid'" } -*/ + + public function testSetThrowsOnMissingKeysInArray() { + $this->expectException('Exception'); + $this->expectExceptionMessage('Invalid AccessList object'); + + $accessList = new AccessList([]); + $accessList->set(['something_else' => 'should_this_fail?']); + } /** * The set_from_array() function calls some other functions, too which are -- cgit v1.2.3 From 14c97799c6dbca22f335c9d289a1b31e68465e3e Mon Sep 17 00:00:00 2001 From: "DM42.Net Hubzilla Development" Date: Tue, 18 Jul 2023 14:34:10 -0400 Subject: add .jsonld to the list of allowed file suffixes for direct download. Fixes 404 error when trying to get /library/w3org/security-v1.jsonld and /library/w3org/activitystreams.jsonld --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 0013ef7c7..2b438c048 100644 --- a/boot.php +++ b/boot.php @@ -942,7 +942,8 @@ class App { 'ttf' => 'font/ttf', 'woff' => 'font/woff', 'woff2' => 'font/woff2', - 'svg' => 'image/svg+xml' + 'svg' => 'image/svg+xml', + 'jsonld' => 'application/ld+json' ]; if (array_key_exists($filext, $serve_rawfiles) && file_exists(self::$cmd)) { -- cgit v1.2.3 From 7200c716736d879501a665c9797ccf9e0131b24c Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 19 Jul 2023 12:52:41 +0000 Subject: ignore internal follow activity --- Zotlabs/Module/Sse_bs.php | 24 +++++++++++++----------- Zotlabs/Widget/Messages.php | 6 ++++-- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index 970c482a9..a3a3afd23 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -169,12 +169,12 @@ class Sse_bs extends Controller { $sql_extra2 = ''; if(self::$xchans) - $sql_extra2 = " AND CASE WHEN verb = '" . ACTIVITY_SHARE . "' THEN owner_xchan ELSE author_xchan END IN (" . self::$xchans . ") "; + $sql_extra2 = " AND CASE WHEN verb = '" . dbesc(ACTIVITY_SHARE) . "' THEN owner_xchan ELSE author_xchan END IN (" . self::$xchans . ") "; $item_normal = item_normal(); - // FEP-5624 filter approvals for comments - $approvals = " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject') "; + // Filter FEP-5624 approvals for comments and internal follow activities + $item_normal .= " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject', '" . dbesc(ACTIVITY_FOLLOW) . "') "; if ($notifications) { $items = q("SELECT * FROM item @@ -184,7 +184,6 @@ class Sse_bs extends Controller { AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image') AND author_xchan != '%s' $item_normal - $approvals $sql_extra $sql_extra2 ORDER BY created DESC LIMIT $limit OFFSET $offset", @@ -258,8 +257,8 @@ class Sse_bs extends Controller { $item_normal = item_normal(); - // FEP-5624 filter approvals for comments - $approvals = " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject') "; + // Filter FEP-5624 approvals for comments and internal follow activities + $item_normal .= " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject', '" . dbesc(ACTIVITY_FOLLOW) . "') "; if ($notifications) { $items = q("SELECT * FROM item @@ -269,7 +268,6 @@ class Sse_bs extends Controller { AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image') AND author_xchan != '%s' $item_normal - $approvals $sql_extra $sql_extra2 ORDER BY created DESC LIMIT $limit OFFSET $offset", @@ -343,8 +341,8 @@ class Sse_bs extends Controller { $item_normal = item_normal(); - // FEP-5624 filter approvals for comments - $approvals = " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject') "; + // Filter FEP-5624 approvals for comments and internal follow activities + $item_normal .= " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject', '" . dbesc(ACTIVITY_FOLLOW) . "') "; if ($notifications) { $items = q("SELECT * FROM item @@ -445,8 +443,8 @@ class Sse_bs extends Controller { $item_normal = item_normal(); - // FEP-5624 filter approvals for comments - $approvals = " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject') "; + // Filter FEP-5624 approvals for comments and internal follow activities + $item_normal .= " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject', '" . dbesc(ACTIVITY_FOLLOW) . "') "; if ($notifications) { $items = q("SELECT * FROM item @@ -641,6 +639,10 @@ class Sse_bs extends Controller { $item_normal = item_normal(); + // Filter FEP-5624 approvals for comments and internal follow activities + $item_normal .= " AND verb NOT IN ('" . dbesc(ACTIVITY_ATTEND) . "', 'Accept', '" . dbesc(ACTIVITY_ATTENDNO) . "', 'Reject', '" . dbesc(ACTIVITY_FOLLOW) . "') "; + + $r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type IN ('Document', 'Video', 'Audio', 'Image') diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php index 0a8900c4f..cdd889121 100644 --- a/Zotlabs/Widget/Messages.php +++ b/Zotlabs/Widget/Messages.php @@ -60,8 +60,10 @@ class Messages { } $channel = App::get_channel(); - $item_normal_i = str_replace('item.', 'i.', item_normal()); - $item_normal_c = str_replace('item.', 'c.', item_normal()); + $item_normal = item_normal(); + $item_normal .= " and item.verb != '" . ACTIVITY_FOLLOW . "'"; + $item_normal_i = str_replace('item.', 'i.', $item_normal); + $item_normal_c = str_replace('item.', 'c.', $item_normal); $entries = []; $limit = 30; $dummy_order_sql = ''; -- cgit v1.2.3 From 718c303086e6ab6061b2a920bd8293b2c0d11348 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 19 Jul 2023 20:19:00 +0200 Subject: Zotlabs: More type safety for AccessList class. Add more type declarations to class attributes and functions. This should ensure that only strings and null values can be assigned to the various access list members. This is still a bit loose, as we should probably aim for lists of channel or group id's instead of a generic type like a string. I'll leave that for later, though. --- Zotlabs/Access/AccessList.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Zotlabs/Access/AccessList.php b/Zotlabs/Access/AccessList.php index a7da1274f..3f5271e87 100644 --- a/Zotlabs/Access/AccessList.php +++ b/Zotlabs/Access/AccessList.php @@ -18,28 +18,28 @@ class AccessList { * @brief Allow contacts * @var string */ - private $allow_cid; + private ?string $allow_cid; /** * @brief Allow groups * @var string */ - private $allow_gid; + private ?string $allow_gid; /** * @brief Deny contacts * @var string */ - private $deny_cid; + private ?string $deny_cid; /** * @brief Deny groups * @var string */ - private $deny_gid; + private ?string $deny_gid; /** * @brief Indicates if we are using the default constructor values or * values that have been set explicitly. * @var boolean */ - private $explicit; + private bool $explicit; /** * @brief Keys required by the constructor if the channel array is given. @@ -91,7 +91,7 @@ class AccessList { $this->explicit = false; } - private function validate_input_array(array $arr, array $required_keys) { + private function validate_input_array(array $arr, array $required_keys) : void { $missing_keys = array_diff($required_keys, array_keys($arr)); if (!empty($missing_keys)) { @@ -108,7 +108,7 @@ class AccessList { * * @return boolean */ - function get_explicit() { + function get_explicit() : bool { return $this->explicit; } @@ -126,7 +126,7 @@ class AccessList { * * \e string \b deny_gid => string of denied gids * @param boolean $explicit (optional) default true */ - function set(array $arr, bool $explicit = true) { + function set(array $arr, bool $explicit = true) : void { $this->validate_input_array($arr, self::REQUIRED_KEYS_SET); $this->allow_cid = $arr['allow_cid']; @@ -146,7 +146,7 @@ class AccessList { * * \e string \b deny_cid => string of denied cids * * \e string \b deny_gid => string of denied gids */ - function get() { + function get() : array { return [ 'allow_cid' => $this->allow_cid, 'allow_gid' => $this->allow_gid, @@ -172,7 +172,7 @@ class AccessList { * * \e array|string \b group_deny => array with gids or comma-seperated string * @param boolean $explicit (optional) default true */ - function set_from_array(array $arr, bool $explicit = true) { + function set_from_array(array $arr, bool $explicit = true) : void { $arr['contact_allow'] = $arr['contact_allow'] ?? []; $arr['group_allow'] = $arr['group_allow'] ?? []; $arr['contact_deny'] = $arr['contact_deny'] ?? []; @@ -195,7 +195,7 @@ class AccessList { * * @return boolean Return true if any of allow_* deny_* values is set. */ - function is_private() { + function is_private() : bool { return (($this->allow_cid || $this->allow_gid || $this->deny_cid || $this->deny_gid) ? true : false); } -- cgit v1.2.3 From 5181e575b4eb91de3ec71a125d45c29e65372c76 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 20 Jul 2023 11:46:40 +0000 Subject: fix accesslist in two cases --- Zotlabs/Lib/ThreadItem.php | 2 +- Zotlabs/Module/Chat.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 7fa621470..7d2bcde56 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -101,7 +101,7 @@ class ThreadItem { $conv = $this->get_conversation(); $observer = $conv->get_observer(); - $acl = new AccessList(false); + $acl = new AccessList([]); $acl->set($item); $lock = ((intval($item['item_private']) || ($item['uid'] == local_channel() && $acl->is_private())) diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php index fc74016ab..2d36e022a 100644 --- a/Zotlabs/Module/Chat.php +++ b/Zotlabs/Module/Chat.php @@ -181,7 +181,7 @@ class Chat extends Controller { ); if($x) { - $acl = new AccessList(false); + $acl = new AccessList([]); $acl->set($x[0]); $private = $acl->is_private(); -- cgit v1.2.3 From 8da6e6a096c7cb5ab8aa7c4b30d69c4876810a84 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 20 Jul 2023 19:20:56 +0000 Subject: move trigger out of the loop for better performance and some var -> let --- boot.php | 2 +- view/js/main.js | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index 0013ef7c7..82da0faaa 100644 --- a/boot.php +++ b/boot.php @@ -60,7 +60,7 @@ require_once('include/bbcode.php'); require_once('include/items.php'); define('PLATFORM_NAME', 'hubzilla'); -define('STD_VERSION', '8.7'); +define('STD_VERSION', '8.7.1'); define('ZOT_REVISION', '6.0'); define('DB_UPDATE_VERSION', 1258); diff --git a/view/js/main.js b/view/js/main.js index 9c2480795..13fc29cd4 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -646,7 +646,8 @@ function updatePageItems(mode, data) { function updateConvItems(mode,data) { - var scroll_position = $(window).scrollTop(); + let scroll_position = $(window).scrollTop(); + let b64mids = []; if(mode !== 'update') $(document).trigger('hz:updateConvItems'); @@ -660,12 +661,12 @@ function updateConvItems(mode,data) { $('.thread-wrapper', data).each(function() { if(this.classList.contains('toplevel_item')) { - var ident = this.id; - var convId = ident.replace('thread-wrapper-',''); - var commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); + let ident = this.id; + let convId = ident.replace('thread-wrapper-',''); + let commentWrap = $('#'+ident+' .collapsed-comments').attr('id'); - var itmId = 0; - var isVisible = false; + let itmId = 0; + let isVisible = false; // figure out the comment state if(typeof commentWrap !== 'undefined') @@ -695,7 +696,7 @@ function updateConvItems(mode,data) { if(isVisible) showHideComments(itmId); - var commentBody = localStorage.getItem("comment_body-" + convId); + let commentBody = localStorage.getItem("comment_body-" + convId); if(commentBody) { var commentElm = $('#comment-edit-text-' + convId); @@ -723,7 +724,7 @@ function updateConvItems(mode,data) { if(mode === 'replace') { if (window.location.search.indexOf("mid=") != -1 || window.location.pathname.indexOf("display") != -1) { - var title = $(".wall-item-title").text(); + let title = $(".wall-item-title").text(); title.replace(/^\s+/, ''); title.replace(/\s+$/, ''); if (title) { @@ -734,10 +735,14 @@ function updateConvItems(mode,data) { } } - $(document).trigger('hz:sse_setNotificationsStatus', [$(this).data('b64mids')]); + $(this).data('b64mids').forEach((b64mid) => { + b64mids.push(b64mid); + }); }); + $(document).trigger('hz:sse_setNotificationsStatus', [b64mids]); + $(window).scrollTop(scroll_position); if(followUpPageLoad) { -- cgit v1.2.3 From 4b1384be832b0a745eeb8ac94cba6b00edc4eb64 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Jul 2023 08:17:45 +0000 Subject: more performance improvements --- view/js/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/js/main.js b/view/js/main.js index 13fc29cd4..c463b1f59 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -807,7 +807,7 @@ function updateConvItems(mode,data) { } // reset rotators and cursors we may have set before reaching this place - $('.like-rotator').hide(); + $("#page-spinner").hide(); $("#profile-jot-text-loading").hide(); @@ -842,8 +842,7 @@ function scrollToItem() { } function collapseHeight() { - - $(".wall-item-content, .directory-collapse").each(function() { + $(".wall-item-content:not('.divmore_checked'), .directory-collapse:not('.divmore_checked')").each(function(i) { var orgHeight = $(this).outerHeight(true); var id = $(this).attr('id') var open = ((expanded_items.indexOf($(this).attr('id')) === -1) ? false : true); @@ -871,6 +870,7 @@ function collapseHeight() { $(this).addClass('divmore'); } } + $(this).addClass('divmore_checked'); }); } -- cgit v1.2.3 From 931b876b44eb22ca470ecd068f3d53e226f635ff Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Jul 2023 12:07:17 +0000 Subject: fix cached jsonld files fetched via network --- include/network.php | 83 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/include/network.php b/include/network.php index d2b5a8b73..ec3474a41 100644 --- a/include/network.php +++ b/include/network.php @@ -462,7 +462,7 @@ function http_status($val, $msg = '',$skiplog = 0) { if ($val >= 200 && $val < 300) $msg = (($msg) ? $msg : 'OK'); - if (!$skiplog) + if (!$skiplog) logger(\App::$query_string . ':' . $val . ' ' . $msg); header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg); } @@ -2041,68 +2041,85 @@ function getBestSupportedMimeType($mimeTypes = null, $acceptedTypes = false) { return null; } + /** * @brief Perform caching for jsonld normaliser. * * @param string $url - * @return mixed|boolean|array + * @return mixed|bool|array */ function jsonld_document_loader($url) { - - switch ($url) { - case 'https://www.w3.org/ns/activitystreams': - $url = z_root() . '/library/w3org/activitystreams.jsonld'; - break; - case 'https://w3id.org/identity/v1': - $url = z_root() . '/library/w3org/identity-v1.jsonld'; - break; - case 'https://w3id.org/security/v1': - $url = z_root() . '/library/w3org/security-v1.jsonld'; - break; - default: - logger('URL: ' . $url, LOGGER_DEBUG); - break; - } - - require_once('library/jsonld/jsonld.php'); + $doc = (object) [ + 'contextUrl' => null, + 'document' => null, + 'documentUrl' => $url + ]; $recursion = 0; + $builtins = [ + 'https://www.w3.org/ns/activitystreams' => 'library/w3org/activitystreams.jsonld', + 'https://w3id.org/identity/v1' => 'library/w3org/identity-v1.jsonld', + 'https://w3id.org/security/v1' => 'library/w3org/security-v1.jsonld', + ]; + $x = debug_backtrace(); - if($x) { - foreach($x as $n) { - if($n['function'] === __FUNCTION__) { - $recursion ++; + if ($x) { + foreach ($x as $n) { + if ($n['function'] === __FUNCTION__) { + $recursion++; } } } - if($recursion > 5) { + if ($recursion > 5) { logger('jsonld bomb detected at: ' . $url); killme(); } + foreach ($builtins as $key => $value) { + if ($url === $key) { + $doc->document = file_get_contents($value); + return $doc; + } + } + $cachepath = 'store/[data]/ldcache'; - if(! is_dir($cachepath)) + if(!is_dir($cachepath)) { os_mkdir($cachepath, STORAGE_DEFAULT_PERMISSIONS, true); + } $filename = $cachepath . '/' . urlencode($url); - if(file_exists($filename) && filemtime($filename) > time() - (12 * 60 * 60)) { - return json_decode(file_get_contents($filename)); + + if (file_exists($filename) && filemtime($filename) > time() - (12 * 60 * 60)) { + logger('loading ' . $filename . ' from recent cache'); + + $doc->document = file_get_contents($filename); + return $doc; } $r = jsonld_default_document_loader($url); - if($r) { - file_put_contents($filename, json_encode($r)); + if ($r) { + if (!in_array($url, $builtins)) { + $cache_obj = $r; + // To prevent double encoding we need to decode $cache_obj->document + // before encoding the whole object for storage. + $cache_obj->document = json_decode($cache_obj->document); + file_put_contents($filename, json_encode($cache_obj)); + } return $r; } - logger('not found'); - if(file_exists($filename)) { - return json_decode(file_get_contents($filename)); + if (file_exists($filename)) { + logger('loading ' . $filename . ' from longterm cache'); + $doc->document = file_get_contents($filename); + return $doc; + } + else { + logger($filename . ' does not exist and cannot be loaded'); } - return []; + return $doc; } /** -- cgit v1.2.3 From 3bd2a919925965c42dfab14ac13dfc5747955f01 Mon Sep 17 00:00:00 2001 From: "DM42.Net Hubzilla Development" Date: Tue, 25 Jul 2023 09:07:32 -0400 Subject: Fix Typo --- Zotlabs/Module/Manifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Manifest.php b/Zotlabs/Module/Manifest.php index 4c418a56a..40bfde87d 100644 --- a/Zotlabs/Module/Manifest.php +++ b/Zotlabs/Module/Manifest.php @@ -23,7 +23,7 @@ class Manifest extends Controller { [ 'src' => '/images/app/hz-144.png', 'sizes' => '144x144', 'type' => 'image/png' ], [ 'src' => '/images/app/hz-152.png', 'sizes' => '152x152', 'type' => 'image/png' ], [ 'src' => '/images/app/hz-192.png', 'sizes' => '192x192', 'type' => 'image/png', 'purpose' => 'any maskable' ], - [ 'src' => '/images/app/hz-348.png', 'sizes' => '384x384', 'type' => 'image/png' ], + [ 'src' => '/images/app/hz-384.png', 'sizes' => '384x384', 'type' => 'image/png' ], [ 'src' => '/images/app/hz-512.png', 'sizes' => '512x512', 'type' => 'image/png' ], [ 'src' => '/images/app/hz.svg', 'sizes' => '64x64', 'type' => 'image/xml+svg' ] ], -- cgit v1.2.3 From e6a261a7897eb2ab07d592649306729e65d87ade Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 9 Aug 2023 08:01:18 +0000 Subject: now all acl fields are checked. if they are not complete the check will fail --- Zotlabs/Module/Wall_attach.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 80892f0f3..0d5c9e983 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -81,13 +81,22 @@ class Wall_attach extends \Zotlabs\Web\Controller { } } - $observer = \App::get_observer(); - - $def_album = get_pconfig($channel['channel_id'],'system','photo_path'); $def_attach = get_pconfig($channel['channel_id'],'system','attach_path'); - $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'album' => $def_album, 'directory' => $def_attach, 'flags' => 1, 'allow_cid' => '<' . $channel['channel_hash'] . '>')); + $data = [ + 'source' => 'editor', + 'visible' => 0, + 'album' => $def_album, + 'directory' => $def_attach, + 'flags' => 1, + 'allow_cid' => '<' . $channel['channel_hash'] . '>', + 'allow_gid' => '', + 'deny_cid' => '', + 'deny_gid' => '' + ]; + + $r = attach_store($channel, get_observer_hash(), '', $data); if(! $r['success']) { notice( $r['message'] . EOL); -- cgit v1.2.3 From 0ec715d7c9d4bdce71210f9d025cf8ac0c02160d Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 9 Aug 2023 08:18:27 +0000 Subject: remove unused variable --- Zotlabs/Module/Sse_bs.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index a3a3afd23..fdaab4ab8 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -213,7 +213,6 @@ class Sse_bs extends Controller { AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image') AND author_xchan != '%s' $item_normal - $approvals $sql_extra LIMIT 100", intval(self::$uid), dbesc(self::$ob_hash) @@ -295,7 +294,6 @@ class Sse_bs extends Controller { $r = q("SELECT id FROM item WHERE uid = %d and item_unseen = 1 AND item_private = 2 $item_normal - $approvals $sql_extra AND author_xchan != '%s' LIMIT 100", intval(self::$uid), @@ -352,7 +350,6 @@ class Sse_bs extends Controller { AND obj_type NOT IN ('Document', 'Video', 'Audio', 'Image') AND author_xchan != '%s' $item_normal - $approvals $sql_extra $sql_extra2 ORDER BY created DESC LIMIT $limit OFFSET $offset", @@ -380,7 +377,6 @@ class Sse_bs extends Controller { $r = q("SELECT id FROM item WHERE uid = %d and item_unseen = 1 AND item_wall = 1 AND item_private IN (0, 1) $item_normal - $approvals $sql_extra AND author_xchan != '%s' LIMIT 100", intval(self::$uid), @@ -454,7 +450,6 @@ class Sse_bs extends Controller { AND author_xchan != '%s' AND created > '%s' $item_normal - $approvals $sql_extra $sql_extra2 ORDER BY created DESC LIMIT $limit OFFSET $offset", @@ -482,7 +477,6 @@ class Sse_bs extends Controller { WHERE true $uids AND created > '%s' $item_normal - $approvals $sql_extra AND author_xchan != '%s' LIMIT 100", dbescdate($_SESSION['static_loadtime']), -- cgit v1.2.3 From b40c38f58c6ff780b518e07a836dd683c971b5b3 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Aug 2023 07:38:36 +0000 Subject: missing semicolon --- install/schema_mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 0f407960d..71a5c8f92 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1629,4 +1629,4 @@ CREATE TABLE IF NOT EXISTS workerq ( KEY workerq_reservationid (workerq_reservationid), KEY workerq_processtimeout (workerq_uuid), KEY workerq_uuid (workerq_processtimeout) -) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4 +) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4; -- cgit v1.2.3 From 1acfc05e2db2ba5556b8d8596dcf7b3b99f75f6b Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Aug 2023 07:58:44 +0000 Subject: fix index name mixup --- install/schema_mysql.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 71a5c8f92..e342c4605 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1627,6 +1627,6 @@ CREATE TABLE IF NOT EXISTS workerq ( workerq_cmd varchar(191) NOT NULL DEFAULT '', KEY workerq_priority (workerq_priority), KEY workerq_reservationid (workerq_reservationid), - KEY workerq_processtimeout (workerq_uuid), - KEY workerq_uuid (workerq_processtimeout) + KEY workerq_processtimeout (workerq_processtimeout), + KEY workerq_uuid (workerq_uuid) ) ENGINE = InnoDB DEFAULT CHARSET=utf8mb4; -- cgit v1.2.3 From c4af4e3297f09aa0c6f8ed8e21d6f54729ebfc4d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Aug 2023 08:17:47 +0000 Subject: fix unable to create folders with name 0 --- Zotlabs/Module/File_upload.php | 2 +- include/attach.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/File_upload.php b/Zotlabs/Module/File_upload.php index 39a30cb1a..8956ce16f 100644 --- a/Zotlabs/Module/File_upload.php +++ b/Zotlabs/Module/File_upload.php @@ -35,7 +35,7 @@ class File_upload extends \Zotlabs\Web\Controller { $_REQUEST['deny_cid'] = ((isset($_REQUEST['contact_deny'])) ? perms2str($_REQUEST['contact_deny']) : ''); $_REQUEST['deny_gid'] = ((isset($_REQUEST['group_deny'])) ? perms2str($_REQUEST['group_deny']) : ''); - if(isset($_REQUEST['filename']) && $_REQUEST['filename']) { + if(isset($_REQUEST['filename']) && strlen($_REQUEST['filename'])) { $r = attach_mkdir($channel, get_observer_hash(), $_REQUEST); if($r['success']) { $hash = $r['data']['hash']; diff --git a/include/attach.php b/include/attach.php index ead5a8e06..3060295b9 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1180,7 +1180,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) { return $ret; } - if(! $arr['filename']) { + if(isset($arr['filename']) && !strlen($arr['filename'])) { $ret['message'] = t('Empty pathname'); return $ret; } -- cgit v1.2.3 From a5a1bbf5d789f19fcb007802eee5e9a29abb72e7 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Aug 2023 09:21:45 +0000 Subject: move profile photo fetching to background --- Zotlabs/Daemon/Xchan_photo.php | 34 ++++++++++++++++++++++++++++++++++ Zotlabs/Lib/Activity.php | 10 +--------- 2 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 Zotlabs/Daemon/Xchan_photo.php diff --git a/Zotlabs/Daemon/Xchan_photo.php b/Zotlabs/Daemon/Xchan_photo.php new file mode 100644 index 000000000..f90d1d726 --- /dev/null +++ b/Zotlabs/Daemon/Xchan_photo.php @@ -0,0 +1,34 @@ + Date: Mon, 14 Aug 2023 09:40:51 +0000 Subject: mising pdl file --- view/pdl/mod_cover_photo.pdl | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 view/pdl/mod_cover_photo.pdl diff --git a/view/pdl/mod_cover_photo.pdl b/view/pdl/mod_cover_photo.pdl new file mode 100644 index 000000000..df722e5bf --- /dev/null +++ b/view/pdl/mod_cover_photo.pdl @@ -0,0 +1,10 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] +[region=content] +$content +[/region] +[region=right_aside] +[widget=notifications][/widget] +[widget=newmember][/widget] +[/region] -- cgit v1.2.3 From 3ddab5966b667051013db889c7963f9133c9f94e Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 14 Aug 2023 18:13:58 +0000 Subject: only try to fetch the icon if we actually got one --- Zotlabs/Lib/Activity.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 2741cc79a..49628c24b 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1697,7 +1697,7 @@ class Activity { $webfinger_addr = escape_tags($person_obj['preferredUsername']) . '@' . $hostname; } - $icon = z_root() . '/' . get_default_profile_photo(300); + $icon = null; if (isset($person_obj['icon'])) { if (is_array($person_obj['icon'])) { if (array_key_exists('url', $person_obj['icon'])) { @@ -1807,6 +1807,9 @@ class Activity { 'xchan_addr' => $webfinger_addr, 'xchan_url' => $profile, 'xchan_name' => escape_tags($name), + 'xchan_photo_l' => z_root() . '/' . get_default_profile_photo(), + 'xchan_photo_m' => z_root() . '/' . get_default_profile_photo(80), + 'xchan_photo_s' => z_root() . '/' . get_default_profile_photo(48), 'xchan_name_date' => datetime_convert(), 'xchan_network' => 'activitypub', 'xchan_pubforum' => intval($group_actor) @@ -1846,8 +1849,9 @@ class Activity { } } - Master::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url)]); - + if ($icon) { + Master::Summon(['Xchan_photo', bin2hex($icon), bin2hex($url)]); + } } static function create_action($channel, $observer_hash, $act) { -- cgit v1.2.3 From be19b7503105955b58c85dbec65c02626c9e5000 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 15 Aug 2023 12:05:50 +0000 Subject: make sure that we allow "0" as pathname --- include/attach.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/attach.php b/include/attach.php index 3060295b9..9baebe2a0 100644 --- a/include/attach.php +++ b/include/attach.php @@ -691,7 +691,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $type = $gis['mime']; } - $pathname = ''; + $pathname = null; if($source === 'photos') { if($newalbum) { @@ -708,7 +708,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $pathname = find_path_by_hash($channel['channel_id'], $arr['folder']); } - if(! $pathname) { + if($pathname === null) { $pathname = filepath_macro($upload_path); } -- cgit v1.2.3 From ce4150cd06a5eb3995592b7c3898d980a58d3dd6 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 19 Aug 2023 08:55:17 +0000 Subject: fix notification text for likes in cases where obj.actor is not set --- include/conversation.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/conversation.php b/include/conversation.php index c02b0c4c8..5e63c4199 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -108,6 +108,8 @@ function localize_item(&$item){ $author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $obj['actor']['url']); elseif (isset($obj['actor']) && is_string($obj['actor'])) $author_link = $obj['actor']; + elseif (isset($obj['attributedTo']) && is_string($obj['attributedTo']) && $obj['attributedTo']) + $author_link = $obj['attributedTo']; else $author_link = ''; @@ -123,6 +125,13 @@ function localize_item(&$item){ } } + if(!$author_name && isset($obj['attributedTo']) && is_string($obj['attributedTo'])) { + $cached_actor = Activity::get_cached_actor($obj['attributedTo']); + if (is_array($cached_actor)) { + $author_name = $cached_actor['name'] ?? $cached_actor['preferredUsername']; + } + } + $item_url = ''; if(isset($obj['link']) && is_array($obj['link'])) $item_url = get_rel_link($obj['link'],'alternate'); -- cgit v1.2.3 From 816bbad28a6292be1c697fe3ac4073f3f110dc10 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 21 Aug 2023 10:07:51 +0200 Subject: allow public stream comments/reactions if item_fetched is set, when fetching parent of a reaction fetch the thr_parent --- Zotlabs/Lib/Activity.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 49628c24b..532bbba45 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -2277,6 +2277,7 @@ class Activity { } static function decode_note($act) { + $response_activity = false; $s = []; @@ -3003,7 +3004,7 @@ class Activity { $allowed = true; // reject public stream comments that weren't sent by the conversation owner - if ($is_sys_channel && $item['owner_xchan'] !== $observer_hash && !$fetch_parents) { + if ($is_sys_channel && $item['owner_xchan'] !== $observer_hash && !$fetch_parents && empty($item['item_fetched'])) { $allowed = false; } } @@ -3139,8 +3140,6 @@ class Activity { $fetch = false; - // TODO: debug - // if (perm_is_allowed($channel['channel_id'],$observer_hash,'send_stream') && (PConfig::Get($channel['channel_id'],'system','hyperdrive',true) || $act->type === 'Announce')) { if (perm_is_allowed($channel['channel_id'], $observer_hash, 'send_stream') || $is_sys_channel) { $fetch = (($fetch_parents) ? self::fetch_and_store_parents($channel, $observer_hash, $item, $force) : false); } @@ -3285,7 +3284,7 @@ class Activity { $current_item = $item; while ($current_item['parent_mid'] !== $current_item['mid']) { - $n = self::fetch($current_item['parent_mid'], $channel); + $n = self::fetch(((in_array($current_item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? $current_item['thr_parent'] : $current_item['parent_mid']), $channel); if (!$n) { break; -- cgit v1.2.3 From 0a3094fc9a708c4e83d6dd91250ac2105e21b03f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 21 Aug 2023 10:45:12 +0200 Subject: test refactor the previous commit --- Zotlabs/Lib/Activity.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 532bbba45..1158acb08 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -2359,6 +2359,9 @@ class Activity { $s['mid'] = $act->id; $s['uuid'] = ((!empty($act->data['diaspora:guid'])) ? $act->data['diaspora:guid'] : uuid_from_url($s['mid'])); + $s['parent_mid'] = $act->objprop('id') ?: $act->obj; + +/* if ($act->objprop('inReplyTo')) { $s['parent_mid'] = $act->objprop('inReplyTo'); } @@ -2369,7 +2372,7 @@ class Activity { logger('response activity without parent_mid or thr_parent'); return; } - +*/ // over-ride the object timestamp with the activity if (isset($act->data['published'])) { @@ -3157,7 +3160,7 @@ class Activity { return; } -/* + if ($parent[0]['parent_mid'] !== $item['parent_mid']) { $item['thr_parent'] = $item['parent_mid']; } @@ -3165,7 +3168,7 @@ class Activity { $item['thr_parent'] = $parent[0]['parent_mid']; } $item['parent_mid'] = $parent[0]['parent_mid']; -*/ + /* * @@ -3284,7 +3287,7 @@ class Activity { $current_item = $item; while ($current_item['parent_mid'] !== $current_item['mid']) { - $n = self::fetch(((in_array($current_item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? $current_item['thr_parent'] : $current_item['parent_mid']), $channel); + $n = self::fetch($current_item['parent_mid'], $channel); if (!$n) { break; -- cgit v1.2.3 From bad7b778b3ae91285d3170d8cac11f4814031a3c Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 27 Aug 2023 17:48:10 +0000 Subject: fix php warning --- Zotlabs/Module/Pubstream.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Pubstream.php b/Zotlabs/Module/Pubstream.php index 9d3a4f92b..4bd1faeff 100644 --- a/Zotlabs/Module/Pubstream.php +++ b/Zotlabs/Module/Pubstream.php @@ -40,7 +40,7 @@ class Pubstream extends \Zotlabs\Web\Controller { $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); - $mid = (($_REQUEST['mid']) ? unpack_link_id($_REQUEST['mid']) : ''); + $mid = ((isset($_REQUEST['mid'])) ? unpack_link_id($_REQUEST['mid']) : ''); if ($mid === false) { notice(t('Malformed message id.') . EOL); -- cgit v1.2.3 From bc9d8d113647bdb88044550db8d1bb5c60ba2060 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 27 Aug 2023 19:02:55 +0000 Subject: changelog --- CHANGELOG | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6edf1847a..306d05c9e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,20 @@ +Hubzilla 8.6.2 + - Fix public stream comments/reactions fetching + - Fix notification text for likes in cases where obj.actor is not set + - Fix missing pdl file for mod cover_photo + - Fix unable to create folders with name 0 + - Fix index name mixup in mysql schema file + - Fix missing semicolon in mysql schema file + - Removed unused variable + - Fix typo in manifest + - Fix cached jsonld files fetched via network + - Page rendering performance improvements + - Fix internal follow activity possibly creating notification items + - Fix admin table highlight color for dark mode + - Pubcrawl: do not handle not implemented listen activity + - Diaspora: fix unshare not implemented + + Hubzilla 8.6.1 (2023-07-18) - Fix diaspora discovery -- cgit v1.2.3 From 1426b7a6dc56250bc528c21028975ac9d68a2d95 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 27 Aug 2023 20:29:30 +0000 Subject: order by hubloc_id like everywhere else for this reason and do not include deleted hublocs --- include/channel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/channel.php b/include/channel.php index 2e8aefaaa..50cd77d6c 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1937,7 +1937,7 @@ function zid_init() { call_hooks('zid_init', $arr); if(! local_channel()) { - $r = q("select hubloc_url, hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' order by hubloc_connected desc", + $r = q("select hubloc_url, hubloc_hash, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_deleted = 0 order by hubloc_id desc", dbesc($tmp_str) ); if(! $r) { -- cgit v1.2.3 From 053a247cc86f9f3a7ab0b393bfec43b3b231f73d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 28 Aug 2023 08:11:32 +0000 Subject: work around sabre caldav php warnings --- Zotlabs/Module/Cdav.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php index b6d7ff5a3..892f02d10 100644 --- a/Zotlabs/Module/Cdav.php +++ b/Zotlabs/Module/Cdav.php @@ -1087,7 +1087,11 @@ class Cdav extends Controller { $filters['name'] = 'VCALENDAR'; $filters['prop-filters'][0]['name'] = 'VEVENT'; + $filters['prop-filters'][0]['is-not-defined'] = null; + $filters['prop-filters'][0]['param-filters'] = null; + $filters['prop-filters'][0]['text-match'] = null; $filters['comp-filters'][0]['name'] = 'VEVENT'; + $filters['comp-filters'][0]['is-not-defined'] = null; $filters['comp-filters'][0]['time-range']['start'] = $start; $filters['comp-filters'][0]['time-range']['end'] = $end; -- cgit v1.2.3 From e16aefec2c46760a1c78ce55dc82b801ef988689 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 30 Aug 2023 08:44:18 +0000 Subject: call init allthough it does not contain anything atm. it will set up things we need later e.g. App::$page["htmlhead"] and php will raise a warning if it does not exist. Also minor cleanup --- Zotlabs/Module/Display.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 1a1c09d7c..31f6bb7a4 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -2,15 +2,13 @@ namespace Zotlabs\Module; use App; +use Zotlabs\Web\Controller; -require_once("include/bbcode.php"); -require_once('include/security.php'); -require_once('include/conversation.php'); -require_once('include/acl_selectors.php'); -require_once('include/items.php'); +class Display extends Controller { + function init() { -class Display extends \Zotlabs\Web\Controller { + } function get($update = 0, $load = false) { -- cgit v1.2.3 From 52c0631833cab9b8e9f12ea986a657cf53781690 Mon Sep 17 00:00:00 2001 From: "mjfriaza:4GF~eYj,-iAv" Date: Sat, 2 Sep 2023 16:23:55 +0200 Subject: Update Spanish strings (cherry picked from commit 847732bd8ac4b79f206981af7d90f183ee8ea58a) --- view/es-es/hmessages.po | 966 +++++++++++++++++++++++++----------------------- view/es-es/hstrings.php | 20 +- 2 files changed, 513 insertions(+), 473 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 8d4c4ea60..3fab2e78f 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-07 08:37+0000\n" +"POT-Creation-Date: 2023-07-04 17:57+0000\n" "PO-Revision-Date: 2015-09-27 06:48+0000\n" "Last-Translator: Manuel Jiménez Friaza , 2017-2023\n" "Language-Team: Spanish (Spain) (http://app.transifex.com/Friendica/hubzilla/language/es_ES/)\n" @@ -24,16 +24,12 @@ msgstr "" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n" -#: ../../store/[data]/smarty3/compiled/2cbde885645602969010e846a38817a1297aafb9_0.file.cover_photo.tpl.php:127 -msgid "Cover Photo" -msgstr "Imagen de portada del perfil" - #: ../../view/theme/redbasic/php/config.php:15 #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 #: ../../addon/cart/submodules/orderoptions.php:459 -#: ../../include/text.php:3466 ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../include/text.php:3502 ../../Zotlabs/Module/Admin/Site.php:245 msgid "Default" msgstr "Predeterminado" @@ -54,7 +50,7 @@ msgstr "Focus (predefinido)" #: ../../addon/statusnet/Mod_Statusnet.php:304 #: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:70 #: ../../addon/wppost/Mod_Wppost.php:107 -#: ../../addon/content_import/Mod_content_import.php:141 +#: ../../addon/content_import/Mod_content_import.php:140 #: ../../addon/openstreetmap/openstreetmap.php:155 #: ../../addon/ijpost/Mod_Ijpost.php:72 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:62 @@ -72,11 +68,11 @@ msgstr "Focus (predefinido)" #: ../../addon/nofed/Mod_Nofed.php:51 #: ../../addon/smileybutton/Mod_Smileybutton.php:53 #: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:87 -#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../addon/piwik/piwik.php:95 -#: ../../addon/workflow/workflow.php:1466 -#: ../../addon/workflow/workflow.php:1525 -#: ../../addon/workflow/workflow.php:1644 -#: ../../addon/workflow/workflow.php:2747 +#: ../../addon/diaspora/Mod_Diaspora.php:101 ../../addon/piwik/piwik.php:95 +#: ../../addon/workflow/workflow.php:1468 +#: ../../addon/workflow/workflow.php:1527 +#: ../../addon/workflow/workflow.php:1646 +#: ../../addon/workflow/workflow.php:2749 #: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94 #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:54 ../../addon/hubwall/hubwall.php:95 @@ -131,14 +127,14 @@ msgstr "Focus (predefinido)" #: ../../Zotlabs/Module/Settings/Connections.php:42 #: ../../Zotlabs/Module/Settings/Photos.php:42 #: ../../Zotlabs/Module/Settings/Profiles.php:52 -#: ../../Zotlabs/Module/Settings/Privacy.php:114 +#: ../../Zotlabs/Module/Settings/Privacy.php:122 #: ../../Zotlabs/Module/Settings/Conversation.php:49 #: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Pconfig.php:117 #: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328 #: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:137 #: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Locs.php:125 #: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:160 -#: ../../Zotlabs/Lib/ThreadItem.php:828 ../../Zotlabs/Storage/Browser.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../Zotlabs/Storage/Browser.php:385 msgid "Submit" msgstr "Enviar" @@ -173,8 +169,8 @@ msgstr "Modo oscuro por defecto" #: ../../addon/statusnet/Mod_Statusnet.php:289 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/wppost/Mod_Wppost.php:84 #: ../../addon/wppost/Mod_Wppost.php:88 ../../addon/wppost/Mod_Wppost.php:92 +#: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 -#: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 @@ -206,7 +202,7 @@ msgstr "Modo oscuro por defecto" #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1478 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1483 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 #: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 @@ -226,10 +222,12 @@ msgstr "Modo oscuro por defecto" #: ../../Zotlabs/Module/Settings/Channel.php:224 #: ../../Zotlabs/Module/Settings/Multifactor.php:82 #: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:124 -#: ../../Zotlabs/Module/Settings/Privacy.php:125 -#: ../../Zotlabs/Module/Settings/Privacy.php:126 -#: ../../Zotlabs/Module/Settings/Privacy.php:127 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Connedit.php:622 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 @@ -252,8 +250,8 @@ msgstr "No" #: ../../addon/statusnet/Mod_Statusnet.php:289 #: ../../addon/rtof/Mod_Rtof.php:47 ../../addon/wppost/Mod_Wppost.php:84 #: ../../addon/wppost/Mod_Wppost.php:88 ../../addon/wppost/Mod_Wppost.php:92 +#: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 -#: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 @@ -285,7 +283,7 @@ msgstr "No" #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1478 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1483 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 #: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 @@ -304,10 +302,12 @@ msgstr "No" #: ../../Zotlabs/Module/Settings/Channel.php:224 #: ../../Zotlabs/Module/Settings/Multifactor.php:82 #: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:124 -#: ../../Zotlabs/Module/Settings/Privacy.php:125 -#: ../../Zotlabs/Module/Settings/Privacy.php:126 -#: ../../Zotlabs/Module/Settings/Privacy.php:127 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Sources.php:122 #: ../../Zotlabs/Module/Sources.php:157 ../../Zotlabs/Lib/Libzotdir.php:165 @@ -461,18 +461,18 @@ msgstr "Añadir una nueva página" #: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 -#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2203 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2213 msgid "Markdown" msgstr "Markdown" #: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 #: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 -#: ../../include/text.php:2201 +#: ../../include/text.php:2211 msgid "BBcode" msgstr "BBcode" #: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 -#: ../../addon/wiki/Mod_Wiki.php:903 ../../include/text.php:2204 +#: ../../addon/wiki/Mod_Wiki.php:903 ../../include/text.php:2214 msgid "Text" msgstr "Texto" @@ -608,12 +608,12 @@ msgstr "Perfil no disponible" #: ../../addon/cards/Mod_Card_edit.php:51 ../../addon/cards/Mod_Cards.php:89 #: ../../addon/articles/Mod_Article_edit.php:51 #: ../../addon/articles/Mod_Articles.php:94 ../../include/photos.php:30 -#: ../../include/items.php:3913 ../../include/attach.php:156 +#: ../../include/items.php:3953 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 -#: ../../include/attach.php:329 ../../include/attach.php:424 -#: ../../include/attach.php:438 ../../include/attach.php:445 -#: ../../include/attach.php:527 ../../include/attach.php:1098 -#: ../../include/attach.php:1171 ../../include/attach.php:1336 +#: ../../include/attach.php:329 ../../include/attach.php:431 +#: ../../include/attach.php:445 ../../include/attach.php:452 +#: ../../include/attach.php:534 ../../include/attach.php:1106 +#: ../../include/attach.php:1179 ../../include/attach.php:1344 #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 #: ../../Zotlabs/Module/Attach_edit.php:106 @@ -621,8 +621,8 @@ msgstr "Perfil no disponible" #: ../../Zotlabs/Module/Setup.php:218 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:383 -#: ../../Zotlabs/Module/Channel.php:422 ../../Zotlabs/Module/Group.php:14 +#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:379 +#: ../../Zotlabs/Module/Channel.php:418 ../../Zotlabs/Module/Group.php:14 #: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 @@ -630,8 +630,8 @@ msgstr "Perfil no disponible" #: ../../Zotlabs/Module/Chat.php:116 #: ../../Zotlabs/Module/Channel_calendar.php:232 #: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:141 -#: ../../Zotlabs/Module/Item.php:495 ../../Zotlabs/Module/Item.php:514 -#: ../../Zotlabs/Module/Item.php:524 ../../Zotlabs/Module/Item.php:1408 +#: ../../Zotlabs/Module/Item.php:513 ../../Zotlabs/Module/Item.php:532 +#: ../../Zotlabs/Module/Item.php:542 ../../Zotlabs/Module/Item.php:1443 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 #: ../../Zotlabs/Module/Sharedwithme.php:19 @@ -767,7 +767,7 @@ msgid "Rename page" msgstr "Renombrar la página" #: ../../addon/wiki/Mod_Wiki.php:304 ../../addon/hsse/hsse.php:186 -#: ../../include/conversation.php:1447 ../../Zotlabs/Widget/Cdav.php:142 +#: ../../include/conversation.php:1452 ../../Zotlabs/Widget/Cdav.php:142 #: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Blocks.php:159 #: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Layouts.php:192 msgid "Share" @@ -789,7 +789,7 @@ msgstr "Comparación de revisiones" #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 #: ../../addon/cards/Mod_Card_edit.php:132 #: ../../addon/articles/Mod_Article_edit.php:130 -#: ../../include/conversation.php:1470 ../../include/conversation.php:1525 +#: ../../include/conversation.php:1475 ../../include/conversation.php:1530 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136 #: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Cdav.php:1049 @@ -824,27 +824,27 @@ msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" #: ../../addon/wiki/Mod_Wiki.php:397 ../../addon/hsse/hsse.php:208 -#: ../../include/conversation.php:1469 +#: ../../include/conversation.php:1474 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" #: ../../addon/wiki/Mod_Wiki.php:399 ../../addon/hsse/hsse.php:210 -#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1471 -#: ../../include/conversation.php:1524 +#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1476 +#: ../../include/conversation.php:1529 #: ../../Zotlabs/Module/Profile_photo.php:554 #: ../../Zotlabs/Module/Cover_photo.php:429 msgid "OK" msgstr "OK" #: ../../addon/wiki/Mod_Wiki.php:400 ../../addon/hsse/hsse.php:139 -#: ../../include/conversation.php:1390 +#: ../../include/conversation.php:1395 #: ../../Zotlabs/Module/Profile_photo.php:555 #: ../../Zotlabs/Module/Cover_photo.php:430 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" #: ../../addon/wiki/Mod_Wiki.php:401 ../../addon/hsse/hsse.php:140 -#: ../../include/conversation.php:1391 +#: ../../include/conversation.php:1396 #: ../../Zotlabs/Module/Profile_photo.php:556 #: ../../Zotlabs/Module/Cover_photo.php:431 msgid "Choose an album" @@ -857,21 +857,21 @@ msgid "Choose a different album" msgstr "Elegir un álbum diferente..." #: ../../addon/wiki/Mod_Wiki.php:403 ../../addon/hsse/hsse.php:142 -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1398 #: ../../Zotlabs/Module/Profile_photo.php:558 #: ../../Zotlabs/Module/Cover_photo.php:433 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" #: ../../addon/wiki/Mod_Wiki.php:404 ../../addon/hsse/hsse.php:143 -#: ../../include/conversation.php:1394 +#: ../../include/conversation.php:1399 #: ../../Zotlabs/Module/Profile_photo.php:559 #: ../../Zotlabs/Module/Cover_photo.php:434 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" #: ../../addon/wiki/Mod_Wiki.php:405 ../../addon/hsse/hsse.php:144 -#: ../../include/conversation.php:1395 +#: ../../include/conversation.php:1400 #: ../../Zotlabs/Module/Profile_photo.php:560 #: ../../Zotlabs/Module/Cover_photo.php:435 msgid "Error getting album" @@ -1175,7 +1175,7 @@ msgstr "Nombre completo" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 #: ../../addon/redred/Mod_Redred.php:69 ../../addon/rtof/Mod_Rtof.php:55 -#: ../../include/network.php:1771 ../../Zotlabs/Module/Cdav.php:1368 +#: ../../include/network.php:1773 ../../Zotlabs/Module/Cdav.php:1368 #: ../../Zotlabs/Module/Admin/Accounts.php:316 #: ../../Zotlabs/Module/Admin/Accounts.php:330 #: ../../Zotlabs/Module/Connedit.php:736 @@ -1397,7 +1397,7 @@ msgstr "Tenga en cuenta que las estadísticas de Diaspora y Friendica se refiere msgid "Channel is required." msgstr "Se requiere un canal." -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:331 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:333 msgid "Invalid channel." msgstr "El canal no es válido." @@ -1443,7 +1443,7 @@ msgstr "Se han importado las fotos" #: ../../addon/redphotos/redphotos.php:119 #: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 -#: ../../include/items.php:444 ../../Zotlabs/Module/Import_items.php:116 +#: ../../include/items.php:447 ../../Zotlabs/Module/Import_items.php:116 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:108 #: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Share.php:72 #: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Dreport.php:10 @@ -1491,10 +1491,10 @@ msgid "0 or blank to import all available" msgstr "0 o en blanco para importar todos los disponibles" #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1647 -#: ../../include/text.php:2342 ../../include/conversation.php:138 +#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1693 +#: ../../include/text.php:2352 ../../include/conversation.php:138 #: ../../Zotlabs/Module/Like.php:453 ../../Zotlabs/Module/Tagger.php:71 -#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3618 +#: ../../Zotlabs/Module/Subthread.php:115 ../../Zotlabs/Lib/Activity.php:3690 msgid "photo" msgstr "foto" @@ -1729,186 +1729,186 @@ msgstr "Publicar en Wordpress" msgid "No server specified" msgstr "No se ha especificado ningún servidor" -#: ../../addon/content_import/Mod_content_import.php:73 +#: ../../addon/content_import/Mod_content_import.php:72 msgid "Posts imported" msgstr "Entradas importadas" -#: ../../addon/content_import/Mod_content_import.php:113 +#: ../../addon/content_import/Mod_content_import.php:112 msgid "Files imported" msgstr "Ficheros importados" -#: ../../addon/content_import/Mod_content_import.php:134 +#: ../../addon/content_import/Mod_content_import.php:133 #: ../../Zotlabs/Lib/Apps.php:337 msgid "Content Import" msgstr "Importación de contenidos" -#: ../../addon/content_import/Mod_content_import.php:135 +#: ../../addon/content_import/Mod_content_import.php:134 msgid "" "This will import all your conversations and cloud files from a cloned " "channel on another server. This may take a while if you have lots of posts " "and or files." msgstr "Esto importará todas sus conversaciones y archivos de nube de un canal clonado en otro servidor. El proceso puede tardar un poco si tiene muchos mensajes y/o ficheros." -#: ../../addon/content_import/Mod_content_import.php:136 +#: ../../addon/content_import/Mod_content_import.php:135 msgid "Include posts" msgstr "Incluir entradas" -#: ../../addon/content_import/Mod_content_import.php:136 +#: ../../addon/content_import/Mod_content_import.php:135 msgid "Conversations, Articles, Cards, and other posted content" msgstr "Conversaciones, artículos, fichas y otros contenidos publicados" -#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:136 msgid "Include files" msgstr "Incluir ficheros" -#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:136 msgid "Files, Photos and other cloud storage" msgstr "Archivos, fotos y otro tipo de almacenamiento en la nube" -#: ../../addon/content_import/Mod_content_import.php:138 +#: ../../addon/content_import/Mod_content_import.php:137 msgid "Original Server base URL" msgstr "URL base del servidor original" -#: ../../addon/content_import/Mod_content_import.php:139 +#: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/hzfiles/hzfiles.php:84 msgid "Since modified date yyyy-mm-dd" msgstr "Modificado desde la fecha yyyy-mm-dd" -#: ../../addon/content_import/Mod_content_import.php:140 +#: ../../addon/content_import/Mod_content_import.php:139 #: ../../addon/hzfiles/hzfiles.php:85 msgid "Until modified date yyyy-mm-dd" msgstr "Modificado hasta la fecha yyyy-mm-dd" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1335 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1340 msgid "Set your location" msgstr "Establecer su ubicación" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1336 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1341 msgid "Clear browser location" msgstr "Eliminar los datos de localización geográfica del navegador" #: ../../addon/hsse/hsse.php:95 ../../addon/cards/Mod_Card_edit.php:101 #: ../../addon/articles/Mod_Article_edit.php:99 -#: ../../include/conversation.php:1348 +#: ../../include/conversation.php:1353 #: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Chat.php:219 #: ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "Insertar enlace web" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1352 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1357 msgid "Embed (existing) photo from your photo albums" msgstr "Insertar una foto (existente) de sus álbumes" -#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1385 +#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1390 #: ../../Zotlabs/Module/Chat.php:217 msgid "Please enter a link URL:" msgstr "Por favor, introduzca la dirección del enlace:" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1386 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1391 msgid "Tag term:" msgstr "Término de la etiqueta:" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1387 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1392 msgid "Where are you right now?" msgstr "¿Donde está ahora?" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1392 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1397 msgid "Choose a different album..." msgstr "Elegir un álbum diferente..." -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1396 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1401 msgid "Comments enabled" msgstr "Comentarios habilitados" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1397 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1402 msgid "Comments disabled" msgstr "Comentarios deshabilitados" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1414 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1419 #: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Photos.php:1094 -#: ../../Zotlabs/Lib/ThreadItem.php:838 +#: ../../Zotlabs/Lib/ThreadItem.php:841 msgid "Preview" msgstr "Previsualizar" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1456 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1461 msgid "Page link name" msgstr "Nombre del enlace de la página" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1459 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1464 msgid "Post as" msgstr "Publicar como" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1461 -#: ../../Zotlabs/Lib/ThreadItem.php:829 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1466 +#: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Bold" msgstr "Negrita" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1462 -#: ../../Zotlabs/Lib/ThreadItem.php:830 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1467 +#: ../../Zotlabs/Lib/ThreadItem.php:833 msgid "Italic" msgstr "Itálico " -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1463 -#: ../../Zotlabs/Lib/ThreadItem.php:831 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1468 +#: ../../Zotlabs/Lib/ThreadItem.php:834 msgid "Underline" msgstr "Subrayar" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1464 -#: ../../Zotlabs/Lib/ThreadItem.php:832 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1469 +#: ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Quote" msgstr "Citar" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1465 -#: ../../Zotlabs/Lib/ThreadItem.php:833 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1470 +#: ../../Zotlabs/Lib/ThreadItem.php:836 msgid "Code" msgstr "Código" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1466 -#: ../../Zotlabs/Lib/ThreadItem.php:835 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1471 +#: ../../Zotlabs/Lib/ThreadItem.php:838 msgid "Attach/Upload file" msgstr "Adjuntar/cargar fichero" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1473 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1478 msgid "Toggle voting" msgstr "Cambiar votación" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1480 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1485 msgid "Disable comments" msgstr "Dehabilitar los comentarios" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1481 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1486 msgid "Toggle comments" msgstr "Activar o desactivar los comentarios" #: ../../addon/hsse/hsse.php:221 ../../addon/cards/Mod_Card_edit.php:118 #: ../../addon/articles/Mod_Article_edit.php:116 -#: ../../include/conversation.php:1487 ../../Zotlabs/Module/Editblock.php:129 +#: ../../include/conversation.php:1492 ../../Zotlabs/Module/Editblock.php:129 #: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1039 msgid "Title (optional)" msgstr "Título (opcional)" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1491 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1496 msgid "Categories (optional, comma-separated list)" msgstr "Temas (opcional, lista separada por comas)" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1492 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1497 msgid "Permission settings" msgstr "Configuración de permisos" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1514 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1519 msgid "Other networks and post services" msgstr "Otras redes y servicios de publicación" -#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1517 +#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1522 msgid "Set expiration date" msgstr "Configurar fecha de caducidad" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1520 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1525 msgid "Set publish date" msgstr "Establecer la fecha de publicación" -#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1522 -#: ../../Zotlabs/Module/Chat.php:218 ../../Zotlabs/Lib/ThreadItem.php:841 +#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1527 +#: ../../Zotlabs/Module/Chat.php:218 ../../Zotlabs/Lib/ThreadItem.php:844 msgid "Encrypt text" msgstr "Cifrar texto" @@ -2112,24 +2112,24 @@ msgid "Enter some text" msgstr "Escribir algún texto" #: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:2002 -#: ../../include/network.php:1770 ../../Zotlabs/Lib/Activity.php:3660 +#: ../../include/network.php:1772 ../../Zotlabs/Lib/Activity.php:3732 msgid "ActivityPub" msgstr "ActivityPub" -#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1647 +#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1693 #: ../../Zotlabs/Module/Like.php:453 ../../Zotlabs/Module/Subthread.php:115 msgid "status" msgstr "el mensaje de estado " -#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1591 +#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1628 #: ../../include/conversation.php:184 ../../Zotlabs/Module/Like.php:485 -#: ../../Zotlabs/Lib/Activity.php:3651 +#: ../../Zotlabs/Lib/Activity.php:3723 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" #: ../../addon/pubcrawl/as.php:1995 ../../include/conversation.php:187 -#: ../../Zotlabs/Module/Like.php:487 ../../Zotlabs/Lib/Activity.php:3653 +#: ../../Zotlabs/Module/Like.php:487 ../../Zotlabs/Lib/Activity.php:3725 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" @@ -3094,7 +3094,7 @@ msgstr "Ocultar el botón y mostrar los smilies directamente." msgid "Smileybutton Settings" msgstr "Ajustes de Smileybutton" -#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2122 +#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2147 msgid "file" msgstr "fichero" @@ -3123,7 +3123,7 @@ msgstr "La dirección de una transmisión de diaspora. Ejemplo: relay@diasporare msgid "Diaspora relay could not be imported" msgstr "El reenvío de Diaspora no ha podido ser importado" -#: ../../addon/diaspora/diaspora.php:1066 +#: ../../addon/diaspora/diaspora.php:1069 msgid "No subject" msgstr "Sin tema" @@ -3155,49 +3155,39 @@ msgid "" "locations." msgstr "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos." -#: ../../addon/diaspora/Mod_Diaspora.php:75 -msgid "Allow any Diaspora member to comment or like your public posts" -msgstr "Permitir que cualquier miembro de Diaspora comente o ponga un like en sus entradas públicas" - -#: ../../addon/diaspora/Mod_Diaspora.php:75 -msgid "" -"If this setting is disabled only your contacts will be able to comment or " -"like your public posts" -msgstr "Si esta configuración está desactivada, sólo sus contactos podrán comentar o dar a \"me gusta\" en sus publicaciones públicas" - -#: ../../addon/diaspora/Mod_Diaspora.php:79 +#: ../../addon/diaspora/Mod_Diaspora.php:80 msgid "Prevent your hashtags from being redirected to other sites" msgstr "Impedir que sus \"hashtags\" sean redirigidos a otros sitios " -#: ../../addon/diaspora/Mod_Diaspora.php:83 +#: ../../addon/diaspora/Mod_Diaspora.php:84 msgid "" "Sign and forward posts and comments with no existing Diaspora signature" msgstr "Firmar y enviar entradas y comentarios sin firma de Diaspora" -#: ../../addon/diaspora/Mod_Diaspora.php:88 +#: ../../addon/diaspora/Mod_Diaspora.php:89 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "\"Hashtags\" seguidos (separados por comas, sin incluir #)" -#: ../../addon/diaspora/Mod_Diaspora.php:97 +#: ../../addon/diaspora/Mod_Diaspora.php:98 msgid "Diaspora Protocol" msgstr "Protocolo Diaspora" -#: ../../addon/diaspora/Receiver.php:1595 +#: ../../addon/diaspora/Receiver.php:1632 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "a %1$s no le gusta el %3$s de %2$s" -#: ../../addon/diaspora/Receiver.php:2206 ../../Zotlabs/Module/Like.php:495 +#: ../../addon/diaspora/Receiver.php:2251 ../../Zotlabs/Module/Like.php:495 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s participa" -#: ../../addon/diaspora/Receiver.php:2208 ../../Zotlabs/Module/Like.php:497 +#: ../../addon/diaspora/Receiver.php:2253 ../../Zotlabs/Module/Like.php:497 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%3$s de %2$s: %1$s no participa" -#: ../../addon/diaspora/Receiver.php:2210 ../../Zotlabs/Module/Like.php:499 +#: ../../addon/diaspora/Receiver.php:2255 ../../Zotlabs/Module/Like.php:499 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%3$s de %2$s: %1$s quizá participe" @@ -3250,67 +3240,67 @@ msgstr "Esta funcionalidad requiere Piwik >= 2.2.0" msgid "Workflow user." msgstr "Usuario de Workflow." -#: ../../addon/workflow/workflow.php:272 +#: ../../addon/workflow/workflow.php:273 msgid "This channel" msgstr "Este canal" -#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123 +#: ../../addon/workflow/workflow.php:286 ../../Zotlabs/Module/Locs.php:123 msgid "Primary" msgstr "Primario" -#: ../../addon/workflow/workflow.php:327 +#: ../../addon/workflow/workflow.php:328 msgid "Create New Workflow Item" msgstr "Crear un nuevo elemento de flujo de trabajo" -#: ../../addon/workflow/workflow.php:546 -#: ../../addon/workflow/workflow.php:1442 -#: ../../addon/workflow/workflow.php:1461 +#: ../../addon/workflow/workflow.php:547 +#: ../../addon/workflow/workflow.php:1444 +#: ../../addon/workflow/workflow.php:1463 msgid "Workflow" msgstr "Workflow" -#: ../../addon/workflow/workflow.php:1430 +#: ../../addon/workflow/workflow.php:1432 msgid "No Workflows Available" msgstr "No hay flujos de trabajo disponibles" -#: ../../addon/workflow/workflow.php:1460 +#: ../../addon/workflow/workflow.php:1462 msgid "Add item to which workflow" msgstr "A qué Workflow añadir un elemento" -#: ../../addon/workflow/workflow.php:1520 -#: ../../addon/workflow/workflow.php:1639 +#: ../../addon/workflow/workflow.php:1522 +#: ../../addon/workflow/workflow.php:1641 msgid "Create Workflow Item" msgstr "Crear elemento de Workflow" -#: ../../addon/workflow/workflow.php:2601 +#: ../../addon/workflow/workflow.php:2603 msgid "Link" msgstr "Enlazar" -#: ../../addon/workflow/workflow.php:2603 +#: ../../addon/workflow/workflow.php:2605 msgid "Web link." msgstr "Enlace Web." -#: ../../addon/workflow/workflow.php:2622 -#: ../../addon/workflow/workflow.php:2683 ../../Zotlabs/Module/Cdav.php:1366 +#: ../../addon/workflow/workflow.php:2624 +#: ../../addon/workflow/workflow.php:2685 ../../Zotlabs/Module/Cdav.php:1366 #: ../../Zotlabs/Module/Connedit.php:734 msgid "Title" msgstr "Título" -#: ../../addon/workflow/workflow.php:2624 -#: ../../addon/workflow/workflow.php:2685 +#: ../../addon/workflow/workflow.php:2626 +#: ../../addon/workflow/workflow.php:2687 msgid "Brief description or title" msgstr "Breve descripción o título" -#: ../../addon/workflow/workflow.php:2630 ../../Zotlabs/Widget/Notes.php:38 +#: ../../addon/workflow/workflow.php:2632 ../../Zotlabs/Widget/Notes.php:38 #: ../../Zotlabs/Lib/Apps.php:375 msgid "Notes" msgstr "Notas" -#: ../../addon/workflow/workflow.php:2632 -#: ../../addon/workflow/workflow.php:2693 +#: ../../addon/workflow/workflow.php:2634 +#: ../../addon/workflow/workflow.php:2695 msgid "Notes and Info" msgstr "Notas e información" -#: ../../addon/workflow/workflow.php:2691 +#: ../../addon/workflow/workflow.php:2693 msgid "Body" msgstr "Cuerpo" @@ -3516,7 +3506,7 @@ msgstr "Elemento no encontrado" #: ../../addon/cards/Mod_Card_edit.php:44 #: ../../addon/articles/Mod_Article_edit.php:44 #: ../../Zotlabs/Module/Attach_edit.php:52 -#: ../../Zotlabs/Module/Wall_upload.php:31 +#: ../../Zotlabs/Module/Wall_upload.php:30 #: ../../Zotlabs/Module/Chanview.php:95 ../../Zotlabs/Module/Cal.php:31 #: ../../Zotlabs/Module/Attach.php:22 ../../Zotlabs/Module/Page.php:75 #: ../../Zotlabs/Module/Block.php:41 @@ -3544,7 +3534,8 @@ msgstr "Editar la ficha" #: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Oauth2.php:193 #: ../../Zotlabs/Module/Thing.php:269 ../../Zotlabs/Module/Connedit.php:540 #: ../../Zotlabs/Module/Connedit.php:749 ../../Zotlabs/Lib/Apps.php:602 -#: ../../Zotlabs/Lib/ThreadItem.php:179 ../../Zotlabs/Storage/Browser.php:387 +#: ../../Zotlabs/Lib/ThreadItem.php:179 ../../Zotlabs/Lib/ThreadItem.php:509 +#: ../../Zotlabs/Storage/Browser.php:387 msgid "Delete" msgstr "Eliminar" @@ -3567,8 +3558,8 @@ msgid "Add Card" msgstr "Añadir una ficha" #: ../../addon/cards/Mod_Cards.php:116 -#: ../../addon/articles/Mod_Articles.php:120 ../../include/text.php:1169 -#: ../../include/text.php:1181 ../../Zotlabs/Module/Admin/Queueworker.php:114 +#: ../../addon/articles/Mod_Articles.php:120 ../../include/text.php:1171 +#: ../../include/text.php:1183 ../../Zotlabs/Module/Admin/Queueworker.php:114 #: ../../Zotlabs/Module/Admin/Profs.php:94 #: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54 #: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103 @@ -3608,7 +3599,7 @@ msgid "Set/edit permissions" msgstr "Establecer/editar los permisos" #: ../../addon/flashcards/Mod_Flashcards.php:291 -#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3836 +#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3876 #: ../../Zotlabs/Module/Filestorage.php:29 #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:263 @@ -4078,47 +4069,47 @@ msgstr "más antiguas" msgid "newer" msgstr "más recientes" -#: ../../include/text.php:1056 ../../include/features.php:133 +#: ../../include/text.php:1058 ../../include/features.php:133 #: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Lib/Apps.php:338 msgid "Connections" msgstr "Conexiones" -#: ../../include/text.php:1064 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../include/text.php:1066 ../../Zotlabs/Module/Viewconnections.php:80 #: ../../Zotlabs/Module/Connections.php:306 msgid "Accepts" msgstr "Se acepta" -#: ../../include/text.php:1067 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../include/text.php:1069 ../../Zotlabs/Module/Viewconnections.php:83 #: ../../Zotlabs/Module/Connections.php:309 msgid "Comments" msgstr "Comentarios" -#: ../../include/text.php:1072 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../include/text.php:1074 ../../Zotlabs/Module/Viewconnections.php:88 #: ../../Zotlabs/Module/Connections.php:314 msgid "Stream items" msgstr "Elementos del stream" -#: ../../include/text.php:1077 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../include/text.php:1079 ../../Zotlabs/Module/Viewconnections.php:93 #: ../../Zotlabs/Module/Connections.php:319 msgid "Wall posts" msgstr "Entradas del Muro" -#: ../../include/text.php:1081 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../include/text.php:1083 ../../Zotlabs/Module/Viewconnections.php:97 #: ../../Zotlabs/Module/Connections.php:323 msgid "Nothing" msgstr "Nada" -#: ../../include/text.php:1094 +#: ../../include/text.php:1096 #, php-format msgid "View all %s connections" msgstr "Ver todas las %s conexiones" -#: ../../include/text.php:1157 +#: ../../include/text.php:1159 #, php-format msgid "Network: %s" msgstr "Red %s" -#: ../../include/text.php:1168 ../../include/text.php:1180 +#: ../../include/text.php:1170 ../../include/text.php:1182 #: ../../include/nav.php:195 ../../include/acl_selectors.php:149 #: ../../Zotlabs/Widget/Sitesearch.php:37 #: ../../Zotlabs/Widget/Activity_filter.php:210 @@ -4127,209 +4118,209 @@ msgstr "Red %s" msgid "Search" msgstr "Buscar" -#: ../../include/text.php:1260 +#: ../../include/text.php:1262 msgid "poke" msgstr "un toque" -#: ../../include/text.php:1260 ../../include/conversation.php:277 +#: ../../include/text.php:1262 ../../include/conversation.php:277 msgid "poked" msgstr "ha dado un toque a" -#: ../../include/text.php:1261 +#: ../../include/text.php:1263 msgid "ping" msgstr "un \"ping\"" -#: ../../include/text.php:1261 +#: ../../include/text.php:1263 msgid "pinged" msgstr "ha enviado un \"ping\" a" -#: ../../include/text.php:1290 +#: ../../include/text.php:1292 msgid "happy" msgstr "feliz " -#: ../../include/text.php:1291 +#: ../../include/text.php:1293 msgid "sad" msgstr "triste " -#: ../../include/text.php:1292 +#: ../../include/text.php:1294 msgid "mellow" msgstr "tranquilo/a" -#: ../../include/text.php:1293 +#: ../../include/text.php:1295 msgid "tired" msgstr "cansado/a " -#: ../../include/text.php:1294 +#: ../../include/text.php:1296 msgid "perky" msgstr "vivaz" -#: ../../include/text.php:1295 +#: ../../include/text.php:1297 msgid "angry" msgstr "enfadado/a" -#: ../../include/text.php:1296 +#: ../../include/text.php:1298 msgid "stupefied" msgstr "asombrado/a" -#: ../../include/text.php:1297 +#: ../../include/text.php:1299 msgid "puzzled" msgstr "perplejo/a" -#: ../../include/text.php:1298 +#: ../../include/text.php:1300 msgid "interested" msgstr "interesado/a" -#: ../../include/text.php:1299 +#: ../../include/text.php:1301 msgid "bitter" msgstr "amargado/a" -#: ../../include/text.php:1300 +#: ../../include/text.php:1302 msgid "cheerful" msgstr "alegre" -#: ../../include/text.php:1301 +#: ../../include/text.php:1303 msgid "alive" msgstr "animado/a" -#: ../../include/text.php:1302 +#: ../../include/text.php:1304 msgid "annoyed" msgstr "molesto/a" -#: ../../include/text.php:1303 +#: ../../include/text.php:1305 msgid "anxious" msgstr "ansioso/a" -#: ../../include/text.php:1304 +#: ../../include/text.php:1306 msgid "cranky" msgstr "de mal humor" -#: ../../include/text.php:1305 +#: ../../include/text.php:1307 msgid "disturbed" msgstr "perturbado/a" -#: ../../include/text.php:1306 +#: ../../include/text.php:1308 msgid "frustrated" msgstr "frustrado/a" -#: ../../include/text.php:1307 +#: ../../include/text.php:1309 msgid "depressed" msgstr "deprimido/a" -#: ../../include/text.php:1308 +#: ../../include/text.php:1310 msgid "motivated" msgstr "motivado/a" -#: ../../include/text.php:1309 +#: ../../include/text.php:1311 msgid "relaxed" msgstr "relajado/a" -#: ../../include/text.php:1310 +#: ../../include/text.php:1312 msgid "surprised" msgstr "sorprendido/a" -#: ../../include/text.php:1498 ../../include/js_strings.php:100 +#: ../../include/text.php:1500 ../../include/js_strings.php:100 msgid "Monday" msgstr "lunes" -#: ../../include/text.php:1498 ../../include/js_strings.php:101 +#: ../../include/text.php:1500 ../../include/js_strings.php:101 msgid "Tuesday" msgstr "martes" -#: ../../include/text.php:1498 ../../include/js_strings.php:102 +#: ../../include/text.php:1500 ../../include/js_strings.php:102 msgid "Wednesday" msgstr "miércoles" -#: ../../include/text.php:1498 ../../include/js_strings.php:103 +#: ../../include/text.php:1500 ../../include/js_strings.php:103 msgid "Thursday" msgstr "jueves" -#: ../../include/text.php:1498 ../../include/js_strings.php:104 +#: ../../include/text.php:1500 ../../include/js_strings.php:104 msgid "Friday" msgstr "viernes" -#: ../../include/text.php:1498 ../../include/js_strings.php:105 +#: ../../include/text.php:1500 ../../include/js_strings.php:105 msgid "Saturday" msgstr "sábado" -#: ../../include/text.php:1498 ../../include/js_strings.php:99 +#: ../../include/text.php:1500 ../../include/js_strings.php:99 msgid "Sunday" msgstr "domingo" -#: ../../include/text.php:1502 ../../include/js_strings.php:75 +#: ../../include/text.php:1504 ../../include/js_strings.php:75 msgid "January" msgstr "enero" -#: ../../include/text.php:1502 ../../include/js_strings.php:76 +#: ../../include/text.php:1504 ../../include/js_strings.php:76 msgid "February" msgstr "febrero" -#: ../../include/text.php:1502 ../../include/js_strings.php:77 +#: ../../include/text.php:1504 ../../include/js_strings.php:77 msgid "March" msgstr "marzo" -#: ../../include/text.php:1502 ../../include/js_strings.php:78 +#: ../../include/text.php:1504 ../../include/js_strings.php:78 msgid "April" msgstr "abril" -#: ../../include/text.php:1502 +#: ../../include/text.php:1504 msgid "May" msgstr "mayo" -#: ../../include/text.php:1502 ../../include/js_strings.php:80 +#: ../../include/text.php:1504 ../../include/js_strings.php:80 msgid "June" msgstr "junio" -#: ../../include/text.php:1502 ../../include/js_strings.php:81 +#: ../../include/text.php:1504 ../../include/js_strings.php:81 msgid "July" msgstr "julio" -#: ../../include/text.php:1502 ../../include/js_strings.php:82 +#: ../../include/text.php:1504 ../../include/js_strings.php:82 msgid "August" msgstr "agosto" -#: ../../include/text.php:1502 ../../include/js_strings.php:83 +#: ../../include/text.php:1504 ../../include/js_strings.php:83 msgid "September" msgstr "septiembre" -#: ../../include/text.php:1502 ../../include/js_strings.php:84 +#: ../../include/text.php:1504 ../../include/js_strings.php:84 msgid "October" msgstr "octubre" -#: ../../include/text.php:1502 ../../include/js_strings.php:85 +#: ../../include/text.php:1504 ../../include/js_strings.php:85 msgid "November" msgstr "noviembre" -#: ../../include/text.php:1502 ../../include/js_strings.php:86 +#: ../../include/text.php:1504 ../../include/js_strings.php:86 msgid "December" msgstr "diciembre" -#: ../../include/text.php:1568 -msgid "Unknown Attachment" +#: ../../include/text.php:1578 +msgid "Unknown attachment" msgstr "Adjunto no reconocido" -#: ../../include/text.php:1570 ../../Zotlabs/Module/Sharedwithme.php:109 +#: ../../include/text.php:1581 ../../Zotlabs/Module/Sharedwithme.php:109 #: ../../Zotlabs/Storage/Browser.php:382 msgid "Size" msgstr "Tamaño" -#: ../../include/text.php:1570 ../../include/feedutils.php:871 +#: ../../include/text.php:1581 ../../include/feedutils.php:871 msgid "unknown" msgstr "desconocido" -#: ../../include/text.php:1613 +#: ../../include/text.php:1623 msgid "remove category" msgstr "eliminar el tema" -#: ../../include/text.php:1690 +#: ../../include/text.php:1700 msgid "remove from file" msgstr "eliminar del fichero" -#: ../../include/text.php:1877 +#: ../../include/text.php:1887 msgid "Download binary/encrypted content" msgstr "Descargar contenido binario o cifrado" -#: ../../include/text.php:1935 ../../include/text.php:1944 -#: ../../include/text.php:1971 ../../include/text.php:1980 +#: ../../include/text.php:1945 ../../include/text.php:1954 +#: ../../include/text.php:1981 ../../include/text.php:1990 #, php-format msgctxt "noun" msgid "%d Vote" @@ -4338,7 +4329,7 @@ msgstr[0] "%dVoto" msgstr[1] "%dVotos" msgstr[2] "%dVotos" -#: ../../include/text.php:1987 +#: ../../include/text.php:1997 #, php-format msgctxt "noun" msgid "%d Vote in total" @@ -4347,162 +4338,162 @@ msgstr[0] "%dVoto en total" msgstr[1] "%dVotos en total" msgstr[2] "%dVotos en total" -#: ../../include/text.php:1993 +#: ../../include/text.php:2003 msgid "Poll has ended" msgstr "La encuesta ha terminado" -#: ../../include/text.php:1996 +#: ../../include/text.php:2006 #, php-format msgid "Poll ends in %s" msgstr "La encuesta termina en %s" -#: ../../include/text.php:2003 ../../Zotlabs/Lib/ThreadItem.php:446 +#: ../../include/text.php:2013 ../../Zotlabs/Lib/ThreadItem.php:446 msgid "Vote" msgstr "Votar" -#: ../../include/text.php:2158 +#: ../../include/text.php:2168 msgid "Link to Source" msgstr "Enlazar con la entrada en su ubicación original" -#: ../../include/text.php:2183 ../../include/language.php:433 +#: ../../include/text.php:2193 ../../include/language.php:433 msgid "default" msgstr "por defecto" -#: ../../include/text.php:2191 +#: ../../include/text.php:2201 msgid "Page layout" msgstr "Plantilla de la página" -#: ../../include/text.php:2191 +#: ../../include/text.php:2201 msgid "You can create your own with the layouts tool" msgstr "Puede crear su propia disposición gráfica con la herramienta de plantillas" -#: ../../include/text.php:2202 +#: ../../include/text.php:2212 msgid "HTML" msgstr "HTML" -#: ../../include/text.php:2205 +#: ../../include/text.php:2215 msgid "Comanche Layout" msgstr "Plantilla de Comanche" -#: ../../include/text.php:2210 +#: ../../include/text.php:2220 msgid "PHP" msgstr "PHP" -#: ../../include/text.php:2222 +#: ../../include/text.php:2232 msgid "Page content type" msgstr "Tipo de contenido de la página" -#: ../../include/text.php:2345 ../../include/event.php:1356 +#: ../../include/text.php:2355 ../../include/event.php:1356 #: ../../include/conversation.php:142 #: ../../Zotlabs/Module/Channel_calendar.php:221 #: ../../Zotlabs/Module/Like.php:455 ../../Zotlabs/Module/Tagger.php:75 msgid "event" msgstr "el/su evento" -#: ../../include/text.php:2348 ../../include/conversation.php:168 +#: ../../include/text.php:2358 ../../include/conversation.php:168 #: ../../include/bbcode.php:566 ../../include/markdown.php:208 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3618 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3690 msgid "post" msgstr "la entrada" -#: ../../include/text.php:2350 ../../include/conversation.php:170 +#: ../../include/text.php:2360 ../../include/conversation.php:170 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "el comentario" -#: ../../include/text.php:2355 +#: ../../include/text.php:2365 msgid "activity" msgstr "la/su actividad" -#: ../../include/text.php:2358 +#: ../../include/text.php:2368 msgid "poll" msgstr "encuesta" -#: ../../include/text.php:2471 +#: ../../include/text.php:2481 msgid "a-z, 0-9, -, and _ only" msgstr "a-z, 0-9, -, and _ only" -#: ../../include/text.php:2776 +#: ../../include/text.php:2786 msgid "Design Tools" msgstr "Herramientas de diseño web" -#: ../../include/text.php:2779 ../../Zotlabs/Module/Blocks.php:152 +#: ../../include/text.php:2789 ../../Zotlabs/Module/Blocks.php:152 msgid "Blocks" msgstr "Bloques" -#: ../../include/text.php:2780 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2790 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "Menús" -#: ../../include/text.php:2781 ../../Zotlabs/Module/Layouts.php:182 +#: ../../include/text.php:2791 ../../Zotlabs/Module/Layouts.php:182 msgid "Layouts" msgstr "Plantillas" -#: ../../include/text.php:2782 +#: ../../include/text.php:2792 msgid "Pages" msgstr "Páginas" -#: ../../include/text.php:2794 +#: ../../include/text.php:2804 msgid "Import" msgstr "Importar" -#: ../../include/text.php:2795 +#: ../../include/text.php:2805 msgid "Import website..." msgstr "Importar un sitio web..." -#: ../../include/text.php:2796 +#: ../../include/text.php:2806 msgid "Select folder to import" msgstr "Seleccionar la carpeta que se va a importar" -#: ../../include/text.php:2797 +#: ../../include/text.php:2807 msgid "Import from a zipped folder:" msgstr "Importar desde una carpeta comprimida: " -#: ../../include/text.php:2798 +#: ../../include/text.php:2808 msgid "Import from cloud files:" msgstr "Importar desde los ficheros en la nube: " -#: ../../include/text.php:2799 +#: ../../include/text.php:2809 msgid "/cloud/channel/path/to/folder" msgstr "/cloud/canal/ruta/a la/carpeta" -#: ../../include/text.php:2800 +#: ../../include/text.php:2810 msgid "Enter path to website files" msgstr "Ruta a los ficheros del sitio web" -#: ../../include/text.php:2801 +#: ../../include/text.php:2811 msgid "Select folder" msgstr "Seleccionar la carpeta" -#: ../../include/text.php:2802 +#: ../../include/text.php:2812 msgid "Export website..." msgstr "Exportar un sitio web..." -#: ../../include/text.php:2803 +#: ../../include/text.php:2813 msgid "Export to a zip file" msgstr "Exportar a un fichero comprimido .zip" -#: ../../include/text.php:2804 +#: ../../include/text.php:2814 msgid "website.zip" msgstr "sitio_web.zip" -#: ../../include/text.php:2805 +#: ../../include/text.php:2815 msgid "Enter a name for the zip file." msgstr "Escriba un nombre para el fichero zip." -#: ../../include/text.php:2806 +#: ../../include/text.php:2816 msgid "Export to cloud files" msgstr "Exportar a la nube de ficheros" -#: ../../include/text.php:2807 +#: ../../include/text.php:2817 msgid "/path/to/export/folder" msgstr "/ruta/para/exportar/carpeta" -#: ../../include/text.php:2808 +#: ../../include/text.php:2818 msgid "Enter a path to a cloud files destination." msgstr "Escriba una ruta de destino a la nube de ficheros." -#: ../../include/text.php:2809 +#: ../../include/text.php:2819 msgid "Specify folder" msgstr "Especificar una carpeta" @@ -4564,42 +4555,42 @@ msgstr "En proceso" msgid "Cancelled" msgstr "Cancelado/a" -#: ../../include/event.php:1520 ../../include/connections.php:752 +#: ../../include/event.php:1520 ../../include/connections.php:781 #: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:741 msgid "Mobile" msgstr "Móvil" -#: ../../include/event.php:1521 ../../include/connections.php:753 +#: ../../include/event.php:1521 ../../include/connections.php:782 #: ../../Zotlabs/Widget/Notifications.php:43 #: ../../Zotlabs/Module/Cdav.php:1374 ../../Zotlabs/Module/Connedit.php:742 msgid "Home" msgstr "Inicio" -#: ../../include/event.php:1522 ../../include/connections.php:754 +#: ../../include/event.php:1522 ../../include/connections.php:783 msgid "Home, Voice" msgstr "Llamadas particulares" -#: ../../include/event.php:1523 ../../include/connections.php:755 +#: ../../include/event.php:1523 ../../include/connections.php:784 msgid "Home, Fax" msgstr "Fax particular" -#: ../../include/event.php:1524 ../../include/connections.php:756 +#: ../../include/event.php:1524 ../../include/connections.php:785 #: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:743 msgid "Work" msgstr "Trabajo" -#: ../../include/event.php:1525 ../../include/connections.php:757 +#: ../../include/event.php:1525 ../../include/connections.php:786 msgid "Work, Voice" msgstr "Llamadas de trabajo" -#: ../../include/event.php:1526 ../../include/connections.php:758 +#: ../../include/event.php:1526 ../../include/connections.php:787 msgid "Work, Fax" msgstr "Fax de trabajo" #: ../../include/event.php:1527 ../../include/event.php:1534 #: ../../include/selectors.php:64 ../../include/selectors.php:81 #: ../../include/selectors.php:119 ../../include/selectors.php:155 -#: ../../include/connections.php:759 ../../include/connections.php:766 +#: ../../include/connections.php:788 ../../include/connections.php:795 #: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:744 #: ../../Zotlabs/Access/PermissionRoles.php:360 msgid "Other" @@ -4935,7 +4926,7 @@ msgstr "Múltiples perfiles" msgid "Ability to create multiple profiles" msgstr "Capacidad de crear múltiples perfiles" -#: ../../include/security.php:630 +#: ../../include/security.php:633 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -4945,16 +4936,16 @@ msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrid msgid "Delete this item?" msgstr "¿Borrar este elemento?" -#: ../../include/js_strings.php:6 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Moderate.php:78 msgid "Item deleted" msgstr "Elemento eliminado" #: ../../include/js_strings.php:7 ../../Zotlabs/Module/Photos.php:1092 -#: ../../Zotlabs/Module/Photos.php:1205 ../../Zotlabs/Lib/ThreadItem.php:827 +#: ../../Zotlabs/Module/Photos.php:1205 ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Comment" msgstr "Comentar" -#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:536 +#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:539 #, php-format msgid "%s show all" msgstr "%s mostrar todo" @@ -5365,43 +5356,43 @@ msgstr "cadena_de_error: " msgid "content-type: " msgstr "tipo de contenido: " -#: ../../include/network.php:1765 ../../include/network.php:1766 +#: ../../include/network.php:1767 ../../include/network.php:1768 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1767 +#: ../../include/network.php:1769 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1768 +#: ../../include/network.php:1770 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1769 +#: ../../include/network.php:1771 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1772 +#: ../../include/network.php:1774 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1773 +#: ../../include/network.php:1775 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1774 +#: ../../include/network.php:1776 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1775 +#: ../../include/network.php:1777 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1776 +#: ../../include/network.php:1778 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1777 +#: ../../include/network.php:1779 msgid "MySpace" msgstr "MySpace" @@ -5822,7 +5813,7 @@ msgstr "Resumen: " #: ../../Zotlabs/Widget/Portfolio.php:99 #: ../../Zotlabs/Module/Embedphotos.php:177 #: ../../Zotlabs/Module/Photos.php:788 ../../Zotlabs/Module/Photos.php:1245 -#: ../../Zotlabs/Lib/Activity.php:1625 ../../Zotlabs/Lib/Apps.php:1152 +#: ../../Zotlabs/Lib/Activity.php:1681 ../../Zotlabs/Lib/Apps.php:1152 #: ../../Zotlabs/Lib/Apps.php:1236 msgid "Unknown" msgstr "Desconocido" @@ -5949,6 +5940,7 @@ msgstr "Firma de mensaje incorrecta" #: ../../Zotlabs/Module/Admin/Accounts.php:318 #: ../../Zotlabs/Module/Connections.php:358 #: ../../Zotlabs/Module/Connections.php:409 +#: ../../Zotlabs/Lib/ThreadItem.php:508 msgid "Approve" msgstr "Aprobar" @@ -6020,7 +6012,7 @@ msgstr "Dejar de seguir este hilo" msgid "Recent Activity" msgstr "Actividad reciente" -#: ../../include/conversation.php:1120 ../../include/connections.php:112 +#: ../../include/conversation.php:1120 ../../include/connections.php:141 #: ../../include/channel.php:1616 ../../Zotlabs/Widget/Suggestions.php:51 #: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Directory.php:371 #: ../../Zotlabs/Module/Connections.php:365 @@ -6037,17 +6029,25 @@ msgstr "Editar conexión" msgid "Poke" msgstr "Toques y otras cosas" -#: ../../include/conversation.php:1268 +#: ../../include/conversation.php:1219 +msgid "Approve this item" +msgstr "Aprobar este elemento" + +#: ../../include/conversation.php:1219 +msgid "Delete this item" +msgstr "Borrar este elemento" + +#: ../../include/conversation.php:1273 #, php-format msgid "%s likes this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1268 +#: ../../include/conversation.php:1273 #, php-format msgid "%s doesn't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1272 +#: ../../include/conversation.php:1277 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." @@ -6055,7 +6055,7 @@ msgstr[0] "a %2$d personas le gusta esto." msgstr[1] "A %2$d personas les gusta esto." msgstr[2] "A %2$d personas les gusta esto." -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1279 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." @@ -6063,11 +6063,11 @@ msgstr[0] "a %2$d personas no les gusta esto." msgstr[1] "A %2$d personas no les gusta esto." msgstr[2] "A %2$d personas no les gusta esto." -#: ../../include/conversation.php:1280 +#: ../../include/conversation.php:1285 msgid "and" msgstr "y" -#: ../../include/conversation.php:1283 +#: ../../include/conversation.php:1288 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" @@ -6075,49 +6075,49 @@ msgstr[0] ", y %d persona más" msgstr[1] ", y %d personas más" msgstr[2] ", y %d personas más" -#: ../../include/conversation.php:1284 +#: ../../include/conversation.php:1289 #, php-format msgid "%s like this." msgstr "A %s le gusta esto." -#: ../../include/conversation.php:1284 +#: ../../include/conversation.php:1289 #, php-format msgid "%s don't like this." msgstr "A %s no le gusta esto." -#: ../../include/conversation.php:1474 +#: ../../include/conversation.php:1479 msgid "Toggle poll" msgstr "Activar o desactivar encuestas" -#: ../../include/conversation.php:1475 +#: ../../include/conversation.php:1480 msgid "Option" msgstr "Opción" -#: ../../include/conversation.php:1476 +#: ../../include/conversation.php:1481 msgid "Add option" msgstr "Añadir una opción" -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1482 msgid "Minutes" msgstr "Minutos " -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1482 msgid "Hours" msgstr "Horas " -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1482 msgid "Days" msgstr "Días " -#: ../../include/conversation.php:1478 +#: ../../include/conversation.php:1483 msgid "Allow multiple answers" msgstr "Permitir respuestas múltiples" -#: ../../include/conversation.php:1488 +#: ../../include/conversation.php:1493 msgid "Summary (optional)" msgstr "Sumario (opcional)" -#: ../../include/conversation.php:1763 ../../include/taxonomy.php:675 +#: ../../include/conversation.php:1768 ../../include/taxonomy.php:675 #: ../../include/channel.php:1779 ../../Zotlabs/Module/Photos.php:1128 #: ../../Zotlabs/Lib/ThreadItem.php:233 msgctxt "noun" @@ -6127,7 +6127,7 @@ msgstr[0] "Me gusta" msgstr[1] "Me gusta" msgstr[2] "Me gusta" -#: ../../include/conversation.php:1766 ../../Zotlabs/Module/Photos.php:1133 +#: ../../include/conversation.php:1771 ../../Zotlabs/Module/Photos.php:1133 #: ../../Zotlabs/Lib/ThreadItem.php:239 msgctxt "noun" msgid "Dislike" @@ -6136,7 +6136,7 @@ msgstr[0] "No me gusta" msgstr[1] "No me gusta" msgstr[2] "No me gusta" -#: ../../include/conversation.php:1769 +#: ../../include/conversation.php:1774 msgctxt "noun" msgid "Attending" msgid_plural "Attending" @@ -6144,7 +6144,7 @@ msgstr[0] "Participaré" msgstr[1] "Participaré" msgstr[2] "Participaré" -#: ../../include/conversation.php:1772 +#: ../../include/conversation.php:1777 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" @@ -6152,7 +6152,7 @@ msgstr[0] "No participaré" msgstr[1] "No participaré" msgstr[2] "No participaré" -#: ../../include/conversation.php:1775 +#: ../../include/conversation.php:1780 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" @@ -6160,7 +6160,7 @@ msgstr[0] "Indeciso/a" msgstr[1] "Indecisos/as" msgstr[2] "Indecisos/as" -#: ../../include/conversation.php:1778 +#: ../../include/conversation.php:1783 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" @@ -6168,7 +6168,7 @@ msgstr[0] "De acuerdo" msgstr[1] "De acuerdo" msgstr[2] "De acuerdo" -#: ../../include/conversation.php:1781 +#: ../../include/conversation.php:1786 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" @@ -6176,7 +6176,7 @@ msgstr[0] "En desacuerdo" msgstr[1] "En desacuerdo" msgstr[2] "En desacuerdo" -#: ../../include/conversation.php:1784 +#: ../../include/conversation.php:1789 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6435,11 +6435,11 @@ msgstr "No me importa" msgid "Ask me" msgstr "Pregúnteme" -#: ../../include/connections.php:136 +#: ../../include/connections.php:165 msgid "New window" msgstr "Nueva ventana" -#: ../../include/connections.php:137 +#: ../../include/connections.php:166 msgid "Open the selected location in a different window or browser tab" msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte" @@ -6525,105 +6525,105 @@ msgstr "no me gusta" msgid "dislikes" msgstr "no gusta de" -#: ../../include/items.php:1231 +#: ../../include/items.php:1234 msgid "Visible to anybody on the internet." msgstr "Visible para cualquiera en internet." -#: ../../include/items.php:1233 +#: ../../include/items.php:1236 msgid "Visible to you only." msgstr "Visible sólo para usted." -#: ../../include/items.php:1235 +#: ../../include/items.php:1238 msgid "Visible to anybody in this network." msgstr "Visible para cualquiera en esta red." -#: ../../include/items.php:1237 +#: ../../include/items.php:1240 msgid "Visible to anybody authenticated." msgstr "Visible para cualquiera que esté autenticado." -#: ../../include/items.php:1239 +#: ../../include/items.php:1242 #, php-format msgid "Visible to anybody on %s." msgstr "Visible para cualquiera en %s." -#: ../../include/items.php:1241 +#: ../../include/items.php:1244 msgid "Visible to all connections." msgstr "Visible para todas las conexiones." -#: ../../include/items.php:1243 +#: ../../include/items.php:1246 msgid "Visible to approved connections." msgstr "Visible para las conexiones permitidas." -#: ../../include/items.php:1245 +#: ../../include/items.php:1248 msgid "Visible to specific connections." msgstr "Visible para conexiones específicas." -#: ../../include/items.php:3333 ../../Zotlabs/Module/Share.php:104 +#: ../../include/items.php:3373 ../../Zotlabs/Module/Share.php:104 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "🔁 Repetidos %2$sde %1$s" -#: ../../include/items.php:4415 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4455 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:206 msgid "Privacy group not found." msgstr "Grupo de canales no encontrado." -#: ../../include/items.php:4431 +#: ../../include/items.php:4471 msgid "Privacy group is empty." msgstr "El grupo de canales está vacío." -#: ../../include/items.php:4438 +#: ../../include/items.php:4478 #, php-format msgid "Privacy group: %s" msgstr "Grupo de canales: %s" -#: ../../include/items.php:4448 +#: ../../include/items.php:4488 #, php-format msgid "Connection: %s" msgstr "Conexión: %s" -#: ../../include/items.php:4450 +#: ../../include/items.php:4490 msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/items.php:4797 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "mujer" -#: ../../include/items.php:4798 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4799 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "hombre" -#: ../../include/items.php:4800 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4802 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4842 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s ha actualizado su %2$s" -#: ../../include/items.php:4804 +#: ../../include/items.php:4844 msgid "profile photo" msgstr "foto del perfil" -#: ../../include/items.php:5001 +#: ../../include/items.php:5171 #, php-format msgid "[Edited %s]" msgstr "[se ha editado %s]" -#: ../../include/items.php:5001 +#: ../../include/items.php:5171 msgctxt "edit_activity" msgid "Post" msgstr "Publicar" -#: ../../include/items.php:5001 +#: ../../include/items.php:5171 msgctxt "edit_activity" msgid "Comment" msgstr "Comentar" @@ -6731,7 +6731,7 @@ msgid "Profile Photos" msgstr "Fotos del perfil" #: ../../include/attach.php:273 ../../include/attach.php:324 -#: ../../include/attach.php:419 +#: ../../include/attach.php:426 msgid "Item was not found." msgstr "Elemento no encontrado." @@ -6739,75 +6739,75 @@ msgstr "Elemento no encontrado." msgid "Unknown error." msgstr "Error desconocido" -#: ../../include/attach.php:614 +#: ../../include/attach.php:621 msgid "No source file." msgstr "Ningún fichero de origen" -#: ../../include/attach.php:636 +#: ../../include/attach.php:643 msgid "Cannot locate file to replace" msgstr "No se puede localizar el fichero que va a ser sustituido." -#: ../../include/attach.php:655 +#: ../../include/attach.php:662 msgid "Cannot locate file to revise/update" msgstr "No se puede localizar el fichero para revisar/actualizar" -#: ../../include/attach.php:801 +#: ../../include/attach.php:808 #, php-format msgid "File exceeds size limit of %d" msgstr "El fichero supera el limite de tamaño de %d" -#: ../../include/attach.php:822 +#: ../../include/attach.php:829 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos." -#: ../../include/attach.php:1011 +#: ../../include/attach.php:1019 msgid "File upload failed. Possible system limit or action terminated." msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado." -#: ../../include/attach.php:1040 +#: ../../include/attach.php:1048 msgid "Stored file could not be verified. Upload failed." msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado." -#: ../../include/attach.php:1112 ../../include/attach.php:1128 +#: ../../include/attach.php:1120 ../../include/attach.php:1136 msgid "Path not available." msgstr "Ruta no disponible." -#: ../../include/attach.php:1176 ../../include/attach.php:1341 +#: ../../include/attach.php:1184 ../../include/attach.php:1349 msgid "Empty pathname" msgstr "Ruta vacía" -#: ../../include/attach.php:1202 +#: ../../include/attach.php:1210 msgid "duplicate filename or path" msgstr "Nombre duplicado de ruta o fichero" -#: ../../include/attach.php:1230 +#: ../../include/attach.php:1238 msgid "Path not found." msgstr "Ruta no encontrada" -#: ../../include/attach.php:1297 +#: ../../include/attach.php:1305 msgid "mkdir failed." msgstr "mkdir ha fallado." -#: ../../include/attach.php:1301 +#: ../../include/attach.php:1309 msgid "database storage failed." msgstr "el almacenamiento en la base de datos ha fallado." -#: ../../include/attach.php:1347 +#: ../../include/attach.php:1355 msgid "Empty path" msgstr "Ruta vacía" -#: ../../include/attach.php:2122 +#: ../../include/attach.php:2147 #, php-format msgid "%s shared an %s with you" msgstr "%s ha compartido un/una %s con usted" -#: ../../include/attach.php:2122 +#: ../../include/attach.php:2147 #, php-format msgid "%s shared a %s with you" msgstr "%s ha compartido un/una %s con usted" -#: ../../include/attach.php:2122 +#: ../../include/attach.php:2147 msgid "image" msgstr "Imagen" @@ -7142,7 +7142,7 @@ msgid "Forums" msgstr "Foros" #: ../../include/acl_selectors.php:136 -#: ../../Zotlabs/Module/Settings/Privacy.php:59 +#: ../../Zotlabs/Module/Settings/Privacy.php:65 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" msgstr "Sólo yo" @@ -7239,7 +7239,7 @@ msgstr "Orden del stream" msgid "Add new guest" msgstr "Añadir un nuevo invitado" -#: ../../Zotlabs/Widget/Tokens.php:49 ../../Zotlabs/Module/Lockview.php:226 +#: ../../Zotlabs/Widget/Tokens.php:49 ../../Zotlabs/Module/Lockview.php:236 msgid "Guest access" msgstr "Acceso para invitados" @@ -8048,29 +8048,29 @@ msgstr "No se puede copiar la carpeta en sí misma." msgid "Can not move folder \"%s\" into itself." msgstr "No se puede mover la carpeta\"%s\" en sí misma." -#: ../../Zotlabs/Module/Network.php:106 +#: ../../Zotlabs/Module/Network.php:108 msgid "No such group" msgstr "No se encuentra el grupo" -#: ../../Zotlabs/Module/Network.php:158 +#: ../../Zotlabs/Module/Network.php:160 msgid "No such channel" msgstr "No se encuentra el canal" -#: ../../Zotlabs/Module/Network.php:170 ../../Zotlabs/Module/Channel.php:234 +#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:234 msgid "Search Results For:" msgstr "Buscar resultados para:" -#: ../../Zotlabs/Module/Network.php:211 ../../Zotlabs/Module/Channel.php:267 -#: ../../Zotlabs/Module/Hq.php:108 ../../Zotlabs/Module/Pubstream.php:89 +#: ../../Zotlabs/Module/Network.php:213 ../../Zotlabs/Module/Channel.php:267 +#: ../../Zotlabs/Module/Hq.php:103 ../../Zotlabs/Module/Pubstream.php:89 #: ../../Zotlabs/Module/Display.php:89 msgid "Reset form" msgstr "Reiniciar el formulario" -#: ../../Zotlabs/Module/Network.php:246 +#: ../../Zotlabs/Module/Network.php:248 msgid "Privacy group is empty" msgstr "El grupo de canales está vacío" -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:258 msgid "Privacy group: " msgstr "Grupo de canales: " @@ -8904,7 +8904,7 @@ msgstr "Solo publicaciones" #: ../../Zotlabs/Module/Channel.php:161 ../../Zotlabs/Module/Channel.php:183 #: ../../Zotlabs/Module/Hq.php:41 ../../Zotlabs/Module/Pubstream.php:46 -#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:83 +#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:82 msgid "Malformed message id." msgstr "ID de mensaje malformado." @@ -8912,7 +8912,7 @@ msgstr "ID de mensaje malformado." msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permisos insuficientes. Petición redirigida a la página del perfil." -#: ../../Zotlabs/Module/Channel.php:498 ../../Zotlabs/Module/Display.php:321 +#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:321 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Debe habilitar javascript para poder ver este contenido en su navegador." @@ -9134,7 +9134,7 @@ msgstr "Este sitio no es un servidor de directorio" msgid "This directory server requires an access token" msgstr "El servidor de este directorio necesita un \"token\" de acceso" -#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:460 +#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:478 msgid "Unable to locate original post." msgstr "No ha sido posible encontrar la entrada original." @@ -9476,59 +9476,67 @@ msgstr "Calendario por defecto" msgid "Default Addressbook" msgstr "Agenda de direcciones por defecto" -#: ../../Zotlabs/Module/Lockview.php:100 +#: ../../Zotlabs/Module/Lockview.php:101 msgid "Remote privacy information not available" msgstr "La información sobre privacidad remota no está disponible" -#: ../../Zotlabs/Module/Lockview.php:143 ../../Zotlabs/Module/Lockview.php:184 +#: ../../Zotlabs/Module/Lockview.php:144 ../../Zotlabs/Module/Lockview.php:203 #: ../../Zotlabs/Module/Acl.php:123 msgctxt "acl" msgid "Profile" msgstr "Perfil" -#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193 +#: ../../Zotlabs/Module/Lockview.php:155 ../../Zotlabs/Module/Lockview.php:212 msgid "Privacy group" msgstr "Grupo de canales" -#: ../../Zotlabs/Module/Lockview.php:214 +#: ../../Zotlabs/Module/Lockview.php:183 +msgid "Item" +msgstr "Elemento" + +#: ../../Zotlabs/Module/Lockview.php:230 #, php-format msgid "Click to copy link to this ressource for guest %s to clipboard" msgstr "Haga clic para copiar el enlace a este recurso para invitados %sen el portapapeles" -#: ../../Zotlabs/Module/Lockview.php:214 +#: ../../Zotlabs/Module/Lockview.php:230 msgid "Link copied" msgstr "Enlace copiado" -#: ../../Zotlabs/Module/Lockview.php:221 +#: ../../Zotlabs/Module/Lockview.php:235 msgid "Access" msgstr "Acceso" -#: ../../Zotlabs/Module/Item.php:746 +#: ../../Zotlabs/Module/Lockview.php:237 +msgid "OCAP access" +msgstr "Acceso OCAP" + +#: ../../Zotlabs/Module/Item.php:764 msgid "Empty post discarded." msgstr "La entrada vacía ha sido desechada." -#: ../../Zotlabs/Module/Item.php:1144 +#: ../../Zotlabs/Module/Item.php:1179 msgid "Duplicate post suppressed." msgstr "Se ha suprimido la entrada duplicada." -#: ../../Zotlabs/Module/Item.php:1294 +#: ../../Zotlabs/Module/Item.php:1329 msgid "System error. Post not saved." msgstr "Error del sistema. La entrada no se ha podido salvar." -#: ../../Zotlabs/Module/Item.php:1328 +#: ../../Zotlabs/Module/Item.php:1363 msgid "Your comment is awaiting approval." msgstr "Su comentario está pendiente de aprobación." -#: ../../Zotlabs/Module/Item.php:1465 +#: ../../Zotlabs/Module/Item.php:1500 msgid "Unable to obtain post information from database." msgstr "No ha sido posible obtener información de la entrada en la base de datos." -#: ../../Zotlabs/Module/Item.php:1472 +#: ../../Zotlabs/Module/Item.php:1507 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal." -#: ../../Zotlabs/Module/Item.php:1479 +#: ../../Zotlabs/Module/Item.php:1514 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Ha alcanzado su límite de %1$.0f páginas web." @@ -9880,7 +9888,7 @@ msgstr "red" msgid "Item is not editable" msgstr "El elemento no es editable" -#: ../../Zotlabs/Module/Editpost.php:113 ../../Zotlabs/Module/Rpost.php:219 +#: ../../Zotlabs/Module/Editpost.php:113 ../../Zotlabs/Module/Rpost.php:211 msgid "Edit post" msgstr "Editar la entrada" @@ -11559,13 +11567,9 @@ msgstr "No se puede encontrar su servidor." msgid "Post successful." msgstr "Enviado con éxito." -#: ../../Zotlabs/Module/Moderate.php:67 -msgid "Comment approved" -msgstr "El comentario ha sido aprobado" - -#: ../../Zotlabs/Module/Moderate.php:71 -msgid "Comment deleted" -msgstr "Se ha eliminado el comentario" +#: ../../Zotlabs/Module/Moderate.php:70 +msgid "Item approved" +msgstr "Elemento aprobado" #: ../../Zotlabs/Module/Removeaccount.php:35 msgid "" @@ -12746,7 +12750,7 @@ msgid "I don't like this (toggle)" msgstr "No me gusta esto (cambiar)" #: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1203 -#: ../../Zotlabs/Lib/ThreadItem.php:825 +#: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "This is you" msgstr "Este es usted" @@ -13285,11 +13289,11 @@ msgstr "Asunto:" msgid "Here you may enter personal notes to the recipient(s)" msgstr "Aquí puede introducir notas personales para el/los destinatario(s)" -#: ../../Zotlabs/Module/Sse_bs.php:610 +#: ../../Zotlabs/Module/Sse_bs.php:605 msgid "Private forum" msgstr "Foro privado" -#: ../../Zotlabs/Module/Sse_bs.php:610 +#: ../../Zotlabs/Module/Sse_bs.php:605 msgid "Public forum" msgstr "Foro público" @@ -13871,90 +13875,106 @@ msgstr "Perfil predeterminado para nuevos contactos" msgid "Profiles Settings" msgstr "Gestión de los perfiles" -#: ../../Zotlabs/Module/Settings/Privacy.php:42 +#: ../../Zotlabs/Module/Settings/Privacy.php:48 msgid "Privacy settings updated." msgstr "Se ha actualizado la configuración de la privacidad." -#: ../../Zotlabs/Module/Settings/Privacy.php:60 +#: ../../Zotlabs/Module/Settings/Privacy.php:66 msgid "Only those you specifically allow" msgstr "Solo aquellos a los que usted permita explícitamente" -#: ../../Zotlabs/Module/Settings/Privacy.php:61 +#: ../../Zotlabs/Module/Settings/Privacy.php:67 msgid "Approved connections" msgstr "Conexiones aprobadas" -#: ../../Zotlabs/Module/Settings/Privacy.php:62 +#: ../../Zotlabs/Module/Settings/Privacy.php:68 msgid "Any connections" msgstr "Cualquier conexión" -#: ../../Zotlabs/Module/Settings/Privacy.php:63 +#: ../../Zotlabs/Module/Settings/Privacy.php:69 msgid "Anybody on this website" msgstr "Cualquiera en este sitio web" -#: ../../Zotlabs/Module/Settings/Privacy.php:64 +#: ../../Zotlabs/Module/Settings/Privacy.php:70 msgid "Anybody in this network" msgstr "Cualquiera en esta red" -#: ../../Zotlabs/Module/Settings/Privacy.php:65 +#: ../../Zotlabs/Module/Settings/Privacy.php:71 msgid "Anybody authenticated" msgstr "Cualquiera que esté autenticado" -#: ../../Zotlabs/Module/Settings/Privacy.php:66 +#: ../../Zotlabs/Module/Settings/Privacy.php:72 msgid "Anybody on the internet" msgstr "Cualquiera en internet" -#: ../../Zotlabs/Module/Settings/Privacy.php:76 +#: ../../Zotlabs/Module/Settings/Privacy.php:82 msgid "" "Advise: set to \"Anybody on the internet\" and use privacy groups to " "restrict access" msgstr "Consejo: establezca la opción \"Cualquiera en Internet\" y utilice los grupos de privacidad para restringir el acceso" -#: ../../Zotlabs/Module/Settings/Privacy.php:113 +#: ../../Zotlabs/Module/Settings/Privacy.php:121 msgid "Privacy Settings" msgstr "Ajustes de privacidad" -#: ../../Zotlabs/Module/Settings/Privacy.php:118 +#: ../../Zotlabs/Module/Settings/Privacy.php:126 msgid "Advanced configuration" msgstr "Ajustes avanzados" -#: ../../Zotlabs/Module/Settings/Privacy.php:120 +#: ../../Zotlabs/Module/Settings/Privacy.php:128 msgid "Proceed with caution" msgstr "Proceda con precaución" -#: ../../Zotlabs/Module/Settings/Privacy.php:121 +#: ../../Zotlabs/Module/Settings/Privacy.php:129 msgid "" "Changing advanced configuration settings can impact your, and your contacts " "channels functionality and security." msgstr "El cambio de los ajustes de configuración avanzada puede afectar a la funcionalidad y seguridad de sus canales y contactos." -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:130 msgid "Accept the risk and continue" msgstr "Aceptar el riesgo y continuar" -#: ../../Zotlabs/Module/Settings/Privacy.php:124 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 msgid "Automatically approve new contacts" msgstr "Aprobar automáticamente nuevos contactos" -#: ../../Zotlabs/Module/Settings/Privacy.php:125 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 msgid "Opt-out of search engine indexing" msgstr "Exclusión de la indexación en los motores de búsqueda" -#: ../../Zotlabs/Module/Settings/Privacy.php:126 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 msgid "Group actor" msgstr "Grupo de actores" -#: ../../Zotlabs/Module/Settings/Privacy.php:126 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 msgid "Allow this channel to act as a forum" msgstr "Permitir que este canal actúe como un foro" -#: ../../Zotlabs/Module/Settings/Privacy.php:127 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 msgid "Accept all messages which mention you" msgstr "Aceptar todos los mensajes que lo mencionen" -#: ../../Zotlabs/Module/Settings/Privacy.php:127 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 msgid "This setting bypasses normal permissions" msgstr "Esta configuración omite los permisos normales" +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +msgid "Accept unsolicited comments for moderation" +msgstr "Aceptar comentarios no solicitados para su moderación" + +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +msgid "Otherwise they will be silently dropped" +msgstr "De lo contrario, se eliminarán silenciosamente" + +#: ../../Zotlabs/Module/Settings/Privacy.php:137 +msgid "Enable OCAP access" +msgstr "Habilitar acceso OCAP" + +#: ../../Zotlabs/Module/Settings/Privacy.php:137 +msgid "Grant limited posts the right to access linked private media" +msgstr "Conceder a entradas limitadas el derecho de acceso a los medios privados vinculados" + #: ../../Zotlabs/Module/Settings/Conversation.php:23 msgid "Settings saved." msgstr "Configuración guardada." @@ -14643,32 +14663,32 @@ msgctxt "permcat" msgid "Default" msgstr "Predeterminado" -#: ../../Zotlabs/Lib/Activity.php:2332 +#: ../../Zotlabs/Lib/Activity.php:2398 #, php-format msgid "Likes %1$s's %2$s" msgstr "Gusta de %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:2335 +#: ../../Zotlabs/Lib/Activity.php:2401 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "No le gusta %2$sde %1$s" -#: ../../Zotlabs/Lib/Activity.php:2341 +#: ../../Zotlabs/Lib/Activity.php:2407 #, php-format msgid "Will attend %s's event" msgstr "Asistirá al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2344 +#: ../../Zotlabs/Lib/Activity.php:2410 #, php-format msgid "Will not attend %s's event" msgstr "No asistirá al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2347 +#: ../../Zotlabs/Lib/Activity.php:2413 #, php-format msgid "May attend %s's event" msgstr "Puede asistir al evento de %s" -#: ../../Zotlabs/Lib/Activity.php:2350 +#: ../../Zotlabs/Lib/Activity.php:2416 #, php-format msgid "May not attend %s's event" msgstr "Puede no asistir al evento de %s" @@ -14727,15 +14747,27 @@ msgstr "un mensaje directo" msgid "Please visit %s to view and/or reply to your direct messages." msgstr "Por favor visite %s para ver y/o responder a su mensaje directo." +#: ../../Zotlabs/Lib/Enotify.php:148 +msgid "requested to comment on" +msgstr "solicita comentar sobre " + #: ../../Zotlabs/Lib/Enotify.php:148 msgid "commented on" msgstr "ha comentado sobre " -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:310 +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 +msgid "requested to like" +msgstr "solicita que se permita mostrar agrado " + +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 msgid "liked" msgstr "ha gustado de " -#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:310 +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 +msgid "requested to dislike" +msgstr "solicita que se permita mostrar desagrado " + +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 msgid "disliked" msgstr "no ha gustado de " @@ -14753,7 +14785,7 @@ msgstr "%1$s%2$s [zrl=%3$s ]un %4$s[/zrl]" msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "%1$s %2$s[zrl=%3$s]%5$s de %4$s[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:229 ../../Zotlabs/Lib/Enotify.php:314 +#: ../../Zotlabs/Lib/Enotify.php:229 ../../Zotlabs/Lib/Enotify.php:321 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s %2$s [zrl=%3$s]su %4$s[/zrl]" @@ -14773,9 +14805,9 @@ msgstr "[$Projectname:Aviso] Nuevo comentario de %2$s en la conversación #%1$d" msgid "%1$s commented on an item/conversation you have been following" msgstr "%1$sha comentado un elemento/conversación que ha estado siguiendo." -#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:334 -#: ../../Zotlabs/Lib/Enotify.php:350 ../../Zotlabs/Lib/Enotify.php:374 -#: ../../Zotlabs/Lib/Enotify.php:391 ../../Zotlabs/Lib/Enotify.php:404 +#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:341 +#: ../../Zotlabs/Lib/Enotify.php:357 ../../Zotlabs/Lib/Enotify.php:381 +#: ../../Zotlabs/Lib/Enotify.php:398 ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Para ver o comentar la conversación, visite %s" @@ -14785,204 +14817,204 @@ msgstr "Para ver o comentar la conversación, visite %s" msgid "Please visit %s to approve or reject this comment." msgstr "Por favor, visite %s para aprobar o rechazar este comentario." -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:337 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "[$Projectname:Aviso] \"Me gusta\" de %2$s en la conversación #%1$d" -#: ../../Zotlabs/Lib/Enotify.php:331 +#: ../../Zotlabs/Lib/Enotify.php:338 #, php-format msgid "%1$s liked an item/conversation you created" msgstr "A %1$s le ha gustado un elemento o conversación que ha creado usted." -#: ../../Zotlabs/Lib/Enotify.php:342 +#: ../../Zotlabs/Lib/Enotify.php:349 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "[$Projectname:Aviso] %s ha publicado una entrada en su página de inicio del perfil (\"muro\")" -#: ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:351 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "%1$s ha publicado en su muro en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:346 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "%1$sha publicado en [zrl=%2$s]su muro[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:368 +#: ../../Zotlabs/Lib/Enotify.php:375 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "[$Projectname:Aviso] %s le ha etiquetado" -#: ../../Zotlabs/Lib/Enotify.php:369 +#: ../../Zotlabs/Lib/Enotify.php:376 #, php-format msgid "%1$s tagged you at %2$s" msgstr "%1$sle ha etiquetado en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:370 +#: ../../Zotlabs/Lib/Enotify.php:377 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "%1$s [zrl=%2$s]le ha etiquetado[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:381 +#: ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "[$Projectname:Aviso] %1$s le ha dado un toque" -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "%1$s poked you at %2$s" msgstr "%1$sle ha dado un toque en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:383 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "%1$s [zrl=%2$s] le ha dado un toque[/zrl]." -#: ../../Zotlabs/Lib/Enotify.php:398 +#: ../../Zotlabs/Lib/Enotify.php:405 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "[$Projectname:Aviso] %s ha etiquetado su entrada" -#: ../../Zotlabs/Lib/Enotify.php:399 +#: ../../Zotlabs/Lib/Enotify.php:406 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "%1$sha etiquetado su entrada en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:400 +#: ../../Zotlabs/Lib/Enotify.php:407 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "%1$s ha etiquetado [zrl=%2$s]su entrada[/zrl]" -#: ../../Zotlabs/Lib/Enotify.php:411 +#: ../../Zotlabs/Lib/Enotify.php:418 msgid "[$Projectname:Notify] Introduction received" msgstr "[$Projectname:Aviso] Ha recibido una solicitud de conexión" -#: ../../Zotlabs/Lib/Enotify.php:412 +#: ../../Zotlabs/Lib/Enotify.php:419 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "Ha recibido una nueva solicitud de conexión de '%1$s' en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:413 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "Ha recibido [zrl=%1$s]una nueva solicitud de conexión[/zrl] de %2$s." -#: ../../Zotlabs/Lib/Enotify.php:416 ../../Zotlabs/Lib/Enotify.php:434 +#: ../../Zotlabs/Lib/Enotify.php:423 ../../Zotlabs/Lib/Enotify.php:441 #, php-format msgid "You may visit their profile at %s" msgstr "Puede visitar su perfil en %s" -#: ../../Zotlabs/Lib/Enotify.php:418 +#: ../../Zotlabs/Lib/Enotify.php:425 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "Por favor, visite %s para permitir o rechazar la solicitad de conexión." -#: ../../Zotlabs/Lib/Enotify.php:425 +#: ../../Zotlabs/Lib/Enotify.php:432 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "[$Projectname:Aviso] Ha recibido una sugerencia de conexión" -#: ../../Zotlabs/Lib/Enotify.php:426 +#: ../../Zotlabs/Lib/Enotify.php:433 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "Ha recibido una sugerencia de amistad de '%1$s' en %2$s" -#: ../../Zotlabs/Lib/Enotify.php:427 +#: ../../Zotlabs/Lib/Enotify.php:434 #, php-format msgid "" "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "Ha recibido [zrl=%1$s]una sugerencia de amistad[/zrl] para %2$s de %3$s." -#: ../../Zotlabs/Lib/Enotify.php:432 +#: ../../Zotlabs/Lib/Enotify.php:439 msgid "Name:" msgstr "Nombre:" -#: ../../Zotlabs/Lib/Enotify.php:433 +#: ../../Zotlabs/Lib/Enotify.php:440 msgid "Photo:" msgstr "Foto:" -#: ../../Zotlabs/Lib/Enotify.php:436 +#: ../../Zotlabs/Lib/Enotify.php:443 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia." -#: ../../Zotlabs/Lib/Enotify.php:661 +#: ../../Zotlabs/Lib/Enotify.php:668 msgid "[$Projectname:Notify]" msgstr "[$Projectname:Aviso]" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:834 msgid "created a new poll" msgstr "se ha creado una nueva encuesta" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:834 msgid "created a new post" msgstr "ha creado una nueva entrada" -#: ../../Zotlabs/Lib/Enotify.php:828 +#: ../../Zotlabs/Lib/Enotify.php:835 #, php-format msgid "voted on %s's poll" msgstr "votado en la encuesta de %s" -#: ../../Zotlabs/Lib/Enotify.php:828 +#: ../../Zotlabs/Lib/Enotify.php:835 #, php-format msgid "commented on %s's post" msgstr "ha comentado la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:832 +#: ../../Zotlabs/Lib/Enotify.php:839 #, php-format msgid "repeated %s's post" msgstr "repetida la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:836 +#: ../../Zotlabs/Lib/Enotify.php:843 #, php-format msgid "liked %s's post" msgstr "Le ha gustado la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:840 +#: ../../Zotlabs/Lib/Enotify.php:847 #, php-format msgid "disliked %s's post" msgstr "No le ha gustado la entrada de %s" -#: ../../Zotlabs/Lib/Enotify.php:844 ../../Zotlabs/Lib/Enotify.php:947 +#: ../../Zotlabs/Lib/Enotify.php:851 ../../Zotlabs/Lib/Enotify.php:954 msgid "shared a file with you" msgstr "compartió un archivo con usted" -#: ../../Zotlabs/Lib/Enotify.php:853 +#: ../../Zotlabs/Lib/Enotify.php:860 #, php-format msgid "edited a post dated %s" msgstr "ha editado una entrada %s" -#: ../../Zotlabs/Lib/Enotify.php:856 +#: ../../Zotlabs/Lib/Enotify.php:863 #, php-format msgid "edited a comment dated %s" msgstr "ha editado un comentario %s" -#: ../../Zotlabs/Lib/Enotify.php:932 +#: ../../Zotlabs/Lib/Enotify.php:939 msgid "added your channel" msgstr "añadió este canal a sus conexiones" -#: ../../Zotlabs/Lib/Enotify.php:962 +#: ../../Zotlabs/Lib/Enotify.php:969 msgid "sent you a direct message" msgstr "enviarle un mensaje directo" -#: ../../Zotlabs/Lib/Enotify.php:969 +#: ../../Zotlabs/Lib/Enotify.php:976 msgid "g A l F d" msgstr "g A l d F" -#: ../../Zotlabs/Lib/Enotify.php:972 +#: ../../Zotlabs/Lib/Enotify.php:979 msgid "[today]" msgstr "[hoy]" -#: ../../Zotlabs/Lib/Enotify.php:982 +#: ../../Zotlabs/Lib/Enotify.php:989 msgid "created an event" msgstr "se creó un evento" -#: ../../Zotlabs/Lib/Enotify.php:997 +#: ../../Zotlabs/Lib/Enotify.php:1004 msgid "status verified" msgstr "estado verificado" -#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:146 +#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:147 msgid "Channel is blocked on this site." msgstr "El canal está bloqueado en este sitio." @@ -14990,23 +15022,23 @@ msgstr "El canal está bloqueado en este sitio." msgid "Channel location missing." msgstr "Falta la dirección del canal." -#: ../../Zotlabs/Lib/Connect.php:104 +#: ../../Zotlabs/Lib/Connect.php:105 msgid "Remote channel or protocol unavailable." msgstr "Canal remoto o protocolo no disponible." -#: ../../Zotlabs/Lib/Connect.php:140 +#: ../../Zotlabs/Lib/Connect.php:141 msgid "Channel discovery failed." msgstr "El intento de acceder al canal ha fallado." -#: ../../Zotlabs/Lib/Connect.php:158 +#: ../../Zotlabs/Lib/Connect.php:159 msgid "Protocol disabled." msgstr "Protocolo deshabilitado." -#: ../../Zotlabs/Lib/Connect.php:170 +#: ../../Zotlabs/Lib/Connect.php:171 msgid "Cannot connect to yourself." msgstr "No puede conectarse consigo mismo." -#: ../../Zotlabs/Lib/Connect.php:275 +#: ../../Zotlabs/Lib/Connect.php:276 msgid "error saving data" msgstr "error guardando los datos" @@ -15263,27 +15295,27 @@ msgstr "Ir al comentario anterior" msgid "Add to Calendar" msgstr "Añadir al calendario" -#: ../../Zotlabs/Lib/ThreadItem.php:834 +#: ../../Zotlabs/Lib/ThreadItem.php:837 msgid "Image" msgstr "Imagen" -#: ../../Zotlabs/Lib/ThreadItem.php:836 +#: ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Insert Link" msgstr "Insertar enlace" -#: ../../Zotlabs/Lib/ThreadItem.php:837 +#: ../../Zotlabs/Lib/ThreadItem.php:840 msgid "Video" msgstr "Vídeo" -#: ../../Zotlabs/Lib/ThreadItem.php:846 +#: ../../Zotlabs/Lib/ThreadItem.php:849 msgid "Your full name (required)" msgstr "Su nombre completo (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:847 +#: ../../Zotlabs/Lib/ThreadItem.php:850 msgid "Your email address (required)" msgstr "Su dirección de correo electrónico (requerido)" -#: ../../Zotlabs/Lib/ThreadItem.php:848 +#: ../../Zotlabs/Lib/ThreadItem.php:851 msgid "Your website URL (optional)" msgstr "La URL de su sitio web (opcional)" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index db074bd4d..ebaf56993 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -4,9 +4,9 @@ if(! function_exists("string_plural_select_es_es")) { function string_plural_select_es_es($n){ return ($n != 1 ? 1 : 0); }} + App::$rtl = 0; App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; -App::$strings["Cover Photo"] = "Imagen de portada del perfil"; App::$strings["Default"] = "Predeterminado"; App::$strings["Focus (Hubzilla default)"] = "Focus (predefinido)"; App::$strings["Submit"] = "Enviar"; @@ -626,8 +626,6 @@ App::$strings["Unable to create a unique channel address. Import failed."] = "No App::$strings["Import completed."] = "Importación completada."; App::$strings["Diaspora Protocol Settings updated."] = "Los ajustes del protocolo de Diaspora se han actualizado."; App::$strings["The diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = "El protocolo de Diaspora no admite la independencia de la ubicación. Las conexiones que realice dentro de esa red pueden ser inaccesibles desde ubicaciones de canales alternativos."; -App::$strings["Allow any Diaspora member to comment or like your public posts"] = "Permitir que cualquier miembro de Diaspora comente o ponga un like en sus entradas públicas"; -App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = "Si esta configuración está desactivada, sólo sus contactos podrán comentar o dar a \"me gusta\" en sus publicaciones públicas"; App::$strings["Prevent your hashtags from being redirected to other sites"] = "Impedir que sus \"hashtags\" sean redirigidos a otros sitios "; App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = "Firmar y enviar entradas y comentarios sin firma de Diaspora"; App::$strings["Followed hashtags (comma separated, do not include the #)"] = "\"Hashtags\" seguidos (separados por comas, sin incluir #)"; @@ -875,7 +873,7 @@ App::$strings["September"] = "septiembre"; App::$strings["October"] = "octubre"; App::$strings["November"] = "noviembre"; App::$strings["December"] = "diciembre"; -App::$strings["Unknown Attachment"] = "Adjunto no reconocido"; +App::$strings["Unknown attachment"] = "Adjunto no reconocido"; App::$strings["Size"] = "Tamaño"; App::$strings["unknown"] = "desconocido"; App::$strings["remove category"] = "eliminar el tema"; @@ -1316,6 +1314,8 @@ App::$strings["Recent Activity"] = "Actividad reciente"; App::$strings["Connect"] = "Conectar"; App::$strings["Edit Connection"] = "Editar conexión"; App::$strings["Poke"] = "Toques y otras cosas"; +App::$strings["Approve this item"] = "Aprobar este elemento"; +App::$strings["Delete this item"] = "Borrar este elemento"; App::$strings["%s likes this."] = "A %s le gusta esto."; App::$strings["%s doesn't like this."] = "A %s no le gusta esto."; App::$strings["%2\$d people like this."] = array( @@ -2143,9 +2143,11 @@ App::$strings["Default Addressbook"] = "Agenda de direcciones por defecto"; App::$strings["Remote privacy information not available"] = "La información sobre privacidad remota no está disponible"; App::$strings["__ctx:acl__ Profile"] = "Perfil"; App::$strings["Privacy group"] = "Grupo de canales"; +App::$strings["Item"] = "Elemento"; App::$strings["Click to copy link to this ressource for guest %s to clipboard"] = "Haga clic para copiar el enlace a este recurso para invitados %sen el portapapeles"; App::$strings["Link copied"] = "Enlace copiado"; App::$strings["Access"] = "Acceso"; +App::$strings["OCAP access"] = "Acceso OCAP"; App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada."; App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada."; App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar."; @@ -2630,8 +2632,7 @@ App::$strings["Use arrows to move the corresponding app left (top) or right (bot App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = "Use las flechas para mover la aplicación correspondiente hacia arriba o hacia abajo en la bandeja de aplicaciones."; App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor."; App::$strings["Post successful."] = "Enviado con éxito."; -App::$strings["Comment approved"] = "El comentario ha sido aprobado"; -App::$strings["Comment deleted"] = "Se ha eliminado el comentario"; +App::$strings["Item approved"] = "Elemento aprobado"; App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña."; App::$strings["Remove This Account"] = "Eliminar esta cuenta"; App::$strings["This account and all its channels will be completely removed from the network. "] = "Esta cuenta y todos sus canales van a ser eliminados de la red."; @@ -3186,6 +3187,10 @@ App::$strings["Group actor"] = "Grupo de actores"; App::$strings["Allow this channel to act as a forum"] = "Permitir que este canal actúe como un foro"; App::$strings["Accept all messages which mention you"] = "Aceptar todos los mensajes que lo mencionen"; App::$strings["This setting bypasses normal permissions"] = "Esta configuración omite los permisos normales"; +App::$strings["Accept unsolicited comments for moderation"] = "Aceptar comentarios no solicitados para su moderación"; +App::$strings["Otherwise they will be silently dropped"] = "De lo contrario, se eliminarán silenciosamente"; +App::$strings["Enable OCAP access"] = "Habilitar acceso OCAP"; +App::$strings["Grant limited posts the right to access linked private media"] = "Conceder a entradas limitadas el derecho de acceso a los medios privados vinculados"; App::$strings["Settings saved."] = "Configuración guardada."; App::$strings["Settings saved. Reload page please."] = "Ajustes guardados. Recargue la página, por favor."; App::$strings["Conversation Settings"] = "Ajustes de conversación"; @@ -3364,8 +3369,11 @@ App::$strings["%1\$s sent you a new direct message at %2\$s"] = "%1\$s le ha env App::$strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s."; App::$strings["a direct message"] = "un mensaje directo"; App::$strings["Please visit %s to view and/or reply to your direct messages."] = "Por favor visite %s para ver y/o responder a su mensaje directo."; +App::$strings["requested to comment on"] = "solicita comentar sobre "; App::$strings["commented on"] = "ha comentado sobre "; +App::$strings["requested to like"] = "solicita que se permita mostrar agrado "; App::$strings["liked"] = "ha gustado de "; +App::$strings["requested to dislike"] = "solicita que se permita mostrar desagrado "; App::$strings["disliked"] = "no ha gustado de "; App::$strings["voted on"] = "votado en "; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s%2\$s [zrl=%3\$s ]un %4\$s[/zrl]"; -- cgit v1.2.3 From 5d9346999e8e45132596e5940f39c6fd655ddbd9 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 7 Sep 2023 13:29:34 +0200 Subject: redbasic: Use body background color for colorboxes. Typically (only?) used by the "view source" function. --- view/theme/redbasic/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b20977f28..2805ed718 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -608,7 +608,7 @@ nav .acpopup { padding: 3px; border: 0px solid var(--bs-border-color); border-radius: var(--bs-border-radius); - background-color: #fff; + background-color: var(--bs-body-bg); z-index: 1052; } -- cgit v1.2.3 From c12833521fab776947c11e70d155eb1fc258b754 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 7 Sep 2023 20:34:40 +0200 Subject: Transparent background for colorbox controls icons. This makes it blend in better when using dark style. I've kept the actual button/control colours unchanged though. --- images/controls.png | Bin 1261 -> 3285 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/controls.png b/images/controls.png index 1ec3cb1c8..5791fd271 100644 Binary files a/images/controls.png and b/images/controls.png differ -- cgit v1.2.3 From 1157dc7dc8544b190004bd014ee85c6e5e0441f3 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 Sep 2023 19:55:15 +0000 Subject: make sure to set the other relevant dates aswell to omit discrepancies if they would be set a splitsecond later when we store the item --- Zotlabs/Module/Like.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index 5779faa19..54daf6471 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -554,7 +554,14 @@ class Like extends Controller { $arr['deny_cid'] = $deny_cid; $arr['deny_gid'] = $deny_gid; $arr['item_private'] = $private; - $arr['created'] = datetime_convert(); + + $created = datetime_convert(); + + $arr['created'] = $created; + $arr['edited'] = $created; + $arr['commented'] = $created; + $arr['received'] = $created; + $arr['changed'] = $created; call_hooks('post_local', $arr); -- cgit v1.2.3 From c8e7f79f50a4babee2b7c27bdb5c7eecf4ded150 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 9 Sep 2023 12:47:27 +0200 Subject: =?UTF-8?q?Update=20translations=20for=20Norwegian=20Bokm=C3=A5l.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/nb-no/hmessages.po | 4961 ++++++++++++++++++++++++----------------------- view/nb-no/hstrings.php | 526 ++--- 2 files changed, 2846 insertions(+), 2641 deletions(-) diff --git a/view/nb-no/hmessages.po b/view/nb-no/hmessages.po index 55e943a74..eb91de095 100644 --- a/view/nb-no/hmessages.po +++ b/view/nb-no/hmessages.po @@ -1,16 +1,16 @@ # hubzilla # Copyright (C) 2012-2022 hubzilla # This file is distributed under the same license as the hubzilla package. -# -# Mike Macgirvin, 2012. +# Mike Macgirvin, 2012 # Haakon Meland Eriksen , 2015-2016. -# Harald Eilertsen , 2022, 2023. +# SPDX-FileCopyrightText: 2022, 2023 Harald Eilertsen +# msgid "" msgstr "" -"Project-Id-Version: 7.8RC\n" +"Project-Id-Version: 8.6RC1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-09-26 07:09+0000\n" -"PO-Revision-Date: 2023-01-26 20:02+0100\n" +"POT-Creation-Date: 2023-07-04 17:57+0000\n" +"PO-Revision-Date: 2023-09-09 15:38+0200\n" "Last-Translator: Harald Eilertsen \n" "Language-Team: Norwegian Bokmal \n" "Language: nb_NO\n" @@ -18,14 +18,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n" -"X-Generator: Lokalize 22.12.1\n" +"X-Generator: Poedit 3.3.2\n" #: ../../view/theme/redbasic/php/config.php:15 #: ../../addon/cart/submodules/orderoptions.php:335 #: ../../addon/cart/submodules/orderoptions.php:359 #: ../../addon/cart/submodules/orderoptions.php:435 -#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3461 -#: ../../Zotlabs/Module/Admin/Site.php:251 +#: ../../addon/cart/submodules/orderoptions.php:459 ../../include/text.php:3502 +#: ../../Zotlabs/Module/Admin/Site.php:245 msgid "Default" msgstr "Standard" @@ -34,10 +34,9 @@ msgstr "Standard" msgid "Focus (Hubzilla default)" msgstr "Focus (Hubzilla standard)" -#: ../../view/theme/redbasic/php/config.php:96 -#: ../../addon/channelreputation/channelreputation.php:143 -#: ../../addon/wiki/Widget/Wiki_pages.php:43 -#: ../../addon/wiki/Widget/Wiki_pages.php:100 ../../addon/wiki/Mod_Wiki.php:218 +#: ../../view/theme/redbasic/php/config.php:98 +#: ../../addon/wiki/Widget/Wiki_pages.php:69 ../../addon/wiki/Mod_Wiki.php:218 +#: ../../addon/wiki/Mod_Wiki.php:907 #: ../../addon/openclipatar/openclipatar.php:54 #: ../../addon/photocache/Mod_Photocache.php:63 #: ../../addon/redred/Mod_Redred.php:88 ../../addon/redphotos/redphotos.php:136 @@ -46,7 +45,7 @@ msgstr "Focus (Hubzilla standard)" #: ../../addon/statusnet/Mod_Statusnet.php:304 #: ../../addon/statusnet/statusnet.php:602 ../../addon/rtof/Mod_Rtof.php:70 #: ../../addon/wppost/Mod_Wppost.php:107 -#: ../../addon/content_import/Mod_content_import.php:141 +#: ../../addon/content_import/Mod_content_import.php:140 #: ../../addon/openstreetmap/openstreetmap.php:155 #: ../../addon/ijpost/Mod_Ijpost.php:72 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:62 @@ -60,15 +59,15 @@ msgstr "Focus (Hubzilla standard)" #: ../../addon/cart/submodules/orderoptions.php:412 #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/Settings/Cart.php:132 -#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1376 +#: ../../addon/cart/Settings/Cart.php:142 ../../addon/cart/cart.php:1425 #: ../../addon/nofed/Mod_Nofed.php:51 #: ../../addon/smileybutton/Mod_Smileybutton.php:53 #: ../../addon/redfiles/redfiles.php:124 ../../addon/diaspora/diaspora.php:87 -#: ../../addon/diaspora/Mod_Diaspora.php:100 ../../addon/piwik/piwik.php:95 -#: ../../addon/workflow/workflow.php:1466 -#: ../../addon/workflow/workflow.php:1525 -#: ../../addon/workflow/workflow.php:1644 -#: ../../addon/workflow/workflow.php:2747 +#: ../../addon/diaspora/Mod_Diaspora.php:101 ../../addon/piwik/piwik.php:95 +#: ../../addon/workflow/workflow.php:1468 +#: ../../addon/workflow/workflow.php:1527 +#: ../../addon/workflow/workflow.php:1646 +#: ../../addon/workflow/workflow.php:2749 #: ../../addon/workflow/Settings/Mod_WorkflowSettings.php:94 #: ../../addon/likebanner/likebanner.php:57 #: ../../addon/fuzzloc/Mod_Fuzzloc.php:54 ../../addon/hubwall/hubwall.php:95 @@ -85,65 +84,81 @@ msgstr "Focus (Hubzilla standard)" #: ../../Zotlabs/Module/Import.php:611 ../../Zotlabs/Module/Setup.php:316 #: ../../Zotlabs/Module/Setup.php:356 ../../Zotlabs/Module/Group.php:150 #: ../../Zotlabs/Module/Group.php:159 ../../Zotlabs/Module/Oauth.php:109 -#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Chat.php:246 -#: ../../Zotlabs/Module/Poke.php:215 ../../Zotlabs/Module/Mitem.php:259 +#: ../../Zotlabs/Module/Chat.php:208 ../../Zotlabs/Module/Chat.php:247 +#: ../../Zotlabs/Module/Poke.php:199 ../../Zotlabs/Module/Mitem.php:259 #: ../../Zotlabs/Module/Filestorage.php:208 -#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:86 +#: ../../Zotlabs/Module/Connect.php:107 ../../Zotlabs/Module/Editpost.php:88 #: ../../Zotlabs/Module/Admin/Themes.php:158 #: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Security.php:120 +#: ../../Zotlabs/Module/Admin/Security.php:129 #: ../../Zotlabs/Module/Admin/Accounts.php:309 #: ../../Zotlabs/Module/Admin/Site.php:415 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:178 -#: ../../Zotlabs/Module/Admin/Addons.php:442 +#: ../../Zotlabs/Module/Admin/Addons.php:445 #: ../../Zotlabs/Module/Regate.php:407 ../../Zotlabs/Module/Permcats.php:257 -#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Appman.php:221 +#: ../../Zotlabs/Module/Mood.php:156 ../../Zotlabs/Module/Appman.php:220 #: ../../Zotlabs/Module/Contactedit.php:429 #: ../../Zotlabs/Module/Contactedit.php:462 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Photos.php:1064 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Photos.php:1220 ../../Zotlabs/Module/Profiles.php:740 -#: ../../Zotlabs/Module/Invite.php:550 ../../Zotlabs/Module/Xchan.php:15 +#: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Photos.php:1093 +#: ../../Zotlabs/Module/Photos.php:1206 ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Invite.php:563 ../../Zotlabs/Module/Xchan.php:15 #: ../../Zotlabs/Module/Affinity.php:84 #: ../../Zotlabs/Module/Settings/Network.php:62 #: ../../Zotlabs/Module/Settings/Features.php:48 -#: ../../Zotlabs/Module/Settings/Channel.php:228 +#: ../../Zotlabs/Module/Settings/Channel.php:229 #: ../../Zotlabs/Module/Settings/Account.php:107 #: ../../Zotlabs/Module/Settings/Events.php:42 #: ../../Zotlabs/Module/Settings/Manage.php:43 #: ../../Zotlabs/Module/Settings/Channel_home.php:91 #: ../../Zotlabs/Module/Settings/Calendar.php:42 +#: ../../Zotlabs/Module/Settings/Multifactor.php:85 #: ../../Zotlabs/Module/Settings/Display.php:186 #: ../../Zotlabs/Module/Settings/Directory.php:42 #: ../../Zotlabs/Module/Settings/Editor.php:42 #: ../../Zotlabs/Module/Settings/Connections.php:42 #: ../../Zotlabs/Module/Settings/Photos.php:42 #: ../../Zotlabs/Module/Settings/Profiles.php:52 -#: ../../Zotlabs/Module/Settings/Privacy.php:110 +#: ../../Zotlabs/Module/Settings/Privacy.php:122 #: ../../Zotlabs/Module/Settings/Conversation.php:49 -#: ../../Zotlabs/Module/Defperms.php:263 ../../Zotlabs/Module/Pconfig.php:116 +#: ../../Zotlabs/Module/Defperms.php:262 ../../Zotlabs/Module/Pconfig.php:117 #: ../../Zotlabs/Module/Oauth2.php:114 ../../Zotlabs/Module/Thing.php:328 -#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:106 +#: ../../Zotlabs/Module/Thing.php:381 ../../Zotlabs/Module/Pdledit.php:137 #: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Locs.php:125 #: ../../Zotlabs/Module/Sources.php:123 ../../Zotlabs/Module/Sources.php:160 -#: ../../Zotlabs/Lib/ThreadItem.php:835 ../../Zotlabs/Storage/Browser.php:382 +#: ../../Zotlabs/Lib/ThreadItem.php:831 ../../Zotlabs/Storage/Browser.php:385 msgid "Submit" msgstr "Lagre" -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Theme settings" msgstr "Instillinger for utseende" -#: ../../view/theme/redbasic/php/config.php:101 -msgid "Narrow navbar" -msgstr "Smal navigasjonslinje" +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Dark style" +msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 -#: ../../view/theme/redbasic/php/config.php:119 -#: ../../addon/channelreputation/channelreputation.php:111 +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Light style" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Common settings" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:106 +#, fuzzy +#| msgid "Default photo upload folder" +msgid "Default to dark mode" +msgstr "Standard mappe for opplasting av bilder" + +#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:124 #: ../../addon/wiki/Mod_Wiki.php:230 ../../addon/wiki/Mod_Wiki.php:231 #: ../../addon/redred/Mod_Redred.php:61 #: ../../addon/statusnet/Mod_Statusnet.php:258 @@ -151,8 +166,8 @@ msgstr "Smal navigasjonslinje" #: ../../addon/statusnet/Mod_Statusnet.php:289 ../../addon/rtof/Mod_Rtof.php:47 #: ../../addon/wppost/Mod_Wppost.php:84 ../../addon/wppost/Mod_Wppost.php:88 #: ../../addon/wppost/Mod_Wppost.php:92 +#: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 -#: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 @@ -172,18 +187,18 @@ msgstr "Smal navigasjonslinje" #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 #: ../../addon/cart/submodules/paypalbuttonV2.php:88 -#: ../../addon/cart/submodules/paypalbuttonV2.php:96 +#: ../../addon/cart/submodules/paypalbuttonV2.php:98 #: ../../addon/cart/submodules/manualcat.php:63 #: ../../addon/cart/submodules/manualcat.php:254 #: ../../addon/cart/submodules/manualcat.php:258 #: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 -#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:40 +#: ../../addon/cart/cart.php:1419 ../../addon/nofed/Mod_Nofed.php:40 #: ../../addon/smileybutton/Mod_Smileybutton.php:42 #: ../../addon/diaspora/Mod_Diaspora.php:70 #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1475 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1483 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 #: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 @@ -197,28 +212,33 @@ msgstr "Smal navigasjonslinje" #: ../../Zotlabs/Module/Permcats.php:247 #: ../../Zotlabs/Module/Contactedit.php:284 #: ../../Zotlabs/Module/Contactedit.php:329 ../../Zotlabs/Module/Api.php:99 -#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:676 -#: ../../Zotlabs/Module/Profiles.php:686 ../../Zotlabs/Module/Profiles.php:694 -#: ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Settings/Channel.php:223 +#: ../../Zotlabs/Module/Photos.php:666 ../../Zotlabs/Module/Profiles.php:675 +#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Settings/Channel.php:224 +#: ../../Zotlabs/Module/Settings/Multifactor.php:82 #: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:120 -#: ../../Zotlabs/Module/Settings/Privacy.php:121 -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Connedit.php:622 #: ../../Zotlabs/Module/Sources.php:122 ../../Zotlabs/Module/Sources.php:157 #: ../../Zotlabs/Lib/Libzotdir.php:165 ../../Zotlabs/Lib/Libzotdir.php:166 #: ../../Zotlabs/Lib/Libzotdir.php:168 ../../Zotlabs/Storage/Browser.php:310 #: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:312 -#: ../../Zotlabs/Storage/Browser.php:389 ../../Zotlabs/Storage/Browser.php:391 -#: ../../Zotlabs/Storage/Browser.php:552 ../../boot.php:1753 +#: ../../Zotlabs/Storage/Browser.php:392 ../../Zotlabs/Storage/Browser.php:394 +#: ../../Zotlabs/Storage/Browser.php:558 ../../boot.php:1751 msgid "No" msgstr "Nei" -#: ../../view/theme/redbasic/php/config.php:101 -#: ../../view/theme/redbasic/php/config.php:119 -#: ../../addon/channelreputation/channelreputation.php:111 +#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:124 #: ../../addon/wiki/Mod_Wiki.php:230 ../../addon/wiki/Mod_Wiki.php:231 #: ../../addon/redred/Mod_Redred.php:61 #: ../../addon/statusnet/Mod_Statusnet.php:258 @@ -226,8 +246,8 @@ msgstr "Nei" #: ../../addon/statusnet/Mod_Statusnet.php:289 ../../addon/rtof/Mod_Rtof.php:47 #: ../../addon/wppost/Mod_Wppost.php:84 ../../addon/wppost/Mod_Wppost.php:88 #: ../../addon/wppost/Mod_Wppost.php:92 +#: ../../addon/content_import/Mod_content_import.php:135 #: ../../addon/content_import/Mod_content_import.php:136 -#: ../../addon/content_import/Mod_content_import.php:137 #: ../../addon/ijpost/Mod_Ijpost.php:61 #: ../../addon/pubcrawl/Mod_Pubcrawl.php:42 #: ../../addon/dwpost/Mod_Dwpost.php:59 ../../addon/dwpost/Mod_Dwpost.php:63 @@ -247,18 +267,18 @@ msgstr "Nei" #: ../../addon/cart/submodules/paypalbutton.php:87 #: ../../addon/cart/submodules/paypalbutton.php:95 #: ../../addon/cart/submodules/paypalbuttonV2.php:88 -#: ../../addon/cart/submodules/paypalbuttonV2.php:96 +#: ../../addon/cart/submodules/paypalbuttonV2.php:98 #: ../../addon/cart/submodules/manualcat.php:63 #: ../../addon/cart/submodules/manualcat.php:254 #: ../../addon/cart/submodules/manualcat.php:258 #: ../../addon/cart/Settings/Cart.php:61 ../../addon/cart/Settings/Cart.php:73 -#: ../../addon/cart/cart.php:1370 ../../addon/nofed/Mod_Nofed.php:40 +#: ../../addon/cart/cart.php:1419 ../../addon/nofed/Mod_Nofed.php:40 #: ../../addon/smileybutton/Mod_Smileybutton.php:42 #: ../../addon/diaspora/Mod_Diaspora.php:70 #: ../../addon/libertree/Mod_Libertree.php:57 #: ../../addon/socialauth/Mod_SocialAuth.php:218 #: ../../addon/ljpost/Mod_Ljpost.php:61 ../../addon/ljpost/Mod_Ljpost.php:65 -#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1475 +#: ../../addon/ljpost/Mod_Ljpost.php:69 ../../include/conversation.php:1483 #: ../../Zotlabs/Module/Import.php:600 ../../Zotlabs/Module/Import.php:604 #: ../../Zotlabs/Module/Import.php:605 ../../Zotlabs/Module/Register.php:512 #: ../../Zotlabs/Module/Group.php:137 ../../Zotlabs/Module/Group.php:138 @@ -271,106 +291,124 @@ msgstr "Nei" #: ../../Zotlabs/Module/Admin/Site.php:321 #: ../../Zotlabs/Module/Permcats.php:247 #: ../../Zotlabs/Module/Contactedit.php:284 ../../Zotlabs/Module/Api.php:98 -#: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Profiles.php:676 -#: ../../Zotlabs/Module/Profiles.php:686 ../../Zotlabs/Module/Profiles.php:694 -#: ../../Zotlabs/Module/Profiles.php:698 -#: ../../Zotlabs/Module/Settings/Channel.php:223 +#: ../../Zotlabs/Module/Photos.php:666 ../../Zotlabs/Module/Profiles.php:675 +#: ../../Zotlabs/Module/Profiles.php:685 ../../Zotlabs/Module/Profiles.php:693 +#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Settings/Channel.php:224 +#: ../../Zotlabs/Module/Settings/Multifactor.php:82 #: ../../Zotlabs/Module/Settings/Display.php:86 -#: ../../Zotlabs/Module/Settings/Privacy.php:120 -#: ../../Zotlabs/Module/Settings/Privacy.php:121 -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +#: ../../Zotlabs/Module/Settings/Privacy.php:137 #: ../../Zotlabs/Module/Menu.php:163 ../../Zotlabs/Module/Menu.php:222 #: ../../Zotlabs/Module/Defperms.php:195 ../../Zotlabs/Module/Sources.php:122 #: ../../Zotlabs/Module/Sources.php:157 ../../Zotlabs/Lib/Libzotdir.php:165 #: ../../Zotlabs/Lib/Libzotdir.php:166 ../../Zotlabs/Lib/Libzotdir.php:168 #: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:311 -#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:389 -#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:552 -#: ../../boot.php:1753 +#: ../../Zotlabs/Storage/Browser.php:312 ../../Zotlabs/Storage/Browser.php:392 +#: ../../Zotlabs/Storage/Browser.php:394 ../../Zotlabs/Storage/Browser.php:558 +#: ../../boot.php:1751 msgid "Yes" msgstr "Ja" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Always use light icons for navbar" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Enable this option if you use a dark navbar color in light mode" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:108 +msgid "Narrow navbar" +msgstr "Smal navigasjonslinje" + +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar background color" msgstr "Navigasjonslinjens bakgrunnsfarge" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Navigation bar icon color " -msgstr "Navigasjonslinjens ikonfarge" - -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Navigation bar active icon color " -msgstr "Navigasjonslinjens aktive ikoners farge" +#: ../../view/theme/redbasic/php/config.php:110 +#, fuzzy +#| msgid "Navigation bar background color" +msgid "Dark navigation bar background color" +msgstr "Navigasjonslinjens bakgrunnsfarge" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Link color" msgstr "Lenkefarge" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:112 +#, fuzzy +#| msgid "Link color" +msgid "Dark link color" +msgstr "Lenkefarge" + +#: ../../view/theme/redbasic/php/config.php:113 msgid "Link hover color" msgstr "Lenkefarge når musepekeren er over" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Set font-color for banner" -msgstr "Angi skriftfargen for banneret" +#: ../../view/theme/redbasic/php/config.php:114 +#, fuzzy +#| msgid "Link hover color" +msgid "Dark link hover color" +msgstr "Lenkefarge når musepekeren er over" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color" msgstr "Angi bakgrunnsfargen" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:116 +#, fuzzy +#| msgid "Set the background color" +msgid "Set the dark background color" +msgstr "Angi bakgrunnsfargen" + +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background image" msgstr "Angi bakgrunnsbilde" -#: ../../view/theme/redbasic/php/config.php:110 -msgid "Set the background color of items" -msgstr "Angi bakgrunnsfargen til elementer" - -#: ../../view/theme/redbasic/php/config.php:111 -msgid "Set the background color of comments" -msgstr "Angi bakgrunnsfargen til kommentarer" +#: ../../view/theme/redbasic/php/config.php:118 +#, fuzzy +#| msgid "Set the background image" +msgid "Set the dark background image" +msgstr "Angi bakgrunnsbilde" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set font-size for the entire application" msgstr "Angi skriftstørrelsen for hele programmet" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Examples: 1rem, 100%, 16px" msgstr "For eksempel: 1rem, 100%, 16px" -#: ../../view/theme/redbasic/php/config.php:113 -msgid "Set font-color for posts and comments" -msgstr "Angi skriftfargen for innlegg og kommentarer" - -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set radius of corners" msgstr "Angi hjørneradius" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Example: 4px" msgstr "For eksempel: 4px" -#: ../../view/theme/redbasic/php/config.php:115 -msgid "Set shadow depth of photos" -msgstr "Angi skyggedybden til bilder" - -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set maximum width of content region in rem" msgstr "Set maksbredde for hovedregionen i rem" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Leave empty for default width" msgstr "La feltet stå tomt for å bruke standard bredde" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set size of conversation author photo" msgstr "Angi størrelsen for samtalens forfatterbilde" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set size of followup author photos" msgstr "Angi størrelsen på forfatterbilder ved oppfølging" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Show advanced settings" msgstr "Vis avanserte innstillinger" @@ -378,96 +416,7 @@ msgstr "Vis avanserte innstillinger" msgid "Source channel not found." msgstr "Fant ikke kildekanalen." -#: ../../addon/channelreputation/channelreputation.php:101 -#: ../../addon/channelreputation/channelreputation.php:102 -#: ../../addon/cart/myshop.php:144 ../../addon/cart/myshop.php:180 -#: ../../addon/cart/myshop.php:214 ../../addon/cart/myshop.php:261 -#: ../../addon/cart/myshop.php:296 ../../addon/cart/myshop.php:319 -msgid "Access Denied" -msgstr "Ingen tilgang" - -#: ../../addon/channelreputation/channelreputation.php:109 -msgid "Enable Community Moderation" -msgstr "Slå på gruppemoderering" - -#: ../../addon/channelreputation/channelreputation.php:117 -msgid "Reputation automatically given to new members" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:118 -msgid "Reputation will never fall below this value" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:119 -msgid "Minimum reputation before posting is allowed" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:120 -msgid "Minimum reputation before commenting is allowed" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:121 -msgid "Minimum reputation before a member is able to moderate other posts" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:122 -msgid "" -"Max ratio of moderator's reputation that can be added to/deducted from " -"reputation of person being moderated" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:123 -msgid "Reputation \"cost\" to post" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:124 -msgid "Reputation \"cost\" to comment" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:125 -msgid "" -"Reputation automatically recovers at this rate per hour until it reaches " -"minimum_to_post" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:126 -msgid "" -"When minimum_to_moderate > reputation > minimum_to_post reputation recovers " -"at this rate per hour" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:140 -msgid "Community Moderation Settings" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:232 -msgid "Channel Reputation" -msgstr "" - -#: ../../addon/channelreputation/channelreputation.php:233 -#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:161 -#: ../../Zotlabs/Module/Photos.php:1279 ../../Zotlabs/Lib/ThreadItem.php:503 -#: ../../Zotlabs/Storage/Browser.php:411 -msgid "Close" -msgstr "Lukk" - -#: ../../addon/channelreputation/channelreputation.php:236 -msgid "An Error has occurred." -msgstr "Det oppsto en feil." - -#: ../../addon/channelreputation/channelreputation.php:254 -msgid "Upvote" -msgstr "Stem opp" - -#: ../../addon/channelreputation/channelreputation.php:255 -msgid "Downvote" -msgstr "Stem ned" - -#: ../../addon/channelreputation/channelreputation.php:414 -msgid "Can moderate reputation on my channel." -msgstr "" - -#: ../../addon/superblock/superblock.php:337 +#: ../../addon/superblock/superblock.php:355 msgid "Block Completely" msgstr "Blokker helt" @@ -484,9 +433,8 @@ msgid "No channels currently blocked" msgstr "Ingen kanaler er blokkert i øyeblikket" #: ../../addon/superblock/Mod_Superblock.php:90 -#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:459 -#: ../../Zotlabs/Module/Cover_photo.php:424 -#: ../../Zotlabs/Module/Photos.php:1002 +#: ../../Zotlabs/Module/Tagrm.php:137 ../../Zotlabs/Module/Admin/Addons.php:462 +#: ../../Zotlabs/Module/Cover_photo.php:424 ../../Zotlabs/Module/Photos.php:991 msgid "Remove" msgstr "Fjern" @@ -506,46 +454,42 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../addon/wiki/Widget/Wiki_pages.php:35 -#: ../../addon/wiki/Widget/Wiki_pages.php:92 +#: ../../addon/wiki/Widget/Wiki_pages.php:55 +msgid "Wiki Pages" +msgstr "Wikisider" + +#: ../../addon/wiki/Widget/Wiki_pages.php:61 ../../addon/wiki/Mod_Wiki.php:899 msgid "Add new page" msgstr "Legg til ny side" -#: ../../addon/wiki/Widget/Wiki_pages.php:39 -#: ../../addon/wiki/Widget/Wiki_pages.php:96 ../../addon/wiki/Mod_Wiki.php:220 -#: ../../addon/wiki/Mod_Wiki.php:374 ../../addon/mdpost/mdpost.php:41 -#: ../../include/text.php:2201 +#: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 +#: ../../addon/mdpost/mdpost.php:41 ../../include/text.php:2213 msgid "Markdown" msgstr "Markdown" -#: ../../addon/wiki/Widget/Wiki_pages.php:39 -#: ../../addon/wiki/Widget/Wiki_pages.php:96 ../../addon/wiki/Mod_Wiki.php:220 -#: ../../addon/wiki/Mod_Wiki.php:374 ../../include/text.php:2199 +#: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../addon/wiki/Mod_Wiki.php:368 ../../addon/wiki/Mod_Wiki.php:903 +#: ../../include/text.php:2211 msgid "BBcode" msgstr "BBcode" -#: ../../addon/wiki/Widget/Wiki_pages.php:39 -#: ../../addon/wiki/Widget/Wiki_pages.php:96 ../../addon/wiki/Mod_Wiki.php:220 -#: ../../include/text.php:2202 +#: ../../addon/wiki/Widget/Wiki_pages.php:65 ../../addon/wiki/Mod_Wiki.php:220 +#: ../../addon/wiki/Mod_Wiki.php:903 ../../include/text.php:2214 msgid "Text" msgstr "Tekst" -#: ../../addon/wiki/Widget/Wiki_pages.php:42 -#: ../../addon/wiki/Widget/Wiki_pages.php:99 -#: ../../Zotlabs/Module/Dreport.php:130 -msgid "Options" -msgstr "Valg" - -#: ../../addon/wiki/Widget/Wiki_pages.php:86 -msgid "Wiki Pages" -msgstr "Wikisider" - -#: ../../addon/wiki/Widget/Wiki_pages.php:97 +#: ../../addon/wiki/Widget/Wiki_pages.php:66 msgid "Page name" msgstr "Sidenavn" +#: ../../addon/wiki/Widget/Wiki_pages.php:68 ../../addon/wiki/Mod_Wiki.php:906 +#: ../../Zotlabs/Module/Dreport.php:133 +msgid "Options" +msgstr "Valg" + #: ../../addon/wiki/Widget/Wiki_list.php:20 ../../addon/wiki/Mod_Wiki.php:209 -#: ../../addon/wiki/wiki.php:70 ../../include/nav.php:515 +#: ../../addon/wiki/wiki.php:70 ../../include/nav.php:522 msgid "Wikis" msgstr "Wikier" @@ -553,11 +497,11 @@ msgstr "Wikier" #: ../../addon/wiki/Lib/NativeWikiPage.php:588 #: ../../addon/wiki/Mod_Wiki.php:221 ../../addon/rendezvous/rendezvous.php:172 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Module/Oauth.php:137 -#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Cdav.php:1372 -#: ../../Zotlabs/Module/Sharedwithme.php:106 +#: ../../Zotlabs/Module/Chat.php:256 ../../Zotlabs/Module/Cdav.php:1364 +#: ../../Zotlabs/Module/Sharedwithme.php:107 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Oauth2.php:116 ../../Zotlabs/Module/Oauth2.php:144 -#: ../../Zotlabs/Module/Connedit.php:732 ../../Zotlabs/Storage/Browser.php:377 +#: ../../Zotlabs/Module/Connedit.php:732 ../../Zotlabs/Storage/Browser.php:380 msgid "Name" msgstr "Navn" @@ -574,7 +518,7 @@ msgstr "Dato" #: ../../addon/wiki/Widget/Wiki_page_history.php:31 #: ../../addon/wiki/Lib/NativeWikiPage.php:591 -#: ../../addon/wiki/Mod_Wiki.php:370 +#: ../../addon/wiki/Mod_Wiki.php:364 msgid "Revert" msgstr "Tilbakestill" @@ -644,52 +588,52 @@ msgstr "Siden ble oppdatert" msgid "Wiki resource_id required for git commit" msgstr "Wiki ressurs_id er nødvendig for å lagre i git" -#: ../../addon/wiki/Lib/NativeWikiPage.php:545 ../../addon/cards/cards.php:103 +#: ../../addon/wiki/Lib/NativeWikiPage.php:545 ../../addon/cards/cards.php:104 #: ../../addon/articles/articles.php:105 ../../include/help.php:133 -#: ../../Zotlabs/Module/Display.php:142 ../../Zotlabs/Module/Page.php:136 +#: ../../Zotlabs/Module/Display.php:149 ../../Zotlabs/Module/Page.php:136 #: ../../Zotlabs/Module/Block.php:77 ../../Zotlabs/Web/Router.php:186 msgid "Page not found." msgstr "Siden ikke funnet." -#: ../../addon/wiki/Lib/NativeWikiPage.php:630 ../../include/bbcode.php:1059 -#: ../../include/bbcode.php:1244 +#: ../../addon/wiki/Lib/NativeWikiPage.php:630 ../../include/bbcode.php:1061 +#: ../../include/bbcode.php:1246 msgid "Different viewers will see this text differently" msgstr "Denne teksten vil se forskjellig ut for ulike besøkende" -#: ../../addon/wiki/Mod_Wiki.php:36 ../../addon/cart/cart.php:1410 +#: ../../addon/wiki/Mod_Wiki.php:36 ../../addon/cart/cart.php:1459 #: ../../addon/flashcards/Mod_Flashcards.php:52 msgid "Profile Unavailable." msgstr "Profilen er ikke tilgjengelig." #: ../../addon/wiki/Mod_Wiki.php:63 ../../addon/wiki/Mod_Wiki.php:288 -#: ../../addon/wiki/Mod_Wiki.php:431 ../../addon/openid/Mod_Id.php:53 +#: ../../addon/wiki/Mod_Wiki.php:425 ../../addon/openid/Mod_Id.php:53 #: ../../addon/pumpio/pumpio.php:44 ../../addon/keepout/keepout.php:36 #: ../../addon/cards/Mod_Card_edit.php:51 ../../addon/cards/Mod_Cards.php:89 #: ../../addon/articles/Mod_Article_edit.php:51 #: ../../addon/articles/Mod_Articles.php:94 ../../include/photos.php:30 -#: ../../include/items.php:3894 ../../include/attach.php:156 +#: ../../include/items.php:3953 ../../include/attach.php:156 #: ../../include/attach.php:205 ../../include/attach.php:278 -#: ../../include/attach.php:329 ../../include/attach.php:424 -#: ../../include/attach.php:438 ../../include/attach.php:445 -#: ../../include/attach.php:527 ../../include/attach.php:1096 -#: ../../include/attach.php:1169 ../../include/attach.php:1332 +#: ../../include/attach.php:329 ../../include/attach.php:431 +#: ../../include/attach.php:445 ../../include/attach.php:452 +#: ../../include/attach.php:534 ../../include/attach.php:1106 +#: ../../include/attach.php:1179 ../../include/attach.php:1344 #: ../../Zotlabs/Module/Attach_edit.php:90 #: ../../Zotlabs/Module/Attach_edit.php:99 #: ../../Zotlabs/Module/Attach_edit.php:106 ../../Zotlabs/Module/Network.php:18 #: ../../Zotlabs/Module/Register.php:200 ../../Zotlabs/Module/Setup.php:218 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Channel.php:220 ../../Zotlabs/Module/Channel.php:377 -#: ../../Zotlabs/Module/Channel.php:416 ../../Zotlabs/Module/Group.php:14 +#: ../../Zotlabs/Module/Channel.php:222 ../../Zotlabs/Module/Channel.php:379 +#: ../../Zotlabs/Module/Channel.php:418 ../../Zotlabs/Module/Group.php:14 #: ../../Zotlabs/Module/Group.php:30 ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 #: ../../Zotlabs/Module/Editwebpage.php:107 #: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Chat.php:111 #: ../../Zotlabs/Module/Chat.php:116 #: ../../Zotlabs/Module/Channel_calendar.php:232 -#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:157 -#: ../../Zotlabs/Module/Item.php:501 ../../Zotlabs/Module/Item.php:520 -#: ../../Zotlabs/Module/Item.php:530 ../../Zotlabs/Module/Item.php:1410 +#: ../../Zotlabs/Module/Like.php:248 ../../Zotlabs/Module/Poke.php:141 +#: ../../Zotlabs/Module/Item.php:513 ../../Zotlabs/Module/Item.php:532 +#: ../../Zotlabs/Module/Item.php:542 ../../Zotlabs/Module/Item.php:1443 #: ../../Zotlabs/Module/Mitem.php:129 ../../Zotlabs/Module/Profile.php:99 #: ../../Zotlabs/Module/Profile.php:114 #: ../../Zotlabs/Module/Sharedwithme.php:19 @@ -702,7 +646,7 @@ msgstr "Profilen er ikke tilgjengelig." #: ../../Zotlabs/Module/Editpost.php:17 #: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Manage.php:10 #: ../../Zotlabs/Module/Authtest.php:13 ../../Zotlabs/Module/Viewsrc.php:19 -#: ../../Zotlabs/Module/Moderate.php:15 ../../Zotlabs/Module/Display.php:384 +#: ../../Zotlabs/Module/Moderate.php:15 ../../Zotlabs/Module/Display.php:388 #: ../../Zotlabs/Module/Common.php:38 ../../Zotlabs/Module/New_channel.php:105 #: ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Mood.php:126 @@ -711,16 +655,16 @@ msgstr "Profilen er ikke tilgjengelig." #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Vote.php:19 #: ../../Zotlabs/Module/Profile_photo.php:390 #: ../../Zotlabs/Module/Profile_photo.php:421 -#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:58 +#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Settings.php:59 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Cover_photo.php:341 #: ../../Zotlabs/Module/Cover_photo.php:354 ../../Zotlabs/Module/Photos.php:71 #: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:133 -#: ../../Zotlabs/Module/Profiles.php:171 ../../Zotlabs/Module/Profiles.php:615 -#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Invite.php:51 -#: ../../Zotlabs/Module/Invite.php:302 ../../Zotlabs/Module/Block.php:24 +#: ../../Zotlabs/Module/Profiles.php:171 ../../Zotlabs/Module/Profiles.php:614 +#: ../../Zotlabs/Module/Bookmarks.php:70 ../../Zotlabs/Module/Invite.php:64 +#: ../../Zotlabs/Module/Invite.php:315 ../../Zotlabs/Module/Block.php:24 #: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Menu.php:130 #: ../../Zotlabs/Module/Menu.php:141 ../../Zotlabs/Module/Defperms.php:181 #: ../../Zotlabs/Module/Thing.php:282 ../../Zotlabs/Module/Thing.php:302 @@ -729,14 +673,14 @@ msgstr "Profilen er ikke tilgjengelig." #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Locs.php:98 #: ../../Zotlabs/Module/Sources.php:80 ../../Zotlabs/Lib/Chatroom.php:135 -#: ../../Zotlabs/Web/WebServer.php:117 +#: ../../Zotlabs/Web/WebServer.php:119 msgid "Permission denied." msgstr "Tillatelse avslått." #: ../../addon/wiki/Mod_Wiki.php:81 ../../addon/cart/manual_payments.php:93 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/submodules/paypalbuttonV2.php:478 -#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1558 +#: ../../addon/cart/submodules/paypalbuttonV2.php:486 +#: ../../addon/cart/myshop.php:37 ../../addon/cart/cart.php:1610 msgid "Invalid channel" msgstr "Ugyldig kanal" @@ -752,39 +696,39 @@ msgstr "Det oppstod en feil ved eksport av mappe til zip fil" msgid "Error downloading wiki: " msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:214 ../../addon/wiki/Mod_Wiki.php:387 -#: ../../addon/cards/Mod_Card_edit.php:99 ../../addon/cards/cards.php:73 +#: ../../addon/wiki/Mod_Wiki.php:214 ../../addon/wiki/Mod_Wiki.php:381 +#: ../../addon/cards/Mod_Card_edit.php:99 ../../addon/cards/cards.php:74 #: ../../addon/articles/Mod_Article_edit.php:97 #: ../../addon/articles/articles.php:75 ../../include/menu.php:120 #: ../../include/channel.php:1530 ../../include/channel.php:1534 -#: ../../Zotlabs/Widget/Cdav.php:142 ../../Zotlabs/Widget/Cdav.php:179 +#: ../../Zotlabs/Widget/Cdav.php:144 ../../Zotlabs/Widget/Cdav.php:181 #: ../../Zotlabs/Module/Group.php:245 ../../Zotlabs/Module/Oauth.php:171 #: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:252 -#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:160 +#: ../../Zotlabs/Module/Webpages.php:250 +#: ../../Zotlabs/Module/Admin/Profs.php:175 ../../Zotlabs/Module/Blocks.php:158 #: ../../Zotlabs/Module/Editblock.php:114 #: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Connections.php:329 -#: ../../Zotlabs/Module/Connections.php:378 -#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Module/Menu.php:176 +#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Connections.php:387 +#: ../../Zotlabs/Module/Connections.php:408 ../../Zotlabs/Module/Menu.php:176 #: ../../Zotlabs/Module/Oauth2.php:192 ../../Zotlabs/Module/Thing.php:268 -#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Lib/Apps.php:600 -#: ../../Zotlabs/Lib/ThreadItem.php:166 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Lib/Apps.php:601 +#: ../../Zotlabs/Lib/ThreadItem.php:158 msgid "Edit" msgstr "Endre" -#: ../../addon/wiki/Mod_Wiki.php:215 ../../Zotlabs/Storage/Browser.php:404 +#: ../../addon/wiki/Mod_Wiki.php:215 ../../Zotlabs/Storage/Browser.php:407 msgid "Download" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:216 ../../addon/wiki/Mod_Wiki.php:412 -#: ../../Zotlabs/Module/Pubsites.php:60 ../../Zotlabs/Module/Webpages.php:258 -#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:198 +#: ../../addon/wiki/Mod_Wiki.php:216 ../../addon/wiki/Mod_Wiki.php:406 +#: ../../Zotlabs/Module/Pubsites.php:62 ../../Zotlabs/Module/Webpages.php:256 +#: ../../Zotlabs/Module/Blocks.php:164 ../../Zotlabs/Module/Layouts.php:196 msgid "View" msgstr "Vis" #: ../../addon/wiki/Mod_Wiki.php:217 ../../Zotlabs/Module/Manage.php:137 -#: ../../Zotlabs/Module/Profiles.php:853 +#: ../../Zotlabs/Module/Profiles.php:852 msgid "Create New" msgstr "Opprett nytt" @@ -796,7 +740,7 @@ msgstr "" msgid "Content type" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:222 ../../Zotlabs/Storage/Browser.php:378 +#: ../../addon/wiki/Mod_Wiki.php:222 ../../Zotlabs/Storage/Browser.php:381 msgid "Type" msgstr "Type" @@ -817,176 +761,177 @@ msgid "Edit Wiki Name" msgstr "" #: ../../addon/wiki/Mod_Wiki.php:277 +#, fuzzy msgid "Wiki not found" -msgstr "" +msgstr "Fant ikke wikien." #: ../../addon/wiki/Mod_Wiki.php:303 msgid "Rename page" msgstr "" #: ../../addon/wiki/Mod_Wiki.php:304 ../../addon/hsse/hsse.php:186 -#: ../../include/conversation.php:1444 ../../Zotlabs/Widget/Cdav.php:140 -#: ../../Zotlabs/Module/Webpages.php:253 ../../Zotlabs/Module/Blocks.php:161 -#: ../../Zotlabs/Module/Photos.php:1084 ../../Zotlabs/Module/Layouts.php:194 +#: ../../include/conversation.php:1452 ../../Zotlabs/Widget/Cdav.php:142 +#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Layouts.php:192 msgid "Share" msgstr "Del" -#: ../../addon/wiki/Mod_Wiki.php:324 +#: ../../addon/wiki/Mod_Wiki.php:318 msgid "Error retrieving page content" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:332 ../../addon/wiki/Mod_Wiki.php:334 +#: ../../addon/wiki/Mod_Wiki.php:326 ../../addon/wiki/Mod_Wiki.php:328 msgid "New page" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:369 +#: ../../addon/wiki/Mod_Wiki.php:363 msgid "Revision Comparison" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:371 ../../addon/wiki/Mod_Wiki.php:404 +#: ../../addon/wiki/Mod_Wiki.php:365 ../../addon/wiki/Mod_Wiki.php:398 #: ../../addon/hsse/hsse.php:209 ../../addon/hsse/hsse.php:258 #: ../../addon/cards/Mod_Card_edit.php:132 #: ../../addon/articles/Mod_Article_edit.php:130 -#: ../../include/conversation.php:1467 ../../include/conversation.php:1522 +#: ../../include/conversation.php:1475 ../../include/conversation.php:1530 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Oauth.php:110 ../../Zotlabs/Module/Oauth.php:136 -#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Cdav.php:1057 -#: ../../Zotlabs/Module/Cdav.php:1390 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Editpost.php:111 -#: ../../Zotlabs/Module/Admin/Addons.php:427 +#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Cdav.php:1049 +#: ../../Zotlabs/Module/Cdav.php:1382 ../../Zotlabs/Module/Tagrm.php:15 +#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Editpost.php:114 +#: ../../Zotlabs/Module/Admin/Addons.php:430 #: ../../Zotlabs/Module/Profile_photo.php:553 #: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Filer.php:56 #: ../../Zotlabs/Module/Editlayout.php:140 #: ../../Zotlabs/Module/Cover_photo.php:428 ../../Zotlabs/Module/Oauth2.php:115 #: ../../Zotlabs/Module/Oauth2.php:143 ../../Zotlabs/Module/Connedit.php:750 -#: ../../Zotlabs/Storage/Browser.php:383 +#: ../../Zotlabs/Storage/Browser.php:386 msgid "Cancel" msgstr "Avbryt" -#: ../../addon/wiki/Mod_Wiki.php:377 +#: ../../addon/wiki/Mod_Wiki.php:371 msgid "Short description of your changes (optional)" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:387 ../../addon/wppost/wppost.php:174 +#: ../../addon/wiki/Mod_Wiki.php:381 ../../addon/wppost/wppost.php:174 #: ../../addon/wppost/Mod_Wppost.php:96 ../../addon/dwpost/Mod_Dwpost.php:67 #: ../../addon/dwpost/dwpost.php:134 ../../addon/ljpost/ljpost.php:134 msgid "Source" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:397 +#: ../../addon/wiki/Mod_Wiki.php:391 msgid "New page name" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:402 +#: ../../addon/wiki/Mod_Wiki.php:396 msgid "Embed image from photo albums" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:403 ../../addon/hsse/hsse.php:208 -#: ../../include/conversation.php:1466 +#: ../../addon/wiki/Mod_Wiki.php:397 ../../addon/hsse/hsse.php:208 +#: ../../include/conversation.php:1474 msgid "Embed an image from your albums" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:405 ../../addon/hsse/hsse.php:210 -#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1468 -#: ../../include/conversation.php:1521 +#: ../../addon/wiki/Mod_Wiki.php:399 ../../addon/hsse/hsse.php:210 +#: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1476 +#: ../../include/conversation.php:1529 #: ../../Zotlabs/Module/Profile_photo.php:554 #: ../../Zotlabs/Module/Cover_photo.php:429 msgid "OK" msgstr "OK" -#: ../../addon/wiki/Mod_Wiki.php:406 ../../addon/hsse/hsse.php:139 -#: ../../include/conversation.php:1387 +#: ../../addon/wiki/Mod_Wiki.php:400 ../../addon/hsse/hsse.php:139 +#: ../../include/conversation.php:1395 #: ../../Zotlabs/Module/Profile_photo.php:555 #: ../../Zotlabs/Module/Cover_photo.php:430 msgid "Choose images to embed" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:407 ../../addon/hsse/hsse.php:140 -#: ../../include/conversation.php:1388 +#: ../../addon/wiki/Mod_Wiki.php:401 ../../addon/hsse/hsse.php:140 +#: ../../include/conversation.php:1396 #: ../../Zotlabs/Module/Profile_photo.php:556 #: ../../Zotlabs/Module/Cover_photo.php:431 msgid "Choose an album" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:408 ../../Zotlabs/Module/Profile_photo.php:557 +#: ../../addon/wiki/Mod_Wiki.php:402 ../../Zotlabs/Module/Profile_photo.php:557 #: ../../Zotlabs/Module/Cover_photo.php:432 msgid "Choose a different album" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:409 ../../addon/hsse/hsse.php:142 -#: ../../include/conversation.php:1390 +#: ../../addon/wiki/Mod_Wiki.php:403 ../../addon/hsse/hsse.php:142 +#: ../../include/conversation.php:1398 #: ../../Zotlabs/Module/Profile_photo.php:558 #: ../../Zotlabs/Module/Cover_photo.php:433 msgid "Error getting album list" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:410 ../../addon/hsse/hsse.php:143 -#: ../../include/conversation.php:1391 +#: ../../addon/wiki/Mod_Wiki.php:404 ../../addon/hsse/hsse.php:143 +#: ../../include/conversation.php:1399 #: ../../Zotlabs/Module/Profile_photo.php:559 #: ../../Zotlabs/Module/Cover_photo.php:434 msgid "Error getting photo link" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:411 ../../addon/hsse/hsse.php:144 -#: ../../include/conversation.php:1392 +#: ../../addon/wiki/Mod_Wiki.php:405 ../../addon/hsse/hsse.php:144 +#: ../../include/conversation.php:1400 #: ../../Zotlabs/Module/Profile_photo.php:560 #: ../../Zotlabs/Module/Cover_photo.php:435 msgid "Error getting album" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:413 +#: ../../addon/wiki/Mod_Wiki.php:407 msgid "History" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:491 +#: ../../addon/wiki/Mod_Wiki.php:485 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:498 +#: ../../addon/wiki/Mod_Wiki.php:492 msgid "A wiki with this name already exists." msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:511 +#: ../../addon/wiki/Mod_Wiki.php:505 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:518 +#: ../../addon/wiki/Mod_Wiki.php:512 msgid "Error creating wiki" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:542 +#: ../../addon/wiki/Mod_Wiki.php:536 msgid "Error updating wiki. Invalid name." msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:561 +#: ../../addon/wiki/Mod_Wiki.php:555 msgid "Error updating wiki" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:576 +#: ../../addon/wiki/Mod_Wiki.php:570 msgid "Wiki delete permission denied." msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:586 +#: ../../addon/wiki/Mod_Wiki.php:580 msgid "Error deleting wiki" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:619 +#: ../../addon/wiki/Mod_Wiki.php:613 msgid "New page created" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:745 +#: ../../addon/wiki/Mod_Wiki.php:739 msgid "Cannot delete Home" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:821 +#: ../../addon/wiki/Mod_Wiki.php:815 msgid "Current Revision" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:821 +#: ../../addon/wiki/Mod_Wiki.php:815 msgid "Selected Revision" msgstr "" -#: ../../addon/wiki/Mod_Wiki.php:876 +#: ../../addon/wiki/Mod_Wiki.php:870 msgid "You must be authenticated." msgstr "" @@ -1005,11 +950,11 @@ msgstr "" #: ../../addon/openclipatar/openclipatar.php:56 msgid "Default Search Term" -msgstr "" +msgstr "Standard søkeord" #: ../../addon/openclipatar/openclipatar.php:56 msgid "The default search term. These will be shown second." -msgstr "" +msgstr "Standard søkeord. Disse vil vises som nummer to." #: ../../addon/openclipatar/openclipatar.php:57 msgid "Return After" @@ -1019,13 +964,13 @@ msgstr "" msgid "Page to load after image selection." msgstr "" -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:113 -#: ../../include/conversation.php:1093 ../../Zotlabs/Module/Connedit.php:480 -#: ../../Zotlabs/Lib/Apps.php:348 +#: ../../addon/openclipatar/openclipatar.php:58 ../../include/nav.php:114 +#: ../../include/conversation.php:1096 ../../Zotlabs/Module/Connedit.php:480 +#: ../../Zotlabs/Lib/Apps.php:349 msgid "View Profile" msgstr "Vis profil" -#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:118 +#: ../../addon/openclipatar/openclipatar.php:59 ../../include/nav.php:119 #: ../../include/channel.php:1534 msgid "Edit Profile" msgstr "Endre profil" @@ -1094,7 +1039,7 @@ msgstr "" #: ../../addon/openclipatar/openclipatar.php:196 msgid "Search Term" -msgstr "" +msgstr "Søkeord" #: ../../addon/openclipatar/openclipatar.php:233 msgid "Unknown error. Please try again later." @@ -1106,55 +1051,18 @@ msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -"Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens" -" mellomlager hvis det nye bildet ikke vises umiddelbart." +"Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens " +"mellomlager hvis det nye bildet ikke vises umiddelbart." #: ../../addon/openclipatar/openclipatar.php:309 msgid "Profile photo updated successfully." msgstr "" #: ../../addon/bookmarker/bookmarker.php:38 -#: ../../Zotlabs/Lib/ThreadItem.php:481 +#: ../../Zotlabs/Lib/ThreadItem.php:474 msgid "Save Bookmarks" msgstr "Lagre bokmerker" -#: ../../addon/queueworker/Mod_Queueworker.php:77 -msgid "Max queueworker threads" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:79 -msgid "Minimum 4, default 4" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:90 -msgid "Assume workers dead after" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:92 -msgid "Minimum 120, default 300 seconds" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:103 -msgid "Pause before starting next task" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:105 -msgid "Minimum 100, default 100 microseconds" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:113 -msgid "Queueworker Settings" -msgstr "" - -#: ../../addon/queueworker/Mod_Queueworker.php:116 -#: ../../addon/cards/Mod_Cards.php:116 -#: ../../addon/articles/Mod_Articles.php:120 ../../include/text.php:1168 -#: ../../include/text.php:1180 ../../Zotlabs/Module/Admin/Profs.php:94 -#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54 -#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103 -msgid "Save" -msgstr "Lagre" - #: ../../addon/rainbowtag/Mod_Rainbowtag.php:22 msgid "Rainbow Tag App" msgstr "" @@ -1218,12 +1126,12 @@ msgid "" msgstr "" #: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:64 -#: ../../include/selectors.php:81 ../../include/channel.php:1712 +#: ../../include/selectors.php:81 ../../include/channel.php:1720 msgid "Male" msgstr "Mannlig" #: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:64 -#: ../../include/selectors.php:81 ../../include/channel.php:1710 +#: ../../include/selectors.php:81 ../../include/channel.php:1718 msgid "Female" msgstr "Kvinnelig" @@ -1236,7 +1144,7 @@ msgstr "OpenID protokollfeil. Ingen ID ble returnert." msgid "Welcome %s. Remote authentication successful." msgstr "Velkommen %s. Ekstern autentisering er vellykket." -#: ../../addon/openid/Mod_Openid.php:189 ../../include/auth.php:323 +#: ../../addon/openid/Mod_Openid.php:189 ../../include/auth.php:334 msgid "Login failed." msgstr "Innlogging mislyktes." @@ -1245,8 +1153,8 @@ msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -"Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at" -" ID-en er stavet riktig." +"Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk " +"at ID-en er stavet riktig." #: ../../addon/openid/openid.php:49 msgid "The error message was:" @@ -1261,7 +1169,7 @@ msgid "Last Name" msgstr "Etternavn" #: ../../addon/openid/MysqlProvider.php:54 ../../addon/redred/Mod_Redred.php:73 -#: ../../boot.php:1742 +#: ../../boot.php:1740 msgid "Nickname" msgstr "Kallenavn" @@ -1271,8 +1179,8 @@ msgstr "Fullt navn" #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/redred/Mod_Redred.php:69 -#: ../../addon/rtof/Mod_Rtof.php:55 ../../include/network.php:1768 -#: ../../Zotlabs/Module/Cdav.php:1376 +#: ../../addon/rtof/Mod_Rtof.php:55 ../../include/network.php:1773 +#: ../../Zotlabs/Module/Cdav.php:1368 #: ../../Zotlabs/Module/Admin/Accounts.php:316 #: ../../Zotlabs/Module/Admin/Accounts.php:330 #: ../../Zotlabs/Module/Connedit.php:736 @@ -1281,7 +1189,7 @@ msgstr "E-post" #: ../../addon/openid/MysqlProvider.php:58 #: ../../addon/openid/MysqlProvider.php:59 -#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:365 +#: ../../addon/openid/MysqlProvider.php:60 ../../Zotlabs/Lib/Apps.php:366 msgid "Profile Photo" msgstr "Profilbilde" @@ -1314,11 +1222,11 @@ msgid "Timezone" msgstr "Tidssone" #: ../../addon/openid/MysqlProvider.php:68 -#: ../../Zotlabs/Module/Profiles.php:784 +#: ../../Zotlabs/Module/Profiles.php:783 msgid "Homepage URL" msgstr "Hjemmeside URL" -#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:363 +#: ../../addon/openid/MysqlProvider.php:69 ../../Zotlabs/Lib/Apps.php:364 msgid "Language" msgstr "Språk" @@ -1339,13 +1247,14 @@ msgid "Birthdate" msgstr "Fødselsdato" #: ../../addon/openid/MysqlProvider.php:74 -#: ../../Zotlabs/Module/Profiles.php:457 +#: ../../Zotlabs/Module/Profiles.php:456 msgid "Gender" msgstr "Kjønn" #: ../../addon/moremoods/moremoods.php:19 +#, fuzzy msgid "lonely" -msgstr "" +msgstr "Ensom" #: ../../addon/moremoods/moremoods.php:20 msgid "drunk" @@ -1494,9 +1403,10 @@ msgstr "" msgid "Channel is required." msgstr "" -#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:331 +#: ../../addon/redred/Mod_Redred.php:29 ../../Zotlabs/Module/Network.php:333 +#, fuzzy msgid "Invalid channel." -msgstr "" +msgstr "Ugyldig kanal" #: ../../addon/redred/Mod_Redred.php:38 msgid "Hubzilla Crosspost Connector Settings saved." @@ -1540,12 +1450,11 @@ msgstr "" #: ../../addon/redphotos/redphotos.php:119 #: ../../addon/redfiles/redfiles.php:109 ../../addon/hzfiles/hzfiles.php:75 -#: ../../include/items.php:441 ../../Zotlabs/Module/Import_items.php:116 +#: ../../include/items.php:447 ../../Zotlabs/Module/Import_items.php:116 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Group.php:108 -#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Cloud.php:123 -#: ../../Zotlabs/Module/Share.php:72 ../../Zotlabs/Module/Subthread.php:89 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:55 -#: ../../Zotlabs/Web/WebServer.php:116 +#: ../../Zotlabs/Module/Like.php:348 ../../Zotlabs/Module/Share.php:72 +#: ../../Zotlabs/Module/Subthread.php:89 ../../Zotlabs/Module/Dreport.php:10 +#: ../../Zotlabs/Module/Dreport.php:55 ../../Zotlabs/Web/WebServer.php:118 msgid "Permission denied" msgstr "Tillatelse avvist" @@ -1589,10 +1498,10 @@ msgid "0 or blank to import all available" msgstr "" #: ../../addon/redphotos/redphotohelper.php:71 ../../addon/pubcrawl/as.php:1958 -#: ../../addon/diaspora/Receiver.php:1647 ../../include/text.php:2337 -#: ../../include/conversation.php:138 ../../Zotlabs/Module/Like.php:445 +#: ../../addon/diaspora/Receiver.php:1693 ../../include/text.php:2352 +#: ../../include/conversation.php:138 ../../Zotlabs/Module/Like.php:453 #: ../../Zotlabs/Module/Tagger.php:71 ../../Zotlabs/Module/Subthread.php:115 -#: ../../Zotlabs/Lib/Activity.php:3546 +#: ../../Zotlabs/Lib/Activity.php:3690 msgid "photo" msgstr "foto" @@ -1601,6 +1510,7 @@ msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" +"Den oppgitte URLen for APIet er ikke gyldig. Kontakt serverens administrator." #: ../../addon/statusnet/Mod_Statusnet.php:98 msgid "We could not contact the GNU social API with the Path you entered." @@ -1827,185 +1737,185 @@ msgstr "" msgid "No server specified" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:73 +#: ../../addon/content_import/Mod_content_import.php:72 msgid "Posts imported" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:113 +#: ../../addon/content_import/Mod_content_import.php:112 msgid "Files imported" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:134 -#: ../../Zotlabs/Lib/Apps.php:336 +#: ../../addon/content_import/Mod_content_import.php:133 +#: ../../Zotlabs/Lib/Apps.php:337 msgid "Content Import" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:135 +#: ../../addon/content_import/Mod_content_import.php:134 msgid "" "This will import all your conversations and cloud files from a cloned " "channel on another server. This may take a while if you have lots of posts " "and or files." msgstr "" -#: ../../addon/content_import/Mod_content_import.php:136 +#: ../../addon/content_import/Mod_content_import.php:135 msgid "Include posts" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:136 +#: ../../addon/content_import/Mod_content_import.php:135 msgid "Conversations, Articles, Cards, and other posted content" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:136 msgid "Include files" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:137 +#: ../../addon/content_import/Mod_content_import.php:136 msgid "Files, Photos and other cloud storage" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:138 +#: ../../addon/content_import/Mod_content_import.php:137 msgid "Original Server base URL" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:139 +#: ../../addon/content_import/Mod_content_import.php:138 #: ../../addon/hzfiles/hzfiles.php:84 msgid "Since modified date yyyy-mm-dd" msgstr "" -#: ../../addon/content_import/Mod_content_import.php:140 +#: ../../addon/content_import/Mod_content_import.php:139 #: ../../addon/hzfiles/hzfiles.php:85 msgid "Until modified date yyyy-mm-dd" msgstr "" -#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1332 +#: ../../addon/hsse/hsse.php:82 ../../include/conversation.php:1340 msgid "Set your location" msgstr "Angi din plassering" -#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1333 +#: ../../addon/hsse/hsse.php:83 ../../include/conversation.php:1341 msgid "Clear browser location" msgstr "Fjern nettleserplassering" #: ../../addon/hsse/hsse.php:95 ../../addon/cards/Mod_Card_edit.php:101 #: ../../addon/articles/Mod_Article_edit.php:99 -#: ../../include/conversation.php:1345 ../../Zotlabs/Module/Editwebpage.php:143 -#: ../../Zotlabs/Module/Chat.php:218 ../../Zotlabs/Module/Editblock.php:116 +#: ../../include/conversation.php:1353 ../../Zotlabs/Module/Editwebpage.php:143 +#: ../../Zotlabs/Module/Chat.php:219 ../../Zotlabs/Module/Editblock.php:116 msgid "Insert web link" msgstr "Sett inn web-lenke" -#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1349 +#: ../../addon/hsse/hsse.php:99 ../../include/conversation.php:1357 msgid "Embed (existing) photo from your photo albums" -msgstr "" +msgstr "Sett inn (eksisterende) bilde fra fotoalbumene dine" -#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1382 -#: ../../Zotlabs/Module/Chat.php:216 +#: ../../addon/hsse/hsse.php:134 ../../include/conversation.php:1390 +#: ../../Zotlabs/Module/Chat.php:217 msgid "Please enter a link URL:" msgstr "Vennligst skriv inn en lenke URL:" -#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1383 +#: ../../addon/hsse/hsse.php:135 ../../include/conversation.php:1391 msgid "Tag term:" msgstr "Merkelapp:" -#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1384 +#: ../../addon/hsse/hsse.php:136 ../../include/conversation.php:1392 msgid "Where are you right now?" msgstr "Hvor er du akkurat nå?" -#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1389 +#: ../../addon/hsse/hsse.php:141 ../../include/conversation.php:1397 msgid "Choose a different album..." msgstr "" -#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1393 +#: ../../addon/hsse/hsse.php:145 ../../include/conversation.php:1401 msgid "Comments enabled" msgstr "" -#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1394 +#: ../../addon/hsse/hsse.php:146 ../../include/conversation.php:1402 msgid "Comments disabled" msgstr "" -#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1411 -#: ../../Zotlabs/Module/Webpages.php:259 ../../Zotlabs/Module/Photos.php:1105 -#: ../../Zotlabs/Lib/ThreadItem.php:845 +#: ../../addon/hsse/hsse.php:153 ../../include/conversation.php:1419 +#: ../../Zotlabs/Module/Webpages.php:257 ../../Zotlabs/Module/Photos.php:1094 +#: ../../Zotlabs/Lib/ThreadItem.php:841 msgid "Preview" msgstr "Forhåndsvisning" -#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1453 +#: ../../addon/hsse/hsse.php:195 ../../include/conversation.php:1461 msgid "Page link name" msgstr "Sidens lenkenavn" -#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1456 +#: ../../addon/hsse/hsse.php:198 ../../include/conversation.php:1464 msgid "Post as" msgstr "Lag innlegg som" -#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1458 -#: ../../Zotlabs/Lib/ThreadItem.php:836 +#: ../../addon/hsse/hsse.php:200 ../../include/conversation.php:1466 +#: ../../Zotlabs/Lib/ThreadItem.php:832 msgid "Bold" msgstr "Uthevet" -#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1459 -#: ../../Zotlabs/Lib/ThreadItem.php:837 +#: ../../addon/hsse/hsse.php:201 ../../include/conversation.php:1467 +#: ../../Zotlabs/Lib/ThreadItem.php:833 msgid "Italic" msgstr "Kursiv" -#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1460 -#: ../../Zotlabs/Lib/ThreadItem.php:838 +#: ../../addon/hsse/hsse.php:202 ../../include/conversation.php:1468 +#: ../../Zotlabs/Lib/ThreadItem.php:834 msgid "Underline" msgstr "Understreket" -#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1461 -#: ../../Zotlabs/Lib/ThreadItem.php:839 +#: ../../addon/hsse/hsse.php:203 ../../include/conversation.php:1469 +#: ../../Zotlabs/Lib/ThreadItem.php:835 msgid "Quote" msgstr "Sitat" -#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1462 -#: ../../Zotlabs/Lib/ThreadItem.php:840 +#: ../../addon/hsse/hsse.php:204 ../../include/conversation.php:1470 +#: ../../Zotlabs/Lib/ThreadItem.php:836 msgid "Code" msgstr "Kode" -#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1463 -#: ../../Zotlabs/Lib/ThreadItem.php:842 +#: ../../addon/hsse/hsse.php:205 ../../include/conversation.php:1471 +#: ../../Zotlabs/Lib/ThreadItem.php:838 msgid "Attach/Upload file" -msgstr "" +msgstr "Last opp fil/vedlegg" -#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1470 +#: ../../addon/hsse/hsse.php:212 ../../include/conversation.php:1478 msgid "Toggle voting" msgstr "Skru av eller på stemming" -#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1477 +#: ../../addon/hsse/hsse.php:215 ../../include/conversation.php:1485 msgid "Disable comments" -msgstr "" +msgstr "Slå av kommentarer" -#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1478 +#: ../../addon/hsse/hsse.php:216 ../../include/conversation.php:1486 msgid "Toggle comments" msgstr "" #: ../../addon/hsse/hsse.php:221 ../../addon/cards/Mod_Card_edit.php:118 #: ../../addon/articles/Mod_Article_edit.php:116 -#: ../../include/conversation.php:1484 ../../Zotlabs/Module/Editblock.php:129 -#: ../../Zotlabs/Module/Photos.php:678 ../../Zotlabs/Module/Photos.php:1050 +#: ../../include/conversation.php:1492 ../../Zotlabs/Module/Editblock.php:129 +#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1039 msgid "Title (optional)" msgstr "Tittel (valgfri)" -#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1488 +#: ../../addon/hsse/hsse.php:224 ../../include/conversation.php:1496 msgid "Categories (optional, comma-separated list)" msgstr "Kategorier (valgfri, kommaseparert liste)" -#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1489 +#: ../../addon/hsse/hsse.php:225 ../../include/conversation.php:1497 msgid "Permission settings" msgstr "Tillatelser - innstillinger" -#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1511 +#: ../../addon/hsse/hsse.php:247 ../../include/conversation.php:1519 msgid "Other networks and post services" msgstr "Andre nettverk og innleggstjenester" -#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1514 +#: ../../addon/hsse/hsse.php:250 ../../include/conversation.php:1522 msgid "Set expiration date" msgstr "Angi utløpsdato" -#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1517 +#: ../../addon/hsse/hsse.php:253 ../../include/conversation.php:1525 msgid "Set publish date" msgstr "Angi publiseringsdato" -#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1519 -#: ../../Zotlabs/Module/Chat.php:217 ../../Zotlabs/Lib/ThreadItem.php:848 +#: ../../addon/hsse/hsse.php:255 ../../include/conversation.php:1527 +#: ../../Zotlabs/Module/Chat.php:218 ../../Zotlabs/Lib/ThreadItem.php:844 msgid "Encrypt text" msgstr "Krypter tekst" @@ -2080,7 +1990,7 @@ msgid "Insane Journal Crosspost Connector App" msgstr "" #: ../../addon/ijpost/Mod_Ijpost.php:35 ../../addon/xmpp/Mod_Xmpp.php:35 -#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Invite.php:56 +#: ../../Zotlabs/Module/Lang.php:20 ../../Zotlabs/Module/Invite.php:69 msgid "Not Installed" msgstr "" @@ -2108,6 +2018,90 @@ msgstr "" msgid "Post to Insane Journal" msgstr "" +#: ../../addon/totp_bak/Mod_Totp.php:32 +msgid "TOTP Two-Step Verification" +msgstr "" + +#: ../../addon/totp_bak/Mod_Totp.php:33 +msgid "Enter the 2-step verification generated by your authenticator app:" +msgstr "" + +#: ../../addon/totp_bak/Mod_Totp.php:34 +msgid "Success!" +msgstr "" + +#: ../../addon/totp_bak/Mod_Totp.php:35 +msgid "Invalid code, please try again." +msgstr "" + +#: ../../addon/totp_bak/Mod_Totp.php:36 +msgid "Too many invalid codes..." +msgstr "" + +#: ../../addon/totp_bak/Mod_Totp.php:37 ../../Zotlabs/Module/Totp_check.php:81 +msgid "Verify" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:92 +msgid "" +"You haven't set a TOTP secret yet.\n" +"Please click the button below to generate one and register this site\n" +"with your preferred authenticator app." +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:95 +msgid "Your TOTP secret is" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:96 +msgid "" +"Be sure to save it somewhere in case you lose or replace your mobile " +"device.\n" +"Use your mobile device to scan the QR code below to register this site\n" +"with your preferred authenticator app." +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:101 +#: ../../Zotlabs/Module/Settings/Multifactor.php:86 +msgid "Test" +msgstr "Sjekk koden" + +#: ../../addon/totp_bak/Settings/Totp.php:102 +msgid "Generate New Secret" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:103 +msgid "Go" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:104 +msgid "Enter your password" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:105 +msgid "enter TOTP code from your device" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:106 +msgid "Pass!" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:107 +msgid "Fail" +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:108 +msgid "Incorrect password, try again." +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:109 +msgid "Record your new TOTP secret and rescan the QR code above." +msgstr "" + +#: ../../addon/totp_bak/Settings/Totp.php:117 +msgid "TOTP Settings" +msgstr "" + #: ../../addon/wholikesme/wholikesme.php:29 msgid "Who likes me?" msgstr "" @@ -2125,24 +2119,24 @@ msgid "Enter some text" msgstr "" #: ../../addon/pubcrawl/as.php:1332 ../../addon/pubcrawl/as.php:2002 -#: ../../include/network.php:1767 ../../Zotlabs/Lib/Activity.php:3588 +#: ../../include/network.php:1772 ../../Zotlabs/Lib/Activity.php:3732 msgid "ActivityPub" msgstr "" -#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1647 -#: ../../Zotlabs/Module/Like.php:445 ../../Zotlabs/Module/Subthread.php:115 +#: ../../addon/pubcrawl/as.php:1958 ../../addon/diaspora/Receiver.php:1693 +#: ../../Zotlabs/Module/Like.php:453 ../../Zotlabs/Module/Subthread.php:115 msgid "status" msgstr "status" -#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1591 -#: ../../include/conversation.php:184 ../../Zotlabs/Module/Like.php:477 -#: ../../Zotlabs/Lib/Activity.php:3579 +#: ../../addon/pubcrawl/as.php:1993 ../../addon/diaspora/Receiver.php:1628 +#: ../../include/conversation.php:184 ../../Zotlabs/Module/Like.php:485 +#: ../../Zotlabs/Lib/Activity.php:3723 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s liker %2$s sin %3$s" #: ../../addon/pubcrawl/as.php:1995 ../../include/conversation.php:187 -#: ../../Zotlabs/Module/Like.php:479 ../../Zotlabs/Lib/Activity.php:3581 +#: ../../Zotlabs/Module/Like.php:487 ../../Zotlabs/Lib/Activity.php:3725 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s liker ikke %2$s sin %3$s" @@ -2460,7 +2454,7 @@ msgstr "" #: ../../addon/rendezvous/rendezvous.php:173 #: ../../addon/cart/submodules/hzservices.php:657 #: ../../addon/cart/submodules/manualcat.php:260 -#: ../../Zotlabs/Module/Cdav.php:1013 ../../Zotlabs/Module/Appman.php:211 +#: ../../Zotlabs/Module/Cdav.php:1005 ../../Zotlabs/Module/Appman.php:210 #: ../../Zotlabs/Module/Rbmark.php:100 msgid "Description" msgstr "Beskrivelse" @@ -2654,7 +2648,7 @@ msgstr "" #: ../../addon/pumpio/pumpio.php:153 msgid "return to the featured settings page" -msgstr "" +msgstr "tilbake til funksjonsinnstillinger" #: ../../addon/pumpio/pumpio.php:168 msgid "Post to Pump.io" @@ -2792,8 +2786,8 @@ msgstr "" #: ../../addon/cart/manual_payments.php:68 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/submodules/paypalbuttonV2.php:409 -#: ../../addon/cart/cart.php:1580 +#: ../../addon/cart/submodules/paypalbuttonV2.php:417 +#: ../../addon/cart/cart.php:1632 msgid "Order not found." msgstr "" @@ -2931,9 +2925,10 @@ msgstr "" #: ../../addon/cart/submodules/orderoptions.php:434 #: ../../addon/cart/submodules/orderoptions.php:458 #: ../../include/js_strings.php:124 ../../include/datetime.php:211 -#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:209 -#: ../../Zotlabs/Module/Appman.php:210 ../../Zotlabs/Module/Profiles.php:762 -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Register.php:498 ../../Zotlabs/Module/Appman.php:208 +#: ../../Zotlabs/Module/Appman.php:209 ../../Zotlabs/Module/Profiles.php:761 +#: ../../Zotlabs/Module/Profiles.php:765 +#: ../../Zotlabs/Module/Settings/Multifactor.php:84 msgid "Required" msgstr "Påkrevd" @@ -2949,37 +2944,37 @@ msgid "Enable Paypal Button Module" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:93 -#: ../../addon/cart/submodules/paypalbuttonV2.php:94 +#: ../../addon/cart/submodules/paypalbuttonV2.php:96 msgid "Use Production Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:100 -#: ../../addon/cart/submodules/paypalbuttonV2.php:101 +#: ../../addon/cart/submodules/paypalbuttonV2.php:103 msgid "Paypal Sandbox Client Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:107 -#: ../../addon/cart/submodules/paypalbuttonV2.php:108 +#: ../../addon/cart/submodules/paypalbuttonV2.php:110 msgid "Paypal Sandbox Secret Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:113 -#: ../../addon/cart/submodules/paypalbuttonV2.php:114 +#: ../../addon/cart/submodules/paypalbuttonV2.php:116 msgid "Paypal Production Client Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:120 -#: ../../addon/cart/submodules/paypalbuttonV2.php:121 +#: ../../addon/cart/submodules/paypalbuttonV2.php:123 msgid "Paypal Production Secret Key" msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:252 -#: ../../addon/cart/submodules/paypalbuttonV2.php:264 +#: ../../addon/cart/submodules/paypalbuttonV2.php:271 msgid "Paypal button payments are not enabled." msgstr "" #: ../../addon/cart/submodules/paypalbutton.php:270 -#: ../../addon/cart/submodules/paypalbuttonV2.php:282 +#: ../../addon/cart/submodules/paypalbuttonV2.php:289 msgid "" "Paypal button payments are not properly configured. Please choose another " "payment option." @@ -2994,17 +2989,25 @@ msgid "Enable Manual Cart Module" msgstr "" #: ../../addon/cart/myshop.php:30 +#, fuzzy msgid "Access Denied." -msgstr "" +msgstr "Ingen tilgang" -#: ../../addon/cart/myshop.php:112 ../../addon/cart/cart.php:1446 +#: ../../addon/cart/myshop.php:113 ../../addon/cart/cart.php:1495 msgid "Order Not Found" msgstr "" -#: ../../addon/cart/myshop.php:189 ../../addon/cart/myshop.php:223 -#: ../../addon/cart/myshop.php:271 ../../addon/cart/myshop.php:329 +#: ../../addon/cart/myshop.php:145 ../../addon/cart/myshop.php:181 +#: ../../addon/cart/myshop.php:215 ../../addon/cart/myshop.php:265 +#: ../../addon/cart/myshop.php:300 ../../addon/cart/myshop.php:323 +msgid "Access Denied" +msgstr "Ingen tilgang" + +#: ../../addon/cart/myshop.php:190 ../../addon/cart/myshop.php:224 +#: ../../addon/cart/myshop.php:275 ../../addon/cart/myshop.php:333 +#, fuzzy msgid "Invalid Item" -msgstr "" +msgstr "Ugyldig element." #: ../../addon/cart/Settings/Cart.php:58 msgid "Enable Test Catalog" @@ -3018,59 +3021,60 @@ msgstr "" msgid "Base Merchant Currency" msgstr "" -#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1375 +#: ../../addon/cart/Settings/Cart.php:129 ../../addon/cart/cart.php:1424 msgid "Cart Settings" msgstr "" -#: ../../addon/cart/cart.php:252 +#: ../../addon/cart/cart.php:259 msgid "DB Cleanup Failure" msgstr "" -#: ../../addon/cart/cart.php:674 +#: ../../addon/cart/cart.php:692 msgid "[cart] Item Added" msgstr "" -#: ../../addon/cart/cart.php:1063 +#: ../../addon/cart/cart.php:1107 msgid "Order already checked out." msgstr "" -#: ../../addon/cart/cart.php:1368 +#: ../../addon/cart/cart.php:1417 msgid "Drop database tables when uninstalling." msgstr "" -#: ../../addon/cart/cart.php:1387 ../../addon/cart/cart.php:1390 +#: ../../addon/cart/cart.php:1436 ../../addon/cart/cart.php:1439 msgid "Shop" msgstr "" -#: ../../addon/cart/cart.php:1547 +#: ../../addon/cart/cart.php:1599 msgid "You must be logged into the Grid to shop." msgstr "" -#: ../../addon/cart/cart.php:1594 +#: ../../addon/cart/cart.php:1648 +#, fuzzy msgid "Access denied." -msgstr "" +msgstr "Ingen tilgang" -#: ../../addon/cart/cart.php:1646 ../../addon/cart/cart.php:1789 +#: ../../addon/cart/cart.php:1700 ../../addon/cart/cart.php:1843 msgid "No Order Found" msgstr "" -#: ../../addon/cart/cart.php:1655 +#: ../../addon/cart/cart.php:1709 msgid "An unknown error has occurred Please start again." msgstr "" -#: ../../addon/cart/cart.php:1798 +#: ../../addon/cart/cart.php:1852 msgid "Requirements not met." msgstr "" -#: ../../addon/cart/cart.php:1798 +#: ../../addon/cart/cart.php:1852 msgid "Review your order and complete any needed requirements." msgstr "" -#: ../../addon/cart/cart.php:1824 +#: ../../addon/cart/cart.php:1878 msgid "Invalid Payment Type. Please start again." msgstr "" -#: ../../addon/cart/cart.php:1831 +#: ../../addon/cart/cart.php:1885 msgid "Order not found" msgstr "" @@ -3098,7 +3102,7 @@ msgstr "" msgid "Smileybutton Settings" msgstr "" -#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2104 +#: ../../addon/redfiles/redfilehelper.php:64 ../../include/attach.php:2147 msgid "file" msgstr "" @@ -3127,12 +3131,12 @@ msgstr "" msgid "Diaspora relay could not be imported" msgstr "" -#: ../../addon/diaspora/diaspora.php:1068 +#: ../../addon/diaspora/diaspora.php:1069 msgid "No subject" msgstr "" -#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:337 -#: ../../addon/diaspora/util.php:350 ../../Zotlabs/Lib/Enotify.php:61 +#: ../../addon/diaspora/p.php:48 ../../addon/diaspora/util.php:342 +#: ../../addon/diaspora/util.php:355 ../../Zotlabs/Lib/Enotify.php:61 msgid "$projectname" msgstr "$projectname" @@ -3159,48 +3163,38 @@ msgid "" "locations." msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:75 -msgid "Allow any Diaspora member to comment or like your public posts" -msgstr "" - -#: ../../addon/diaspora/Mod_Diaspora.php:75 -msgid "" -"If this setting is disabled only your contacts will be able to comment or " -"like your public posts" -msgstr "" - -#: ../../addon/diaspora/Mod_Diaspora.php:79 +#: ../../addon/diaspora/Mod_Diaspora.php:80 msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:83 +#: ../../addon/diaspora/Mod_Diaspora.php:84 msgid "Sign and forward posts and comments with no existing Diaspora signature" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:88 +#: ../../addon/diaspora/Mod_Diaspora.php:89 msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../addon/diaspora/Mod_Diaspora.php:97 +#: ../../addon/diaspora/Mod_Diaspora.php:98 msgid "Diaspora Protocol" msgstr "" -#: ../../addon/diaspora/Receiver.php:1595 +#: ../../addon/diaspora/Receiver.php:1632 #, php-format msgid "%1$s dislikes %2$s's %3$s" msgstr "" -#: ../../addon/diaspora/Receiver.php:2206 ../../Zotlabs/Module/Like.php:487 +#: ../../addon/diaspora/Receiver.php:2251 ../../Zotlabs/Module/Like.php:495 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "%1$s deltar på %2$ss %3$s" -#: ../../addon/diaspora/Receiver.php:2208 ../../Zotlabs/Module/Like.php:489 +#: ../../addon/diaspora/Receiver.php:2253 ../../Zotlabs/Module/Like.php:497 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "%1$s deltar ikke på %2$ss %3$s" -#: ../../addon/diaspora/Receiver.php:2210 ../../Zotlabs/Module/Like.php:491 +#: ../../addon/diaspora/Receiver.php:2255 ../../Zotlabs/Module/Like.php:499 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s deltar kanskje på %2$ss %3$s" @@ -3253,66 +3247,66 @@ msgstr "" msgid "Workflow user." msgstr "" -#: ../../addon/workflow/workflow.php:272 +#: ../../addon/workflow/workflow.php:273 msgid "This channel" msgstr "" -#: ../../addon/workflow/workflow.php:285 ../../Zotlabs/Module/Locs.php:123 +#: ../../addon/workflow/workflow.php:286 ../../Zotlabs/Module/Locs.php:123 msgid "Primary" msgstr "Primær" -#: ../../addon/workflow/workflow.php:327 +#: ../../addon/workflow/workflow.php:328 msgid "Create New Workflow Item" msgstr "" -#: ../../addon/workflow/workflow.php:546 ../../addon/workflow/workflow.php:1442 -#: ../../addon/workflow/workflow.php:1461 +#: ../../addon/workflow/workflow.php:547 ../../addon/workflow/workflow.php:1444 +#: ../../addon/workflow/workflow.php:1463 msgid "Workflow" msgstr "" -#: ../../addon/workflow/workflow.php:1430 +#: ../../addon/workflow/workflow.php:1432 msgid "No Workflows Available" msgstr "" -#: ../../addon/workflow/workflow.php:1460 +#: ../../addon/workflow/workflow.php:1462 msgid "Add item to which workflow" msgstr "" -#: ../../addon/workflow/workflow.php:1520 -#: ../../addon/workflow/workflow.php:1639 +#: ../../addon/workflow/workflow.php:1522 +#: ../../addon/workflow/workflow.php:1641 msgid "Create Workflow Item" msgstr "" -#: ../../addon/workflow/workflow.php:2601 +#: ../../addon/workflow/workflow.php:2603 msgid "Link" msgstr "" -#: ../../addon/workflow/workflow.php:2603 +#: ../../addon/workflow/workflow.php:2605 msgid "Web link." msgstr "" -#: ../../addon/workflow/workflow.php:2622 -#: ../../addon/workflow/workflow.php:2683 ../../Zotlabs/Module/Cdav.php:1374 +#: ../../addon/workflow/workflow.php:2624 +#: ../../addon/workflow/workflow.php:2685 ../../Zotlabs/Module/Cdav.php:1366 #: ../../Zotlabs/Module/Connedit.php:734 msgid "Title" msgstr "Tittel" -#: ../../addon/workflow/workflow.php:2624 -#: ../../addon/workflow/workflow.php:2685 +#: ../../addon/workflow/workflow.php:2626 +#: ../../addon/workflow/workflow.php:2687 msgid "Brief description or title" msgstr "" -#: ../../addon/workflow/workflow.php:2630 ../../Zotlabs/Widget/Notes.php:38 -#: ../../Zotlabs/Lib/Apps.php:374 +#: ../../addon/workflow/workflow.php:2632 ../../Zotlabs/Widget/Notes.php:38 +#: ../../Zotlabs/Lib/Apps.php:375 msgid "Notes" msgstr "Merknader" -#: ../../addon/workflow/workflow.php:2632 -#: ../../addon/workflow/workflow.php:2693 +#: ../../addon/workflow/workflow.php:2634 +#: ../../addon/workflow/workflow.php:2695 msgid "Notes and Info" msgstr "" -#: ../../addon/workflow/workflow.php:2691 +#: ../../addon/workflow/workflow.php:2693 msgid "Body" msgstr "" @@ -3417,15 +3411,15 @@ msgstr "" #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" -msgstr "" +msgstr "Søk %1$s (%2$s)" #: ../../addon/opensearch/opensearch.php:28 msgctxt "opensearch" msgid "$Projectname" -msgstr "" +msgstr "$Projectname" -#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Invite.php:225 -#: ../../Zotlabs/Module/Invite.php:494 ../../Zotlabs/Module/Invite.php:508 +#: ../../addon/opensearch/opensearch.php:42 ../../Zotlabs/Module/Invite.php:238 +#: ../../Zotlabs/Module/Invite.php:507 ../../Zotlabs/Module/Invite.php:521 #: ../../Zotlabs/Module/Home.php:87 ../../Zotlabs/Module/Home.php:95 #: ../../Zotlabs/Lib/Enotify.php:66 msgid "$Projectname" @@ -3485,18 +3479,18 @@ msgstr "" msgid "Test mode (only send to hub administrator)" msgstr "" -#: ../../addon/cards/Widget/Cards_categories.php:74 -#: ../../addon/articles/Widget/Articles_categories.php:74 +#: ../../addon/cards/Widget/Cards_categories.php:80 +#: ../../addon/articles/Widget/Articles_categories.php:80 #: ../../include/contact_widgets.php:115 ../../include/contact_widgets.php:149 -#: ../../include/taxonomy.php:420 ../../include/taxonomy.php:502 -#: ../../include/taxonomy.php:522 ../../include/taxonomy.php:543 -#: ../../Zotlabs/Module/Cdav.php:1070 ../../Zotlabs/Storage/Browser.php:293 -#: ../../Zotlabs/Storage/Browser.php:388 ../../Zotlabs/Storage/Browser.php:403 +#: ../../include/taxonomy.php:423 ../../include/taxonomy.php:505 +#: ../../include/taxonomy.php:525 ../../include/taxonomy.php:546 +#: ../../Zotlabs/Module/Cdav.php:1062 ../../Zotlabs/Storage/Browser.php:293 +#: ../../Zotlabs/Storage/Browser.php:391 ../../Zotlabs/Storage/Browser.php:406 msgid "Categories" msgstr "Kategorier" -#: ../../addon/cards/Widget/Cards_categories.php:77 -#: ../../addon/articles/Widget/Articles_categories.php:77 +#: ../../addon/cards/Widget/Cards_categories.php:83 +#: ../../addon/articles/Widget/Articles_categories.php:83 #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:118 #: ../../include/contact_widgets.php:152 #: ../../Zotlabs/Widget/Appcategories.php:52 ../../Zotlabs/Widget/Filer.php:36 @@ -3516,7 +3510,7 @@ msgstr "Elementet ble ikke funnet." #: ../../addon/cards/Mod_Card_edit.php:44 #: ../../addon/articles/Mod_Article_edit.php:44 #: ../../Zotlabs/Module/Attach_edit.php:52 -#: ../../Zotlabs/Module/Wall_upload.php:31 ../../Zotlabs/Module/Chanview.php:95 +#: ../../Zotlabs/Module/Wall_upload.php:30 ../../Zotlabs/Module/Chanview.php:95 #: ../../Zotlabs/Module/Cal.php:31 ../../Zotlabs/Module/Attach.php:22 #: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Block.php:41 msgid "Channel not found." @@ -3528,36 +3522,36 @@ msgstr "" #: ../../addon/cards/Mod_Card_edit.php:130 #: ../../addon/articles/Mod_Article_edit.php:128 -#: ../../include/conversation.php:737 ../../include/conversation.php:797 +#: ../../include/conversation.php:736 ../../include/conversation.php:799 #: ../../Zotlabs/Module/Tokens.php:295 ../../Zotlabs/Module/Group.php:251 #: ../../Zotlabs/Module/Oauth.php:172 ../../Zotlabs/Module/Editwebpage.php:167 -#: ../../Zotlabs/Module/Cdav.php:1055 ../../Zotlabs/Module/Cdav.php:1389 -#: ../../Zotlabs/Module/Webpages.php:254 +#: ../../Zotlabs/Module/Cdav.php:1047 ../../Zotlabs/Module/Cdav.php:1381 +#: ../../Zotlabs/Module/Webpages.php:252 #: ../../Zotlabs/Module/Admin/Accounts.php:320 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Admin/Profs.php:176 #: ../../Zotlabs/Module/Permcats.php:261 -#: ../../Zotlabs/Module/Contactedit.php:667 ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Contactedit.php:667 ../../Zotlabs/Module/Blocks.php:160 #: ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1185 +#: ../../Zotlabs/Module/Editlayout.php:138 ../../Zotlabs/Module/Photos.php:1171 #: ../../Zotlabs/Module/Oauth2.php:193 ../../Zotlabs/Module/Thing.php:269 #: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Connedit.php:749 -#: ../../Zotlabs/Lib/Apps.php:601 ../../Zotlabs/Lib/ThreadItem.php:187 -#: ../../Zotlabs/Storage/Browser.php:384 +#: ../../Zotlabs/Lib/Apps.php:602 ../../Zotlabs/Lib/ThreadItem.php:179 +#: ../../Zotlabs/Lib/ThreadItem.php:509 ../../Zotlabs/Storage/Browser.php:387 msgid "Delete" msgstr "Slett" -#: ../../addon/cards/cards.php:47 ../../addon/cards/cards.php:159 -#: ../../addon/cards/Mod_Cards.php:209 ../../Zotlabs/Lib/Apps.php:330 +#: ../../addon/cards/cards.php:48 ../../addon/cards/cards.php:160 +#: ../../addon/cards/Mod_Cards.php:209 ../../Zotlabs/Lib/Apps.php:331 msgid "Cards" msgstr "" -#: ../../addon/cards/cards.php:50 +#: ../../addon/cards/cards.php:51 msgid "View Cards" msgstr "" -#: ../../addon/cards/cards.php:81 ../../addon/articles/articles.php:83 -#: ../../include/conversation.php:849 +#: ../../addon/cards/cards.php:82 ../../addon/articles/articles.php:83 +#: ../../include/conversation.php:852 msgid "View in context" msgstr "Vis i sammenheng" @@ -3565,12 +3559,21 @@ msgstr "Vis i sammenheng" msgid "Add Card" msgstr "" +#: ../../addon/cards/Mod_Cards.php:116 +#: ../../addon/articles/Mod_Articles.php:120 ../../include/text.php:1171 +#: ../../include/text.php:1183 ../../Zotlabs/Module/Admin/Queueworker.php:114 +#: ../../Zotlabs/Module/Admin/Profs.php:94 +#: ../../Zotlabs/Module/Admin/Profs.php:114 ../../Zotlabs/Module/Filer.php:54 +#: ../../Zotlabs/Module/Rbmark.php:31 ../../Zotlabs/Module/Rbmark.php:103 +msgid "Save" +msgstr "Lagre" + #: ../../addon/notifyadmin/notifyadmin.php:34 msgid "New registration" msgstr "" #: ../../addon/notifyadmin/notifyadmin.php:40 -#: ../../Zotlabs/Module/Invite.php:252 +#: ../../Zotlabs/Module/Invite.php:265 #, php-format msgid "%s : Message delivery failed." msgstr "%s : meldingslevering feilet." @@ -3585,9 +3588,9 @@ msgid "Not allowed." msgstr "" #: ../../addon/flashcards/Mod_Flashcards.php:261 -#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:239 -#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:682 -#: ../../Zotlabs/Module/Photos.php:1053 ../../Zotlabs/Module/Thing.php:321 +#: ../../include/acl_selectors.php:154 ../../Zotlabs/Module/Chat.php:240 +#: ../../Zotlabs/Module/Filestorage.php:195 ../../Zotlabs/Module/Photos.php:671 +#: ../../Zotlabs/Module/Photos.php:1042 ../../Zotlabs/Module/Thing.php:321 #: ../../Zotlabs/Module/Thing.php:374 msgid "Permissions" msgstr "Tillatelser" @@ -3598,13 +3601,13 @@ msgid "Set/edit permissions" msgstr "Angi/endre tillatelser" #: ../../addon/flashcards/Mod_Flashcards.php:291 -#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3817 +#: ../../addon/flashcards/Mod_Flashcards.php:292 ../../include/items.php:3876 #: ../../Zotlabs/Module/Filestorage.php:29 #: ../../Zotlabs/Module/Admin/Themes.php:72 -#: ../../Zotlabs/Module/Admin/Addons.php:260 +#: ../../Zotlabs/Module/Admin/Addons.php:263 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:53 -#: ../../Zotlabs/Module/Display.php:388 ../../Zotlabs/Module/Admin.php:61 -#: ../../Zotlabs/Module/Thing.php:96 +#: ../../Zotlabs/Module/Display.php:114 ../../Zotlabs/Module/Display.php:392 +#: ../../Zotlabs/Module/Admin.php:61 ../../Zotlabs/Module/Thing.php:96 msgid "Item not found." msgstr "Elementet ble ikke funnet." @@ -3648,93 +3651,10 @@ msgstr "" msgid "<blush>" msgstr "" -#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:332 +#: ../../addon/buglink/buglink.php:16 ../../Zotlabs/Lib/Apps.php:333 msgid "Report Bug" msgstr "" -#: ../../addon/totp/Mod_Totp.php:32 -msgid "TOTP Two-Step Verification" -msgstr "" - -#: ../../addon/totp/Mod_Totp.php:33 -msgid "Enter the 2-step verification generated by your authenticator app:" -msgstr "" - -#: ../../addon/totp/Mod_Totp.php:34 -msgid "Success!" -msgstr "" - -#: ../../addon/totp/Mod_Totp.php:35 -msgid "Invalid code, please try again." -msgstr "" - -#: ../../addon/totp/Mod_Totp.php:36 -msgid "Too many invalid codes..." -msgstr "" - -#: ../../addon/totp/Mod_Totp.php:37 -msgid "Verify" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:92 -msgid "" -"You haven't set a TOTP secret yet.\n" -"Please click the button below to generate one and register this site\n" -"with your preferred authenticator app." -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:95 -msgid "Your TOTP secret is" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:96 -msgid "" -"Be sure to save it somewhere in case you lose or replace your mobile " -"device.\n" -"Use your mobile device to scan the QR code below to register this site\n" -"with your preferred authenticator app." -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:101 -msgid "Test" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:102 -msgid "Generate New Secret" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:103 -msgid "Go" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:104 -msgid "Enter your password" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:105 -msgid "enter TOTP code from your device" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:106 -msgid "Pass!" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:107 -msgid "Fail" -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:108 -msgid "Incorrect password, try again." -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:109 -msgid "Record your new TOTP secret and rescan the QR code above." -msgstr "" - -#: ../../addon/totp/Settings/Totp.php:117 -msgid "TOTP Settings" -msgstr "" - #: ../../addon/logrot/logrot.php:36 msgid "Logfile archive directory" msgstr "" @@ -3818,8 +3738,9 @@ msgid "Add an identity provider" msgstr "" #: ../../addon/socialauth/Mod_SocialAuth.php:260 +#, fuzzy msgid "Enable " -msgstr "" +msgstr "Skru på" #: ../../addon/socialauth/Mod_SocialAuth.php:267 msgid "Key" @@ -3861,11 +3782,11 @@ msgstr "" msgid "Social authentication settings saved." msgstr "" -#: ../../addon/nsfw/nsfw.php:152 +#: ../../addon/nsfw/nsfw.php:153 msgid "Possible adult content" msgstr "" -#: ../../addon/nsfw/nsfw.php:167 +#: ../../addon/nsfw/nsfw.php:168 #, php-format msgid "%s - view" msgstr "" @@ -4019,7 +3940,7 @@ msgid "Edit Article" msgstr "" #: ../../addon/articles/articles.php:48 ../../addon/articles/articles.php:160 -#: ../../addon/articles/Mod_Articles.php:228 ../../Zotlabs/Lib/Apps.php:329 +#: ../../addon/articles/Mod_Articles.php:228 ../../Zotlabs/Lib/Apps.php:330 msgid "Articles" msgstr "" @@ -4127,315 +4048,284 @@ msgstr "" msgid "XMPP Settings" msgstr "" -#: ../../include/text.php:546 +#: ../../include/text.php:547 msgid "prev" msgstr "forrige" -#: ../../include/text.php:548 +#: ../../include/text.php:549 msgid "first" msgstr "første" -#: ../../include/text.php:577 +#: ../../include/text.php:578 msgid "last" msgstr "siste" -#: ../../include/text.php:580 +#: ../../include/text.php:581 msgid "next" msgstr "neste" -#: ../../include/text.php:598 +#: ../../include/text.php:599 msgid "older" msgstr "eldre" -#: ../../include/text.php:600 +#: ../../include/text.php:601 msgid "newer" msgstr "nyere" -#: ../../include/text.php:1055 ../../include/features.php:133 -#: ../../Zotlabs/Module/Connections.php:390 ../../Zotlabs/Lib/Apps.php:337 +#: ../../include/text.php:1058 ../../include/features.php:133 +#: ../../Zotlabs/Module/Connections.php:399 ../../Zotlabs/Lib/Apps.php:338 msgid "Connections" msgstr "Forbindelser" -#: ../../include/text.php:1063 ../../Zotlabs/Module/Viewconnections.php:80 -#: ../../Zotlabs/Module/Connections.php:297 +#: ../../include/text.php:1066 ../../Zotlabs/Module/Viewconnections.php:80 +#: ../../Zotlabs/Module/Connections.php:306 msgid "Accepts" msgstr "" -#: ../../include/text.php:1066 ../../Zotlabs/Module/Viewconnections.php:83 -#: ../../Zotlabs/Module/Connections.php:300 +#: ../../include/text.php:1069 ../../Zotlabs/Module/Viewconnections.php:83 +#: ../../Zotlabs/Module/Connections.php:309 msgid "Comments" msgstr "" -#: ../../include/text.php:1071 ../../Zotlabs/Module/Viewconnections.php:88 -#: ../../Zotlabs/Module/Connections.php:305 +#: ../../include/text.php:1074 ../../Zotlabs/Module/Viewconnections.php:88 +#: ../../Zotlabs/Module/Connections.php:314 msgid "Stream items" msgstr "" -#: ../../include/text.php:1076 ../../Zotlabs/Module/Viewconnections.php:93 -#: ../../Zotlabs/Module/Connections.php:310 +#: ../../include/text.php:1079 ../../Zotlabs/Module/Viewconnections.php:93 +#: ../../Zotlabs/Module/Connections.php:319 msgid "Wall posts" msgstr "" -#: ../../include/text.php:1080 ../../Zotlabs/Module/Viewconnections.php:97 -#: ../../Zotlabs/Module/Connections.php:314 +#: ../../include/text.php:1083 ../../Zotlabs/Module/Viewconnections.php:97 +#: ../../Zotlabs/Module/Connections.php:323 msgid "Nothing" msgstr "" -#: ../../include/text.php:1093 +#: ../../include/text.php:1096 #, php-format msgid "View all %s connections" msgstr "Vis alle %s forbindelser" -#: ../../include/text.php:1156 +#: ../../include/text.php:1159 #, php-format msgid "Network: %s" msgstr "" -#: ../../include/text.php:1167 ../../include/text.php:1179 -#: ../../include/nav.php:193 ../../include/acl_selectors.php:149 +#: ../../include/text.php:1170 ../../include/text.php:1182 +#: ../../include/nav.php:195 ../../include/acl_selectors.php:149 #: ../../Zotlabs/Widget/Sitesearch.php:37 #: ../../Zotlabs/Widget/Activity_filter.php:210 -#: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:394 -#: ../../Zotlabs/Lib/Apps.php:357 +#: ../../Zotlabs/Module/Search.php:46 ../../Zotlabs/Module/Connections.php:403 +#: ../../Zotlabs/Lib/Apps.php:358 msgid "Search" msgstr "Søk" -#: ../../include/text.php:1259 ../../include/text.php:1263 +#: ../../include/text.php:1262 msgid "poke" msgstr "prikk" -#: ../../include/text.php:1259 ../../include/text.php:1263 -#: ../../include/conversation.php:277 +#: ../../include/text.php:1262 ../../include/conversation.php:277 msgid "poked" msgstr "prikket" -#: ../../include/text.php:1264 +#: ../../include/text.php:1263 msgid "ping" msgstr "varsle" -#: ../../include/text.php:1264 +#: ../../include/text.php:1263 msgid "pinged" msgstr "varslet" -#: ../../include/text.php:1265 -msgid "prod" -msgstr "oppildne" - -#: ../../include/text.php:1265 -msgid "prodded" -msgstr "oppildnet" - -#: ../../include/text.php:1266 -msgid "slap" -msgstr "daske" - -#: ../../include/text.php:1266 -msgid "slapped" -msgstr "dasket" - -#: ../../include/text.php:1267 -msgid "finger" -msgstr "fingre" - -#: ../../include/text.php:1267 -msgid "fingered" -msgstr "fingret" - -#: ../../include/text.php:1268 -msgid "rebuff" -msgstr "tilbakevise" - -#: ../../include/text.php:1268 -msgid "rebuffed" -msgstr "tilbakeviste" - -#: ../../include/text.php:1291 +#: ../../include/text.php:1292 msgid "happy" msgstr "glad" -#: ../../include/text.php:1292 +#: ../../include/text.php:1293 msgid "sad" msgstr "trist" -#: ../../include/text.php:1293 +#: ../../include/text.php:1294 msgid "mellow" msgstr "dempet" -#: ../../include/text.php:1294 +#: ../../include/text.php:1295 msgid "tired" msgstr "trøtt" -#: ../../include/text.php:1295 +#: ../../include/text.php:1296 msgid "perky" msgstr "oppkvikket" -#: ../../include/text.php:1296 +#: ../../include/text.php:1297 msgid "angry" msgstr "sint" -#: ../../include/text.php:1297 +#: ../../include/text.php:1298 msgid "stupefied" msgstr "lamslått" -#: ../../include/text.php:1298 +#: ../../include/text.php:1299 msgid "puzzled" msgstr "forundret" -#: ../../include/text.php:1299 +#: ../../include/text.php:1300 msgid "interested" msgstr "interessert" -#: ../../include/text.php:1300 +#: ../../include/text.php:1301 msgid "bitter" msgstr "bitter" -#: ../../include/text.php:1301 +#: ../../include/text.php:1302 msgid "cheerful" msgstr "munter" -#: ../../include/text.php:1302 +#: ../../include/text.php:1303 msgid "alive" msgstr "levende" -#: ../../include/text.php:1303 +#: ../../include/text.php:1304 msgid "annoyed" msgstr "irritert" -#: ../../include/text.php:1304 +#: ../../include/text.php:1305 msgid "anxious" msgstr "nervøs" -#: ../../include/text.php:1305 +#: ../../include/text.php:1306 msgid "cranky" msgstr "gretten" -#: ../../include/text.php:1306 +#: ../../include/text.php:1307 msgid "disturbed" msgstr "foruroliget" -#: ../../include/text.php:1307 +#: ../../include/text.php:1308 msgid "frustrated" msgstr "frustrert" -#: ../../include/text.php:1308 +#: ../../include/text.php:1309 msgid "depressed" msgstr "lei seg" -#: ../../include/text.php:1309 +#: ../../include/text.php:1310 msgid "motivated" msgstr "motivert" -#: ../../include/text.php:1310 +#: ../../include/text.php:1311 msgid "relaxed" msgstr "avslappet" -#: ../../include/text.php:1311 +#: ../../include/text.php:1312 msgid "surprised" msgstr "overrasket" -#: ../../include/text.php:1499 ../../include/js_strings.php:100 +#: ../../include/text.php:1500 ../../include/js_strings.php:100 msgid "Monday" msgstr "mandag" -#: ../../include/text.php:1499 ../../include/js_strings.php:101 +#: ../../include/text.php:1500 ../../include/js_strings.php:101 msgid "Tuesday" msgstr "tirsdag" -#: ../../include/text.php:1499 ../../include/js_strings.php:102 +#: ../../include/text.php:1500 ../../include/js_strings.php:102 msgid "Wednesday" msgstr "onsdag" -#: ../../include/text.php:1499 ../../include/js_strings.php:103 +#: ../../include/text.php:1500 ../../include/js_strings.php:103 msgid "Thursday" msgstr "torsdag" -#: ../../include/text.php:1499 ../../include/js_strings.php:104 +#: ../../include/text.php:1500 ../../include/js_strings.php:104 msgid "Friday" msgstr "fredag" -#: ../../include/text.php:1499 ../../include/js_strings.php:105 +#: ../../include/text.php:1500 ../../include/js_strings.php:105 msgid "Saturday" msgstr "lørdag" -#: ../../include/text.php:1499 ../../include/js_strings.php:99 +#: ../../include/text.php:1500 ../../include/js_strings.php:99 msgid "Sunday" msgstr "søndag" -#: ../../include/text.php:1503 ../../include/js_strings.php:75 +#: ../../include/text.php:1504 ../../include/js_strings.php:75 msgid "January" msgstr "januar" -#: ../../include/text.php:1503 ../../include/js_strings.php:76 +#: ../../include/text.php:1504 ../../include/js_strings.php:76 msgid "February" msgstr "februar" -#: ../../include/text.php:1503 ../../include/js_strings.php:77 +#: ../../include/text.php:1504 ../../include/js_strings.php:77 msgid "March" msgstr "mars" -#: ../../include/text.php:1503 ../../include/js_strings.php:78 +#: ../../include/text.php:1504 ../../include/js_strings.php:78 msgid "April" msgstr "april" -#: ../../include/text.php:1503 +#: ../../include/text.php:1504 msgid "May" msgstr "mai" -#: ../../include/text.php:1503 ../../include/js_strings.php:80 +#: ../../include/text.php:1504 ../../include/js_strings.php:80 msgid "June" msgstr "juni" -#: ../../include/text.php:1503 ../../include/js_strings.php:81 +#: ../../include/text.php:1504 ../../include/js_strings.php:81 msgid "July" msgstr "juli" -#: ../../include/text.php:1503 ../../include/js_strings.php:82 +#: ../../include/text.php:1504 ../../include/js_strings.php:82 msgid "August" msgstr "august" -#: ../../include/text.php:1503 ../../include/js_strings.php:83 +#: ../../include/text.php:1504 ../../include/js_strings.php:83 msgid "September" msgstr "september" -#: ../../include/text.php:1503 ../../include/js_strings.php:84 +#: ../../include/text.php:1504 ../../include/js_strings.php:84 msgid "October" msgstr "oktober" -#: ../../include/text.php:1503 ../../include/js_strings.php:85 +#: ../../include/text.php:1504 ../../include/js_strings.php:85 msgid "November" msgstr "november" -#: ../../include/text.php:1503 ../../include/js_strings.php:86 +#: ../../include/text.php:1504 ../../include/js_strings.php:86 msgid "December" msgstr "desember" -#: ../../include/text.php:1569 -msgid "Unknown Attachment" +#: ../../include/text.php:1578 +#, fuzzy +#| msgid "Unknown Attachment" +msgid "Unknown attachment" msgstr "Ukjent vedlegg" -#: ../../include/text.php:1571 ../../Zotlabs/Module/Sharedwithme.php:108 -#: ../../Zotlabs/Storage/Browser.php:379 +#: ../../include/text.php:1581 ../../Zotlabs/Module/Sharedwithme.php:109 +#: ../../Zotlabs/Storage/Browser.php:382 msgid "Size" msgstr "Størrelse" -#: ../../include/text.php:1571 ../../include/feedutils.php:871 +#: ../../include/text.php:1581 ../../include/feedutils.php:871 msgid "unknown" msgstr "ukjent" -#: ../../include/text.php:1614 +#: ../../include/text.php:1623 msgid "remove category" msgstr "fjern kategori" -#: ../../include/text.php:1691 +#: ../../include/text.php:1700 msgid "remove from file" msgstr "fjern fra fil" -#: ../../include/text.php:1878 +#: ../../include/text.php:1887 msgid "Download binary/encrypted content" msgstr "" -#: ../../include/text.php:1936 ../../include/text.php:1945 -#: ../../include/text.php:1972 ../../include/text.php:1981 +#: ../../include/text.php:1945 ../../include/text.php:1954 +#: ../../include/text.php:1981 ../../include/text.php:1990 #, php-format msgctxt "noun" msgid "%d Vote" @@ -4443,7 +4333,7 @@ msgid_plural "%d Votes" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:1988 +#: ../../include/text.php:1997 #, php-format msgctxt "noun" msgid "%d Vote in total" @@ -4451,162 +4341,162 @@ msgid_plural "%d Votes in total" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:1994 +#: ../../include/text.php:2003 msgid "Poll has ended" -msgstr "" +msgstr "Spørreskjema har utløpt" -#: ../../include/text.php:1997 +#: ../../include/text.php:2006 #, php-format msgid "Poll ends in %s" -msgstr "" +msgstr "Spørreskjema utløper om %s" -#: ../../include/text.php:2004 ../../Zotlabs/Lib/ThreadItem.php:453 +#: ../../include/text.php:2013 ../../Zotlabs/Lib/ThreadItem.php:446 msgid "Vote" msgstr "" -#: ../../include/text.php:2159 +#: ../../include/text.php:2168 msgid "Link to Source" msgstr "Lenke til kilde" -#: ../../include/text.php:2181 ../../include/language.php:433 +#: ../../include/text.php:2193 ../../include/language.php:433 msgid "default" msgstr "standard" -#: ../../include/text.php:2189 +#: ../../include/text.php:2201 msgid "Page layout" msgstr "Sidens layout" -#: ../../include/text.php:2189 +#: ../../include/text.php:2201 msgid "You can create your own with the layouts tool" msgstr "Du kan lage din egen med layout-verktøyet" -#: ../../include/text.php:2200 +#: ../../include/text.php:2212 msgid "HTML" msgstr "" -#: ../../include/text.php:2203 +#: ../../include/text.php:2215 msgid "Comanche Layout" msgstr "" -#: ../../include/text.php:2208 +#: ../../include/text.php:2220 msgid "PHP" msgstr "" -#: ../../include/text.php:2217 +#: ../../include/text.php:2232 msgid "Page content type" msgstr "Sidens innholdstype" -#: ../../include/text.php:2340 ../../include/event.php:1347 +#: ../../include/text.php:2355 ../../include/event.php:1356 #: ../../include/conversation.php:142 #: ../../Zotlabs/Module/Channel_calendar.php:221 -#: ../../Zotlabs/Module/Like.php:447 ../../Zotlabs/Module/Tagger.php:75 +#: ../../Zotlabs/Module/Like.php:455 ../../Zotlabs/Module/Tagger.php:75 msgid "event" msgstr "hendelse" -#: ../../include/text.php:2343 ../../include/conversation.php:168 -#: ../../include/bbcode.php:564 ../../include/markdown.php:205 -#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3546 +#: ../../include/text.php:2358 ../../include/conversation.php:168 +#: ../../include/bbcode.php:566 ../../include/markdown.php:208 +#: ../../Zotlabs/Module/Tagger.php:79 ../../Zotlabs/Lib/Activity.php:3690 msgid "post" msgstr "innlegg" -#: ../../include/text.php:2345 ../../include/conversation.php:170 +#: ../../include/text.php:2360 ../../include/conversation.php:170 #: ../../Zotlabs/Module/Tagger.php:81 msgid "comment" msgstr "kommentar" -#: ../../include/text.php:2350 +#: ../../include/text.php:2365 msgid "activity" msgstr "aktivitet" -#: ../../include/text.php:2353 +#: ../../include/text.php:2368 msgid "poll" -msgstr "" +msgstr "spørreskjema" -#: ../../include/text.php:2466 +#: ../../include/text.php:2481 msgid "a-z, 0-9, -, and _ only" msgstr "" -#: ../../include/text.php:2771 +#: ../../include/text.php:2786 msgid "Design Tools" msgstr "Designverktøy" -#: ../../include/text.php:2774 ../../Zotlabs/Module/Blocks.php:154 +#: ../../include/text.php:2789 ../../Zotlabs/Module/Blocks.php:152 msgid "Blocks" msgstr "Byggeklosser" -#: ../../include/text.php:2775 ../../Zotlabs/Module/Menu.php:171 +#: ../../include/text.php:2790 ../../Zotlabs/Module/Menu.php:171 msgid "Menus" msgstr "Menyer" -#: ../../include/text.php:2776 ../../Zotlabs/Module/Layouts.php:184 +#: ../../include/text.php:2791 ../../Zotlabs/Module/Layouts.php:182 msgid "Layouts" msgstr "Layout" -#: ../../include/text.php:2777 +#: ../../include/text.php:2792 msgid "Pages" msgstr "Sider" -#: ../../include/text.php:2789 +#: ../../include/text.php:2804 msgid "Import" msgstr "Importer" -#: ../../include/text.php:2790 +#: ../../include/text.php:2805 msgid "Import website..." msgstr "" -#: ../../include/text.php:2791 +#: ../../include/text.php:2806 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2792 +#: ../../include/text.php:2807 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2793 +#: ../../include/text.php:2808 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2794 +#: ../../include/text.php:2809 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2795 +#: ../../include/text.php:2810 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2796 +#: ../../include/text.php:2811 msgid "Select folder" msgstr "" -#: ../../include/text.php:2797 +#: ../../include/text.php:2812 msgid "Export website..." msgstr "" -#: ../../include/text.php:2798 +#: ../../include/text.php:2813 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2799 +#: ../../include/text.php:2814 msgid "website.zip" msgstr "" -#: ../../include/text.php:2800 +#: ../../include/text.php:2815 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2801 +#: ../../include/text.php:2816 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2802 +#: ../../include/text.php:2817 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2803 +#: ../../include/text.php:2818 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2804 +#: ../../include/text.php:2819 msgid "Specify folder" msgstr "" @@ -4628,7 +4518,7 @@ msgid "Finishes:" msgstr "Slutter:" #: ../../include/event.php:63 ../../include/event.php:153 -#: ../../include/channel.php:1625 ../../Zotlabs/Module/Directory.php:353 +#: ../../include/channel.php:1631 ../../Zotlabs/Module/Directory.php:354 msgid "Location:" msgstr "Plassering:" @@ -4644,67 +4534,68 @@ msgstr "" msgid "End:" msgstr "" -#: ../../include/event.php:1193 +#: ../../include/event.php:1202 msgid "This event has been added to your calendar." msgstr "Denne hendelsen er lagt til i din kalender." -#: ../../include/event.php:1426 +#: ../../include/event.php:1435 msgid "Not specified" msgstr "Ikke spesifisert" -#: ../../include/event.php:1427 +#: ../../include/event.php:1436 msgid "Needs Action" msgstr "Trenger handling" -#: ../../include/event.php:1428 +#: ../../include/event.php:1437 msgid "Completed" msgstr "Ferdig" -#: ../../include/event.php:1429 +#: ../../include/event.php:1438 msgid "In Process" msgstr "Igang" -#: ../../include/event.php:1430 +#: ../../include/event.php:1439 msgid "Cancelled" msgstr "Avbrutt" -#: ../../include/event.php:1511 ../../include/connections.php:752 -#: ../../Zotlabs/Module/Cdav.php:1381 ../../Zotlabs/Module/Connedit.php:741 +#: ../../include/event.php:1520 ../../include/connections.php:781 +#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:741 +#, fuzzy msgid "Mobile" -msgstr "" +msgstr "mobil" -#: ../../include/event.php:1512 ../../include/connections.php:753 -#: ../../Zotlabs/Widget/Notifications.php:43 ../../Zotlabs/Module/Cdav.php:1382 +#: ../../include/event.php:1521 ../../include/connections.php:782 +#: ../../Zotlabs/Widget/Notifications.php:43 ../../Zotlabs/Module/Cdav.php:1374 #: ../../Zotlabs/Module/Connedit.php:742 msgid "Home" msgstr "Hjem" -#: ../../include/event.php:1513 ../../include/connections.php:754 +#: ../../include/event.php:1522 ../../include/connections.php:783 msgid "Home, Voice" msgstr "" -#: ../../include/event.php:1514 ../../include/connections.php:755 +#: ../../include/event.php:1523 ../../include/connections.php:784 msgid "Home, Fax" msgstr "" -#: ../../include/event.php:1515 ../../include/connections.php:756 -#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:743 +#: ../../include/event.php:1524 ../../include/connections.php:785 +#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:743 msgid "Work" msgstr "" -#: ../../include/event.php:1516 ../../include/connections.php:757 +#: ../../include/event.php:1525 ../../include/connections.php:786 msgid "Work, Voice" msgstr "" -#: ../../include/event.php:1517 ../../include/connections.php:758 +#: ../../include/event.php:1526 ../../include/connections.php:787 msgid "Work, Fax" msgstr "" -#: ../../include/event.php:1518 ../../include/event.php:1525 +#: ../../include/event.php:1527 ../../include/event.php:1534 #: ../../include/selectors.php:64 ../../include/selectors.php:81 #: ../../include/selectors.php:119 ../../include/selectors.php:155 -#: ../../include/connections.php:759 ../../include/connections.php:766 -#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Connedit.php:744 +#: ../../include/connections.php:788 ../../include/connections.php:795 +#: ../../Zotlabs/Module/Cdav.php:1376 ../../Zotlabs/Module/Connedit.php:744 #: ../../Zotlabs/Access/PermissionRoles.php:360 msgid "Other" msgstr "Annen" @@ -4721,8 +4612,8 @@ msgstr "Av" msgid "On" msgstr "På" -#: ../../include/features.php:82 ../../include/nav.php:466 -#: ../../include/nav.php:469 ../../Zotlabs/Lib/Apps.php:350 +#: ../../include/features.php:82 ../../include/nav.php:473 +#: ../../include/nav.php:476 ../../Zotlabs/Lib/Apps.php:351 msgid "Calendar" msgstr "Kalender" @@ -4764,11 +4655,11 @@ msgstr "Tilby en personlig merkelappsky på din kanalside" #: ../../include/features.php:124 ../../include/features.php:358 msgid "Use blog/list mode" -msgstr "" +msgstr "Bruk blogg/listemodus" #: ../../include/features.php:125 ../../include/features.php:359 msgid "Comments will be displayed separately" -msgstr "" +msgstr "Kommentarer blir vist separat fra innlegget" #: ../../include/features.php:137 msgid "Connection Filtering" @@ -4815,17 +4706,17 @@ msgstr "" msgid "Ability to reply on selected comment" msgstr "" -#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:351 +#: ../../include/features.php:192 ../../Zotlabs/Lib/Apps.php:352 msgid "Directory" msgstr "Katalog" #: ../../include/features.php:196 msgid "Advanced Directory Search" -msgstr "" +msgstr "Avansert katalogsøk" #: ../../include/features.php:197 msgid "Allows creation of complex directory search queries" -msgstr "" +msgstr "Gjør det mulig å bruke avanserte kriterier ved søk i katalogen" #: ../../include/features.php:206 msgid "Editor" @@ -4848,8 +4739,8 @@ msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -"Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd," -" bruk små (640px) småbilder." +"Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, " +"bruk små (640px) småbilder" #: ../../include/features.php:226 msgid "Even More Encryption" @@ -4859,15 +4750,16 @@ msgstr "Enda mer kryptering" msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -"Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel" +"Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig " +"nøkkel" #: ../../include/features.php:234 msgid "Disable Comments" -msgstr "" +msgstr "Slå av kommentarer" #: ../../include/features.php:235 msgid "Provide the option to disable comments for a post" -msgstr "" +msgstr "Slår på valg for å ikke tillate kommentarer til innlegget" #: ../../include/features.php:242 msgid "Delayed Posting" @@ -4884,8 +4776,8 @@ msgstr "Innholdet utløper" #: ../../include/features.php:251 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -"Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt i" -" fremtiden" +"Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt " +"i fremtiden" #: ../../include/features.php:258 msgid "Suppress Duplicate Posts/Comments" @@ -4896,18 +4788,20 @@ msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -"Forhindre innlegg med identisk innhold fra å bli publisert hvis det er mindre" -" enn to minutter mellom innsendingene." +"Forhindre innlegg med identisk innhold fra å bli publisert hvis det er " +"mindre enn to minutter mellom innsendingene." #: ../../include/features.php:266 msgid "Auto-save drafts of posts and comments" -msgstr "" +msgstr "Automatisk lagring av kladd for innlegg og kommentarer" #: ../../include/features.php:267 msgid "" "Automatically saves post and comment drafts in local browser storage to help " "prevent accidental loss of compositions" msgstr "" +"Lagrer automatisk utkast til innlegg og kommentarer i nettleserens interne " +"lager for å unngå å tape innholet ved et uhell" #: ../../include/features.php:276 msgid "Manage" @@ -4922,25 +4816,25 @@ msgid "Change channels directly from within the navigation dropdown menu" msgstr "Endre kanaler direkte fra navigasjonsmenyen" #: ../../include/features.php:290 ../../Zotlabs/Widget/Notifications.php:23 -#: ../../Zotlabs/Module/Connections.php:338 +#: ../../Zotlabs/Module/Connections.php:347 msgid "Network" msgstr "Nettverk" #: ../../include/features.php:294 msgid "Events Filter" -msgstr "" +msgstr "Arrangementsfilter" #: ../../include/features.php:295 msgid "Ability to display only events" -msgstr "" +msgstr "Mulighet for kun å vise arrangementer" #: ../../include/features.php:302 msgid "Polls Filter" -msgstr "" +msgstr "Filer for Spørreskjema" #: ../../include/features.php:303 msgid "Ability to display only polls" -msgstr "" +msgstr "Mulighet for å kun vise spørreskjema" #: ../../include/features.php:310 ../../Zotlabs/Widget/Savedsearch.php:89 msgid "Saved Searches" @@ -4962,41 +4856,43 @@ msgstr "Mulighet til å sortere innlegg i mapper" #: ../../include/features.php:326 msgid "Alternate Stream Order" -msgstr "" +msgstr "Alternativer for sortering" #: ../../include/features.php:327 msgid "" "Ability to order the stream by last post date, last comment date or " "unthreaded activities" msgstr "" +"Mulighet for å sortere tidslinjen etter dato for siste innlegg, siste " +"kommentar eller som separate aktiviteter" #: ../../include/features.php:334 msgid "Contact Filter" -msgstr "" +msgstr "Kontaktfilter" #: ../../include/features.php:335 msgid "Ability to display only posts of a selected contact" -msgstr "" +msgstr "Mulighet for å kun vise innlegg fra en bestemt kontakt" #: ../../include/features.php:342 msgid "Forum Filter" -msgstr "" +msgstr "Forumfilter" #: ../../include/features.php:343 msgid "Ability to display only posts of a specific forum" -msgstr "" +msgstr "Mulighet for å kun vise innlegg i et bestemt forum" #: ../../include/features.php:350 msgid "Personal Posts Filter" -msgstr "" +msgstr "Filter for personlige innlegg" #: ../../include/features.php:351 msgid "Ability to display only posts that you've interacted on" -msgstr "" +msgstr "Mulighet til å vise kun innlegg du har deltatt på" -#: ../../include/features.php:368 ../../include/nav.php:447 +#: ../../include/features.php:368 ../../include/nav.php:454 #: ../../Zotlabs/Widget/Channel_activities.php:93 -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:349 +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:350 msgid "Photos" msgstr "Bilder" @@ -5007,8 +4903,8 @@ msgstr "Bildeplassering" #: ../../include/features.php:373 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -"Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på" -" et kart." +"Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på " +"et kart." #: ../../include/features.php:380 msgid "Flag Adult Photos" @@ -5021,7 +4917,7 @@ msgid "" msgstr "" #: ../../include/features.php:390 ../../Zotlabs/Module/Contactedit.php:444 -#: ../../Zotlabs/Lib/Apps.php:367 +#: ../../Zotlabs/Lib/Apps.php:368 msgid "Profiles" msgstr "" @@ -5049,28 +4945,28 @@ msgstr "Flere profiler" msgid "Ability to create multiple profiles" msgstr "Mulig å lage flere profiler" -#: ../../include/security.php:630 +#: ../../include/security.php:633 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." msgstr "" -"Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi" -" skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn." +"Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi " +"skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn." #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "Slett dette elementet?" -#: ../../include/js_strings.php:6 +#: ../../include/js_strings.php:6 ../../Zotlabs/Module/Moderate.php:78 msgid "Item deleted" msgstr "" -#: ../../include/js_strings.php:7 ../../Zotlabs/Module/Photos.php:1103 -#: ../../Zotlabs/Module/Photos.php:1219 ../../Zotlabs/Lib/ThreadItem.php:834 +#: ../../include/js_strings.php:7 ../../Zotlabs/Module/Photos.php:1092 +#: ../../Zotlabs/Module/Photos.php:1205 ../../Zotlabs/Lib/ThreadItem.php:830 msgid "Comment" msgstr "Kommentar" -#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:543 +#: ../../include/js_strings.php:8 ../../Zotlabs/Lib/ThreadItem.php:539 #, php-format msgid "%s show all" msgstr "" @@ -5117,7 +5013,7 @@ msgstr "" #: ../../include/js_strings.php:18 msgid "close all" -msgstr "Lukk alle" +msgstr "lukk alle" #: ../../include/js_strings.php:19 msgid "Nothing new here" @@ -5137,16 +5033,17 @@ msgstr "Beskriv (valgfritt)" #: ../../include/js_strings.php:24 msgid "Please enter a link URL" -msgstr "Vennligst skriv inn en lenke URL:" +msgstr "Vennligst skriv inn en lenke URL" #: ../../include/js_strings.php:25 msgid "Unsaved changes. Are you sure you wish to leave this page?" msgstr "" -"Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne siden?" +"Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne " +"siden?" -#: ../../include/js_strings.php:26 ../../Zotlabs/Module/Pubsites.php:52 -#: ../../Zotlabs/Module/Cdav.php:1014 ../../Zotlabs/Module/Profiles.php:480 -#: ../../Zotlabs/Module/Profiles.php:751 ../../Zotlabs/Module/Locs.php:121 +#: ../../include/js_strings.php:26 ../../Zotlabs/Module/Pubsites.php:54 +#: ../../Zotlabs/Module/Cdav.php:1006 ../../Zotlabs/Module/Profiles.php:479 +#: ../../Zotlabs/Module/Profiles.php:750 ../../Zotlabs/Module/Locs.php:121 msgid "Location" msgstr "Plassering" @@ -5189,8 +5086,9 @@ msgid "This is a " msgstr "" #: ../../include/js_strings.php:36 +#, fuzzy msgid " channel name" -msgstr "" +msgstr "Kanalnavn" #: ../../include/js_strings.php:37 msgid "Back to reply" @@ -5200,12 +5098,12 @@ msgstr "" msgid "Pinned" msgstr "" -#: ../../include/js_strings.php:39 ../../Zotlabs/Lib/ThreadItem.php:480 +#: ../../include/js_strings.php:39 ../../Zotlabs/Lib/ThreadItem.php:473 msgid "Pin to the top" msgstr "" -#: ../../include/js_strings.php:40 ../../Zotlabs/Widget/Pinned.php:158 -#: ../../Zotlabs/Lib/ThreadItem.php:480 +#: ../../include/js_strings.php:40 ../../Zotlabs/Widget/Pinned.php:160 +#: ../../Zotlabs/Lib/ThreadItem.php:473 msgid "Unpin from the top" msgstr "" @@ -5412,8 +5310,8 @@ msgid "Help:" msgstr "Hjelp:" #: ../../include/help.php:118 ../../include/help.php:126 -#: ../../include/nav.php:179 ../../include/nav.php:318 -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:352 +#: ../../include/nav.php:181 ../../include/nav.php:325 +#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Lib/Apps.php:353 msgid "Help" msgstr "Hjelp" @@ -5421,44 +5319,44 @@ msgstr "Hjelp" msgid "Not Found" msgstr "Ikke funnet" -#: ../../include/photos.php:153 +#: ../../include/photos.php:152 #, php-format msgid "Image exceeds website size limit of %lu bytes" msgstr "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes" -#: ../../include/photos.php:164 +#: ../../include/photos.php:163 msgid "Image file is empty." msgstr "Bildefilen er tom." -#: ../../include/photos.php:198 ../../Zotlabs/Module/Profile_photo.php:275 +#: ../../include/photos.php:197 ../../Zotlabs/Module/Profile_photo.php:275 #: ../../Zotlabs/Module/Cover_photo.php:241 msgid "Unable to process image" msgstr "Kan ikke behandle bildet" -#: ../../include/photos.php:324 +#: ../../include/photos.php:323 msgid "Photo storage failed." msgstr "Bildelagring mislyktes." -#: ../../include/photos.php:373 +#: ../../include/photos.php:372 msgid "a new photo" msgstr "et nytt bilde" -#: ../../include/photos.php:377 +#: ../../include/photos.php:376 #, php-format msgctxt "photo_upload" msgid "%1$s posted %2$s to %3$s" msgstr "%1$s la inn %2$s til %3$s" -#: ../../include/photos.php:722 ../../include/nav.php:450 +#: ../../include/photos.php:721 ../../include/nav.php:457 msgid "Photo Albums" msgstr "Fotoalbum" -#: ../../include/photos.php:723 ../../Zotlabs/Module/Photos.php:1352 -#: ../../Zotlabs/Module/Photos.php:1365 ../../Zotlabs/Module/Photos.php:1366 +#: ../../include/photos.php:722 ../../Zotlabs/Module/Photos.php:1338 +#: ../../Zotlabs/Module/Photos.php:1351 ../../Zotlabs/Module/Photos.php:1352 msgid "Recent Photos" msgstr "Nye bilder" -#: ../../include/photos.php:727 +#: ../../include/photos.php:726 msgid "Upload New Photos" msgstr "Last opp nye bilder" @@ -5478,49 +5376,49 @@ msgstr "" msgid "content-type: " msgstr "" -#: ../../include/network.php:1762 ../../include/network.php:1763 +#: ../../include/network.php:1767 ../../include/network.php:1768 msgid "Friendica" msgstr "Friendica" -#: ../../include/network.php:1764 +#: ../../include/network.php:1769 msgid "OStatus" msgstr "OStatus" -#: ../../include/network.php:1765 +#: ../../include/network.php:1770 msgid "GNU-Social" msgstr "" -#: ../../include/network.php:1766 +#: ../../include/network.php:1771 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1769 +#: ../../include/network.php:1774 msgid "Diaspora" msgstr "Diaspora" -#: ../../include/network.php:1770 +#: ../../include/network.php:1775 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1771 +#: ../../include/network.php:1776 msgid "Zot" msgstr "Zot" -#: ../../include/network.php:1772 +#: ../../include/network.php:1777 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1773 +#: ../../include/network.php:1778 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1774 +#: ../../include/network.php:1779 msgid "MySpace" msgstr "MySpace" #: ../../include/activities.php:42 msgid " and " -msgstr "og" +msgstr " og " #: ../../include/activities.php:50 msgid "public profile" @@ -5569,13 +5467,13 @@ msgstr "Forbindelse/Følg" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Eksempler: Ola Nordmann, fisking" -#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:432 -#: ../../Zotlabs/Module/Directory.php:437 -#: ../../Zotlabs/Module/Connections.php:398 +#: ../../include/contact_widgets.php:23 ../../Zotlabs/Module/Directory.php:435 +#: ../../Zotlabs/Module/Directory.php:440 +#: ../../Zotlabs/Module/Connections.php:407 msgid "Find" msgstr "Finn" -#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:436 +#: ../../include/contact_widgets.php:24 ../../Zotlabs/Module/Directory.php:439 #: ../../Zotlabs/Module/Suggest.php:77 msgid "Channel Suggestions" msgstr "Kanalforslag" @@ -5613,236 +5511,238 @@ msgstr "" msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -"Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import" -" mislyktes." +"Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import " +"mislyktes." #: ../../include/import.php:122 msgid "Cloned channel not found. Import failed." msgstr "Klonet kanal ble ikke funnet. Import mislyktes." -#: ../../include/nav.php:95 +#: ../../include/nav.php:96 msgid "Remote authentication" msgstr "Fjernautentisering" -#: ../../include/nav.php:95 +#: ../../include/nav.php:96 msgid "Click to authenticate to your home hub" msgstr "Klikk for å godkjennes mot din hjemme-hub" -#: ../../include/nav.php:101 ../../Zotlabs/Widget/Channel_activities.php:239 +#: ../../include/nav.php:102 ../../Zotlabs/Widget/Channel_activities.php:239 #: ../../Zotlabs/Widget/Admin.php:29 #: ../../Zotlabs/Module/Admin/Channels.php:146 #: ../../Zotlabs/Module/Manage.php:162 ../../Zotlabs/Module/Admin.php:116 msgid "Channels" msgstr "Kanaler" -#: ../../include/nav.php:101 +#: ../../include/nav.php:102 msgid "Manage your channels" -msgstr "" +msgstr "Behandle kanalene dine" -#: ../../include/nav.php:104 ../../Zotlabs/Widget/Settings_menu.php:71 +#: ../../include/nav.php:105 ../../Zotlabs/Widget/Settings_menu.php:71 #: ../../Zotlabs/Widget/Newmember.php:58 #: ../../Zotlabs/Module/Admin/Themes.php:125 -#: ../../Zotlabs/Module/Admin/Addons.php:345 ../../Zotlabs/Lib/Apps.php:343 +#: ../../Zotlabs/Module/Admin/Addons.php:348 ../../Zotlabs/Lib/Apps.php:344 msgid "Settings" msgstr "Innstillinger" -#: ../../include/nav.php:104 +#: ../../include/nav.php:105 msgid "Account/Channel Settings" -msgstr "Konto-/kanal-innstillinger" +msgstr "Konto-/kanalinnstillinger" -#: ../../include/nav.php:110 ../../include/nav.php:140 -#: ../../include/nav.php:161 ../../boot.php:1747 +#: ../../include/nav.php:111 ../../include/nav.php:141 +#: ../../include/nav.php:162 ../../boot.php:1745 msgid "Logout" msgstr "Logg ut" -#: ../../include/nav.php:110 ../../include/nav.php:140 +#: ../../include/nav.php:111 ../../include/nav.php:141 msgid "End this session" msgstr "Avslutt denne økten" -#: ../../include/nav.php:113 +#: ../../include/nav.php:114 msgid "Your profile page" msgstr "Din profilside" -#: ../../include/nav.php:116 ../../include/channel.php:1530 -#: ../../Zotlabs/Module/Profiles.php:852 +#: ../../include/nav.php:117 ../../include/channel.php:1530 +#: ../../Zotlabs/Module/Profiles.php:851 msgid "Edit Profiles" msgstr "Endre profiler" -#: ../../include/nav.php:116 +#: ../../include/nav.php:117 msgid "Manage/Edit profiles" msgstr "Håndter/endre profiler" -#: ../../include/nav.php:118 ../../Zotlabs/Widget/Newmember.php:40 +#: ../../include/nav.php:119 ../../Zotlabs/Widget/Newmember.php:40 msgid "Edit your profile" msgstr "Rediger profil" -#: ../../include/nav.php:125 ../../include/nav.php:129 -#: ../../Zotlabs/Lib/Apps.php:340 ../../boot.php:1748 +#: ../../include/nav.php:126 ../../include/nav.php:130 +#: ../../Zotlabs/Lib/Apps.php:341 ../../boot.php:1746 msgid "Login" msgstr "Logg inn" -#: ../../include/nav.php:125 ../../include/nav.php:129 +#: ../../include/nav.php:126 ../../include/nav.php:130 msgid "Sign in" msgstr "Logg på" -#: ../../include/nav.php:159 +#: ../../include/nav.php:160 msgid "Take me home" msgstr "" -#: ../../include/nav.php:161 +#: ../../include/nav.php:162 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:166 ../../Zotlabs/Module/Register.php:542 -#: ../../boot.php:1725 +#: ../../include/nav.php:167 ../../Zotlabs/Module/Register.php:542 +#: ../../boot.php:1723 msgid "Register" msgstr "Registrer" -#: ../../include/nav.php:166 +#: ../../include/nav.php:167 msgid "Create an account" msgstr "Lag en konto" -#: ../../include/nav.php:179 +#: ../../include/nav.php:181 msgid "Help and documentation" msgstr "Hjelp og dokumentasjon" -#: ../../include/nav.php:193 +#: ../../include/nav.php:195 msgid "Search site @name, !forum, #tag, ?docs, content" -msgstr "" +msgstr "Søk etter @navn, !forum, #emne, ?dokumentasjon eller innhold" -#: ../../include/nav.php:199 ../../Zotlabs/Widget/Admin.php:60 +#: ../../include/nav.php:201 ../../Zotlabs/Widget/Admin.php:61 msgid "Admin" msgstr "Administrator" -#: ../../include/nav.php:199 +#: ../../include/nav.php:201 msgid "Site Setup and Configuration" msgstr "Nettstedsoppsett og -konfigurasjon" -#: ../../include/nav.php:322 ../../Zotlabs/Widget/Messages.php:36 +#: ../../include/nav.php:329 ../../Zotlabs/Widget/Messages.php:36 #: ../../Zotlabs/Widget/Notifications.php:173 #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Defperms.php:254 +#, fuzzy msgid "Loading" -msgstr "" +msgstr "Laster..." -#: ../../include/nav.php:327 +#: ../../include/nav.php:334 msgid "@name, #tag, ?doc, content" msgstr "@navn, #merkelapp, ?dokumentasjon, innhold" -#: ../../include/nav.php:328 +#: ../../include/nav.php:335 msgid "Please wait..." msgstr "Vennligst vent..." -#: ../../include/nav.php:334 ../../Zotlabs/Lib/Apps.php:327 +#: ../../include/nav.php:341 ../../Zotlabs/Lib/Apps.php:328 msgid "Apps" msgstr "Apper" -#: ../../include/nav.php:335 +#: ../../include/nav.php:342 msgid "Channel Apps" msgstr "" -#: ../../include/nav.php:336 +#: ../../include/nav.php:343 msgid "System Apps" msgstr "" -#: ../../include/nav.php:337 +#: ../../include/nav.php:344 msgid "Pinned Apps" msgstr "" -#: ../../include/nav.php:338 +#: ../../include/nav.php:345 msgid "Featured Apps" -msgstr "" +msgstr "Fremhevede apper" -#: ../../include/nav.php:424 ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../Zotlabs/Lib/Apps.php:347 +#: ../../include/nav.php:431 ../../Zotlabs/Module/Admin/Channels.php:154 +#: ../../Zotlabs/Lib/Apps.php:348 msgid "Channel" msgstr "Kanal" -#: ../../include/nav.php:427 +#: ../../include/nav.php:434 msgid "Status Messages and Posts" msgstr "Statusmeldinger og -innlegg" -#: ../../include/nav.php:437 ../../Zotlabs/Module/Help.php:83 +#: ../../include/nav.php:444 ../../Zotlabs/Module/Help.php:85 msgid "About" msgstr "Om" -#: ../../include/nav.php:440 +#: ../../include/nav.php:447 msgid "Profile Details" msgstr "Profildetaljer" -#: ../../include/nav.php:455 ../../Zotlabs/Widget/Channel_activities.php:125 +#: ../../include/nav.php:462 ../../Zotlabs/Widget/Channel_activities.php:125 #: ../../Zotlabs/Widget/Notifications.php:108 -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:344 +#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:345 #: ../../Zotlabs/Storage/Browser.php:351 msgid "Files" msgstr "Filer" -#: ../../include/nav.php:458 +#: ../../include/nav.php:465 msgid "Files and Storage" msgstr "Filer og lagring" -#: ../../include/nav.php:480 ../../include/nav.php:483 -#: ../../Zotlabs/Widget/Chatroom_list.php:22 ../../Zotlabs/Lib/Apps.php:334 +#: ../../include/nav.php:487 ../../include/nav.php:490 +#: ../../Zotlabs/Widget/Chatroom_list.php:22 ../../Zotlabs/Lib/Apps.php:335 msgid "Chatrooms" msgstr "Chatrom" -#: ../../include/nav.php:493 ../../Zotlabs/Module/Bookmarks.php:90 -#: ../../Zotlabs/Lib/Apps.php:333 +#: ../../include/nav.php:500 ../../Zotlabs/Module/Bookmarks.php:90 +#: ../../Zotlabs/Lib/Apps.php:334 msgid "Bookmarks" msgstr "Bokmerker" -#: ../../include/nav.php:496 +#: ../../include/nav.php:503 msgid "Saved Bookmarks" msgstr "Lagrede bokmerker" -#: ../../include/nav.php:504 ../../Zotlabs/Widget/Channel_activities.php:168 -#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Lib/Apps.php:345 +#: ../../include/nav.php:511 ../../Zotlabs/Widget/Channel_activities.php:168 +#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:346 msgid "Webpages" msgstr "Websider" -#: ../../include/nav.php:507 +#: ../../include/nav.php:514 msgid "View Webpages" msgstr "" -#: ../../include/nav.php:518 ../../Zotlabs/Lib/Apps.php:346 +#: ../../include/nav.php:525 ../../Zotlabs/Lib/Apps.php:347 msgid "Wiki" msgstr "" -#: ../../include/auth.php:194 +#: ../../include/auth.php:197 msgid "Delegation session ended." msgstr "" -#: ../../include/auth.php:198 +#: ../../include/auth.php:201 msgid "Logged out." msgstr "Logget ut." -#: ../../include/auth.php:297 +#: ../../include/auth.php:308 msgid "Email validation is incomplete. Please check your email." msgstr "" -#: ../../include/auth.php:313 +#: ../../include/auth.php:324 msgid "Failed authentication" msgstr "Mislykket autentisering" #: ../../include/datetime.php:58 ../../Zotlabs/Widget/Newmember.php:56 -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Miscellaneous" msgstr "Forskjellig" #: ../../include/datetime.php:140 +#, fuzzy msgid "Birthday" -msgstr "" +msgstr "Fødselsdag:" #: ../../include/datetime.php:140 msgid "Age: " -msgstr "Alder:" +msgstr "Alder: " #: ../../include/datetime.php:140 msgid "YYYY-MM-DD or MM-DD" msgstr "YYYY-MM-DD eller MM-DD" -#: ../../include/datetime.php:238 ../../boot.php:2764 +#: ../../include/datetime.php:238 ../../boot.php:2752 msgid "never" msgstr "aldri" @@ -5913,29 +5813,31 @@ msgstr "%1$s sin fødselsdag" #: ../../include/datetime.php:521 #, php-format msgid "Happy Birthday %1$s" -msgstr "Gratulerer med dagen, %1$s !" +msgstr "Gratulerer med dagen, %1$s" #: ../../include/cdav.php:157 msgid "INVALID EVENT DISMISSED!" msgstr "" #: ../../include/cdav.php:158 +#, fuzzy msgid "Summary: " -msgstr "" +msgstr "Sammendrag" #: ../../include/cdav.php:158 ../../include/cdav.php:159 -#: ../../include/cdav.php:167 ../../include/conversation.php:1214 -#: ../../Zotlabs/Widget/Album.php:90 ../../Zotlabs/Widget/Pinned.php:271 +#: ../../include/cdav.php:167 ../../include/conversation.php:1217 +#: ../../Zotlabs/Widget/Album.php:90 ../../Zotlabs/Widget/Pinned.php:275 #: ../../Zotlabs/Widget/Portfolio.php:99 -#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:799 -#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/Activity.php:1604 -#: ../../Zotlabs/Lib/Apps.php:1151 ../../Zotlabs/Lib/Apps.php:1235 +#: ../../Zotlabs/Module/Embedphotos.php:177 ../../Zotlabs/Module/Photos.php:788 +#: ../../Zotlabs/Module/Photos.php:1245 ../../Zotlabs/Lib/Activity.php:1681 +#: ../../Zotlabs/Lib/Apps.php:1152 ../../Zotlabs/Lib/Apps.php:1236 msgid "Unknown" msgstr "Ukjent" #: ../../include/cdav.php:159 +#, fuzzy msgid "Date: " -msgstr "" +msgstr "Dato" #: ../../include/cdav.php:160 ../../include/cdav.php:168 msgid "Reason: " @@ -5946,8 +5848,9 @@ msgid "INVALID CARD DISMISSED!" msgstr "" #: ../../include/cdav.php:167 +#, fuzzy msgid "Name: " -msgstr "" +msgstr "Navn" #: ../../include/conversation.php:145 ../../Zotlabs/Module/Like.php:184 msgid "channel" @@ -5979,299 +5882,314 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "%1$s er %2$s" -#: ../../include/conversation.php:526 ../../Zotlabs/Lib/ThreadItem.php:508 +#: ../../include/conversation.php:526 ../../Zotlabs/Lib/ThreadItem.php:501 msgid "This is an unsaved preview" msgstr "" -#: ../../include/conversation.php:659 ../../Zotlabs/Module/Photos.php:1119 +#: ../../include/conversation.php:658 ../../Zotlabs/Module/Photos.php:1108 msgctxt "title" msgid "Likes" msgstr "Liker" -#: ../../include/conversation.php:660 ../../Zotlabs/Module/Photos.php:1119 +#: ../../include/conversation.php:659 ../../Zotlabs/Module/Photos.php:1108 msgctxt "title" msgid "Dislikes" msgstr "Liker ikke" -#: ../../include/conversation.php:661 ../../Zotlabs/Widget/Pinned.php:80 -#: ../../Zotlabs/Module/Photos.php:1120 +#: ../../include/conversation.php:660 ../../Zotlabs/Widget/Pinned.php:82 +#: ../../Zotlabs/Module/Photos.php:1109 msgctxt "title" msgid "Agree" msgstr "Enig" -#: ../../include/conversation.php:662 ../../Zotlabs/Widget/Pinned.php:81 -#: ../../Zotlabs/Module/Photos.php:1120 +#: ../../include/conversation.php:661 ../../Zotlabs/Widget/Pinned.php:83 +#: ../../Zotlabs/Module/Photos.php:1109 msgctxt "title" msgid "Disagree" msgstr "Uenig" -#: ../../include/conversation.php:663 ../../Zotlabs/Widget/Pinned.php:82 -#: ../../Zotlabs/Module/Photos.php:1120 +#: ../../include/conversation.php:662 ../../Zotlabs/Widget/Pinned.php:84 +#: ../../Zotlabs/Module/Photos.php:1109 msgctxt "title" msgid "Abstain" msgstr "Avstår" -#: ../../include/conversation.php:664 ../../Zotlabs/Widget/Pinned.php:69 -#: ../../Zotlabs/Module/Photos.php:1121 +#: ../../include/conversation.php:663 ../../Zotlabs/Widget/Pinned.php:71 +#: ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Attending" msgstr "Deltar" -#: ../../include/conversation.php:665 ../../Zotlabs/Widget/Pinned.php:70 -#: ../../Zotlabs/Module/Photos.php:1121 +#: ../../include/conversation.php:664 ../../Zotlabs/Widget/Pinned.php:72 +#: ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Not attending" msgstr "Deltar ikke" -#: ../../include/conversation.php:666 ../../Zotlabs/Widget/Pinned.php:71 -#: ../../Zotlabs/Module/Photos.php:1121 +#: ../../include/conversation.php:665 ../../Zotlabs/Widget/Pinned.php:73 +#: ../../Zotlabs/Module/Photos.php:1110 msgctxt "title" msgid "Might attend" msgstr "Deltar kanskje" -#: ../../include/conversation.php:736 +#: ../../include/conversation.php:735 msgid "Select" msgstr "Velg" -#: ../../include/conversation.php:743 ../../Zotlabs/Lib/ThreadItem.php:270 +#: ../../include/conversation.php:742 ../../Zotlabs/Lib/ThreadItem.php:263 msgid "Toggle Star Status" msgstr "Skru av og på stjernestatus" -#: ../../include/conversation.php:749 +#: ../../include/conversation.php:748 msgid "Private Message" msgstr "Privat melding" -#: ../../include/conversation.php:758 ../../Zotlabs/Widget/Pinned.php:91 -#: ../../Zotlabs/Lib/ThreadItem.php:280 +#: ../../include/conversation.php:757 ../../Zotlabs/Widget/Pinned.php:93 +#: ../../Zotlabs/Lib/ThreadItem.php:273 msgid "Message signature validated" msgstr "Innleggets signatur er bekreftet" -#: ../../include/conversation.php:759 ../../Zotlabs/Widget/Pinned.php:92 -#: ../../Zotlabs/Lib/ThreadItem.php:281 +#: ../../include/conversation.php:758 ../../Zotlabs/Widget/Pinned.php:94 +#: ../../Zotlabs/Lib/ThreadItem.php:274 msgid "Message signature incorrect" msgstr "Innleggets signatur er feil" -#: ../../include/conversation.php:796 +#: ../../include/conversation.php:798 #: ../../Zotlabs/Module/Admin/Accounts.php:318 -#: ../../Zotlabs/Module/Connections.php:349 -#: ../../Zotlabs/Module/Connections.php:400 +#: ../../Zotlabs/Module/Connections.php:358 +#: ../../Zotlabs/Module/Connections.php:409 +#: ../../Zotlabs/Lib/ThreadItem.php:508 msgid "Approve" msgstr "Godkjenn" -#: ../../include/conversation.php:802 +#: ../../include/conversation.php:804 #, php-format msgid "View %s's profile @ %s" msgstr "Vis %s sin profile @ %s" -#: ../../include/conversation.php:823 +#: ../../include/conversation.php:826 msgid "Categories:" msgstr "Kategorier:" -#: ../../include/conversation.php:824 +#: ../../include/conversation.php:827 msgid "Filed under:" msgstr "Sortert under:" -#: ../../include/conversation.php:830 ../../Zotlabs/Widget/Pinned.php:135 -#: ../../Zotlabs/Lib/ThreadItem.php:437 +#: ../../include/conversation.php:833 ../../Zotlabs/Widget/Pinned.php:137 +#: ../../Zotlabs/Lib/ThreadItem.php:430 #, php-format msgid "from %s" msgstr "fra %s" -#: ../../include/conversation.php:833 ../../Zotlabs/Widget/Pinned.php:138 -#: ../../Zotlabs/Lib/ThreadItem.php:440 +#: ../../include/conversation.php:836 ../../Zotlabs/Widget/Pinned.php:140 +#: ../../Zotlabs/Lib/ThreadItem.php:433 #, php-format msgid "last edited: %s" msgstr "sist endret: %s" -#: ../../include/conversation.php:834 ../../Zotlabs/Widget/Pinned.php:139 -#: ../../Zotlabs/Lib/ThreadItem.php:441 +#: ../../include/conversation.php:837 ../../Zotlabs/Widget/Pinned.php:141 +#: ../../Zotlabs/Lib/ThreadItem.php:434 #, php-format msgid "Expires: %s" msgstr "Utløper: %s" -#: ../../include/conversation.php:851 ../../Zotlabs/Module/Photos.php:1085 -#: ../../Zotlabs/Lib/ThreadItem.php:509 +#: ../../include/conversation.php:854 ../../Zotlabs/Module/Photos.php:1074 +#: ../../Zotlabs/Lib/ThreadItem.php:502 msgid "Please wait" msgstr "Vennligst vent" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:955 msgid "remove" msgstr "fjern" -#: ../../include/conversation.php:956 +#: ../../include/conversation.php:959 msgid "Loading..." msgstr "Laster..." -#: ../../include/conversation.php:957 ../../Zotlabs/Lib/ThreadItem.php:297 +#: ../../include/conversation.php:960 ../../Zotlabs/Lib/ThreadItem.php:290 msgid "Conversation Features" -msgstr "" +msgstr "Samtaleinnstillinger" -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:961 msgid "Delete Selected Items" msgstr "Slett valgte elementer" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:997 msgid "View Source" msgstr "Vis kilde" -#: ../../include/conversation.php:1004 +#: ../../include/conversation.php:1007 msgid "Follow Thread" msgstr "Følg tråd" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1016 msgid "Unfollow Thread" msgstr "Ikke følg tråd" -#: ../../include/conversation.php:1105 ../../Zotlabs/Module/Connedit.php:501 +#: ../../include/conversation.php:1108 ../../Zotlabs/Module/Connedit.php:501 msgid "Recent Activity" msgstr "Nylig aktivitet" -#: ../../include/conversation.php:1117 ../../include/connections.php:112 -#: ../../include/channel.php:1610 ../../Zotlabs/Widget/Suggestions.php:51 -#: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Directory.php:369 -#: ../../Zotlabs/Module/Connections.php:356 ../../Zotlabs/Module/Suggest.php:69 +#: ../../include/conversation.php:1120 ../../include/connections.php:141 +#: ../../include/channel.php:1616 ../../Zotlabs/Widget/Suggestions.php:51 +#: ../../Zotlabs/Widget/Follow.php:37 ../../Zotlabs/Module/Directory.php:371 +#: ../../Zotlabs/Module/Connections.php:365 ../../Zotlabs/Module/Suggest.php:69 msgid "Connect" msgstr "Koble" -#: ../../include/conversation.php:1129 +#: ../../include/conversation.php:1132 msgid "Edit Connection" msgstr "Endre forbindelse" -#: ../../include/conversation.php:1141 ../../Zotlabs/Module/Poke.php:197 -#: ../../Zotlabs/Lib/Apps.php:355 +#: ../../include/conversation.php:1144 ../../Zotlabs/Module/Poke.php:181 +#: ../../Zotlabs/Module/Poke.php:185 ../../Zotlabs/Lib/Apps.php:356 msgid "Poke" msgstr "Prikk" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1219 +#, fuzzy +#| msgid "Remove this file" +msgid "Approve this item" +msgstr "Fjern denne filen" + +#: ../../include/conversation.php:1219 +#, fuzzy +#| msgid "Delete this item?" +msgid "Delete this item" +msgstr "Slett dette elementet?" + +#: ../../include/conversation.php:1273 #, php-format msgid "%s likes this." msgstr "%s liker dette." -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1273 #, php-format msgid "%s doesn't like this." msgstr "%s liker ikke dette." -#: ../../include/conversation.php:1269 +#: ../../include/conversation.php:1277 #, php-format msgid "%2$d people like this." msgid_plural "%2$d people like this." msgstr[0] "%2$d person liker dette." msgstr[1] "%2$d personer liker dette." -#: ../../include/conversation.php:1271 +#: ../../include/conversation.php:1279 #, php-format msgid "%2$d people don't like this." msgid_plural "%2$d people don't like this." msgstr[0] "%2$d person liker ikke dette." msgstr[1] "%2$d personer liker ikke dette." -#: ../../include/conversation.php:1277 +#: ../../include/conversation.php:1285 msgid "and" msgstr "og" -#: ../../include/conversation.php:1280 +#: ../../include/conversation.php:1288 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] ", og %d annen person" msgstr[1] ", og %d andre personer" -#: ../../include/conversation.php:1281 +#: ../../include/conversation.php:1289 #, php-format msgid "%s like this." msgstr "%s liker dette." -#: ../../include/conversation.php:1281 +#: ../../include/conversation.php:1289 #, php-format msgid "%s don't like this." msgstr "%s liker ikke dette." -#: ../../include/conversation.php:1471 +#: ../../include/conversation.php:1479 msgid "Toggle poll" -msgstr "" +msgstr "Spørreskjema (på/av)" -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1480 msgid "Option" -msgstr "" +msgstr "Valg" -#: ../../include/conversation.php:1473 +#: ../../include/conversation.php:1481 msgid "Add option" -msgstr "" +msgstr "Legg til valg" -#: ../../include/conversation.php:1474 +#: ../../include/conversation.php:1482 msgid "Minutes" msgstr "Minutter" -#: ../../include/conversation.php:1474 +#: ../../include/conversation.php:1482 +#, fuzzy msgid "Hours" -msgstr "" +msgstr "timer" -#: ../../include/conversation.php:1474 +#: ../../include/conversation.php:1482 +#, fuzzy msgid "Days" -msgstr "" +msgstr "dager" -#: ../../include/conversation.php:1475 +#: ../../include/conversation.php:1483 msgid "Allow multiple answers" -msgstr "" +msgstr "Tillat flere svar" -#: ../../include/conversation.php:1485 +#: ../../include/conversation.php:1493 msgid "Summary (optional)" -msgstr "" +msgstr "Sammendrag (valgfritt)" -#: ../../include/conversation.php:1760 ../../include/taxonomy.php:672 -#: ../../include/channel.php:1771 ../../Zotlabs/Module/Photos.php:1142 -#: ../../Zotlabs/Lib/ThreadItem.php:241 +#: ../../include/conversation.php:1768 ../../include/taxonomy.php:675 +#: ../../include/channel.php:1779 ../../Zotlabs/Module/Photos.php:1128 +#: ../../Zotlabs/Lib/ThreadItem.php:233 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "Liker" msgstr[1] "Liker" -#: ../../include/conversation.php:1763 ../../Zotlabs/Module/Photos.php:1147 -#: ../../Zotlabs/Lib/ThreadItem.php:246 +#: ../../include/conversation.php:1771 ../../Zotlabs/Module/Photos.php:1133 +#: ../../Zotlabs/Lib/ThreadItem.php:239 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "Liker ikke" msgstr[1] "Liker ikke" -#: ../../include/conversation.php:1766 +#: ../../include/conversation.php:1774 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "Deltar" msgstr[1] "Deltar" -#: ../../include/conversation.php:1769 +#: ../../include/conversation.php:1777 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "Deltar ikke" msgstr[1] "Deltar ikke" -#: ../../include/conversation.php:1772 +#: ../../include/conversation.php:1780 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "Ikke bestemt" msgstr[1] "Ikke bestemt" -#: ../../include/conversation.php:1775 +#: ../../include/conversation.php:1783 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "Enig" msgstr[1] "Enige" -#: ../../include/conversation.php:1778 +#: ../../include/conversation.php:1786 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "Uenig" msgstr[1] "Uenige" -#: ../../include/conversation.php:1781 +#: ../../include/conversation.php:1789 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -6338,11 +6256,11 @@ msgstr "Transseksuell" msgid "Hermaphrodite" msgstr "Hermafroditt" -#: ../../include/selectors.php:64 ../../include/channel.php:1716 +#: ../../include/selectors.php:64 ../../include/channel.php:1724 msgid "Neuter" msgstr "Intetkjønn" -#: ../../include/selectors.php:64 ../../include/channel.php:1718 +#: ../../include/selectors.php:64 ../../include/channel.php:1726 msgid "Non-specific" msgstr "Ubestemt" @@ -6447,7 +6365,7 @@ msgstr "Venner" #: ../../include/selectors.php:138 msgid "Friends/Benefits" -msgstr "Venner med frynsegoder" +msgstr "Venner/Frynsegoder" #: ../../include/selectors.php:138 msgid "Casual" @@ -6529,11 +6447,11 @@ msgstr "Bryr meg ikke" msgid "Ask me" msgstr "Spør meg" -#: ../../include/connections.php:136 +#: ../../include/connections.php:165 msgid "New window" msgstr "Nytt vindu" -#: ../../include/connections.php:137 +#: ../../include/connections.php:166 msgid "Open the selected location in a different window or browser tab" msgstr "Åpne det valgte stedet i et annet vindu eller nettleser-fane" @@ -6543,10 +6461,10 @@ msgid "" "may apply to this group and any future members. If this is " "not what you intended, please create another group with a different name." msgstr "" -"En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende" -" tillatelser for elementet kan gjelde for denne gruppen og" -" fremtidige medlemmer. Hvis du ønsket noe annet, vennligst lag en ny gruppe" -" med et annet navn." +"En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende " +"tillatelser for elementet kan gjelde for denne gruppen og " +"fremtidige medlemmer. Hvis du ønsket noe annet, vennligst lag en ny gruppe " +"med et annet navn." #: ../../include/group.php:271 msgid "Add new connections to this privacy group" @@ -6558,7 +6476,7 @@ msgstr "endre" #: ../../include/group.php:327 ../../include/acl_selectors.php:87 #: ../../Zotlabs/Widget/Activity_filter.php:95 -#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:368 +#: ../../Zotlabs/Module/Group.php:143 ../../Zotlabs/Lib/Apps.php:369 msgid "Privacy Groups" msgstr "Personverngrupper" @@ -6578,159 +6496,153 @@ msgstr "Kanaler uten personverngruppe" msgid "add" msgstr "legg til" -#: ../../include/taxonomy.php:323 +#: ../../include/taxonomy.php:324 msgid "Trending" msgstr "" -#: ../../include/taxonomy.php:323 ../../include/taxonomy.php:460 -#: ../../include/taxonomy.php:481 ../../Zotlabs/Widget/Tagcloud.php:27 +#: ../../include/taxonomy.php:324 ../../include/taxonomy.php:463 +#: ../../include/taxonomy.php:484 ../../Zotlabs/Widget/Tagcloud.php:27 msgid "Tags" msgstr "Merkelapper" -#: ../../include/taxonomy.php:561 +#: ../../include/taxonomy.php:564 msgid "Keywords" msgstr "Nøkkelord" -#: ../../include/taxonomy.php:582 +#: ../../include/taxonomy.php:585 msgid "have" msgstr "har" -#: ../../include/taxonomy.php:582 +#: ../../include/taxonomy.php:585 msgid "has" msgstr "har" -#: ../../include/taxonomy.php:583 +#: ../../include/taxonomy.php:586 msgid "want" msgstr "ønsker" -#: ../../include/taxonomy.php:583 +#: ../../include/taxonomy.php:586 msgid "wants" msgstr "ønsker" -#: ../../include/taxonomy.php:584 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../include/taxonomy.php:587 ../../Zotlabs/Lib/ThreadItem.php:310 msgid "like" msgstr "liker" -#: ../../include/taxonomy.php:584 +#: ../../include/taxonomy.php:587 msgid "likes" msgstr "liker" -#: ../../include/taxonomy.php:585 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../include/taxonomy.php:588 ../../Zotlabs/Lib/ThreadItem.php:311 msgid "dislike" msgstr "misliker" -#: ../../include/taxonomy.php:585 +#: ../../include/taxonomy.php:588 msgid "dislikes" msgstr "misliker" -#: ../../include/items.php:1040 -msgid "(Unknown)" -msgstr "(Ukjent)" - -#: ../../include/items.php:1228 +#: ../../include/items.php:1234 msgid "Visible to anybody on the internet." msgstr "Synlig for enhver på Internett." -#: ../../include/items.php:1230 +#: ../../include/items.php:1236 msgid "Visible to you only." msgstr "Synlig bare for deg." -#: ../../include/items.php:1232 +#: ../../include/items.php:1238 msgid "Visible to anybody in this network." msgstr "Synlig for enhver i dette nettverket." -#: ../../include/items.php:1234 +#: ../../include/items.php:1240 msgid "Visible to anybody authenticated." msgstr "Synlig for enhver som er autentisert." -#: ../../include/items.php:1236 +#: ../../include/items.php:1242 #, php-format msgid "Visible to anybody on %s." msgstr "Synlig for alle på %s." -#: ../../include/items.php:1238 +#: ../../include/items.php:1244 msgid "Visible to all connections." msgstr "Synlig for alle forbindelser." -#: ../../include/items.php:1240 +#: ../../include/items.php:1246 msgid "Visible to approved connections." msgstr "Synlig for godkjente forbindelser." -#: ../../include/items.php:1242 +#: ../../include/items.php:1248 msgid "Visible to specific connections." msgstr "Synlig for spesifikke forbindelser." -#: ../../include/items.php:3302 ../../Zotlabs/Module/Share.php:104 +#: ../../include/items.php:3373 ../../Zotlabs/Module/Share.php:104 #, php-format msgid "🔁 Repeated %1$s's %2$s" msgstr "" -#: ../../include/items.php:4394 ../../Zotlabs/Module/Group.php:62 +#: ../../include/items.php:4455 ../../Zotlabs/Module/Group.php:62 #: ../../Zotlabs/Module/Group.php:206 msgid "Privacy group not found." -msgstr "Personverngruppen ble ikke funnet" +msgstr "Personverngruppen ble ikke funnet." -#: ../../include/items.php:4410 +#: ../../include/items.php:4471 msgid "Privacy group is empty." msgstr "Personverngruppen er tom." -#: ../../include/items.php:4417 +#: ../../include/items.php:4478 #, php-format msgid "Privacy group: %s" msgstr "Personverngruppe: %s" -#: ../../include/items.php:4427 +#: ../../include/items.php:4488 #, php-format msgid "Connection: %s" msgstr "Forbindelse: %s" -#: ../../include/items.php:4429 +#: ../../include/items.php:4490 msgid "Connection not found." msgstr "Forbindelsen ble ikke funnet." -#: ../../include/items.php:4775 ../../Zotlabs/Module/Cover_photo.php:297 +#: ../../include/items.php:4837 ../../Zotlabs/Module/Cover_photo.php:297 msgid "female" msgstr "kvinne" -#: ../../include/items.php:4776 ../../Zotlabs/Module/Cover_photo.php:298 +#: ../../include/items.php:4838 ../../Zotlabs/Module/Cover_photo.php:298 #, php-format msgid "%1$s updated her %2$s" msgstr "%1$s oppdaterte %2$s sitt" -#: ../../include/items.php:4777 ../../Zotlabs/Module/Cover_photo.php:299 +#: ../../include/items.php:4839 ../../Zotlabs/Module/Cover_photo.php:299 msgid "male" msgstr "mann" -#: ../../include/items.php:4778 ../../Zotlabs/Module/Cover_photo.php:300 +#: ../../include/items.php:4840 ../../Zotlabs/Module/Cover_photo.php:300 #, php-format msgid "%1$s updated his %2$s" msgstr "%1$s oppdaterte %2$s sitt" -#: ../../include/items.php:4780 ../../Zotlabs/Module/Cover_photo.php:302 +#: ../../include/items.php:4842 ../../Zotlabs/Module/Cover_photo.php:302 #, php-format msgid "%1$s updated their %2$s" msgstr "%1$s oppdaterte %2$s deres" -#: ../../include/items.php:4782 +#: ../../include/items.php:4844 msgid "profile photo" msgstr "profilbilde" -#: ../../include/items.php:4979 +#: ../../include/items.php:5171 #, php-format msgid "[Edited %s]" msgstr "" -#: ../../include/items.php:4979 -#, fuzzy +#: ../../include/items.php:5171 msgctxt "edit_activity" msgid "Post" -msgstr "" +msgstr "Innlegg" -#: ../../include/items.php:4979 -#, fuzzy +#: ../../include/items.php:5171 msgctxt "edit_activity" msgid "Comment" -msgstr "" +msgstr "Kommentar" #: ../../include/account.php:38 msgid "The provided email address is not valid" @@ -6800,42 +6712,42 @@ msgstr "Registrering trukket tilbake for %s" msgid "Could not revoke registration for %s" msgstr "" -#: ../../include/account.php:1185 ../../include/account.php:1187 +#: ../../include/account.php:1186 ../../include/account.php:1188 msgid "Click here to upgrade." msgstr "Klikk her for å oppgradere." -#: ../../include/account.php:1193 +#: ../../include/account.php:1194 msgid "This action exceeds the limits set by your subscription plan." msgstr "Denne handlingen går utenfor grensene satt i din abonnementsplan." -#: ../../include/account.php:1198 +#: ../../include/account.php:1199 msgid "This action is not available under your subscription plan." msgstr "Denne handlingen er ikke tilgjengelig i din abonnementsplan." -#: ../../include/account.php:1258 +#: ../../include/account.php:1259 msgid "open" msgstr "" -#: ../../include/account.php:1258 +#: ../../include/account.php:1259 msgid "closed" msgstr "" -#: ../../include/account.php:1265 +#: ../../include/account.php:1266 msgid "Registration is currently" msgstr "" -#: ../../include/account.php:1274 +#: ../../include/account.php:1275 msgid "please come back" msgstr "" -#: ../../include/photo/photo_driver.php:449 +#: ../../include/photo/photo_driver.php:450 #: ../../Zotlabs/Module/Profile_photo.php:167 #: ../../Zotlabs/Module/Profile_photo.php:337 msgid "Profile Photos" msgstr "Profilbilder" #: ../../include/attach.php:273 ../../include/attach.php:324 -#: ../../include/attach.php:419 +#: ../../include/attach.php:426 msgid "Item was not found." msgstr "Elementet ble ikke funnet." @@ -6843,144 +6755,156 @@ msgstr "Elementet ble ikke funnet." msgid "Unknown error." msgstr "" -#: ../../include/attach.php:612 +#: ../../include/attach.php:621 msgid "No source file." msgstr "Ingen kildefil." -#: ../../include/attach.php:634 +#: ../../include/attach.php:643 msgid "Cannot locate file to replace" msgstr "Kan ikke finne filen som skal byttes ut" -#: ../../include/attach.php:653 +#: ../../include/attach.php:662 msgid "Cannot locate file to revise/update" msgstr "Finner ikke filen som skal revideres/oppdateres" -#: ../../include/attach.php:800 +#: ../../include/attach.php:808 #, php-format msgid "File exceeds size limit of %d" msgstr "Filens størrelse overgår grensen på %d" -#: ../../include/attach.php:821 +#: ../../include/attach.php:829 #, php-format msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes." -#: ../../include/attach.php:1009 +#: ../../include/attach.php:1019 msgid "File upload failed. Possible system limit or action terminated." msgstr "" "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt." -#: ../../include/attach.php:1038 +#: ../../include/attach.php:1048 msgid "Stored file could not be verified. Upload failed." msgstr "Lagret fil kunne ikke bekreftes. Opplasting mislyktes." -#: ../../include/attach.php:1110 ../../include/attach.php:1126 +#: ../../include/attach.php:1120 ../../include/attach.php:1136 msgid "Path not available." msgstr "Stien er ikke tilgjengelig." -#: ../../include/attach.php:1174 ../../include/attach.php:1337 +#: ../../include/attach.php:1184 ../../include/attach.php:1349 msgid "Empty pathname" msgstr "Tomt sti-navn" -#: ../../include/attach.php:1200 +#: ../../include/attach.php:1210 msgid "duplicate filename or path" msgstr "duplikat av filnavn eller sti" -#: ../../include/attach.php:1225 +#: ../../include/attach.php:1238 msgid "Path not found." msgstr "Stien ble ikke funnet." -#: ../../include/attach.php:1293 +#: ../../include/attach.php:1305 msgid "mkdir failed." msgstr "mkdir mislyktes." -#: ../../include/attach.php:1297 +#: ../../include/attach.php:1309 msgid "database storage failed." msgstr "databaselagring mislyktes." -#: ../../include/attach.php:1343 +#: ../../include/attach.php:1355 msgid "Empty path" msgstr "Tom sti" -#: ../../include/attach.php:2104 +#: ../../include/attach.php:2147 +#, fuzzy, php-format +#| msgid "Files: shared with me" +msgid "%s shared an %s with you" +msgstr "Filer: delt med meg" + +#: ../../include/attach.php:2147 #, php-format msgid "%s shared a %s with you" msgstr "" +#: ../../include/attach.php:2147 +#, fuzzy +#| msgid "Image" +msgid "image" +msgstr "Bilde" + #: ../../include/bookmarks.php:34 #, php-format msgid "%1$s's bookmarks" msgstr "%1$s sine bokmerker" -#: ../../include/bbcode.php:233 ../../include/bbcode.php:937 -#: ../../include/bbcode.php:1558 ../../include/bbcode.php:1566 +#: ../../include/bbcode.php:233 ../../include/bbcode.php:939 +#: ../../include/bbcode.php:1560 ../../include/bbcode.php:1568 msgid "Image/photo" msgstr "Bilde/fotografi" -#: ../../include/bbcode.php:280 ../../include/bbcode.php:1583 +#: ../../include/bbcode.php:280 ../../include/bbcode.php:1585 msgid "Encrypted content" msgstr "Kryptert innhold" -#: ../../include/bbcode.php:334 +#: ../../include/bbcode.php:336 #, php-format msgid "Install %1$s element %2$s" msgstr "" -#: ../../include/bbcode.php:338 +#: ../../include/bbcode.php:340 #, php-format msgid "" "This post contains an installable %s element, however you lack permissions " "to install it on this site." msgstr "" -"Dette innlegget inneholder det installerbare elementet %s, men du mangler" -" tillatelse til å installere det på dette nettstedet." +"Dette innlegget inneholder det installerbare elementet %s, men du mangler " +"tillatelse til å installere det på dette nettstedet." -#: ../../include/bbcode.php:348 ../../Zotlabs/Module/Impel.php:47 +#: ../../include/bbcode.php:350 ../../Zotlabs/Module/Impel.php:47 msgid "webpage" msgstr "nettside" -#: ../../include/bbcode.php:351 ../../Zotlabs/Module/Impel.php:57 +#: ../../include/bbcode.php:353 ../../Zotlabs/Module/Impel.php:57 msgid "layout" msgstr "layout" -#: ../../include/bbcode.php:354 ../../Zotlabs/Module/Impel.php:52 +#: ../../include/bbcode.php:356 ../../Zotlabs/Module/Impel.php:52 msgid "block" msgstr "byggekloss" -#: ../../include/bbcode.php:357 ../../Zotlabs/Module/Impel.php:64 +#: ../../include/bbcode.php:359 ../../Zotlabs/Module/Impel.php:64 msgid "menu" msgstr "meny" -#: ../../include/bbcode.php:560 +#: ../../include/bbcode.php:562 msgid "card" msgstr "" -#: ../../include/bbcode.php:562 +#: ../../include/bbcode.php:564 msgid "article" msgstr "" -#: ../../include/bbcode.php:568 ../../include/markdown.php:203 +#: ../../include/bbcode.php:570 ../../include/markdown.php:206 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s skrev følgende %2$s %3$s" -#: ../../include/bbcode.php:645 ../../include/bbcode.php:653 +#: ../../include/bbcode.php:647 ../../include/bbcode.php:655 msgid "Click to open/close" msgstr "Klikk for å åpne/lukke" -#: ../../include/bbcode.php:653 ../../include/markdown.php:256 +#: ../../include/bbcode.php:655 ../../include/markdown.php:259 msgid "spoiler" msgstr "" -#: ../../include/bbcode.php:666 +#: ../../include/bbcode.php:668 msgid "View article" msgstr "" -#: ../../include/bbcode.php:666 +#: ../../include/bbcode.php:668 msgid "View summary" msgstr "" -#: ../../include/bbcode.php:1534 +#: ../../include/bbcode.php:1536 msgid "$1 wrote:" msgstr "$1 skrev:" @@ -7014,8 +6938,8 @@ msgstr "Reservert kallenavn. Vennligst velg et annet." msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -"Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk" -" på dette nettstedet." +"Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk " +"på dette nettstedet." #: ../../include/channel.php:292 msgid "Unable to retrieve created identity" @@ -7033,7 +6957,7 @@ msgstr "" msgid "Requested channel is not available" msgstr "" -#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:745 +#: ../../include/channel.php:1523 ../../Zotlabs/Module/Profiles.php:744 msgid "Change profile photo" msgstr "Endre profilbilde" @@ -7041,7 +6965,7 @@ msgstr "Endre profilbilde" msgid "Create New Profile" msgstr "Lag ny profil" -#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:842 +#: ../../include/channel.php:1549 ../../Zotlabs/Module/Profiles.php:841 msgid "Profile Image" msgstr "Profilbilde" @@ -7049,168 +6973,172 @@ msgstr "Profilbilde" msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:742 -#: ../../Zotlabs/Module/Profiles.php:846 +#: ../../include/channel.php:1553 ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:845 msgid "Edit visibility" msgstr "Endre synlighet" -#: ../../include/channel.php:1629 ../../include/channel.php:1755 +#: ../../include/channel.php:1635 ../../include/channel.php:1763 msgid "Gender:" msgstr "Kjønn:" -#: ../../include/channel.php:1630 ../../include/channel.php:1799 +#: ../../include/channel.php:1636 ../../include/channel.php:1807 msgid "Status:" msgstr "Status:" -#: ../../include/channel.php:1631 ../../include/channel.php:1823 +#: ../../include/channel.php:1637 ../../include/channel.php:1831 msgid "Homepage:" msgstr "Hjemmeside:" -#: ../../include/channel.php:1632 ../../include/channel.php:1825 -#: ../../Zotlabs/Module/Directory.php:366 +#: ../../include/channel.php:1638 ../../include/channel.php:1833 +#: ../../Zotlabs/Module/Directory.php:368 msgid "Hometown:" msgstr "Hjemby:" -#: ../../include/channel.php:1633 +#: ../../include/channel.php:1639 msgid "Online Now" msgstr "Online nå" -#: ../../include/channel.php:1683 +#: ../../include/channel.php:1688 +msgid "This channel has not added a profile description yet" +msgstr "" + +#: ../../include/channel.php:1690 msgid "Change your profile photo" msgstr "" -#: ../../include/channel.php:1714 +#: ../../include/channel.php:1722 msgid "Trans" msgstr "" -#: ../../include/channel.php:1753 +#: ../../include/channel.php:1761 msgid "Full Name:" msgstr "Fullt navn:" -#: ../../include/channel.php:1760 +#: ../../include/channel.php:1768 msgid "Like this channel" msgstr "Lik denne kanalen" -#: ../../include/channel.php:1784 +#: ../../include/channel.php:1792 msgid "j F, Y" msgstr "j F, Y" -#: ../../include/channel.php:1785 +#: ../../include/channel.php:1793 msgid "j F" msgstr "j F" -#: ../../include/channel.php:1792 +#: ../../include/channel.php:1800 msgid "Birthday:" msgstr "Fødselsdag:" -#: ../../include/channel.php:1796 ../../Zotlabs/Module/Directory.php:348 +#: ../../include/channel.php:1804 ../../Zotlabs/Module/Directory.php:349 msgid "Age:" msgstr "Alder:" -#: ../../include/channel.php:1805 +#: ../../include/channel.php:1813 #, php-format msgid "for %1$d %2$s" msgstr "for %1$d %2$s" -#: ../../include/channel.php:1817 +#: ../../include/channel.php:1825 msgid "Tags:" msgstr "Merkelapper:" -#: ../../include/channel.php:1821 +#: ../../include/channel.php:1829 msgid "Sexual Preference:" msgstr "Seksuell preferanse:" -#: ../../include/channel.php:1827 +#: ../../include/channel.php:1835 msgid "Political Views:" msgstr "Politiske synspunkter:" -#: ../../include/channel.php:1829 +#: ../../include/channel.php:1837 msgid "Religion:" msgstr "Religion:" -#: ../../include/channel.php:1831 ../../Zotlabs/Module/Directory.php:368 +#: ../../include/channel.php:1839 ../../Zotlabs/Module/Directory.php:370 msgid "About:" msgstr "Om:" -#: ../../include/channel.php:1833 +#: ../../include/channel.php:1841 msgid "Hobbies/Interests:" msgstr "Hobbyer/interesser:" -#: ../../include/channel.php:1835 +#: ../../include/channel.php:1843 msgid "Likes:" msgstr "Liker:" -#: ../../include/channel.php:1837 +#: ../../include/channel.php:1845 msgid "Dislikes:" msgstr "Misliker:" -#: ../../include/channel.php:1839 +#: ../../include/channel.php:1847 msgid "Contact information and Social Networks:" msgstr "Kontaktinformasjon og sosiale nettverk:" -#: ../../include/channel.php:1841 +#: ../../include/channel.php:1849 msgid "My other channels:" msgstr "Mine andre kanaler:" -#: ../../include/channel.php:1843 +#: ../../include/channel.php:1851 msgid "Musical interests:" msgstr "Musikkinteresse:" -#: ../../include/channel.php:1845 +#: ../../include/channel.php:1853 msgid "Books, literature:" msgstr "Bøker, litteratur:" -#: ../../include/channel.php:1847 +#: ../../include/channel.php:1855 msgid "Television:" msgstr "TV:" -#: ../../include/channel.php:1849 +#: ../../include/channel.php:1857 msgid "Film/dance/culture/entertainment:" msgstr "Film/dans/kultur/underholdning:" -#: ../../include/channel.php:1851 +#: ../../include/channel.php:1859 msgid "Love/Romance:" msgstr "Kjærlighet/romantikk:" -#: ../../include/channel.php:1853 +#: ../../include/channel.php:1861 msgid "Work/employment:" msgstr "Arbeid/sysselsetting:" -#: ../../include/channel.php:1855 +#: ../../include/channel.php:1863 msgid "School/education:" msgstr "Skole/utdannelse:" -#: ../../include/channel.php:1876 ../../Zotlabs/Module/Profperm.php:113 -#: ../../Zotlabs/Lib/Apps.php:366 +#: ../../include/channel.php:1884 ../../Zotlabs/Module/Profperm.php:113 +#: ../../Zotlabs/Lib/Apps.php:367 msgid "Profile" msgstr "Profil" -#: ../../include/channel.php:1878 +#: ../../include/channel.php:1886 msgid "Like this thing" msgstr "Lik denne tingen" -#: ../../include/channel.php:1879 +#: ../../include/channel.php:1887 msgid "Export" msgstr "Eksport" -#: ../../include/channel.php:2332 ../../Zotlabs/Module/Cover_photo.php:304 +#: ../../include/channel.php:2340 ../../Zotlabs/Module/Cover_photo.php:304 msgid "cover photo" msgstr "forsidebilde" -#: ../../include/channel.php:2607 ../../Zotlabs/Module/Rmagic.php:96 -#: ../../boot.php:1749 +#: ../../include/channel.php:2615 ../../Zotlabs/Module/Rmagic.php:96 +#: ../../boot.php:1747 msgid "Remote Authentication" msgstr "Fjernautentisering" -#: ../../include/channel.php:2608 ../../Zotlabs/Module/Rmagic.php:97 +#: ../../include/channel.php:2616 ../../Zotlabs/Module/Rmagic.php:97 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)" -#: ../../include/channel.php:2609 ../../Zotlabs/Module/Rmagic.php:98 +#: ../../include/channel.php:2617 ../../Zotlabs/Module/Rmagic.php:98 msgid "Authenticate" msgstr "Autentiser" -#: ../../include/channel.php:2767 ../../Zotlabs/Module/Admin/Accounts.php:184 +#: ../../include/channel.php:2775 ../../Zotlabs/Module/Admin/Accounts.php:184 #, php-format msgid "Account '%s' deleted" msgstr "Kontoen '%s' slettet" @@ -7236,18 +7164,18 @@ msgid "Forums" msgstr "Forum" #: ../../include/acl_selectors.php:136 -#: ../../Zotlabs/Module/Settings/Privacy.php:56 +#: ../../Zotlabs/Module/Settings/Privacy.php:65 #: ../../Zotlabs/Lib/PermissionDescription.php:107 msgid "Only me" -msgstr "" +msgstr "Kun meg" #: ../../include/acl_selectors.php:143 msgid "Share with" -msgstr "" +msgstr "Del med" #: ../../include/acl_selectors.php:144 msgid "Custom selection" -msgstr "" +msgstr "Tilpasset utvalg" #: ../../include/acl_selectors.php:146 msgid "" @@ -7263,34 +7191,43 @@ msgstr "" msgid "Don't allow" msgstr "" +#: ../../include/acl_selectors.php:156 ../../Zotlabs/Widget/Pinned.php:163 +#: ../../Zotlabs/Module/Photos.php:1265 ../../Zotlabs/Lib/ThreadItem.php:496 +#: ../../Zotlabs/Storage/Browser.php:414 +msgid "Close" +msgstr "Lukk" + #: ../../include/acl_selectors.php:181 #, php-format msgid "" "Post permissions %s cannot be changed %s after a post is shared.
These " "permissions set who is allowed to view the post." msgstr "" +"Tillatelsene til innlegget %s kan ikke endres %s etter at innlegget er delt." +"
Disse tillatelsene avgjør hvem som kan se innlegget." -#: ../../include/oembed.php:154 +#: ../../include/oembed.php:155 msgid "View PDF" msgstr "" -#: ../../include/oembed.php:386 +#: ../../include/oembed.php:391 msgid " by " -msgstr "" +msgstr " av " -#: ../../include/oembed.php:387 +#: ../../include/oembed.php:392 +#, fuzzy msgid " on " -msgstr "" +msgstr "På" -#: ../../include/oembed.php:416 +#: ../../include/oembed.php:421 msgid "Embedded content" msgstr "Innebygget innhold" -#: ../../include/oembed.php:425 +#: ../../include/oembed.php:430 msgid "Embedding disabled" msgstr "Innbygging avskrudd" -#: ../../include/zid.php:408 +#: ../../include/zid.php:410 #, php-format msgid "OpenWebAuth: %1$s welcomes %2$s" msgstr "OpenWebAuth: %1$s ønsker %2$s velkommen" @@ -7327,7 +7264,7 @@ msgstr "" msgid "Add new guest" msgstr "" -#: ../../Zotlabs/Widget/Tokens.php:49 ../../Zotlabs/Module/Lockview.php:226 +#: ../../Zotlabs/Widget/Tokens.php:49 ../../Zotlabs/Module/Lockview.php:236 msgid "Guest access" msgstr "" @@ -7336,22 +7273,22 @@ msgid "Archives" msgstr "Arkiv" #: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:91 -#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:793 -#: ../../Zotlabs/Module/Photos.php:1337 +#: ../../Zotlabs/Module/Embedphotos.php:171 ../../Zotlabs/Module/Photos.php:782 +#: ../../Zotlabs/Module/Photos.php:1323 msgid "View Photo" msgstr "Vis foto" #: ../../Zotlabs/Widget/Album.php:101 ../../Zotlabs/Widget/Portfolio.php:112 -#: ../../Zotlabs/Module/Embedphotos.php:187 ../../Zotlabs/Module/Photos.php:824 +#: ../../Zotlabs/Module/Embedphotos.php:187 ../../Zotlabs/Module/Photos.php:813 msgid "Edit Album" msgstr "Endre album" -#: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Cdav.php:150 -#: ../../Zotlabs/Widget/Cdav.php:186 ../../Zotlabs/Widget/Portfolio.php:114 +#: ../../Zotlabs/Widget/Album.php:103 ../../Zotlabs/Widget/Cdav.php:152 +#: ../../Zotlabs/Widget/Cdav.php:188 ../../Zotlabs/Widget/Portfolio.php:114 #: ../../Zotlabs/Module/Embedphotos.php:189 #: ../../Zotlabs/Module/Profile_photo.php:547 -#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:692 -#: ../../Zotlabs/Storage/Browser.php:540 +#: ../../Zotlabs/Module/Cover_photo.php:423 ../../Zotlabs/Module/Photos.php:681 +#: ../../Zotlabs/Storage/Browser.php:546 msgid "Upload" msgstr "Last opp" @@ -7363,82 +7300,94 @@ msgstr "Oppgaver" msgid "Chat Members" msgstr "" +#: ../../Zotlabs/Widget/Channel_activities.php:29 +#: ../../Zotlabs/Module/Go.php:27 +msgid "Welcome" +msgstr "Velkommen" + +#: ../../Zotlabs/Widget/Channel_activities.php:46 +#, fuzzy +#| msgid "Recent activity" +msgid "No recent activities" +msgstr "Nylig aktivitet" + #: ../../Zotlabs/Widget/Channel_activities.php:214 msgctxt "noun" msgid "new connection" msgid_plural "new connections" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ny forbindelse" +msgstr[1] "nye forbindelser" #: ../../Zotlabs/Widget/Channel_activities.php:220 msgctxt "noun" msgid "notice" msgid_plural "notices" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "varsel" +msgstr[1] "varsel" -#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:214 +#: ../../Zotlabs/Widget/Pinned.php:75 ../../Zotlabs/Lib/ThreadItem.php:206 msgid "I will attend" msgstr "Jeg vil delta" -#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:214 +#: ../../Zotlabs/Widget/Pinned.php:75 ../../Zotlabs/Lib/ThreadItem.php:206 msgid "I will not attend" msgstr "Jeg deltar ikke" -#: ../../Zotlabs/Widget/Pinned.php:73 ../../Zotlabs/Lib/ThreadItem.php:214 +#: ../../Zotlabs/Widget/Pinned.php:75 ../../Zotlabs/Lib/ThreadItem.php:206 msgid "I might attend" msgstr "Jeg vil kanskje delta" -#: ../../Zotlabs/Widget/Pinned.php:84 +#: ../../Zotlabs/Widget/Pinned.php:86 msgid "I agree" msgstr "Jeg er enig" -#: ../../Zotlabs/Widget/Pinned.php:84 +#: ../../Zotlabs/Widget/Pinned.php:86 msgid "I disagree" msgstr "Jeg er uenig" -#: ../../Zotlabs/Widget/Pinned.php:84 +#: ../../Zotlabs/Widget/Pinned.php:86 msgid "I abstain" msgstr "Jeg avstår" -#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:331 +#: ../../Zotlabs/Widget/Pinned.php:104 ../../Zotlabs/Lib/ThreadItem.php:324 msgid "Share This" msgstr "Del dette" -#: ../../Zotlabs/Widget/Pinned.php:102 ../../Zotlabs/Lib/ThreadItem.php:331 +#: ../../Zotlabs/Widget/Pinned.php:104 ../../Zotlabs/Lib/ThreadItem.php:324 msgid "share" msgstr "del" -#: ../../Zotlabs/Widget/Pinned.php:125 ../../Zotlabs/Widget/Pinned.php:126 +#: ../../Zotlabs/Widget/Pinned.php:127 ../../Zotlabs/Widget/Pinned.php:128 #, php-format msgid "View %s's profile - %s" msgstr "Vis %s sin profil - %s" -#: ../../Zotlabs/Widget/Pinned.php:130 ../../Zotlabs/Widget/Messages.php:104 -#: ../../Zotlabs/Lib/ThreadItem.php:421 +#: ../../Zotlabs/Widget/Pinned.php:132 ../../Zotlabs/Widget/Messages.php:146 +#: ../../Zotlabs/Lib/ThreadItem.php:414 msgid "via" msgstr "via" -#: ../../Zotlabs/Widget/Pinned.php:144 ../../Zotlabs/Lib/ThreadItem.php:452 +#: ../../Zotlabs/Widget/Pinned.php:146 ../../Zotlabs/Lib/ThreadItem.php:445 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:145 ../../Zotlabs/Lib/ThreadItem.php:454 +#: ../../Zotlabs/Widget/Pinned.php:147 ../../Zotlabs/Lib/ThreadItem.php:447 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:157 ../../Zotlabs/Lib/ThreadItem.php:478 +#: ../../Zotlabs/Widget/Pinned.php:159 ../../Zotlabs/Lib/ThreadItem.php:471 msgid "Pinned post" msgstr "" -#: ../../Zotlabs/Widget/Pinned.php:159 +#: ../../Zotlabs/Widget/Pinned.php:161 msgid "Don't show" msgstr "Ikke vis" #: ../../Zotlabs/Widget/Activity.php:55 +#, fuzzy msgctxt "widget" msgid "Activity" -msgstr "" +msgstr "aktivitet" #: ../../Zotlabs/Widget/Cdav.php:41 msgid "Select Channel" @@ -7452,86 +7401,86 @@ msgstr "" msgid "Read-only" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:131 +#: ../../Zotlabs/Widget/Cdav.php:133 msgid "Channel Calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:133 ../../Zotlabs/Widget/Cdav.php:147 -#: ../../Zotlabs/Module/Cdav.php:1054 +#: ../../Zotlabs/Widget/Cdav.php:135 ../../Zotlabs/Widget/Cdav.php:149 +#: ../../Zotlabs/Module/Cdav.php:1046 msgid "CalDAV Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:135 +#: ../../Zotlabs/Widget/Cdav.php:137 msgid "Shared CalDAV Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:139 +#: ../../Zotlabs/Widget/Cdav.php:141 msgid "Share this calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:141 +#: ../../Zotlabs/Widget/Cdav.php:143 msgid "Calendar name and color" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:143 +#: ../../Zotlabs/Widget/Cdav.php:145 msgid "Create new CalDAV calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:144 ../../Zotlabs/Widget/Cdav.php:182 -#: ../../Zotlabs/Module/Cdav.php:1058 ../../Zotlabs/Module/Cdav.php:1387 -#: ../../Zotlabs/Module/Webpages.php:251 -#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Widget/Cdav.php:146 ../../Zotlabs/Widget/Cdav.php:184 +#: ../../Zotlabs/Module/Cdav.php:1050 ../../Zotlabs/Module/Cdav.php:1379 +#: ../../Zotlabs/Module/Webpages.php:249 +#: ../../Zotlabs/Module/New_channel.php:189 ../../Zotlabs/Module/Blocks.php:157 #: ../../Zotlabs/Module/Menu.php:182 ../../Zotlabs/Module/Connedit.php:747 -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Storage/Browser.php:365 -#: ../../Zotlabs/Storage/Browser.php:538 +#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Storage/Browser.php:368 +#: ../../Zotlabs/Storage/Browser.php:544 msgid "Create" msgstr "Lag" -#: ../../Zotlabs/Widget/Cdav.php:145 +#: ../../Zotlabs/Widget/Cdav.php:147 msgid "Calendar Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:146 +#: ../../Zotlabs/Widget/Cdav.php:148 msgid "Calendar Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:147 ../../Zotlabs/Module/Cdav.php:1054 +#: ../../Zotlabs/Widget/Cdav.php:149 ../../Zotlabs/Module/Cdav.php:1046 msgid "Channel Calendars" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:148 +#: ../../Zotlabs/Widget/Cdav.php:150 msgid "Import calendar" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:149 +#: ../../Zotlabs/Widget/Cdav.php:151 msgid "Select a calendar to import to" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:176 +#: ../../Zotlabs/Widget/Cdav.php:178 msgid "Addressbooks" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:178 +#: ../../Zotlabs/Widget/Cdav.php:180 msgid "Addressbook name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:180 +#: ../../Zotlabs/Widget/Cdav.php:182 msgid "Create new addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:181 +#: ../../Zotlabs/Widget/Cdav.php:183 msgid "Addressbook Name" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:183 +#: ../../Zotlabs/Widget/Cdav.php:185 msgid "Addressbook Tools" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:184 +#: ../../Zotlabs/Widget/Cdav.php:186 msgid "Import addressbook" msgstr "" -#: ../../Zotlabs/Widget/Cdav.php:185 +#: ../../Zotlabs/Widget/Cdav.php:187 msgid "Select an addressbook to import to" msgstr "" @@ -7553,7 +7502,7 @@ msgstr "Kanalinnstillinger" #: ../../Zotlabs/Widget/Settings_menu.php:49 msgid "Privacy settings" -msgstr "" +msgstr "Personverninnstillinger" #: ../../Zotlabs/Widget/Settings_menu.php:56 msgid "Display settings" @@ -7589,7 +7538,7 @@ msgstr "" #: ../../Zotlabs/Widget/Hq_controls.php:23 msgid "Toggle post editor" -msgstr "" +msgstr "Vis redigering av innlegg" #: ../../Zotlabs/Widget/Hq_controls.php:33 msgid "Toggle personal notes" @@ -7599,16 +7548,16 @@ msgstr "" msgid "Channel activities" msgstr "" -#: ../../Zotlabs/Widget/Permcats.php:42 +#: ../../Zotlabs/Widget/Permcats.php:43 msgid "Add new role" msgstr "" -#: ../../Zotlabs/Widget/Permcats.php:93 +#: ../../Zotlabs/Widget/Permcats.php:92 #: ../../Zotlabs/Module/Contactedit.php:409 msgid "Contact roles" msgstr "" -#: ../../Zotlabs/Widget/Permcats.php:94 +#: ../../Zotlabs/Widget/Permcats.php:93 msgid "Role members" msgstr "" @@ -7627,20 +7576,21 @@ msgstr "Nettsted" msgid "Accounts" msgstr "Kontoer" -#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Widget/Admin.php:65 +#: ../../Zotlabs/Widget/Admin.php:28 ../../Zotlabs/Widget/Admin.php:66 msgid "Member registrations waiting for confirmation" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:30 ../../Zotlabs/Module/Admin/Security.php:99 +#: ../../Zotlabs/Widget/Admin.php:30 +#: ../../Zotlabs/Module/Admin/Security.php:106 msgid "Security" msgstr "Sikkerhet" -#: ../../Zotlabs/Widget/Admin.php:31 ../../Zotlabs/Lib/Apps.php:362 +#: ../../Zotlabs/Widget/Admin.php:31 ../../Zotlabs/Lib/Apps.php:363 msgid "Features" msgstr "Funksjoner" -#: ../../Zotlabs/Widget/Admin.php:32 ../../Zotlabs/Module/Admin/Addons.php:343 -#: ../../Zotlabs/Module/Admin/Addons.php:441 +#: ../../Zotlabs/Widget/Admin.php:32 ../../Zotlabs/Module/Admin/Addons.php:346 +#: ../../Zotlabs/Module/Admin/Addons.php:444 msgid "Addons" msgstr "Tillegg" @@ -7653,20 +7603,24 @@ msgstr "Utseende" msgid "Inspect queue" msgstr "Inspiser kø" -#: ../../Zotlabs/Widget/Admin.php:35 ../../Zotlabs/Module/Admin/Profs.php:168 +#: ../../Zotlabs/Widget/Admin.php:35 +msgid "Queueworker" +msgstr "" + +#: ../../Zotlabs/Widget/Admin.php:36 ../../Zotlabs/Module/Admin/Profs.php:168 msgid "Profile Fields" msgstr "Profilfelter" -#: ../../Zotlabs/Widget/Admin.php:36 +#: ../../Zotlabs/Widget/Admin.php:37 msgid "DB updates" msgstr "Databaseoppdateringer" -#: ../../Zotlabs/Widget/Admin.php:53 ../../Zotlabs/Widget/Admin.php:63 +#: ../../Zotlabs/Widget/Admin.php:54 ../../Zotlabs/Widget/Admin.php:64 #: ../../Zotlabs/Module/Admin/Logs.php:83 msgid "Logs" msgstr "Logger" -#: ../../Zotlabs/Widget/Admin.php:61 +#: ../../Zotlabs/Widget/Admin.php:62 msgid "Addon Features" msgstr "" @@ -7677,7 +7631,7 @@ msgstr "Direktemeldinger" #: ../../Zotlabs/Widget/Activity_filter.php:48 msgid "Show direct (private) messages" -msgstr "" +msgstr "Vis direktemeldinger (private meldinger)" #: ../../Zotlabs/Widget/Activity_filter.php:53 #: ../../Zotlabs/Widget/Notifications.php:81 @@ -7690,11 +7644,11 @@ msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:63 msgid "Polls" -msgstr "" +msgstr "Spørreskjema" #: ../../Zotlabs/Widget/Activity_filter.php:67 msgid "Show posts that include polls" -msgstr "" +msgstr "Vis innlegg som inneholder spørreskjema" #: ../../Zotlabs/Widget/Activity_filter.php:90 #, php-format @@ -7744,7 +7698,7 @@ msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:224 msgid "Filter by name" -msgstr "" +msgstr "Filtrer etter navn" #: ../../Zotlabs/Widget/Activity_filter.php:239 msgid "Remove active filter" @@ -7752,7 +7706,7 @@ msgstr "" #: ../../Zotlabs/Widget/Activity_filter.php:255 msgid "Stream Filters" -msgstr "" +msgstr "Filtere for tidslinjen" #: ../../Zotlabs/Widget/Appstore.php:16 msgid "App Collections" @@ -7762,7 +7716,7 @@ msgstr "" msgid "Installed apps" msgstr "" -#: ../../Zotlabs/Widget/Appstore.php:19 ../../Zotlabs/Module/Apps.php:50 +#: ../../Zotlabs/Widget/Appstore.php:19 ../../Zotlabs/Module/Apps.php:51 msgid "Available Apps" msgstr "" @@ -7772,8 +7726,9 @@ msgstr "" #: ../../Zotlabs/Widget/Privacygroups.php:54 #: ../../Zotlabs/Module/Contactedit.php:443 +#, fuzzy msgid "Privacy groups" -msgstr "" +msgstr "Personverngrupper" #: ../../Zotlabs/Widget/Rating.php:57 msgid "Rating Tools" @@ -7787,11 +7742,11 @@ msgstr "Vurder meg" msgid "View Ratings" msgstr "Vis vurderinger" -#: ../../Zotlabs/Widget/Cover_photo.php:71 +#: ../../Zotlabs/Widget/Cover_photo.php:74 msgid "Click to show more" msgstr "" -#: ../../Zotlabs/Widget/Follow.php:27 ../../Zotlabs/Module/Connections.php:368 +#: ../../Zotlabs/Widget/Follow.php:27 ../../Zotlabs/Module/Connections.php:377 #, php-format msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "Du har %1$.0f av %2$.0f tillate forbindelser." @@ -7828,8 +7783,21 @@ msgstr "Varsel" #: ../../Zotlabs/Widget/Messages.php:37 msgid "No messages" +msgstr "Ingen meldinger" + +#: ../../Zotlabs/Widget/Messages.php:38 +msgid "Unseen" msgstr "" +#: ../../Zotlabs/Widget/Messages.php:39 +#: ../../Zotlabs/Widget/Notifications.php:34 +#: ../../Zotlabs/Widget/Notifications.php:54 +#: ../../Zotlabs/Widget/Notifications.php:73 +#: ../../Zotlabs/Widget/Notifications.php:134 +#: ../../Zotlabs/Widget/Notifications.php:165 +msgid "Filter by name or address" +msgstr "Filtrer etter navn eller adresse" + #: ../../Zotlabs/Widget/Newmember.php:36 msgid "Profile Creation" msgstr "Oppretting av profil" @@ -7965,14 +7933,6 @@ msgstr "" msgid "Show new posts only" msgstr "" -#: ../../Zotlabs/Widget/Notifications.php:34 -#: ../../Zotlabs/Widget/Notifications.php:54 -#: ../../Zotlabs/Widget/Notifications.php:73 -#: ../../Zotlabs/Widget/Notifications.php:134 -#: ../../Zotlabs/Widget/Notifications.php:165 -msgid "Filter by name or address" -msgstr "" - #: ../../Zotlabs/Widget/Notifications.php:44 msgid "New home activity notifications" msgstr "" @@ -8007,7 +7967,7 @@ msgid "Mark all events seen" msgstr "Merk alle hendelser som sett" #: ../../Zotlabs/Widget/Notifications.php:96 -#: ../../Zotlabs/Module/Connections.php:165 +#: ../../Zotlabs/Module/Connections.php:168 msgid "New Connections" msgstr "Nye forbindelser" @@ -8040,7 +8000,7 @@ msgid "New registrations notifications" msgstr "" #: ../../Zotlabs/Widget/Notifications.php:154 -#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:379 +#: ../../Zotlabs/Module/Pubstream.php:100 ../../Zotlabs/Lib/Apps.php:380 msgid "Public Stream" msgstr "" @@ -8084,7 +8044,7 @@ msgstr "" msgid "Select a role for this guest" msgstr "" -#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:373 +#: ../../Zotlabs/Module/Tokens.php:288 ../../Zotlabs/Lib/Apps.php:374 msgid "Guest Access" msgstr "" @@ -8114,31 +8074,31 @@ msgstr "" msgid "Can not move folder \"%s\" into itself." msgstr "" -#: ../../Zotlabs/Module/Network.php:106 +#: ../../Zotlabs/Module/Network.php:108 msgid "No such group" msgstr "Gruppen finnes ikke" -#: ../../Zotlabs/Module/Network.php:158 +#: ../../Zotlabs/Module/Network.php:160 msgid "No such channel" msgstr "Ingen slik kanal" -#: ../../Zotlabs/Module/Network.php:170 ../../Zotlabs/Module/Channel.php:232 +#: ../../Zotlabs/Module/Network.php:172 ../../Zotlabs/Module/Channel.php:234 msgid "Search Results For:" msgstr "Søkeresultat for:" -#: ../../Zotlabs/Module/Network.php:211 ../../Zotlabs/Module/Channel.php:267 -#: ../../Zotlabs/Module/Hq.php:101 ../../Zotlabs/Module/Pubstream.php:90 -#: ../../Zotlabs/Module/Display.php:87 +#: ../../Zotlabs/Module/Network.php:213 ../../Zotlabs/Module/Channel.php:267 +#: ../../Zotlabs/Module/Hq.php:103 ../../Zotlabs/Module/Pubstream.php:89 +#: ../../Zotlabs/Module/Display.php:89 msgid "Reset form" -msgstr "" +msgstr "Nullstill skjema" -#: ../../Zotlabs/Module/Network.php:246 +#: ../../Zotlabs/Module/Network.php:248 msgid "Privacy group is empty" msgstr "Personverngruppen er tom" -#: ../../Zotlabs/Module/Network.php:256 +#: ../../Zotlabs/Module/Network.php:258 msgid "Privacy group: " -msgstr "Personverngruppe:" +msgstr "Personverngruppe: " #: ../../Zotlabs/Module/Import_items.php:50 msgid "Not a zip file or zip file corrupted." @@ -8151,8 +8111,8 @@ msgstr "Importer elementer" #: ../../Zotlabs/Module/Import_items.php:122 msgid "Use this form to import existing posts and content from an export file." msgstr "" -"Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en" -" eksportfil." +"Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en " +"eksportfil." #: ../../Zotlabs/Module/Import_items.php:123 #: ../../Zotlabs/Module/Import.php:594 @@ -8229,9 +8189,9 @@ msgid "" "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -"Bruk dette skjemaet for å importere en eksisterende kanal fra en annen" -" tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben" -" via nettverket eller ved å bruke en eksportfil." +"Bruk dette skjemaet for å importere en eksisterende kanal fra en annen " +"tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben " +"via nettverket eller ved å bruke en eksportfil." #: ../../Zotlabs/Module/Import.php:595 msgid "Or provide the old server/hub details" @@ -8260,11 +8220,11 @@ msgid "" "able to post from either location, but only one can be marked as the primary " "location for files, photos, and media." msgstr "" -"Enten du tar det ene eller det andre valget, vennligst angi om du vil at" -" denne hubben skal være din nye primære adresse, eller om din gamle" -" plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene" -" eller den andre plasseringen, men bare en av dem kan markeres som den" -" primære plasseringen for filer, bilder og media." +"Enten du tar det ene eller det andre valget, vennligst angi om du vil at " +"denne hubben skal være din nye primære adresse, eller om din gamle " +"plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene " +"eller den andre plasseringen, men bare en av dem kan markeres som den " +"primære plasseringen for filer, bilder og media." #: ../../Zotlabs/Module/Import.php:604 msgid "Make this hub my primary location" @@ -8289,11 +8249,10 @@ msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." msgstr "" -"Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette" -" skjemaet bare en gang og la siden være åpen inntil den er ferdig." +"Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette " +"skjemaet bare en gang og la siden være åpen inntil den er ferdig." -#: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Channel.php:44 -#: ../../Zotlabs/Module/Chat.php:29 +#: ../../Zotlabs/Module/Ochannel.php:32 ../../Zotlabs/Module/Chat.php:29 msgid "You must be logged in to see this page." msgstr "Du må være innloegget for å se denne siden." @@ -8455,16 +8414,16 @@ msgstr "" #: ../../Zotlabs/Module/Search.php:23 #: ../../Zotlabs/Module/Viewconnections.php:23 #: ../../Zotlabs/Module/Display.php:28 ../../Zotlabs/Module/Directory.php:72 -#: ../../Zotlabs/Module/Directory.php:77 ../../Zotlabs/Module/Photos.php:523 +#: ../../Zotlabs/Module/Directory.php:77 ../../Zotlabs/Module/Photos.php:511 msgid "Public access denied." msgstr "Offentlig tilgang avvist." -#: ../../Zotlabs/Module/Search.php:255 +#: ../../Zotlabs/Module/Search.php:250 #, php-format msgid "Items tagged with: %s" msgstr "Elementer merket med: %s" -#: ../../Zotlabs/Module/Search.php:257 +#: ../../Zotlabs/Module/Search.php:252 #, php-format msgid "Search results for: %s" msgstr "Søkeresultater for: %s" @@ -8482,8 +8441,8 @@ msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -"Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens" -" skyldes SSL-sertifikatet eller DNS." +"Fikk ikke kontakt med det angitte nettstedets URL. Problemet kan muligens " +"skyldes SSL-sertifikatet eller DNS." #: ../../Zotlabs/Module/Setup.php:194 msgid "Could not create table." @@ -8498,8 +8457,8 @@ msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -"Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke" -" en databaseklient." +"Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke " +"en databaseklient." #: ../../Zotlabs/Module/Setup.php:207 ../../Zotlabs/Module/Setup.php:271 #: ../../Zotlabs/Module/Setup.php:778 @@ -8510,8 +8469,8 @@ msgstr "Vennligst les filen \"install/INSTALL.txt\"." msgid "System check" msgstr "Systemsjekk" -#: ../../Zotlabs/Module/Setup.php:272 ../../Zotlabs/Module/Cdav.php:1035 -#: ../../Zotlabs/Module/Cal.php:204 ../../Zotlabs/Module/Photos.php:962 +#: ../../Zotlabs/Module/Setup.php:272 ../../Zotlabs/Module/Cdav.php:1027 +#: ../../Zotlabs/Module/Cal.php:200 ../../Zotlabs/Module/Photos.php:951 msgid "Next" msgstr "Neste" @@ -8535,16 +8494,16 @@ msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -"Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du" -" har spørsmål om disse innstillingene." +"Vennligst kontakt din nettstedstilbyder eller nettstedsadministrator hvis du " +"har spørsmål om disse innstillingene." #: ../../Zotlabs/Module/Setup.php:297 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -"Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes," -" vennligst lag den før du fortsetter." +"Databasen du oppgir nedenfor må finnes på forhånd. Hvis den ikke finnes, " +"vennligst lag den før du fortsetter." #: ../../Zotlabs/Module/Setup.php:301 msgid "Database Server Name" @@ -8587,8 +8546,8 @@ msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -"Din konto sin e-postadresse må være lik denne for å kunne bruke" -" web-administrasjonspanelet." +"Din konto sin e-postadresse må være lik denne for å kunne bruke web-" +"administrasjonspanelet." #: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 msgid "Website URL" @@ -8623,8 +8582,8 @@ msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron." msgstr "" -"Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så" -" vil du ikke kunne kjøre bakgrunnshenting via cron." +"Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så " +"vil du ikke kunne kjøre bakgrunnshenting via cron." #: ../../Zotlabs/Module/Setup.php:413 msgid "PHP executable path" @@ -8635,8 +8594,8 @@ msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -"Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å" -" fortsette installasjonen." +"Skriv full sti til kjørefilen for PHP. Du kan la denne stå blank for å " +"fortsette installasjonen." #: ../../Zotlabs/Module/Setup.php:418 msgid "Command line PHP" @@ -8653,8 +8612,8 @@ msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -"Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\"" -" påskrudd." +"Kommandolinjeversjonen av PHP på ditt system har ikke \"register_argc_argv\" " +"påskrudd." #: ../../Zotlabs/Module/Setup.php:433 msgid "This is required for message delivery to work." @@ -8676,9 +8635,9 @@ msgid "" "Your max allowed total upload size is set to %s. Maximum size of one file to " "upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -"Den største totale opplastingsstørrelsen du er tillatt er satt til %s." -" Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov" -" til å laste opp inntil %d filer samtidig." +"Den største totale opplastingsstørrelsen du er tillatt er satt til %s. " +"Filstørrelsen på en enkelt fil er satt til å maksimalt være %s. Du har lov " +"til å laste opp inntil %d filer samtidig." #: ../../Zotlabs/Module/Setup.php:464 msgid "You can adjust these settings in the server php.ini file." @@ -8693,16 +8652,16 @@ msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -"Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til å" -" lage krypteringsnøkler" +"Feil: \"openssl_pkey_new\"-funksjonen på dette systemet er ikke i stand til " +"å lage krypteringsnøkler" #: ../../Zotlabs/Module/Setup.php:490 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -"Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl.in" -"stallation.php\"." +"Ved kjøring på Windows, vennligst se \"http://www.php.net/manual/en/openssl." +"installation.php\"." #: ../../Zotlabs/Module/Setup.php:493 msgid "Generate encryption keys" @@ -8730,7 +8689,7 @@ msgstr "mb_string PHP-modul" #: ../../Zotlabs/Module/Setup.php:515 msgid "xml PHP module" -msgstr "XML PHP modul" +msgstr "xml PHP modul" #: ../../Zotlabs/Module/Setup.php:516 msgid "zip PHP module" @@ -8810,16 +8769,16 @@ 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 "" -"Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i" -" toppkatalogen til web-tjeneren din, men dette får den ikke til." +"Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i " +"toppkatalogen til web-tjeneren din, men dette får den ikke til." #: ../../Zotlabs/Module/Setup.php:596 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 "" -"Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan" -" skrive til filer i din mappe - selv om du kan." +"Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan " +"skrive til filer i din mappe - selv om du kan." #: ../../Zotlabs/Module/Setup.php:597 msgid "Please see install/INSTALL.txt for additional information." @@ -8843,8 +8802,8 @@ msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -"Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel" -" www-data) har skrivetilgang til denne katalogen." +"Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel " +"www-data) har skrivetilgang til denne katalogen." #: ../../Zotlabs/Module/Setup.php:616 #, php-format @@ -8876,8 +8835,8 @@ msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -"SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https" -" tilgang til dette nettstedet." +"SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av " +"https tilgang til dette nettstedet." #: ../../Zotlabs/Module/Setup.php:672 msgid "" @@ -8885,17 +8844,17 @@ msgid "" "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -"Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til" -" TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater." -" Du MÅ IKKE bruke egensignert sertifikater!" +"Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til " +"TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. " +"Du MÅ IKKE bruke egensignert sertifikater!" #: ../../Zotlabs/Module/Setup.php:673 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." msgstr "" -"Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for" -" eksempel inneholde referanser til bilder på din egen hub." +"Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for " +"eksempel inneholde referanser til bilder på din egen hub." #: ../../Zotlabs/Module/Setup.php:674 msgid "" @@ -8903,24 +8862,24 @@ msgid "" "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -"Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder" -" (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på" -" deres eget nettsted som klager over sikkerhetsproblemer." +"Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre " +"nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en " +"advarsel på deres eget nettsted som klager over sikkerhetsproblemer." #: ../../Zotlabs/Module/Setup.php:675 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -"Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget" -" nettsted), så vi må insistere på dette kravet." +"Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget " +"nettsted), så vi må insistere på dette kravet." #: ../../Zotlabs/Module/Setup.php:676 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -"Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i" -" nettlesere." +"Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i " +"nettlesere." #: ../../Zotlabs/Module/Setup.php:677 msgid "" @@ -8939,8 +8898,8 @@ msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -"URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til" -" tjeneren din. Test:" +"URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til " +"tjeneren din. Test: " #: ../../Zotlabs/Module/Setup.php:688 msgid "Url rewrite is working" @@ -8952,9 +8911,9 @@ msgid "" "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -"Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst" -" bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen" -" av din web-tjener." +"Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst " +"bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen " +"av din web-tjener." #: ../../Zotlabs/Module/Setup.php:776 msgid "

What next?

" @@ -8964,8 +8923,8 @@ msgstr "" msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -"VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til" -" bakgrunnshenteren." +"VIKTIG: Du må [manuelt] sette opp en automatisert tidfestet oppgave til " +"bakgrunnshenteren." #: ../../Zotlabs/Module/Viewconnections.php:65 msgid "No connections." @@ -8980,11 +8939,11 @@ msgstr "Besøk %s sin profil [%s]" msgid "View Connections" msgstr "Vis forbindelser" -#: ../../Zotlabs/Module/Pubsites.php:24 +#: ../../Zotlabs/Module/Pubsites.php:26 msgid "Public Hubs" msgstr "Offentlige huber" -#: ../../Zotlabs/Module/Pubsites.php:27 +#: ../../Zotlabs/Module/Pubsites.php:29 msgid "" "The listed hubs allow public registration for the $Projectname network. All " "hubs in the network are interlinked so membership on any of them conveys " @@ -8992,61 +8951,61 @@ msgid "" "provide tiered service plans. The hub itself may provide " "additional details." msgstr "" -"Nettstedene på listen tillater offentlig registrering i" -" $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så" -" medlemskap på enhver av dem formidler medlemskap i nettverket som helhet." -" Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler." -" Nettstedene selv kan gi tilleggsopplysninger." +"Nettstedene på listen tillater offentlig registrering i $Projectname-" +"nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på " +"enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder " +"kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv " +"kan gi tilleggsopplysninger." -#: ../../Zotlabs/Module/Pubsites.php:33 +#: ../../Zotlabs/Module/Pubsites.php:35 msgid "Hub URL" msgstr "Nettstedets URL" -#: ../../Zotlabs/Module/Pubsites.php:33 +#: ../../Zotlabs/Module/Pubsites.php:35 msgid "Access Type" msgstr "Tilgangstype" -#: ../../Zotlabs/Module/Pubsites.php:33 +#: ../../Zotlabs/Module/Pubsites.php:35 msgid "Registration Policy" msgstr "Retningslinjer for registrering" -#: ../../Zotlabs/Module/Pubsites.php:33 +#: ../../Zotlabs/Module/Pubsites.php:35 msgid "Stats" msgstr "Statistikk" -#: ../../Zotlabs/Module/Pubsites.php:33 +#: ../../Zotlabs/Module/Pubsites.php:35 msgid "Software" msgstr "Programvare" -#: ../../Zotlabs/Module/Pubsites.php:35 +#: ../../Zotlabs/Module/Pubsites.php:37 msgid "Ratings" msgstr "Vurderinger" -#: ../../Zotlabs/Module/Pubsites.php:49 +#: ../../Zotlabs/Module/Pubsites.php:51 msgid "Rate" msgstr "Vurder" -#: ../../Zotlabs/Module/Channel.php:139 ../../Zotlabs/Module/Hcard.php:37 +#: ../../Zotlabs/Module/Channel.php:141 ../../Zotlabs/Module/Hcard.php:37 #: ../../Zotlabs/Module/Profile.php:62 msgid "Posts and comments" msgstr "Innlegg og kommentarer" -#: ../../Zotlabs/Module/Channel.php:146 ../../Zotlabs/Module/Hcard.php:44 +#: ../../Zotlabs/Module/Channel.php:148 ../../Zotlabs/Module/Hcard.php:44 #: ../../Zotlabs/Module/Profile.php:69 msgid "Only posts" msgstr "Kun innlegg" -#: ../../Zotlabs/Module/Channel.php:159 ../../Zotlabs/Module/Channel.php:181 -#: ../../Zotlabs/Module/Hq.php:41 ../../Zotlabs/Module/Pubstream.php:47 -#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:83 +#: ../../Zotlabs/Module/Channel.php:161 ../../Zotlabs/Module/Channel.php:183 +#: ../../Zotlabs/Module/Hq.php:41 ../../Zotlabs/Module/Pubstream.php:46 +#: ../../Zotlabs/Module/Display.php:47 ../../Zotlabs/Module/Oep.php:82 msgid "Malformed message id." msgstr "" -#: ../../Zotlabs/Module/Channel.php:217 +#: ../../Zotlabs/Module/Channel.php:219 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden." -#: ../../Zotlabs/Module/Channel.php:495 ../../Zotlabs/Module/Display.php:318 +#: ../../Zotlabs/Module/Channel.php:494 ../../Zotlabs/Module/Display.php:321 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "" @@ -9068,7 +9027,7 @@ msgid "Visible To" msgstr "Synlig for" #: ../../Zotlabs/Module/Profperm.php:140 -#: ../../Zotlabs/Module/Connections.php:218 +#: ../../Zotlabs/Module/Connections.php:221 msgid "All Connections" msgstr "Alle forbindelser" @@ -9093,8 +9052,9 @@ msgid "Add new contacts to this group by default" msgstr "" #: ../../Zotlabs/Module/Group.php:146 +#, fuzzy msgid "Privacy group name" -msgstr "" +msgstr "Personverngruppens navn:" #: ../../Zotlabs/Module/Group.php:147 ../../Zotlabs/Module/Group.php:249 msgid "Members are visible to other channels" @@ -9109,13 +9069,13 @@ msgid "Unable to remove privacy group." msgstr "Ikke i stand til å fjerne personverngruppen." #: ../../Zotlabs/Module/Group.php:244 -#, php-format +#, fuzzy, php-format msgid "Privacy Group: %s" -msgstr "" +msgstr "Personverngruppe: %s" #: ../../Zotlabs/Module/Group.php:246 msgid "Privacy group name: " -msgstr "Personverngruppens navn:" +msgstr "Personverngruppens navn: " #: ../../Zotlabs/Module/Group.php:262 msgid "Group members" @@ -9133,10 +9093,6 @@ msgstr "" msgid "This page is available only to site members" msgstr "" -#: ../../Zotlabs/Module/Go.php:27 -msgid "Welcome" -msgstr "Velkommen" - #: ../../Zotlabs/Module/Go.php:29 msgid "What would you like to do?" msgstr "" @@ -9197,10 +9153,10 @@ msgid "Key and Secret are required" msgstr "Nøkkel og hemmelighet er påkrevd" #: ../../Zotlabs/Module/Oauth.php:53 ../../Zotlabs/Module/Oauth.php:135 -#: ../../Zotlabs/Module/Cdav.php:1052 ../../Zotlabs/Module/Cdav.php:1388 -#: ../../Zotlabs/Module/Admin/Addons.php:457 ../../Zotlabs/Module/Oauth2.php:58 +#: ../../Zotlabs/Module/Cdav.php:1044 ../../Zotlabs/Module/Cdav.php:1380 +#: ../../Zotlabs/Module/Admin/Addons.php:460 ../../Zotlabs/Module/Oauth2.php:58 #: ../../Zotlabs/Module/Oauth2.php:142 ../../Zotlabs/Module/Connedit.php:748 -#: ../../Zotlabs/Lib/Apps.php:545 +#: ../../Zotlabs/Lib/Apps.php:546 msgid "Update" msgstr "Oppdater" @@ -9264,72 +9220,72 @@ msgstr "Sidelenke" msgid "Edit Webpage" msgstr "Endre webside" -#: ../../Zotlabs/Module/Dirsearch.php:24 ../../Zotlabs/Module/Regdir.php:52 +#: ../../Zotlabs/Module/Dirsearch.php:23 ../../Zotlabs/Module/Regdir.php:52 msgid "This site is not a directory server" msgstr "Dette nettstedet er ikke en katalogtjener" -#: ../../Zotlabs/Module/Dirsearch.php:33 +#: ../../Zotlabs/Module/Dirsearch.php:31 msgid "This directory server requires an access token" msgstr "Denne katalogtjeneren krever en tilgangsnøkkel (access token)" -#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:466 +#: ../../Zotlabs/Module/Pin.php:36 ../../Zotlabs/Module/Item.php:478 msgid "Unable to locate original post." msgstr "Ikke i stand til å finne opprinnelig innlegg." -#: ../../Zotlabs/Module/Chat.php:192 +#: ../../Zotlabs/Module/Chat.php:193 msgid "Room not found" msgstr "Rommet ble ikke funnet" -#: ../../Zotlabs/Module/Chat.php:208 +#: ../../Zotlabs/Module/Chat.php:209 msgid "Leave Room" msgstr "Forlat rom" -#: ../../Zotlabs/Module/Chat.php:209 +#: ../../Zotlabs/Module/Chat.php:210 msgid "Delete Room" msgstr "Slett rom" -#: ../../Zotlabs/Module/Chat.php:210 +#: ../../Zotlabs/Module/Chat.php:211 msgid "I am away right now" msgstr "Jeg er borte akkurat nå" -#: ../../Zotlabs/Module/Chat.php:211 +#: ../../Zotlabs/Module/Chat.php:212 msgid "I am online" msgstr "Jeg er online" -#: ../../Zotlabs/Module/Chat.php:213 +#: ../../Zotlabs/Module/Chat.php:214 msgid "Bookmark this room" msgstr "Bokmerk dette rommet" -#: ../../Zotlabs/Module/Chat.php:236 +#: ../../Zotlabs/Module/Chat.php:237 msgid "New Chatroom" msgstr "Nytt chatrom" -#: ../../Zotlabs/Module/Chat.php:237 +#: ../../Zotlabs/Module/Chat.php:238 msgid "Chatroom name" msgstr "Romnavn" -#: ../../Zotlabs/Module/Chat.php:238 +#: ../../Zotlabs/Module/Chat.php:239 msgid "Expiration of chats (minutes)" msgstr "Chat utgår (antall minutter)" -#: ../../Zotlabs/Module/Chat.php:254 +#: ../../Zotlabs/Module/Chat.php:255 #, php-format msgid "%1$s's Chatrooms" msgstr "%1$s sine chatrom" -#: ../../Zotlabs/Module/Chat.php:259 +#: ../../Zotlabs/Module/Chat.php:260 msgid "No chatrooms available" msgstr "Ingen rom tilgjengelige" -#: ../../Zotlabs/Module/Chat.php:260 +#: ../../Zotlabs/Module/Chat.php:261 msgid "Add Room" msgstr "" -#: ../../Zotlabs/Module/Chat.php:263 +#: ../../Zotlabs/Module/Chat.php:264 msgid "Expiration" msgstr "Utløp" -#: ../../Zotlabs/Module/Chat.php:264 +#: ../../Zotlabs/Module/Chat.php:265 msgid "min" msgstr "min" @@ -9361,9 +9317,10 @@ msgid "Delete event" msgstr "Slett hendelse" #: ../../Zotlabs/Module/Channel_calendar.php:392 -#: ../../Zotlabs/Module/Cdav.php:942 ../../Zotlabs/Module/Cal.php:165 +#: ../../Zotlabs/Module/Cdav.php:935 ../../Zotlabs/Module/Cal.php:161 +#, fuzzy msgid "Link to source" -msgstr "" +msgstr "Lenke til kilde" #: ../../Zotlabs/Module/Channel_calendar.php:406 msgid "calendar" @@ -9373,6 +9330,20 @@ msgstr "kalender" msgid "Failed to remove event" msgstr "Mislyktes med å slette hendelse" +#: ../../Zotlabs/Module/Totp_check.php:71 +#: ../../Zotlabs/Module/Admin/Account_edit.php:61 +#, fuzzy +msgid "Account not found." +msgstr "Kontoen ble ikke funnet" + +#: ../../Zotlabs/Module/Totp_check.php:78 +msgid "Multifactor Verification" +msgstr "" + +#: ../../Zotlabs/Module/Totp_check.php:80 +msgid "Please enter the verification key from your authenticator app" +msgstr "" + #: ../../Zotlabs/Module/Like.php:112 msgid "Like/Dislike" msgstr "Liker/Liker ikke" @@ -9386,9 +9357,9 @@ msgid "" "Please login with your $Projectname ID or register as a new $Projectname member to continue." msgstr "" -"Vennligst logg inn med din $Projectname ID eller registrer deg som et nytt $Projectname-medlem for å" -" fortsette" +"Vennligst logg inn med din $Projectname ID eller registrer deg som et nytt $Projectname-medlem for å " +"fortsette." #: ../../Zotlabs/Module/Like.php:172 ../../Zotlabs/Module/Like.php:198 #: ../../Zotlabs/Module/Like.php:236 @@ -9407,50 +9378,50 @@ msgstr "Kanalen er utilgjengelig." msgid "Previous action reversed." msgstr "Forrige handling er omgjort." -#: ../../Zotlabs/Module/Like.php:481 +#: ../../Zotlabs/Module/Like.php:489 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "%1$s er enig med %2$s sin %3$s" -#: ../../Zotlabs/Module/Like.php:483 +#: ../../Zotlabs/Module/Like.php:491 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "%1$s er ikke enig med %2$s sin %3$s" -#: ../../Zotlabs/Module/Like.php:485 +#: ../../Zotlabs/Module/Like.php:493 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "%1$s avstår fra å mene noe om %2$s sin %3$s" -#: ../../Zotlabs/Module/Like.php:592 +#: ../../Zotlabs/Module/Like.php:610 msgid "Action completed." msgstr "Handling ferdig." -#: ../../Zotlabs/Module/Like.php:593 +#: ../../Zotlabs/Module/Like.php:611 msgid "Thank you." msgstr "Tusen takk." -#: ../../Zotlabs/Module/Poke.php:198 +#: ../../Zotlabs/Module/Poke.php:182 msgid "Poke somebody" msgstr "Dult noen" -#: ../../Zotlabs/Module/Poke.php:201 -msgid "Poke/Prod" -msgstr "Prikke/oppildne" - -#: ../../Zotlabs/Module/Poke.php:202 -msgid "Poke, prod or do other things to somebody" -msgstr "Dult, prikk eller gjør andre ting med noen" +#: ../../Zotlabs/Module/Poke.php:186 +#, fuzzy +#| msgid "Poke somebody" +msgid "Poke or ping somebody" +msgstr "Dult noen" -#: ../../Zotlabs/Module/Poke.php:209 +#: ../../Zotlabs/Module/Poke.php:193 msgid "Recipient" msgstr "Mottaker" -#: ../../Zotlabs/Module/Poke.php:210 -msgid "Choose what you wish to do to recipient" -msgstr "Velg hva du ønsker å gjøre med mottakeren" +#: ../../Zotlabs/Module/Poke.php:194 +#, fuzzy +#| msgid "Connections" +msgid "Choose action" +msgstr "Forbindelser" -#: ../../Zotlabs/Module/Poke.php:213 ../../Zotlabs/Module/Poke.php:214 +#: ../../Zotlabs/Module/Poke.php:197 ../../Zotlabs/Module/Poke.php:198 msgid "Make this post private" msgstr "Gjør dette innlegget privat" @@ -9462,206 +9433,218 @@ msgstr "Kalenderhendelsene er importert." msgid "No calendar entries found." msgstr "Ingen kalenderhendelser funnet." -#: ../../Zotlabs/Module/Cdav.php:1008 +#: ../../Zotlabs/Module/Cdav.php:1000 msgid "Event title" msgstr "Tittel på hendelse" -#: ../../Zotlabs/Module/Cdav.php:1009 +#: ../../Zotlabs/Module/Cdav.php:1001 msgid "Start date and time" msgstr "Startdato og tidspunkt" -#: ../../Zotlabs/Module/Cdav.php:1010 +#: ../../Zotlabs/Module/Cdav.php:1002 msgid "End date and time" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1011 +#: ../../Zotlabs/Module/Cdav.php:1003 +#, fuzzy msgid "Timezone:" -msgstr "" +msgstr "Tidssone" -#: ../../Zotlabs/Module/Cdav.php:1034 ../../Zotlabs/Module/Cal.php:203 -#: ../../Zotlabs/Module/Photos.php:953 +#: ../../Zotlabs/Module/Cdav.php:1026 ../../Zotlabs/Module/Cal.php:199 +#: ../../Zotlabs/Module/Photos.php:942 msgid "Previous" msgstr "Forrige" -#: ../../Zotlabs/Module/Cdav.php:1036 ../../Zotlabs/Module/Cal.php:205 +#: ../../Zotlabs/Module/Cdav.php:1028 ../../Zotlabs/Module/Cal.php:201 msgid "Today" msgstr "Idag" -#: ../../Zotlabs/Module/Cdav.php:1037 +#: ../../Zotlabs/Module/Cdav.php:1029 +#, fuzzy msgid "Month" -msgstr "" +msgstr "måned" -#: ../../Zotlabs/Module/Cdav.php:1038 +#: ../../Zotlabs/Module/Cdav.php:1030 +#, fuzzy msgid "Week" -msgstr "" +msgstr "uke" -#: ../../Zotlabs/Module/Cdav.php:1039 +#: ../../Zotlabs/Module/Cdav.php:1031 +#, fuzzy msgid "Day" -msgstr "" +msgstr "dag" -#: ../../Zotlabs/Module/Cdav.php:1040 +#: ../../Zotlabs/Module/Cdav.php:1032 msgid "List month" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1041 +#: ../../Zotlabs/Module/Cdav.php:1033 msgid "List week" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1042 +#: ../../Zotlabs/Module/Cdav.php:1034 msgid "List day" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1050 +#: ../../Zotlabs/Module/Cdav.php:1042 msgid "More" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1051 +#: ../../Zotlabs/Module/Cdav.php:1043 msgid "Less" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1053 +#: ../../Zotlabs/Module/Cdav.php:1045 msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1056 +#: ../../Zotlabs/Module/Cdav.php:1048 msgid "Delete all" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1059 +#: ../../Zotlabs/Module/Cdav.php:1051 msgid "Sorry! Editing of recurrent events is not yet implemented." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1060 +#: ../../Zotlabs/Module/Cdav.php:1052 msgid "" "Could not fetch calendar resource. The selected calendar might be disabled." msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1373 ../../Zotlabs/Module/Connedit.php:733 +#: ../../Zotlabs/Module/Cdav.php:1365 ../../Zotlabs/Module/Connedit.php:733 msgid "Organisation" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1375 ../../Zotlabs/Module/Connedit.php:735 +#: ../../Zotlabs/Module/Cdav.php:1367 ../../Zotlabs/Module/Connedit.php:735 msgid "Phone" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Connedit.php:737 +#: ../../Zotlabs/Module/Cdav.php:1369 ../../Zotlabs/Module/Connedit.php:737 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Connedit.php:738 +#: ../../Zotlabs/Module/Cdav.php:1370 ../../Zotlabs/Module/Connedit.php:738 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1379 +#: ../../Zotlabs/Module/Cdav.php:1371 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Profiles.php:473 ../../Zotlabs/Module/Connedit.php:739 +#: ../../Zotlabs/Module/Profiles.php:472 ../../Zotlabs/Module/Connedit.php:739 #: ../../Zotlabs/Module/Locs.php:122 msgid "Address" msgstr "Adresse" -#: ../../Zotlabs/Module/Cdav.php:1380 ../../Zotlabs/Module/Connedit.php:740 +#: ../../Zotlabs/Module/Cdav.php:1372 ../../Zotlabs/Module/Connedit.php:740 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Connedit.php:745 +#: ../../Zotlabs/Module/Cdav.php:1377 ../../Zotlabs/Module/Connedit.php:745 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Connedit.php:746 +#: ../../Zotlabs/Module/Cdav.php:1378 ../../Zotlabs/Module/Connedit.php:746 msgid "Add Field" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1391 ../../Zotlabs/Module/Connedit.php:751 +#: ../../Zotlabs/Module/Cdav.php:1383 ../../Zotlabs/Module/Connedit.php:751 msgid "P.O. Box" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1392 ../../Zotlabs/Module/Connedit.php:752 +#: ../../Zotlabs/Module/Cdav.php:1384 ../../Zotlabs/Module/Connedit.php:752 msgid "Additional" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1393 ../../Zotlabs/Module/Connedit.php:753 +#: ../../Zotlabs/Module/Cdav.php:1385 ../../Zotlabs/Module/Connedit.php:753 msgid "Street" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1394 ../../Zotlabs/Module/Connedit.php:754 +#: ../../Zotlabs/Module/Cdav.php:1386 ../../Zotlabs/Module/Connedit.php:754 msgid "Locality" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1395 ../../Zotlabs/Module/Connedit.php:755 +#: ../../Zotlabs/Module/Cdav.php:1387 ../../Zotlabs/Module/Connedit.php:755 msgid "Region" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1396 ../../Zotlabs/Module/Connedit.php:756 +#: ../../Zotlabs/Module/Cdav.php:1388 ../../Zotlabs/Module/Connedit.php:756 msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1397 ../../Zotlabs/Module/Profiles.php:774 +#: ../../Zotlabs/Module/Cdav.php:1389 ../../Zotlabs/Module/Profiles.php:773 #: ../../Zotlabs/Module/Connedit.php:757 msgid "Country" msgstr "Land" -#: ../../Zotlabs/Module/Cdav.php:1456 +#: ../../Zotlabs/Module/Cdav.php:1448 msgid "Default Calendar" msgstr "" -#: ../../Zotlabs/Module/Cdav.php:1467 +#: ../../Zotlabs/Module/Cdav.php:1459 msgid "Default Addressbook" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:100 +#: ../../Zotlabs/Module/Lockview.php:101 msgid "Remote privacy information not available" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:143 ../../Zotlabs/Module/Lockview.php:184 -#, fuzzy +#: ../../Zotlabs/Module/Lockview.php:144 ../../Zotlabs/Module/Lockview.php:203 #: ../../Zotlabs/Module/Acl.php:123 msgctxt "acl" msgid "Profile" -msgstr "" +msgstr "Profil" -#: ../../Zotlabs/Module/Lockview.php:154 ../../Zotlabs/Module/Lockview.php:193 +#: ../../Zotlabs/Module/Lockview.php:155 ../../Zotlabs/Module/Lockview.php:212 +#, fuzzy msgid "Privacy group" +msgstr "Personverngruppe:" + +#: ../../Zotlabs/Module/Lockview.php:183 +msgid "Item" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:214 +#: ../../Zotlabs/Module/Lockview.php:230 #, php-format msgid "Click to copy link to this ressource for guest %s to clipboard" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:214 +#: ../../Zotlabs/Module/Lockview.php:230 msgid "Link copied" msgstr "" -#: ../../Zotlabs/Module/Lockview.php:221 +#: ../../Zotlabs/Module/Lockview.php:235 msgid "Access" +msgstr "Tilgang" + +#: ../../Zotlabs/Module/Lockview.php:237 +msgid "OCAP access" msgstr "" -#: ../../Zotlabs/Module/Item.php:751 +#: ../../Zotlabs/Module/Item.php:764 msgid "Empty post discarded." msgstr "Tomt innlegg forkastet." -#: ../../Zotlabs/Module/Item.php:1153 +#: ../../Zotlabs/Module/Item.php:1179 msgid "Duplicate post suppressed." msgstr "Duplikat av innlegg forhindret." -#: ../../Zotlabs/Module/Item.php:1296 +#: ../../Zotlabs/Module/Item.php:1329 msgid "System error. Post not saved." msgstr "Systemfeil. Innlegg ble ikke lagret." -#: ../../Zotlabs/Module/Item.php:1330 +#: ../../Zotlabs/Module/Item.php:1363 msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Item.php:1463 +#: ../../Zotlabs/Module/Item.php:1500 msgid "Unable to obtain post information from database." msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen." -#: ../../Zotlabs/Module/Item.php:1470 +#: ../../Zotlabs/Module/Item.php:1507 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Du har nådd din grense på %1$.0f startinnlegg." -#: ../../Zotlabs/Module/Item.php:1477 +#: ../../Zotlabs/Module/Item.php:1514 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Du har nådd din grense på %1$.0f websider." @@ -9795,52 +9778,52 @@ msgstr "Lenketekst" msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:105 +#: ../../Zotlabs/Module/Sharedwithme.php:106 msgid "Files: shared with me" msgstr "Filer: delt med meg" -#: ../../Zotlabs/Module/Sharedwithme.php:107 +#: ../../Zotlabs/Module/Sharedwithme.php:108 msgid "NEW" msgstr "NY" -#: ../../Zotlabs/Module/Sharedwithme.php:109 -#: ../../Zotlabs/Storage/Browser.php:380 +#: ../../Zotlabs/Module/Sharedwithme.php:110 +#: ../../Zotlabs/Storage/Browser.php:383 msgid "Last Modified" msgstr "Sist endret" -#: ../../Zotlabs/Module/Sharedwithme.php:110 +#: ../../Zotlabs/Module/Sharedwithme.php:111 msgid "Remove all files" msgstr "Fjern alle filer" -#: ../../Zotlabs/Module/Sharedwithme.php:111 +#: ../../Zotlabs/Module/Sharedwithme.php:112 msgid "Remove this file" msgstr "Fjern denne filen" -#: ../../Zotlabs/Module/Help.php:23 +#: ../../Zotlabs/Module/Help.php:25 msgid "Documentation Search" msgstr "Søk i dokumentasjon" -#: ../../Zotlabs/Module/Help.php:84 +#: ../../Zotlabs/Module/Help.php:86 msgid "Members" msgstr "Medlemmer" -#: ../../Zotlabs/Module/Help.php:85 +#: ../../Zotlabs/Module/Help.php:87 msgid "Administrators" msgstr "" -#: ../../Zotlabs/Module/Help.php:86 +#: ../../Zotlabs/Module/Help.php:88 msgid "Developers" msgstr "" -#: ../../Zotlabs/Module/Help.php:87 +#: ../../Zotlabs/Module/Help.php:89 msgid "Tutorials" msgstr "" -#: ../../Zotlabs/Module/Help.php:98 +#: ../../Zotlabs/Module/Help.php:101 msgid "$Projectname Documentation" msgstr "$Projectname dokumentasjon" -#: ../../Zotlabs/Module/Help.php:99 +#: ../../Zotlabs/Module/Help.php:102 msgid "Contents" msgstr "" @@ -9860,45 +9843,45 @@ msgstr "" msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:260 +#: ../../Zotlabs/Module/Webpages.php:258 msgid "Actions" msgstr "Handlinger" -#: ../../Zotlabs/Module/Webpages.php:261 +#: ../../Zotlabs/Module/Webpages.php:259 msgid "Page Link" msgstr "Sidelenke" -#: ../../Zotlabs/Module/Webpages.php:262 +#: ../../Zotlabs/Module/Webpages.php:260 msgid "Page Title" msgstr "Sidetittel" -#: ../../Zotlabs/Module/Webpages.php:263 ../../Zotlabs/Module/Blocks.php:157 -#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:191 +#: ../../Zotlabs/Module/Webpages.php:261 ../../Zotlabs/Module/Blocks.php:155 +#: ../../Zotlabs/Module/Menu.php:178 ../../Zotlabs/Module/Layouts.php:189 msgid "Created" msgstr "Laget" -#: ../../Zotlabs/Module/Webpages.php:264 ../../Zotlabs/Module/Blocks.php:158 -#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:192 +#: ../../Zotlabs/Module/Webpages.php:262 ../../Zotlabs/Module/Blocks.php:156 +#: ../../Zotlabs/Module/Menu.php:179 ../../Zotlabs/Module/Layouts.php:190 msgid "Edited" msgstr "Endret" -#: ../../Zotlabs/Module/Webpages.php:292 +#: ../../Zotlabs/Module/Webpages.php:290 msgid "Invalid file type." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:304 +#: ../../Zotlabs/Module/Webpages.php:302 msgid "Error opening zip file" msgstr "" -#: ../../Zotlabs/Module/Webpages.php:315 +#: ../../Zotlabs/Module/Webpages.php:313 msgid "Invalid folder path." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:342 +#: ../../Zotlabs/Module/Webpages.php:340 msgid "No webpage elements detected." msgstr "" -#: ../../Zotlabs/Module/Webpages.php:417 +#: ../../Zotlabs/Module/Webpages.php:415 msgid "Import complete." msgstr "" @@ -9924,12 +9907,12 @@ msgid "Return to file list" msgstr "Gå tilbake til filoversikten" #: ../../Zotlabs/Module/Filestorage.php:206 -#: ../../Zotlabs/Storage/Browser.php:386 +#: ../../Zotlabs/Storage/Browser.php:389 msgid "Copy/paste this code to attach file to a post" msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg" #: ../../Zotlabs/Module/Filestorage.php:207 -#: ../../Zotlabs/Storage/Browser.php:387 +#: ../../Zotlabs/Storage/Browser.php:390 msgid "Copy/paste this URL to link file from a web page" msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside" @@ -9942,7 +9925,7 @@ msgid "Show URL to this file" msgstr "Vis URLen til denne filen" #: ../../Zotlabs/Module/Filestorage.php:211 -#: ../../Zotlabs/Storage/Browser.php:552 +#: ../../Zotlabs/Storage/Browser.php:558 msgid "Show in your contacts shared folder" msgstr "" @@ -9956,7 +9939,7 @@ msgstr "Fjern merkelapp fra element" #: ../../Zotlabs/Module/Tagrm.php:125 msgid "Select a tag to remove: " -msgstr "Velg merkelapp å fjerne:" +msgstr "Velg merkelapp å fjerne: " #: ../../Zotlabs/Module/Connect.php:65 ../../Zotlabs/Module/Connect.php:118 msgid "Continue" @@ -9975,16 +9958,16 @@ msgid "" "Please enter your restrictions or conditions, such as paypal receipt, usage " "guidelines, etc." msgstr "" -"Vennligst skriv dine restriksjoner og betingelser, slik som" -" PayPal-kvittering, retningslinjer for bruk, og så videre." +"Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-" +"kvittering, retningslinjer for bruk, og så videre." #: ../../Zotlabs/Module/Connect.php:104 ../../Zotlabs/Module/Connect.php:124 msgid "" "This channel may require additional steps or acknowledgement of the " "following conditions prior to connecting:" msgstr "" -"Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende" -" betingelser før tilkobling:" +"Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende " +"betingelser før tilkobling:" #: ../../Zotlabs/Module/Connect.php:105 msgid "" @@ -9996,8 +9979,8 @@ msgid "" "By continuing, I certify that I have complied with any instructions provided " "on this page." msgstr "" -"Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på" -" denne siden." +"Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på " +"denne siden." #: ../../Zotlabs/Module/Connect.php:115 msgid "(No specific instructions have been provided by the channel owner.)" @@ -10007,14 +9990,6 @@ msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)" msgid "Restricted or Premium Channel" msgstr "Begrenset kanal eller premiumkanal" -#: ../../Zotlabs/Module/Cloud.php:120 -msgid "Not found" -msgstr "" - -#: ../../Zotlabs/Module/Cloud.php:130 -msgid "Unknown error" -msgstr "" - #: ../../Zotlabs/Module/Share.php:120 msgid "Post repeated" msgstr "" @@ -10027,7 +10002,7 @@ msgstr "nettverk" msgid "Item is not editable" msgstr "Elementet kan ikke endres" -#: ../../Zotlabs/Module/Editpost.php:110 ../../Zotlabs/Module/Rpost.php:218 +#: ../../Zotlabs/Module/Editpost.php:113 ../../Zotlabs/Module/Rpost.php:211 msgid "Edit post" msgstr "Endre innlegg" @@ -10058,6 +10033,38 @@ msgstr "" msgid "Deny" msgstr "Avslå" +#: ../../Zotlabs/Module/Admin/Queueworker.php:65 +msgid "Max queueworker threads" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:67 +msgid "Minimum 4, default 4" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:77 +msgid "Assume workers dead after" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:79 +msgid "Minimum 120, default 300 seconds" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:91 +msgid "Pause before starting next task" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:93 +msgid "Minimum 100, default 100 microseconds" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:102 +msgid "Automatically adjust pause before starting next task" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Queueworker.php:111 +msgid "Queueworker Settings" +msgstr "" + #: ../../Zotlabs/Module/Admin/Queue.php:45 msgid "Queue Statistics" msgstr "Køstatistikk" @@ -10099,12 +10106,12 @@ msgid "No themes found." msgstr "Ingen temaer er funnet." #: ../../Zotlabs/Module/Admin/Themes.php:95 -#: ../../Zotlabs/Module/Admin/Addons.php:311 +#: ../../Zotlabs/Module/Admin/Addons.php:314 msgid "Disable" msgstr "Skru av" #: ../../Zotlabs/Module/Admin/Themes.php:97 -#: ../../Zotlabs/Module/Admin/Addons.php:314 +#: ../../Zotlabs/Module/Admin/Addons.php:317 msgid "Enable" msgstr "Skru på" @@ -10114,30 +10121,30 @@ msgstr "Skjermbilde" #: ../../Zotlabs/Module/Admin/Themes.php:122 #: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Security.php:98 +#: ../../Zotlabs/Module/Admin/Security.php:105 #: ../../Zotlabs/Module/Admin/Accounts.php:307 #: ../../Zotlabs/Module/Admin/Site.php:411 #: ../../Zotlabs/Module/Admin/Logs.php:82 #: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Addons.php:342 -#: ../../Zotlabs/Module/Admin/Addons.php:440 ../../Zotlabs/Module/Admin.php:140 +#: ../../Zotlabs/Module/Admin/Addons.php:345 +#: ../../Zotlabs/Module/Admin/Addons.php:443 ../../Zotlabs/Module/Admin.php:140 msgid "Administration" msgstr "Administrasjon" #: ../../Zotlabs/Module/Admin/Themes.php:124 -#: ../../Zotlabs/Module/Admin/Addons.php:344 +#: ../../Zotlabs/Module/Admin/Addons.php:347 msgid "Toggle" msgstr "Skru av og på" #: ../../Zotlabs/Module/Admin/Themes.php:134 -#: ../../Zotlabs/Module/Admin/Addons.php:352 +#: ../../Zotlabs/Module/Admin/Addons.php:355 msgid "Author: " -msgstr "Forfatter:" +msgstr "Forfatter: " #: ../../Zotlabs/Module/Admin/Themes.php:135 -#: ../../Zotlabs/Module/Admin/Addons.php:353 +#: ../../Zotlabs/Module/Admin/Addons.php:356 msgid "Maintainer: " -msgstr "Vedlikeholder:" +msgstr "Vedlikeholder: " #: ../../Zotlabs/Module/Admin/Themes.php:162 msgid "[Experimental]" @@ -10156,156 +10163,168 @@ msgstr "Lås funksjon %s" msgid "Manage Additional Features" msgstr "Håndter tilleggsfunksjoner" -#: ../../Zotlabs/Module/Admin/Security.php:89 +#: ../../Zotlabs/Module/Admin/Security.php:96 msgid "" "By default, unfiltered HTML is allowed in embedded media. This is inherently " "insecure." msgstr "" -"Ufiltrert HTML er i utgangspunktet tillatt i innebygde media. Dette er en" -" sikkerhetsrisiko." +"Ufiltrert HTML er i utgangspunktet tillatt i innebygde media. Dette er en " +"sikkerhetsrisiko." -#: ../../Zotlabs/Module/Admin/Security.php:92 +#: ../../Zotlabs/Module/Admin/Security.php:99 msgid "" "The recommended setting is to only allow unfiltered HTML from the following " "sites:" msgstr "" "Det anbefales at man kun tillater ufiltrert HTML fra følgende nettsteder:" -#: ../../Zotlabs/Module/Admin/Security.php:93 +#: ../../Zotlabs/Module/Admin/Security.php:100 msgid "" "https://youtube.com/
https://www.youtube.com/
https://youtu.be/" "
https://vimeo.com/
https://soundcloud.com/
" msgstr "" -"https://youtube.com/
https://www.youtube.com/
https://youtu.be/https://vimeo.com/
https://soundcloud.com/
" +"https://youtube.com/
https://www.youtube.com/
https://youtu.be/" +"
https://vimeo.com/
https://soundcloud.com/
" -#: ../../Zotlabs/Module/Admin/Security.php:94 +#: ../../Zotlabs/Module/Admin/Security.php:101 msgid "" "All other embedded content will be filtered, unless " "embedded content from that site is explicitly blocked." msgstr "" -"Alt annet innebygget innhold vil bli filtrert, med mindre" -" innebygget innhold fra den aktuelle siden eksplisitt er blokkert." +"Alt annet innebygget innhold vil bli filtrert, med mindre " +"innebygget innhold fra den aktuelle siden eksplisitt er blokkert." -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "Block public" msgstr "Blokker offentlig tilgang" -#: ../../Zotlabs/Module/Admin/Security.php:101 +#: ../../Zotlabs/Module/Admin/Security.php:108 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently authenticated." msgstr "" -"Kryss av for å blokkere tilgang til alle personlige sider som ellers ville" -" vært offentlig tilgjengelige på dette nettstedet med mindre du er logget inn." +"Kryss av for å blokkere tilgang til alle personlige sider som ellers ville " +"vært offentlig tilgjengelige på dette nettstedet med mindre du er logget inn." -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:109 msgid "Provide a cloud root directory" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:102 +#: ../../Zotlabs/Module/Admin/Security.php:109 msgid "" "The cloud root directory lists all channel names which provide public files" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:103 +#: ../../Zotlabs/Module/Admin/Security.php:110 msgid "Show total disk space available to cloud uploads" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:104 +#: ../../Zotlabs/Module/Admin/Security.php:111 msgid "Set \"Transport Security\" HTTP header" msgstr "Slå på \"Transport Security\" i HTTP meldingshodet" -#: ../../Zotlabs/Module/Admin/Security.php:105 +#: ../../Zotlabs/Module/Admin/Security.php:112 msgid "Set \"Content Security Policy\" HTTP header" msgstr "Sett \"Content Security Policy\" i HTTP meldingshodet" -#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "Allowed email domains" msgstr "Tillate e-postdomener" -#: ../../Zotlabs/Module/Admin/Security.php:106 +#: ../../Zotlabs/Module/Admin/Security.php:113 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -"Kommaseparert liste med domener som er tillatt i e-postadresser ved" -" registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle" -" domener er tillatt" +"Kommaseparert liste med domener som er tillatt i e-postadresser ved " +"registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle " +"domener er tillatt" -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:114 msgid "Not allowed email domains" msgstr "Ikke tillatte e-postdomener" -#: ../../Zotlabs/Module/Admin/Security.php:107 +#: ../../Zotlabs/Module/Admin/Security.php:114 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -"Kommaseparert liste med domener som ikke er tillatt i e-postadresser ved" -" registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle" -" domener er tillatt, med mindre tillate domener er blitt definert." +"Kommaseparert liste med domener som ikke er tillatt i e-postadresser ved " +"registrering på dette nettstedet. Jokertegn er akseptert. Tomt betyr at alle " +"domener er tillatt, med mindre tillate domener er blitt definert." -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:115 msgid "Allow communications only from these sites" msgstr "Tillat kommunikasjon med bare disse nettstedene" -#: ../../Zotlabs/Module/Admin/Security.php:108 +#: ../../Zotlabs/Module/Admin/Security.php:115 msgid "" "One site per line. Leave empty to allow communication from anywhere by " "default" msgstr "" -"Et nettsted per linje. La det stå tomt for å tillate kommunikasjon med" -" ethvert nettsted som standard" +"Et nettsted per linje. La det stå tomt for å tillate kommunikasjon med " +"ethvert nettsted som standard" -#: ../../Zotlabs/Module/Admin/Security.php:109 +#: ../../Zotlabs/Module/Admin/Security.php:116 msgid "Block communications from these sites" msgstr "Blokker kommunikasjon fra disse nettstedene" -#: ../../Zotlabs/Module/Admin/Security.php:110 +#: ../../Zotlabs/Module/Admin/Security.php:117 msgid "Allow communications only from these channels" msgstr "Tillat kommunikasjon med bare disse kanalene" -#: ../../Zotlabs/Module/Admin/Security.php:110 +#: ../../Zotlabs/Module/Admin/Security.php:117 msgid "" "One channel (hash) per line. Leave empty to allow from any channel by default" msgstr "" -"En kanal (hash) per linje. La det stå tomt for å tillate enhver kanal som" -" standard" +"En kanal (hash) per linje. La det stå tomt for å tillate enhver kanal som " +"standard" -#: ../../Zotlabs/Module/Admin/Security.php:111 +#: ../../Zotlabs/Module/Admin/Security.php:118 msgid "Block communications from these channels" msgstr "Blokker kommunikasjon fra disse kanalene" -#: ../../Zotlabs/Module/Admin/Security.php:112 +#: ../../Zotlabs/Module/Admin/Security.php:119 msgid "Only allow embeds from secure (SSL) websites and links." msgstr "Kun tillat innebygget innhold fra sikre (HTTPS) nettsteder og lenker." -#: ../../Zotlabs/Module/Admin/Security.php:113 +#: ../../Zotlabs/Module/Admin/Security.php:120 msgid "Allow unfiltered embedded HTML content only from these domains" msgstr "Kun tillat ufiltrert innebygget innhold fra disse domenene" -#: ../../Zotlabs/Module/Admin/Security.php:113 +#: ../../Zotlabs/Module/Admin/Security.php:120 msgid "One site per line. By default embedded content is filtered." msgstr "" "Ett nettsted pr. linje. Innebygget innhold er filtrert i utgangsounktet." -#: ../../Zotlabs/Module/Admin/Security.php:114 +#: ../../Zotlabs/Module/Admin/Security.php:121 msgid "Block embedded HTML from these domains" msgstr "Blokker innbygget HTML fra disse domenene" -#: ../../Zotlabs/Module/Admin/Security.php:115 +#: ../../Zotlabs/Module/Admin/Security.php:122 msgid "Allow SVG thumbnails in file browser" msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:115 +#: ../../Zotlabs/Module/Admin/Security.php:122 msgid "WARNING: SVG images may contain malicious code." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:116 -msgid "Allow embedded (inline) PDF files" +#: ../../Zotlabs/Module/Admin/Security.php:123 +msgid "Allow embedded (inline) PDF files" +msgstr "" + +#: ../../Zotlabs/Module/Admin/Security.php:125 +#, fuzzy +#| msgid "Default directory server" +msgid "Additional trusted directory server URLs" +msgstr "Standard katalogtjener" + +#: ../../Zotlabs/Module/Admin/Security.php:125 +msgid "" +"Accept directory flags (spam, nsfw) from those servers. One per line like " +"https://example.tld" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:128 @@ -10438,50 +10457,50 @@ msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Valgte kontoer vil bli slettet!\\n\\nAlt disse kontoene har lagt inn på dette" -" nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette" -" disse valgte kontoene?" +"Valgte kontoer vil bli slettet!\\n\\nAlt disse kontoene har lagt inn på " +"dette nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil " +"slette disse valgte kontoene?" #: ../../Zotlabs/Module/Admin/Accounts.php:338 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Kontoen {0} vl bli slettet!\\n\\nAlt denne kontoen har lagt inn på dette" -" nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette" -" denne kontoen?" +"Kontoen {0} vl bli slettet!\\n\\nAlt denne kontoen har lagt inn på dette " +"nettstedet vil bli slettet permanent!\\n\\nEr du sikker på at du vil slette " +"denne kontoen?" #: ../../Zotlabs/Module/Admin/Accounts.php:347 msgid "Message" msgstr "Melding" -#: ../../Zotlabs/Module/Admin/Site.php:112 +#: ../../Zotlabs/Module/Admin/Site.php:111 msgid "Invalid input" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:132 +#: ../../Zotlabs/Module/Admin/Site.php:131 msgid "Errors" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:225 +#: ../../Zotlabs/Module/Admin/Site.php:219 msgid "Site settings updated." msgstr "Nettstedsinnstillinger er oppdatert." -#: ../../Zotlabs/Module/Admin/Site.php:262 +#: ../../Zotlabs/Module/Admin/Site.php:256 #: ../../Zotlabs/Module/Settings/Display.php:116 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:269 +#: ../../Zotlabs/Module/Admin/Site.php:263 msgid "mobile" msgstr "mobil" -#: ../../Zotlabs/Module/Admin/Site.php:271 +#: ../../Zotlabs/Module/Admin/Site.php:265 msgid "experimental" msgstr "eksperimentell" -#: ../../Zotlabs/Module/Admin/Site.php:273 +#: ../../Zotlabs/Module/Admin/Site.php:267 msgid "unsupported" msgstr "ikke støttet" @@ -10504,7 +10523,8 @@ msgstr "Mitt nettsted har kun gratis tilgang" #: ../../Zotlabs/Module/Admin/Site.php:331 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -"Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt tjeneste" +"Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt " +"tjeneste" #: ../../Zotlabs/Module/Admin/Site.php:349 msgid "Default permission role for new accounts" @@ -10515,15 +10535,15 @@ msgid "" "This role will be used for the first channel created after registration." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:356 ../../Zotlabs/Module/Invite.php:397 +#: ../../Zotlabs/Module/Admin/Site.php:356 ../../Zotlabs/Module/Invite.php:410 msgid "Minute(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:357 ../../Zotlabs/Module/Invite.php:398 +#: ../../Zotlabs/Module/Admin/Site.php:357 ../../Zotlabs/Module/Invite.php:411 msgid "Hour(s)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:358 ../../Zotlabs/Module/Invite.php:399 +#: ../../Zotlabs/Module/Admin/Site.php:358 ../../Zotlabs/Module/Invite.php:412 msgid "Day(s)" msgstr "" @@ -10548,7 +10568,7 @@ msgid "Time to wait before a registration can be verified" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:375 -#: ../../Zotlabs/Module/Admin/Site.php:397 ../../Zotlabs/Module/Invite.php:408 +#: ../../Zotlabs/Module/Admin/Site.php:397 ../../Zotlabs/Module/Invite.php:421 msgid "duration up from now" msgstr "" @@ -10585,8 +10605,8 @@ msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -"Kontaktinformasjon til nettstedsadministratorer. Vises på siteinfo-siden." -" BBCode kan brukes her" +"Kontaktinformasjon til nettstedsadministratorer. Vises på siteinfo-siden. " +"BBCode kan brukes her" #: ../../Zotlabs/Module/Admin/Site.php:427 ../../Zotlabs/Module/Siteinfo.php:24 msgid "Site Information" @@ -10598,10 +10618,6 @@ msgid "" "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:428 -msgid "System language" -msgstr "Systemspråk" - #: ../../Zotlabs/Module/Admin/Site.php:429 msgid "System theme" msgstr "Systemtema" @@ -10611,8 +10627,8 @@ msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -"Standard systemtema - kan overstyres av brukerprofiler - endre temainnstillinger" +"Standard systemtema - kan overstyres av brukerprofiler - endre temainnstillinger" #: ../../Zotlabs/Module/Admin/Site.php:432 msgid "Allow Feeds as Connections" @@ -10631,8 +10647,8 @@ msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -"Største størrelse i bytes for opplastede bilder. Standard er 0, som betyr" -" ubegrenset." +"Største størrelse i bytes for opplastede bilder. Standard er 0, som betyr " +"ubegrenset." #: ../../Zotlabs/Module/Admin/Site.php:434 msgid "Minimum age" @@ -10645,8 +10661,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:435 msgid "Which best describes the types of account offered by this hub?" msgstr "" -"Hvilket alternativ beskriver best hva slags kontotype som tilbys av dette" -" nettstedet/denne hubben?" +"Hvilket alternativ beskriver best hva slags kontotype som tilbys av dette " +"nettstedet/denne hubben?" #: ../../Zotlabs/Module/Admin/Site.php:435 msgid "This is displayed on the public server site list." @@ -10695,7 +10711,7 @@ msgid "Advanced examples:" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:460 -#: ../../Zotlabs/Module/Settings/Channel.php:182 +#: ../../Zotlabs/Module/Settings/Channel.php:183 msgid "or" msgstr "eller" @@ -10754,8 +10770,8 @@ msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -"Vil ikke kaste bort systemressurser på å spørre eksterne nettsteder etter" -" forlatte kontoer. Skriv 0 for å ikke sette noen tidsgrense." +"Vil ikke kaste bort systemressurser på å spørre eksterne nettsteder etter " +"forlatte kontoer. Skriv 0 for å ikke sette noen tidsgrense." #: ../../Zotlabs/Module/Admin/Site.php:508 msgid "Site homepage to show visitors (default: login box)" @@ -10777,8 +10793,8 @@ msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -"Presenter hjemmesiden til nettstedet i en ramme fra den opprinnelige" -" plasseringen i stedet for å omdirigere" +"Presenter hjemmesiden til nettstedet i en ramme fra den opprinnelige " +"plasseringen i stedet for å omdirigere" #: ../../Zotlabs/Module/Admin/Site.php:510 msgid "Allowed friend domains" @@ -10789,50 +10805,54 @@ msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -"Kommaseparert liste over domener som har lov til å etablere vennskap med" -" dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener." +"Kommaseparert liste over domener som har lov til å etablere vennskap med " +"dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener" #: ../../Zotlabs/Module/Admin/Site.php:511 msgid "Force publish" msgstr "Tving publisering" #: ../../Zotlabs/Module/Admin/Site.php:511 +#, fuzzy +#| msgid "" +#| "Check to force all profiles on this site to be listed in the site " +#| "directory." msgid "" -"Check to force all profiles on this site to be listed in the site directory." +"Check to force all profiles on this site to be listed in the site directory" msgstr "" -"Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i" -" nettstedet sin katalog." +"Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i " +"nettstedet sin katalog." #: ../../Zotlabs/Module/Admin/Site.php:512 -msgid "Import Public Streams" -msgstr "Importer offentlige innholdsstrømmer" +msgid "Enable public stream" +msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:512 -msgid "" -"Import and allow access to public content pulled from other sites. Warning: " -"this content is unmoderated." +#, fuzzy +#| msgid "" +#| "Import and allow access to public content pulled from other sites. " +#| "Warning: this content is unmoderated." +msgid "Enable the public stream. Warning: this content is unmoderated" msgstr "" -"Importer og gi tilgang til offentlig innhold trukket inn fra andre" -" nettsteder. Advarsel: dette innholdet er ikke moderert." +"Importer og gi tilgang til offentlig innhold trukket inn fra andre " +"nettsteder. Advarsel: dette innholdet er ikke moderert." #: ../../Zotlabs/Module/Admin/Site.php:513 -msgid "Site only Public Streams" -msgstr "" +#, fuzzy +#| msgid "My site is not a public server" +msgid "Site only public stream" +msgstr "Mitt nettsted er ikke en offentlig tjeneste" #: ../../Zotlabs/Module/Admin/Site.php:513 -msgid "" -"Allow access to public content originating only from this site if Imported " -"Public Streams are disabled." +msgid "Restrict the public stream to content originating at this site" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:514 -msgid "Allow anybody on the internet to access the Public streams" +msgid "Allow anybody on the internet to access the public streams" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:514 -msgid "" -"Disable to require authentication before viewing. Warning: this content is " -"unmoderated." +msgid "Disable to require authentication before viewing" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:515 @@ -10848,8 +10868,8 @@ msgid "" "words one per line or #tags or /patterns/ or lang=xx, leave blank to import " "all posts" msgstr "" -"ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå" -" blankt for å importere alle innlegg" +"ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå " +"blankt for å importere alle innlegg" #: ../../Zotlabs/Module/Admin/Site.php:516 msgid "Do not import Public stream posts with this text" @@ -10864,8 +10884,8 @@ msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -"Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe annet" -" innhold har blitt konfigurert." +"Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe " +"annet innhold har blitt konfigurert." #: ../../Zotlabs/Module/Admin/Site.php:520 msgid "Enable context help" @@ -10875,8 +10895,8 @@ msgstr "Slå på kontekstuell hjelp" msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -"Vis kontekstuell hjelp for den gjeldende siden når du klikker på" -" hjelpeknappen." +"Vis kontekstuell hjelp for den gjeldende siden når du klikker på " +"hjelpeknappen." #: ../../Zotlabs/Module/Admin/Site.php:522 msgid "Reply-to email address for system generated email." @@ -10934,9 +10954,9 @@ msgid "" "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -"Forsink leveringsprosessene i bakgrunnen med dette antall sekunder for å" -" redusere systembelastningen. Anbefaling: 4-5 for delte tjenere, 2-3 for" -" virtuelle tjenere, 0-1 for større dedikerte tjenere." +"Forsink leveringsprosessene i bakgrunnen med dette antall sekunder for å " +"redusere systembelastningen. Anbefaling: 4-5 for delte tjenere, 2-3 for " +"virtuelle tjenere, 0-1 for større dedikerte tjenere." #: ../../Zotlabs/Module/Admin/Site.php:534 msgid "Deliveries per process" @@ -10947,18 +10967,8 @@ msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -"Antall leveranser som forsøkes i en enkelt operativsystemprosess. Juster om" -" nødvendig for å fininnstille systemets yteevne. Anbefaling: 1-5." - -#: ../../Zotlabs/Module/Admin/Site.php:535 -msgid "Queue Threshold" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:535 -msgid "" -"Always defer immediate delivery if queue contains more than this number of " -"entries." -msgstr "" +"Antall leveranser som forsøkes i en enkelt operativsystemprosess. Juster om " +"nødvendig for å fininnstille systemets yteevne. Anbefaling: 1-5." #: ../../Zotlabs/Module/Admin/Site.php:536 msgid "Poll interval" @@ -10969,8 +10979,8 @@ msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -"Forsink spørreprosessene i bakgrunnen med dette antall sekunder for å" -" redusere systembelastningen. Hvis 0, bruk dette leveringsintervallet." +"Forsink spørreprosessene i bakgrunnen med dette antall sekunder for å " +"redusere systembelastningen. Hvis 0, bruk dette leveringsintervallet." #: ../../Zotlabs/Module/Admin/Site.php:537 msgid "Path to ImageMagick convert program" @@ -10992,8 +11002,8 @@ msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -"Største systembelastning før leverings- og spørreprosesser blir utsatt -" -" standard 50." +"Største systembelastning før leverings- og spørreprosesser blir utsatt - " +"standard 50." #: ../../Zotlabs/Module/Admin/Site.php:539 msgid "Expiration period in days for imported (grid/network) content" @@ -11120,12 +11130,10 @@ msgid "select all" msgstr "velg alle" #: ../../Zotlabs/Module/Admin/Channels.php:150 -#: ../../Zotlabs/Module/Directory.php:361 msgid "Censor" msgstr "Sensurer" #: ../../Zotlabs/Module/Admin/Channels.php:151 -#: ../../Zotlabs/Module/Directory.php:361 msgid "Uncensor" msgstr "Ikke sensurer lenger" @@ -11146,18 +11154,18 @@ msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Valgte kanaler vil bli slettet!\\n\\nAlt innhold som er lagt inn i disse" -" kanalene på dette nettstedet vil bli slettet for alltid!\\n\\nEr du sikker" -" på at du vil slette disse kanalene med alt innhold?" +"Valgte kanaler vil bli slettet!\\n\\nAlt innhold som er lagt inn i disse " +"kanalene på dette nettstedet vil bli slettet for alltid!\\n\\nEr du sikker " +"på at du vil slette disse kanalene med alt innhold?" #: ../../Zotlabs/Module/Admin/Channels.php:163 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -"Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne kanalen" -" på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du" -" vil slette denne kanalen med alt innhold?" +"Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne " +"kanalen på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker " +"på at du vil slette denne kanalen med alt innhold?" #: ../../Zotlabs/Module/Admin/Account_edit.php:29 #, php-format @@ -11168,10 +11176,6 @@ msgstr "" msgid "Account settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Account_edit.php:61 -msgid "Account not found." -msgstr "" - #: ../../Zotlabs/Module/Admin/Account_edit.php:68 msgid "Account Edit" msgstr "" @@ -11260,7 +11264,6 @@ msgid "Create Custom Field" msgstr "Legg til egendefinert felt" #: ../../Zotlabs/Module/Admin/Dbsync.php:19 -#: ../../Zotlabs/Module/Admin/Dbsync.php:59 msgid "Update has been marked successful" msgstr "Oppdateringen har blitt merket som en suksess" @@ -11270,7 +11273,7 @@ msgid "Verification of update %s failed. Check system logs." msgstr "" #: ../../Zotlabs/Module/Admin/Dbsync.php:35 -#: ../../Zotlabs/Module/Admin/Dbsync.php:74 +#: ../../Zotlabs/Module/Admin/Dbsync.php:62 #, php-format msgid "Update %s was successfully applied." msgstr "Oppdatering %s ble gjennomført med suksess." @@ -11286,131 +11289,132 @@ msgid "Update %s does not contain a verification function." msgstr "" #: ../../Zotlabs/Module/Admin/Dbsync.php:46 -#: ../../Zotlabs/Module/Admin/Dbsync.php:81 +#: ../../Zotlabs/Module/Admin/Dbsync.php:69 #, php-format msgid "Update function %s could not be found." msgstr "Oppdatering av funksjon %s kunne ikke finnes." -#: ../../Zotlabs/Module/Admin/Dbsync.php:71 +#: ../../Zotlabs/Module/Admin/Dbsync.php:59 #, php-format msgid "Executing update procedure %s failed. Check system logs." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:78 +#: ../../Zotlabs/Module/Admin/Dbsync.php:66 #, php-format msgid "" "Update %s did not return a status. It cannot be determined if it was " "successful." msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:99 +#: ../../Zotlabs/Module/Admin/Dbsync.php:87 msgid "Failed Updates" msgstr "Mislykkede oppdateringer" -#: ../../Zotlabs/Module/Admin/Dbsync.php:101 +#: ../../Zotlabs/Module/Admin/Dbsync.php:89 msgid "Mark success (if update was manually applied)" msgstr "Marker suksess (hvis oppdateringen ble gjennomført manuelt)" -#: ../../Zotlabs/Module/Admin/Dbsync.php:102 +#: ../../Zotlabs/Module/Admin/Dbsync.php:90 msgid "Attempt to verify this update if a verification procedure exists" msgstr "" -#: ../../Zotlabs/Module/Admin/Dbsync.php:103 +#: ../../Zotlabs/Module/Admin/Dbsync.php:91 msgid "Attempt to execute this update step automatically" msgstr "Prøv å gjennomføre dette oppdateringstrinnet automatisk" -#: ../../Zotlabs/Module/Admin/Dbsync.php:108 +#: ../../Zotlabs/Module/Admin/Dbsync.php:96 msgid "No failed updates." msgstr "Ingen mislykkede oppdateringer." -#: ../../Zotlabs/Module/Admin/Addons.php:290 +#: ../../Zotlabs/Module/Admin/Addons.php:293 #, php-format msgid "Plugin %s disabled." msgstr "Tilleggsfunksjonen %s er avskrudd." -#: ../../Zotlabs/Module/Admin/Addons.php:295 +#: ../../Zotlabs/Module/Admin/Addons.php:298 #, php-format msgid "Plugin %s enabled." msgstr "Tilleggsfunksjonen %s er påskrudd." -#: ../../Zotlabs/Module/Admin/Addons.php:354 +#: ../../Zotlabs/Module/Admin/Addons.php:357 msgid "Minimum project version: " -msgstr "Minimum prosjektversjon:" +msgstr "Minimum prosjektversjon: " -#: ../../Zotlabs/Module/Admin/Addons.php:355 +#: ../../Zotlabs/Module/Admin/Addons.php:358 msgid "Maximum project version: " -msgstr "Maksimum prosjektversjon:" +msgstr "Maksimum prosjektversjon: " -#: ../../Zotlabs/Module/Admin/Addons.php:356 +#: ../../Zotlabs/Module/Admin/Addons.php:359 msgid "Minimum PHP version: " -msgstr "Minimum PHP-versjon:" +msgstr "Minimum PHP-versjon: " -#: ../../Zotlabs/Module/Admin/Addons.php:357 +#: ../../Zotlabs/Module/Admin/Addons.php:360 msgid "Compatible Server Roles: " msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:358 +#: ../../Zotlabs/Module/Admin/Addons.php:361 msgid "Requires: " -msgstr "Krever:" +msgstr "Krever: " -#: ../../Zotlabs/Module/Admin/Addons.php:359 -#: ../../Zotlabs/Module/Admin/Addons.php:446 +#: ../../Zotlabs/Module/Admin/Addons.php:362 +#: ../../Zotlabs/Module/Admin/Addons.php:449 msgid "Disabled - version incompatibility" msgstr "Skrudd av - versjonsinkompatibilitet" -#: ../../Zotlabs/Module/Admin/Addons.php:415 +#: ../../Zotlabs/Module/Admin/Addons.php:418 msgid "Enter the public git repository URL of the addon repo." msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:416 +#: ../../Zotlabs/Module/Admin/Addons.php:419 msgid "Addon repo git URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:417 +#: ../../Zotlabs/Module/Admin/Addons.php:420 msgid "Custom repo name" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:417 +#: ../../Zotlabs/Module/Admin/Addons.php:420 +#, fuzzy msgid "(optional)" -msgstr "" +msgstr "Valgfritt" -#: ../../Zotlabs/Module/Admin/Addons.php:418 +#: ../../Zotlabs/Module/Admin/Addons.php:421 msgid "Download Addon Repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:425 +#: ../../Zotlabs/Module/Admin/Addons.php:428 msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:426 ../../Zotlabs/Lib/Apps.php:545 +#: ../../Zotlabs/Module/Admin/Addons.php:429 ../../Zotlabs/Lib/Apps.php:546 msgid "Install" msgstr "Installer" -#: ../../Zotlabs/Module/Admin/Addons.php:449 +#: ../../Zotlabs/Module/Admin/Addons.php:452 msgid "Manage Repos" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:450 +#: ../../Zotlabs/Module/Admin/Addons.php:453 msgid "Installed Addon Repositories" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:451 +#: ../../Zotlabs/Module/Admin/Addons.php:454 msgid "Install a New Addon Repository" msgstr "" -#: ../../Zotlabs/Module/Admin/Addons.php:458 +#: ../../Zotlabs/Module/Admin/Addons.php:461 msgid "Switch branch" msgstr "" -#: ../../Zotlabs/Module/Apps.php:50 +#: ../../Zotlabs/Module/Apps.php:51 msgid "Installed Apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:53 +#: ../../Zotlabs/Module/Apps.php:54 msgid "Manage Apps" msgstr "" -#: ../../Zotlabs/Module/Apps.php:54 +#: ../../Zotlabs/Module/Apps.php:55 msgid "Create Custom App" msgstr "" @@ -11423,11 +11427,11 @@ msgid "" "Channel removals are not allowed within 48 hours of changing the account " "password." msgstr "" -"Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av" -" kontopassordet." +"Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av " +"kontopassordet." #: ../../Zotlabs/Module/Removeme.php:60 ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:281 +#: ../../Zotlabs/Module/Settings/Channel.php:282 msgid "Remove Channel" msgstr "Fjern kanal" @@ -11435,7 +11439,7 @@ msgstr "Fjern kanal" #: ../../Zotlabs/Module/Removeaccount.php:58 #: ../../Zotlabs/Module/Changeaddr.php:78 msgid "WARNING: " -msgstr "ADVARSEL:" +msgstr "ADVARSEL: " #: ../../Zotlabs/Module/Removeme.php:61 msgid "This channel will be permanently removed. " @@ -11612,19 +11616,20 @@ msgstr "%d nye introduksjoner" msgid "Delegated Channel" msgstr "Delegert kanal" -#: ../../Zotlabs/Module/Pdledit_gui.php:118 +#: ../../Zotlabs/Module/Pdledit_gui.php:119 +#, fuzzy msgid "Layout not found" -msgstr "" +msgstr "Layouten ble ikke funnet." -#: ../../Zotlabs/Module/Pdledit_gui.php:126 +#: ../../Zotlabs/Module/Pdledit_gui.php:127 msgid "This template does not support pdledi_gui (no content regions defined)" msgstr "" -#: ../../Zotlabs/Module/Pdledit_gui.php:361 +#: ../../Zotlabs/Module/Pdledit_gui.php:403 msgid "Main page content" msgstr "" -#: ../../Zotlabs/Module/Pdledit_gui.php:362 +#: ../../Zotlabs/Module/Pdledit_gui.php:404 msgid "The main page content can not be edited!" msgstr "" @@ -11672,7 +11677,7 @@ msgstr "" msgid "Automatically assign this role to new contacts" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:248 ../../Zotlabs/Lib/Apps.php:378 +#: ../../Zotlabs/Module/Permcats.php:248 ../../Zotlabs/Lib/Apps.php:379 msgid "Contact Roles" msgstr "" @@ -11688,7 +11693,7 @@ msgstr "" msgid "Deleting" msgstr "" -#: ../../Zotlabs/Module/Permcats.php:253 ../../Zotlabs/Module/Defperms.php:262 +#: ../../Zotlabs/Module/Permcats.php:253 ../../Zotlabs/Module/Defperms.php:261 #: ../../Zotlabs/Module/Connedit.php:713 msgid "inherited" msgstr "arvet" @@ -11750,21 +11755,19 @@ msgstr "Ikke i stand til å finne hubben din." msgid "Post successful." msgstr "Innlegg vellykket." -#: ../../Zotlabs/Module/Moderate.php:67 -msgid "Comment approved" -msgstr "" - -#: ../../Zotlabs/Module/Moderate.php:71 -msgid "Comment deleted" -msgstr "" +#: ../../Zotlabs/Module/Moderate.php:70 +#, fuzzy +#| msgid "Account approved." +msgid "Item approved" +msgstr "Konto godkjent." #: ../../Zotlabs/Module/Removeaccount.php:35 msgid "" "Account removals are not allowed within 48 hours of changing the account " "password." msgstr "" -"Sletting av kontoer er ikke tillatt innen 48 timer etter endring av" -" kontopassordet." +"Sletting av kontoer er ikke tillatt innen 48 timer etter endring av " +"kontopassordet." #: ../../Zotlabs/Module/Removeaccount.php:57 msgid "Remove This Account" @@ -11775,14 +11778,15 @@ msgid "" "This account and all its channels will be completely removed from the " "network. " msgstr "" -"Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket." +"Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra " +"nettverket. " #: ../../Zotlabs/Module/Removeaccount.php:58 msgid "This action is permanent and can not be undone!" msgstr "Denne handlingen er permanent og kan ikke angres!" #: ../../Zotlabs/Module/Removeaccount.php:61 -#: ../../Zotlabs/Module/Settings/Account.php:109 +#: ../../Zotlabs/Module/Settings/Account.php:111 msgid "Remove Account" msgstr "Slett konto" @@ -11817,9 +11821,9 @@ msgid "" "This will export your posts, direct messages, articles and cards per month " "stored into a zip file per year. Months with no posts will be dismissed." msgstr "" -"Dette vil eksportere dine innlegg, direktemeldinger, artikler og kort, en fil" -" for hver måned, pakket i en zip fil for hvert år. Måneder uten innhold blir" -" ignorert." +"Dette vil eksportere dine innlegg, direktemeldinger, artikler og kort, en " +"fil for hver måned, pakket i en zip fil for hvert år. Måneder uten innhold " +"blir ignorert." #: ../../Zotlabs/Module/Uexport.php:180 msgid "Export wikis" @@ -11862,11 +11866,11 @@ msgid "" "a> on any site containing your channel." msgstr "" -#: ../../Zotlabs/Module/Display.php:336 +#: ../../Zotlabs/Module/Display.php:341 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:381 +#: ../../Zotlabs/Module/Display.php:385 msgid "Item has been removed." msgstr "" @@ -11901,8 +11905,8 @@ msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" -"Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\"," -" \"Sykkelgruppa\"" +"Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", " +"\"Sykkelgruppa\"" #: ../../Zotlabs/Module/New_channel.php:165 msgid "" @@ -11914,11 +11918,12 @@ msgid "Allowed characters are a-z 0-9, - and _" msgstr "" #: ../../Zotlabs/Module/New_channel.php:175 +#, fuzzy msgid "Channel name" -msgstr "" +msgstr "Kanalnavn" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:232 +#: ../../Zotlabs/Module/Settings/Channel.php:233 msgid "Channel role" msgstr "" @@ -11937,25 +11942,26 @@ msgstr "" msgid "" "or import an existing channel from another location." msgstr "" -"eller importer en eksisterende kanal fra et annet sted." +"eller importer en eksisterende kanal fra et annet " +"sted." #: ../../Zotlabs/Module/New_channel.php:188 msgid "Validate" msgstr "" -#: ../../Zotlabs/Module/Dircensor.php:42 +#: ../../Zotlabs/Module/Dircensor.php:61 msgid "Entry censored" msgstr "" -#: ../../Zotlabs/Module/Dircensor.php:45 -msgid "Entry uncensored" +#: ../../Zotlabs/Module/Dircensor.php:64 +msgid "Entry OK" msgstr "" #: ../../Zotlabs/Module/Service_limits.php:23 msgid "No service class restrictions found." msgstr "Ingen restriksjoner er funnet i tjenesteklasse." -#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:354 +#: ../../Zotlabs/Module/Mood.php:152 ../../Zotlabs/Lib/Apps.php:355 msgid "Mood" msgstr "Stemning" @@ -11968,8 +11974,9 @@ msgid "About this site" msgstr "" #: ../../Zotlabs/Module/Siteinfo.php:22 +#, fuzzy msgid "Site Name" -msgstr "" +msgstr "Nettstedets navn" #: ../../Zotlabs/Module/Siteinfo.php:26 msgid "Administrator" @@ -12017,43 +12024,44 @@ msgstr "Feil oppsett for app-en." msgid "Embed code" msgstr "Innbyggingskode" -#: ../../Zotlabs/Module/Appman.php:204 +#: ../../Zotlabs/Module/Appman.php:203 msgid "Edit App" msgstr "Endre app" -#: ../../Zotlabs/Module/Appman.php:204 +#: ../../Zotlabs/Module/Appman.php:203 msgid "Create App" msgstr "Lag app" -#: ../../Zotlabs/Module/Appman.php:209 +#: ../../Zotlabs/Module/Appman.php:208 msgid "Name of app" msgstr "Navn på app" -#: ../../Zotlabs/Module/Appman.php:210 +#: ../../Zotlabs/Module/Appman.php:209 msgid "Location (URL) of app" msgstr "Plassering (URL) til app" -#: ../../Zotlabs/Module/Appman.php:212 +#: ../../Zotlabs/Module/Appman.php:211 msgid "Photo icon URL" msgstr "Bildeikon URL" -#: ../../Zotlabs/Module/Appman.php:212 +#: ../../Zotlabs/Module/Appman.php:211 msgid "80 x 80 pixels - optional" msgstr "80 x80 pixler - valgfritt" -#: ../../Zotlabs/Module/Appman.php:213 +#: ../../Zotlabs/Module/Appman.php:212 +#, fuzzy msgid "Categories (optional, comma separated list)" -msgstr "" +msgstr "Kategorier (valgfri, kommaseparert liste)" -#: ../../Zotlabs/Module/Appman.php:214 +#: ../../Zotlabs/Module/Appman.php:213 msgid "Version ID" msgstr "Versjons-ID" -#: ../../Zotlabs/Module/Appman.php:215 +#: ../../Zotlabs/Module/Appman.php:214 msgid "Price of app" msgstr "Pris på app" -#: ../../Zotlabs/Module/Appman.php:216 +#: ../../Zotlabs/Module/Appman.php:215 msgid "Location (URL) to purchase app" msgstr "Plassering (URL) for å kjøpe app" @@ -12165,11 +12173,12 @@ msgid "Location independence is not supported by their network." msgstr "" #: ../../Zotlabs/Module/Contactedit.php:395 +#, fuzzy msgid "View profile" -msgstr "" +msgstr "Vis profil" #: ../../Zotlabs/Module/Contactedit.php:397 -#: ../../Zotlabs/Module/Connections.php:405 +#: ../../Zotlabs/Module/Connections.php:414 msgid "This is a group/forum channel" msgstr "" @@ -12188,13 +12197,13 @@ msgid "Custom Filter" msgstr "Tilpasset filter" #: ../../Zotlabs/Module/Contactedit.php:423 -#: ../../Zotlabs/Module/Settings/Channel.php:285 +#: ../../Zotlabs/Module/Settings/Channel.php:286 #: ../../Zotlabs/Module/Connedit.php:706 msgid "Only import posts with this text" msgstr "Bare importer innlegg med disse ordene" #: ../../Zotlabs/Module/Contactedit.php:424 -#: ../../Zotlabs/Module/Settings/Channel.php:284 +#: ../../Zotlabs/Module/Settings/Channel.php:285 #: ../../Zotlabs/Module/Connedit.php:707 msgid "Do not import posts with this text" msgstr "Ikke importer innlegg med denne teksten" @@ -12244,7 +12253,7 @@ msgid "Contact update failed" msgstr "" #: ../../Zotlabs/Module/Contactedit.php:462 -#: ../../Zotlabs/Module/Connections.php:348 +#: ../../Zotlabs/Module/Connections.php:357 msgid "Approve connection" msgstr "Godkjenn forbindelse" @@ -12254,8 +12263,9 @@ msgid "Refresh succeeded" msgstr "" #: ../../Zotlabs/Module/Contactedit.php:511 +#, fuzzy msgid "Refresh failed - channel is currently unavailable" -msgstr "" +msgstr "Oppfrisking mislyktes - kanalen er for øyeblikket utilgjengelig." #: ../../Zotlabs/Module/Contactedit.php:530 msgid "Block status updated" @@ -12334,7 +12344,7 @@ msgid "Unignore" msgstr "Ikke ignorer lenger" #: ../../Zotlabs/Module/Contactedit.php:646 -#: ../../Zotlabs/Module/Connections.php:351 +#: ../../Zotlabs/Module/Connections.php:360 #: ../../Zotlabs/Module/Connedit.php:516 msgid "Ignore" msgstr "Ignorer" @@ -12343,8 +12353,8 @@ msgstr "Ignorer" #: ../../Zotlabs/Module/Connedit.php:519 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -"Ignorer eller fjern ignorering av all inngående kommunikasjon fra denne" -" forbindelsen" +"Ignorer eller fjern ignorering av all inngående kommunikasjon fra denne " +"forbindelsen" #: ../../Zotlabs/Module/Contactedit.php:649 #: ../../Zotlabs/Module/Connedit.php:520 @@ -12366,8 +12376,8 @@ msgstr "Arkiver" msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -"Arkiver eller fjern arkivering av denne forbindelsen - marker kanal som død," -" men behold innhold" +"Arkiver eller fjern arkivering av denne forbindelsen - marker kanal som død, " +"men behold innhold" #: ../../Zotlabs/Module/Contactedit.php:656 #: ../../Zotlabs/Module/Connedit.php:528 @@ -12400,90 +12410,91 @@ msgstr "Denne forbindelsen er skjult!" msgid "Delete this connection" msgstr "Slett denne forbindelsen" -#: ../../Zotlabs/Module/Directory.php:121 +#: ../../Zotlabs/Module/Directory.php:124 msgid "No default suggestions were found." msgstr "" -#: ../../Zotlabs/Module/Directory.php:281 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "%d vurdering" -msgstr[1] "%d vurderinger" - #: ../../Zotlabs/Module/Directory.php:292 msgid "Gender: " -msgstr "Kjønn:" +msgstr "Kjønn: " #: ../../Zotlabs/Module/Directory.php:294 msgid "Status: " -msgstr "Status:" +msgstr "Status: " #: ../../Zotlabs/Module/Directory.php:296 msgid "Homepage: " -msgstr "Hjemmeside:" +msgstr "Hjemmeside: " -#: ../../Zotlabs/Module/Directory.php:359 +#: ../../Zotlabs/Module/Directory.php:357 msgid "Description:" msgstr "Beskrivelse:" -#: ../../Zotlabs/Module/Directory.php:370 +#: ../../Zotlabs/Module/Directory.php:359 +msgid "Unsafe" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:362 +msgid "Spam" +msgstr "" + +#: ../../Zotlabs/Module/Directory.php:372 msgid "Public Forum:" msgstr "Offentlig forum:" -#: ../../Zotlabs/Module/Directory.php:373 +#: ../../Zotlabs/Module/Directory.php:375 msgid "Keywords: " -msgstr "Nøkkelord:" +msgstr "Nøkkelord: " -#: ../../Zotlabs/Module/Directory.php:376 +#: ../../Zotlabs/Module/Directory.php:378 msgid "Don't suggest" msgstr "Ikke foreslå" -#: ../../Zotlabs/Module/Directory.php:378 +#: ../../Zotlabs/Module/Directory.php:380 msgid "Common connections (estimated):" msgstr "" -#: ../../Zotlabs/Module/Directory.php:427 +#: ../../Zotlabs/Module/Directory.php:430 msgid "Global Directory" msgstr "Global katalog" -#: ../../Zotlabs/Module/Directory.php:427 +#: ../../Zotlabs/Module/Directory.php:430 msgid "Local Directory" msgstr "Lokal katalog" -#: ../../Zotlabs/Module/Directory.php:433 +#: ../../Zotlabs/Module/Directory.php:436 msgid "Finding:" msgstr "Finner:" -#: ../../Zotlabs/Module/Directory.php:438 +#: ../../Zotlabs/Module/Directory.php:441 msgid "next page" -msgstr "Neste side" +msgstr "neste side" -#: ../../Zotlabs/Module/Directory.php:438 +#: ../../Zotlabs/Module/Directory.php:441 msgid "previous page" -msgstr "Forrige side" +msgstr "forrige side" -#: ../../Zotlabs/Module/Directory.php:439 +#: ../../Zotlabs/Module/Directory.php:442 msgid "Sort options" msgstr "Sorteringsvalg" -#: ../../Zotlabs/Module/Directory.php:440 +#: ../../Zotlabs/Module/Directory.php:443 msgid "Alphabetic" msgstr "Alfabetisk" -#: ../../Zotlabs/Module/Directory.php:441 +#: ../../Zotlabs/Module/Directory.php:444 msgid "Reverse Alphabetic" msgstr "Omvendt alfabetisk" -#: ../../Zotlabs/Module/Directory.php:442 +#: ../../Zotlabs/Module/Directory.php:445 msgid "Newest to Oldest" msgstr "Nyest til eldst" -#: ../../Zotlabs/Module/Directory.php:443 +#: ../../Zotlabs/Module/Directory.php:446 msgid "Oldest to Newest" msgstr "Eldst til nyest" -#: ../../Zotlabs/Module/Directory.php:460 +#: ../../Zotlabs/Module/Directory.php:464 msgid "No entries (some entries may be hidden)." msgstr "Ingen oppføringer (noen oppføringer kan være skjult)." @@ -12504,19 +12515,19 @@ msgid "" "Do you want to authorize this application to access your posts and contacts, " "and/or create new posts for you?" msgstr "" -"Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter," -" og/eller lage nye innlegg for deg?" +"Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, " +"og/eller lage nye innlegg for deg?" #: ../../Zotlabs/Module/Regmod.php:15 msgid "Please login." msgstr "Vennligst logg inn." -#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155 +#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:153 #: ../../Zotlabs/Module/Editblock.php:113 msgid "Block Name" msgstr "Byggeklossens navn" -#: ../../Zotlabs/Module/Blocks.php:156 +#: ../../Zotlabs/Module/Blocks.php:154 msgid "Block Title" msgstr "Byggeklossens tittel" @@ -12531,10 +12542,10 @@ msgid "" "here to complete the account verification step. Please allow a few minutes " "for delivery, and check your spam folder if you do not see the message." msgstr "" -"En verifikasjonskode ble sendt til epostadressen din [%s]. Skriv inn koden du" -" mottok her for å fullføre kontoverifikasjonen. Det kan ta noen minutter før" -" du mottar koden. Sjekk også at eposten ikke har havnet i mappen for" -" søppelpost om du ikke ser den etter en stund." +"En verifikasjonskode ble sendt til epostadressen din [%s]. Skriv inn koden " +"du mottok her for å fullføre kontoverifikasjonen. Det kan ta noen minutter " +"før du mottar koden. Sjekk også at eposten ikke har havnet i mappen for " +"søppelpost om du ikke ser den etter en stund." #: ../../Zotlabs/Module/Email_validation.php:38 msgid "Resend Email" @@ -12550,13 +12561,13 @@ msgstr "Elementet er ikke tilgjengelig." #: ../../Zotlabs/Module/Vote.php:40 msgid "Poll not found." -msgstr "" +msgstr "Fant ikke spørreskjema." -#: ../../Zotlabs/Module/Vote.php:71 +#: ../../Zotlabs/Module/Vote.php:69 msgid "Invalid response." msgstr "" -#: ../../Zotlabs/Module/Vote.php:127 +#: ../../Zotlabs/Module/Vote.php:125 msgid "Response submitted. Updates may not appear instantly." msgstr "" @@ -12604,8 +12615,9 @@ msgid "Use Photo for Profile" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:546 +#, fuzzy msgid "Change Profile Photo" -msgstr "" +msgstr "Endre profilbilde" #: ../../Zotlabs/Module/Profile_photo.php:548 msgid "Reset to default" @@ -12633,8 +12645,9 @@ msgid "Please adjust the image cropping for optimum viewing." msgstr "Vennligst juster bildebeskjæringen for optimal visning." #: ../../Zotlabs/Module/Profile_photo.php:584 +#, fuzzy msgid "Done editing" -msgstr "" +msgstr "Avslutt redigering" #: ../../Zotlabs/Module/Editblock.php:138 msgid "Edit Block" @@ -12648,12 +12661,12 @@ msgstr "" msgid "or select an existing folder (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:194 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Lib/ThreadItem.php:186 msgid "Save to Folder" msgstr "Lagre i mappe" #: ../../Zotlabs/Module/Editlayout.php:128 ../../Zotlabs/Module/Layouts.php:129 -#: ../../Zotlabs/Module/Layouts.php:189 +#: ../../Zotlabs/Module/Layouts.php:187 msgid "Layout Name" msgstr "Layout-navn" @@ -12667,30 +12680,29 @@ msgstr "Endre layout" #: ../../Zotlabs/Module/Connections.php:58 #: ../../Zotlabs/Module/Connections.php:116 -#: ../../Zotlabs/Module/Connections.php:282 msgid "Active" msgstr "" #: ../../Zotlabs/Module/Connections.php:63 -#: ../../Zotlabs/Module/Connections.php:182 -#: ../../Zotlabs/Module/Connections.php:287 +#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:296 msgid "Blocked" msgstr "Blokkert" #: ../../Zotlabs/Module/Connections.php:68 -#: ../../Zotlabs/Module/Connections.php:189 -#: ../../Zotlabs/Module/Connections.php:286 +#: ../../Zotlabs/Module/Connections.php:192 +#: ../../Zotlabs/Module/Connections.php:295 msgid "Ignored" msgstr "Ignorert" #: ../../Zotlabs/Module/Connections.php:73 -#: ../../Zotlabs/Module/Connections.php:203 -#: ../../Zotlabs/Module/Connections.php:285 +#: ../../Zotlabs/Module/Connections.php:206 +#: ../../Zotlabs/Module/Connections.php:294 msgid "Hidden" msgstr "Skjult" #: ../../Zotlabs/Module/Connections.php:78 -#: ../../Zotlabs/Module/Connections.php:196 +#: ../../Zotlabs/Module/Connections.php:199 msgid "Archived/Unreachable" msgstr "" @@ -12700,101 +12712,101 @@ msgstr "" msgid "New" msgstr "Nye" -#: ../../Zotlabs/Module/Connections.php:158 +#: ../../Zotlabs/Module/Connections.php:161 msgid "Active Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:161 +#: ../../Zotlabs/Module/Connections.php:164 msgid "Show active connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:168 +#: ../../Zotlabs/Module/Connections.php:171 msgid "Show pending (new) connections" msgstr "Vis ventende (nye) forbindelser" -#: ../../Zotlabs/Module/Connections.php:185 +#: ../../Zotlabs/Module/Connections.php:188 msgid "Only show blocked connections" msgstr "Vis bare forbindelser som er blokkert" -#: ../../Zotlabs/Module/Connections.php:192 +#: ../../Zotlabs/Module/Connections.php:195 msgid "Only show ignored connections" msgstr "Vis bare ignorerte forbindelser" -#: ../../Zotlabs/Module/Connections.php:199 +#: ../../Zotlabs/Module/Connections.php:202 msgid "Only show archived/unreachable connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:206 +#: ../../Zotlabs/Module/Connections.php:209 msgid "Only show hidden connections" msgstr "Vis bare skjulte forbindelser" -#: ../../Zotlabs/Module/Connections.php:221 +#: ../../Zotlabs/Module/Connections.php:224 msgid "Show all connections" msgstr "Vis alle forbindelser" -#: ../../Zotlabs/Module/Connections.php:283 +#: ../../Zotlabs/Module/Connections.php:292 msgid "Pending approval" msgstr "Venter på godkjenning" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:293 msgid "Archived" msgstr "Arkivert" -#: ../../Zotlabs/Module/Connections.php:288 +#: ../../Zotlabs/Module/Connections.php:297 msgid "Not connected at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:327 +#: ../../Zotlabs/Module/Connections.php:336 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../Zotlabs/Module/Connections.php:328 +#: ../../Zotlabs/Module/Connections.php:337 msgid "Edit connection" msgstr "Endre forbindelse" -#: ../../Zotlabs/Module/Connections.php:330 +#: ../../Zotlabs/Module/Connections.php:339 msgid "Delete connection" msgstr "Slett forbindelse" -#: ../../Zotlabs/Module/Connections.php:336 +#: ../../Zotlabs/Module/Connections.php:345 msgid "Channel address" msgstr "Kanaladresse" -#: ../../Zotlabs/Module/Connections.php:341 +#: ../../Zotlabs/Module/Connections.php:350 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:343 +#: ../../Zotlabs/Module/Connections.php:352 msgid "Status" msgstr "Status" -#: ../../Zotlabs/Module/Connections.php:346 +#: ../../Zotlabs/Module/Connections.php:355 msgid "Connected" msgstr "Forbundet" -#: ../../Zotlabs/Module/Connections.php:350 +#: ../../Zotlabs/Module/Connections.php:359 msgid "Ignore connection" msgstr "Ignorer forbindelse" -#: ../../Zotlabs/Module/Connections.php:352 +#: ../../Zotlabs/Module/Connections.php:361 msgid "Recent activity" msgstr "Nylig aktivitet" -#: ../../Zotlabs/Module/Connections.php:358 +#: ../../Zotlabs/Module/Connections.php:367 msgid "Connect at this location" msgstr "" -#: ../../Zotlabs/Module/Connections.php:395 +#: ../../Zotlabs/Module/Connections.php:404 #: ../../Zotlabs/Module/Connedit.php:686 msgid "Contact role" msgstr "" -#: ../../Zotlabs/Module/Connections.php:396 +#: ../../Zotlabs/Module/Connections.php:405 msgid "Search your connections" msgstr "Søk blant dine forbindelser" -#: ../../Zotlabs/Module/Connections.php:397 +#: ../../Zotlabs/Module/Connections.php:406 msgid "Contact search" msgstr "" @@ -12816,8 +12828,9 @@ msgid "Select a profile:" msgstr "Velg en profil:" #: ../../Zotlabs/Module/Cover_photo.php:422 +#, fuzzy msgid "Change Cover Photo" -msgstr "" +msgstr "Endre omslagsbilde" #: ../../Zotlabs/Module/Cover_photo.php:438 msgid "Select existing photo" @@ -12827,168 +12840,164 @@ msgstr "" msgid "Done Editing" msgstr "Avslutt redigering" -#: ../../Zotlabs/Module/Photos.php:80 -msgid "Page owner information could not be retrieved." -msgstr "Informasjon om sideeier kunne ikke hentes." - -#: ../../Zotlabs/Module/Photos.php:96 ../../Zotlabs/Module/Photos.php:115 +#: ../../Zotlabs/Module/Photos.php:84 ../../Zotlabs/Module/Photos.php:103 msgid "Album not found." msgstr "Albumet ble ikke funnet." -#: ../../Zotlabs/Module/Photos.php:105 +#: ../../Zotlabs/Module/Photos.php:93 msgid "Delete Album" msgstr "Slett album" -#: ../../Zotlabs/Module/Photos.php:177 ../../Zotlabs/Module/Photos.php:1065 +#: ../../Zotlabs/Module/Photos.php:165 ../../Zotlabs/Module/Photos.php:1054 msgid "Delete Photo" msgstr "Slett bilde" -#: ../../Zotlabs/Module/Photos.php:534 +#: ../../Zotlabs/Module/Photos.php:522 msgid "No photos selected" msgstr "Ingen bilder valgt" -#: ../../Zotlabs/Module/Photos.php:583 +#: ../../Zotlabs/Module/Photos.php:571 msgid "Access to this item is restricted." msgstr "Tilgang til dette elementet er begrenset." -#: ../../Zotlabs/Module/Photos.php:626 -#, php-format -msgid "%1$.2f MB of %2$.2f MB photo storage used." -msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt." - -#: ../../Zotlabs/Module/Photos.php:629 +#: ../../Zotlabs/Module/Photos.php:614 #, php-format msgid "%1$.2f MB photo storage used." msgstr "%1$.2f MB lagringsplass til bilder er brukt." -#: ../../Zotlabs/Module/Photos.php:671 +#: ../../Zotlabs/Module/Photos.php:618 +#, php-format +msgid "%1$.2f MB of %2$.2f MB photo storage used." +msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt." + +#: ../../Zotlabs/Module/Photos.php:660 msgid "Upload Photos" msgstr "Last opp bilder" -#: ../../Zotlabs/Module/Photos.php:675 +#: ../../Zotlabs/Module/Photos.php:664 msgid "Enter an album name" msgstr "Skriv et albumnavn" -#: ../../Zotlabs/Module/Photos.php:676 +#: ../../Zotlabs/Module/Photos.php:665 msgid "or select an existing album (doubleclick)" msgstr "eller velg et eksisterende album (dobbeltklikk)" -#: ../../Zotlabs/Module/Photos.php:677 +#: ../../Zotlabs/Module/Photos.php:666 msgid "Create a status post for this upload" msgstr "Lag et statusinnlegg for denne opplastingen" -#: ../../Zotlabs/Module/Photos.php:679 +#: ../../Zotlabs/Module/Photos.php:668 msgid "Description (optional)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:767 +#: ../../Zotlabs/Module/Photos.php:756 msgid "Show Newest First" msgstr "Vis nyeste først" -#: ../../Zotlabs/Module/Photos.php:769 +#: ../../Zotlabs/Module/Photos.php:758 msgid "Show Oldest First" msgstr "Vis eldste først" -#: ../../Zotlabs/Module/Photos.php:826 ../../Zotlabs/Module/Photos.php:1368 +#: ../../Zotlabs/Module/Photos.php:815 ../../Zotlabs/Module/Photos.php:1354 msgid "Add Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:874 +#: ../../Zotlabs/Module/Photos.php:863 msgid "Permission denied. Access to this item may be restricted." msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset." -#: ../../Zotlabs/Module/Photos.php:876 +#: ../../Zotlabs/Module/Photos.php:865 msgid "Photo not available" msgstr "Bilde er utilgjengelig" -#: ../../Zotlabs/Module/Photos.php:934 +#: ../../Zotlabs/Module/Photos.php:923 msgid "Use as profile photo" msgstr "Bruk som profilbilde" -#: ../../Zotlabs/Module/Photos.php:935 +#: ../../Zotlabs/Module/Photos.php:924 msgid "Use as cover photo" msgstr "Bruk som omslagsbilde" -#: ../../Zotlabs/Module/Photos.php:942 +#: ../../Zotlabs/Module/Photos.php:931 msgid "Private Photo" msgstr "Privat bilde" -#: ../../Zotlabs/Module/Photos.php:957 +#: ../../Zotlabs/Module/Photos.php:946 msgid "View Full Size" msgstr "Vis i full størrelse" -#: ../../Zotlabs/Module/Photos.php:1039 +#: ../../Zotlabs/Module/Photos.php:1028 msgid "Edit photo" msgstr "Endre bilde" -#: ../../Zotlabs/Module/Photos.php:1041 +#: ../../Zotlabs/Module/Photos.php:1030 msgid "Rotate CW (right)" msgstr "Roter med klokka (mot høyre)" -#: ../../Zotlabs/Module/Photos.php:1042 +#: ../../Zotlabs/Module/Photos.php:1031 msgid "Rotate CCW (left)" msgstr "Roter mot klokka (venstre)" -#: ../../Zotlabs/Module/Photos.php:1045 +#: ../../Zotlabs/Module/Photos.php:1034 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1046 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Enter a new album name" msgstr "Skriv et nytt albumnavn" -#: ../../Zotlabs/Module/Photos.php:1047 +#: ../../Zotlabs/Module/Photos.php:1036 msgid "or select an existing one (doubleclick)" msgstr "eller velg et eksisterende album (dobbeltklikk)" -#: ../../Zotlabs/Module/Photos.php:1052 +#: ../../Zotlabs/Module/Photos.php:1041 msgid "Add a Tag" msgstr "Legg til merkelapp" -#: ../../Zotlabs/Module/Photos.php:1060 +#: ../../Zotlabs/Module/Photos.php:1049 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com" -#: ../../Zotlabs/Module/Photos.php:1063 +#: ../../Zotlabs/Module/Photos.php:1052 msgid "Flag as adult in album view" msgstr "Flag som voksent i albumvisning" -#: ../../Zotlabs/Module/Photos.php:1082 ../../Zotlabs/Lib/ThreadItem.php:317 +#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:310 msgid "I like this (toggle)" msgstr "Jeg liker dette (skru av og på)" -#: ../../Zotlabs/Module/Photos.php:1083 ../../Zotlabs/Lib/ThreadItem.php:318 +#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:311 msgid "I don't like this (toggle)" msgstr "Jeg liker ikke dette (skru av og på)" -#: ../../Zotlabs/Module/Photos.php:1101 ../../Zotlabs/Module/Photos.php:1217 -#: ../../Zotlabs/Lib/ThreadItem.php:832 +#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1203 +#: ../../Zotlabs/Lib/ThreadItem.php:828 msgid "This is you" msgstr "Dette er deg" -#: ../../Zotlabs/Module/Photos.php:1138 ../../Zotlabs/Module/Photos.php:1150 -#: ../../Zotlabs/Lib/ThreadItem.php:237 ../../Zotlabs/Lib/ThreadItem.php:249 +#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136 +#: ../../Zotlabs/Lib/ThreadItem.php:229 ../../Zotlabs/Lib/ThreadItem.php:242 msgid "View all" msgstr "Vis alle" -#: ../../Zotlabs/Module/Photos.php:1251 +#: ../../Zotlabs/Module/Photos.php:1237 msgid "Photo Tools" msgstr "Fotoverktøy" -#: ../../Zotlabs/Module/Photos.php:1260 +#: ../../Zotlabs/Module/Photos.php:1246 msgid "In This Photo:" msgstr "I dette bildet:" -#: ../../Zotlabs/Module/Photos.php:1265 +#: ../../Zotlabs/Module/Photos.php:1251 msgid "Map" msgstr "Kart" -#: ../../Zotlabs/Module/Photos.php:1273 ../../Zotlabs/Lib/ThreadItem.php:497 +#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:490 msgctxt "noun" msgid "Likes" msgstr "Liker" -#: ../../Zotlabs/Module/Photos.php:1274 ../../Zotlabs/Lib/ThreadItem.php:498 +#: ../../Zotlabs/Module/Photos.php:1260 ../../Zotlabs/Lib/ThreadItem.php:491 msgctxt "noun" msgid "Dislikes" msgstr "Liker ikke" @@ -13016,10 +13025,10 @@ msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." msgstr "" -"Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.)" -" Tilbakestilling av passord mislyktes." +"Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) " +"Tilbakestilling av passord mislyktes." -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1757 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1755 msgid "Password Reset" msgstr "Tilbakestill passord" @@ -13044,8 +13053,8 @@ msgid "" "Your password may be changed from the Settings page after " "successful login." msgstr "" -"Ditt passord kan endres på siden Innstillinger etter vellykket" -" innlogging." +"Ditt passord kan endres på siden Innstillinger etter vellykket " +"innlogging." #: ../../Zotlabs/Module/Lostpass.php:117 #, php-format @@ -13061,18 +13070,19 @@ msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -"Skriv e-postadressen din og send inn for å tilbakestille passordet ditt." -" Sjekk deretter din e-post for videre instruksjoner." +"Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. " +"Sjekk deretter din e-post for videre instruksjoner." #: ../../Zotlabs/Module/Lostpass.php:132 msgid "Email Address" msgstr "E-postadresse" #: ../../Zotlabs/Module/Lostpass.php:133 ../../Zotlabs/Module/Pdledit.php:76 +#: ../../Zotlabs/Module/Pdledit.php:93 msgid "Reset" msgstr "Tilbakestill" -#: ../../Zotlabs/Module/Follow.php:93 +#: ../../Zotlabs/Module/Follow.php:92 msgid "Connection added." msgstr "" @@ -13089,15 +13099,15 @@ msgid "" "cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " "non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod" -" tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam," -" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo" -" consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse" -" cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat" -" non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." #: ../../Zotlabs/Module/Profiles.php:26 ../../Zotlabs/Module/Profiles.php:214 -#: ../../Zotlabs/Module/Profiles.php:643 +#: ../../Zotlabs/Module/Profiles.php:642 msgid "Profile not found." msgstr "Profilen ble ikke funnet." @@ -13121,235 +13131,235 @@ msgstr "Profilen er utilgjengelig for klonen." msgid "Profile unavailable to export." msgstr "Profilen er utilgjengelig for eksport." -#: ../../Zotlabs/Module/Profiles.php:225 +#: ../../Zotlabs/Module/Profiles.php:224 msgid "Profile Name is required." msgstr "Profilnavn er påkrevd." -#: ../../Zotlabs/Module/Profiles.php:430 +#: ../../Zotlabs/Module/Profiles.php:429 msgid "Marital Status" msgstr "Sivilstand" -#: ../../Zotlabs/Module/Profiles.php:434 +#: ../../Zotlabs/Module/Profiles.php:433 msgid "Romantic Partner" msgstr "Romantisk partner" -#: ../../Zotlabs/Module/Profiles.php:438 ../../Zotlabs/Module/Profiles.php:789 +#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:788 msgid "Likes" msgstr "Liker" -#: ../../Zotlabs/Module/Profiles.php:442 ../../Zotlabs/Module/Profiles.php:790 +#: ../../Zotlabs/Module/Profiles.php:441 ../../Zotlabs/Module/Profiles.php:789 msgid "Dislikes" msgstr "Liker ikke" -#: ../../Zotlabs/Module/Profiles.php:446 ../../Zotlabs/Module/Profiles.php:797 +#: ../../Zotlabs/Module/Profiles.php:445 ../../Zotlabs/Module/Profiles.php:796 msgid "Work/Employment" msgstr "Arbeid/sysselsetting" -#: ../../Zotlabs/Module/Profiles.php:449 +#: ../../Zotlabs/Module/Profiles.php:448 msgid "Religion" msgstr "Religion" -#: ../../Zotlabs/Module/Profiles.php:453 +#: ../../Zotlabs/Module/Profiles.php:452 msgid "Political Views" msgstr "Politiske synspunkter" -#: ../../Zotlabs/Module/Profiles.php:461 +#: ../../Zotlabs/Module/Profiles.php:460 msgid "Sexual Preference" msgstr "Seksuelle preferanser" -#: ../../Zotlabs/Module/Profiles.php:465 +#: ../../Zotlabs/Module/Profiles.php:464 msgid "Homepage" msgstr "Hjemmeside" -#: ../../Zotlabs/Module/Profiles.php:469 +#: ../../Zotlabs/Module/Profiles.php:468 msgid "Interests" msgstr "Interesser" -#: ../../Zotlabs/Module/Profiles.php:577 +#: ../../Zotlabs/Module/Profiles.php:576 msgid "Profile updated." msgstr "Profilen er oppdatert." -#: ../../Zotlabs/Module/Profiles.php:673 +#: ../../Zotlabs/Module/Profiles.php:672 msgid "Hide my connections from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:686 +#: ../../Zotlabs/Module/Profiles.php:685 msgid "Publish my default profile in the network directory" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 +#: ../../Zotlabs/Module/Profiles.php:693 msgid "Suggest me as a potential contact to new members" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:698 +#: ../../Zotlabs/Module/Profiles.php:697 msgid "Reveal my online status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Edit Profile Details" msgstr "Endre profildetaljer" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "View this profile" msgstr "Vis denne profilen" -#: ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:742 msgid "Profile Tools" msgstr "Profilverktøy" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Change cover photo" msgstr "Endre omslagsbilde" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "Create a new profile using these settings" msgstr "Lag en ny profil ved å bruke disse innstillingene" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:746 msgid "Clone this profile" msgstr "Klon denne profilen" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Delete this profile" msgstr "Slett denne profilen" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Add profile things" msgstr "Legg til profilting" -#: ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:749 msgid "Basic" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Relationship" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:755 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Import profile from file" msgstr "Importer profil fra fil" -#: ../../Zotlabs/Module/Profiles.php:756 +#: ../../Zotlabs/Module/Profiles.php:755 msgid "Export profile to file" msgstr "Eksporter profil til fil" -#: ../../Zotlabs/Module/Profiles.php:757 +#: ../../Zotlabs/Module/Profiles.php:756 msgid "Your gender" msgstr "Kjønn" -#: ../../Zotlabs/Module/Profiles.php:758 +#: ../../Zotlabs/Module/Profiles.php:757 msgid "Marital status" msgstr "Sivilstatus" -#: ../../Zotlabs/Module/Profiles.php:759 +#: ../../Zotlabs/Module/Profiles.php:758 msgid "Sexual preference" msgstr "Legning" -#: ../../Zotlabs/Module/Profiles.php:762 +#: ../../Zotlabs/Module/Profiles.php:761 msgid "Profile name" msgstr "Profilnavn" -#: ../../Zotlabs/Module/Profiles.php:764 +#: ../../Zotlabs/Module/Profiles.php:763 msgid "This is your default profile." msgstr "Dette er din standardprofil." -#: ../../Zotlabs/Module/Profiles.php:766 +#: ../../Zotlabs/Module/Profiles.php:765 msgid "Your full name" msgstr "Fullt navn" -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Short title/description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:767 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Maximal 190 characters" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:770 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Street address" msgstr "Gateadresse" -#: ../../Zotlabs/Module/Profiles.php:771 +#: ../../Zotlabs/Module/Profiles.php:770 msgid "Locality/City" msgstr "Sted/by" -#: ../../Zotlabs/Module/Profiles.php:772 +#: ../../Zotlabs/Module/Profiles.php:771 msgid "Region/State" msgstr "Region" -#: ../../Zotlabs/Module/Profiles.php:773 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Postal/Zip code" msgstr "Postnummer" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Who (if applicable)" msgstr "Hvem (om relevant)" -#: ../../Zotlabs/Module/Profiles.php:779 +#: ../../Zotlabs/Module/Profiles.php:778 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com" -#: ../../Zotlabs/Module/Profiles.php:780 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "Since (date)" msgstr "Fra (dato)" -#: ../../Zotlabs/Module/Profiles.php:783 +#: ../../Zotlabs/Module/Profiles.php:782 msgid "Tell us about yourself" msgstr "Fortell oss om deg selv" -#: ../../Zotlabs/Module/Profiles.php:785 +#: ../../Zotlabs/Module/Profiles.php:784 msgid "Hometown" msgstr "Hjemsted" -#: ../../Zotlabs/Module/Profiles.php:786 +#: ../../Zotlabs/Module/Profiles.php:785 msgid "Political views" msgstr "Politiske holdninger" -#: ../../Zotlabs/Module/Profiles.php:787 +#: ../../Zotlabs/Module/Profiles.php:786 msgid "Religious views" msgstr "Religiøse holdninger" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Keywords used in directory listings" msgstr "Nøkkelord for bruk i katalogoppføringen" -#: ../../Zotlabs/Module/Profiles.php:788 +#: ../../Zotlabs/Module/Profiles.php:787 msgid "Example: fishing photography software" msgstr "Eksempel: fisking fotografering programvare" -#: ../../Zotlabs/Module/Profiles.php:791 +#: ../../Zotlabs/Module/Profiles.php:790 msgid "Musical interests" msgstr "Musikkinteresser" -#: ../../Zotlabs/Module/Profiles.php:792 +#: ../../Zotlabs/Module/Profiles.php:791 msgid "Books, literature" msgstr "Bøker, litteratur" -#: ../../Zotlabs/Module/Profiles.php:793 +#: ../../Zotlabs/Module/Profiles.php:792 msgid "Television" msgstr "TV/fjernsyn" -#: ../../Zotlabs/Module/Profiles.php:794 +#: ../../Zotlabs/Module/Profiles.php:793 msgid "Film/Dance/Culture/Entertainment" msgstr "Film/dans/kultur/underholdning" -#: ../../Zotlabs/Module/Profiles.php:795 +#: ../../Zotlabs/Module/Profiles.php:794 msgid "Hobbies/Interests" msgstr "Hobbier/Interesser" -#: ../../Zotlabs/Module/Profiles.php:796 +#: ../../Zotlabs/Module/Profiles.php:795 msgid "Love/Romance" msgstr "Kjærlighet/romantikk" -#: ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Profiles.php:797 msgid "School/Education" msgstr "Skolle/utdanning" -#: ../../Zotlabs/Module/Profiles.php:799 +#: ../../Zotlabs/Module/Profiles.php:798 msgid "Contact information and social networks" msgstr "Kontaktinformasjon og andre sosiale nettverk" -#: ../../Zotlabs/Module/Profiles.php:800 +#: ../../Zotlabs/Module/Profiles.php:799 msgid "My other channels" msgstr "Mine andre kanaler" @@ -13393,132 +13403,133 @@ msgstr "" msgid "Rename Channel" msgstr "" -#: ../../Zotlabs/Module/Invite.php:56 +#: ../../Zotlabs/Module/Invite.php:69 msgid "Invite App" msgstr "" -#: ../../Zotlabs/Module/Invite.php:68 +#: ../../Zotlabs/Module/Invite.php:81 msgid "Register is closed" msgstr "" -#: ../../Zotlabs/Module/Invite.php:102 ../../Zotlabs/Module/Invite.php:549 +#: ../../Zotlabs/Module/Invite.php:115 ../../Zotlabs/Module/Invite.php:562 msgid "Note, the invitation code is valid up to" msgstr "" -#: ../../Zotlabs/Module/Invite.php:115 +#: ../../Zotlabs/Module/Invite.php:128 #, php-format msgid "Too many recipients for one invitation (max %d)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:119 +#: ../../Zotlabs/Module/Invite.php:132 msgid "No recipients for this invitation" msgstr "" -#: ../../Zotlabs/Module/Invite.php:138 +#: ../../Zotlabs/Module/Invite.php:151 #, php-format msgid "(%s) : Not a real email address" -msgstr "" +msgstr "(%s): Ikke en virkelig epostadresse" -#: ../../Zotlabs/Module/Invite.php:145 +#: ../../Zotlabs/Module/Invite.php:158 #, php-format msgid "(%s) : Not allowed email address" -msgstr "" +msgstr "(%s): Ikke en tillatt epostadresse" -#: ../../Zotlabs/Module/Invite.php:158 +#: ../../Zotlabs/Module/Invite.php:171 #, php-format msgid "(%s) : email address already in use" -msgstr "" +msgstr "(%s): epostadressen er allerede i bruk" -#: ../../Zotlabs/Module/Invite.php:165 +#: ../../Zotlabs/Module/Invite.php:178 #, php-format msgid "(%s) : Accepted email address" -msgstr "" +msgstr "(%s): Godkjent epostadresse" -#: ../../Zotlabs/Module/Invite.php:257 +#: ../../Zotlabs/Module/Invite.php:270 #, php-format msgid "To %s : Message delivery success." msgstr "" -#: ../../Zotlabs/Module/Invite.php:289 +#: ../../Zotlabs/Module/Invite.php:302 #, php-format msgid "%1$d mail(s) sent, %2$d mail error(s)" msgstr "" -#: ../../Zotlabs/Module/Invite.php:314 +#: ../../Zotlabs/Module/Invite.php:327 msgid "Invites not proposed by configuration" msgstr "" -#: ../../Zotlabs/Module/Invite.php:315 +#: ../../Zotlabs/Module/Invite.php:328 msgid "Contact the site admin" msgstr "" -#: ../../Zotlabs/Module/Invite.php:331 +#: ../../Zotlabs/Module/Invite.php:344 msgid "Invites by users not enabled" msgstr "" -#: ../../Zotlabs/Module/Invite.php:336 +#: ../../Zotlabs/Module/Invite.php:349 msgid "You have no more invitations available" msgstr "Du har ikke flere invitasjoner tilgjengelig" -#: ../../Zotlabs/Module/Invite.php:352 +#: ../../Zotlabs/Module/Invite.php:365 msgid "Not on xchan" msgstr "" -#: ../../Zotlabs/Module/Invite.php:385 +#: ../../Zotlabs/Module/Invite.php:398 msgid "All users invitation limit exceeded." msgstr "" -#: ../../Zotlabs/Module/Invite.php:403 +#: ../../Zotlabs/Module/Invite.php:416 msgid "Invitation expires after" msgstr "" -#: ../../Zotlabs/Module/Invite.php:504 ../../Zotlabs/Module/Invite.php:543 +#: ../../Zotlabs/Module/Invite.php:517 ../../Zotlabs/Module/Invite.php:556 msgid "Invitation" msgstr "" -#: ../../Zotlabs/Module/Invite.php:534 +#: ../../Zotlabs/Module/Invite.php:547 msgid "Send invitations" msgstr "Send invitasjoner" -#: ../../Zotlabs/Module/Invite.php:535 +#: ../../Zotlabs/Module/Invite.php:548 msgid "Invitations I am using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:536 +#: ../../Zotlabs/Module/Invite.php:549 msgid "Invitations we are using" msgstr "" -#: ../../Zotlabs/Module/Invite.php:537 +#: ../../Zotlabs/Module/Invite.php:550 msgid "§ Note, the email(s) sent will be recorded in the system logs" msgstr "" -#: ../../Zotlabs/Module/Invite.php:538 +#: ../../Zotlabs/Module/Invite.php:551 msgid "Enter email addresses, one per line:" msgstr "Skriv e-postadresser, en per linje:" -#: ../../Zotlabs/Module/Invite.php:539 +#: ../../Zotlabs/Module/Invite.php:552 msgid "Your message:" msgstr "Din melding:" -#: ../../Zotlabs/Module/Invite.php:540 +#: ../../Zotlabs/Module/Invite.php:553 msgid "Invite template" msgstr "" -#: ../../Zotlabs/Module/Invite.php:542 +#: ../../Zotlabs/Module/Invite.php:555 msgid "Subject:" msgstr "Emne:" -#: ../../Zotlabs/Module/Invite.php:548 +#: ../../Zotlabs/Module/Invite.php:561 msgid "Here you may enter personal notes to the recipient(s)" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:588 +#: ../../Zotlabs/Module/Sse_bs.php:605 msgid "Private forum" msgstr "" -#: ../../Zotlabs/Module/Sse_bs.php:588 +#: ../../Zotlabs/Module/Sse_bs.php:605 +#, fuzzy msgid "Public forum" -msgstr "" +msgstr "Offentlig forum:" #: ../../Zotlabs/Module/Xchan.php:10 msgid "Xchan Lookup" @@ -13526,7 +13537,7 @@ msgstr "Xchan oppslag" #: ../../Zotlabs/Module/Xchan.php:13 msgid "Lookup xchan beginning with (or webbie): " -msgstr "Slå opp xchan som begynner med (eller webbie):" +msgstr "Slå opp xchan som begynner med (eller webbie): " #: ../../Zotlabs/Module/Affinity.php:35 msgid "Affinity Tool settings updated." @@ -13543,16 +13554,18 @@ msgid "Default maximum affinity level" msgstr "" #: ../../Zotlabs/Module/Affinity.php:61 +#, fuzzy msgid "0-99 default 99" -msgstr "" +msgstr "Standard" #: ../../Zotlabs/Module/Affinity.php:67 msgid "Default minimum affinity level" msgstr "" #: ../../Zotlabs/Module/Affinity.php:67 +#, fuzzy msgid "0-99 - default 0" -msgstr "" +msgstr "Standard" #: ../../Zotlabs/Module/Affinity.php:73 msgid "Persistent affinity levels" @@ -13570,291 +13583,291 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Network.php:42 #: ../../Zotlabs/Module/Settings/Channel_home.php:46 msgid "Max height of content (in pixels)" -msgstr "" +msgstr "Maks høyde for innhold (i piksler)" #: ../../Zotlabs/Module/Settings/Network.php:44 #: ../../Zotlabs/Module/Settings/Channel_home.php:48 msgid "Click to expand content exceeding this height" -msgstr "" +msgstr "Klikk for å vise hele innlegg som overskrider denne grensen" #: ../../Zotlabs/Module/Settings/Network.php:59 msgid "Stream Settings" -msgstr "" +msgstr "Instillinger for tidslinjen" #: ../../Zotlabs/Module/Settings/Features.php:45 msgid "Additional Features" msgstr "Ekstra funksjoner" #: ../../Zotlabs/Module/Settings/Channel.php:105 -#: ../../Zotlabs/Module/Settings/Channel.php:216 +#: ../../Zotlabs/Module/Settings/Channel.php:217 msgid "Please select a channel role" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:193 +#: ../../Zotlabs/Module/Settings/Channel.php:194 msgid "Your channel address is" msgstr "Din kanaladresse er" -#: ../../Zotlabs/Module/Settings/Channel.php:196 +#: ../../Zotlabs/Module/Settings/Channel.php:197 msgid "Your files/photos are accessible via WebDAV at" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:227 +#: ../../Zotlabs/Module/Settings/Channel.php:228 msgid "Channel Settings" msgstr "Kanalinnstillinger" -#: ../../Zotlabs/Module/Settings/Channel.php:234 +#: ../../Zotlabs/Module/Settings/Channel.php:235 msgid "Basic Settings" msgstr "Grunninnstillinger" -#: ../../Zotlabs/Module/Settings/Channel.php:235 +#: ../../Zotlabs/Module/Settings/Channel.php:236 msgid "Channel timezone:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:236 +#: ../../Zotlabs/Module/Settings/Channel.php:237 msgid "Default post location:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:236 +#: ../../Zotlabs/Module/Settings/Channel.php:237 msgid "Geographical location to display on your posts" msgstr "Geografisk plassering som vises på dine innlegg" -#: ../../Zotlabs/Module/Settings/Channel.php:237 +#: ../../Zotlabs/Module/Settings/Channel.php:238 msgid "Use browser location" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:238 +#: ../../Zotlabs/Module/Settings/Channel.php:239 msgid "Adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:238 +#: ../../Zotlabs/Module/Settings/Channel.php:239 msgid "This channel frequently or regularly publishes adult content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:239 +#: ../../Zotlabs/Module/Settings/Channel.php:240 msgid "Maximum Friend Requests/Day:" msgstr "Maksimalt antall venneforespørsler per dag:" -#: ../../Zotlabs/Module/Settings/Channel.php:239 +#: ../../Zotlabs/Module/Settings/Channel.php:240 msgid "May reduce spam activity" msgstr "Kan redusere søppelpostaktivitet" -#: ../../Zotlabs/Module/Settings/Channel.php:240 +#: ../../Zotlabs/Module/Settings/Channel.php:241 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Varslingsinnstillinger" -#: ../../Zotlabs/Module/Settings/Channel.php:241 +#: ../../Zotlabs/Module/Settings/Channel.php:242 msgid "By default post a status message when:" msgstr "Legg inn en statusmelding når du:" -#: ../../Zotlabs/Module/Settings/Channel.php:242 +#: ../../Zotlabs/Module/Settings/Channel.php:243 msgid "accepting a friend request" msgstr "aksepterer en venneforespørsel" -#: ../../Zotlabs/Module/Settings/Channel.php:243 +#: ../../Zotlabs/Module/Settings/Channel.php:244 msgid "joining a forum/community" msgstr "blir med i et forum/miljø" -#: ../../Zotlabs/Module/Settings/Channel.php:244 +#: ../../Zotlabs/Module/Settings/Channel.php:245 msgid "making an interesting profile change" msgstr "gjør en interessant profilendring" -#: ../../Zotlabs/Module/Settings/Channel.php:245 +#: ../../Zotlabs/Module/Settings/Channel.php:246 msgid "Send a notification email when:" msgstr "Send en varsel-e-post når:" -#: ../../Zotlabs/Module/Settings/Channel.php:246 +#: ../../Zotlabs/Module/Settings/Channel.php:247 msgid "You receive a connection request" msgstr "Du har mottatt en forespørsel om forbindelse" -#: ../../Zotlabs/Module/Settings/Channel.php:247 +#: ../../Zotlabs/Module/Settings/Channel.php:248 msgid "Your connections are confirmed" msgstr "Dine forbindelser er bekreftet" -#: ../../Zotlabs/Module/Settings/Channel.php:248 +#: ../../Zotlabs/Module/Settings/Channel.php:249 msgid "Someone writes on your profile wall" msgstr "Noen skriver på din profilvegg" -#: ../../Zotlabs/Module/Settings/Channel.php:249 +#: ../../Zotlabs/Module/Settings/Channel.php:250 msgid "Someone writes a followup comment" msgstr "Noen skriver en oppfølgende kommentar" -#: ../../Zotlabs/Module/Settings/Channel.php:250 +#: ../../Zotlabs/Module/Settings/Channel.php:251 msgid "You receive a private message" msgstr "Du mottar en privat melding" -#: ../../Zotlabs/Module/Settings/Channel.php:251 +#: ../../Zotlabs/Module/Settings/Channel.php:252 msgid "You receive a friend suggestion" msgstr "Du mottok et venneforslag" -#: ../../Zotlabs/Module/Settings/Channel.php:252 +#: ../../Zotlabs/Module/Settings/Channel.php:253 msgid "You are tagged in a post" msgstr "Du merkes i et innlegg" -#: ../../Zotlabs/Module/Settings/Channel.php:253 +#: ../../Zotlabs/Module/Settings/Channel.php:254 msgid "You are poked/prodded/etc. in a post" msgstr "Du ble prikket/oppildnet/og så vider i et innlegg" -#: ../../Zotlabs/Module/Settings/Channel.php:254 +#: ../../Zotlabs/Module/Settings/Channel.php:255 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:255 +#: ../../Zotlabs/Module/Settings/Channel.php:256 msgid "Show visual notifications including:" msgstr "Vis visuelle varslinger om:" -#: ../../Zotlabs/Module/Settings/Channel.php:256 +#: ../../Zotlabs/Module/Settings/Channel.php:257 msgid "Unseen stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:257 +#: ../../Zotlabs/Module/Settings/Channel.php:258 msgid "Unseen channel activity" msgstr "Usett kanalaktivitet" -#: ../../Zotlabs/Module/Settings/Channel.php:258 +#: ../../Zotlabs/Module/Settings/Channel.php:259 msgid "Unseen private messages" msgstr "Usette private meldinger" -#: ../../Zotlabs/Module/Settings/Channel.php:258 -#: ../../Zotlabs/Module/Settings/Channel.php:263 +#: ../../Zotlabs/Module/Settings/Channel.php:259 #: ../../Zotlabs/Module/Settings/Channel.php:264 #: ../../Zotlabs/Module/Settings/Channel.php:265 +#: ../../Zotlabs/Module/Settings/Channel.php:266 msgid "Recommended" msgstr "Anbefalt" -#: ../../Zotlabs/Module/Settings/Channel.php:259 +#: ../../Zotlabs/Module/Settings/Channel.php:260 msgid "Upcoming events" msgstr "Kommende hendelser" -#: ../../Zotlabs/Module/Settings/Channel.php:260 +#: ../../Zotlabs/Module/Settings/Channel.php:261 msgid "Events today" msgstr "Hendelser idag" -#: ../../Zotlabs/Module/Settings/Channel.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:262 msgid "Upcoming birthdays" msgstr "Kommende fødselsdager" -#: ../../Zotlabs/Module/Settings/Channel.php:261 +#: ../../Zotlabs/Module/Settings/Channel.php:262 msgid "Not available in all themes" msgstr "Ikke tilgjengelig i alle temaer" -#: ../../Zotlabs/Module/Settings/Channel.php:262 +#: ../../Zotlabs/Module/Settings/Channel.php:263 msgid "System (personal) notifications" msgstr "System (personlige) varslinger" -#: ../../Zotlabs/Module/Settings/Channel.php:263 +#: ../../Zotlabs/Module/Settings/Channel.php:264 msgid "System info messages" msgstr "System infomeldinger" -#: ../../Zotlabs/Module/Settings/Channel.php:264 +#: ../../Zotlabs/Module/Settings/Channel.php:265 msgid "System critical alerts" msgstr "System kritiske varsel" -#: ../../Zotlabs/Module/Settings/Channel.php:265 +#: ../../Zotlabs/Module/Settings/Channel.php:266 msgid "New connections" msgstr "Nye forbindelser" -#: ../../Zotlabs/Module/Settings/Channel.php:266 +#: ../../Zotlabs/Module/Settings/Channel.php:267 msgid "System Registrations" msgstr "Systemregistreringer" -#: ../../Zotlabs/Module/Settings/Channel.php:267 +#: ../../Zotlabs/Module/Settings/Channel.php:268 msgid "Unseen shared files" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:268 +#: ../../Zotlabs/Module/Settings/Channel.php:269 msgid "Unseen public stream activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:269 +#: ../../Zotlabs/Module/Settings/Channel.php:270 msgid "Unseen likes and dislikes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:270 +#: ../../Zotlabs/Module/Settings/Channel.php:271 msgid "Unseen forum posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:271 +#: ../../Zotlabs/Module/Settings/Channel.php:272 msgid "Email notification hub (hostname)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:271 +#: ../../Zotlabs/Module/Settings/Channel.php:272 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:273 msgid "Show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:273 +#: ../../Zotlabs/Module/Settings/Channel.php:274 msgid "Mark all notices of the thread read if a notice is clicked" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:273 +#: ../../Zotlabs/Module/Settings/Channel.php:274 msgid "If no, only the clicked notice will be marked read" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:274 +#: ../../Zotlabs/Module/Settings/Channel.php:275 msgid "" "Desktop notifications are unavailable because the required browser " "permission has not been granted" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:275 +#: ../../Zotlabs/Module/Settings/Channel.php:276 msgid "Grant permission" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:276 +#: ../../Zotlabs/Module/Settings/Channel.php:277 msgid "Notify me of events this many days in advance" msgstr "Varsle meg om hendelser dette antall dager på forhånd" -#: ../../Zotlabs/Module/Settings/Channel.php:276 +#: ../../Zotlabs/Module/Settings/Channel.php:277 msgid "Must be greater than 0" msgstr "Må være større enn 0" -#: ../../Zotlabs/Module/Settings/Channel.php:279 +#: ../../Zotlabs/Module/Settings/Channel.php:280 msgid "Default photo upload folder" msgstr "Standard mappe for opplasting av bilder" -#: ../../Zotlabs/Module/Settings/Channel.php:279 #: ../../Zotlabs/Module/Settings/Channel.php:280 +#: ../../Zotlabs/Module/Settings/Channel.php:281 msgid "%Y - current year, %m - current month" msgstr "%Y - nåværende år, %m - nåværende måned" -#: ../../Zotlabs/Module/Settings/Channel.php:280 +#: ../../Zotlabs/Module/Settings/Channel.php:281 msgid "Default file upload folder" msgstr "Standard mappe for opplasting av filer" -#: ../../Zotlabs/Module/Settings/Channel.php:282 +#: ../../Zotlabs/Module/Settings/Channel.php:283 msgid "Remove this channel." msgstr "Fjern denne kanalen." -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 msgid "Expire other channel content after this many days" msgstr "Annet kanal innhold utløper etter så mange dager" -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:283 +#: ../../Zotlabs/Module/Settings/Channel.php:284 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:284 #: ../../Zotlabs/Module/Settings/Channel.php:285 +#: ../../Zotlabs/Module/Settings/Channel.php:286 msgid "" "Words one per line or #tags, $categories, /patterns/, lang=xx, lang!=xx - " "leave blank to import all posts" @@ -13913,10 +13926,14 @@ msgid "Leave password fields blank unless changing" msgstr "La passordfeltene stå blanke om det ikke skal endres" #: ../../Zotlabs/Module/Settings/Account.php:108 +msgid "Multi-Factor Authentication" +msgstr "Flerfaktorautentisering" + +#: ../../Zotlabs/Module/Settings/Account.php:109 msgid "DId2 or Email Address:" -msgstr "" +msgstr "DId2 eller epostadresse:" -#: ../../Zotlabs/Module/Settings/Account.php:110 +#: ../../Zotlabs/Module/Settings/Account.php:112 msgid "Remove this account including all its channels" msgstr "Slett denne kontoen inkludert alle dens kanaler" @@ -13926,11 +13943,11 @@ msgstr "Ingen funksjonsinnstillinger er konfigurert" #: ../../Zotlabs/Module/Settings/Featured.php:34 msgid "Addon Settings" -msgstr "" +msgstr "Instillinger for tillegg" #: ../../Zotlabs/Module/Settings/Featured.php:35 msgid "Please save/submit changes to any panel before opening another." -msgstr "" +msgstr "Husk å lagre endringene i ett panel før du åpner andre." #: ../../Zotlabs/Module/Settings/Events.php:40 msgid "Events Settings" @@ -13952,6 +13969,61 @@ msgstr "" msgid "Calendar Settings" msgstr "" +#: ../../Zotlabs/Module/Settings/Multifactor.php:23 +#, fuzzy +#| msgid "Name is required" +msgid "Password is required" +msgstr "Navn er påkrevd" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:29 +msgid "The provided password is not correct" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:68 +msgid "Account Multi-Factor Authentication" +msgstr "Tofaktorautentisering" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:69 +msgid "" +"This is your generated secret. It may be used in some cases if the QR image " +"cannot be read. Please store it in a safe place." +msgstr "" +"Dette er en generert sikkerhetskode. Den kan være nyttig i enkelte tilfeller " +"hvor QR koden ikke kan leses. Lagre den et sikkert sted." + +#: ../../Zotlabs/Module/Settings/Multifactor.php:70 +msgid "Please enter the code from your authenticator app" +msgstr "Skriv inn koden fra din autentiseringsapp" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:71 +msgid "You will only be able to enable MFA if the test passes" +msgstr "" +"Flerfaktorautentisering vil kun bli slått på dersom denne testen lykkes" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:75 +msgid "Congratulations, the provided code was correct" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:76 +msgid "Incorrect code" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:79 +#, fuzzy +#| msgid "Failed authentication" +msgid "Enable Multi-Factor Authentication" +msgstr "Mislykket autentisering" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:81 +msgid "Logging in will require you to be in possession of your smartphone" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Multifactor.php:84 +#, fuzzy +#| msgid "Your new password is" +msgid "Your account password" +msgstr "Ditt nye passord er" + #: ../../Zotlabs/Module/Settings/Display.php:125 #, php-format msgid "%s - (Experimental)" @@ -13990,8 +14062,8 @@ msgid "" "The subjective page load time will be longer but the page will be ready when " "displayed" msgstr "" -"Den personlige opplevelsen av lastetiden vil være lenger, men siden vil være" -" klar når den vises" +"Den personlige opplevelsen av lastetiden vil være lenger, men siden vil være " +"klar når den vises" #: ../../Zotlabs/Module/Settings/Display.php:194 msgid "Enable user zoom on mobile devices" @@ -14023,7 +14095,7 @@ msgstr "Lenk innleggets tittel til kilden" #: ../../Zotlabs/Module/Settings/Display.php:200 msgid "Display new member quick links menu" -msgstr "" +msgstr "Vis hurtiglenker for nye medlemmer" #: ../../Zotlabs/Module/Settings/Directory.php:40 msgid "Directory Settings" @@ -14031,7 +14103,7 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Editor.php:40 msgid "Editor Settings" -msgstr "" +msgstr "Instillinger for redigering" #: ../../Zotlabs/Module/Settings/Connections.php:40 msgid "Connections Settings" @@ -14049,82 +14121,106 @@ msgstr "" msgid "Profiles Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:39 +#: ../../Zotlabs/Module/Settings/Privacy.php:48 msgid "Privacy settings updated." -msgstr "" +msgstr "Personverninnstillingene ble oppdatert." -#: ../../Zotlabs/Module/Settings/Privacy.php:57 +#: ../../Zotlabs/Module/Settings/Privacy.php:66 msgid "Only those you specifically allow" msgstr "Bare de du spesifikt tillater" -#: ../../Zotlabs/Module/Settings/Privacy.php:58 +#: ../../Zotlabs/Module/Settings/Privacy.php:67 msgid "Approved connections" msgstr "Godkjente forbindelser" -#: ../../Zotlabs/Module/Settings/Privacy.php:59 +#: ../../Zotlabs/Module/Settings/Privacy.php:68 msgid "Any connections" msgstr "Enhver forbindelse" -#: ../../Zotlabs/Module/Settings/Privacy.php:60 +#: ../../Zotlabs/Module/Settings/Privacy.php:69 msgid "Anybody on this website" msgstr "Enhver ved dette nettstedet" -#: ../../Zotlabs/Module/Settings/Privacy.php:61 +#: ../../Zotlabs/Module/Settings/Privacy.php:70 msgid "Anybody in this network" msgstr "Enhver i dette nettverket" -#: ../../Zotlabs/Module/Settings/Privacy.php:62 +#: ../../Zotlabs/Module/Settings/Privacy.php:71 msgid "Anybody authenticated" msgstr "Enhver som er autentisert" -#: ../../Zotlabs/Module/Settings/Privacy.php:63 +#: ../../Zotlabs/Module/Settings/Privacy.php:72 msgid "Anybody on the internet" msgstr "Enhver på Internett" -#: ../../Zotlabs/Module/Settings/Privacy.php:73 +#: ../../Zotlabs/Module/Settings/Privacy.php:82 msgid "" "Advise: set to \"Anybody on the internet\" and use privacy groups to " "restrict access" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:109 +#: ../../Zotlabs/Module/Settings/Privacy.php:121 msgid "Privacy Settings" -msgstr "" +msgstr "Personverninnstillinger" -#: ../../Zotlabs/Module/Settings/Privacy.php:114 +#: ../../Zotlabs/Module/Settings/Privacy.php:126 msgid "Advanced configuration" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:116 +#: ../../Zotlabs/Module/Settings/Privacy.php:128 msgid "Proceed with caution" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:117 +#: ../../Zotlabs/Module/Settings/Privacy.php:129 msgid "" "Changing advanced configuration settings can impact your, and your contacts " "channels functionality and security." msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:118 +#: ../../Zotlabs/Module/Settings/Privacy.php:130 msgid "Accept the risk and continue" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:120 +#: ../../Zotlabs/Module/Settings/Privacy.php:132 msgid "Automatically approve new contacts" -msgstr "" +msgstr "Automatisk godkjenn nye kontakter" -#: ../../Zotlabs/Module/Settings/Privacy.php:121 +#: ../../Zotlabs/Module/Settings/Privacy.php:133 msgid "Opt-out of search engine indexing" -msgstr "" +msgstr "Ikke la søkemotorer indeksere denne kanalen" -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 msgid "Group actor" msgstr "" -#: ../../Zotlabs/Module/Settings/Privacy.php:122 +#: ../../Zotlabs/Module/Settings/Privacy.php:134 msgid "Allow this channel to act as a forum" msgstr "" +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +msgid "Accept all messages which mention you" +msgstr "Godta alle meldinger som nevner deg" + +#: ../../Zotlabs/Module/Settings/Privacy.php:135 +msgid "This setting bypasses normal permissions" +msgstr "Denne instillingen overstyrer vanlig tilgangskontroll" + +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +msgid "Accept unsolicited comments for moderation" +msgstr "Godta kommentarer fra fremmede for moderering" + +#: ../../Zotlabs/Module/Settings/Privacy.php:136 +msgid "Otherwise they will be silently dropped" +msgstr "Ellers vil de avvises uten varsel" + +#: ../../Zotlabs/Module/Settings/Privacy.php:137 +msgid "Enable OCAP access" +msgstr "Slå på OCAP tilgangskontroll" + +#: ../../Zotlabs/Module/Settings/Privacy.php:137 +msgid "Grant limited posts the right to access linked private media" +msgstr "Gi begrensede innlegg tilgang til private media som er lenket fra dem" + #: ../../Zotlabs/Module/Settings/Conversation.php:23 msgid "Settings saved." msgstr "" @@ -14251,45 +14347,46 @@ msgid "" "The permissions indicated on this page will be applied to all new " "connections." msgstr "" -"Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser." +"Tillatelsene angitt på denne siden gjøres gjeldende for alle nye " +"forbindelser." #: ../../Zotlabs/Module/Defperms.php:260 msgid "Automatic approval settings" msgstr "" -#: ../../Zotlabs/Module/Defperms.php:264 +#: ../../Zotlabs/Module/Defperms.php:263 msgid "My Settings" msgstr "Mine innstillinger" -#: ../../Zotlabs/Module/Defperms.php:267 ../../Zotlabs/Module/Connedit.php:720 +#: ../../Zotlabs/Module/Defperms.php:266 ../../Zotlabs/Module/Connedit.php:720 msgid "Individual Permissions" msgstr "Individuelle tillatelser" -#: ../../Zotlabs/Module/Defperms.php:268 +#: ../../Zotlabs/Module/Defperms.php:267 msgid "" "Some individual permissions may have been preset or locked based on your " "channel type and privacy settings." msgstr "" -#: ../../Zotlabs/Module/Pconfig.php:32 ../../Zotlabs/Module/Pconfig.php:68 +#: ../../Zotlabs/Module/Pconfig.php:33 ../../Zotlabs/Module/Pconfig.php:69 msgid "This setting requires special processing and editing has been blocked." msgstr "" -"Denne innstillingen krever spesiell behandling og redigering har blitt" -" blokkert." +"Denne innstillingen krever spesiell behandling og redigering har blitt " +"blokkert." -#: ../../Zotlabs/Module/Pconfig.php:57 +#: ../../Zotlabs/Module/Pconfig.php:58 msgid "Configuration Editor" msgstr "Konfigurasjonsbehandler" -#: ../../Zotlabs/Module/Pconfig.php:58 +#: ../../Zotlabs/Module/Pconfig.php:59 msgid "" "Warning: Changing some settings could render your channel inoperable. Please " "leave this page unless you are comfortable with and knowledgeable about how " "to correctly use this feature." msgstr "" -"Advarsel: kanalen din kan slutte å virke ved endring av enkelte" -" innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med" -" dette og vet hvordan du bruker denne funksjonen riktig." +"Advarsel: kanalen din kan slutte å virke ved endring av enkelte " +"innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med " +"dette og vet hvordan du bruker denne funksjonen riktig." #: ../../Zotlabs/Module/Oauth2.php:54 msgid "Name and Secret are required" @@ -14327,48 +14424,48 @@ msgstr "" msgid "Invalid message" msgstr "Ugyldig melding" -#: ../../Zotlabs/Module/Dreport.php:66 +#: ../../Zotlabs/Module/Dreport.php:68 msgid "no results" msgstr "ingen resultater" -#: ../../Zotlabs/Module/Dreport.php:80 +#: ../../Zotlabs/Module/Dreport.php:82 msgid "channel sync processed" -msgstr "Kanalsynkronisering er behandlet" +msgstr "kanalsynkronisering er behandlet" -#: ../../Zotlabs/Module/Dreport.php:84 +#: ../../Zotlabs/Module/Dreport.php:86 msgid "queued" msgstr "lagt i kø" -#: ../../Zotlabs/Module/Dreport.php:88 +#: ../../Zotlabs/Module/Dreport.php:90 msgid "posted" msgstr "lagt inn" -#: ../../Zotlabs/Module/Dreport.php:92 +#: ../../Zotlabs/Module/Dreport.php:94 msgid "accepted for delivery" msgstr "akseptert for levering" -#: ../../Zotlabs/Module/Dreport.php:96 +#: ../../Zotlabs/Module/Dreport.php:98 msgid "updated" msgstr "oppdatert" -#: ../../Zotlabs/Module/Dreport.php:99 +#: ../../Zotlabs/Module/Dreport.php:102 msgid "update ignored" msgstr "oppdatering ignorert" -#: ../../Zotlabs/Module/Dreport.php:102 +#: ../../Zotlabs/Module/Dreport.php:105 msgid "permission denied" msgstr "tillatelse avvist" -#: ../../Zotlabs/Module/Dreport.php:106 +#: ../../Zotlabs/Module/Dreport.php:109 msgid "recipient not found" msgstr "mottaker ble ikke funnet" -#: ../../Zotlabs/Module/Dreport.php:126 +#: ../../Zotlabs/Module/Dreport.php:129 #, php-format msgid "Delivery report for %1$s" msgstr "Leveringsrapport for %1$s" -#: ../../Zotlabs/Module/Dreport.php:131 +#: ../../Zotlabs/Module/Dreport.php:134 msgid "Redeliver" msgstr "" @@ -14477,31 +14574,31 @@ msgstr "" msgid "Layout updated." msgstr "Layout er oppdatert." -#: ../../Zotlabs/Module/Pdledit.php:55 ../../Zotlabs/Module/Pdledit.php:98 +#: ../../Zotlabs/Module/Pdledit.php:55 ../../Zotlabs/Module/Pdledit.php:129 msgid "Edit System Page Description" msgstr "Endre beskrivelsen av systemsiden" -#: ../../Zotlabs/Module/Pdledit.php:76 +#: ../../Zotlabs/Module/Pdledit.php:76 ../../Zotlabs/Module/Pdledit.php:93 msgid "(modified)" -msgstr "" +msgstr "(endret)" -#: ../../Zotlabs/Module/Pdledit.php:93 +#: ../../Zotlabs/Module/Pdledit.php:124 msgid "Layout not found." msgstr "Layouten ble ikke funnet." -#: ../../Zotlabs/Module/Pdledit.php:99 +#: ../../Zotlabs/Module/Pdledit.php:130 msgid "Module Name:" msgstr "Modulnavn:" -#: ../../Zotlabs/Module/Pdledit.php:100 +#: ../../Zotlabs/Module/Pdledit.php:131 msgid "Layout Help" msgstr "Layout-hjelp" -#: ../../Zotlabs/Module/Pdledit.php:101 +#: ../../Zotlabs/Module/Pdledit.php:132 msgid "Edit another layout" msgstr "" -#: ../../Zotlabs/Module/Pdledit.php:102 +#: ../../Zotlabs/Module/Pdledit.php:133 msgid "System layout" msgstr "" @@ -14515,8 +14612,8 @@ msgid "" "No suggestions available. If this is a new site, please try again in 24 " "hours." msgstr "" -"Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv" -" igjen om 24 timer." +"Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv " +"igjen om 24 timer." #: ../../Zotlabs/Module/Connedit.php:171 msgid "Connection updated." @@ -14612,8 +14709,8 @@ msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -"Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret" -" måte. " +"Vennligst velg profilen du ønsker å vise %s når profilen din ses på en " +"sikret måte." #: ../../Zotlabs/Module/Connedit.php:721 msgid "" @@ -14622,10 +14719,10 @@ msgid "" "priority than individual settings. You can not change those " "settings here." msgstr "" -"Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn" -" individuelle innstillinger. Du kan ikke endre arvede" -" innstillingene her." +"Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har " +"høyere prioritet enn individuelle innstillinger. Du kan ikke endre arvede innstillingene her." #: ../../Zotlabs/Module/Connedit.php:722 msgid "" @@ -14634,10 +14731,11 @@ msgid "" "priority than individual settings. You can change those settings here but " "they wont have any impact unless the inherited setting changes." msgstr "" -"Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn" -" individuelle innstillinger. Du kan endre disse innstillingene her, men de" -" vil ikke få noen effekt før de arvede innstillingene endres." +"Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har " +"høyere prioritet enn individuelle innstillinger. Du kan endre disse " +"innstillingene her, men de vil ikke få noen effekt før de arvede " +"innstillingene endres." #: ../../Zotlabs/Module/Connedit.php:723 msgid "Last update:" @@ -14658,19 +14756,19 @@ msgid "System Notifications" msgstr "Systemvarsler" #: ../../Zotlabs/Module/Notifications.php:111 -#: ../../Zotlabs/Lib/ThreadItem.php:490 +#: ../../Zotlabs/Lib/ThreadItem.php:483 msgid "Mark all seen" msgstr "Merk alle som sett" -#: ../../Zotlabs/Module/Layouts.php:186 +#: ../../Zotlabs/Module/Layouts.php:184 msgid "Comanche page description language help" msgstr "Hjelp med Comanche sidebeskrivelsesspråk" -#: ../../Zotlabs/Module/Layouts.php:190 +#: ../../Zotlabs/Module/Layouts.php:188 msgid "Layout Description" msgstr "Layout-beskrivelse" -#: ../../Zotlabs/Module/Layouts.php:195 +#: ../../Zotlabs/Module/Layouts.php:193 msgid "Download PDL file" msgstr "Last ned PDL-fil" @@ -14687,8 +14785,8 @@ msgid "" "Please select another location to become primary before removing the primary " "location." msgstr "" -"Vennligst velg en annen plassering som primær før du sletter gjeldende" -" primære plassering." +"Vennligst velg en annen plassering som primær før du sletter gjeldende " +"primære plassering." #: ../../Zotlabs/Module/Locs.php:106 msgid "Syncing locations" @@ -14715,14 +14813,14 @@ msgid "" "When possible, drop a location by logging into that website/hub and removing " "your channel." msgstr "" -"Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den" -" hub-en og fjern din kanal." +"Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den " +"hub-en og fjern din kanal." #: ../../Zotlabs/Module/Locs.php:129 msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -"Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift" -" lenger." +"Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift " +"lenger." #: ../../Zotlabs/Module/Sources.php:41 msgid "Failed to create source. No channel selected." @@ -14740,7 +14838,7 @@ msgstr "Kilden er oppdatert." msgid "*" msgstr "*" -#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:372 +#: ../../Zotlabs/Module/Sources.php:105 ../../Zotlabs/Lib/Apps.php:373 msgid "Channel Sources" msgstr "Kanalkilder" @@ -14757,8 +14855,8 @@ msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." msgstr "" -"Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne" -" kanalen og distribuer det i henhold til dine egne kanalinnstillinger." +"Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne " +"kanalen og distribuer det i henhold til dine egne kanalinnstillinger." #: ../../Zotlabs/Module/Sources.php:119 ../../Zotlabs/Module/Sources.php:153 msgid "Only import content with these words (one per line)" @@ -14835,37 +14933,36 @@ msgid "Select a privacy group" msgstr "" #: ../../Zotlabs/Lib/Permcat.php:83 -#, fuzzy msgctxt "permcat" msgid "Default" -msgstr "" +msgstr "Standard" -#: ../../Zotlabs/Lib/Activity.php:2271 +#: ../../Zotlabs/Lib/Activity.php:2398 #, php-format msgid "Likes %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2274 +#: ../../Zotlabs/Lib/Activity.php:2401 #, php-format msgid "Doesn't like %1$s's %2$s" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2280 +#: ../../Zotlabs/Lib/Activity.php:2407 #, php-format msgid "Will attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2283 +#: ../../Zotlabs/Lib/Activity.php:2410 #, php-format msgid "Will not attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2286 +#: ../../Zotlabs/Lib/Activity.php:2413 #, php-format msgid "May attend %s's event" msgstr "" -#: ../../Zotlabs/Lib/Activity.php:2289 +#: ../../Zotlabs/Lib/Activity.php:2416 #, php-format msgid "May not attend %s's event" msgstr "" @@ -14900,286 +14997,300 @@ msgstr "" msgid "%s " msgstr "%s " -#: ../../Zotlabs/Lib/Enotify.php:128 +#: ../../Zotlabs/Lib/Enotify.php:131 #, php-format msgid "[$Projectname:Notify] New direct message received at %s" msgstr "[$Projectname:Notify] Ny direktemelding mottatt kl. %s" -#: ../../Zotlabs/Lib/Enotify.php:130 +#: ../../Zotlabs/Lib/Enotify.php:133 #, php-format msgid "%1$s sent you a new direct message at %2$s" msgstr "%1$s sendte deg en ny direktemelding kl. %2$s" -#: ../../Zotlabs/Lib/Enotify.php:131 +#: ../../Zotlabs/Lib/Enotify.php:134 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s sendte deg %2$s." -#: ../../Zotlabs/Lib/Enotify.php:131 +#: ../../Zotlabs/Lib/Enotify.php:134 msgid "a direct message" msgstr "en direktemelding" -#: ../../Zotlabs/Lib/Enotify.php:132 +#: ../../Zotlabs/Lib/Enotify.php:135 #, php-format msgid "Please visit %s to view and/or reply to your direct messages." msgstr "Gå til %s for å vise og/eller svare på dine direktemeldinger." -#: ../../Zotlabs/Lib/Enotify.php:145 +#: ../../Zotlabs/Lib/Enotify.php:148 +msgid "requested to comment on" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:148 msgid "commented on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:158 ../../Zotlabs/Lib/Enotify.php:307 +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 +#, fuzzy +#| msgid "Request date" +msgid "requested to like" +msgstr "Dato for forespørsel" + +#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:314 msgid "liked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:161 ../../Zotlabs/Lib/Enotify.php:307 +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 +msgid "requested to dislike" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:164 ../../Zotlabs/Lib/Enotify.php:317 msgid "disliked" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:166 +#: ../../Zotlabs/Lib/Enotify.php:169 msgid "voted on" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:209 +#: ../../Zotlabs/Lib/Enotify.php:212 #, php-format msgid "%1$s %2$s [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:217 +#: ../../Zotlabs/Lib/Enotify.php:220 #, php-format msgid "%1$s %2$s [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:226 ../../Zotlabs/Lib/Enotify.php:311 +#: ../../Zotlabs/Lib/Enotify.php:229 ../../Zotlabs/Lib/Enotify.php:321 #, php-format msgid "%1$s %2$s [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:238 +#: ../../Zotlabs/Lib/Enotify.php:241 #, php-format msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:240 +#: ../../Zotlabs/Lib/Enotify.php:243 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:241 +#: ../../Zotlabs/Lib/Enotify.php:244 #, php-format msgid "%1$s commented on an item/conversation you have been following" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:244 ../../Zotlabs/Lib/Enotify.php:331 -#: ../../Zotlabs/Lib/Enotify.php:347 ../../Zotlabs/Lib/Enotify.php:371 -#: ../../Zotlabs/Lib/Enotify.php:388 ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:247 ../../Zotlabs/Lib/Enotify.php:341 +#: ../../Zotlabs/Lib/Enotify.php:357 ../../Zotlabs/Lib/Enotify.php:381 +#: ../../Zotlabs/Lib/Enotify.php:398 ../../Zotlabs/Lib/Enotify.php:411 #, php-format msgid "Please visit %s to view and/or reply to the conversation." -msgstr "Vennligst besøk %s for å se og/eller svare i samtalen" +msgstr "Vennligst besøk %s for å se og/eller svare i samtalen." -#: ../../Zotlabs/Lib/Enotify.php:248 ../../Zotlabs/Lib/Enotify.php:249 +#: ../../Zotlabs/Lib/Enotify.php:251 ../../Zotlabs/Lib/Enotify.php:252 #, php-format msgid "Please visit %s to approve or reject this comment." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:327 +#: ../../Zotlabs/Lib/Enotify.php:337 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:338 #, php-format msgid "%1$s liked an item/conversation you created" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:339 +#: ../../Zotlabs/Lib/Enotify.php:349 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:341 +#: ../../Zotlabs/Lib/Enotify.php:351 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:343 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:365 +#: ../../Zotlabs/Lib/Enotify.php:375 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:366 +#: ../../Zotlabs/Lib/Enotify.php:376 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:377 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:378 +#: ../../Zotlabs/Lib/Enotify.php:388 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:379 +#: ../../Zotlabs/Lib/Enotify.php:389 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:380 +#: ../../Zotlabs/Lib/Enotify.php:390 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:395 +#: ../../Zotlabs/Lib/Enotify.php:405 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:396 +#: ../../Zotlabs/Lib/Enotify.php:406 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:407 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:408 +#: ../../Zotlabs/Lib/Enotify.php:418 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:409 +#: ../../Zotlabs/Lib/Enotify.php:419 #, php-format msgid "You've received an new connection request from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:410 +#: ../../Zotlabs/Lib/Enotify.php:420 #, php-format msgid "You've received [zrl=%1$s]a new connection request[/zrl] from %2$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:413 ../../Zotlabs/Lib/Enotify.php:431 +#: ../../Zotlabs/Lib/Enotify.php:423 ../../Zotlabs/Lib/Enotify.php:441 #, php-format msgid "You may visit their profile at %s" msgstr "Du kan besøke profilen deres på %s" -#: ../../Zotlabs/Lib/Enotify.php:415 +#: ../../Zotlabs/Lib/Enotify.php:425 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" "Vennligst besøk %s for å godkjenne eller avslå forespørselen om forbindelse." -#: ../../Zotlabs/Lib/Enotify.php:422 +#: ../../Zotlabs/Lib/Enotify.php:432 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:423 +#: ../../Zotlabs/Lib/Enotify.php:433 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:424 +#: ../../Zotlabs/Lib/Enotify.php:434 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:429 +#: ../../Zotlabs/Lib/Enotify.php:439 msgid "Name:" msgstr "Navn:" -#: ../../Zotlabs/Lib/Enotify.php:430 +#: ../../Zotlabs/Lib/Enotify.php:440 msgid "Photo:" msgstr "Bilde:" -#: ../../Zotlabs/Lib/Enotify.php:433 +#: ../../Zotlabs/Lib/Enotify.php:443 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Vennligst besøk %s for å godkjenne eller avslå dette forslaget." -#: ../../Zotlabs/Lib/Enotify.php:658 +#: ../../Zotlabs/Lib/Enotify.php:668 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:826 +#: ../../Zotlabs/Lib/Enotify.php:834 msgid "created a new poll" -msgstr "" +msgstr "opprettet spørreskjema" -#: ../../Zotlabs/Lib/Enotify.php:826 +#: ../../Zotlabs/Lib/Enotify.php:834 msgid "created a new post" msgstr "laget et nytt innlegg" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:835 #, php-format msgid "voted on %s's poll" -msgstr "" +msgstr "stemte på %s sitt spørreskjema" -#: ../../Zotlabs/Lib/Enotify.php:827 +#: ../../Zotlabs/Lib/Enotify.php:835 #, php-format msgid "commented on %s's post" msgstr "kommenterte på %s sitt innlegg" -#: ../../Zotlabs/Lib/Enotify.php:831 +#: ../../Zotlabs/Lib/Enotify.php:839 #, php-format msgid "repeated %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:835 +#: ../../Zotlabs/Lib/Enotify.php:843 #, php-format msgid "liked %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:839 +#: ../../Zotlabs/Lib/Enotify.php:847 #, php-format msgid "disliked %s's post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:843 ../../Zotlabs/Lib/Enotify.php:946 +#: ../../Zotlabs/Lib/Enotify.php:851 ../../Zotlabs/Lib/Enotify.php:954 msgid "shared a file with you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:852 +#: ../../Zotlabs/Lib/Enotify.php:860 #, php-format msgid "edited a post dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:855 +#: ../../Zotlabs/Lib/Enotify.php:863 #, php-format msgid "edited a comment dated %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:931 +#: ../../Zotlabs/Lib/Enotify.php:939 msgid "added your channel" msgstr "la til din kanal" -#: ../../Zotlabs/Lib/Enotify.php:961 +#: ../../Zotlabs/Lib/Enotify.php:969 msgid "sent you a direct message" msgstr "sendte deg en direktemelding" -#: ../../Zotlabs/Lib/Enotify.php:968 +#: ../../Zotlabs/Lib/Enotify.php:976 msgid "g A l F d" msgstr "g A l F d" -#: ../../Zotlabs/Lib/Enotify.php:971 +#: ../../Zotlabs/Lib/Enotify.php:979 msgid "[today]" msgstr "[idag]" -#: ../../Zotlabs/Lib/Enotify.php:981 +#: ../../Zotlabs/Lib/Enotify.php:989 msgid "created an event" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:996 +#: ../../Zotlabs/Lib/Enotify.php:1004 msgid "status verified" msgstr "" -#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:143 +#: ../../Zotlabs/Lib/Connect.php:46 ../../Zotlabs/Lib/Connect.php:147 msgid "Channel is blocked on this site." msgstr "Kanalen er blokkert på dette nettstedet." @@ -15187,23 +15298,23 @@ msgstr "Kanalen er blokkert på dette nettstedet." msgid "Channel location missing." msgstr "Kanalplassering mangler." -#: ../../Zotlabs/Lib/Connect.php:103 +#: ../../Zotlabs/Lib/Connect.php:105 msgid "Remote channel or protocol unavailable." msgstr "" -#: ../../Zotlabs/Lib/Connect.php:137 +#: ../../Zotlabs/Lib/Connect.php:141 msgid "Channel discovery failed." msgstr "Kanaloppdagelse mislyktes." -#: ../../Zotlabs/Lib/Connect.php:155 +#: ../../Zotlabs/Lib/Connect.php:159 msgid "Protocol disabled." msgstr "Protokollen er avskrudd." -#: ../../Zotlabs/Lib/Connect.php:167 +#: ../../Zotlabs/Lib/Connect.php:171 msgid "Cannot connect to yourself." msgstr "Kan ikke lage forbindelse med deg selv." -#: ../../Zotlabs/Lib/Connect.php:272 +#: ../../Zotlabs/Lib/Connect.php:276 msgid "error saving data" msgstr "" @@ -15217,7 +15328,7 @@ msgstr "Duplikat romnavn" #: ../../Zotlabs/Lib/Chatroom.php:84 ../../Zotlabs/Lib/Chatroom.php:92 msgid "Invalid room specifier." -msgstr "Ugyldig rom-spesifisering" +msgstr "Ugyldig rom-spesifisering." #: ../../Zotlabs/Lib/Chatroom.php:124 msgid "Room not found." @@ -15227,115 +15338,115 @@ msgstr "Rommet ble ikke funnet." msgid "Room is full" msgstr "Rommet er fullt" -#: ../../Zotlabs/Lib/Apps.php:328 +#: ../../Zotlabs/Lib/Apps.php:329 msgid "Affinity Tool" msgstr "Nærhetsverktøy" -#: ../../Zotlabs/Lib/Apps.php:331 +#: ../../Zotlabs/Lib/Apps.php:332 msgid "Site Admin" msgstr "Nettstedsadministrator" -#: ../../Zotlabs/Lib/Apps.php:335 +#: ../../Zotlabs/Lib/Apps.php:336 msgid "Content Filter" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:338 +#: ../../Zotlabs/Lib/Apps.php:339 msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:339 +#: ../../Zotlabs/Lib/Apps.php:340 msgid "Suggest Channels" msgstr "Foreslå kanaler" -#: ../../Zotlabs/Lib/Apps.php:341 +#: ../../Zotlabs/Lib/Apps.php:342 msgid "Channel Manager" msgstr "Kanalstyring" -#: ../../Zotlabs/Lib/Apps.php:342 +#: ../../Zotlabs/Lib/Apps.php:343 msgid "Stream" -msgstr "" +msgstr "Tidslinje" -#: ../../Zotlabs/Lib/Apps.php:353 +#: ../../Zotlabs/Lib/Apps.php:354 msgid "Mail" msgstr "Melding" -#: ../../Zotlabs/Lib/Apps.php:356 +#: ../../Zotlabs/Lib/Apps.php:357 msgid "Chat" msgstr "Chat" -#: ../../Zotlabs/Lib/Apps.php:358 +#: ../../Zotlabs/Lib/Apps.php:359 msgid "Probe" msgstr "Undersøk" -#: ../../Zotlabs/Lib/Apps.php:359 +#: ../../Zotlabs/Lib/Apps.php:360 msgid "Suggest" msgstr "Forreslå" -#: ../../Zotlabs/Lib/Apps.php:360 +#: ../../Zotlabs/Lib/Apps.php:361 msgid "Random Channel" msgstr "Tilfeldig kanal" -#: ../../Zotlabs/Lib/Apps.php:361 +#: ../../Zotlabs/Lib/Apps.php:362 msgid "Invite" msgstr "Inviter" -#: ../../Zotlabs/Lib/Apps.php:364 ../../Zotlabs/Storage/Browser.php:407 +#: ../../Zotlabs/Lib/Apps.php:365 ../../Zotlabs/Storage/Browser.php:410 msgid "Post" msgstr "Innlegg" -#: ../../Zotlabs/Lib/Apps.php:369 +#: ../../Zotlabs/Lib/Apps.php:370 msgid "Notifications" msgstr "Varsler" -#: ../../Zotlabs/Lib/Apps.php:370 +#: ../../Zotlabs/Lib/Apps.php:371 msgid "Order Apps" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:371 +#: ../../Zotlabs/Lib/Apps.php:372 msgid "CardDAV" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:375 +#: ../../Zotlabs/Lib/Apps.php:376 msgid "OAuth Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:376 +#: ../../Zotlabs/Lib/Apps.php:377 msgid "OAuth2 Apps Manager" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:377 +#: ../../Zotlabs/Lib/Apps.php:378 msgid "PDL Editor" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:380 +#: ../../Zotlabs/Lib/Apps.php:381 msgid "My Chatrooms" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:381 +#: ../../Zotlabs/Lib/Apps.php:382 msgid "Channel Export" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:575 ../../Zotlabs/Lib/Apps.php:597 +#: ../../Zotlabs/Lib/Apps.php:576 ../../Zotlabs/Lib/Apps.php:598 msgid "Purchase" msgstr "Kjøp" -#: ../../Zotlabs/Lib/Apps.php:602 +#: ../../Zotlabs/Lib/Apps.php:603 msgid "Undelete" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:610 +#: ../../Zotlabs/Lib/Apps.php:611 msgid "Add to app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:611 +#: ../../Zotlabs/Lib/Apps.php:612 msgid "Remove from app-tray" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:612 +#: ../../Zotlabs/Lib/Apps.php:613 msgid "Pin to navbar" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:613 +#: ../../Zotlabs/Lib/Apps.php:614 msgid "Unpin from navbar" msgstr "" @@ -15379,107 +15490,109 @@ msgstr "Bare offentlige forum" msgid "This Website Only" msgstr "Kun dette nettstedet" -#: ../../Zotlabs/Lib/Libzot.php:679 +#: ../../Zotlabs/Lib/Libzot.php:686 msgid "Unable to verify channel signature" msgstr "Ikke i stand til å sjekke kanalsignaturen" -#: ../../Zotlabs/Lib/ThreadItem.php:110 +#: ../../Zotlabs/Lib/ThreadItem.php:108 msgid "Restricted message" -msgstr "" +msgstr "Begrenset melding" -#: ../../Zotlabs/Lib/ThreadItem.php:117 +#: ../../Zotlabs/Lib/ThreadItem.php:115 msgid "Direct message" -msgstr "direktemelding" +msgstr "Direktemelding" -#: ../../Zotlabs/Lib/ThreadItem.php:122 +#: ../../Zotlabs/Lib/ThreadItem.php:120 msgid "Public Policy" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:160 +#: ../../Zotlabs/Lib/ThreadItem.php:152 msgid "Privacy conflict. Discretion advised." msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:191 ../../Zotlabs/Storage/Browser.php:369 +#: ../../Zotlabs/Lib/ThreadItem.php:183 ../../Zotlabs/Storage/Browser.php:372 msgid "Admin Delete" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:319 +#: ../../Zotlabs/Lib/ThreadItem.php:312 msgid "Reply on this comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:319 +#: ../../Zotlabs/Lib/ThreadItem.php:312 msgid "reply" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:319 +#: ../../Zotlabs/Lib/ThreadItem.php:312 msgid "Reply to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:342 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "Delivery Report" msgstr "Leveringsrapport" -#: ../../Zotlabs/Lib/ThreadItem.php:362 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" +#: ../../Zotlabs/Lib/ThreadItem.php:355 +#, fuzzy, php-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%d Comment" +msgid_plural "%d Comments" msgstr[0] "%d kommentar" msgstr[1] "%d kommentarer" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:356 #, php-format msgid "%d unseen" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:413 +#: ../../Zotlabs/Lib/ThreadItem.php:406 msgid "Forum" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:420 +#: ../../Zotlabs/Lib/ThreadItem.php:413 msgid "to" msgstr "til" -#: ../../Zotlabs/Lib/ThreadItem.php:422 +#: ../../Zotlabs/Lib/ThreadItem.php:415 msgid "Wall-to-Wall" -msgstr "vegg-til-vegg" +msgstr "Vegg-til-vegg" -#: ../../Zotlabs/Lib/ThreadItem.php:423 +#: ../../Zotlabs/Lib/ThreadItem.php:416 msgid "via Wall-To-Wall:" msgstr "via vegg-til-vegg:" -#: ../../Zotlabs/Lib/ThreadItem.php:451 +#: ../../Zotlabs/Lib/ThreadItem.php:444 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:469 +#: ../../Zotlabs/Lib/ThreadItem.php:462 msgid "Go to previous comment" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:482 +#: ../../Zotlabs/Lib/ThreadItem.php:475 msgid "Add to Calendar" msgstr "Legg til i kalender" -#: ../../Zotlabs/Lib/ThreadItem.php:841 +#: ../../Zotlabs/Lib/ThreadItem.php:837 msgid "Image" msgstr "Bilde" -#: ../../Zotlabs/Lib/ThreadItem.php:843 +#: ../../Zotlabs/Lib/ThreadItem.php:839 msgid "Insert Link" msgstr "Sett inn lenke" -#: ../../Zotlabs/Lib/ThreadItem.php:844 +#: ../../Zotlabs/Lib/ThreadItem.php:840 msgid "Video" msgstr "Video" -#: ../../Zotlabs/Lib/ThreadItem.php:853 +#: ../../Zotlabs/Lib/ThreadItem.php:849 msgid "Your full name (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:854 +#: ../../Zotlabs/Lib/ThreadItem.php:850 msgid "Your email address (required)" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:855 +#: ../../Zotlabs/Lib/ThreadItem.php:851 msgid "Your website URL (optional)" msgstr "" @@ -15551,7 +15664,7 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/Libsync.php:805 +#: ../../Zotlabs/Lib/Libsync.php:819 #, php-format msgid "Unable to verify site signature for %s" msgstr "Ikke i stand til å bekrefte signaturen til %s" @@ -15625,8 +15738,9 @@ msgid "Personal" msgstr "Personlig" #: ../../Zotlabs/Access/PermissionRoles.php:386 +#, fuzzy msgid "Community forum" -msgstr "" +msgstr "Forum for fellesskap" #: ../../Zotlabs/Access/PermissionRoles.php:387 msgid "Custom" @@ -15704,15 +15818,15 @@ msgstr "" msgid "Change filename to" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:390 +#: ../../Zotlabs/Storage/Browser.php:309 ../../Zotlabs/Storage/Browser.php:393 msgid "Select a target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:391 +#: ../../Zotlabs/Storage/Browser.php:310 ../../Zotlabs/Storage/Browser.php:394 msgid "Copy to target location" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:389 +#: ../../Zotlabs/Storage/Browser.php:311 ../../Zotlabs/Storage/Browser.php:392 msgid "Set permissions for all files and sub folders" msgstr "" @@ -15724,124 +15838,213 @@ msgstr "Varsle dine kontakter om denne filen" msgid "File category" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:362 +#: ../../Zotlabs/Storage/Browser.php:365 msgid "Total" msgstr "Totalt" -#: ../../Zotlabs/Storage/Browser.php:364 +#: ../../Zotlabs/Storage/Browser.php:367 msgid "Shared" msgstr "Delt" -#: ../../Zotlabs/Storage/Browser.php:366 +#: ../../Zotlabs/Storage/Browser.php:369 msgid "Add Files" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:381 +#: ../../Zotlabs/Storage/Browser.php:384 msgid "parent" msgstr "opp et nivå" -#: ../../Zotlabs/Storage/Browser.php:399 +#: ../../Zotlabs/Storage/Browser.php:402 +#, fuzzy msgid "Select All" -msgstr "" +msgstr "velg alle" -#: ../../Zotlabs/Storage/Browser.php:400 +#: ../../Zotlabs/Storage/Browser.php:403 msgid "Bulk Actions" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:401 +#: ../../Zotlabs/Storage/Browser.php:404 msgid "Adjust Permissions" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:402 +#: ../../Zotlabs/Storage/Browser.php:405 msgid "Move or Copy" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:405 +#: ../../Zotlabs/Storage/Browser.php:408 msgid "Info" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:406 +#: ../../Zotlabs/Storage/Browser.php:409 msgid "Rename" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:408 +#: ../../Zotlabs/Storage/Browser.php:411 msgid "Attachment BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:409 +#: ../../Zotlabs/Storage/Browser.php:412 msgid "Embed BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:410 +#: ../../Zotlabs/Storage/Browser.php:413 msgid "Link BBcode" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:480 +#: ../../Zotlabs/Storage/Browser.php:486 #, php-format msgid "You are using %1$s of your available file storage." msgstr "Du bruker %1$s av din tilgjengelige lagringsplass." -#: ../../Zotlabs/Storage/Browser.php:485 +#: ../../Zotlabs/Storage/Browser.php:491 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "Du bruker %1$s av %2$s tilgjengelig lagringsplass (%3$s%)" -#: ../../Zotlabs/Storage/Browser.php:496 +#: ../../Zotlabs/Storage/Browser.php:502 msgid "WARNING:" msgstr "ADVARSEL:" -#: ../../Zotlabs/Storage/Browser.php:537 +#: ../../Zotlabs/Storage/Browser.php:543 msgid "Create new folder" msgstr "Lag ny mappe" -#: ../../Zotlabs/Storage/Browser.php:539 +#: ../../Zotlabs/Storage/Browser.php:545 msgid "Upload file" msgstr "Last opp fil" -#: ../../Zotlabs/Storage/Browser.php:551 +#: ../../Zotlabs/Storage/Browser.php:557 msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:554 +#: ../../Zotlabs/Storage/Browser.php:560 msgid "" "You can select files via the upload button or drop them right here or into " "an existing folder." msgstr "" -#: ../../boot.php:1724 +#: ../../boot.php:1722 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1742 +#: ../../boot.php:1740 msgid "Email or nickname" msgstr "" -#: ../../boot.php:1752 +#: ../../boot.php:1750 msgid "Password" msgstr "Passord" -#: ../../boot.php:1753 +#: ../../boot.php:1751 msgid "Remember me" msgstr "Husk meg" -#: ../../boot.php:1756 +#: ../../boot.php:1754 msgid "Forgot your password?" msgstr "Glemt passordet ditt?" -#: ../../boot.php:2637 +#: ../../boot.php:2625 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2642 +#: ../../boot.php:2630 msgid "Website SSL certificate is not valid. Please correct." msgstr "Nettstedets SSL-sertifikat er ikke gyldig. Vennligst fiks dette." -#: ../../boot.php:2758 +#: ../../boot.php:2746 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2763 +#: ../../boot.php:2751 msgid "Cron/Scheduled tasks not running." msgstr "Cron/planlagte oppgaver kjører ikke." + +#~ msgid "Navigation bar icon color " +#~ msgstr "Navigasjonslinjens ikonfarge" + +#~ msgid "Navigation bar active icon color " +#~ msgstr "Navigasjonslinjens aktive ikoners farge" + +#~ msgid "Set font-color for banner" +#~ msgstr "Angi skriftfargen for banneret" + +#~ msgid "Set the background color of items" +#~ msgstr "Angi bakgrunnsfargen til elementer" + +#~ msgid "Set the background color of comments" +#~ msgstr "Angi bakgrunnsfargen til kommentarer" + +#~ msgid "Set font-color for posts and comments" +#~ msgstr "Angi skriftfargen for innlegg og kommentarer" + +#~ msgid "Set shadow depth of photos" +#~ msgstr "Angi skyggedybden til bilder" + +#~ msgid "Enable Community Moderation" +#~ msgstr "Slå på gruppemoderering" + +#~ msgid "An Error has occurred." +#~ msgstr "Det oppsto en feil." + +#~ msgid "Upvote" +#~ msgstr "Stem opp" + +#~ msgid "Downvote" +#~ msgstr "Stem ned" + +#~ msgid "prod" +#~ msgstr "oppildne" + +#~ msgid "prodded" +#~ msgstr "oppildnet" + +#~ msgid "slap" +#~ msgstr "daske" + +#~ msgid "slapped" +#~ msgstr "dasket" + +#~ msgid "finger" +#~ msgstr "fingre" + +#~ msgid "fingered" +#~ msgstr "fingret" + +#~ msgid "rebuff" +#~ msgstr "tilbakevise" + +#~ msgid "rebuffed" +#~ msgstr "tilbakeviste" + +#~ msgid "(Unknown)" +#~ msgstr "(Ukjent)" + +#~ msgid "Poke/Prod" +#~ msgstr "Prikke/oppildne" + +#~ msgid "Poke, prod or do other things to somebody" +#~ msgstr "Dult, prikk eller gjør andre ting med noen" + +#~ msgid "Choose what you wish to do to recipient" +#~ msgstr "Velg hva du ønsker å gjøre med mottakeren" + +#, fuzzy +#~ msgid "Not found" +#~ msgstr "Ikke funnet." + +#~ msgid "System language" +#~ msgstr "Systemspråk" + +#~ msgid "Import Public Streams" +#~ msgstr "Importer offentlige innholdsstrømmer" + +#, php-format +#~ msgid "%d rating" +#~ msgid_plural "%d ratings" +#~ msgstr[0] "%d vurdering" +#~ msgstr[1] "%d vurderinger" + +#~ msgid "Page owner information could not be retrieved." +#~ msgstr "Informasjon om sideeier kunne ikke hentes." diff --git a/view/nb-no/hstrings.php b/view/nb-no/hstrings.php index 86588d051..f66946062 100644 --- a/view/nb-no/hstrings.php +++ b/view/nb-no/hstrings.php @@ -10,50 +10,35 @@ App::$strings["Default"] = "Standard"; App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla standard)"; App::$strings["Submit"] = "Lagre"; App::$strings["Theme settings"] = "Instillinger for utseende"; -App::$strings["Narrow navbar"] = "Smal navigasjonslinje"; +App::$strings["Dark style"] = ""; +App::$strings["Light style"] = ""; +App::$strings["Common settings"] = ""; +App::$strings["Default to dark mode"] = "Standard mappe for opplasting av bilder"; App::$strings["No"] = "Nei"; App::$strings["Yes"] = "Ja"; +App::$strings["Always use light icons for navbar"] = ""; +App::$strings["Enable this option if you use a dark navbar color in light mode"] = ""; +App::$strings["Narrow navbar"] = "Smal navigasjonslinje"; App::$strings["Navigation bar background color"] = "Navigasjonslinjens bakgrunnsfarge"; -App::$strings["Navigation bar icon color "] = "Navigasjonslinjens ikonfarge"; -App::$strings["Navigation bar active icon color "] = "Navigasjonslinjens aktive ikoners farge"; +App::$strings["Dark navigation bar background color"] = "Navigasjonslinjens bakgrunnsfarge"; App::$strings["Link color"] = "Lenkefarge"; +App::$strings["Dark link color"] = "Lenkefarge"; App::$strings["Link hover color"] = "Lenkefarge når musepekeren er over"; -App::$strings["Set font-color for banner"] = "Angi skriftfargen for banneret"; +App::$strings["Dark link hover color"] = "Lenkefarge når musepekeren er over"; App::$strings["Set the background color"] = "Angi bakgrunnsfargen"; +App::$strings["Set the dark background color"] = "Angi bakgrunnsfargen"; App::$strings["Set the background image"] = "Angi bakgrunnsbilde"; -App::$strings["Set the background color of items"] = "Angi bakgrunnsfargen til elementer"; -App::$strings["Set the background color of comments"] = "Angi bakgrunnsfargen til kommentarer"; +App::$strings["Set the dark background image"] = "Angi bakgrunnsbilde"; App::$strings["Set font-size for the entire application"] = "Angi skriftstørrelsen for hele programmet"; App::$strings["Examples: 1rem, 100%, 16px"] = "For eksempel: 1rem, 100%, 16px"; -App::$strings["Set font-color for posts and comments"] = "Angi skriftfargen for innlegg og kommentarer"; App::$strings["Set radius of corners"] = "Angi hjørneradius"; App::$strings["Example: 4px"] = "For eksempel: 4px"; -App::$strings["Set shadow depth of photos"] = "Angi skyggedybden til bilder"; App::$strings["Set maximum width of content region in rem"] = "Set maksbredde for hovedregionen i rem"; App::$strings["Leave empty for default width"] = "La feltet stå tomt for å bruke standard bredde"; App::$strings["Set size of conversation author photo"] = "Angi størrelsen for samtalens forfatterbilde"; App::$strings["Set size of followup author photos"] = "Angi størrelsen på forfatterbilder ved oppfølging"; App::$strings["Show advanced settings"] = "Vis avanserte innstillinger"; App::$strings["Source channel not found."] = "Fant ikke kildekanalen."; -App::$strings["Access Denied"] = "Ingen tilgang"; -App::$strings["Enable Community Moderation"] = "Slå på gruppemoderering"; -App::$strings["Reputation automatically given to new members"] = ""; -App::$strings["Reputation will never fall below this value"] = ""; -App::$strings["Minimum reputation before posting is allowed"] = ""; -App::$strings["Minimum reputation before commenting is allowed"] = ""; -App::$strings["Minimum reputation before a member is able to moderate other posts"] = ""; -App::$strings["Max ratio of moderator's reputation that can be added to/deducted from reputation of person being moderated"] = ""; -App::$strings["Reputation \"cost\" to post"] = ""; -App::$strings["Reputation \"cost\" to comment"] = ""; -App::$strings["Reputation automatically recovers at this rate per hour until it reaches minimum_to_post"] = ""; -App::$strings["When minimum_to_moderate > reputation > minimum_to_post reputation recovers at this rate per hour"] = ""; -App::$strings["Community Moderation Settings"] = ""; -App::$strings["Channel Reputation"] = ""; -App::$strings["Close"] = "Lukk"; -App::$strings["An Error has occurred."] = "Det oppsto en feil."; -App::$strings["Upvote"] = "Stem opp"; -App::$strings["Downvote"] = "Stem ned"; -App::$strings["Can moderate reputation on my channel."] = ""; App::$strings["Block Completely"] = "Blokker helt"; App::$strings["superblock settings updated"] = "innstillingene til superblokk ble oppdatert"; App::$strings["Currently blocked"] = "Blokkert for øyeblikket"; @@ -63,13 +48,13 @@ App::$strings["NSA Bait App"] = ""; App::$strings["Make yourself a political target."] = ""; App::$strings["Recent Channel/Profile Viewers"] = ""; App::$strings["No entries."] = ""; +App::$strings["Wiki Pages"] = "Wikisider"; App::$strings["Add new page"] = "Legg til ny side"; App::$strings["Markdown"] = "Markdown"; App::$strings["BBcode"] = "BBcode"; App::$strings["Text"] = "Tekst"; -App::$strings["Options"] = "Valg"; -App::$strings["Wiki Pages"] = "Wikisider"; App::$strings["Page name"] = "Sidenavn"; +App::$strings["Options"] = "Valg"; App::$strings["Wikis"] = "Wikier"; App::$strings["Name"] = "Navn"; App::$strings["__ctx:wiki_history__ Message"] = "Melding"; @@ -109,7 +94,7 @@ App::$strings["Any type"] = ""; App::$strings["Lock content type"] = ""; App::$strings["Create a status post for this wiki"] = ""; App::$strings["Edit Wiki Name"] = ""; -App::$strings["Wiki not found"] = ""; +App::$strings["Wiki not found"] = "Fant ikke wikien."; App::$strings["Rename page"] = ""; App::$strings["Share"] = "Del"; App::$strings["Error retrieving page content"] = ""; @@ -145,8 +130,8 @@ App::$strings["You must be authenticated."] = ""; App::$strings["System defaults:"] = ""; App::$strings["Preferred Clipart IDs"] = ""; App::$strings["List of preferred clipart ids. These will be shown first."] = ""; -App::$strings["Default Search Term"] = ""; -App::$strings["The default search term. These will be shown second."] = ""; +App::$strings["Default Search Term"] = "Standard søkeord"; +App::$strings["The default search term. These will be shown second."] = "Standard søkeord. Disse vil vises som nummer to."; App::$strings["Return After"] = ""; App::$strings["Page to load after image selection."] = ""; App::$strings["View Profile"] = "Vis profil"; @@ -166,19 +151,11 @@ App::$strings["Uploaded by: "] = ""; App::$strings["Drawn by: "] = ""; App::$strings["Use this image"] = ""; App::$strings["Or select from a free OpenClipart.org image:"] = ""; -App::$strings["Search Term"] = ""; +App::$strings["Search Term"] = "Søkeord"; App::$strings["Unknown error. Please try again later."] = ""; App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."; App::$strings["Profile photo updated successfully."] = ""; App::$strings["Save Bookmarks"] = "Lagre bokmerker"; -App::$strings["Max queueworker threads"] = ""; -App::$strings["Minimum 4, default 4"] = ""; -App::$strings["Assume workers dead after"] = ""; -App::$strings["Minimum 120, default 300 seconds"] = ""; -App::$strings["Pause before starting next task"] = ""; -App::$strings["Minimum 100, default 100 microseconds"] = ""; -App::$strings["Queueworker Settings"] = ""; -App::$strings["Save"] = "Lagre"; App::$strings["Rainbow Tag App"] = ""; App::$strings["Add some colour to tag clouds"] = ""; App::$strings["Rainbow Tag"] = ""; @@ -219,7 +196,7 @@ App::$strings["Birth Month"] = "Fødselsmåne"; App::$strings["Birth Day"] = "Fødselsdag"; App::$strings["Birthdate"] = "Fødselsdato"; App::$strings["Gender"] = "Kjønn"; -App::$strings["lonely"] = ""; +App::$strings["lonely"] = "Ensom"; App::$strings["drunk"] = ""; App::$strings["horny"] = ""; App::$strings["stoned"] = ""; @@ -256,7 +233,7 @@ App::$strings["Known Chatrooms"] = ""; App::$strings["Known Tags"] = ""; App::$strings["Please note Diaspora and Friendica statistics are merely those **this directory** is aware of, and not all those known in the network. This also applies to chatrooms,"] = ""; App::$strings["Channel is required."] = ""; -App::$strings["Invalid channel."] = ""; +App::$strings["Invalid channel."] = "Ugyldig kanal"; App::$strings["Hubzilla Crosspost Connector Settings saved."] = ""; App::$strings["Send public postings to Hubzilla channel by default"] = ""; App::$strings["Hubzilla API Path"] = ""; @@ -278,7 +255,7 @@ App::$strings["Leave blank to import all albums"] = ""; App::$strings["Maximum count to import"] = ""; App::$strings["0 or blank to import all available"] = ""; App::$strings["photo"] = "foto"; -App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = ""; +App::$strings["Please contact your site administrator.
The provided API URL is not valid."] = "Den oppgitte URLen for APIet er ikke gyldig. Kontakt serverens administrator."; App::$strings["We could not contact the GNU social API with the Path you entered."] = ""; App::$strings["GNU social settings updated."] = ""; App::$strings["Globally Available GNU social OAuthKeys"] = ""; @@ -343,7 +320,7 @@ App::$strings["Until modified date yyyy-mm-dd"] = ""; App::$strings["Set your location"] = "Angi din plassering"; App::$strings["Clear browser location"] = "Fjern nettleserplassering"; App::$strings["Insert web link"] = "Sett inn web-lenke"; -App::$strings["Embed (existing) photo from your photo albums"] = ""; +App::$strings["Embed (existing) photo from your photo albums"] = "Sett inn (eksisterende) bilde fra fotoalbumene dine"; App::$strings["Please enter a link URL:"] = "Vennligst skriv inn en lenke URL:"; App::$strings["Tag term:"] = "Merkelapp:"; App::$strings["Where are you right now?"] = "Hvor er du akkurat nå?"; @@ -358,9 +335,9 @@ App::$strings["Italic"] = "Kursiv"; App::$strings["Underline"] = "Understreket"; App::$strings["Quote"] = "Sitat"; App::$strings["Code"] = "Kode"; -App::$strings["Attach/Upload file"] = ""; +App::$strings["Attach/Upload file"] = "Last opp fil/vedlegg"; App::$strings["Toggle voting"] = "Skru av eller på stemming"; -App::$strings["Disable comments"] = ""; +App::$strings["Disable comments"] = "Slå av kommentarer"; App::$strings["Toggle comments"] = ""; App::$strings["Title (optional)"] = "Tittel (valgfri)"; App::$strings["Categories (optional, comma-separated list)"] = "Kategorier (valgfri, kommaseparert liste)"; @@ -391,6 +368,25 @@ App::$strings["InsaneJournal password"] = ""; App::$strings["Post to InsaneJournal by default"] = ""; App::$strings["Insane Journal Crosspost Connector"] = ""; App::$strings["Post to Insane Journal"] = ""; +App::$strings["TOTP Two-Step Verification"] = ""; +App::$strings["Enter the 2-step verification generated by your authenticator app:"] = ""; +App::$strings["Success!"] = ""; +App::$strings["Invalid code, please try again."] = ""; +App::$strings["Too many invalid codes..."] = ""; +App::$strings["Verify"] = ""; +App::$strings["You haven't set a TOTP secret yet.\nPlease click the button below to generate one and register this site\nwith your preferred authenticator app."] = ""; +App::$strings["Your TOTP secret is"] = ""; +App::$strings["Be sure to save it somewhere in case you lose or replace your mobile device.\nUse your mobile device to scan the QR code below to register this site\nwith your preferred authenticator app."] = ""; +App::$strings["Test"] = "Sjekk koden"; +App::$strings["Generate New Secret"] = ""; +App::$strings["Go"] = ""; +App::$strings["Enter your password"] = ""; +App::$strings["enter TOTP code from your device"] = ""; +App::$strings["Pass!"] = ""; +App::$strings["Fail"] = ""; +App::$strings["Incorrect password, try again."] = ""; +App::$strings["Record your new TOTP secret and rescan the QR code above."] = ""; +App::$strings["TOTP Settings"] = ""; App::$strings["Who likes me?"] = ""; App::$strings["QR code"] = ""; App::$strings["QR Generator"] = ""; @@ -513,7 +509,7 @@ App::$strings["If enabled your public postings will be posted to the associated App::$strings["Twitter Crosspost Connector"] = ""; App::$strings["Post to Twitter"] = ""; App::$strings["You are now authenticated to pumpio."] = ""; -App::$strings["return to the featured settings page"] = ""; +App::$strings["return to the featured settings page"] = "tilbake til funksjonsinnstillinger"; App::$strings["Post to Pump.io"] = ""; App::$strings["Pump.io Settings saved."] = ""; App::$strings["Pump.io servername"] = ""; @@ -588,9 +584,10 @@ App::$strings["Paypal button payments are not enabled."] = ""; App::$strings["Paypal button payments are not properly configured. Please choose another payment option."] = ""; App::$strings["Enable Paypal Button Module (API-v2)"] = ""; App::$strings["Enable Manual Cart Module"] = ""; -App::$strings["Access Denied."] = ""; +App::$strings["Access Denied."] = "Ingen tilgang"; App::$strings["Order Not Found"] = ""; -App::$strings["Invalid Item"] = ""; +App::$strings["Access Denied"] = "Ingen tilgang"; +App::$strings["Invalid Item"] = "Ugyldig element."; App::$strings["Enable Test Catalog"] = ""; App::$strings["Enable Manual Payments"] = ""; App::$strings["Base Merchant Currency"] = ""; @@ -601,7 +598,7 @@ App::$strings["Order already checked out."] = ""; App::$strings["Drop database tables when uninstalling."] = ""; App::$strings["Shop"] = ""; App::$strings["You must be logged into the Grid to shop."] = ""; -App::$strings["Access denied."] = ""; +App::$strings["Access denied."] = "Ingen tilgang"; App::$strings["No Order Found"] = ""; App::$strings["An unknown error has occurred Please start again."] = ""; App::$strings["Requirements not met."] = ""; @@ -628,8 +625,6 @@ App::$strings["Unable to create a unique channel address. Import failed."] = "Kl App::$strings["Import completed."] = "Import ferdig."; App::$strings["Diaspora Protocol Settings updated."] = ""; App::$strings["The diaspora protocol does not support location independence. Connections you make within that network may be unreachable from alternate channel locations."] = ""; -App::$strings["Allow any Diaspora member to comment or like your public posts"] = ""; -App::$strings["If this setting is disabled only your contacts will be able to comment or like your public posts"] = ""; App::$strings["Prevent your hashtags from being redirected to other sites"] = ""; App::$strings["Sign and forward posts and comments with no existing Diaspora signature"] = ""; App::$strings["Followed hashtags (comma separated, do not include the #)"] = ""; @@ -682,8 +677,8 @@ App::$strings["Fontsize (px):"] = ""; App::$strings["Link:"] = ""; App::$strings["Like us on Hubzilla"] = ""; App::$strings["Embed:"] = ""; -App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = ""; -App::$strings["__ctx:opensearch__ \$Projectname"] = ""; +App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Søk %1\$s (%2\$s)"; +App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname"; App::$strings["\$Projectname"] = "\$Projectname"; App::$strings["Search \$Projectname"] = ""; App::$strings["Fuzzloc Settings updated."] = ""; @@ -708,6 +703,7 @@ App::$strings["Cards"] = ""; App::$strings["View Cards"] = ""; App::$strings["View in context"] = "Vis i sammenheng"; App::$strings["Add Card"] = ""; +App::$strings["Save"] = "Lagre"; App::$strings["New registration"] = ""; App::$strings["%s : Message delivery failed."] = "%s : meldingslevering feilet."; App::$strings["Message sent to %s. New account registration: %s"] = ""; @@ -726,25 +722,6 @@ App::$strings["Ah shucks..."] = ""; App::$strings["Don't mention it."] = ""; App::$strings["<blush>"] = ""; App::$strings["Report Bug"] = ""; -App::$strings["TOTP Two-Step Verification"] = ""; -App::$strings["Enter the 2-step verification generated by your authenticator app:"] = ""; -App::$strings["Success!"] = ""; -App::$strings["Invalid code, please try again."] = ""; -App::$strings["Too many invalid codes..."] = ""; -App::$strings["Verify"] = ""; -App::$strings["You haven't set a TOTP secret yet.\nPlease click the button below to generate one and register this site\nwith your preferred authenticator app."] = ""; -App::$strings["Your TOTP secret is"] = ""; -App::$strings["Be sure to save it somewhere in case you lose or replace your mobile device.\nUse your mobile device to scan the QR code below to register this site\nwith your preferred authenticator app."] = ""; -App::$strings["Test"] = ""; -App::$strings["Generate New Secret"] = ""; -App::$strings["Go"] = ""; -App::$strings["Enter your password"] = ""; -App::$strings["enter TOTP code from your device"] = ""; -App::$strings["Pass!"] = ""; -App::$strings["Fail"] = ""; -App::$strings["Incorrect password, try again."] = ""; -App::$strings["Record your new TOTP secret and rescan the QR code above."] = ""; -App::$strings["TOTP Settings"] = ""; App::$strings["Logfile archive directory"] = ""; App::$strings["Directory to store rotated logs"] = ""; App::$strings["Logfile size in bytes before rotating"] = ""; @@ -764,7 +741,7 @@ App::$strings["Unable to login using email address "] = ""; App::$strings["Social Authentication using your social media account"] = ""; App::$strings["This app enables one or more social provider sign-in buttons on the login page."] = ""; App::$strings["Add an identity provider"] = ""; -App::$strings["Enable "] = ""; +App::$strings["Enable "] = "Skru på"; App::$strings["Key"] = ""; App::$strings["Word"] = ""; App::$strings["Secret"] = ""; @@ -855,14 +832,6 @@ App::$strings["poke"] = "prikk"; App::$strings["poked"] = "prikket"; App::$strings["ping"] = "varsle"; App::$strings["pinged"] = "varslet"; -App::$strings["prod"] = "oppildne"; -App::$strings["prodded"] = "oppildnet"; -App::$strings["slap"] = "daske"; -App::$strings["slapped"] = "dasket"; -App::$strings["finger"] = "fingre"; -App::$strings["fingered"] = "fingret"; -App::$strings["rebuff"] = "tilbakevise"; -App::$strings["rebuffed"] = "tilbakeviste"; App::$strings["happy"] = "glad"; App::$strings["sad"] = "trist"; App::$strings["mellow"] = "dempet"; @@ -903,7 +872,7 @@ App::$strings["September"] = "september"; App::$strings["October"] = "oktober"; App::$strings["November"] = "november"; App::$strings["December"] = "desember"; -App::$strings["Unknown Attachment"] = "Ukjent vedlegg"; +App::$strings["Unknown attachment"] = "Ukjent vedlegg"; App::$strings["Size"] = "Størrelse"; App::$strings["unknown"] = "ukjent"; App::$strings["remove category"] = "fjern kategori"; @@ -917,8 +886,8 @@ App::$strings["__ctx:noun__ %d Vote in total"] = array( 0 => "", 1 => "", ); -App::$strings["Poll has ended"] = ""; -App::$strings["Poll ends in %s"] = ""; +App::$strings["Poll has ended"] = "Spørreskjema har utløpt"; +App::$strings["Poll ends in %s"] = "Spørreskjema utløper om %s"; App::$strings["Vote"] = ""; App::$strings["Link to Source"] = "Lenke til kilde"; App::$strings["default"] = "standard"; @@ -932,7 +901,7 @@ App::$strings["event"] = "hendelse"; App::$strings["post"] = "innlegg"; App::$strings["comment"] = "kommentar"; App::$strings["activity"] = "aktivitet"; -App::$strings["poll"] = ""; +App::$strings["poll"] = "spørreskjema"; App::$strings["a-z, 0-9, -, and _ only"] = ""; App::$strings["Design Tools"] = "Designverktøy"; App::$strings["Blocks"] = "Byggeklosser"; @@ -969,7 +938,7 @@ App::$strings["Needs Action"] = "Trenger handling"; App::$strings["Completed"] = "Ferdig"; App::$strings["In Process"] = "Igang"; App::$strings["Cancelled"] = "Avbrutt"; -App::$strings["Mobile"] = ""; +App::$strings["Mobile"] = "mobil"; App::$strings["Home"] = "Hjem"; App::$strings["Home, Voice"] = ""; App::$strings["Home, Fax"] = ""; @@ -989,8 +958,8 @@ App::$strings["Search by Date"] = "Søk etter dato"; App::$strings["Ability to select posts by date ranges"] = "Mulighet for å velge innlegg etter datoområde"; App::$strings["Tag Cloud"] = "Merkelappsky"; App::$strings["Provide a personal tag cloud on your channel page"] = "Tilby en personlig merkelappsky på din kanalside"; -App::$strings["Use blog/list mode"] = ""; -App::$strings["Comments will be displayed separately"] = ""; +App::$strings["Use blog/list mode"] = "Bruk blogg/listemodus"; +App::$strings["Comments will be displayed separately"] = "Kommentarer blir vist separat fra innlegget"; App::$strings["Connection Filtering"] = "Filtrer forbindelser"; App::$strings["Filter incoming posts from connections based on keywords/content"] = "Filtrer innkommende innlegg fra forbindelser basert på nøkkelord/innhold"; App::$strings["Conversation"] = ""; @@ -1003,45 +972,45 @@ App::$strings["Ability to mark special posts with a star indicator"] = "Mulighet App::$strings["Reply on comment"] = ""; App::$strings["Ability to reply on selected comment"] = ""; App::$strings["Directory"] = "Katalog"; -App::$strings["Advanced Directory Search"] = ""; -App::$strings["Allows creation of complex directory search queries"] = ""; +App::$strings["Advanced Directory Search"] = "Avansert katalogsøk"; +App::$strings["Allows creation of complex directory search queries"] = "Gjør det mulig å bruke avanserte kriterier ved søk i katalogen"; App::$strings["Editor"] = ""; App::$strings["Post Categories"] = "Innleggskategorier"; App::$strings["Add categories to your posts"] = "Legg kategorier til dine innlegg"; App::$strings["Large Photos"] = "Store bilder"; -App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, bruk små (640px) småbilder."; +App::$strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, bruk små (640px) småbilder"; App::$strings["Even More Encryption"] = "Enda mer kryptering"; App::$strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel"; -App::$strings["Disable Comments"] = ""; -App::$strings["Provide the option to disable comments for a post"] = ""; +App::$strings["Disable Comments"] = "Slå av kommentarer"; +App::$strings["Provide the option to disable comments for a post"] = "Slår på valg for å ikke tillate kommentarer til innlegget"; App::$strings["Delayed Posting"] = "Tidfest publisering"; App::$strings["Allow posts to be published at a later date"] = "Tillat innlegg å bli publisert på et senere tidspunkt"; App::$strings["Content Expiration"] = "Innholdet utløper"; App::$strings["Remove posts/comments and/or private messages at a future time"] = "Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt i fremtiden"; App::$strings["Suppress Duplicate Posts/Comments"] = "Forhindre duplikat av innlegg/kommentarer"; App::$strings["Prevent posts with identical content to be published with less than two minutes in between submissions."] = "Forhindre innlegg med identisk innhold fra å bli publisert hvis det er mindre enn to minutter mellom innsendingene."; -App::$strings["Auto-save drafts of posts and comments"] = ""; -App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = ""; +App::$strings["Auto-save drafts of posts and comments"] = "Automatisk lagring av kladd for innlegg og kommentarer"; +App::$strings["Automatically saves post and comment drafts in local browser storage to help prevent accidental loss of compositions"] = "Lagrer automatisk utkast til innlegg og kommentarer i nettleserens interne lager for å unngå å tape innholet ved et uhell"; App::$strings["Manage"] = ""; App::$strings["Navigation Channel Select"] = "Navigasjon kanalvalg"; App::$strings["Change channels directly from within the navigation dropdown menu"] = "Endre kanaler direkte fra navigasjonsmenyen"; App::$strings["Network"] = "Nettverk"; -App::$strings["Events Filter"] = ""; -App::$strings["Ability to display only events"] = ""; -App::$strings["Polls Filter"] = ""; -App::$strings["Ability to display only polls"] = ""; +App::$strings["Events Filter"] = "Arrangementsfilter"; +App::$strings["Ability to display only events"] = "Mulighet for kun å vise arrangementer"; +App::$strings["Polls Filter"] = "Filer for Spørreskjema"; +App::$strings["Ability to display only polls"] = "Mulighet for å kun vise spørreskjema"; App::$strings["Saved Searches"] = "Lagrede søk"; App::$strings["Save search terms for re-use"] = "Lagre søkeuttrykk for senere bruk"; App::$strings["Saved Folders"] = "Lagrede mapper"; App::$strings["Ability to file posts under folders"] = "Mulighet til å sortere innlegg i mapper"; -App::$strings["Alternate Stream Order"] = ""; -App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = ""; -App::$strings["Contact Filter"] = ""; -App::$strings["Ability to display only posts of a selected contact"] = ""; -App::$strings["Forum Filter"] = ""; -App::$strings["Ability to display only posts of a specific forum"] = ""; -App::$strings["Personal Posts Filter"] = ""; -App::$strings["Ability to display only posts that you've interacted on"] = ""; +App::$strings["Alternate Stream Order"] = "Alternativer for sortering"; +App::$strings["Ability to order the stream by last post date, last comment date or unthreaded activities"] = "Mulighet for å sortere tidslinjen etter dato for siste innlegg, siste kommentar eller som separate aktiviteter"; +App::$strings["Contact Filter"] = "Kontaktfilter"; +App::$strings["Ability to display only posts of a selected contact"] = "Mulighet for å kun vise innlegg fra en bestemt kontakt"; +App::$strings["Forum Filter"] = "Forumfilter"; +App::$strings["Ability to display only posts of a specific forum"] = "Mulighet for å kun vise innlegg i et bestemt forum"; +App::$strings["Personal Posts Filter"] = "Filter for personlige innlegg"; +App::$strings["Ability to display only posts that you've interacted on"] = "Mulighet til å vise kun innlegg du har deltatt på"; App::$strings["Photos"] = "Bilder"; App::$strings["Photo Location"] = "Bildeplassering"; App::$strings["If location data is available on uploaded photos, link this to a map."] = "Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på et kart."; @@ -1068,12 +1037,12 @@ App::$strings["everybody"] = "alle"; App::$strings["Secret Passphrase"] = "Hemmelig passordsetning"; App::$strings["Passphrase hint"] = "Hint om passordsetning"; App::$strings["Notice: Permissions have changed but have not yet been submitted."] = "Varsel: Tillatelser har blitt endret, men de har ennå ikke blitt sendt inn."; -App::$strings["close all"] = "Lukk alle"; +App::$strings["close all"] = "lukk alle"; App::$strings["Nothing new here"] = "Ikke noe nytt her"; App::$strings["Rate This Channel (this is public)"] = "Vurder denne kanalen (dette er offentlig)"; App::$strings["Rating"] = "Vurdering"; App::$strings["Describe (optional)"] = "Beskriv (valgfritt)"; -App::$strings["Please enter a link URL"] = "Vennligst skriv inn en lenke URL:"; +App::$strings["Please enter a link URL"] = "Vennligst skriv inn en lenke URL"; App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Endringene er ikke lagret. Er du sikker på at du ønsker å forlate denne siden?"; App::$strings["Location"] = "Plassering"; App::$strings["lovely"] = ""; @@ -1085,7 +1054,7 @@ App::$strings[") or enter a new one."] = ""; App::$strings["Thank you, this nickname is valid."] = ""; App::$strings["A channel name is required."] = ""; App::$strings["This is a "] = ""; -App::$strings[" channel name"] = ""; +App::$strings[" channel name"] = "Kanalnavn"; App::$strings["Back to reply"] = ""; App::$strings["Pinned"] = ""; App::$strings["Pin to the top"] = ""; @@ -1175,7 +1144,7 @@ App::$strings["Zot"] = "Zot"; App::$strings["LinkedIn"] = "LinkedIn"; App::$strings["XMPP/IM"] = "XMPP/IM"; App::$strings["MySpace"] = "MySpace"; -App::$strings[" and "] = "og"; +App::$strings[" and "] = " og "; App::$strings["public profile"] = "offentlig profil"; App::$strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s endret %2\$s til “%3\$s”"; App::$strings["Visit %1\$s's %2\$s"] = "Besøk %1\$s sitt %2\$s"; @@ -1203,9 +1172,9 @@ App::$strings["Cloned channel not found. Import failed."] = "Klonet kanal ble ik App::$strings["Remote authentication"] = "Fjernautentisering"; App::$strings["Click to authenticate to your home hub"] = "Klikk for å godkjennes mot din hjemme-hub"; App::$strings["Channels"] = "Kanaler"; -App::$strings["Manage your channels"] = ""; +App::$strings["Manage your channels"] = "Behandle kanalene dine"; App::$strings["Settings"] = "Innstillinger"; -App::$strings["Account/Channel Settings"] = "Konto-/kanal-innstillinger"; +App::$strings["Account/Channel Settings"] = "Konto-/kanalinnstillinger"; App::$strings["Logout"] = "Logg ut"; App::$strings["End this session"] = "Avslutt denne økten"; App::$strings["Your profile page"] = "Din profilside"; @@ -1219,17 +1188,17 @@ App::$strings["Log me out of this site"] = ""; App::$strings["Register"] = "Registrer"; App::$strings["Create an account"] = "Lag en konto"; App::$strings["Help and documentation"] = "Hjelp og dokumentasjon"; -App::$strings["Search site @name, !forum, #tag, ?docs, content"] = ""; +App::$strings["Search site @name, !forum, #tag, ?docs, content"] = "Søk etter @navn, !forum, #emne, ?dokumentasjon eller innhold"; App::$strings["Admin"] = "Administrator"; App::$strings["Site Setup and Configuration"] = "Nettstedsoppsett og -konfigurasjon"; -App::$strings["Loading"] = ""; +App::$strings["Loading"] = "Laster..."; App::$strings["@name, #tag, ?doc, content"] = "@navn, #merkelapp, ?dokumentasjon, innhold"; App::$strings["Please wait..."] = "Vennligst vent..."; App::$strings["Apps"] = "Apper"; App::$strings["Channel Apps"] = ""; App::$strings["System Apps"] = ""; App::$strings["Pinned Apps"] = ""; -App::$strings["Featured Apps"] = ""; +App::$strings["Featured Apps"] = "Fremhevede apper"; App::$strings["Channel"] = "Kanal"; App::$strings["Status Messages and Posts"] = "Statusmeldinger og -innlegg"; App::$strings["About"] = "Om"; @@ -1247,8 +1216,8 @@ App::$strings["Logged out."] = "Logget ut."; App::$strings["Email validation is incomplete. Please check your email."] = ""; App::$strings["Failed authentication"] = "Mislykket autentisering"; App::$strings["Miscellaneous"] = "Forskjellig"; -App::$strings["Birthday"] = ""; -App::$strings["Age: "] = "Alder:"; +App::$strings["Birthday"] = "Fødselsdag:"; +App::$strings["Age: "] = "Alder: "; App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD eller MM-DD"; App::$strings["never"] = "aldri"; App::$strings["less than a second ago"] = "for mindre enn ett sekund siden"; @@ -1282,14 +1251,14 @@ App::$strings["__ctx:relative_date__ second"] = array( 1 => "sekunder", ); App::$strings["%1\$s's birthday"] = "%1\$s sin fødselsdag"; -App::$strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s !"; +App::$strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s"; App::$strings["INVALID EVENT DISMISSED!"] = ""; -App::$strings["Summary: "] = ""; +App::$strings["Summary: "] = "Sammendrag"; App::$strings["Unknown"] = "Ukjent"; -App::$strings["Date: "] = ""; +App::$strings["Date: "] = "Dato"; App::$strings["Reason: "] = ""; App::$strings["INVALID CARD DISMISSED!"] = ""; -App::$strings["Name: "] = ""; +App::$strings["Name: "] = "Navn"; App::$strings["channel"] = "kanal"; App::$strings["likes %1\$s's %2\$s"] = ""; App::$strings["doesn't like %1\$s's %2\$s"] = ""; @@ -1320,7 +1289,7 @@ App::$strings["Expires: %s"] = "Utløper: %s"; App::$strings["Please wait"] = "Vennligst vent"; App::$strings["remove"] = "fjern"; App::$strings["Loading..."] = "Laster..."; -App::$strings["Conversation Features"] = ""; +App::$strings["Conversation Features"] = "Samtaleinnstillinger"; App::$strings["Delete Selected Items"] = "Slett valgte elementer"; App::$strings["View Source"] = "Vis kilde"; App::$strings["Follow Thread"] = "Følg tråd"; @@ -1329,6 +1298,8 @@ App::$strings["Recent Activity"] = "Nylig aktivitet"; App::$strings["Connect"] = "Koble"; App::$strings["Edit Connection"] = "Endre forbindelse"; App::$strings["Poke"] = "Prikk"; +App::$strings["Approve this item"] = "Fjern denne filen"; +App::$strings["Delete this item"] = "Slett dette elementet?"; App::$strings["%s likes this."] = "%s liker dette."; App::$strings["%s doesn't like this."] = "%s liker ikke dette."; App::$strings["%2\$d people like this."] = array( @@ -1346,14 +1317,14 @@ App::$strings[", and %d other people"] = array( ); App::$strings["%s like this."] = "%s liker dette."; App::$strings["%s don't like this."] = "%s liker ikke dette."; -App::$strings["Toggle poll"] = ""; -App::$strings["Option"] = ""; -App::$strings["Add option"] = ""; +App::$strings["Toggle poll"] = "Spørreskjema (på/av)"; +App::$strings["Option"] = "Valg"; +App::$strings["Add option"] = "Legg til valg"; App::$strings["Minutes"] = "Minutter"; -App::$strings["Hours"] = ""; -App::$strings["Days"] = ""; -App::$strings["Allow multiple answers"] = ""; -App::$strings["Summary (optional)"] = ""; +App::$strings["Hours"] = "timer"; +App::$strings["Days"] = "dager"; +App::$strings["Allow multiple answers"] = "Tillat flere svar"; +App::$strings["Summary (optional)"] = "Sammendrag (valgfritt)"; App::$strings["__ctx:noun__ Like"] = array( 0 => "Liker", 1 => "Liker", @@ -1427,7 +1398,7 @@ App::$strings["Dating"] = "Sammen med"; App::$strings["Unfaithful"] = "Utro"; App::$strings["Sex Addict"] = "Sexavhengig"; App::$strings["Friends"] = "Venner"; -App::$strings["Friends/Benefits"] = "Venner med frynsegoder"; +App::$strings["Friends/Benefits"] = "Venner/Frynsegoder"; App::$strings["Casual"] = "Tilfeldig"; App::$strings["Engaged"] = "Forlovet"; App::$strings["Married"] = "Gift"; @@ -1469,7 +1440,6 @@ App::$strings["like"] = "liker"; App::$strings["likes"] = "liker"; App::$strings["dislike"] = "misliker"; App::$strings["dislikes"] = "misliker"; -App::$strings["(Unknown)"] = "(Ukjent)"; App::$strings["Visible to anybody on the internet."] = "Synlig for enhver på Internett."; App::$strings["Visible to you only."] = "Synlig bare for deg."; App::$strings["Visible to anybody in this network."] = "Synlig for enhver i dette nettverket."; @@ -1479,7 +1449,7 @@ App::$strings["Visible to all connections."] = "Synlig for alle forbindelser."; App::$strings["Visible to approved connections."] = "Synlig for godkjente forbindelser."; App::$strings["Visible to specific connections."] = "Synlig for spesifikke forbindelser."; App::$strings["🔁 Repeated %1\$s's %2\$s"] = ""; -App::$strings["Privacy group not found."] = "Personverngruppen ble ikke funnet"; +App::$strings["Privacy group not found."] = "Personverngruppen ble ikke funnet."; App::$strings["Privacy group is empty."] = "Personverngruppen er tom."; App::$strings["Privacy group: %s"] = "Personverngruppe: %s"; App::$strings["Connection: %s"] = "Forbindelse: %s"; @@ -1491,8 +1461,8 @@ App::$strings["%1\$s updated his %2\$s"] = "%1\$s oppdaterte %2\$s sitt"; App::$strings["%1\$s updated their %2\$s"] = "%1\$s oppdaterte %2\$s deres"; App::$strings["profile photo"] = "profilbilde"; App::$strings["[Edited %s]"] = ""; -App::$strings["__ctx:edit_activity__ Post"] = ""; -App::$strings["__ctx:edit_activity__ Comment"] = ""; +App::$strings["__ctx:edit_activity__ Post"] = "Innlegg"; +App::$strings["__ctx:edit_activity__ Comment"] = "Kommentar"; App::$strings["The provided email address is not valid"] = ""; App::$strings["The provided email domain is not among those allowed on this site"] = ""; App::$strings["The provided email address is already registered at this site"] = ""; @@ -1532,7 +1502,9 @@ App::$strings["Path not found."] = "Stien ble ikke funnet."; App::$strings["mkdir failed."] = "mkdir mislyktes."; App::$strings["database storage failed."] = "databaselagring mislyktes."; App::$strings["Empty path"] = "Tom sti"; +App::$strings["%s shared an %s with you"] = "Filer: delt med meg"; App::$strings["%s shared a %s with you"] = ""; +App::$strings["image"] = "Bilde"; App::$strings["%1\$s's bookmarks"] = "%1\$s sine bokmerker"; App::$strings["Image/photo"] = "Bilde/fotografi"; App::$strings["Encrypted content"] = "Kryptert innhold"; @@ -1571,6 +1543,7 @@ App::$strings["Status:"] = "Status:"; App::$strings["Homepage:"] = "Hjemmeside:"; App::$strings["Hometown:"] = "Hjemby:"; App::$strings["Online Now"] = "Online nå"; +App::$strings["This channel has not added a profile description yet"] = ""; App::$strings["Change your profile photo"] = ""; App::$strings["Trans"] = ""; App::$strings["Full Name:"] = "Fullt navn:"; @@ -1609,16 +1582,17 @@ App::$strings["Visible to your default audience"] = "Synlig for ditt standard pu App::$strings["Profile-Based Privacy Groups"] = ""; App::$strings["Private Forum"] = ""; App::$strings["Forums"] = "Forum"; -App::$strings["Only me"] = ""; -App::$strings["Share with"] = ""; -App::$strings["Custom selection"] = ""; +App::$strings["Only me"] = "Kun meg"; +App::$strings["Share with"] = "Del med"; +App::$strings["Custom selection"] = "Tilpasset utvalg"; App::$strings["Select \"Allow\" to allow viewing. \"Don't allow\" lets you override and limit the scope of \"Allow\"."] = ""; App::$strings["Allow"] = ""; App::$strings["Don't allow"] = ""; -App::$strings["Post permissions %s cannot be changed %s after a post is shared.
These permissions set who is allowed to view the post."] = ""; +App::$strings["Close"] = "Lukk"; +App::$strings["Post permissions %s cannot be changed %s after a post is shared.
These permissions set who is allowed to view the post."] = "Tillatelsene til innlegget %s kan ikke endres %s etter at innlegget er delt.
Disse tillatelsene avgjør hvem som kan se innlegget."; App::$strings["View PDF"] = ""; -App::$strings[" by "] = ""; -App::$strings[" on "] = ""; +App::$strings[" by "] = " av "; +App::$strings[" on "] = "På"; App::$strings["Embedded content"] = "Innebygget innhold"; App::$strings["Embedding disabled"] = "Innbygging avskrudd"; App::$strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s ønsker %2\$s velkommen"; @@ -1637,13 +1611,15 @@ App::$strings["Edit Album"] = "Endre album"; App::$strings["Upload"] = "Last opp"; App::$strings["Tasks"] = "Oppgaver"; App::$strings["Chat Members"] = ""; +App::$strings["Welcome"] = "Velkommen"; +App::$strings["No recent activities"] = "Nylig aktivitet"; App::$strings["__ctx:noun__ new connection"] = array( - 0 => "", - 1 => "", + 0 => "ny forbindelse", + 1 => "nye forbindelser", ); App::$strings["__ctx:noun__ notice"] = array( - 0 => "", - 1 => "", + 0 => "varsel", + 1 => "varsel", ); App::$strings["I will attend"] = "Jeg vil delta"; App::$strings["I will not attend"] = "Jeg deltar ikke"; @@ -1659,7 +1635,7 @@ App::$strings["Attendance Options"] = ""; App::$strings["Voting Options"] = ""; App::$strings["Pinned post"] = ""; App::$strings["Don't show"] = "Ikke vis"; -App::$strings["__ctx:widget__ Activity"] = ""; +App::$strings["__ctx:widget__ Activity"] = "aktivitet"; App::$strings["Select Channel"] = ""; App::$strings["Read-write"] = ""; App::$strings["Read-only"] = ""; @@ -1686,7 +1662,7 @@ App::$strings["Remove term"] = "Fjern begrep"; App::$strings["Suggested Chatrooms"] = "Foreslåtte chatrom"; App::$strings["Account settings"] = "Kontoinnstillinger"; App::$strings["Channel settings"] = "Kanalinnstillinger"; -App::$strings["Privacy settings"] = ""; +App::$strings["Privacy settings"] = "Personverninnstillinger"; App::$strings["Display settings"] = "Visningsinnstillinger"; App::$strings["Manage locations"] = ""; App::$strings["Overview"] = ""; @@ -1695,7 +1671,7 @@ App::$strings["Suggestions"] = "Forslag"; App::$strings["See more..."] = "Se mer..."; App::$strings["Bookmarked Chatrooms"] = "Bokmerkede chatrom"; App::$strings["App Categories"] = ""; -App::$strings["Toggle post editor"] = ""; +App::$strings["Toggle post editor"] = "Vis redigering av innlegg"; App::$strings["Toggle personal notes"] = ""; App::$strings["Channel activities"] = ""; App::$strings["Add new role"] = ""; @@ -1710,16 +1686,17 @@ App::$strings["Features"] = "Funksjoner"; App::$strings["Addons"] = "Tillegg"; App::$strings["Themes"] = "Utseende"; App::$strings["Inspect queue"] = "Inspiser kø"; +App::$strings["Queueworker"] = ""; App::$strings["Profile Fields"] = "Profilfelter"; App::$strings["DB updates"] = "Databaseoppdateringer"; App::$strings["Logs"] = "Logger"; App::$strings["Addon Features"] = ""; App::$strings["Direct Messages"] = "Direktemeldinger"; -App::$strings["Show direct (private) messages"] = ""; +App::$strings["Show direct (private) messages"] = "Vis direktemeldinger (private meldinger)"; App::$strings["Events"] = "Hendelser"; App::$strings["Show posts that include events"] = ""; -App::$strings["Polls"] = ""; -App::$strings["Show posts that include polls"] = ""; +App::$strings["Polls"] = "Spørreskjema"; +App::$strings["Show posts that include polls"] = "Vis innlegg som inneholder spørreskjema"; App::$strings["Show posts related to the %s privacy group"] = ""; App::$strings["Show my privacy groups"] = ""; App::$strings["Show posts to this forum"] = ""; @@ -1731,14 +1708,14 @@ App::$strings["Show posts that mention or involve me"] = ""; App::$strings["Show posts that I have filed to %s"] = ""; App::$strings["Show filed post categories"] = ""; App::$strings["Panel search"] = ""; -App::$strings["Filter by name"] = ""; +App::$strings["Filter by name"] = "Filtrer etter navn"; App::$strings["Remove active filter"] = ""; -App::$strings["Stream Filters"] = ""; +App::$strings["Stream Filters"] = "Filtere for tidslinjen"; App::$strings["App Collections"] = ""; App::$strings["Installed apps"] = ""; App::$strings["Available Apps"] = ""; App::$strings["Add new group"] = ""; -App::$strings["Privacy groups"] = ""; +App::$strings["Privacy groups"] = "Personverngrupper"; App::$strings["Rating Tools"] = "Vurderingsverktøy"; App::$strings["Rate Me"] = "Vurder meg"; App::$strings["View Ratings"] = "Vis vurderinger"; @@ -1751,7 +1728,9 @@ App::$strings["Public and restricted messages"] = ""; App::$strings["Direct messages"] = "Direktemeldinger"; App::$strings["Starred messages"] = ""; App::$strings["Notices"] = "Varsel"; -App::$strings["No messages"] = ""; +App::$strings["No messages"] = "Ingen meldinger"; +App::$strings["Unseen"] = ""; +App::$strings["Filter by name or address"] = "Filtrer etter navn eller adresse"; App::$strings["Profile Creation"] = "Oppretting av profil"; App::$strings["Upload profile photo"] = "Last opp profilbilde"; App::$strings["Upload cover photo"] = "Last opp bannerbilde"; @@ -1782,7 +1761,6 @@ App::$strings["New network activity notifications"] = ""; App::$strings["Network stream"] = ""; App::$strings["Mark all notifications read"] = ""; App::$strings["Show new posts only"] = ""; -App::$strings["Filter by name or address"] = ""; App::$strings["New home activity notifications"] = ""; App::$strings["Home stream"] = ""; App::$strings["Mark all notifications seen"] = ""; @@ -1819,9 +1797,9 @@ App::$strings["Can not move folder \"%s\" into itself."] = ""; App::$strings["No such group"] = "Gruppen finnes ikke"; App::$strings["No such channel"] = "Ingen slik kanal"; App::$strings["Search Results For:"] = "Søkeresultat for:"; -App::$strings["Reset form"] = ""; +App::$strings["Reset form"] = "Nullstill skjema"; App::$strings["Privacy group is empty"] = "Personverngruppen er tom"; -App::$strings["Privacy group: "] = "Personverngruppe:"; +App::$strings["Privacy group: "] = "Personverngruppe: "; App::$strings["Not a zip file or zip file corrupted."] = ""; App::$strings["Import Items"] = "Importer elementer"; App::$strings["Use this form to import existing posts and content from an export file."] = "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil."; @@ -1945,7 +1923,7 @@ App::$strings["GD graphics PHP module"] = "GD graphics PHP-modul"; App::$strings["OpenSSL PHP module"] = "OpenSSL PHP-modul"; App::$strings["PDO database PHP module"] = ""; App::$strings["mb_string PHP module"] = "mb_string PHP-modul"; -App::$strings["xml PHP module"] = "XML PHP modul"; +App::$strings["xml PHP module"] = "xml PHP modul"; App::$strings["zip PHP module"] = ""; App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite-modul"; App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert."; @@ -1980,7 +1958,7 @@ App::$strings["This can cause usability issues elsewhere (not just on your own s App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere."; App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = ""; App::$strings["SSL certificate validation"] = "SSL sertifikat-kontroll"; -App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:"; +App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test: "; App::$strings["Url rewrite is working"] = "URL rewrite virker"; App::$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."] = "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener."; App::$strings["

What next?

"] = ""; @@ -2012,17 +1990,16 @@ App::$strings["Could not create privacy group."] = "Kunne ikke opprette personve App::$strings["Privacy group updated."] = "Personverngruppen er oppdatert."; App::$strings["Post to this group by default"] = ""; App::$strings["Add new contacts to this group by default"] = ""; -App::$strings["Privacy group name"] = ""; +App::$strings["Privacy group name"] = "Personverngruppens navn:"; App::$strings["Members are visible to other channels"] = "Medlemmer er synlig for andre kanaler"; App::$strings["Privacy group removed."] = "Personverngruppen er fjernet."; App::$strings["Unable to remove privacy group."] = "Ikke i stand til å fjerne personverngruppen."; -App::$strings["Privacy Group: %s"] = ""; -App::$strings["Privacy group name: "] = "Personverngruppens navn:"; +App::$strings["Privacy Group: %s"] = "Personverngruppe: %s"; +App::$strings["Privacy group name: "] = "Personverngruppens navn: "; App::$strings["Group members"] = ""; App::$strings["Not in this group"] = ""; App::$strings["Click a channel to toggle membership"] = ""; App::$strings["This page is available only to site members"] = ""; -App::$strings["Welcome"] = "Velkommen"; App::$strings["What would you like to do?"] = ""; App::$strings["Please bookmark this page if you would like to return to it in the future"] = ""; App::$strings["Upload a profile photo"] = ""; @@ -2074,12 +2051,15 @@ App::$strings["Event title and start time are required."] = "Hendelsestittel og App::$strings["Event not found."] = "Hendelsen ble ikke funnet."; App::$strings["Edit event"] = "Endre hendelse"; App::$strings["Delete event"] = "Slett hendelse"; -App::$strings["Link to source"] = ""; +App::$strings["Link to source"] = "Lenke til kilde"; App::$strings["calendar"] = "kalender"; App::$strings["Failed to remove event"] = "Mislyktes med å slette hendelse"; +App::$strings["Account not found."] = "Kontoen ble ikke funnet"; +App::$strings["Multifactor Verification"] = ""; +App::$strings["Please enter the verification key from your authenticator app"] = ""; App::$strings["Like/Dislike"] = "Liker/Liker ikke"; App::$strings["This action is restricted to members."] = "Denne handlingen er begrenset til medlemmer."; -App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Vennligst logg inn med din \$Projectname ID eller registrer deg som et nytt \$Projectname-medlem for å fortsette"; +App::$strings["Please login with your \$Projectname ID or register as a new \$Projectname member to continue."] = "Vennligst logg inn med din \$Projectname ID eller registrer deg som et nytt \$Projectname-medlem for å fortsette."; App::$strings["Invalid request."] = "Ugyldig forespørsel."; App::$strings["thing"] = "ting"; App::$strings["Channel unavailable."] = "Kanalen er utilgjengelig."; @@ -2090,22 +2070,21 @@ App::$strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = "%1\$s avstå App::$strings["Action completed."] = "Handling ferdig."; App::$strings["Thank you."] = "Tusen takk."; App::$strings["Poke somebody"] = "Dult noen"; -App::$strings["Poke/Prod"] = "Prikke/oppildne"; -App::$strings["Poke, prod or do other things to somebody"] = "Dult, prikk eller gjør andre ting med noen"; +App::$strings["Poke or ping somebody"] = "Dult noen"; App::$strings["Recipient"] = "Mottaker"; -App::$strings["Choose what you wish to do to recipient"] = "Velg hva du ønsker å gjøre med mottakeren"; +App::$strings["Choose action"] = "Forbindelser"; App::$strings["Make this post private"] = "Gjør dette innlegget privat"; App::$strings["Calendar entries imported."] = "Kalenderhendelsene er importert."; App::$strings["No calendar entries found."] = "Ingen kalenderhendelser funnet."; App::$strings["Event title"] = "Tittel på hendelse"; App::$strings["Start date and time"] = "Startdato og tidspunkt"; App::$strings["End date and time"] = ""; -App::$strings["Timezone:"] = ""; +App::$strings["Timezone:"] = "Tidssone"; App::$strings["Previous"] = "Forrige"; App::$strings["Today"] = "Idag"; -App::$strings["Month"] = ""; -App::$strings["Week"] = ""; -App::$strings["Day"] = ""; +App::$strings["Month"] = "måned"; +App::$strings["Week"] = "uke"; +App::$strings["Day"] = "dag"; App::$strings["List month"] = ""; App::$strings["List week"] = ""; App::$strings["List day"] = ""; @@ -2133,11 +2112,13 @@ App::$strings["Country"] = "Land"; App::$strings["Default Calendar"] = ""; App::$strings["Default Addressbook"] = ""; App::$strings["Remote privacy information not available"] = ""; -App::$strings["__ctx:acl__ Profile"] = ""; -App::$strings["Privacy group"] = ""; +App::$strings["__ctx:acl__ Profile"] = "Profil"; +App::$strings["Privacy group"] = "Personverngruppe:"; +App::$strings["Item"] = ""; App::$strings["Click to copy link to this ressource for guest %s to clipboard"] = ""; App::$strings["Link copied"] = ""; -App::$strings["Access"] = ""; +App::$strings["Access"] = "Tilgang"; +App::$strings["OCAP access"] = ""; App::$strings["Empty post discarded."] = "Tomt innlegg forkastet."; App::$strings["Duplicate post suppressed."] = "Duplikat av innlegg forhindret."; App::$strings["System error. Post not saved."] = "Systemfeil. Innlegg ble ikke lagret."; @@ -2215,7 +2196,7 @@ App::$strings["Show URL to this file"] = "Vis URLen til denne filen"; App::$strings["Show in your contacts shared folder"] = ""; App::$strings["Tag removed"] = "Merkelapp fjernet"; App::$strings["Remove Item Tag"] = "Fjern merkelapp fra element"; -App::$strings["Select a tag to remove: "] = "Velg merkelapp å fjerne:"; +App::$strings["Select a tag to remove: "] = "Velg merkelapp å fjerne: "; App::$strings["Continue"] = "Fortsett"; App::$strings["Premium Channel Setup"] = "Premiumkanal-oppsett"; App::$strings["Enable premium channel connection restrictions"] = "Slå på restriksjoner for forbindelse med premiumkanal"; @@ -2225,8 +2206,6 @@ App::$strings["Potential connections will then see the following text before pro App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."; App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"; App::$strings["Restricted or Premium Channel"] = "Begrenset kanal eller premiumkanal"; -App::$strings["Not found"] = ""; -App::$strings["Unknown error"] = ""; App::$strings["Post repeated"] = ""; App::$strings["network"] = "nettverk"; App::$strings["Item is not editable"] = "Elementet kan ikke endres"; @@ -2237,6 +2216,14 @@ App::$strings["Unknown App"] = ""; App::$strings["Authorize"] = ""; App::$strings["Do you authorize the app %s to access your channel data?"] = ""; App::$strings["Deny"] = "Avslå"; +App::$strings["Max queueworker threads"] = ""; +App::$strings["Minimum 4, default 4"] = ""; +App::$strings["Assume workers dead after"] = ""; +App::$strings["Minimum 120, default 300 seconds"] = ""; +App::$strings["Pause before starting next task"] = ""; +App::$strings["Minimum 100, default 100 microseconds"] = ""; +App::$strings["Automatically adjust pause before starting next task"] = ""; +App::$strings["Queueworker Settings"] = ""; App::$strings["Queue Statistics"] = "Køstatistikk"; App::$strings["Total Entries"] = "Totalt antall oppføringer"; App::$strings["Priority"] = "Prioritet"; @@ -2252,8 +2239,8 @@ App::$strings["Enable"] = "Skru på"; App::$strings["Screenshot"] = "Skjermbilde"; App::$strings["Administration"] = "Administrasjon"; App::$strings["Toggle"] = "Skru av og på"; -App::$strings["Author: "] = "Forfatter:"; -App::$strings["Maintainer: "] = "Vedlikeholder:"; +App::$strings["Author: "] = "Forfatter: "; +App::$strings["Maintainer: "] = "Vedlikeholder: "; App::$strings["[Experimental]"] = "[Eksperimentelt]"; App::$strings["[Unsupported]"] = "[Ingen støtte]"; App::$strings["Lock feature %s"] = "Lås funksjon %s"; @@ -2286,6 +2273,8 @@ App::$strings["Block embedded HTML from these domains"] = "Blokker innbygget HTM App::$strings["Allow SVG thumbnails in file browser"] = ""; App::$strings["WARNING: SVG images may contain malicious code."] = ""; App::$strings["Allow embedded (inline) PDF files"] = ""; +App::$strings["Additional trusted directory server URLs"] = "Standard katalogtjener"; +App::$strings["Accept directory flags (spam, nsfw) from those servers. One per line like https://example.tld"] = ""; App::$strings["%s account blocked/unblocked"] = array( 0 => "%s konto blokkert/ikke blokkert lenger", 1 => "%s kontoer blokkert/ikke blokkert lenger", @@ -2356,7 +2345,6 @@ App::$strings["Administrator Information"] = "Administratorinformasjon"; App::$strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformasjon til nettstedsadministratorer. Vises på siteinfo-siden. BBCode kan brukes her"; App::$strings["Site Information"] = ""; App::$strings["Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here"] = ""; -App::$strings["System language"] = "Systemspråk"; App::$strings["System theme"] = "Systemtema"; App::$strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard systemtema - kan overstyres av brukerprofiler - endre temainnstillinger"; App::$strings["Allow Feeds as Connections"] = "Tillat strømmer som forbindelser"; @@ -2395,15 +2383,15 @@ App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to sh App::$strings["Preserve site homepage URL"] = "Bevar URL-en til nettstedets hjemmeside"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenter hjemmesiden til nettstedet i en ramme fra den opprinnelige plasseringen i stedet for å omdirigere"; App::$strings["Allowed friend domains"] = "Tillatte vennedomener"; -App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Kommaseparert liste over domener som har lov til å etablere vennskap med dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener."; +App::$strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Kommaseparert liste over domener som har lov til å etablere vennskap med dette nettstedet. Jokertegn er akseptert. Tøm for å tillate alle domener"; App::$strings["Force publish"] = "Tving publisering"; -App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog."; -App::$strings["Import Public Streams"] = "Importer offentlige innholdsstrømmer"; -App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert."; -App::$strings["Site only Public Streams"] = ""; -App::$strings["Allow access to public content originating only from this site if Imported Public Streams are disabled."] = ""; -App::$strings["Allow anybody on the internet to access the Public streams"] = ""; -App::$strings["Disable to require authentication before viewing. Warning: this content is unmoderated."] = ""; +App::$strings["Check to force all profiles on this site to be listed in the site directory"] = "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog."; +App::$strings["Enable public stream"] = ""; +App::$strings["Enable the public stream. Warning: this content is unmoderated"] = "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert."; +App::$strings["Site only public stream"] = "Mitt nettsted er ikke en offentlig tjeneste"; +App::$strings["Restrict the public stream to content originating at this site"] = ""; +App::$strings["Allow anybody on the internet to access the public streams"] = ""; +App::$strings["Disable to require authentication before viewing"] = ""; App::$strings["Only import Public stream posts with this text"] = ""; App::$strings["words one per line or #tags or /patterns/ or lang=xx, leave blank to import all posts"] = "ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå blankt for å importere alle innlegg"; App::$strings["Do not import Public stream posts with this text"] = ""; @@ -2426,8 +2414,6 @@ App::$strings["Delivery interval"] = "Leveringsinterval"; App::$strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Forsink leveringsprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Anbefaling: 4-5 for delte tjenere, 2-3 for virtuelle tjenere, 0-1 for større dedikerte tjenere."; App::$strings["Deliveries per process"] = "Leveranser per prosess"; App::$strings["Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5."] = "Antall leveranser som forsøkes i en enkelt operativsystemprosess. Juster om nødvendig for å fininnstille systemets yteevne. Anbefaling: 1-5."; -App::$strings["Queue Threshold"] = ""; -App::$strings["Always defer immediate delivery if queue contains more than this number of entries."] = ""; App::$strings["Poll interval"] = "Spørreintervall"; App::$strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Forsink spørreprosessene i bakgrunnen med dette antall sekunder for å redusere systembelastningen. Hvis 0, bruk dette leveringsintervallet."; App::$strings["Path to ImageMagick convert program"] = ""; @@ -2478,7 +2464,6 @@ App::$strings["Selected channels will be deleted!\\n\\nEverything that was poste App::$strings["The channel {0} will be deleted!\\n\\nEverything that was posted in this channel on this site will be permanently deleted!\\n\\nAre you sure?"] = "Kanalen {0} vil bli slettet!\\n\\nAlt innhold som er lagt inn i denne kanalen på dettet nettstedet vil bli slettet for alltid!\\n\\nEr du sikker på at du vil slette denne kanalen med alt innhold?"; App::$strings["Password changed for account %d."] = ""; App::$strings["Account settings updated."] = ""; -App::$strings["Account not found."] = ""; App::$strings["Account Edit"] = ""; App::$strings["New Password"] = ""; App::$strings["New Password again"] = ""; @@ -2514,16 +2499,16 @@ App::$strings["Attempt to execute this update step automatically"] = "Prøv å g App::$strings["No failed updates."] = "Ingen mislykkede oppdateringer."; App::$strings["Plugin %s disabled."] = "Tilleggsfunksjonen %s er avskrudd."; App::$strings["Plugin %s enabled."] = "Tilleggsfunksjonen %s er påskrudd."; -App::$strings["Minimum project version: "] = "Minimum prosjektversjon:"; -App::$strings["Maximum project version: "] = "Maksimum prosjektversjon:"; -App::$strings["Minimum PHP version: "] = "Minimum PHP-versjon:"; +App::$strings["Minimum project version: "] = "Minimum prosjektversjon: "; +App::$strings["Maximum project version: "] = "Maksimum prosjektversjon: "; +App::$strings["Minimum PHP version: "] = "Minimum PHP-versjon: "; App::$strings["Compatible Server Roles: "] = ""; -App::$strings["Requires: "] = "Krever:"; +App::$strings["Requires: "] = "Krever: "; App::$strings["Disabled - version incompatibility"] = "Skrudd av - versjonsinkompatibilitet"; App::$strings["Enter the public git repository URL of the addon repo."] = ""; App::$strings["Addon repo git URL"] = ""; App::$strings["Custom repo name"] = ""; -App::$strings["(optional)"] = ""; +App::$strings["(optional)"] = "Valgfritt"; App::$strings["Download Addon Repo"] = ""; App::$strings["Install new repo"] = ""; App::$strings["Install"] = "Installer"; @@ -2537,7 +2522,7 @@ App::$strings["Create Custom App"] = ""; App::$strings["Some blurb about what to do when you're new here"] = "En standardtekst om hva du bør gjøre som ny her"; App::$strings["Channel removals are not allowed within 48 hours of changing the account password."] = "Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av kontopassordet."; App::$strings["Remove Channel"] = "Fjern kanal"; -App::$strings["WARNING: "] = "ADVARSEL:"; +App::$strings["WARNING: "] = "ADVARSEL: "; App::$strings["This channel will be permanently removed. "] = ""; App::$strings["This action can not be undone!"] = ""; App::$strings["Please enter your password for verification:"] = "Vennligst skriv ditt passord for å få bekreftelse:"; @@ -2580,7 +2565,7 @@ App::$strings["Default Channel"] = "Standardkanal"; App::$strings["Make Default"] = "Gjør til standard"; App::$strings["%d new introductions"] = "%d nye introduksjoner"; App::$strings["Delegated Channel"] = "Delegert kanal"; -App::$strings["Layout not found"] = ""; +App::$strings["Layout not found"] = "Layouten ble ikke funnet."; App::$strings["This template does not support pdledi_gui (no content regions defined)"] = ""; App::$strings["Main page content"] = ""; App::$strings["The main page content can not be edited!"] = ""; @@ -2613,11 +2598,10 @@ App::$strings["Use arrows to move the corresponding app left (top) or right (bot App::$strings["Use arrows to move the corresponding app up or down in the app tray"] = ""; App::$strings["Unable to find your hub."] = "Ikke i stand til å finne hubben din."; App::$strings["Post successful."] = "Innlegg vellykket."; -App::$strings["Comment approved"] = ""; -App::$strings["Comment deleted"] = ""; +App::$strings["Item approved"] = "Konto godkjent."; App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet."; App::$strings["Remove This Account"] = "Slett denne kontoen"; -App::$strings["This account and all its channels will be completely removed from the network. "] = "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket."; +App::$strings["This account and all its channels will be completely removed from the network. "] = "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket. "; App::$strings["This action is permanent and can not be undone!"] = "Denne handlingen er permanent og kan ikke angres!"; App::$strings["Remove Account"] = "Slett konto"; App::$strings["Language App"] = ""; @@ -2647,19 +2631,19 @@ App::$strings["Your real name is recommended."] = ""; App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""; App::$strings["This will be used to create a unique network address (like an email address)."] = ""; App::$strings["Allowed characters are a-z 0-9, - and _"] = ""; -App::$strings["Channel name"] = ""; +App::$strings["Channel name"] = "Kanalnavn"; App::$strings["Channel role"] = ""; App::$strings["Create a Channel"] = ""; App::$strings["A channel is a unique network identity. It can represent a person (social network profile), a forum (group), a business or celebrity page, a newsfeed, and many other things."] = ""; App::$strings["or import an existing channel from another location."] = "eller importer en eksisterende kanal fra et annet sted."; App::$strings["Validate"] = ""; App::$strings["Entry censored"] = ""; -App::$strings["Entry uncensored"] = ""; +App::$strings["Entry OK"] = ""; App::$strings["No service class restrictions found."] = "Ingen restriksjoner er funnet i tjenesteklasse."; App::$strings["Mood"] = "Stemning"; App::$strings["Set your current mood and tell your friends"] = "Angi ditt nåværende humør og fortell dine venner"; App::$strings["About this site"] = ""; -App::$strings["Site Name"] = ""; +App::$strings["Site Name"] = "Nettstedets navn"; App::$strings["Administrator"] = "Administrator"; App::$strings["Software and Project information"] = ""; App::$strings["This site is powered by \$Projectname"] = ""; @@ -2677,7 +2661,7 @@ App::$strings["Name of app"] = "Navn på app"; App::$strings["Location (URL) of app"] = "Plassering (URL) til app"; App::$strings["Photo icon URL"] = "Bildeikon URL"; App::$strings["80 x 80 pixels - optional"] = "80 x80 pixler - valgfritt"; -App::$strings["Categories (optional, comma separated list)"] = ""; +App::$strings["Categories (optional, comma separated list)"] = "Kategorier (valgfri, kommaseparert liste)"; App::$strings["Version ID"] = "Versjons-ID"; App::$strings["Price of app"] = "Pris på app"; App::$strings["Location (URL) to purchase app"] = "Plassering (URL) for å kjøpe app"; @@ -2705,7 +2689,7 @@ App::$strings["Please select a role for this contact!"] = ""; App::$strings["This contact is unreachable from this location."] = ""; App::$strings["This contact may be unreachable from other channel locations."] = ""; App::$strings["Location independence is not supported by their network."] = ""; -App::$strings["View profile"] = ""; +App::$strings["View profile"] = "Vis profil"; App::$strings["This is a group/forum channel"] = ""; App::$strings["Select a role for this contact"] = ""; App::$strings["Slide to adjust your degree of friendship"] = "Flytt for å justere din grad av vennskap"; @@ -2724,7 +2708,7 @@ App::$strings["Contact updated"] = ""; App::$strings["Contact update failed"] = ""; App::$strings["Approve connection"] = "Godkjenn forbindelse"; App::$strings["Refresh succeeded"] = ""; -App::$strings["Refresh failed - channel is currently unavailable"] = ""; +App::$strings["Refresh failed - channel is currently unavailable"] = "Oppfrisking mislyktes - kanalen er for øyeblikket utilgjengelig."; App::$strings["Block status updated"] = ""; App::$strings["Block failed"] = ""; App::$strings["Ignore status updated"] = ""; @@ -2755,23 +2739,21 @@ App::$strings["Hide or Unhide this connection from your other connections"] = "S App::$strings["This connection is hidden!"] = "Denne forbindelsen er skjult!"; App::$strings["Delete this connection"] = "Slett denne forbindelsen"; App::$strings["No default suggestions were found."] = ""; -App::$strings["%d rating"] = array( - 0 => "%d vurdering", - 1 => "%d vurderinger", -); -App::$strings["Gender: "] = "Kjønn:"; -App::$strings["Status: "] = "Status:"; -App::$strings["Homepage: "] = "Hjemmeside:"; +App::$strings["Gender: "] = "Kjønn: "; +App::$strings["Status: "] = "Status: "; +App::$strings["Homepage: "] = "Hjemmeside: "; App::$strings["Description:"] = "Beskrivelse:"; +App::$strings["Unsafe"] = ""; +App::$strings["Spam"] = ""; App::$strings["Public Forum:"] = "Offentlig forum:"; -App::$strings["Keywords: "] = "Nøkkelord:"; +App::$strings["Keywords: "] = "Nøkkelord: "; App::$strings["Don't suggest"] = "Ikke foreslå"; App::$strings["Common connections (estimated):"] = ""; App::$strings["Global Directory"] = "Global katalog"; App::$strings["Local Directory"] = "Lokal katalog"; App::$strings["Finding:"] = "Finner:"; -App::$strings["next page"] = "Neste side"; -App::$strings["previous page"] = "Forrige side"; +App::$strings["next page"] = "neste side"; +App::$strings["previous page"] = "forrige side"; App::$strings["Sort options"] = "Sorteringsvalg"; App::$strings["Alphabetic"] = "Alfabetisk"; App::$strings["Reverse Alphabetic"] = "Omvendt alfabetisk"; @@ -2790,7 +2772,7 @@ App::$strings["A verification token was sent to your email address [%s]. Enter t App::$strings["Resend Email"] = ""; App::$strings["Validation token"] = ""; App::$strings["Item not available."] = "Elementet er ikke tilgjengelig."; -App::$strings["Poll not found."] = ""; +App::$strings["Poll not found."] = "Fant ikke spørreskjema."; App::$strings["Invalid response."] = ""; App::$strings["Response submitted. Updates may not appear instantly."] = ""; App::$strings["Image uploaded but image cropping failed."] = "Bildet ble lastet opp, men beskjæring av bildet mislyktes."; @@ -2801,13 +2783,13 @@ App::$strings["Photo not available."] = "Bildet er ikke tilgjengelig."; App::$strings["This profile photo will be visible to anybody on the internet and may be distributed to other websites."] = ""; App::$strings["This profile photo will be visible only to channels with permission to view this profile."] = ""; App::$strings["Use Photo for Profile"] = ""; -App::$strings["Change Profile Photo"] = ""; +App::$strings["Change Profile Photo"] = "Endre profilbilde"; App::$strings["Reset to default"] = ""; App::$strings["Use a photo from your albums"] = ""; App::$strings["Select existing"] = ""; App::$strings["Crop Image"] = "Beskjær bildet"; App::$strings["Please adjust the image cropping for optimum viewing."] = "Vennligst juster bildebeskjæringen for optimal visning."; -App::$strings["Done editing"] = ""; +App::$strings["Done editing"] = "Avslutt redigering"; App::$strings["Edit Block"] = "Endre byggekloss"; App::$strings["Enter a folder name"] = ""; App::$strings["or select an existing folder (doubleclick)"] = ""; @@ -2849,17 +2831,16 @@ App::$strings["Cover Photos"] = "Forsidebilder"; App::$strings["Your cover photo may be visible to anybody on the internet"] = ""; App::$strings["Upload File:"] = "Last opp fil:"; App::$strings["Select a profile:"] = "Velg en profil:"; -App::$strings["Change Cover Photo"] = ""; +App::$strings["Change Cover Photo"] = "Endre omslagsbilde"; App::$strings["Select existing photo"] = ""; App::$strings["Done Editing"] = "Avslutt redigering"; -App::$strings["Page owner information could not be retrieved."] = "Informasjon om sideeier kunne ikke hentes."; App::$strings["Album not found."] = "Albumet ble ikke funnet."; App::$strings["Delete Album"] = "Slett album"; App::$strings["Delete Photo"] = "Slett bilde"; App::$strings["No photos selected"] = "Ingen bilder valgt"; App::$strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset."; -App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."; App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB lagringsplass til bilder er brukt."; +App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."; App::$strings["Upload Photos"] = "Last opp bilder"; App::$strings["Enter an album name"] = "Skriv et albumnavn"; App::$strings["or select an existing album (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)"; @@ -2989,10 +2970,10 @@ App::$strings["Register is closed"] = ""; App::$strings["Note, the invitation code is valid up to"] = ""; App::$strings["Too many recipients for one invitation (max %d)"] = ""; App::$strings["No recipients for this invitation"] = ""; -App::$strings["(%s) : Not a real email address"] = ""; -App::$strings["(%s) : Not allowed email address"] = ""; -App::$strings["(%s) : email address already in use"] = ""; -App::$strings["(%s) : Accepted email address"] = ""; +App::$strings["(%s) : Not a real email address"] = "(%s): Ikke en virkelig epostadresse"; +App::$strings["(%s) : Not allowed email address"] = "(%s): Ikke en tillatt epostadresse"; +App::$strings["(%s) : email address already in use"] = "(%s): epostadressen er allerede i bruk"; +App::$strings["(%s) : Accepted email address"] = "(%s): Godkjent epostadresse"; App::$strings["To %s : Message delivery success."] = ""; App::$strings["%1\$d mail(s) sent, %2\$d mail error(s)"] = ""; App::$strings["Invites not proposed by configuration"] = ""; @@ -3013,21 +2994,21 @@ App::$strings["Invite template"] = ""; App::$strings["Subject:"] = "Emne:"; App::$strings["Here you may enter personal notes to the recipient(s)"] = ""; App::$strings["Private forum"] = ""; -App::$strings["Public forum"] = ""; +App::$strings["Public forum"] = "Offentlig forum:"; App::$strings["Xchan Lookup"] = "Xchan oppslag"; -App::$strings["Lookup xchan beginning with (or webbie): "] = "Slå opp xchan som begynner med (eller webbie):"; +App::$strings["Lookup xchan beginning with (or webbie): "] = "Slå opp xchan som begynner med (eller webbie): "; App::$strings["Affinity Tool settings updated."] = ""; App::$strings["The numbers below represent the minimum and maximum slider default positions for your network/stream page as a percentage."] = ""; App::$strings["Default maximum affinity level"] = ""; -App::$strings["0-99 default 99"] = ""; +App::$strings["0-99 default 99"] = "Standard"; App::$strings["Default minimum affinity level"] = ""; -App::$strings["0-99 - default 0"] = ""; +App::$strings["0-99 - default 0"] = "Standard"; App::$strings["Persistent affinity levels"] = ""; App::$strings["If disabled the max and min levels will be reset to default after page reload"] = ""; App::$strings["Affinity Tool Settings"] = ""; -App::$strings["Max height of content (in pixels)"] = ""; -App::$strings["Click to expand content exceeding this height"] = ""; -App::$strings["Stream Settings"] = ""; +App::$strings["Max height of content (in pixels)"] = "Maks høyde for innhold (i piksler)"; +App::$strings["Click to expand content exceeding this height"] = "Klikk for å vise hele innlegg som overskrider denne grensen"; +App::$strings["Stream Settings"] = "Instillinger for tidslinjen"; App::$strings["Additional Features"] = "Ekstra funksjoner"; App::$strings["Please select a channel role"] = ""; App::$strings["Your channel address is"] = "Din kanaladresse er"; @@ -3107,16 +3088,28 @@ App::$strings["Current Password"] = "Nåværende passord"; App::$strings["Enter New Password"] = "Skriv nytt passord"; App::$strings["Confirm New Password"] = "Bekreft nytt passord"; App::$strings["Leave password fields blank unless changing"] = "La passordfeltene stå blanke om det ikke skal endres"; -App::$strings["DId2 or Email Address:"] = ""; +App::$strings["Multi-Factor Authentication"] = "Flerfaktorautentisering"; +App::$strings["DId2 or Email Address:"] = "DId2 eller epostadresse:"; App::$strings["Remove this account including all its channels"] = "Slett denne kontoen inkludert alle dens kanaler"; App::$strings["No feature settings configured"] = "Ingen funksjonsinnstillinger er konfigurert"; -App::$strings["Addon Settings"] = ""; -App::$strings["Please save/submit changes to any panel before opening another."] = ""; +App::$strings["Addon Settings"] = "Instillinger for tillegg"; +App::$strings["Please save/submit changes to any panel before opening another."] = "Husk å lagre endringene i ett panel før du åpner andre."; App::$strings["Events Settings"] = ""; App::$strings["Channel Manager Settings"] = ""; App::$strings["Personal menu to display in your channel pages"] = "Personlig meny som kan vises på dine kanalsider"; App::$strings["Channel Home Settings"] = ""; App::$strings["Calendar Settings"] = ""; +App::$strings["Password is required"] = "Navn er påkrevd"; +App::$strings["The provided password is not correct"] = ""; +App::$strings["Account Multi-Factor Authentication"] = "Tofaktorautentisering"; +App::$strings["This is your generated secret. It may be used in some cases if the QR image cannot be read. Please store it in a safe place."] = "Dette er en generert sikkerhetskode. Den kan være nyttig i enkelte tilfeller hvor QR koden ikke kan leses. Lagre den et sikkert sted."; +App::$strings["Please enter the code from your authenticator app"] = "Skriv inn koden fra din autentiseringsapp"; +App::$strings["You will only be able to enable MFA if the test passes"] = "Flerfaktorautentisering vil kun bli slått på dersom denne testen lykkes"; +App::$strings["Congratulations, the provided code was correct"] = ""; +App::$strings["Incorrect code"] = ""; +App::$strings["Enable Multi-Factor Authentication"] = "Mislykket autentisering"; +App::$strings["Logging in will require you to be in possession of your smartphone"] = ""; +App::$strings["Your account password"] = "Ditt nye passord er"; App::$strings["%s - (Experimental)"] = "%s - (Eksperimentelt)"; App::$strings["Display Settings"] = "Visningsinnstillinger"; App::$strings["Theme Settings"] = "Temainnstillinger"; @@ -3133,14 +3126,14 @@ App::$strings["Maximum number of conversations to load at any time:"] = "Maksima App::$strings["Maximum of 30 items"] = ""; App::$strings["Show emoticons (smilies) as images"] = "Vis emoticons (smilefjes) som bilder"; App::$strings["Link post titles to source"] = "Lenk innleggets tittel til kilden"; -App::$strings["Display new member quick links menu"] = ""; +App::$strings["Display new member quick links menu"] = "Vis hurtiglenker for nye medlemmer"; App::$strings["Directory Settings"] = ""; -App::$strings["Editor Settings"] = ""; +App::$strings["Editor Settings"] = "Instillinger for redigering"; App::$strings["Connections Settings"] = ""; App::$strings["Photos Settings"] = ""; App::$strings["Default profile for new contacts"] = ""; App::$strings["Profiles Settings"] = ""; -App::$strings["Privacy settings updated."] = ""; +App::$strings["Privacy settings updated."] = "Personverninnstillingene ble oppdatert."; App::$strings["Only those you specifically allow"] = "Bare de du spesifikt tillater"; App::$strings["Approved connections"] = "Godkjente forbindelser"; App::$strings["Any connections"] = "Enhver forbindelse"; @@ -3149,15 +3142,21 @@ App::$strings["Anybody in this network"] = "Enhver i dette nettverket"; App::$strings["Anybody authenticated"] = "Enhver som er autentisert"; App::$strings["Anybody on the internet"] = "Enhver på Internett"; App::$strings["Advise: set to \"Anybody on the internet\" and use privacy groups to restrict access"] = ""; -App::$strings["Privacy Settings"] = ""; +App::$strings["Privacy Settings"] = "Personverninnstillinger"; App::$strings["Advanced configuration"] = ""; App::$strings["Proceed with caution"] = ""; App::$strings["Changing advanced configuration settings can impact your, and your contacts channels functionality and security."] = ""; App::$strings["Accept the risk and continue"] = ""; -App::$strings["Automatically approve new contacts"] = ""; -App::$strings["Opt-out of search engine indexing"] = ""; +App::$strings["Automatically approve new contacts"] = "Automatisk godkjenn nye kontakter"; +App::$strings["Opt-out of search engine indexing"] = "Ikke la søkemotorer indeksere denne kanalen"; App::$strings["Group actor"] = ""; App::$strings["Allow this channel to act as a forum"] = ""; +App::$strings["Accept all messages which mention you"] = "Godta alle meldinger som nevner deg"; +App::$strings["This setting bypasses normal permissions"] = "Denne instillingen overstyrer vanlig tilgangskontroll"; +App::$strings["Accept unsolicited comments for moderation"] = "Godta kommentarer fra fremmede for moderering"; +App::$strings["Otherwise they will be silently dropped"] = "Ellers vil de avvises uten varsel"; +App::$strings["Enable OCAP access"] = "Slå på OCAP tilgangskontroll"; +App::$strings["Grant limited posts the right to access linked private media"] = "Gi begrensede innlegg tilgang til private media som er lenket fra dem"; App::$strings["Settings saved."] = ""; App::$strings["Settings saved. Reload page please."] = ""; App::$strings["Conversation Settings"] = ""; @@ -3206,7 +3205,7 @@ App::$strings["leave blank unless your application specifically requires this"] App::$strings["Connected OAuth2 Apps"] = ""; App::$strings["Invalid message"] = "Ugyldig melding"; App::$strings["no results"] = "ingen resultater"; -App::$strings["channel sync processed"] = "Kanalsynkronisering er behandlet"; +App::$strings["channel sync processed"] = "kanalsynkronisering er behandlet"; App::$strings["queued"] = "lagt i kø"; App::$strings["posted"] = "lagt inn"; App::$strings["accepted for delivery"] = "akseptert for levering"; @@ -3243,7 +3242,7 @@ App::$strings["Resume"] = ""; App::$strings["Only resume if sync stalled!"] = ""; App::$strings["Layout updated."] = "Layout er oppdatert."; App::$strings["Edit System Page Description"] = "Endre beskrivelsen av systemsiden"; -App::$strings["(modified)"] = ""; +App::$strings["(modified)"] = "(endret)"; App::$strings["Layout not found."] = "Layouten ble ikke funnet."; App::$strings["Module Name:"] = "Modulnavn:"; App::$strings["Layout Help"] = "Layout-hjelp"; @@ -3272,7 +3271,7 @@ App::$strings["Manage contact roles"] = ""; App::$strings["This contacts's primary address is"] = ""; App::$strings["Available locations:"] = "Tilgjengelige plasseringer:"; App::$strings["Contact Pending Approval"] = ""; -App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte. "; +App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte."; App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can not change those settings here."] = "Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn individuelle innstillinger. Du kan ikke endre arvede innstillingene her."; App::$strings["Some permissions may be inherited from your channel's privacy settings, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Noen tillatelser kan være arvet fra din kanals personverninnstillinger, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres."; App::$strings["Last update:"] = "Siste oppdatering:"; @@ -3318,7 +3317,7 @@ App::$strings["URL of bookmark"] = "URL-en til bokmerket"; App::$strings["Or enter new bookmark folder name"] = "Eller skriv nytt navn på bokmerkemappe"; App::$strings["A deleted privacy group with this name was revived. Existing item permissions may apply to this privacy group and any future members. If this is not what you intended, please create another privacy group with a different name."] = ""; App::$strings["Select a privacy group"] = ""; -App::$strings["__ctx:permcat__ Default"] = ""; +App::$strings["__ctx:permcat__ Default"] = "Standard"; App::$strings["Likes %1\$s's %2\$s"] = ""; App::$strings["Doesn't like %1\$s's %2\$s"] = ""; App::$strings["Will attend %s's event"] = ""; @@ -3336,8 +3335,11 @@ App::$strings["%1\$s sent you a new direct message at %2\$s"] = "%1\$s sendte de App::$strings["%1\$s sent you %2\$s."] = "%1\$s sendte deg %2\$s."; App::$strings["a direct message"] = "en direktemelding"; App::$strings["Please visit %s to view and/or reply to your direct messages."] = "Gå til %s for å vise og/eller svare på dine direktemeldinger."; +App::$strings["requested to comment on"] = ""; App::$strings["commented on"] = ""; +App::$strings["requested to like"] = "Dato for forespørsel"; App::$strings["liked"] = ""; +App::$strings["requested to dislike"] = ""; App::$strings["disliked"] = ""; App::$strings["voted on"] = ""; App::$strings["%1\$s %2\$s [zrl=%3\$s]a %4\$s[/zrl]"] = ""; @@ -3346,7 +3348,7 @@ App::$strings["%1\$s %2\$s [zrl=%3\$s]your %4\$s[/zrl]"] = ""; App::$strings["[\$Projectname:Notify] Moderated Comment to conversation #%1\$d by %2\$s"] = ""; App::$strings["[\$Projectname:Notify] Comment to conversation #%1\$d by %2\$s"] = ""; App::$strings["%1\$s commented on an item/conversation you have been following"] = ""; -App::$strings["Please visit %s to view and/or reply to the conversation."] = "Vennligst besøk %s for å se og/eller svare i samtalen"; +App::$strings["Please visit %s to view and/or reply to the conversation."] = "Vennligst besøk %s for å se og/eller svare i samtalen."; App::$strings["Please visit %s to approve or reject this comment."] = ""; App::$strings["[\$Projectname:Notify] Like received to conversation #%1\$d by %2\$s"] = ""; App::$strings["%1\$s liked an item/conversation you created"] = ""; @@ -3374,9 +3376,9 @@ App::$strings["Name:"] = "Navn:"; App::$strings["Photo:"] = "Bilde:"; App::$strings["Please visit %s to approve or reject the suggestion."] = "Vennligst besøk %s for å godkjenne eller avslå dette forslaget."; App::$strings["[\$Projectname:Notify]"] = ""; -App::$strings["created a new poll"] = ""; +App::$strings["created a new poll"] = "opprettet spørreskjema"; App::$strings["created a new post"] = "laget et nytt innlegg"; -App::$strings["voted on %s's poll"] = ""; +App::$strings["voted on %s's poll"] = "stemte på %s sitt spørreskjema"; App::$strings["commented on %s's post"] = "kommenterte på %s sitt innlegg"; App::$strings["repeated %s's post"] = ""; App::$strings["liked %s's post"] = ""; @@ -3399,7 +3401,7 @@ App::$strings["Cannot connect to yourself."] = "Kan ikke lage forbindelse med de App::$strings["error saving data"] = ""; App::$strings["Missing room name"] = "Mangler romnavn"; App::$strings["Duplicate room name"] = "Duplikat romnavn"; -App::$strings["Invalid room specifier."] = "Ugyldig rom-spesifisering"; +App::$strings["Invalid room specifier."] = "Ugyldig rom-spesifisering."; App::$strings["Room not found."] = "Rommet ble ikke funnet."; App::$strings["Room is full"] = "Rommet er fullt"; App::$strings["Affinity Tool"] = "Nærhetsverktøy"; @@ -3408,7 +3410,7 @@ App::$strings["Content Filter"] = ""; App::$strings["Remote Diagnostics"] = ""; App::$strings["Suggest Channels"] = "Foreslå kanaler"; App::$strings["Channel Manager"] = "Kanalstyring"; -App::$strings["Stream"] = ""; +App::$strings["Stream"] = "Tidslinje"; App::$strings["Mail"] = "Melding"; App::$strings["Chat"] = "Chat"; App::$strings["Probe"] = "Undersøk"; @@ -3441,8 +3443,8 @@ App::$strings["Safe Mode"] = "Trygt modus"; App::$strings["Public Forums Only"] = "Bare offentlige forum"; App::$strings["This Website Only"] = "Kun dette nettstedet"; App::$strings["Unable to verify channel signature"] = "Ikke i stand til å sjekke kanalsignaturen"; -App::$strings["Restricted message"] = ""; -App::$strings["Direct message"] = "direktemelding"; +App::$strings["Restricted message"] = "Begrenset melding"; +App::$strings["Direct message"] = "Direktemelding"; App::$strings["Public Policy"] = ""; App::$strings["Privacy conflict. Discretion advised."] = ""; App::$strings["Admin Delete"] = ""; @@ -3450,14 +3452,14 @@ App::$strings["Reply on this comment"] = ""; App::$strings["reply"] = ""; App::$strings["Reply to"] = ""; App::$strings["Delivery Report"] = "Leveringsrapport"; -App::$strings["%d comment"] = array( +App::$strings["%d Comment"] = array( 0 => "%d kommentar", 1 => "%d kommentarer", ); App::$strings["%d unseen"] = ""; App::$strings["Forum"] = ""; App::$strings["to"] = "til"; -App::$strings["Wall-to-Wall"] = "vegg-til-vegg"; +App::$strings["Wall-to-Wall"] = "Vegg-til-vegg"; App::$strings["via Wall-To-Wall:"] = "via vegg-til-vegg:"; App::$strings["Attend"] = ""; App::$strings["Go to previous comment"] = ""; @@ -3501,7 +3503,7 @@ App::$strings["Special - Celebrity/Soapbox"] = "Spesiell - kjendis/talerstol"; App::$strings["Special - Group Repository"] = "Spesiell - gruppelager"; App::$strings["Custom/Expert Mode"] = "Tilpasset/Ekspertmodus"; App::$strings["Personal"] = "Personlig"; -App::$strings["Community forum"] = ""; +App::$strings["Community forum"] = "Forum for fellesskap"; App::$strings["Custom"] = ""; App::$strings["Can view my channel stream and posts"] = ""; App::$strings["Can send me their channel stream and posts"] = "Kan sende meg deres kanalstrøm og innlegg"; @@ -3530,7 +3532,7 @@ App::$strings["Total"] = "Totalt"; App::$strings["Shared"] = "Delt"; App::$strings["Add Files"] = ""; App::$strings["parent"] = "opp et nivå"; -App::$strings["Select All"] = ""; +App::$strings["Select All"] = "velg alle"; App::$strings["Bulk Actions"] = ""; App::$strings["Adjust Permissions"] = ""; App::$strings["Move or Copy"] = ""; -- cgit v1.2.3 From a88236b36fc9828e6dccbbc044aa37b2f7b46581 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 9 Sep 2023 18:52:30 +0000 Subject: possible fix for item widget not respecting ACL if added by title - issue #1799 --- Zotlabs/Widget/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Widget/Item.php b/Zotlabs/Widget/Item.php index 9fd703dfe..6f943ffdf 100644 --- a/Zotlabs/Widget/Item.php +++ b/Zotlabs/Widget/Item.php @@ -34,7 +34,7 @@ class Item { if($arr['title']) { $r = q("select item.* from item left join iconfig on item.id = iconfig.iid where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' - and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1", + and iconfig.k = 'WEBPAGE' and item_type = %d $sql_extra $revision limit 1", intval($channel_id), dbesc($arr['title']), intval(ITEM_TYPE_WEBPAGE) -- cgit v1.2.3 From 0e8ecbc9fc108b4903eb013ca0a4a1f4beb5fbe1 Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 10 Sep 2023 08:00:18 +0000 Subject: theme fixes to make a barebones theme work slightly better --- include/nav.php | 2 +- view/css/default.css | 2 ++ view/php/theme_init.php | 3 +++ view/theme/redbasic/php/theme_init.php | 2 -- view/tpl/messages_widget.tpl | 10 +++++----- view/tpl/navbar_default.tpl | 2 +- view/tpl/notifications_widget.tpl | 9 +++++---- view/tpl/settings_display.tpl | 6 +++--- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/nav.php b/include/nav.php index 31a447a84..18fa65edc 100644 --- a/include/nav.php +++ b/include/nav.php @@ -85,7 +85,7 @@ function nav($template = 'default') { if ($observer) { $userinfo = [ - 'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']), + 'icon' => $observer['xchan_photo_s'] . '?rev=' . strtotime($observer['xchan_photo_date']), 'addr' => $observer['xchan_addr'], 'name' => $observer['xchan_name'], ]; diff --git a/view/css/default.css b/view/css/default.css index bd0f14ba2..bb6498193 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -20,6 +20,7 @@ main { position: relative; order: 1; padding: 4.5rem 7px 0px 7px; + width: 350px; } #region_2 { @@ -34,4 +35,5 @@ main { position: relative; order: 3; padding: 4.5rem 7px 0px 7px; + width: 350px; } diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 4aa695aeb..b08651689 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,8 +10,11 @@ head_add_css('/view/css/conversation.css'); head_add_css('/view/css/widgets.css'); head_add_css('/view/css/colorbox.css'); head_add_css('/library/justifiedGallery/justifiedGallery.min.css'); +head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); head_add_js('jquery.js'); +head_add_js('/library/datetimepicker/jquery.datetimepicker.js'); + head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('/library/sprintf.js/dist/sprintf.min.js'); diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 0ac580f0e..39fc28f1f 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -4,12 +4,10 @@ head_add_css('/library/fork-awesome/css/fork-awesome.min.css'); head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css'); head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css'); head_add_css('/view/css/bootstrap-red.css'); -head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css'); require_once('view/php/theme_init.php'); head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js'); head_add_js('/library/bootbox/bootbox.min.js'); head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js'); -head_add_js('/library/datetimepicker/jquery.datetimepicker.js'); head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js'); diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index 5770abffc..9b6c6d03b 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -25,11 +25,11 @@
-
- +
+
-
+
{7} {4}
@@ -55,8 +55,8 @@
{{foreach $entries as $e}}
-
- +
+
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index ea8723e8b..c6f350b09 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -4,7 +4,7 @@