From e1fd2ecb16a212c56567ac5c5910d2a2d9754b47 Mon Sep 17 00:00:00 2001 From: Friendika Date: Tue, 29 Mar 2011 15:27:14 -0700 Subject: [PATCH] another template --- boot.php | 6 ++++-- util/strings.php | 22 +++++++++++++++++++++- view/de/head.tpl | 31 ------------------------------- view/en/head.tpl | 32 -------------------------------- view/fr/head.tpl | 32 -------------------------------- view/{sv => }/head.tpl | 8 +++++--- view/it/head.tpl | 32 -------------------------------- 7 files changed, 30 insertions(+), 133 deletions(-) delete mode 100644 view/de/head.tpl delete mode 100644 view/en/head.tpl delete mode 100644 view/fr/head.tpl rename view/{sv => }/head.tpl (88%) delete mode 100644 view/it/head.tpl diff --git a/boot.php b/boot.php index 16c980b19..3b5da170c 100644 --- a/boot.php +++ b/boot.php @@ -352,10 +352,12 @@ class App { function init_pagehead() { $this->page['title'] = $this->config['sitename']; - $tpl = load_view_file("view/head.tpl"); + $tpl = load_view_file('view/head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl() . '/', - '$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION + '$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION, + '$delitem' => t('Delete this item?'), + '$comment' => t('Comment') )); } diff --git a/util/strings.php b/util/strings.php index a1f8f9a15..632693836 100644 --- a/util/strings.php +++ b/util/strings.php @@ -8,6 +8,8 @@ $a->strings['Not Found'] = 'Not Found'; $a->strings['Page not found.' ] = 'Page not found.' ; $a->strings['Permission denied'] = 'Permission denied'; $a->strings['Permission denied.'] = 'Permission denied.'; +$a->strings['Delete this item?'] = 'Delete this item?'; +$a->strings['Comment'] = 'Comment'; $a->strings['Create a New Account'] = 'Create a New Account'; $a->strings['Register'] = 'Register'; $a->strings['Nickname or Email address: '] = 'Nickname or Email address: '; @@ -172,6 +174,9 @@ $a->strings["%d required parameter was not found at the given location"] = array 1 => "%d required parameters were not found at the given location", ); $a->strings['Global Directory'] = 'Global Directory'; +$a->strings['Age: '] = 'Age: '; +$a->strings['Gender: '] = 'Gender: '; +$a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29."; $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"; @@ -204,6 +209,14 @@ $a->strings['The profile address specified does not provide adequate information $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.'; $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.'; $a->strings['following'] = 'following'; +$a->strings['This is Friendika version'] = 'This is Friendika version'; +$a->strings['running at web location'] = 'running at web location'; +$a->strings['Shared content within the Friendika network is provided under the Creative Commons Attribution 3.0 license'] = 'Shared content within the Friendika network is provided under the Creative Commons Attribution 3.0 license'; +$a->strings['Please visit Project.Friendika.com to learn more about the Friendika project.'] = 'Please visit Project.Friendika.com to learn more about the Friendika project.'; +$a->strings['Bug reports and issues: please visit'] = 'Bug reports and issues: please visit'; +$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'; +$a->strings['Installed plugins/addons/apps'] = 'Installed plugins/addons/apps'; +$a->strings['No installed plugins/addons/apps'] = 'No installed plugins/addons/apps'; $a->strings['Group created.'] = 'Group created.'; $a->strings['Could not create group.'] = 'Could not create group.'; $a->strings['Group not found.'] = 'Group not found.'; @@ -303,6 +316,8 @@ $a->strings['No such group'] = 'No such group'; $a->strings['Group is empty'] = 'Group is empty'; $a->strings['Group: '] = 'Group: '; $a->strings['View in context'] = 'View in context'; +$a->strings['See more posts like this'] = 'See more posts like this'; +$a->strings['See all %d comments'] = 'See all %d comments'; $a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; $a->strings['Discard'] = 'Discard'; $a->strings['Ignore'] = 'Ignore'; @@ -368,7 +383,6 @@ $a->strings['Profile-'] = 'Profile-'; $a->strings['New profile created.'] = 'New profile created.'; $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.'; $a->strings['This is your public profile.
It may be visible to anybody using the internet.'] = 'This is your public profile.
It may be visible to anybody using the internet.'; -$a->strings['Age: '] = 'Age: '; $a->strings['Profile Image'] = 'Profile Image'; $a->strings['Invalid OpenID url'] = 'Invalid OpenID url'; $a->strings['Please enter the required information.'] = 'Please enter the required information.'; @@ -418,6 +432,7 @@ $a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; $a->strings['OpenID: '] = 'OpenID: '; $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; $a->strings['Profile is not published.'] = 'Profile is not published.'; +$a->strings['Export Personal Data'] = 'Export Personal Data'; $a->strings['Default Post Permissions'] = 'Default Post Permissions'; $a->strings['Tag removed'] = 'Tag removed'; $a->strings['Remove Item Tag'] = 'Remove Item Tag'; @@ -725,6 +740,7 @@ $a->strings['America/Managua'] = 'America/Managua'; $a->strings['America/Manaus'] = 'America/Manaus'; $a->strings['America/Marigot'] = 'America/Marigot'; $a->strings['America/Martinique'] = 'America/Martinique'; +$a->strings['America/Matamoros'] = 'America/Matamoros'; $a->strings['America/Mazatlan'] = 'America/Mazatlan'; $a->strings['America/Mendoza'] = 'America/Mendoza'; $a->strings['America/Menominee'] = 'America/Menominee'; @@ -743,6 +759,7 @@ $a->strings['America/Nome'] = 'America/Nome'; $a->strings['America/Noronha'] = 'America/Noronha'; $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center'; $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem'; +$a->strings['America/Ojinaga'] = 'America/Ojinaga'; $a->strings['America/Panama'] = 'America/Panama'; $a->strings['America/Pangnirtung'] = 'America/Pangnirtung'; $a->strings['America/Paramaribo'] = 'America/Paramaribo'; @@ -759,6 +776,7 @@ $a->strings['America/Regina'] = 'America/Regina'; $a->strings['America/Resolute'] = 'America/Resolute'; $a->strings['America/Rio_Branco'] = 'America/Rio_Branco'; $a->strings['America/Rosario'] = 'America/Rosario'; +$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel'; $a->strings['America/Santarem'] = 'America/Santarem'; $a->strings['America/Santiago'] = 'America/Santiago'; $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo'; @@ -787,6 +805,7 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife'; $a->strings['Antarctica/Casey'] = 'Antarctica/Casey'; $a->strings['Antarctica/Davis'] = 'Antarctica/Davis'; $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville'; +$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie'; $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson'; $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo'; $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer'; @@ -849,6 +868,7 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar'; $a->strings['Asia/Manila'] = 'Asia/Manila'; $a->strings['Asia/Muscat'] = 'Asia/Muscat'; $a->strings['Asia/Nicosia'] = 'Asia/Nicosia'; +$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk'; $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk'; $a->strings['Asia/Omsk'] = 'Asia/Omsk'; $a->strings['Asia/Oral'] = 'Asia/Oral'; diff --git a/view/de/head.tpl b/view/de/head.tpl deleted file mode 100644 index 17b7706f8..000000000 --- a/view/de/head.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/view/en/head.tpl b/view/en/head.tpl deleted file mode 100644 index 8f97a11e5..000000000 --- a/view/en/head.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/view/fr/head.tpl b/view/fr/head.tpl deleted file mode 100644 index 4636b542c..000000000 --- a/view/fr/head.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/view/sv/head.tpl b/view/head.tpl similarity index 88% rename from view/sv/head.tpl rename to view/head.tpl index 828fcb13d..7a5710b2a 100644 --- a/view/sv/head.tpl +++ b/view/head.tpl @@ -11,9 +11,9 @@ + + diff --git a/view/it/head.tpl b/view/it/head.tpl deleted file mode 100644 index 8e4e0ccd7..000000000 --- a/view/it/head.tpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - -