Added a whitespace between comma and t()

diff --git a/mod/admin.php b/mod/admin.php
index 3ca8ea4..e86bb90 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -971,7 +971,7 @@ function admin_page_site(App $a) {
                '$banner'               => array('banner', t("Banner/Logo"), $banner, ""),
                '$shortcut_icon'        => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'),  t("Link to an icon that will be used for browsers.")),
                '$touch_icon'           => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'),  t("Link to an icon that will be used for tablets and mobiles.")),
-               '$info'                 => array('info',t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
+               '$info'                 => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
                '$language'             => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
                '$theme'                => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
                '$theme_mobile'         => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
@@ -2058,8 +2058,8 @@ function admin_page_features(App $a) {
                                        $set = $f[3];
                                }
                                $arr[$fname][1][] = array(
-                                       array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'),t('On'))),
-                                       array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'),t('On')))
+                                       array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'), t('On'))),
+                                       array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'), t('On')))
                                );
                        }
                }

diff --git a/mod/cal.php b/mod/cal.php
index f43a4e8..7398426 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -269,8 +269,8 @@ function cal_content(App $a) {
                        '$tabs'         => $tabs,
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
-                       '$previous'     => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-                       '$next'         => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+                       '$previous'     => array(App::get_baseurl()."/events/$prevyear/$prevmonth", t('Previous'),'',''),
+                       '$next'         => array(App::get_baseurl()."/events/$nextyear/$nextmonth", t('Next'),'',''),
                        '$calendar' => cal($y,$m,$links, ' eventcal'),
 
                        '$events'       => $events,

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 52b5eb9..f3875ed 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -872,7 +872,7 @@ function dfrn_request_content(App $a) {
                        '$header' => t('Friend/Connection Request'),
                        '$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
                        '$pls_answer' => t('Please answer the following:'),
-                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'),t('Yes'))),
+                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$a->profile['name']), false, '', array(t('No'), t('Yes'))),
                        /*'$does_know' => sprintf( t('Does %s know you?'),$a->profile['name']),
                        '$yes' => t('Yes'),
                        '$no' => t('No'), */

diff --git a/mod/follow.php b/mod/follow.php
index 2b564c1..6e1f906 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -110,7 +110,7 @@ function follow_content(App $a) {
                        //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
                        '$desc' => "",
                        '$pls_answer' => t('Please answer the following:'),
-                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
+                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'), t('Yes'))),
                        '$add_note' => t('Add a personal note:'),
                        '$page_desc' => "",
                        '$friendica' => "",

diff --git a/mod/group.php b/mod/group.php
index 2b332e4..2042c76 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -95,7 +95,7 @@ function group_content(App $a) {
 
                return replace_macros($tpl, $context + array(
                        '$title' => t('Create a group of contacts/friends.'),
-                       '$gname' => array('groupname',t('Group Name: '), '', ''),
+                       '$gname' => array('groupname', t('Group Name: '), '', ''),
                        '$gid' => 'new',
                        '$form_security_token' => get_form_security_token("group_edit"),
                ));
@@ -185,7 +185,7 @@ function group_content(App $a) {
 
                $context = $context + array(
                        '$title' => t('Group Editor'),
-                       '$gname' => array('groupname',t('Group Name: '),$group['name'], ''),
+                       '$gname' => array('groupname', t('Group Name: '),$group['name'], ''),
                        '$gid' => $group['id'],
                        '$drop' => $drop_txt,
                        '$form_security_token' => get_form_security_token('group_edit'),

diff --git a/mod/photos.php b/mod/photos.php
index ddf0814..3acd39b 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1581,9 +1581,9 @@ function photos_content(App $a) {
                                '$album' => array('albname', t('New album name'), $album_e,''),
                                '$caption' => array('desc', t('Caption'), $caption_e, ''),
                                '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')),
-                               '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true),
-                               '$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''),
-                               '$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''),
+                               '$rotate_none' => array('rotate', t('Do not rotate'),0,'', true),
+                               '$rotate_cw' => array('rotate', t('Rotate CW (right)'),1,''),
+                               '$rotate_ccw' => array('rotate', t('Rotate CCW (left)'),2,''),
 
                                '$nickname' => $a->data['user']['nickname'],
                                '$resource_id' => $ph[0]['resource-id'],

diff --git a/mod/profiles.php b/mod/profiles.php
index b73c46e..2b8d812 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -637,7 +637,7 @@ function profiles_content(App $a) {
                                t('Hide contacts and friends:'), //Label
                                !!$r[0]['hide-friends'], //Value
                                '', //Help string
-                               array(t('No'),t('Yes')) //Off - On strings
+                               array(t('No'), t('Yes')) //Off - On strings
                        ),
                        '$desc' => t('Hide your contact/friend list from viewers of this profile?'),
                        '$yes_str' => t('Yes'),
@@ -739,7 +739,7 @@ function profiles_content(App $a) {
                        '$tv' => array('tv', t('Television'), $r[0]['tv']),
                        '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
                        '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
-                       '$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
+                       '$romance' => array('romance', t('Love/romance'), $r[0]['romance']),
                        '$work' => array('work', t('Work/employment'), $r[0]['work']),
                        '$education' => array('education', t('School/education'), $r[0]['education']),
                        '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),

diff --git a/mod/register.php b/mod/register.php
index 81e8c3a..5e8da46 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -282,7 +282,7 @@ function register_content(App $a) {
                '$passwords' => $passwords,
                '$password1' => array('password1', t('New Password:'), '', t('Leave empty for an auto generated password.')),
                '$password2' => array('confirm', t('Confirm:'), '', ''),
-               '$nickdesc'  => str_replace('$sitename',$a->get_hostname(),t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
+               '$nickdesc'  => str_replace('$sitename',$a->get_hostname(), t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.')),
                '$nicklabel' => t('Choose a nickname: '),
                '$photo'     => $photo,
                '$publish'   => $profile_publish,

diff --git a/mod/settings.php b/mod/settings.php
index 5c9c439..eebac66 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -779,7 +779,7 @@ function settings_content(App $a) {
                        $arr[$fname] = array();
                        $arr[$fname][0] = $fdata[0];
                        foreach (array_slice($fdata,1) as $f) {
-                               $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
+                               $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'), t('On')));
                        }
                }
 
@@ -1168,44 +1168,44 @@ function settings_content(App $a) {
                $profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
        } else {
                $profile_in_dir = replace_macros($opt_tpl,array(
-                       '$field'        => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
+                       '$field'        => array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'), t('Yes'))),
                ));
        }
 
        if (strlen(get_config('system','directory'))) {
                $profile_in_net_dir = replace_macros($opt_tpl,array(
-                       '$field'        => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
+                       '$field'        => array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'), t('Yes'))),
                ));
        } else {
                $profile_in_net_dir = '';
        }
 
        $hide_friends = replace_macros($opt_tpl,array(
-                       '$field'        => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
+                       '$field'        => array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'), t('Yes'))),
        ));
 
        $hide_wall = replace_macros($opt_tpl,array(
-                       '$field'        => array('hidewall',  t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'),t('Yes'))),
+                       '$field'        => array('hidewall',  t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], t("If enabled, posting public messages to Diaspora and other networks isn't possible."), array(t('No'), t('Yes'))),
 
        ));
 
        $blockwall = replace_macros($opt_tpl,array(
-                       '$field'        => array('blockwall',  t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+                       '$field'        => array('blockwall',  t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
 
        ));
 
        $blocktags = replace_macros($opt_tpl,array(
-                       '$field'        => array('blocktags',  t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
+                       '$field'        => array('blocktags',  t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'), t('Yes'))),
 
        ));
 
        $suggestme = replace_macros($opt_tpl,array(
-                       '$field'        => array('suggestme',  t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
+                       '$field'        => array('suggestme',  t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'), t('Yes'))),
 
        ));
 
        $unkmail = replace_macros($opt_tpl,array(
-                       '$field'        => array('unkmail',  t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
+                       '$field'        => array('unkmail',  t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'), t('Yes'))),
 
        ));
 
@@ -1231,11 +1231,11 @@ function settings_content(App $a) {
                'days' => array('expire',  t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')),
                'advanced' => t('Advanced expiration settings'),
                'label' => t('Advanced Expiration'),
-               'items' => array('expire_items',  t("Expire posts:"), $expire_items, '', array(t('No'),t('Yes'))),
-               'notes' => array('expire_notes',  t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
-               'starred' => array('expire_starred',  t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
-               'photos' => array('expire_photos',  t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
-               'network_only' => array('expire_network_only',  t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),
+               'items' => array('expire_items',  t("Expire posts:"), $expire_items, '', array(t('No'), t('Yes'))),
+               'notes' => array('expire_notes',  t("Expire personal notes:"), $expire_notes, '', array(t('No'), t('Yes'))),
+               'starred' => array('expire_starred',  t("Expire starred posts:"), $expire_starred, '', array(t('No'), t('Yes'))),
+               'photos' => array('expire_photos',  t("Expire photos:"), $expire_photos, '', array(t('No'), t('Yes'))),
+               'network_only' => array('expire_network_only',  t("Only expire posts by others:"), $expire_network_only, '', array(t('No'), t('Yes'))),
        );
 
        require_once('include/group.php');
@@ -1293,7 +1293,7 @@ function settings_content(App $a) {
 
                '$h_prv'        => t('Security and Privacy Settings'),
 
-               '$maxreq'       => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq ,t("\x28to prevent spam abuse\x29")),
+               '$maxreq'       => array('maxreq', t('Maximum Friend Requests/Day:'), $maxreq , t("\x28to prevent spam abuse\x29")),
                '$permissions' => t('Default Post Permissions'),
                '$permdesc' => t("\x28click to open/close\x29"),
                '$visibility' => $profile['net-publish'],
@@ -1323,7 +1323,7 @@ function settings_content(App $a) {
                '$hide_friends' => $hide_friends,
                '$hide_wall' => $hide_wall,
                '$unkmail' => $unkmail,
-               '$cntunkmail'   => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail ,t("\x28to prevent spam abuse\x29")),
+               '$cntunkmail'   => array('cntunkmail', t('Maximum private messages per day from unknown people:'), $cntunkmail , t("\x28to prevent spam abuse\x29")),
 
 
                '$h_not'        => t('Notification Settings'),

diff --git a/mod/uexport.php b/mod/uexport.php
index cada539..77a45f8 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -34,8 +34,8 @@ function uexport_content(App $a) {
         * list of array( 'link url', 'link text', 'help text' )
         */
        $options = array(
-               array('uexport/account',t('Export account'),t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
-               array('uexport/backup',t('Export all'),t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')),
+               array('uexport/account', t('Export account'), t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')),
+               array('uexport/backup', t('Export all'), t('Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)')),
        );
        call_hooks('uexport_options', $options);
 

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 7584e0b..a873e45 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -240,7 +240,7 @@ function frio_remote_nav($a,&$nav) {
                }
 
        if(!local_user() && !empty($server_url)) {
-               $nav['logout'] = Array($server_url . '/logout',t('Logout'), "", t('End this session'));
+               $nav['logout'] = Array($server_url . '/logout', t('Logout'), "", t('End this session'));
 
                // user menu
                $nav['usermenu'][] = Array($server_url . '/profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations'));

diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 5af58a1..993f778 100644 (file)
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -70,7 +70,7 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) {
                '$align'   => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
                '$color'   => array('quattro_color', t('Color scheme'), $color, '', $colors),
                '$pfs'     => array('quattro_pfs', t('Posts font size'), $pfs),
-               '$tfs'     => array('quattro_tfs',t('Textareas font size'), $tfs),
+               '$tfs'     => array('quattro_tfs', t('Textareas font size'), $tfs),
        ));
        return $o;
 }