From bc7035408a17437eb46457389d8911512812b8fd Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 01:43:42 -0800 Subject: [PATCH 01/25] twitteroauth library path --- addon/twitter/twitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index b2e5aa7ce..db283e1a9 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -138,7 +138,7 @@ function twitter_settings(&$a,&$s) { * which the user can request a PIN to connect the account to a * account at Twitter. */ - require_once('addon/twitter/twitteroauth.php'); + require_once('library/twitteroauth.php'); $connection = new TwitterOAuth($ckey, $csecret); $request_token = $connection->getRequestToken(); $token = $request_token['oauth_token']; From c248b28f922603ec135fea903a9ec3f0ef63c935 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 04:06:37 -0800 Subject: [PATCH 02/25] indicate preference to register/communicate-with real people and not fictitious entities. --- mod/register.php | 5 ++++- view/register.tpl | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index 97038def0..13d770fda 100644 --- a/mod/register.php +++ b/mod/register.php @@ -401,6 +401,8 @@ function register_content(&$a) { $oidlabel = t("Your OpenID \x28optional\x29: "); } + $realpeople = t('Members of this network prefer to communicate with real people who use their real names.'); + if(get_config('system','publish_all')) { $profile_publish_reg = ''; } @@ -423,6 +425,7 @@ function register_content(&$a) { $o = load_view_file("view/register.tpl"); $o = replace_macros($o, array( '$oidhtml' => $oidhtml, + '$realpeople' => $realpeople, '$regtitle' => t('Registration'), '$registertext' =>((x($a->config,'register_text')) ? '
' . $a->config['register_text'] . '
' @@ -433,7 +436,7 @@ function register_content(&$a) { '$openid' => $openid_url, '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '), '$addrlabel' => t('Your Email Address: '), - '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'), + '$nickdesc' => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'), '$nicklabel' => t('Choose a nickname: '), '$photo' => $photo, '$publish' => $profile_publish, diff --git a/view/register.tpl b/view/register.tpl index 3f57994ed..131460828 100644 --- a/view/register.tpl +++ b/view/register.tpl @@ -6,6 +6,7 @@ $registertext +

$realpeople

$fillwith

$fillext

From e776024b3a99e84fcf4351b23b76b695022d3f69 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 15:40:23 +0100 Subject: [PATCH 03/25] Fix IT strings --- view/it/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/it/strings.php b/view/it/strings.php index 25439d8d5..1cee5399a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -140,7 +140,7 @@ $a->strings['Item not found.'] = 'Elemento non trovato.'; $a->strings['Private Message'] = 'Messaggio privato'; $a->strings['This is you'] = 'Questo sei tu'; $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name'; -$a->strings['View $owner_name\'s profile'] = Guarda il profilo di $owner_name'; +$a->strings['View $owner_name\'s profile'] = 'Guarda il profilo di $owner_name'; $a->strings['to'] = 'a'; $a->strings['Wall-to-Wall'] = 'Bacheca-A-Bacheca'; $a->strings['via Wall-To-Wall:'] = 'via Bacheca-A-Bacheca'; From 33264dc2941dda39bc024517ce70efece8d90ac4 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 16:50:10 +0100 Subject: [PATCH 04/25] Add title attribute to location links --- mod/network.php | 8 ++++---- mod/profile.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/network.php b/mod/network.php index 1ef4ab372..7e7a5ea39 100644 --- a/mod/network.php +++ b/mod/network.php @@ -255,8 +255,8 @@ function network_content(&$a, $update = 0) { } } - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; @@ -407,8 +407,8 @@ function network_content(&$a, $update = 0) { $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; diff --git a/mod/profile.php b/mod/profile.php index b23af2e66..5424a2884 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -358,8 +358,8 @@ function profile_content(&$a, $update = 0) { $like = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); if($coord) { if($location) $location .= '
(' . $coord . ')'; From b00abf7e329de95791f1e50e39a2eba37ba73f10 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 8 Mar 2011 16:51:14 +0100 Subject: [PATCH 05/25] reworked items template --- view/theme/duepuntozero/style.css | 48 +++++++++++++++++++++++++++---- view/wall_item.tpl | 11 ++++--- view/wallwall_item.tpl | 12 ++++---- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bfe524b01..2c271218a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -833,10 +833,14 @@ input#dfrn-url { .wall-item-info { display: block; float: left; - width:150px; + width:110px; + margin-right:10px; +} +.comment .wall-item-info { + width: 70px; } .wallwall .wall-item-info { - width: 300px; + width: 170px; } @@ -846,8 +850,13 @@ input#dfrn-url { margin-bottom: 10px; width: 100px; } -.wallwall .wall-item-photo-wrapper { +/*.wallwall .wall-item-photo-wrapper { float: left; +}*/ +.wallwall .wwfrom { + left: 75px; + position: absolute; + top: 0; } .wallwall .wall-item-photo-end { @@ -855,9 +864,13 @@ input#dfrn-url { } .wall-item-arrowphoto-wrapper { - margin-top: 40px; + /*margin-top: 40px; margin-right: 20px; - float: left; + float: left;*/ + position: absolute; + left: 70px; + top: 70px; + z-index: 100; } .wall-item-wrapper { /*float: left; @@ -868,16 +881,39 @@ input#dfrn-url { .wall-item-lock { /*height: 20px;*/ /*margin-top: 10px;*/ - left: 135px; + left: 105px; position: absolute; top: 1px; } +.comment .wall-item-lock { + left: 65px; +} .wall-item-ago { color: #888888; font-size: 0.8em; } +.wall-item-location { + overflow: hidden; + /* add ellipsis on text overflow */ + /* this work on safari, opera, ie, chrome. */ + /* firefox users have to wait support or we */ + /* can use a jquery plugin http://bit.ly/zJskg */ + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + white-space: nowrap; + width: 100%; +} + +.wall-item-like-buttons { + float: left; + margin-right: 10px; + padding-right: 10px; + border-right: 2px solid #fff; +} + + .wall-item-like-buttons img { cursor: pointer; } diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 1cad41118..5cae6b142 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -8,18 +8,21 @@
$lock - $name -
$ago
-
$location
- $vote +
$location
+
+ $name +
$ago
+ +
$title
$body
+ $vote $plink $drop
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index 6e61ce4f0..256320a46 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -1,30 +1,32 @@
-
+
$wall
-
+
$lock - $name $to $owner_name $vwall
-
$ago
$location
- $vote
+
+ $name $to $owner_name $vwall
+
$ago
+
$title
$body
+ $vote $plink $drop
From 0784c072ce70a8a2c684674e79937690b2734663 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 13:47:10 -0800 Subject: [PATCH 06/25] Italian string file typo --- view/it/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/it/strings.php b/view/it/strings.php index 25439d8d5..1cee5399a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -140,7 +140,7 @@ $a->strings['Item not found.'] = 'Elemento non trovato.'; $a->strings['Private Message'] = 'Messaggio privato'; $a->strings['This is you'] = 'Questo sei tu'; $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name'; -$a->strings['View $owner_name\'s profile'] = Guarda il profilo di $owner_name'; +$a->strings['View $owner_name\'s profile'] = 'Guarda il profilo di $owner_name'; $a->strings['to'] = 'a'; $a->strings['Wall-to-Wall'] = 'Bacheca-A-Bacheca'; $a->strings['via Wall-To-Wall:'] = 'via Bacheca-A-Bacheca'; From c40944fc86d4c53f32563dc8685c0026ac4ee641 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 14:40:33 -0800 Subject: [PATCH 07/25] inherit 'wall' setting from parent post on remote item --- include/items.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/items.php b/include/items.php index f38c0938f..e930ab5d2 100644 --- a/include/items.php +++ b/include/items.php @@ -609,6 +609,7 @@ function item_store($arr,$force_parent = false) { else { // find the parent and snarf the item id and ACL's + // and anything else we need to inherit $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($arr['parent-uri']), @@ -632,6 +633,7 @@ function item_store($arr,$force_parent = false) { $allow_gid = $r[0]['allow_gid']; $deny_cid = $r[0]['deny_cid']; $deny_gid = $r[0]['deny_gid']; + $arr['wall'] = $r[0]['wall']; } else { From 041f3ca774b07e404c5a9eea6e42c9875d444387 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 18:11:36 -0800 Subject: [PATCH 08/25] detect empty .htconfig.php - in case permissions need to be set on it in order to install --- boot.php | 2 +- index.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 6bd78b87d..d3380a395 100644 --- a/boot.php +++ b/boot.php @@ -3,7 +3,7 @@ set_time_limit(0); define ( 'BUILD_ID', 1039 ); -define ( 'FRIENDIKA_VERSION', '2.10.0909' ); +define ( 'FRIENDIKA_VERSION', '2.10.0910' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "
\r\n" ); diff --git a/index.php b/index.php index bbd2c81cd..01d8eb2a1 100644 --- a/index.php +++ b/index.php @@ -19,11 +19,11 @@ $a = new App; /** * * Load the configuration file which contains our DB credentials. - * Ignore errors. If the file doesn't exist, we are running in installation mode. + * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode. * */ -$install = ((file_exists('.htconfig.php')) ? false : true); +$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true); @include(".htconfig.php"); From ea59e199d5609f4d196ecced569a8e267c2e27d5 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 18:19:20 -0800 Subject: [PATCH 09/25] updated INSTALL.txt --- INSTALL.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 85114dee5..8de306b7d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -34,7 +34,7 @@ php.ini file - Mysql 5.x - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks -(Windows) [Note: other options are presented in Section 7 of this document] +(Windows) [Note: other options are presented in Section 8 of this document] - Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will @@ -53,10 +53,15 @@ you might have trouble getting everything to work.] 3. Create an empty database and note the access details (hostname, username, password, database name). -4. Visit your website with a web browser and follow the instructions. Please + +4. If you know in advance that it will be impossible for the web server to +write or create files in your web directory, create an empty file called +.htconfig.php and make it writable by the web server. + +5. Visit your website with a web browser and follow the instructions. Please note any error messages and correct these before continuing. -5. *If* the automated installation fails for any reason, check the following: +6. *If* the automated installation fails for any reason, check the following: - ".htconfig.php" exists If not, edit htconfig.php and change system settings. Rename @@ -65,7 +70,7 @@ to .htconfig.php If not, import the contents of "database.sql" with phpmyadmin or mysql command line -6. At this point visit your website again, and register your personal account. +7. At this point visit your website again, and register your personal account. Registration errors should all be recoverable automatically. If you get any *critical* failure at this point, it generally indicates the database was not installed correctly. You might wish to move/rename @@ -78,7 +83,7 @@ tables, so that you can start fresh. **************************************************************************** **************************************************************************** -7. Set up a cron job or scheduled task to run the poller once every 5-10 +8. Set up a cron job or scheduled task to run the poller once every 5-10 minutes to pick up the recent "public" postings of your friends. Example: cd /base/directory; /path/to/php include/poller.php From 0de88eb6b0e5ceab470240a54414317884a49101 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 8 Mar 2011 18:53:52 -0800 Subject: [PATCH 10/25] yet another template converted to language neutral format --- mod/display.php | 7 ++++++- mod/network.php | 7 ++++++- mod/photos.php | 10 ++++++++-- mod/profile.php | 7 ++++++- util/strings.php | 5 ++++- util/typo.php | 12 +++++++++++- view/de/like.tpl | 5 ----- view/de/strings.php | 2 ++ view/en/like.tpl | 5 ----- view/fr/like.tpl | 5 ----- view/fr/strings.php | 2 ++ view/it/like.tpl | 5 ----- view/it/strings.php | 2 ++ view/like.tpl | 5 +++++ 14 files changed, 52 insertions(+), 27 deletions(-) delete mode 100644 view/de/like.tpl delete mode 100644 view/en/like.tpl delete mode 100644 view/fr/like.tpl delete mode 100644 view/it/like.tpl create mode 100644 view/like.tpl diff --git a/mod/display.php b/mod/display.php index edbadbc75..096ea16c9 100644 --- a/mod/display.php +++ b/mod/display.php @@ -151,7 +151,12 @@ function display_content(&$a) { if(can_write_wall($a,$a->profile['uid'])) { if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( diff --git a/mod/network.php b/mod/network.php index 1ef4ab372..6f9e84b70 100644 --- a/mod/network.php +++ b/mod/network.php @@ -360,7 +360,12 @@ function network_content(&$a, $update = 0) { $likebuttons = ''; if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { diff --git a/mod/photos.php b/mod/photos.php index c1c6a4133..7d3e57616 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1033,8 +1033,14 @@ function photos_content(&$a) { $likebuttons = ''; - if($can_post || can_write_wall($a,$owner_uid)) - $likebuttons = replace_macros($like_tpl,array('$id' => $link_item['id'])); + if($can_post || can_write_wall($a,$owner_uid)) { + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); + } if(! count($r)) { $o .= '
'; diff --git a/mod/profile.php b/mod/profile.php index b23af2e66..9375b670b 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -302,7 +302,12 @@ function profile_content(&$a, $update = 0) { if(can_write_wall($a,$a->profile['profile_uid'])) { if($item['id'] == $item['parent']) { - $likebuttons = replace_macros($like_tpl,array('$id' => $item['id'])); + $likebuttons = replace_macros($like_tpl,array( + '$id' => $item['id'], + '$likethis' => t("I like this \x28toggle\x29"), + '$nolike' => t("I don't like this \x28toggle\x29"), + '$wait' => t('Please wait') + )); } if($item['last-child']) { $comment = replace_macros($cmnt_tpl,array( diff --git a/util/strings.php b/util/strings.php index 71b1d776b..b010cb9fc 100644 --- a/util/strings.php +++ b/util/strings.php @@ -192,6 +192,8 @@ $a->strings['Cancel'] = 'Cancel'; $a->strings['Global Directory'] = 'Global Directory'; $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; +$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29"; $a->strings['This is you'] = 'This is you'; $a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; @@ -370,11 +372,12 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; $a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; +$a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Members of this network prefer to communicate with real people who use their real names.'; $a->strings['Include your profile in member directory?'] = 'Include your profile in member directory?'; $a->strings['Registration'] = 'Registration'; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Email Address: '] = 'Your Email Address: '; -$a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'] = 'Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'nickname@$sitename\'.'; +$a->strings['Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'] = 'Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'; $a->strings['Choose a nickname: '] = 'Choose a nickname: '; $a->strings['Please login.'] = 'Please login.'; $a->strings['Registration revoked for '] = 'Registration revoked for '; diff --git a/util/typo.php b/util/typo.php index ac837efe5..ac61ef6d3 100644 --- a/util/typo.php +++ b/util/typo.php @@ -35,4 +35,14 @@ echo $file . "\n"; include_once($file); } - } \ No newline at end of file + } + + echo "String files\n"; + + echo 'util/strings.php' . "\n"; + include_once('util/strings.php'); + $files = glob('view/*/strings.php'); + foreach($files as $file) { + echo $file . "\n"; + include_once($file); + } diff --git a/view/de/like.tpl b/view/de/like.tpl deleted file mode 100644 index 2f778851a..000000000 --- a/view/de/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/de/strings.php b/view/de/strings.php index 002749df9..b45ddee69 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -173,6 +173,8 @@ $a->strings['Submit Request'] = 'Anfrage abschicken'; $a->strings['Cancel'] = 'Abbrechen'; $a->strings['Global Directory'] = 'Weltweites Verzeichnis'; $a->strings['Private Message'] = 'Private Nachricht'; +$a->strings["I like this \x28toggle\x29"] = "Ich mag das \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "Ich mag das nicht \x28toggle\x29"; $a->strings['This is you'] = 'Das bist du'; $a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name'; $a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name'; diff --git a/view/en/like.tpl b/view/en/like.tpl deleted file mode 100644 index 1c385e5de..000000000 --- a/view/en/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/fr/like.tpl b/view/fr/like.tpl deleted file mode 100644 index 1c385e5de..000000000 --- a/view/fr/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/fr/strings.php b/view/fr/strings.php index b6b20f68c..423645c86 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -159,6 +159,8 @@ $a->strings['Cancel'] = 'Annuler'; $a->strings['Global Directory'] = 'Annuaire global'; $a->strings['Item not found.'] = 'Élément introuvable.'; $a->strings['Private Message'] = 'Message privé'; +$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29"; $a->strings['This is you'] = 'C\'est vous'; $a->strings['View $name\'s profile'] = 'Voir le profil de $name'; $a->strings['Item has been removed.'] = 'Cet élément a été enlevé.'; diff --git a/view/it/like.tpl b/view/it/like.tpl deleted file mode 100644 index d64349a4b..000000000 --- a/view/it/like.tpl +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/view/it/strings.php b/view/it/strings.php index 1cee5399a..437d6e7c6 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -138,6 +138,8 @@ $a->strings['Cancel'] = 'Annulla'; $a->strings['Global Directory'] = 'Elenco Globale'; $a->strings['Item not found.'] = 'Elemento non trovato.'; $a->strings['Private Message'] = 'Messaggio privato'; +$a->strings["I like this \x28toggle\x29"] = "Mi piace questo \x28metti/togli\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "Non mi piace questo \x28metti/togli\x29"; $a->strings['This is you'] = 'Questo sei tu'; $a->strings['View $name\'s profile'] = 'Guarda il profilo di $name'; $a->strings['View $owner_name\'s profile'] = 'Guarda il profilo di $owner_name'; diff --git a/view/like.tpl b/view/like.tpl new file mode 100644 index 000000000..e36a624a4 --- /dev/null +++ b/view/like.tpl @@ -0,0 +1,5 @@ + From 37a87b0f58c61a58303230f2ca997c5e81f1f908 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 9 Mar 2011 08:43:17 +0100 Subject: [PATCH 11/25] reworked wall-to-wall style --- view/theme/duepuntozero/style.css | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 2c271218a..bc6e63edb 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -839,10 +839,6 @@ input#dfrn-url { .comment .wall-item-info { width: 70px; } -.wallwall .wall-item-info { - width: 170px; -} - .wall-item-photo-wrapper { margin-top: 10px; @@ -850,25 +846,25 @@ input#dfrn-url { margin-bottom: 10px; width: 100px; } -/*.wallwall .wall-item-photo-wrapper { - float: left; -}*/ -.wallwall .wwfrom { - left: 75px; - position: absolute; - top: 0; -} +.wallwall .wwto { + left: 50px; + margin: 0; + position: absolute; + top: 70px; + width: 30px +} +.wallwall .wwto img { + width: 30px; + height: 30px; +} .wallwall .wall-item-photo-end { clear: both; } .wall-item-arrowphoto-wrapper { - /*margin-top: 40px; - margin-right: 20px; - float: left;*/ position: absolute; - left: 70px; + left: 75px; top: 70px; z-index: 100; } @@ -902,7 +898,6 @@ input#dfrn-url { /* can use a jquery plugin http://bit.ly/zJskg */ text-overflow: ellipsis; -o-text-overflow: ellipsis; - white-space: nowrap; width: 100%; } From a543ae6d8e8b44dd515b59d73f757cb15887ec0b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 9 Mar 2011 09:33:08 +0100 Subject: [PATCH 12/25] Update search_item.tpl --- view/search_item.tpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/view/search_item.tpl b/view/search_item.tpl index fcdaac834..f890bdee5 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -8,11 +8,14 @@
$lock - $name -
$ago
$location
+
+ $name +
$ago
+ +
$title
From 32e96d2647b4f535bf329caf160336f3358ce423 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 02:12:32 -0800 Subject: [PATCH 13/25] reload plugins if they change --- boot.php | 56 ++++++++++++++++++++++++++++++++++++++++++---- database.sql | 3 ++- include/poller.php | 5 +++++ update.php | 3 +++ 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index d3380a395..37cd42592 100644 --- a/boot.php +++ b/boot.php @@ -2,8 +2,8 @@ set_time_limit(0); -define ( 'BUILD_ID', 1039 ); -define ( 'FRIENDIKA_VERSION', '2.10.0910' ); +define ( 'BUILD_ID', 1040 ); +define ( 'FRIENDIKA_VERSION', '2.10.0912' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'EOL', "
\r\n" ); @@ -512,22 +512,70 @@ function check_config(&$a) { foreach($plugins_arr as $p) { if(! in_array($p,$installed_arr)) { logger("Addons: installing " . $p); + $t = filemtime('addon/' . $p . '/' . $p . '.php'); @include_once('addon/' . $p . '/' . $p . '.php'); if(function_exists($p . '_install')) { $func = $p . '_install'; $func(); - $r = q("INSERT INTO `addon` (`name`, `installed`) VALUES ( '%s', 1 ) ", - dbesc($p) + $r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`) VALUES ( '%s', 1, %d ) ", + dbesc($p), + intval($t) ); } } } } + + load_hooks(); return; }} +// reload all updated plugins + +if(! function_exists('reload_plugins')) { +function reload_plugins() { + $plugins = get_config('system','addon'); + if(strlen($plugins)) { + + $r = q("SELECT * FROM `addon` WHERE `installed` = 1"); + if(count($r)) + $installed = $r; + else + $installed = array(); + + $parr = explode(',',$plugins); + if(count($parr)) { + foreach($parr as $pl) { + $pl = trim($pl); + + $t = filemtime('addon/' . $pl . '/' . $pl . '.php'); + foreach($installed as $i) { + if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { + logger('Reloading plugin: ' . $i['name']); + @include_once('addon/' . $pl . '/' . $pl . '.php'); + + if(function_exists($pl . '_uninstall')) { + $func = $pl . '_uninstall'; + $func(); + } + if(function_exists($pl . '_install')) { + $func = $pl . '_install'; + $func(); + } + q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d LIMIT 1", + intval($t), + intval($i['id']) + ); + } + } + } + } + } +}} + + // This is our template processor. // $s is the string requiring macro substitution. diff --git a/database.sql b/database.sql index 93e444b6b..f47a5967e 100644 --- a/database.sql +++ b/database.sql @@ -451,7 +451,8 @@ CREATE TABLE IF NOT EXISTS `addon` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `name` CHAR( 255 ) NOT NULL , `version` CHAR( 255 ) NOT NULL , -`installed` TINYINT( 1 ) NOT NULL DEFAULT '0' +`installed` TINYINT( 1 ) NOT NULL DEFAULT '0' , +`timestamp` BIGINT NOT NULL DEFAULT '0' ) ENGINE = MYISAM DEFAULT CHARSET=utf8; diff --git a/include/poller.php b/include/poller.php index fd02e0198..a093190a6 100644 --- a/include/poller.php +++ b/include/poller.php @@ -47,6 +47,11 @@ function poller_run($argv, $argc){ $sql_extra = (($manual_id) ? " AND `id` = $manual_id " : ""); + $d = datetime_convert(); + call_hooks('cron', $d); + + reload_plugins(); + $contacts = q("SELECT `id` FROM `contact` WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != '' $sql_extra diff --git a/update.php b/update.php index 131014d4a..422c27c7b 100644 --- a/update.php +++ b/update.php @@ -374,3 +374,6 @@ function update_1038() { q("ALTER TABLE `item` ADD `plink` CHAR( 255 ) NOT NULL AFTER `target` "); } +function update_1039() { + q("ALTER TABLE `addon` ADD `timestamp` BIGINT NOT NULL DEFAULT '0'"); +} \ No newline at end of file From 7250b04dbdbc10a6470d34ffa6dacc97d43cd347 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 02:17:08 -0800 Subject: [PATCH 14/25] EOF --- update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.php b/update.php index 422c27c7b..88d038f94 100644 --- a/update.php +++ b/update.php @@ -376,4 +376,4 @@ function update_1038() { function update_1039() { q("ALTER TABLE `addon` ADD `timestamp` BIGINT NOT NULL DEFAULT '0'"); -} \ No newline at end of file +} From 1c779e20618baf0d348ad52bc877d9a7a7923641 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 14:39:18 -0800 Subject: [PATCH 15/25] fb "post by default" implemented, post_by_default logic fixed for other plugins --- addon/facebook/facebook.css | 5 +++++ addon/facebook/facebook.php | 37 ++++++++++++++++++++++++++++------- addon/statusnet/statusnet.php | 2 +- addon/twitter/twitter.php | 2 +- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/addon/facebook/facebook.css b/addon/facebook/facebook.css index 3df65706f..0c164331e 100644 --- a/addon/facebook/facebook.css +++ b/addon/facebook/facebook.css @@ -6,3 +6,8 @@ #facebook-disable-wrapper { margin-top: 20px; } + +#facebook-post-default-form input { + margin-top: 20px; + margin-right: 20px; +} \ No newline at end of file diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index d4d4cc443..edfc5a374 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -95,6 +95,15 @@ function facebook_init(&$a) { } +function facebook_post(&$a) { + + if(local_user()){ + $value = ((x($_POST,'post_by_default')) ? intval($_POST['post_by_default']) : 0); + set_pconfig(local_user(),'facebook','post_by_default', $value); + } + return; +} + function facebook_content(&$a) { if(! local_user()) { @@ -107,6 +116,8 @@ function facebook_content(&$a) { notice( t('Facebook disabled') . EOL); } + $fb_installed = get_pconfig(local_user(),'facebook','post'); + $appid = get_config('facebook','appid'); if(! $appid) { @@ -119,14 +130,26 @@ function facebook_content(&$a) { $o .= '

' . t('Facebook Connect') . '

'; - $o .= '
'; + if(! $fb_installed) { + $o .= ''; + } - $o .= '' . t('Remove Facebook post connector') . '
'; + if($fb_installed) { + $o .= ''; + + $o .= '
'; + $o .= '
'; + $post_by_default = get_pconfig(local_user(),'facebook','post_by_default'); + $checked = (($post_by_default) ? ' checked="checked" ' : ''); + $o .= '' . ' ' . t('Post to Facebook by default') . '
'; + $o .= '
'; + } return $o; } @@ -161,7 +184,7 @@ function facebook_jot_nets(&$a,&$b) { $fb_post = get_pconfig(local_user(),'facebook','post'); if(intval($fb_post) == 1) { $fb_defpost = get_pconfig(local_user(),'facebook','post_by_default'); - $selected = ((intval($fb_defpost == 1)) ? ' selected="selected" ' : ''); + $selected = ((intval($fb_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . t('Post to Facebook') . '
'; } @@ -202,7 +225,7 @@ function facebook_post_hook(&$a,&$b) { // make links readable before we strip the code - $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 ($1)',$msg); + $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 [$1]',$msg); $msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1',$msg); diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php index 1deb030c1..f763cd0c3 100644 --- a/addon/statusnet/statusnet.php +++ b/addon/statusnet/statusnet.php @@ -73,7 +73,7 @@ function statusnet_jot_nets(&$a,&$b) { $statusnet_post = get_pconfig(local_user(),'statusnet','post'); if(intval($statusnet_post) == 1) { $statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default'); - $selected = ((intval($statusnet_defpost == 1)) ? ' selected="selected" ' : ''); + $selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . t('Post to StatusNet') . '
'; } diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php index db283e1a9..bb424fb65 100644 --- a/addon/twitter/twitter.php +++ b/addon/twitter/twitter.php @@ -59,7 +59,7 @@ function twitter_jot_nets(&$a,&$b) { $tw_post = get_pconfig(local_user(),'twitter','post'); if(intval($tw_post) == 1) { $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default'); - $selected = ((intval($tw_defpost == 1)) ? ' selected="selected" ' : ''); + $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : ''); $b .= '
' . t('Post to Twitter') . '
'; } From 7b9dff1db7a1a03e237103ff28a4ec32d40af959 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 16:57:22 -0800 Subject: [PATCH 16/25] automated versioning --- .gitignore | 1 + boot.php | 12 ++++++------ update.php | 18 +++++++++--------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index fea5fb91e..10a7187cf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ wip/* include/jquery-1.4.2.min.js *.log *.out +*.version* push* home.html diff --git a/boot.php b/boot.php index 37cd42592..7dd188ee7 100644 --- a/boot.php +++ b/boot.php @@ -2,9 +2,9 @@ set_time_limit(0); -define ( 'BUILD_ID', 1040 ); -define ( 'FRIENDIKA_VERSION', '2.10.0912' ); +define ( 'FRIENDIKA_VERSION', '2.1.913' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); +define ( 'DB_UPDATE_VERSION', 1040 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -435,15 +435,15 @@ function check_config(&$a) { $build = get_config('system','build'); if(! x($build)) - $build = set_config('system','build',BUILD_ID); + $build = set_config('system','build',DB_UPDATE_VERSION); $url = get_config('system','url'); if(! x($url)) $url = set_config('system','url',$a->get_baseurl()); - if($build != BUILD_ID) { + if($build != DB_UPDATE_VERSION) { $stored = intval($build); - $current = intval(BUILD_ID); + $current = intval(DB_UPDATE_VERSION); if(($stored < $current) && file_exists('update.php')) { // We're reporting a different version than what is currently installed. // Run any existing update scripts to bring the database up to current. @@ -455,7 +455,7 @@ function check_config(&$a) { $func($a); } } - set_config('system','build', BUILD_ID); + set_config('system','build', DB_UPDATE_VERSION); } } diff --git a/update.php b/update.php index 88d038f94..fe8052b00 100644 --- a/update.php +++ b/update.php @@ -11,24 +11,24 @@ * Each function in this file is named update_nnnn() where nnnn is an increasing number * which began counting at 1000. * - * At the top of the file "boot.php" is a define for BUILD_ID. Any time there is a change + * At the top of the file "boot.php" is a define for DB_UPDATE_VERSION. Any time there is a change * to the database schema or one which requires an upgrade path from the existing application, - * the BUILD_ID is incremented. + * the DB_UPDATE_VERSION is incremented. * - * The current BUILD_ID is stored in the config area of the database. If the application starts up - * and BUILD_ID is greater than the last stored build number, we will process every update function - * in order from the currently stored value to the new BUILD_ID. This is expected to bring the system + * The current DB_UPDATE_VERSION is stored in the config area of the database. If the application starts up + * and DB_UPDATE_VERSION is greater than the last stored build number, we will process every update function + * in order from the currently stored value to the new DB_UPDATE_VERSION. This is expected to bring the system * up to current without requiring re-installation or manual intervention. * - * Once the upgrade functions have completed, the current BUILD_ID is stored as the current value. - * The BUILD_ID will always be one greater than the last numbered script in this file. + * Once the upgrade functions have completed, the current DB_UPDATE_VERSION is stored as the current value. + * The DB_UPDATE_VERSION will always be one greater than the last numbered script in this file. * * If you change the database schema, the following are required: * 1. Update the file database.sql to match the new schema. - * 2. Update this file by adding a new function at the end with the number of the current BUILD_ID. + * 2. Update this file by adding a new function at the end with the number of the current DB_UPDATE_VERSION. * This function should modify the current database schema and perform any other steps necessary * to ensure that upgrade is silent and free from requiring interaction. - * 3. Increment the BUILD_ID in boot.php + * 3. Increment the DB_UPDATE_VERSION in boot.php * 4. TEST the upgrade prior to checkin and filing a pull request. * */ From d6e4cd9d6b57afc33242dc7121a529462c6b4b7b Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 17:59:26 -0800 Subject: [PATCH 17/25] bring loozah theme up to date, move name slightly lower --- view/theme/duepuntozero/style.css | 6 +++- view/theme/loozah/style.css | 49 ++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bc6e63edb..f4aa5dac6 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -203,7 +203,7 @@ div.wall-item-content-wrapper.shiny { background-repeat:no-repeat; } -/* from defautlt */ +/* from default */ #jot-perms-icon, #profile-location, #profile-nolocation, @@ -977,6 +977,10 @@ input#dfrn-url { background-repeat: repeat-x; padding: 5px 10px 0px; } +.wall-item-author { + margin-top: 10px; +} + .comment .wall-item-tools { background:none; } diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 662df2528..a24f89a83 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -965,36 +965,41 @@ input#dfrn-url { float: left; } .wall-item-wrapper { - float: left; + margin-left: 10px;; } + .wall-item-lock { - height: 20px; - margin-top: 10px; + position: absolute; + left: 105px; + top: 1px; } .wall-item-ago { color: #888888; font-size: 0.8em; } - -.wall-item-like-buttons img { - cursor: pointer; +.wall-item-like-buttons { + float: left; + margin-right: 10px; + padding-right: 10px; + border-right: 2px solid #fff; } .wall-item-links-wrapper { - float: left; - margin-top: 100px; - margin-left: 10px; + float: left; } .wall-item-delete-wrapper { - float: right; - margin-top: 20px; - margin-right: 50px; + float: right; } .wall-item-delete-end { - clear: both; + clear: both; +} + + +.wall-item-like-buttons img { + cursor: pointer; } .wall-item-delete-icon { @@ -1023,6 +1028,22 @@ input#dfrn-url { overflow: auto; } +.wall-item-tools { + clear: both; +padding: 5px 10px 0px; +} +.wall-item-photo-end { + clear: both; +} +.wall-item-author { + margin-top: 10px; +} +.wall-item-info { + display: block; + float: left; + width:110px; + margin-right:10px; +} .wall-item-title { float: left; @@ -1033,7 +1054,7 @@ input#dfrn-url { .wall-item-body { float: left; width: 450px; - margin-top: 30px; + margin-top: 10px; } .comment-edit-wrapper { From 35c3e12df53fc0584f1b5231ea6e73a177db3573 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 21:10:16 -0800 Subject: [PATCH 18/25] ability to edit image permissions --- include/acl_selectors.php | 2 +- mod/photos.php | 15 +++++++++++++-- view/photo_edit.tpl | 14 +++++++++++++- view/theme/duepuntozero/style.css | 5 +++++ view/theme/loozah/style.css | 5 +++++ 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9467531d9..fa700818f 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -10,7 +10,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $o .= " @@ -16,8 +15,21 @@ +
+
+ +
+ + +
+
+ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index f4aa5dac6..d4643b20a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1826,6 +1826,11 @@ a.mail-list-link { float: left; width: 150px; } + +#photo-edit-perms-end { + margin-bottom: 15px; +} + #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { float: left; margin-bottom: 25px; diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index a24f89a83..ffd352c5a 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1869,6 +1869,11 @@ a.mail-list-link { float: left; width: 150px; } + +#photo-edit-perms-end { + margin-bottom: 15px; +} + #photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { float: left; margin-bottom: 25px; From 2270e73fcd231013929d5f9e7475fc8b0d872149 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 21:29:32 -0800 Subject: [PATCH 19/25] show permission denied photo when direct link was accessed and authentication is insufficient to view --- images/nosign.jpg | Bin 0 -> 6498 bytes mod/photo.php | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 images/nosign.jpg diff --git a/images/nosign.jpg b/images/nosign.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b73629332d8a6fa9121bc265ba6b571a4ba65fa2 GIT binary patch literal 6498 zcmeI0S5#B&wuTo32=GhqUuOclJL7F6lD7|+?P$|+v zFBYnFkfIp89-}jAY&3CN#V&>v2K#znY-~b5;3DACd z0T=UtCO{4%BO?QmU*5>c$tl2BD8ZLO_t#%kR~YCR85!sp7?@bEvN17pvM?~P^Rjb7 zAW$fjiH%Qyk6Yj>HHx0Ac`Cffiq!h(?UaodrZ_J$g{H$z@@!Skq-gVR7LIpml~7ab{SHQn4v& z&%0GjM$1#d01APEMGnykuVDwfbM{QWyeO{g*oi~iB_LhY-heYgDx6C0apV|7PF{LrRaSWr?De;26^m8zWS!;qo&_ibfo z24V#RhLiDHo?wr$aKqvHAXEOjL)sr%p||)(Q^%BK!%3d|ehK9K@Xq3h;Zy$OHUneR zdF%%AW;Ryj;i23Faw^kH&>7q;cY?_j7UW6y2Q0>nv4U5fpKY2f6m94uU`$K|UAJV@ za4_$0xW=ahFGziqN7pBGT2tEf-X|cd0_gDhhk6m_GRw~0&-T`ANc5BzR3FF5zjp}EPc-Y|{A>dEb?t0G26tIfM~ z{HXNfrnIP%JCE5x<>%M&`lKx^teI_$g`oHqL&_s~rfqFrubA}I5FQe{++M+$l;h^-< z9;P-@>rp&x;915fE%w-WEerrYo_qLy$jRU8=)T&L`8Vkkw^@g_%%*6y`klwDJC0gv*x z={@D|5c7_ao>a~QQcSW$e?e`vVHM>r#%Us-K8p*&KVKF3WajKjz#Pw&zZM&J`oAS?O1?CEidShs0FD z9OnWWQvMxs>Inbr=|RciFxo%eT;vdDdrI7vEZpyx^u&s4M@NmGy~* zt`8fRZ`Mk0YWT82qaTtOl(;>qw*M_x68+a(S2hCKj8IDvYDD;1VdYJp-{>zGcYk8# zM(Eighh-4`m45N(hAG=-qGg`2;3*t`4;;k^=u#e_qb64m3?*BAj3MdH@vRN5OE0{f zEvJwe90URL)>kuMOGI%PEErNYcCw8!o(&S(rL@hUJM{+?J?$SjzZ~dF3a-%#NGRa> zXO|we5E&KM{oSB})_*`IGZ5)Px95-BdK;|fBnPt&?m9vyN{UYCY%@com#MnD@4z9E zl*o4Mca?okwtQ9nhfDt307O(ioBt$Rva;`RH!4(#7^Rg#Q~gA7aQ;W~s~?b)?WY|D z^Q0p#DXxvTodp#7C>^ujC+J)NKMAns%0vDeNGX5>&C%_GnlLT#_L0Jg*rep3FgR*v z+@qGB=ko2HwSkrUh&CO>4}}oxiLkjgo`9|DqeH(5*~o@G5?ZXoy~0rGgN-T6Y9RD0 z#ds?H@YVi?)#HqzfJps04a1tArL~eDle3^Mn>d_A@6Y*C!H&N6&yJO*{nV2#=5Ks; zAdK>Wo1S54tG(4i($Jdas$Ob^d4nrhD`Je_j$$&oXyf#F=$bcNbK!mZm;|GJ_`8w2 ztNxkiCe3t=UNRFO~(p5;E!E(UE_jGKNi?+$+B zaW>nj{Lpu;P|VytKX_pl*+~WC{ql_Z_YE!&=P2{>w~Z?1JUuRNr*E9>nrD4T#X$pS z=GIjnDZ##)Y?(W&(!5;_qL6>9$B~)cI@b`;1Y*9?`yI(7wb3=7f ziF4F0zLPcX&09Qw7VG}hD#O>i>Z>q{SM=gPHV@;bpl*_~_1oAoXUdZ(q{6WD7#SCP zg{|~=>io95)or>e*8WeY-zXoY%6#d4@It z^b-DthLEt=q^BF47T7*$O-N^XHB}M5o~k6^3e45iLsV5-aJxEv!8t@r!IyeQ>@8c$ zmBg;Z0FosGm>qTQf8qxpw_Omx+&(4H`&6Qh$$2uCrOb2^bb4dqc*al8^{!JXho*RA zY_1!xum&S3DpeLBsm4zXJVZRSVRz;FQ&25|SMoX0cMiRE?|C{##dh(msWAH)+|nu5 zXi%cKG*1UfA03Xt(g1*~*z+}6Ssc?lPK3~!aAN@4^y_(F%iN4dBvT?II$4$kcL)Rt ze24vTLB77WtkTEgQN1KTN}A{ASzv);Rv1;WmJE}#6y_{?V~^J1c%b;cbd2-mD~!Jo ztNUx`*NL7g3fx}a=aNe-_oQEmKg=@Yo7gNC&iGjL2pbY<%5)}MHqxCu-`~r2COt*! zaN8Z_rySuH0{ecby@(Vo?H~^Ff?id}e%?ibr}yLxjZ3V*MXDa+3^ z!9dB-8^`qLcw9%+2nomL169-Nx{1gpvMB3Cf=Jdt_K{`+Y_Woz$;XG&O@yYA@kRI% zROd)zl7U{ri>DFLdO%N9n<2xJoL{P;SuA->2}I;JQdIGhsLBr?MUZ1Yanf#qp$>;O zUo-quGqycXTFQPm_^a(rqc_&J%ACkuwG~m8Wqn$$~E}1>TV)71Ryv zh@Id)xdoQ|0mAE^ABHy*ZCx1c;jEt$8k~EmCq$hi&hvJIwv}=phxLE+(jBtb(|J2z zBVTa`Z5g9)q?!>rViRX#{w^yQjgcOF2ndy)m>;?;OXNP$I=|fE46c+PW92nlsZ&MwNZfLZ3_`&$n12Z_bmn| zymI@q2%67a-}Al*0{ESyoB0gdKtWo=q|7O}K&ePJ4d(Vdx zv}id%pcUBmJjDsgzo_eKi@P>5>=;6AZ6<42jG{XrHuNPoFULr1RpuVxwCkjoohA*8 ztc+eF3{;8jsb+S{{9R9rx!fh&=le$A6`ZNIF2$Xhi(*q4vwR*6owZOdItP%w@BGQB z&G37_HF;|o-I+Ye?eqXS6Cr!`y*9a7Lqd|98xhm0Out3nat7oV_It2Epcr$@@l2q ziq?PT=jgxr;p+Q;e*Oo3M3AT$hHFV&k?2*X?}(rHkLYj}vX%>AnDFV2Do6JI@zP*y zuI)=1WY!6IOMJfwYQ$KwZ}jR^eKJmCEuKqU<@~z0gE)QVeoMKQ1)^#OFCs zV=j^HK?NHOZ|VYbL5GkT=WKU}b0YuL2jd4~2fA3wpWu<0(!RzPPux@euT1*&rS9gn z%ZvlHC`QG(Zxh-9?+v(2e&iX5qC3o39$ZZatB{}d!A6CJL(D~Mri)I7dzhHfF3FJ| zLJz7-PwJ;5tZ;S#$Z(?*GxE;4wb^Sj5^StVsKxeD8$(Bdjlt$kI%7Q-?_VikIP#d@ zWdD7w5Mdzg?v||Q1z-}tf8%N|lAHBBW1I*#Dm;*0A>IsQWVr7`P3dX+hTO!Tuh3#6Z;5Z#_eZ*FG~ z`~E<>Wr>3XAp;e4qgKMmEApxeM5koh5v+b_+D+b9ejCTI*1R*?m#L7pn?;1jtCm+V z;q48PR2t@IjqI7wI}+POR8plo9 z1EJaXv&kEZDO+B^hZnvCE7gOFbA|x3sR`mj4{_l)$HKe27XX!Z(=5!Z?~pU6G~$b+ zt9bE!2F~>7CfS66m(F)BknQSov`g|SE*hm(bhFC4B7xQbp~=@*#Eb~9zy}^J zTh*J+98dQ$c$?ZA7Y?Ra-h7=D9o;I1+_oymja<1N|MGoFe48IsL!#RCB_i_0AYk(c|Y_UMK?4E_+cg8IV*&boX ztkH3OtRSU^8WKej4#=|%N99bQo-WHVB3dq;3*)|j{J&Ioy!RDzg$XSP)-Z}`T5yNH ziRKB)=rao*>Y`7M{akN%%d~E{#n+3IubIIVPC#!Xjfm)pwTIjQ9E7~iUB zYVBs+&7bgt4d&|}c%0`YWeRqkdYG3M{}~=m!<^&9zfpx}eL*aYP_CyaM24QCY%&B_ z+s_6i6_zGUab@`kfnCHF!mvwJH{GFqd9U?l(^aqANXvwYbVF&wpwrRl?aj66@^YXL zo;;S%kyWJYtM8XpNo>s6rs)2-e09cY`iomEmsMqRQ8X{rB+^(302VSVJouy-J-M%F z1qvhD^m$LWI3Xh8pZL@ol^#;SBo~j55}TGJvxNMfEIYFJ3LMAxBe}rd{(BabC=6ldRWTBU5#F-l z(P*_QY_h&DCn^xltTdi5DTY{g#(s0xwXTk;vMs0d4-HSpk?h@M8Veo!c>zFf$p48Z zmE|{bda;t>gQ%^WvCGhwE%1)~(RK%*|V(386me1fnJ;aPX1C$%^*J5K*;*HS&Hwu+=L%#^ct2s>lQlp zdp1#)1+44TQ2#8#-*!Tb-1|%Kz3``{6hq2xQN&n@0KYb>o0=HqDYb2qwX|PY(|57w z`aLM4&-^`x^+mV76)CY&9cdhm|4cSdv|umOlM;_XH!nk8Jxb;-d)X38QFEFxslu;f z_im`^;o98+SCOsW9Hgr8i9x!mr*N3x7jwVWNI0HF<{D@0~$Gth&dO- z3V)JRP{jT!l@y%sm9*|rzwWT$j$G&O6}i-o*ph9Nr3Whq=2M(K+gjk%FqfFg5Dlgx z@RF%$C#v11TwnYSmnZa$QTiV3BNSFdKbvmXnE%ZkcmUh|E4oR7RP3?eMZFM{G!>Te zQ9q4jkzpFurWI$`q%%0~%QYU|p^kDlj~>pU=HhRq*gB=TnWl$|yJr(KVW=P)WDn1f zC|}go$46@O+yaDT;hg@O>*(05txDm`ujj99hcdnAM447eGh6d8XaUj1%=2E&He2@V8xkX*%8$@hbWFbj8V4 zjyDcWJ?BS)FxpmMaYEkxpw6?Pbw5d(>)KwT)mX9WgVdJ@Q?P=O;ifQi#CoczOy`MX zyG(DJJS;+x-=s$(vsUc{pK|XF3e&ymTGx!Rilw(O9Cu!cr_x;2^e(Tm4p|a;r@*-r z2Q`tws(T^6^jpTC6UD5Zl@O8<2+D(ByS6zJS#T#&LQub@RJ7r|0p>P!^8U)XiYS!%_w0TCx hxJ;#Qh9t}DK!IPY1EV+*+f*X+Kb(D}QOU*Ze*x7h{|f*B literal 0 HcmV?d00001 diff --git a/mod/photo.php b/mod/photo.php index 7f13d1cbf..2f8d180fd 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -108,6 +108,24 @@ function photo_init(&$a) { if(count($r)) { $data = $r[0]['data']; } + else { + + // Does the picture exist? It may be a remote person with no credentials, + // but who should otherwise be able to view it. Show a default image to let + // them know permissions was denied. It may be possible to view the image + // through an authenticated profile visit. + // There won't be many complete unauthorised people seeing this because + // they won't have the photo link, so there's a reasonable chance that the person + // might be able to obtain permission to view it. + + $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1", + dbesc($photo), + intval($resolution) + ); + if(count($r)) { + $data = file_get_contents('images/nosign.jpg'); + } + } } } From 0578751cc9820fcc028d8761e2ba8926dbcfbb05 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 9 Mar 2011 23:35:47 -0800 Subject: [PATCH 20/25] allowed_email matching $host instead of $domain --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 7dd188ee7..4c3a923dc 100644 --- a/boot.php +++ b/boot.php @@ -1825,7 +1825,7 @@ function allowed_email($email) { if(count($allowed)) { foreach($allowed as $a) { $pat = strtolower(trim($a)); - if(($fnmatch && fnmatch($pat,$host)) || ($pat == $host)) { + if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) { $found = true; break; } From 439ee37f99a6029e1d689f3a0133ca3de25b593e Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 10 Mar 2011 02:45:37 -0800 Subject: [PATCH 21/25] never enough comments --- index.php | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 01d8eb2a1..09a179c1c 100644 --- a/index.php +++ b/index.php @@ -102,8 +102,9 @@ if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = ''; /* - * check_config() is responible for running update scripts. These automatically - * update the DB schema whenever we push a new one out. + * check_config() is responsible for running update scripts. These automatically + * update the DB schema whenever we push a new one out. It also checks to see if + * any plugins have been added or removed and reacts accordingly. */ @@ -122,7 +123,7 @@ $a->apps = $arr['app_menu']; /** * - * We have already parsed the server path into $->argc and $a->argv + * We have already parsed the server path into $a->argc and $a->argv * * $a->argv[0] is our module name. We will load the file mod/{$a->argv[0]}.php * and use it for handling our URL request. @@ -130,7 +131,7 @@ $a->apps = $arr['app_menu']; * and in the following order: * * "module"_init - * "module"_post (only if there are $_POST variables) + * "module"_post (only called if there are $_POST variables) * "module"_afterpost * "module"_content - the string return of this function contains our page body * @@ -140,15 +141,42 @@ $a->apps = $arr['app_menu']; */ if(strlen($a->module)) { + + /** + * + * We will always have a module name. + * First see if we have a plugin which is masquerading as a module. + * + */ + if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) { include_once("addon/{$a->module}/{$a->module}.php"); if(function_exists($a->module . '_module')) $a->module_loaded = true; } + + /** + * If not, next look for a 'standard' program module in the 'mod' directory + */ + if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) { include("mod/{$a->module}.php"); $a->module_loaded = true; } + + /** + * + * The URL provided does not resolve to a valid module. + * + * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'. + * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic - + * we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page + * this will often succeed and eventually do the right thing. + * + * Otherwise we are going to emit a 404 not found. + * + */ + if(! $a->module_loaded) { if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) { logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']); @@ -199,7 +227,7 @@ if($a->module_loaded) { } -// let javascript take you home +// If you're just visiting, let javascript take you home if(x($_SESSION,'visitor_home')) $homebase = $_SESSION['visitor_home']; From 508636082ecc68f61e82770bb671932be2b353bc Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 10 Mar 2011 20:46:27 -0800 Subject: [PATCH 22/25] bogus 'no results' message on search page --- boot.php | 2 +- index.php | 2 +- mod/search.php | 9 +-------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index 4c3a923dc..1412f1f91 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.913' ); +define ( 'FRIENDIKA_VERSION', '2.1.914' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1040 ); diff --git a/index.php b/index.php index 09a179c1c..cc17119b6 100644 --- a/index.php +++ b/index.php @@ -160,7 +160,7 @@ if(strlen($a->module)) { */ if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) { - include("mod/{$a->module}.php"); + include_once("mod/{$a->module}.php"); $a->module_loaded = true; } diff --git a/mod/search.php b/mod/search.php index 561bb6c62..db7279fb5 100644 --- a/mod/search.php +++ b/mod/search.php @@ -51,7 +51,7 @@ function search_content(&$a) { $a->set_pager_total($r[0]['total']); if(! $r[0]['total']) { - notice('No results.'); + notice( t('No results.') . EOL); return $o; } @@ -134,13 +134,6 @@ function search_content(&$a) { } } - - if(! $r[0]['total']) { - notice('No results.'); - return $o; - } - - $o .= paginate($a); return $o; From 5e2f0ff05596cf572f5fbd0fc1c43b06a394ee31 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 11 Mar 2011 14:48:58 -0800 Subject: [PATCH 23/25] roll back "real people preferred" message - ineffectual --- boot.php | 2 +- mod/register.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 1412f1f91..bbaa8324d 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.914' ); +define ( 'FRIENDIKA_VERSION', '2.1.915' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); define ( 'DB_UPDATE_VERSION', 1040 ); diff --git a/mod/register.php b/mod/register.php index 13d770fda..fdf488b1a 100644 --- a/mod/register.php +++ b/mod/register.php @@ -401,7 +401,9 @@ function register_content(&$a) { $oidlabel = t("Your OpenID \x28optional\x29: "); } - $realpeople = t('Members of this network prefer to communicate with real people who use their real names.'); + // I set this and got even more fake names than before... + + $realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.'); if(get_config('system','publish_all')) { $profile_publish_reg = ''; From ee210718ccbef15432741665ce2b13379067804e Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 11 Mar 2011 20:06:13 -0800 Subject: [PATCH 24/25] photo album prev/next links --- mod/photos.php | 37 +++++++++++++++++++++++++++++-- view/theme/duepuntozero/style.css | 13 +++++++++++ view/theme/loozah/style.css | 14 ++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 854c6ee14..929d1c971 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -909,6 +909,32 @@ function photos_content(&$a) { return; } + $prevlink = ''; + $nextlink = ''; + + $prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0 + $sql_extra ORDER BY `created` DESC ", + dbesc($ph[0]['album']), + intval($owner_uid) + ); + + if(count($prvnxt)) { + for($z = 0; $z < count($prvnxt); $z++) { + if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) { + $prv = $z - 1; + $nxt = $z + 1; + if($prv < 0) + $prv = count($prvnxt) - 1; + if($nxt >= count($prvnxt)) + $nxt = 0; + break; + } + } + $prevlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] ; + $nextlink = $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] ; + } + + if(count($ph) == 1) $hires = $lores = $ph[0]; if(count($ph) > 1) { @@ -938,11 +964,18 @@ function photos_content(&$a) { $o .= '
'; } + if($prevlink) + $o .= '' ; - $o .= ''; + . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '" />
'; + + if($nextlink) + $o .= ''; + + $o .= '
'; // Do we have an item for this photo? diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index d4643b20a..c54b9835a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2094,3 +2094,16 @@ a.mail-list-link { margin-top: 20px; } +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} + +#photo-photo { + float: left; +} + +#photo-photo-end { + clear: both; +} + diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index ffd352c5a..4461907bb 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -2126,3 +2126,17 @@ a.mail-list-link { margin-top: 20px; } + +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} + +#photo-photo { + float: left; +} + +#photo-photo-end { + clear: both; +} + From a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 12 Mar 2011 03:15:38 -0800 Subject: [PATCH 25/25] Swedish translation --- view/sv/cmnt_received_eml.tpl | 18 + view/sv/contact_edit.tpl | 81 +++ view/sv/strings.php | 1124 +++++++++++++++++++++++++++++++++ 3 files changed, 1223 insertions(+) create mode 100644 view/sv/cmnt_received_eml.tpl create mode 100644 view/sv/contact_edit.tpl create mode 100644 view/sv/strings.php diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl new file mode 100644 index 000000000..60a5711ea --- /dev/null +++ b/view/sv/cmnt_received_eml.tpl @@ -0,0 +1,18 @@ + +$username, + + '$from' har kommenterat något som du följer. + +----- +$body +----- + +Logga in på $siteurl för att se hela konversationen: + +$display + +Tack, + $sitename admin + + + diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl new file mode 100644 index 000000000..1c5a1a3fb --- /dev/null +++ b/view/sv/contact_edit.tpl @@ -0,0 +1,81 @@ + +

$header

+ +
$name
+ +
+ + +
+ +
+ $alt_text +
+ $name +
+
+
+
+ + + +
+ + +
+
$lastupdtext$last_update +
$updpub
+ $poll_interval + +
+
+
+ +$insecure +$blocked +$ignored + +
+

Kontaktuppgifter / Anteckningar

+ +
+
+ + + +
+

Profilvisning

+

Välj vilken profil som ska visas för $name när han eller hon tittar på din profil i säkert läge. +

+
+$profile_select +
+ + + + +
+

Rykte online

+

+Ibland kanske dina vänner vill få reda på hur någon annan uppför sig på nätet innan de våga inleda någon kontakt. Du kan hjälpa till genom att ange personens 'rykte'. +

+
+$rating +
+
+

+Var vänlig ägna en liten stund åt att fylla i något som du känner kan vara till hjälp för andra. +

+ +
+
+$groups + + + +
diff --git a/view/sv/strings.php b/view/sv/strings.php new file mode 100644 index 000000000..2fe95bc96 --- /dev/null +++ b/view/sv/strings.php @@ -0,0 +1,1124 @@ +strings['Not Found'] = 'Hittades inte'; +$a->strings['Page not found.' ] = 'Sidan hittades inte.' ; +$a->strings['Permission denied'] = 'Åtkomst nekad'; +$a->strings['Permission denied.'] = 'Åtkomst nekad.'; +$a->strings['Create a New Account'] = 'Skapa nytt konto'; +$a->strings['Register'] = 'Registrera'; +$a->strings['Nickname or Email address: '] = 'Användarnamn eller e-postadress: '; +$a->strings['Password: '] = 'Lösenord: '; +$a->strings['Login'] = 'Logga in'; +$a->strings['Nickname/Email/OpenID: '] = 'Användarnamn/E-post/OpenID: '; +$a->strings["Password \x28if not OpenID\x29: "] = "Lösenord \x28om inget OpenID\x29: "; +$a->strings['Forgot your password?'] = 'Glömt lösenordet?'; +$a->strings['Password Reset'] = 'Återställ lösenord'; +$a->strings['Logout'] = 'Logga ut'; +$a->strings['prev'] = 'föreg'; +$a->strings['first'] = 'första'; +$a->strings['last'] = 'sista'; +$a->strings['next'] = 'nästa'; +$a->strings[' likes this.'] = ' gillar detta.'; +$a->strings[' doesn\'t like this.'] = ' ogillar detta.'; +$a->strings['people'] = 'personer'; +$a->strings['like this.'] = 'gilla detta.'; +$a->strings['don\'t like this.'] = 'ogilla detta.'; +$a->strings['and'] = 'och'; +$a->strings[', and '] = ', och '; +$a->strings[' other people'] = ' personer till'; +$a->strings[' like this.'] = ' gillar detta.'; +$a->strings[' don\'t like this.'] = ' ogillar detta.'; +$a->strings['No contacts'] = 'Inga kontakter'; +$a->strings['Contacts'] = 'Kontakter'; +$a->strings['View Contacts'] = 'Visa kontakter'; +$a->strings['Search'] = 'Sök'; +$a->strings['No profile'] = 'Ingen profil'; +$a->strings['Connect'] = 'Anslut'; +$a->strings['Location:'] = 'Plats:'; +$a->strings[', '] = ', '; +$a->strings['Gender:'] = 'Kön:'; +$a->strings['Status:'] = 'Status:'; +$a->strings['Homepage:'] = 'Hemsida:'; +$a->strings['Monday'] = 'måndag'; +$a->strings['Tuesday'] = 'tisdag'; +$a->strings['Wednesday'] = 'onsdag'; +$a->strings['Thursday'] = 'torsdag'; +$a->strings['Friday'] = 'fredag'; +$a->strings['Saturday'] = 'lördag'; +$a->strings['Sunday'] = 'söndag'; +$a->strings['January'] = 'januari'; +$a->strings['February'] = 'februari'; +$a->strings['March'] = 'mars'; +$a->strings['April'] = 'april'; +$a->strings['May'] = 'maj'; +$a->strings['June'] = 'juni'; +$a->strings['July'] = 'juli'; +$a->strings['August'] = 'augusti'; +$a->strings['September'] = 'september'; +$a->strings['October'] = 'oktober'; +$a->strings['November'] = 'november'; +$a->strings['December'] = 'december'; +$a->strings['Birthdays this week:'] = 'Födelsedagar denna vecka:'; +$a->strings["\x28Adjusted for local time\x29"] = "\x28Justerad till lokal tid\x29"; +$a->strings['[today]'] = '[today]'; +$a->strings['link to source'] = 'länk till källa'; +$a->strings['No recipient selected.'] = 'Ingen mottagare vald.'; +$a->strings['[no subject]'] = '[no subject]'; +$a->strings['Unable to locate contact information.'] = 'Hittar inga kontaktuppgifter.'; +$a->strings['Wall Photos'] = 'Loggfoton'; +$a->strings['Message sent.'] = 'Meddelandet har skickats.'; +$a->strings['Message could not be sent.'] = 'Det gick inte att skicka meddelandet.'; +$a->strings['Messages'] = 'Meddelanden'; +$a->strings['Inbox'] = 'Inkort'; +$a->strings['Outbox'] = 'Utkorg'; +$a->strings['New Message'] = 'Nytt meddelande'; +$a->strings['Message deleted.'] = 'Meddelandet borttaget.'; +$a->strings['Conversation removed.'] = 'Konversationen borttagen.'; +$a->strings['Send Private Message'] = 'Skicka personligt meddelande'; +$a->strings['To:'] = 'Till:'; +$a->strings['Subject:'] = 'Ämne:'; +$a->strings['Your message:'] = 'Ditt meddelande:'; +$a->strings['Upload photo'] = 'Ladda upp foto'; +$a->strings['Insert web link'] = 'Infoga länk'; +$a->strings['Please wait'] = 'Vänta'; +$a->strings['No messages.'] = 'Inga meddelanden.'; +$a->strings['Delete conversation'] = 'Ta bort konversation'; +$a->strings['Message not available.'] = 'Meddelandet är inte tillgängligt.'; +$a->strings['Delete message'] = 'Ta bort meddelande'; +$a->strings['Send Reply'] = 'Skicka svar'; +$a->strings['Applications'] = 'Applikationer'; +$a->strings["Invite Friends"] = "Bjud in vänner"; +$a->strings['Connect/Follow'] = 'Anslut/Följ'; +$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Exempel: adam@exempel.com, http://exempel.com/bertil'; +$a->strings['Follow'] = 'Följ'; +$a->strings['Could not access contact record.'] = 'Could not access contact record.'; +$a->strings['Could not locate selected profile.'] = 'Hittade inte vald profil.'; +$a->strings['Contact updated.'] = 'Kontakten har uppdaterats.'; +$a->strings['Failed to update contact record.'] = 'Failed to update contact record.'; +$a->strings['Contact has been '] = 'Kontakten '; +$a->strings['blocked'] = 'spärrad'; +$a->strings['unblocked'] = 'inte längre spärrad'; +$a->strings['ignored'] = 'ignoreras'; +$a->strings['unignored'] = 'ignoreras inte längre'; +$a->strings['stopped following'] = 'följer inte längre'; +$a->strings['Contact has been removed.'] = 'Kontakten har tagits bort.'; +$a->strings['Contact not found.'] = 'Kontakten hittades inte.'; +$a->strings['Mutual Friendship'] = 'Ömsesidig vänskap'; +$a->strings['is a fan of yours'] = 'är ett fan till dig'; +$a->strings['you are a fan of'] = 'du är fan till'; +$a->strings['Never'] = 'Aldrig'; +$a->strings["\x28Update was successful\x29"] = "\x28Uppdateringen lyckades\x29"; +$a->strings["\x28Update was not successful\x29"] = "\x28Uppdateringen lyckades inte\x29"; +$a->strings['Contact Editor'] = 'Kontaktredigerare'; +$a->strings['Visit $name\'s profile'] = 'Besök $name '; +$a->strings['Block/Unblock contact'] = 'Spärra kontakt eller häv spärr'; +$a->strings['Ignore contact'] = 'Ignorera kontakt'; +$a->strings['Delete contact'] = 'Ta bort kontakt'; +$a->strings['Last updated: '] = 'Uppdaterad senast: '; +$a->strings['Update public posts: '] = 'Uppdatera offentliga inlägg: '; +$a->strings['Update now'] = 'Updatera nu'; +$a->strings['Unblock this contact'] = 'Häv spärr för kontakt'; +$a->strings['Block this contact'] = 'Spärra kontakt'; +$a->strings['Unignore this contact'] = 'Ignorera inte längre kontakt'; +$a->strings['Ignore this contact'] = 'Ignorera kontakt'; +$a->strings['Currently blocked'] = 'Spärrad'; +$a->strings['Currently ignored'] = 'Ignoreras'; +$a->strings['Show Blocked Connections'] = 'Visa spärrade kontakter'; +$a->strings['Hide Blocked Connections'] = 'Dölj spärrade kontakter'; +$a->strings['Finding: '] = 'Finding: '; +$a->strings['Find'] = 'Find'; +$a->strings['Visit '] = 'Besök '; +$a->strings['\'s profile'] = 's profil'; +$a->strings['Edit contact'] = 'Ändra kontakt'; +$a->strings['Profile not found.'] = 'Profilen hittades inte.'; +$a->strings['Response from remote site was not understood.'] = 'Kunde inte tolka svaret från fjärrsajten.'; +$a->strings['Unexpected response from remote site: '] = 'Oväntat svar från fjärrsajten: '; +$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully."; +$a->strings['Remote site reported: '] = 'Remote site reported: '; +$a->strings["Temporary failure. Please wait and try again."] = "Tillfälligt fel. Försök igen lite senare."; +$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked."; +$a->strings['Unable to set contact photo.'] = 'Det gick inte att välja profilbild.'; +$a->strings['is now friends with'] = 'är nu vän med'; +$a->strings['No user record found for '] = 'No user record found for '; +$a->strings['Our site encryption key is apparently messed up.'] = 'Det är något fel på webbplatsens krypteringsnyckel.'; +$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.'; +$a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.'; +$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'Det ID som angavs av ditt system är samma som på vårt system. Det borde fungera om du provar igen.'; +$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.'; +$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system'; +$a->strings["Connection accepted at "] = "Connection accepted at "; +$a->strings['Administrator'] = 'Administratör'; +$a->strings['noreply'] = 'noreply'; +$a->strings[' commented on an item at '] = ' har kommenterat '; +$a->strings[" commented on an item at "] = " har kommenterat "; +$a->strings[' welcomes '] = ' välkomnar '; +$a->strings["This introduction has already been accepted."] = "Den här förfrågan har redan accepterats."; +$a->strings['Profile location is not valid or does not contain profile information.'] = 'Profiladressen är ogiltig eller innehåller ingen profilinformation.'; +$a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.'; +$a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.'; +$a->strings[' required parameter'] = ' obligatoriskt fält'; +$a->strings[" was "] = " var "; +$a->strings["s were "] = " var "; +$a->strings["not found at the given location."] = "finns inte på platsen som angavs."; +$a->strings["Introduction complete."] = "Presentationen klar."; +$a->strings['Unrecoverable protocol error.'] = 'Irreparabelt protokollfel.'; +$a->strings['Profile unavailable.'] = 'Profilen är inte tillgänglig.'; +$a->strings[' has received too many connection requests today.'] = ' har tagit emot för många förfrågningar idag.'; +$a->strings['Spam protection measures have been invoked.'] = 'Åtgärder för skydd mot spam har aktiverats.'; +$a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.'; +$a->strings["Invalid locator"] = "Invalid locator"; +$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location."; +$a->strings['You have already introduced yourself here.'] = 'Du har redan presenterat dig här.'; +$a->strings['Apparently you are already friends with .'] = 'Du är tydligen redan vän med .'; +$a->strings['Invalid profile URL.'] = 'Ogiltig profil-URL.'; +$a->strings['Disallowed profile URL.'] = 'Otillåten profil-URL.'; +$a->strings['Your introduction has been sent.'] = 'Presentationen har skickats.'; +$a->strings["Please login to confirm introduction."] = "Logga in för att acceptera förfrågan."; +$a->strings["Incorrect identity currently logged in. Please login to this profile."] = "Incorrect identity currently logged in. Please login to this profile."; +$a->strings['[Name Withheld]'] = '[Name Withheld]'; +$a->strings['Friend/Connection Request'] = 'Vän- eller kontaktförfrågan'; +$a->strings['Please answer the following:'] = 'Besvara följande, tack:'; +$a->strings['Does $name know you?'] = 'Känner $name dig?'; +$a->strings['Yes'] = 'Ja'; +$a->strings['No'] = 'Nej'; +$a->strings['Add a personal note:'] = 'Lägg till ett personligt meddelande:'; +$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Ange din profiladress på ett av följande sociala nätverk som stöds:'; +$a->strings['Friendika'] = 'Friendika'; +$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web'; +$a->strings["Private \x28secure\x29 network"] = "Privat \x28säkert\x29 nätverk"; +$a->strings["Public \x28insecure\x29 network"] = "Offentligt \x28osäkert\x29 nätverk"; +$a->strings['Your profile address:'] = 'Din profiladress:'; +$a->strings['Submit Request'] = 'Skicka begäran'; +$a->strings['Cancel'] = 'Avbryt'; +$a->strings['Global Directory'] = 'Global katalog'; +$a->strings['Item not found.'] = 'Hittades inte.'; +$a->strings['Private Message'] = 'Personligt meddelande'; +$a->strings["I like this \x28toggle\x29"] = "Jag gillar detta \x28toggle\x29"; +$a->strings["I don't like this \x28toggle\x29"] = "Jag ogillar detta \x28toggle\x29"; +$a->strings['This is you'] = 'Det här är du'; +$a->strings['Delete'] = 'Ta bort'; +$a->strings['View $name\'s profile'] = 'Visa $name s profil'; +$a->strings['View $owner_name\'s profile'] = 'Visa $owner_name s profil'; +$a->strings['to'] = 'till'; +$a->strings['Wall-to-Wall'] = 'Logg-till-logg'; +$a->strings['via Wall-To-Wall:'] = 'via Logg-till-logg:'; +$a->strings['Item has been removed.'] = 'Har tagits bort.'; +$a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Innehållet omfattas av licensen Creative Commons Attribution 3.0.'; +$a->strings['CC: email addresses'] = 'CC: e-postadresser'; +$a->strings['Example: bob@example.com, mary@example.com'] = 'Exempel: adam@exempel.com, bertil@exempel.com'; +$a->strings['The profile address specified does not provide adequate information.'] = 'Angiven profiladress ger inte tillräcklig information.'; +$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Begränsad profil. Den här personen kommer inte att kunna ta emot personliga meddelanden från dig.'; +$a->strings['Unable to retrieve contact information.'] = 'Det gick inte att nå kontaktinformationen.'; +$a->strings['following'] = 'följer'; +$a->strings['Group created.'] = 'Gruppen har skapats.'; +$a->strings['Could not create group.'] = 'Det gick inte att skapa gruppen.'; +$a->strings['Group not found.'] = 'Gruppen hittades inte.'; +$a->strings['Group name changed.'] = 'Gruppens namn har ändrats.'; +$a->strings['Membership list updated.'] = 'Medlemslistan har uppdaterats.'; +$a->strings['Group removed.'] = 'Gruppen har tagits bort.'; +$a->strings['Unable to remove group.'] = 'Gruppen kunde inte tas bort.'; +$a->strings["Welcome to "] = "Välkommen till "; +$a->strings['Could not create/connect to database.'] = 'Det gick inte att skapa eller ansluta till databasen.'; +$a->strings['Connected to database.'] = 'Ansluten till databasen.'; +$a->strings['Database import succeeded.'] = 'Databasen har importerats.'; +$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'; +$a->strings['Please see the file "INSTALL.txt".'] = 'Se filen "INSTALL.txt".'; +$a->strings['Database import failed.'] = 'Det gick inte att importera databasen.'; +$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Du kanske måste importera filen "database.sql" manuellt med phpmyadmin eller mysql.'; +$a->strings['Welcome to Friendika.'] = 'Välkommen till Friendika.'; +$a->strings['Submit'] = 'Skicka'; +$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; +$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; +$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; +$a->strings['This is required for message delivery to work.'] = 'Det krävs för att meddelanden ska kunna levereras.'; +$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Fel: funktionen "openssl_pkey_new" kan inte skapa krypteringsnycklar'; +$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'Läs mer på "http://www.php.net/manual/en/openssl.installation.php" om du kör Windows.'; +$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Error: Apache webserver mod-rewrite module is required but not installed.'; +$a->strings['Error: libCURL PHP module required but not installed.'] = 'Error: libCURL PHP module required but not installed.'; +$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Error: GD graphics PHP module with JPEG support required but not installed.'; +$a->strings['Error: openssl PHP module required but not installed.'] = 'Error: openssl PHP module required but not installed.'; +$a->strings['Error: mysqli PHP module required but not installed.'] = 'Error: mysqli PHP module required but not installed.'; +$a->strings['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.'] = '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.'; +$a->strings['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.'] = '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.'; +$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Please check with your site documentation or support people to see if this situation can be corrected.'; +$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'; +$a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'; +$a->strings['Errors encountered creating database tables.'] = 'Fel vid skapandet av databastabeller.'; +$a->strings[' : '] = ' : '; +$a->strings['Not a valid email address.'] = 'Ogiltig e-postadress.'; +$a->strings['Please join my network on '] = 'Gå med i mitt nätverk på '; +$a->strings['Message delivery failed.'] = 'Meddelandet kom inte fram.'; +$a->strings[' messages sent.'] = ' meddelanden har skickats.'; +$a->strings['Send invitations'] = 'Send invitations'; +$a->strings['Enter email addresses, one per line:'] = 'Ange e-postadresser, en per rad:'; +$a->strings['Please join my social network on '] = 'Gå med i mitt sociala nätverk på '; +$a->strings['To accept this invitation, please visit:'] = 'Gå hit för att tacka ja till inbjudan:'; +$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:'; +$a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; +$a->strings['Empty post discarded.'] = 'Empty post discarded.'; +$a->strings[" commented on your item at "] = " commented on your item at "; +$a->strings[" posted on your profile wall at "] = " posted on your profile wall at "; +$a->strings['System error. Post not saved.'] = 'Systemfel. Inlägget sparades inte.'; +$a->strings['This message was sent to you by '] = 'Du har fått det här meddelandet av '; +$a->strings[', a member of the Friendika social network.'] = ', medlem i det sociala nätverket Friendika.'; +$a->strings['You may visit them online at'] = 'Besök online på'; +$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Kontakta avsändaren genom att svara på det här meddelandet om du inte vill ha sådana här meddelanden.'; +$a->strings['posted an update.'] = 'gjorde en uppdatering.'; +$a->strings['photo'] = 'foto'; +$a->strings['status'] = 'status'; +$a->strings['likes'] = 'gillar'; +$a->strings['doesn\'t like'] = 'ogillar'; +$a->strings['\'s'] = 's'; +$a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; +$a->strings['Visible to:'] = 'Synlig för:'; +$a->strings['Password reset requested at '] = 'Lösenordsåterställning begärd kl '; +$a->strings["Welcome back "] = "Välkommen tillbaka "; +$a->strings['Manage Identities and/or Pages'] = 'Ändra identitet eller sidor'; +$a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29"; +$a->strings['Select an identity to manage: '] = 'Välj vilken identitet du vill ändra: '; +$a->strings['Normal View'] = 'Normal vy'; +$a->strings['New Item View'] = 'New Item View'; +$a->strings['Share'] = 'Dela'; +$a->strings['Insert YouTube video'] = 'Infoga klipp från YouTube'; +$a->strings['Set your location'] = 'Ange plats'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Åtkomstinställningar'; +$a->strings['No such group'] = 'Gruppen finns inte'; +$a->strings['Group is empty'] = 'Gruppen är tom'; +$a->strings['Group: '] = 'Grupp: '; +$a->strings['View in context'] = 'Se i sitt sammanhang'; +$a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; +$a->strings['Discard'] = 'Kasta bort'; +$a->strings['Ignore'] = 'Ignorera'; +$a->strings['Show Ignored Requests'] = 'Show Ignored Requests'; +$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests'; +$a->strings['Claims to be known to you: '] = 'Hävdar att du vet vem han/hon är: '; +$a->strings['yes'] = 'ja'; +$a->strings['no'] = 'nej'; +$a->strings['Approve as: '] = 'Godkänn som: '; +$a->strings['Friend'] = 'Vän'; +$a->strings['Fan/Admirer'] = 'Fan/Beundrare'; +$a->strings['Notification type: '] = 'Notification type: '; +$a->strings['Friend/Connect Request'] = 'Friend/Connect Request'; +$a->strings['New Follower'] = 'New Follower'; +$a->strings['Approve'] = 'Godkänn'; +$a->strings['No notifications.'] = 'Inga aviseringar.'; +$a->strings['No registrations.'] = 'Inga registreringar.'; +$a->strings['Login failed.'] = 'Inloggningen misslyckades.'; +$a->strings['Photo Albums'] = 'Fotoalbum'; +$a->strings['Contact Photos'] = 'Contact Photos'; +$a->strings['Contact information unavailable'] = 'Kontaktinformationen är inte tillgänglig'; +$a->strings['Profile Photos'] = 'Profilbilder'; +$a->strings['Album not found.'] = 'Albumet finns inte.'; +$a->strings['Delete Album'] = 'Ta bort album'; +$a->strings['Delete Photo'] = 'Ta bort foto'; +$a->strings['was tagged in a'] = 'har taggats i'; +$a->strings['by'] = 'av'; +$a->strings['Image exceeds size limit of '] = 'Bilden överskrider den tillåtna storleken '; +$a->strings['Unable to process image.'] = 'Bilden kunde inte bahandlas.'; +$a->strings['Image upload failed.'] = 'Fel vid bilduppladdning.'; +$a->strings['No photos selected'] = 'Inga foton har valts'; +$a->strings['Upload Photos'] = 'Ladda upp foton'; +$a->strings['New album name: '] = 'Nytt album med namn: '; +$a->strings['or existing album name: '] = 'eller befintligt album med namn: '; +$a->strings['Permissions'] = 'Åtkomst'; +$a->strings['Edit Album'] = 'Redigera album'; +$a->strings['View Photo'] = 'Visa foto'; +$a->strings['Photo not available'] = 'Fotot är inte tillgängligt'; +$a->strings['Edit photo'] = 'Redigera foto'; +$a->strings['View Full Size'] = 'Visa fullstor'; +$a->strings['Tags: '] = 'Taggar: '; +$a->strings['[Remove any tag]'] = '[Remove any tag]'; +$a->strings['New album name'] = 'Nytt album med namn'; +$a->strings['Caption'] = 'Caption'; +$a->strings['Add a Tag'] = 'Lägg till tagg'; +$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping'; +$a->strings['Recent Photos'] = 'Nyligen tillagda foton'; +$a->strings['Upload New Photos'] = 'Ladda upp foton'; +$a->strings['View Album'] = 'Titta i album'; +$a->strings['Image uploaded but image cropping failed.'] = 'Bilden laddades upp men det blev fel när den skulle beskäras.'; +$a->strings['Image size reduction [175] failed.'] = 'Fel när bildstorlek skulle minskas [175].'; +$a->strings['Image size reduction [80] failed.'] = 'Fel när bildstorlek skulle minskas [80].'; +$a->strings['Image size reduction [48] failed.'] = 'Fel när bildstorlek skulle minskas [48].'; +$a->strings['Unable to process image'] = 'Det gick inte att behandla bilden'; +$a->strings['Image uploaded successfully.'] = 'Bilden har laddats upp.'; +$a->strings['Image size reduction [640] failed.'] = 'Fel när bildstorlek skulle minskas [640].'; +$a->strings['Profile Name is required.'] = 'Profilen måste ha ett namn.'; +$a->strings['Profile updated.'] = 'Profilen har uppdaterats.'; +$a->strings['Profile deleted.'] = 'Profilen har tagits bort.'; +$a->strings['Profile-'] = 'Profil-'; +$a->strings['New profile created.'] = 'En ny profil har skapats.'; +$a->strings['Profile unavailable to clone.'] = 'Det gick inte att klona profilen.'; +$a->strings['This is your public profile.
It may be visible to anybody using the internet.'] = 'Det här är din offentliga profil.
Den kan vara synlig för vem som helst på internet.'; +$a->strings['Age: '] = 'Ålder: '; +$a->strings['Profile Image'] = 'Profilbild'; +$a->strings['Invalid OpenID url'] = 'Ogiltig OpenID-URL'; +$a->strings['Please enter the required information.'] = 'Fyll i alla obligatoriska fält.'; +$a->strings['Please use a shorter name.'] = 'Välj ett kortare namn.'; +$a->strings['Name too short.'] = 'Namnet är för kort.'; +$a->strings["That doesn\'t appear to be your full \x28First Last\x29 name."] = "Du verkar inte ha angett ditt fullständiga namn."; +$a->strings['Your email domain is not among those allowed on this site.'] = 'Din epostdomän är inte tillåten på den här webbplatsen.'; +$a->strings['Cannot use that email.'] = 'Får inte använda den e-postadressen.'; +$a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Ditt användarnamn får bara innehålla "a-z", "0-9", "-" och "_", och måste dessutom börja med en bokstav.'; +$a->strings['Nickname is already registered. Please choose another.'] = 'Användarnamnet är upptaget. Välj ett annat.'; +$a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.'; +$a->strings['An error occurred during registration. Please try again.'] = 'Något gick fel vid registreringen. Försök igen.'; +$a->strings['An error occurred creating your default profile. Please try again.'] = 'An error occurred creating your default profile. Please try again.'; +$a->strings['Registration details for '] = 'Registration details for '; +$a->strings['Registration successful. Please check your email for further instructions.'] = 'Registrering klar. Kolla din e-post för vidare instruktioner.'; +$a->strings['Failed to send email message. Here is the message that failed.'] = 'Det gick inte att skicka e-brevet. Här är meddelandet som inte kunde skickas.'; +$a->strings['Your registration can not be processed.'] = 'Det går inte att behandla registreringen.'; +$a->strings['Registration request at '] = 'Registration request at '; +$a->strings['Your registration is pending approval by the site owner.'] = 'Din registrering inväntar godkännande av webbplatsens ägare.'; +$a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; +$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Om du inte känner till OpenID kan du lämna det fältet tomt och fylla i resten.'; +$a->strings["Your OpenID \x28optional\x29: "] = "Ditt OpenID \x28krävs ej\x29: "; +$a->strings['Members of this network prefer to communicate with real people who use their real names.'] = 'Medlemmarna i det här nätverket föredrar att kommunicera med riktiga människor som använder sina riktiga namn.'; +$a->strings['Include your profile in member directory?'] = 'Inkludera din profil i medlemskatalogen?'; +$a->strings['Registration'] = 'Registrering'; +$a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Ditt fullständiga namn ' . "\x28" . 't. ex. Karl Karlsson' . "\x29" . ': '; +$a->strings['Your Email Address: '] = 'Din e-postadress: '; +$a->strings['Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'nickname@$sitename\'.'] = 'Välj ett användarnamn. Det måste inledas med en bokstav. Din profiladress på den här webbplatsen blir \'användarnamn@$sitename\'.'; +$a->strings['Choose a nickname: '] = 'Välj ett användarnamn: '; +$a->strings['Please login.'] = 'Logga in.'; +$a->strings['Registration revoked for '] = 'Registration revoked for '; +$a->strings['Account approved.'] = 'Kontot har godkänts.'; +$a->strings['Remove My Account'] = 'Ta bort mitt konto'; +$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'Detta kommer att ta bort kontot helt och hållet. Efter att det är gjort går det inte att återställa.'; +$a->strings['Please enter your password for verification:'] = 'Ange lösenordet igen för jämförelse:'; +$a->strings['Passwords do not match. Password unchanged.'] = 'Lösenorden skiljer sig åt. Lösenordet ändras inte.'; +$a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Lösenordet får inte vara blankt. Lösenordet ändras inte.'; +$a->strings['Password changed.'] = 'Lösenordet har ändrats.'; +$a->strings['Password update failed. Please try again.'] = 'Det blev fel när lösenordet skulle ändras. Försök igen.'; +$a->strings[' Please use a shorter name.'] = ' Använd ett kortare namn.'; +$a->strings[' Name too short.'] = ' Namnet är för kort.'; +$a->strings[' Not valid email.'] = ' Ogiltig e-postadress.'; +$a->strings[' Cannot change to that email.'] = ' Ändring till den e-postadressen görs inte.'; +$a->strings['Settings updated.'] = 'Inställningarna har uppdaterats.'; +$a->strings['Plugin Settings'] = 'Plugin Settings'; +$a->strings['Account Settings'] = 'Kontoinställningar'; +$a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; +$a->strings['OpenID: '] = 'OpenID: '; +$a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Valfritt\x29 Tillåt inloggning med detta OpenID på det här kontot."; +$a->strings['Profile is not published.'] = 'Profilen är inte publicerad.'; +$a->strings['Default Post Permissions'] = 'Default Post Permissions'; +$a->strings['Tag removed'] = 'Taggen har tagits bort'; +$a->strings['Remove Item Tag'] = 'Ta bort tagg'; +$a->strings['Select a tag to remove: '] = 'Välj vilken tagg som ska tas bort: '; +$a->strings['Remove'] = 'Ta bort'; +$a->strings['No contacts.'] = 'Inga kontakter.'; +$a->strings['Visible To:'] = 'Synlig för:'; +$a->strings['Groups'] = 'Grupper'; +$a->strings['Except For:'] = 'Utom för:'; +$a->strings['Logged out.'] = 'Utloggad.'; +$a->strings['Unknown | Not categorised'] = 'Okänd | Inte kategoriserad'; +$a->strings['Block immediately'] = 'Spärra omedelbart'; +$a->strings['Shady, spammer, self-marketer'] = 'Suspekt, spammare, reklamspridare'; +$a->strings['Known to me, but no opinion'] = 'Jag vet vem det är, men har ingen åsikt'; +$a->strings['OK, probably harmless'] = 'OK, antagligen harmlös'; +$a->strings['Reputable, has my trust'] = 'Pålitlig, jag litar på personen'; +$a->strings['Frequently'] = 'Ofta'; +$a->strings['Hourly'] = 'Varje timme'; +$a->strings['Twice daily'] = 'Två gånger om dagen'; +$a->strings['Daily'] = 'Dagligen'; +$a->strings['Weekly'] = 'Veckovis'; +$a->strings['Monthly'] = 'Månadsvis'; +$a->strings['Miscellaneous'] = 'Blandat'; +$a->strings['less than a second ago'] = 'för mindre än en sekund sedan'; +$a->strings['year'] = 'år'; +$a->strings['years'] = 'år'; +$a->strings['month'] = 'månad'; +$a->strings['months'] = 'månader'; +$a->strings['week'] = 'vecka'; +$a->strings['weeks'] = 'veckor'; +$a->strings['day'] = 'dag'; +$a->strings['days'] = 'dagar'; +$a->strings['hour'] = 'timme'; +$a->strings['hours'] = 'timmar'; +$a->strings['minute'] = 'minut'; +$a->strings['minutes'] = 'minuter'; +$a->strings['second'] = 'sekund'; +$a->strings['seconds'] = 'sekunder'; +$a->strings[' ago'] = ' sedan'; +$a->strings['Create a new group'] = 'Skapa ny grupp'; +$a->strings['Everybody'] = 'Alla'; +$a->strings['Birthday:'] = 'Födelsedatum:'; +$a->strings['Home'] = 'Hem'; +$a->strings['Apps'] = 'Apps'; +$a->strings['Directory'] = 'Katalog'; +$a->strings['Network'] = 'Nätverk'; +$a->strings['Notifications'] = 'Aviseringar'; +$a->strings['Manage'] = 'Hantera'; +$a->strings['Settings'] = 'Inställningar'; +$a->strings['Profiles'] = 'Profiler'; +$a->strings['Embedding disabled'] = 'Embedding disabled'; +$a->strings['Male'] = 'Man'; +$a->strings['Female'] = 'Kvinna'; +$a->strings['Currently Male'] = 'För närvarande man'; +$a->strings['Currently Female'] = 'För närvarande kvinna'; +$a->strings['Mostly Male'] = 'Mestadels man'; +$a->strings['Mostly Female'] = 'Mestadels kvinna'; +$a->strings['Transgender'] = 'Transgender'; +$a->strings['Intersex'] = 'Intersex'; +$a->strings['Transsexual'] = 'Transsexuell'; +$a->strings['Hermaphrodite'] = 'Hermafrodit'; +$a->strings['Neuter'] = 'Neuter'; +$a->strings['Non-specific'] = 'Non-specific'; +$a->strings['Other'] = 'Annat'; +$a->strings['Undecided'] = 'Undecided'; +$a->strings['Males'] = 'Males'; +$a->strings['Females'] = 'Females'; +$a->strings['Gay'] = 'Bög'; +$a->strings['Lesbian'] = 'Lesbisk'; +$a->strings['No Preference'] = 'No Preference'; +$a->strings['Bisexual'] = 'Bisexuell'; +$a->strings['Autosexual'] = 'Autosexual'; +$a->strings['Abstinent'] = 'Abstinent'; +$a->strings['Virgin'] = 'Oskuld'; +$a->strings['Deviant'] = 'Avvikande'; +$a->strings['Fetish'] = 'Fetish'; +$a->strings['Oodles'] = 'Oodles'; +$a->strings['Nonsexual'] = 'Nonsexual'; +$a->strings['Single'] = 'Singel'; +$a->strings['Lonely'] = 'Ensam'; +$a->strings['Available'] = 'Tillgänglig'; +$a->strings['Unavailable'] = 'Upptagen'; +$a->strings['Dating'] = 'Dejtar'; +$a->strings['Unfaithful'] = 'Unfaithful'; +$a->strings['Sex Addict'] = 'Sexmissbrukare'; +$a->strings['Friends'] = 'Vänner'; +$a->strings['Friends/Benefits'] = 'Friends/Benefits'; +$a->strings['Casual'] = 'Casual'; +$a->strings['Engaged'] = 'Förlovad'; +$a->strings['Married'] = 'Gift'; +$a->strings['Partners'] = 'I partnerskap'; +$a->strings['Cohabiting'] = 'Cohabiting'; +$a->strings['Happy'] = 'Glad'; +$a->strings['Not Looking'] = 'Letar inte'; +$a->strings['Swinger'] = 'Swinger'; +$a->strings['Betrayed'] = 'Bedragen'; +$a->strings['Separated'] = 'Separerat'; +$a->strings['Unstable'] = 'Unstable'; +$a->strings['Divorced'] = 'Skiljd'; +$a->strings['Widowed'] = 'Widowed'; +$a->strings['Uncertain'] = 'Uncertain'; +$a->strings['Complicated'] = 'Komplicerat'; +$a->strings['Don\'t care'] = 'Bryr mig inte'; +$a->strings['Ask me'] = 'Fråga mig'; +$a->strings['Facebook disabled'] = 'Facebook disabled'; +$a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.'; +$a->strings['Facebook Connect'] = 'Facebook Connect'; +$a->strings['Install Facebook post connector'] = 'Install Facebook post connector'; +$a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector'; +$a->strings['Facebook'] = 'Facebook'; +$a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings'; +$a->strings['Post to Facebook'] = 'Lägg in på Facebook'; +$a->strings['Image: '] = 'Bild: '; +$a->strings['Select files to upload: '] = 'Välj filer att ladda upp: '; +$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Använd följande bara om javauppladdaren ovanför inte startar.'; +$a->strings['Upload a file'] = 'Ladda upp fil'; +$a->strings['Drop files here to upload'] = 'Dra filer som ska laddas upp hit'; +$a->strings['Failed'] = 'Misslyckades'; +$a->strings['No files were uploaded.'] = 'Inga filer laddades upp.'; +$a->strings['Uploaded file is empty'] = 'Den uppladdade filen är tom'; +$a->strings['Uploaded file is too large'] = 'Den uppladdade filen är för stor'; +$a->strings['File has an invalid extension, it should be one of '] = 'Otillåten filnamnsändelse, det ska vara '; +$a->strings['Upload was cancelled, or server error encountered'] = 'Serverfel eller avbruten uppladdning'; +$a->strings['Randplace Settings'] = 'Randplace Settings'; +$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; +$a->strings['Post to StatusNet'] = 'Lägg in på StatusNet'; +$a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; +$a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'; +$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key'; +$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret'; +$a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x28remember the trailing /\x29"; +$a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet.'; +$a->strings['Log in with StatusNet'] = 'Logga in med StatusNet'; +$a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; +$a->strings['Currently connected to: '] = 'Ansluten till: '; +$a->strings['If enabled all your public postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your public postings will be posted to the associated StatusNet account as well.'; +$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; +$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; +$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tredimensionellt luffarschack'; +$a->strings['3D Tic-Tac-Toe'] = '3D-luffarschack'; +$a->strings['New game'] = 'Ny spelomgång'; +$a->strings['New game with handicap'] = 'Ny spelomgång med handikapp'; +$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Det tredimensionella luffarschacket är precis som vanligt luffarschack förutom att det spelas i flera nivåer samtidigt. '; +$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Här är det tre nivåer. Man vinner om man får tre i rad på vilken nivå som helst, eller uppåt, nedåt eller diagonalt på flera nivåer.'; +$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Om man spelar med handikapp så stängs mittenpositionen på mittennivån av eftersom spelare som väljer den positionen ofta får övertaget.'; +$a->strings['You go first...'] = 'Du börjar...'; +$a->strings['I\'m going first this time...'] = 'Jag börjar den här gången...'; +$a->strings['You won!'] = 'Du vann!'; +$a->strings['"Cat" game!'] = '"Cat" game!'; +$a->strings['I won!'] = 'Jag vann!'; +$a->strings['Post to Twitter'] = 'Lägg in på Twitter'; +$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings'; +$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.'; +$a->strings['At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'] = 'At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter.'; +$a->strings['Copy the PIN from Twitter here'] = 'Ange PIN-koden från Twitter här'; +$a->strings['If enabled all your public postings will be posted to the associated Twitter account as well.'] = 'If enabled all your public postings will be posted to the associated Twitter account as well.'; +$a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter'; +$a->strings['Africa/Abidjan'] = 'Afrika/Abidjan'; +$a->strings['Africa/Accra'] = 'Afrika/Accra'; +$a->strings['Africa/Addis_Ababa'] = 'Afrika/Addis_Ababa'; +$a->strings['Africa/Algiers'] = 'Afrika/Algiers'; +$a->strings['Africa/Asmara'] = 'Afrika/Asmara'; +$a->strings['Africa/Asmera'] = 'Afrika/Asmera'; +$a->strings['Africa/Bamako'] = 'Afrika/Bamako'; +$a->strings['Africa/Bangui'] = 'Afrika/Bangui'; +$a->strings['Africa/Banjul'] = 'Afrika/Banjul'; +$a->strings['Africa/Bissau'] = 'Afrika/Bissau'; +$a->strings['Africa/Blantyre'] = 'Afrika/Blantyre'; +$a->strings['Africa/Brazzaville'] = 'Afrika/Brazzaville'; +$a->strings['Africa/Bujumbura'] = 'Afrika/Bujumbura'; +$a->strings['Africa/Cairo'] = 'Afrika/Cairo'; +$a->strings['Africa/Casablanca'] = 'Afrika/Casablanca'; +$a->strings['Africa/Ceuta'] = 'Afrika/Ceuta'; +$a->strings['Africa/Conakry'] = 'Afrika/Conakry'; +$a->strings['Africa/Dakar'] = 'Afrika/Dakar'; +$a->strings['Africa/Dar_es_Salaam'] = 'Afrika/Dar_es_Salaam'; +$a->strings['Africa/Djibouti'] = 'Afrika/Djibouti'; +$a->strings['Africa/Douala'] = 'Afrika/Douala'; +$a->strings['Africa/El_Aaiun'] = 'Afrika/El_Aaiun'; +$a->strings['Africa/Freetown'] = 'Afrika/Freetown'; +$a->strings['Africa/Gaborone'] = 'Afrika/Gaborone'; +$a->strings['Africa/Harare'] = 'Afrika/Harare'; +$a->strings['Africa/Johannesburg'] = 'Afrika/Johannesburg'; +$a->strings['Africa/Kampala'] = 'Afrika/Kampala'; +$a->strings['Africa/Khartoum'] = 'Afrika/Khartoum'; +$a->strings['Africa/Kigali'] = 'Afrika/Kigali'; +$a->strings['Africa/Kinshasa'] = 'Afrika/Kinshasa'; +$a->strings['Africa/Lagos'] = 'Afrika/Lagos'; +$a->strings['Africa/Libreville'] = 'Afrika/Libreville'; +$a->strings['Africa/Lome'] = 'Afrika/Lome'; +$a->strings['Africa/Luanda'] = 'Afrika/Luanda'; +$a->strings['Africa/Lubumbashi'] = 'Afrika/Lubumbashi'; +$a->strings['Africa/Lusaka'] = 'Afrika/Lusaka'; +$a->strings['Africa/Malabo'] = 'Afrika/Malabo'; +$a->strings['Africa/Maputo'] = 'Afrika/Maputo'; +$a->strings['Africa/Maseru'] = 'Afrika/Maseru'; +$a->strings['Africa/Mbabane'] = 'Afrika/Mbabane'; +$a->strings['Africa/Mogadishu'] = 'Afrika/Mogadishu'; +$a->strings['Africa/Monrovia'] = 'Afrika/Monrovia'; +$a->strings['Africa/Nairobi'] = 'Afrika/Nairobi'; +$a->strings['Africa/Ndjamena'] = 'Afrika/Ndjamena'; +$a->strings['Africa/Niamey'] = 'Afrika/Niamey'; +$a->strings['Africa/Nouakchott'] = 'Afrika/Nouakchott'; +$a->strings['Africa/Ouagadougou'] = 'Afrika/Ouagadougou'; +$a->strings['Africa/Porto-Novo'] = 'Afrika/Porto-Novo'; +$a->strings['Africa/Sao_Tome'] = 'Afrika/Sao_Tome'; +$a->strings['Africa/Timbuktu'] = 'Afrika/Timbuktu'; +$a->strings['Africa/Tripoli'] = 'Afrika/Tripoli'; +$a->strings['Africa/Tunis'] = 'Afrika/Tunis'; +$a->strings['Africa/Windhoek'] = 'Afrika/Windhoek'; +$a->strings['America/Adak'] = 'Amerika/Adak'; +$a->strings['America/Anchorage'] = 'Amerika/Anchorage'; +$a->strings['America/Anguilla'] = 'Amerika/Anguilla'; +$a->strings['America/Antigua'] = 'Amerika/Antigua'; +$a->strings['America/Araguaina'] = 'Amerika/Araguaina'; +$a->strings['America/Argentina/Buenos_Aires'] = 'Amerika/Argentina/Buenos_Aires'; +$a->strings['America/Argentina/Catamarca'] = 'Amerika/Argentina/Catamarca'; +$a->strings['America/Argentina/ComodRivadavia'] = 'Amerika/Argentina/ComodRivadavia'; +$a->strings['America/Argentina/Cordoba'] = 'Amerika/Argentina/Cordoba'; +$a->strings['America/Argentina/Jujuy'] = 'Amerika/Argentina/Jujuy'; +$a->strings['America/Argentina/La_Rioja'] = 'Amerika/Argentina/La_Rioja'; +$a->strings['America/Argentina/Mendoza'] = 'Amerika/Argentina/Mendoza'; +$a->strings['America/Argentina/Rio_Gallegos'] = 'Amerika/Argentina/Rio_Gallegos'; +$a->strings['America/Argentina/Salta'] = 'Amerika/Argentina/Salta'; +$a->strings['America/Argentina/San_Juan'] = 'Amerika/Argentina/San_Juan'; +$a->strings['America/Argentina/San_Luis'] = 'Amerika/Argentina/San_Luis'; +$a->strings['America/Argentina/Tucuman'] = 'Amerika/Argentina/Tucuman'; +$a->strings['America/Argentina/Ushuaia'] = 'Amerika/Argentina/Ushuaia'; +$a->strings['America/Aruba'] = 'Amerika/Aruba'; +$a->strings['America/Asuncion'] = 'Amerika/Asuncion'; +$a->strings['America/Atikokan'] = 'Amerika/Atikokan'; +$a->strings['America/Atka'] = 'Amerika/Atka'; +$a->strings['America/Bahia'] = 'Amerika/Bahia'; +$a->strings['America/Barbados'] = 'Amerika/Barbados'; +$a->strings['America/Belem'] = 'Amerika/Belem'; +$a->strings['America/Belize'] = 'Amerika/Belize'; +$a->strings['America/Blanc-Sablon'] = 'Amerika/Blanc-Sablon'; +$a->strings['America/Boa_Vista'] = 'Amerika/Boa_Vista'; +$a->strings['America/Bogota'] = 'Amerika/Bogota'; +$a->strings['America/Boise'] = 'Amerika/Boise'; +$a->strings['America/Buenos_Aires'] = 'Amerika/Buenos_Aires'; +$a->strings['America/Cambridge_Bay'] = 'Amerika/Cambridge_Bay'; +$a->strings['America/Campo_Grande'] = 'Amerika/Campo_Grande'; +$a->strings['America/Cancun'] = 'Amerika/Cancun'; +$a->strings['America/Caracas'] = 'Amerika/Caracas'; +$a->strings['America/Catamarca'] = 'Amerika/Catamarca'; +$a->strings['America/Cayenne'] = 'Amerika/Cayenne'; +$a->strings['America/Cayman'] = 'Amerika/Cayman'; +$a->strings['America/Chicago'] = 'Amerika/Chicago'; +$a->strings['America/Chihuahua'] = 'Amerika/Chihuahua'; +$a->strings['America/Coral_Harbour'] = 'Amerika/Coral_Harbour'; +$a->strings['America/Cordoba'] = 'Amerika/Cordoba'; +$a->strings['America/Costa_Rica'] = 'Amerika/Costa_Rica'; +$a->strings['America/Cuiaba'] = 'Amerika/Cuiaba'; +$a->strings['America/Curacao'] = 'Amerika/Curacao'; +$a->strings['America/Danmarkshavn'] = 'Amerika/Danmarkshavn'; +$a->strings['America/Dawson'] = 'Amerika/Dawson'; +$a->strings['America/Dawson_Creek'] = 'Amerika/Dawson_Creek'; +$a->strings['America/Denver'] = 'Amerika/Denver'; +$a->strings['America/Detroit'] = 'Amerika/Detroit'; +$a->strings['America/Dominica'] = 'Amerika/Dominica'; +$a->strings['America/Edmonton'] = 'Amerika/Edmonton'; +$a->strings['America/Eirunepe'] = 'Amerika/Eirunepe'; +$a->strings['America/El_Salvador'] = 'Amerika/El_Salvador'; +$a->strings['America/Ensenada'] = 'Amerika/Ensenada'; +$a->strings['America/Fort_Wayne'] = 'Amerika/Fort_Wayne'; +$a->strings['America/Fortaleza'] = 'Amerika/Fortaleza'; +$a->strings['America/Glace_Bay'] = 'Amerika/Glace_Bay'; +$a->strings['America/Godthab'] = 'Amerika/Godthab'; +$a->strings['America/Goose_Bay'] = 'Amerika/Goose_Bay'; +$a->strings['America/Grand_Turk'] = 'Amerika/Grand_Turk'; +$a->strings['America/Grenada'] = 'Amerika/Grenada'; +$a->strings['America/Guadeloupe'] = 'Amerika/Guadeloupe'; +$a->strings['America/Guatemala'] = 'Amerika/Guatemala'; +$a->strings['America/Guayaquil'] = 'Amerika/Guayaquil'; +$a->strings['America/Guyana'] = 'Amerika/Guyana'; +$a->strings['America/Halifax'] = 'Amerika/Halifax'; +$a->strings['America/Havana'] = 'Amerika/Havana'; +$a->strings['America/Hermosillo'] = 'Amerika/Hermosillo'; +$a->strings['America/Indiana/Indianapolis'] = 'Amerika/Indiana/Indianapolis'; +$a->strings['America/Indiana/Knox'] = 'Amerika/Indiana/Knox'; +$a->strings['America/Indiana/Marengo'] = 'Amerika/Indiana/Marengo'; +$a->strings['America/Indiana/Petersburg'] = 'Amerika/Indiana/Petersburg'; +$a->strings['America/Indiana/Tell_City'] = 'Amerika/Indiana/Tell_City'; +$a->strings['America/Indiana/Vevay'] = 'Amerika/Indiana/Vevay'; +$a->strings['America/Indiana/Vincennes'] = 'Amerika/Indiana/Vincennes'; +$a->strings['America/Indiana/Winamac'] = 'Amerika/Indiana/Winamac'; +$a->strings['America/Indianapolis'] = 'Amerika/Indianapolis'; +$a->strings['America/Inuvik'] = 'Amerika/Inuvik'; +$a->strings['America/Iqaluit'] = 'Amerika/Iqaluit'; +$a->strings['America/Jamaica'] = 'Amerika/Jamaica'; +$a->strings['America/Jujuy'] = 'Amerika/Jujuy'; +$a->strings['America/Juneau'] = 'Amerika/Juneau'; +$a->strings['America/Kentucky/Louisville'] = 'Amerika/Kentucky/Louisville'; +$a->strings['America/Kentucky/Monticello'] = 'Amerika/Kentucky/Monticello'; +$a->strings['America/Knox_IN'] = 'Amerika/Knox_IN'; +$a->strings['America/La_Paz'] = 'Amerika/La_Paz'; +$a->strings['America/Lima'] = 'Amerika/Lima'; +$a->strings['America/Los_Angeles'] = 'Amerika/Los_Angeles'; +$a->strings['America/Louisville'] = 'Amerika/Louisville'; +$a->strings['America/Maceio'] = 'Amerika/Maceio'; +$a->strings['America/Managua'] = 'Amerika/Managua'; +$a->strings['America/Manaus'] = 'Amerika/Manaus'; +$a->strings['America/Marigot'] = 'Amerika/Marigot'; +$a->strings['America/Martinique'] = 'Amerika/Martinique'; +$a->strings['America/Matamoros'] = 'Amerika/Matamoros'; +$a->strings['America/Mazatlan'] = 'Amerika/Mazatlan'; +$a->strings['America/Mendoza'] = 'Amerika/Mendoza'; +$a->strings['America/Menominee'] = 'Amerika/Menominee'; +$a->strings['America/Merida'] = 'Amerika/Merida'; +$a->strings['America/Mexico_City'] = 'Amerika/Mexico_City'; +$a->strings['America/Miquelon'] = 'Amerika/Miquelon'; +$a->strings['America/Moncton'] = 'Amerika/Moncton'; +$a->strings['America/Monterrey'] = 'Amerika/Monterrey'; +$a->strings['America/Montevideo'] = 'Amerika/Montevideo'; +$a->strings['America/Montreal'] = 'Amerika/Montreal'; +$a->strings['America/Montserrat'] = 'Amerika/Montserrat'; +$a->strings['America/Nassau'] = 'Amerika/Nassau'; +$a->strings['America/New_York'] = 'Amerika/New_York'; +$a->strings['America/Nipigon'] = 'Amerika/Nipigon'; +$a->strings['America/Nome'] = 'Amerika/Nome'; +$a->strings['America/Noronha'] = 'Amerika/Noronha'; +$a->strings['America/North_Dakota/Center'] = 'Amerika/North_Dakota/Center'; +$a->strings['America/North_Dakota/New_Salem'] = 'Amerika/North_Dakota/New_Salem'; +$a->strings['America/Ojinaga'] = 'Amerika/Ojinaga'; +$a->strings['America/Panama'] = 'Amerika/Panama'; +$a->strings['America/Pangnirtung'] = 'Amerika/Pangnirtung'; +$a->strings['America/Paramaribo'] = 'Amerika/Paramaribo'; +$a->strings['America/Phoenix'] = 'Amerika/Phoenix'; +$a->strings['America/Port-au-Prince'] = 'Amerika/Port-au-Prince'; +$a->strings['America/Port_of_Spain'] = 'Amerika/Port_of_Spain'; +$a->strings['America/Porto_Acre'] = 'Amerika/Porto_Acre'; +$a->strings['America/Porto_Velho'] = 'Amerika/Porto_Velho'; +$a->strings['America/Puerto_Rico'] = 'Amerika/Puerto_Rico'; +$a->strings['America/Rainy_River'] = 'Amerika/Rainy_River'; +$a->strings['America/Rankin_Inlet'] = 'Amerika/Rankin_Inlet'; +$a->strings['America/Recife'] = 'Amerika/Recife'; +$a->strings['America/Regina'] = 'Amerika/Regina'; +$a->strings['America/Resolute'] = 'Amerika/Resolute'; +$a->strings['America/Rio_Branco'] = 'Amerika/Rio_Branco'; +$a->strings['America/Rosario'] = 'Amerika/Rosario'; +$a->strings['America/Santa_Isabel'] = 'Amerika/Santa_Isabel'; +$a->strings['America/Santarem'] = 'Amerika/Santarem'; +$a->strings['America/Santiago'] = 'Amerika/Santiago'; +$a->strings['America/Santo_Domingo'] = 'Amerika/Santo_Domingo'; +$a->strings['America/Sao_Paulo'] = 'Amerika/Sao_Paulo'; +$a->strings['America/Scoresbysund'] = 'Amerika/Scoresbysund'; +$a->strings['America/Shiprock'] = 'Amerika/Shiprock'; +$a->strings['America/St_Barthelemy'] = 'Amerika/St_Barthelemy'; +$a->strings['America/St_Johns'] = 'Amerika/St_Johns'; +$a->strings['America/St_Kitts'] = 'Amerika/St_Kitts'; +$a->strings['America/St_Lucia'] = 'Amerika/St_Lucia'; +$a->strings['America/St_Thomas'] = 'Amerika/St_Thomas'; +$a->strings['America/St_Vincent'] = 'Amerika/St_Vincent'; +$a->strings['America/Swift_Current'] = 'Amerika/Swift_Current'; +$a->strings['America/Tegucigalpa'] = 'Amerika/Tegucigalpa'; +$a->strings['America/Thule'] = 'Amerika/Thule'; +$a->strings['America/Thunder_Bay'] = 'Amerika/Thunder_Bay'; +$a->strings['America/Tijuana'] = 'Amerika/Tijuana'; +$a->strings['America/Toronto'] = 'Amerika/Toronto'; +$a->strings['America/Tortola'] = 'Amerika/Tortola'; +$a->strings['America/Vancouver'] = 'Amerika/Vancouver'; +$a->strings['America/Virgin'] = 'Amerika/Virgin'; +$a->strings['America/Whitehorse'] = 'Amerika/Whitehorse'; +$a->strings['America/Winnipeg'] = 'Amerika/Winnipeg'; +$a->strings['America/Yakutat'] = 'Amerika/Yakutat'; +$a->strings['America/Yellowknife'] = 'Amerika/Yellowknife'; +$a->strings['Antarctica/Casey'] = 'Antarctica/Casey'; +$a->strings['Antarctica/Davis'] = 'Antarctica/Davis'; +$a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville'; +$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie'; +$a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson'; +$a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo'; +$a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer'; +$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera'; +$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole'; +$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa'; +$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok'; +$a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen'; +$a->strings['Asia/Aden'] = 'Asien/Aden'; +$a->strings['Asia/Almaty'] = 'Asien/Almaty'; +$a->strings['Asia/Amman'] = 'Asien/Amman'; +$a->strings['Asia/Anadyr'] = 'Asien/Anadyr'; +$a->strings['Asia/Aqtau'] = 'Asien/Aqtau'; +$a->strings['Asia/Aqtobe'] = 'Asien/Aqtobe'; +$a->strings['Asia/Ashgabat'] = 'Asien/Ashgabat'; +$a->strings['Asia/Ashkhabad'] = 'Asien/Ashkhabad'; +$a->strings['Asia/Baghdad'] = 'Asien/Baghdad'; +$a->strings['Asia/Bahrain'] = 'Asien/Bahrain'; +$a->strings['Asia/Baku'] = 'Asien/Baku'; +$a->strings['Asia/Bangkok'] = 'Asien/Bangkok'; +$a->strings['Asia/Beirut'] = 'Asien/Beirut'; +$a->strings['Asia/Bishkek'] = 'Asien/Bishkek'; +$a->strings['Asia/Brunei'] = 'Asien/Brunei'; +$a->strings['Asia/Calcutta'] = 'Asien/Calcutta'; +$a->strings['Asia/Choibalsan'] = 'Asien/Choibalsan'; +$a->strings['Asia/Chongqing'] = 'Asien/Chongqing'; +$a->strings['Asia/Chungking'] = 'Asien/Chungking'; +$a->strings['Asia/Colombo'] = 'Asien/Colombo'; +$a->strings['Asia/Dacca'] = 'Asien/Dacca'; +$a->strings['Asia/Damascus'] = 'Asien/Damascus'; +$a->strings['Asia/Dhaka'] = 'Asien/Dhaka'; +$a->strings['Asia/Dili'] = 'Asien/Dili'; +$a->strings['Asia/Dubai'] = 'Asien/Dubai'; +$a->strings['Asia/Dushanbe'] = 'Asien/Dushanbe'; +$a->strings['Asia/Gaza'] = 'Asien/Gaza'; +$a->strings['Asia/Harbin'] = 'Asien/Harbin'; +$a->strings['Asia/Ho_Chi_Minh'] = 'Asien/Ho_Chi_Minh'; +$a->strings['Asia/Hong_Kong'] = 'Asien/Hong_Kong'; +$a->strings['Asia/Hovd'] = 'Asien/Hovd'; +$a->strings['Asia/Irkutsk'] = 'Asien/Irkutsk'; +$a->strings['Asia/Istanbul'] = 'Asien/Istanbul'; +$a->strings['Asia/Jakarta'] = 'Asien/Jakarta'; +$a->strings['Asia/Jayapura'] = 'Asien/Jayapura'; +$a->strings['Asia/Jerusalem'] = 'Asien/Jerusalem'; +$a->strings['Asia/Kabul'] = 'Asien/Kabul'; +$a->strings['Asia/Kamchatka'] = 'Asien/Kamchatka'; +$a->strings['Asia/Karachi'] = 'Asien/Karachi'; +$a->strings['Asia/Kashgar'] = 'Asien/Kashgar'; +$a->strings['Asia/Kathmandu'] = 'Asien/Kathmandu'; +$a->strings['Asia/Katmandu'] = 'Asien/Katmandu'; +$a->strings['Asia/Kolkata'] = 'Asien/Kolkata'; +$a->strings['Asia/Krasnoyarsk'] = 'Asien/Krasnoyarsk'; +$a->strings['Asia/Kuala_Lumpur'] = 'Asien/Kuala_Lumpur'; +$a->strings['Asia/Kuching'] = 'Asien/Kuching'; +$a->strings['Asia/Kuwait'] = 'Asien/Kuwait'; +$a->strings['Asia/Macao'] = 'Asien/Macao'; +$a->strings['Asia/Macau'] = 'Asien/Macau'; +$a->strings['Asia/Magadan'] = 'Asien/Magadan'; +$a->strings['Asia/Makassar'] = 'Asien/Makassar'; +$a->strings['Asia/Manila'] = 'Asien/Manila'; +$a->strings['Asia/Muscat'] = 'Asien/Muscat'; +$a->strings['Asia/Nicosia'] = 'Asien/Nicosia'; +$a->strings['Asia/Novokuznetsk'] = 'Asien/Novokuznetsk'; +$a->strings['Asia/Novosibirsk'] = 'Asien/Novosibirsk'; +$a->strings['Asia/Omsk'] = 'Asien/Omsk'; +$a->strings['Asia/Oral'] = 'Asien/Oral'; +$a->strings['Asia/Phnom_Penh'] = 'Asien/Phnom_Penh'; +$a->strings['Asia/Pontianak'] = 'Asien/Pontianak'; +$a->strings['Asia/Pyongyang'] = 'Asien/Pyongyang'; +$a->strings['Asia/Qatar'] = 'Asien/Qatar'; +$a->strings['Asia/Qyzylorda'] = 'Asien/Qyzylorda'; +$a->strings['Asia/Rangoon'] = 'Asien/Rangoon'; +$a->strings['Asia/Riyadh'] = 'Asien/Riyadh'; +$a->strings['Asia/Saigon'] = 'Asien/Saigon'; +$a->strings['Asia/Sakhalin'] = 'Asien/Sakhalin'; +$a->strings['Asia/Samarkand'] = 'Asien/Samarkand'; +$a->strings['Asia/Seoul'] = 'Asien/Seoul'; +$a->strings['Asia/Shanghai'] = 'Asien/Shanghai'; +$a->strings['Asia/Singapore'] = 'Asien/Singapore'; +$a->strings['Asia/Taipei'] = 'Asien/Taipei'; +$a->strings['Asia/Tashkent'] = 'Asien/Tashkent'; +$a->strings['Asia/Tbilisi'] = 'Asien/Tbilisi'; +$a->strings['Asia/Tehran'] = 'Asien/Tehran'; +$a->strings['Asia/Tel_Aviv'] = 'Asien/Tel_Aviv'; +$a->strings['Asia/Thimbu'] = 'Asien/Thimbu'; +$a->strings['Asia/Thimphu'] = 'Asien/Thimphu'; +$a->strings['Asia/Tokyo'] = 'Asien/Tokyo'; +$a->strings['Asia/Ujung_Pandang'] = 'Asien/Ujung_Pandang'; +$a->strings['Asia/Ulaanbaatar'] = 'Asien/Ulaanbaatar'; +$a->strings['Asia/Ulan_Bator'] = 'Asien/Ulan_Bator'; +$a->strings['Asia/Urumqi'] = 'Asien/Urumqi'; +$a->strings['Asia/Vientiane'] = 'Asien/Vientiane'; +$a->strings['Asia/Vladivostok'] = 'Asien/Vladivostok'; +$a->strings['Asia/Yakutsk'] = 'Asien/Yakutsk'; +$a->strings['Asia/Yekaterinburg'] = 'Asien/Yekaterinburg'; +$a->strings['Asia/Yerevan'] = 'Asien/Yerevan'; +$a->strings['Atlantic/Azores'] = 'Atlantic/Azores'; +$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda'; +$a->strings['Atlantic/Canary'] = 'Atlantic/Canary'; +$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde'; +$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe'; +$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe'; +$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen'; +$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira'; +$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik'; +$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia'; +$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena'; +$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley'; +$a->strings['Australia/ACT'] = 'Australien/ACT'; +$a->strings['Australia/Adelaide'] = 'Australien/Adelaide'; +$a->strings['Australia/Brisbane'] = 'Australien/Brisbane'; +$a->strings['Australia/Broken_Hill'] = 'Australien/Broken_Hill'; +$a->strings['Australia/Canberra'] = 'Australien/Canberra'; +$a->strings['Australia/Currie'] = 'Australien/Currie'; +$a->strings['Australia/Darwin'] = 'Australien/Darwin'; +$a->strings['Australia/Eucla'] = 'Australien/Eucla'; +$a->strings['Australia/Hobart'] = 'Australien/Hobart'; +$a->strings['Australia/LHI'] = 'Australien/LHI'; +$a->strings['Australia/Lindeman'] = 'Australien/Lindeman'; +$a->strings['Australia/Lord_Howe'] = 'Australien/Lord_Howe'; +$a->strings['Australia/Melbourne'] = 'Australien/Melbourne'; +$a->strings['Australia/North'] = 'Australien/North'; +$a->strings['Australia/NSW'] = 'Australien/NSW'; +$a->strings['Australia/Perth'] = 'Australien/Perth'; +$a->strings['Australia/Queensland'] = 'Australien/Queensland'; +$a->strings['Australia/South'] = 'Australien/South'; +$a->strings['Australia/Sydney'] = 'Australien/Sydney'; +$a->strings['Australia/Tasmania'] = 'Australien/Tasmania'; +$a->strings['Australia/Victoria'] = 'Australien/Victoria'; +$a->strings['Australia/West'] = 'Australien/West'; +$a->strings['Australia/Yancowinna'] = 'Australien/Yancowinna'; +$a->strings['Brazil/Acre'] = 'Brasilien/Acre'; +$a->strings['Brazil/DeNoronha'] = 'Brasilien/DeNoronha'; +$a->strings['Brazil/East'] = 'Brasilien/East'; +$a->strings['Brazil/West'] = 'Brasilien/West'; +$a->strings['Canada/Atlantic'] = 'Kanada/Atlantic'; +$a->strings['Canada/Central'] = 'Kanada/Central'; +$a->strings['Canada/East-Saskatchewan'] = 'Kanada/East-Saskatchewan'; +$a->strings['Canada/Eastern'] = 'Kanada/Eastern'; +$a->strings['Canada/Mountain'] = 'Kanada/Mountain'; +$a->strings['Canada/Newfoundland'] = 'Kanada/Newfoundland'; +$a->strings['Canada/Pacific'] = 'Kanada/Pacific'; +$a->strings['Canada/Saskatchewan'] = 'Kanada/Saskatchewan'; +$a->strings['Canada/Yukon'] = 'Kanada/Yukon'; +$a->strings['CET'] = 'CET'; +$a->strings['Chile/Continental'] = 'Chile/Continental'; +$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland'; +$a->strings['CST6CDT'] = 'CST6CDT'; +$a->strings['Cuba'] = 'Cuba'; +$a->strings['EET'] = 'EET'; +$a->strings['Egypt'] = 'Egypten'; +$a->strings['Eire'] = 'Eire'; +$a->strings['EST'] = 'EST'; +$a->strings['EST5EDT'] = 'EST5EDT'; +$a->strings['Etc/GMT'] = 'Etc/GMT'; +$a->strings['Etc/GMT+0'] = 'Etc/GMT+0'; +$a->strings['Etc/GMT+1'] = 'Etc/GMT+1'; +$a->strings['Etc/GMT+10'] = 'Etc/GMT+10'; +$a->strings['Etc/GMT+11'] = 'Etc/GMT+11'; +$a->strings['Etc/GMT+12'] = 'Etc/GMT+12'; +$a->strings['Etc/GMT+2'] = 'Etc/GMT+2'; +$a->strings['Etc/GMT+3'] = 'Etc/GMT+3'; +$a->strings['Etc/GMT+4'] = 'Etc/GMT+4'; +$a->strings['Etc/GMT+5'] = 'Etc/GMT+5'; +$a->strings['Etc/GMT+6'] = 'Etc/GMT+6'; +$a->strings['Etc/GMT+7'] = 'Etc/GMT+7'; +$a->strings['Etc/GMT+8'] = 'Etc/GMT+8'; +$a->strings['Etc/GMT+9'] = 'Etc/GMT+9'; +$a->strings['Etc/GMT-0'] = 'Etc/GMT-0'; +$a->strings['Etc/GMT-1'] = 'Etc/GMT-1'; +$a->strings['Etc/GMT-10'] = 'Etc/GMT-10'; +$a->strings['Etc/GMT-11'] = 'Etc/GMT-11'; +$a->strings['Etc/GMT-12'] = 'Etc/GMT-12'; +$a->strings['Etc/GMT-13'] = 'Etc/GMT-13'; +$a->strings['Etc/GMT-14'] = 'Etc/GMT-14'; +$a->strings['Etc/GMT-2'] = 'Etc/GMT-2'; +$a->strings['Etc/GMT-3'] = 'Etc/GMT-3'; +$a->strings['Etc/GMT-4'] = 'Etc/GMT-4'; +$a->strings['Etc/GMT-5'] = 'Etc/GMT-5'; +$a->strings['Etc/GMT-6'] = 'Etc/GMT-6'; +$a->strings['Etc/GMT-7'] = 'Etc/GMT-7'; +$a->strings['Etc/GMT-8'] = 'Etc/GMT-8'; +$a->strings['Etc/GMT-9'] = 'Etc/GMT-9'; +$a->strings['Etc/GMT0'] = 'Etc/GMT0'; +$a->strings['Etc/Greenwich'] = 'Etc/Greenwich'; +$a->strings['Etc/UCT'] = 'Etc/UCT'; +$a->strings['Etc/Universal'] = 'Etc/Universal'; +$a->strings['Etc/UTC'] = 'Etc/UTC'; +$a->strings['Etc/Zulu'] = 'Etc/Zulu'; +$a->strings['Europe/Amsterdam'] = 'Europa/Amsterdam'; +$a->strings['Europe/Andorra'] = 'Europa/Andorra'; +$a->strings['Europe/Athens'] = 'Europa/Aten'; +$a->strings['Europe/Belfast'] = 'Europa/Belfast'; +$a->strings['Europe/Belgrade'] = 'Europa/Belgrad'; +$a->strings['Europe/Berlin'] = 'Europa/Berlin'; +$a->strings['Europe/Bratislava'] = 'Europa/Bratislava'; +$a->strings['Europe/Brussels'] = 'Europa/Bryssel'; +$a->strings['Europe/Bucharest'] = 'Europa/Bucharest'; +$a->strings['Europe/Budapest'] = 'Europa/Budapest'; +$a->strings['Europe/Chisinau'] = 'Europa/Chisinau'; +$a->strings['Europe/Copenhagen'] = 'Europa/Köpenhamn'; +$a->strings['Europe/Dublin'] = 'Europa/Dublin'; +$a->strings['Europe/Gibraltar'] = 'Europa/Gibraltar'; +$a->strings['Europe/Guernsey'] = 'Europa/Guernsey'; +$a->strings['Europe/Helsinki'] = 'Europa/Helsingfors'; +$a->strings['Europe/Isle_of_Man'] = 'Europa/Isle_of_Man'; +$a->strings['Europe/Istanbul'] = 'Europa/Istanbul'; +$a->strings['Europe/Jersey'] = 'Europa/Jersey'; +$a->strings['Europe/Kaliningrad'] = 'Europa/Kaliningrad'; +$a->strings['Europe/Kiev'] = 'Europa/Kiev'; +$a->strings['Europe/Lisbon'] = 'Europa/Lisabon'; +$a->strings['Europe/Ljubljana'] = 'Europa/Ljubljana'; +$a->strings['Europe/London'] = 'Europa/London'; +$a->strings['Europe/Luxembourg'] = 'Europa/Luxemburg'; +$a->strings['Europe/Madrid'] = 'Europa/Madrid'; +$a->strings['Europe/Malta'] = 'Europa/Malta'; +$a->strings['Europe/Mariehamn'] = 'Europa/Mariehamn'; +$a->strings['Europe/Minsk'] = 'Europa/Minsk'; +$a->strings['Europe/Monaco'] = 'Europa/Monaco'; +$a->strings['Europe/Moscow'] = 'Europa/Moskva'; +$a->strings['Europe/Nicosia'] = 'Europa/Nicosia'; +$a->strings['Europe/Oslo'] = 'Europa/Oslo'; +$a->strings['Europe/Paris'] = 'Europa/Paris'; +$a->strings['Europe/Podgorica'] = 'Europa/Podgorica'; +$a->strings['Europe/Prague'] = 'Europa/Prag'; +$a->strings['Europe/Riga'] = 'Europa/Riga'; +$a->strings['Europe/Rome'] = 'Europa/Rom'; +$a->strings['Europe/Samara'] = 'Europa/Samara'; +$a->strings['Europe/San_Marino'] = 'Europa/San_Marino'; +$a->strings['Europe/Sarajevo'] = 'Europa/Sarajevo'; +$a->strings['Europe/Simferopol'] = 'Europa/Simferopol'; +$a->strings['Europe/Skopje'] = 'Europa/Skopje'; +$a->strings['Europe/Sofia'] = 'Europa/Sofia'; +$a->strings['Europe/Stockholm'] = 'Europa/Stockholm'; +$a->strings['Europe/Tallinn'] = 'Europa/Tallinn'; +$a->strings['Europe/Tirane'] = 'Europa/Tirane'; +$a->strings['Europe/Tiraspol'] = 'Europa/Tiraspol'; +$a->strings['Europe/Uzhgorod'] = 'Europa/Uzhgorod'; +$a->strings['Europe/Vaduz'] = 'Europa/Vaduz'; +$a->strings['Europe/Vatican'] = 'Europa/Vatikanen'; +$a->strings['Europe/Vienna'] = 'Europa/Wien'; +$a->strings['Europe/Vilnius'] = 'Europa/Vilnius'; +$a->strings['Europe/Volgograd'] = 'Europa/Volgograd'; +$a->strings['Europe/Warsaw'] = 'Europa/Warsawa'; +$a->strings['Europe/Zagreb'] = 'Europa/Zagreb'; +$a->strings['Europe/Zaporozhye'] = 'Europa/Zaporozhye'; +$a->strings['Europe/Zurich'] = 'Europa/Zürich'; +$a->strings['Factory'] = 'Factory'; +$a->strings['GB'] = 'GB'; +$a->strings['GB-Eire'] = 'GB-Eire'; +$a->strings['GMT'] = 'GMT'; +$a->strings['GMT+0'] = 'GMT+0'; +$a->strings['GMT-0'] = 'GMT-0'; +$a->strings['GMT0'] = 'GMT0'; +$a->strings['Greenwich'] = 'Greenwich'; +$a->strings['Hongkong'] = 'Hongkong'; +$a->strings['HST'] = 'HST'; +$a->strings['Iceland'] = 'Iceland'; +$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo'; +$a->strings['Indian/Chagos'] = 'Indian/Chagos'; +$a->strings['Indian/Christmas'] = 'Indian/Christmas'; +$a->strings['Indian/Cocos'] = 'Indian/Cocos'; +$a->strings['Indian/Comoro'] = 'Indian/Comoro'; +$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen'; +$a->strings['Indian/Mahe'] = 'Indian/Mahe'; +$a->strings['Indian/Maldives'] = 'Indian/Maldives'; +$a->strings['Indian/Mauritius'] = 'Indian/Mauritius'; +$a->strings['Indian/Mayotte'] = 'Indian/Mayotte'; +$a->strings['Indian/Reunion'] = 'Indian/Reunion'; +$a->strings['Iran'] = 'Iran'; +$a->strings['Israel'] = 'Israel'; +$a->strings['Jamaica'] = 'Jamaica'; +$a->strings['Japan'] = 'Japan'; +$a->strings['Kwajalein'] = 'Kwajalein'; +$a->strings['Libya'] = 'Libyen'; +$a->strings['MET'] = 'MET'; +$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte'; +$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur'; +$a->strings['Mexico/General'] = 'Mexico/General'; +$a->strings['MST'] = 'MST'; +$a->strings['MST7MDT'] = 'MST7MDT'; +$a->strings['Navajo'] = 'Navajo'; +$a->strings['NZ'] = 'NZ'; +$a->strings['NZ-CHAT'] = 'NZ-CHAT'; +$a->strings['Pacific/Apia'] = 'Pacific/Apia'; +$a->strings['Pacific/Auckland'] = 'Pacific/Auckland'; +$a->strings['Pacific/Chatham'] = 'Pacific/Chatham'; +$a->strings['Pacific/Easter'] = 'Pacific/Easter'; +$a->strings['Pacific/Efate'] = 'Pacific/Efate'; +$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury'; +$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo'; +$a->strings['Pacific/Fiji'] = 'Pacific/Fiji'; +$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti'; +$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos'; +$a->strings['Pacific/Gambier'] = 'Pacific/Gambier'; +$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal'; +$a->strings['Pacific/Guam'] = 'Pacific/Guam'; +$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu'; +$a->strings['Pacific/Johnston'] = 'Pacific/Johnston'; +$a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati'; +$a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae'; +$a->strings['Pacific/Kwajalein'] = 'Pacific/Kwajalein'; +$a->strings['Pacific/Majuro'] = 'Pacific/Majuro'; +$a->strings['Pacific/Marquesas'] = 'Pacific/Marquesas'; +$a->strings['Pacific/Midway'] = 'Pacific/Midway'; +$a->strings['Pacific/Nauru'] = 'Pacific/Nauru'; +$a->strings['Pacific/Niue'] = 'Pacific/Niue'; +$a->strings['Pacific/Norfolk'] = 'Pacific/Norfolk'; +$a->strings['Pacific/Noumea'] = 'Pacific/Noumea'; +$a->strings['Pacific/Pago_Pago'] = 'Pacific/Pago_Pago'; +$a->strings['Pacific/Palau'] = 'Pacific/Palau'; +$a->strings['Pacific/Pitcairn'] = 'Pacific/Pitcairn'; +$a->strings['Pacific/Ponape'] = 'Pacific/Ponape'; +$a->strings['Pacific/Port_Moresby'] = 'Pacific/Port_Moresby'; +$a->strings['Pacific/Rarotonga'] = 'Pacific/Rarotonga'; +$a->strings['Pacific/Saipan'] = 'Pacific/Saipan'; +$a->strings['Pacific/Samoa'] = 'Pacific/Samoa'; +$a->strings['Pacific/Tahiti'] = 'Pacific/Tahiti'; +$a->strings['Pacific/Tarawa'] = 'Pacific/Tarawa'; +$a->strings['Pacific/Tongatapu'] = 'Pacific/Tongatapu'; +$a->strings['Pacific/Truk'] = 'Pacific/Truk'; +$a->strings['Pacific/Wake'] = 'Pacific/Wake'; +$a->strings['Pacific/Wallis'] = 'Pacific/Wallis'; +$a->strings['Pacific/Yap'] = 'Pacific/Yap'; +$a->strings['Poland'] = 'Polen'; +$a->strings['Portugal'] = 'Portugal'; +$a->strings['PRC'] = 'PRC'; +$a->strings['PST8PDT'] = 'PST8PDT'; +$a->strings['ROC'] = 'ROC'; +$a->strings['ROK'] = 'ROK'; +$a->strings['Singapore'] = 'Singapore'; +$a->strings['Turkey'] = 'Turkiet'; +$a->strings['UCT'] = 'UCT'; +$a->strings['Universal'] = 'Universal'; +$a->strings['US/Alaska'] = 'USA/Alaska'; +$a->strings['US/Aleutian'] = 'USA/Aleutian'; +$a->strings['US/Arizona'] = 'USA/Arizona'; +$a->strings['US/Central'] = 'USA/Central'; +$a->strings['US/East-Indiana'] = 'USA/East-Indiana'; +$a->strings['US/Eastern'] = 'USA/Eastern'; +$a->strings['US/Hawaii'] = 'USA/Hawaii'; +$a->strings['US/Indiana-Starke'] = 'USA/Indiana-Starke'; +$a->strings['US/Michigan'] = 'USA/Michigan'; +$a->strings['US/Mountain'] = 'USA/Mountain'; +$a->strings['US/Pacific'] = 'USA/Pacific'; +$a->strings['US/Pacific-New'] = 'USA/Pacific-New'; +$a->strings['US/Samoa'] = 'USA/Samoa'; +$a->strings['UTC'] = 'UTC'; +$a->strings['W-SU'] = 'W-SU'; +$a->strings['WET'] = 'WET'; +$a->strings['Zulu'] = 'Zulu';