friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge branch 'fabrixxm-master'

This commit is contained in:
Friendika 2011-03-23 14:32:23 -07:00
parent de8d9ab66d 1f1fe4d5be
commit f0bd849555
5 changed files with 432 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -2019,7 +2019,7 @@ function contact_block() {
intval($shown)
);
if(count($r)) {
$o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">';
$o .= '<h4 class="contact-h4">' . sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
foreach($r as $rr) {
$redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
if(local_user() && ($rr['uid'] == local_user())
@ -2665,4 +2665,4 @@ function extract_item_authors($arr,$uid) {
}
}
return array();
}}
}}

700
util/messages.po
View File

File diff suppressed because it is too large Load Diff

14
util/strings.php
View File

@ -31,7 +31,6 @@ $a->strings[', and %d other people'] = ', and %d other people';
$a->strings['%s like this.'] = '%s like this.';
$a->strings['%s don\'t like this.'] = '%s don\'t like this.';
$a->strings['No contacts'] = 'No contacts';
$a->strings['Contacts'] = 'Contacts';
$a->strings['View Contacts'] = 'View Contacts';
$a->strings['Search'] = 'Search';
$a->strings['No profile'] = 'No profile';
@ -67,6 +66,7 @@ $a->strings['[today]'] = '[today]';
$a->strings['link to source'] = 'link to source';
$a->strings['Applications'] = 'Applications';
$a->strings["Invite Friends"] = "Invite Friends";
$a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
$a->strings['Connect/Follow'] = 'Connect/Follow';
$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara';
$a->strings['Follow'] = 'Follow';
@ -106,6 +106,7 @@ $a->strings['Unignore this contact'] = 'Unignore this contact';
$a->strings['Ignore this contact'] = 'Ignore this contact';
$a->strings['Currently blocked'] = 'Currently blocked';
$a->strings['Currently ignored'] = 'Currently ignored';
$a->strings['Contacts'] = 'Contacts';
$a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
$a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
$a->strings['Finding: '] = 'Finding: ';
@ -213,9 +214,11 @@ $a->strings['Unable to remove group.'] = 'Unable to remove group.';
$a->strings["Welcome to %s"] = "Welcome to %s";
$a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
$a->strings['Connected to database.'] = 'Connected to database.';
$a->strings['Database import succeeded.'] = 'Database import succeeded.';
$a->strings['Proceed with Installation'] = 'Proceed with Installation';
$a->strings['Your Friendika site database has been installed.'] = 'Your Friendika site database has been installed.';
$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
$a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".';
$a->strings['Proceed to registration'] = 'Proceed to registration';
$a->strings['Database import failed.'] = 'Database import failed.';
$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
$a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
@ -268,6 +271,8 @@ $a->strings["Welcome back %s"] = "Welcome back %s";
$a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
$a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";
$a->strings['Select an identity to manage: '] = 'Select an identity to manage: ';
$a->strings['Profile Match'] = 'Profile Match';
$a->strings['No matches'] = 'No matches';
$a->strings['No recipient selected.'] = 'No recipient selected.';
$a->strings['[no subject]'] = '[no subject]';
$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
@ -720,7 +725,6 @@ $a->strings['America/Managua'] = 'America/Managua';
$a->strings['America/Manaus'] = 'America/Manaus';
$a->strings['America/Marigot'] = 'America/Marigot';
$a->strings['America/Martinique'] = 'America/Martinique';
$a->strings['America/Matamoros'] = 'America/Matamoros';
$a->strings['America/Mazatlan'] = 'America/Mazatlan';
$a->strings['America/Mendoza'] = 'America/Mendoza';
$a->strings['America/Menominee'] = 'America/Menominee';
@ -739,7 +743,6 @@ $a->strings['America/Nome'] = 'America/Nome';
$a->strings['America/Noronha'] = 'America/Noronha';
$a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
$a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
$a->strings['America/Ojinaga'] = 'America/Ojinaga';
$a->strings['America/Panama'] = 'America/Panama';
$a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
$a->strings['America/Paramaribo'] = 'America/Paramaribo';
@ -756,7 +759,6 @@ $a->strings['America/Regina'] = 'America/Regina';
$a->strings['America/Resolute'] = 'America/Resolute';
$a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
$a->strings['America/Rosario'] = 'America/Rosario';
$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
$a->strings['America/Santarem'] = 'America/Santarem';
$a->strings['America/Santiago'] = 'America/Santiago';
$a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@ -785,7 +787,6 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
$a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
$a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
$a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
$a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
$a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
$a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@ -848,7 +849,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
$a->strings['Asia/Manila'] = 'Asia/Manila';
$a->strings['Asia/Muscat'] = 'Asia/Muscat';
$a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
$a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
$a->strings['Asia/Omsk'] = 'Asia/Omsk';
$a->strings['Asia/Oral'] = 'Asia/Oral';

15
view/it/messages.po
View File

@ -6,13 +6,13 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2.1.913\n"
"Project-Id-Version: 2.1.921\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-03-18 10:32+0100\n"
"POT-Creation-Date: 2011-03-23 13:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n"
"Language-Team: Italian <fabrix.xm@gmail.com>\n"
"Language: it-IT\n"
"Language: It\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -118,7 +118,7 @@ msgstr "Piace a %s."
msgid "%s doesn't like this."
msgstr "Non piace a %s."
#: ../../boot.php:1835
#: ../../boot.php:1835 ../../test.php:8
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr "Piace a <span %1$s>%2$d persone</span>."
@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio"
#, php-format
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Non trovo le informazioni DNS per il database server '%s'"
#: ../../boot.php:2016
#, php-format
msgid "%d Contact"
msgid_plural "%d Contacts"
msgstr[0] "%d Contatto"
msgstr[1] "%d Contatti"

4
view/it/strings.php
View File

@ -581,3 +581,7 @@ $a->strings["Next >>"] = "Succ >>";
$a->strings["Item not found"] = "Elemento non trovato";
$a->strings["Edit post"] = "Modifica messaggio";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
$a->strings["%d Contact"] = array(
0 => "%d Contatto",
1 => "%d Contatti",
);