diff --git a/mod/network.php b/mod/network.php index 144ae5874..1ef4ab372 100644 --- a/mod/network.php +++ b/mod/network.php @@ -87,6 +87,17 @@ function network_content(&$a, $update = 0) { $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, + '$action' => 'item', + '$share' => t('Share'), + '$upload' => t('Upload photo'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$content' => '', + '$post_id' => '', '$baseurl' => $a->get_baseurl(), '$defloc' => $a->user['default-location'], '$visitor' => 'block', diff --git a/mod/profile.php b/mod/profile.php index 827530bc8..b23af2e66 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -147,6 +147,17 @@ function profile_content(&$a, $update = 0) { $o .= replace_macros($tpl,array( '$baseurl' => $a->get_baseurl(), + '$action' => 'item', + '$share' => t('Share'), + '$upload' => t('Upload photo'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$content' => '', + '$post_id' => '', '$defloc' => (($is_owner) ? $a->user['default-location'] : ''), '$return_path' => $a->cmd, '$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), diff --git a/util/strings.php b/util/strings.php index f74f69584..71b1d776b 100644 --- a/util/strings.php +++ b/util/strings.php @@ -87,7 +87,7 @@ $a->strings['Delete message'] = 'Delete message'; $a->strings['Send Reply'] = 'Send Reply'; $a->strings['Applications'] = 'Applications'; $a->strings["Invite Friends"] = "Invite Friends"; -$a->strings['Connect/Follow [profile address]'] = 'Connect/Follow [profile address]'; +$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'; $a->strings['Could not access contact record.'] = 'Could not access contact record.'; @@ -193,6 +193,7 @@ $a->strings['Global Directory'] = 'Global Directory'; $a->strings['Item not found.'] = 'Item not found.'; $a->strings['Private Message'] = 'Private Message'; $a->strings['This is you'] = 'This is you'; +$a->strings['Delete'] = 'Delete'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; $a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile'; $a->strings['to'] = 'to'; @@ -200,6 +201,8 @@ $a->strings['Wall-to-Wall'] = 'Wall-to-Wall'; $a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:'; $a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; +$a->strings['CC: email addresses'] = 'CC: email addresses'; +$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com'; $a->strings['The profile address specified does not provide adequate information.'] = '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.'; @@ -211,7 +214,6 @@ $a->strings['Group name changed.'] = 'Group name changed.'; $a->strings['Membership list updated.'] = 'Membership list updated.'; $a->strings['Group removed.'] = 'Group removed.'; $a->strings['Unable to remove group.'] = 'Unable to remove group.'; -$a->strings['Delete'] = 'Delete'; $a->strings["Welcome to "] = "Welcome to "; $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; $a->strings['Connected to database.'] = 'Connected to database.'; @@ -267,10 +269,17 @@ $a->strings['\'s'] = '\'s'; $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.'; $a->strings['Visible to:'] = 'Visible to:'; $a->strings['Password reset requested at '] = 'Password reset requested at '; +$a->strings["Welcome back "] = "Welcome back "; +$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['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['CC: email addresses'] = 'CC: email addresses'; -$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com'; +$a->strings['Share'] = 'Share'; +$a->strings['Insert YouTube video'] = 'Insert YouTube video'; +$a->strings['Set your location'] = 'Set your location'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Permission settings'; $a->strings['No such group'] = 'No such group'; $a->strings['Group is empty'] = 'Group is empty'; $a->strings['Group: '] = 'Group: '; @@ -293,7 +302,6 @@ $a->strings['Approve'] = 'Approve'; $a->strings['No notifications.'] = 'No notifications.'; $a->strings['No registrations.'] = 'No registrations.'; $a->strings['Login failed.'] = 'Login failed.'; -$a->strings["Welcome back "] = "Welcome back "; $a->strings['Photo Albums'] = 'Photo Albums'; $a->strings['Contact Photos'] = 'Contact Photos'; $a->strings['Contact information unavailable'] = 'Contact information unavailable'; @@ -436,6 +444,7 @@ $a->strings['Apps'] = 'Apps'; $a->strings['Directory'] = 'Directory'; $a->strings['Network'] = 'Network'; $a->strings['Notifications'] = 'Notifications'; +$a->strings['Manage'] = 'Manage'; $a->strings['Settings'] = 'Settings'; $a->strings['Profiles'] = 'Profiles'; $a->strings['Embedding disabled'] = 'Embedding disabled'; @@ -527,9 +536,10 @@ $a->strings['If enabled all your public postings will be posted $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'] = 'Three Dimensional Tic-Tac-Toe'; +$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe'; $a->strings['New game'] = 'New game'; $a->strings['New game with handicap'] = 'New game with handicap'; -$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously.'] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously.'; +$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '; $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.'] = '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.'; $a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'; $a->strings['You go first...'] = 'You go first...'; diff --git a/view/de/jot.tpl b/view/de/jot.tpl deleted file mode 100644 index db73b17a6..000000000 --- a/view/de/jot.tpl +++ /dev/null @@ -1,60 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - -
- -
-
Foto hochladen
-
- -
- YouTube Video einfügen -
-
- Deinen Standort festlegen -
- - -
- $jotplugins -
- - -
- -
-
Berechtigungseinstellungen$bang
-
- - -
- -
- -
-
-
diff --git a/view/de/strings.php b/view/de/strings.php index 4d291d544..002749df9 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -263,6 +263,11 @@ $a->strings['Delete message'] = 'Nachricht löschen'; $a->strings['Send Reply'] = 'Antwort senden'; $a->strings['Normal View'] = 'Normale Ansicht'; $a->strings['New Item View'] = 'Neue Einträge'; +$a->strings['Share'] = 'Share'; +$a->strings['Insert YouTube video'] = 'YouTube Video einfügen'; +$a->strings['Set your location'] = 'Deinen Standort festlegen'; +$a->strings['Clear browser location'] = 'Browser Standort leeren'; +$a->strings['Permission settings'] = 'Berechtigungseinstellungen'; $a->strings['CC: email addresses'] = 'CC: EMail Addresse'; $a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com'; $a->strings['No such group'] = 'Es gibt keine solche Gruppe'; diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl deleted file mode 100644 index d64632da0..000000000 --- a/view/fr/jot.tpl +++ /dev/null @@ -1,60 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - - -
- -
-
Upload Photo
-
- -
- Insert YouTube video -
-
- Set your location -
- - -
- $jotplugins -
- -
- -
-
Permission Settings$bang
-
- - -
- -
- -
-
-
diff --git a/view/fr/strings.php b/view/fr/strings.php index 09fa91f30..b6b20f68c 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -250,6 +250,11 @@ $a->strings['Delete message'] = 'Effacer message'; $a->strings['Send Reply'] = 'Répondre'; $a->strings['Normal View'] = 'Vue normale'; $a->strings['New Item View'] = 'Vue des nouveautés'; +$a->strings['Share'] = 'Share'; +$a->strings['Insert YouTube video'] = 'Insert YouTube video'; +$a->strings['Set your location'] = 'Set your location'; +$a->strings['Clear browser location'] = 'Clear browser location'; +$a->strings['Permission settings'] = 'Permission settings'; $a->strings['No such group'] = 'Groupe inexistant'; $a->strings['Group is empty'] = 'Groupe vide'; $a->strings['Group: '] = 'Groupe: '; diff --git a/view/it/jot.tpl b/view/it/jot.tpl deleted file mode 100644 index c4b63eb01..000000000 --- a/view/it/jot.tpl +++ /dev/null @@ -1,61 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - -
- -
-
Carica foto
-
- -
- Inserisci video da YouTube -
-
- Imposta la tua posizione -
- - -
- $jotplugins -
- -
- -
-
Impostazione permessi$bang
-
- - -
- -
- - - -
-
-
diff --git a/view/it/strings.php b/view/it/strings.php index 7f4b3eddd..25439d8d5 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -1038,6 +1038,11 @@ $a->strings['Invalid OpenID url'] = 'Url OpenID non valido'; $a->strings['Cannot use that email.'] = 'Questa email non si puo\' usare.'; $a->strings['Normal View'] = 'Vista normale'; $a->strings['New Item View'] = 'Vista Nuovi Elementi'; +$a->strings['Share'] = 'Condividi'; +$a->strings['Insert YouTube video'] = 'Inserisci video da YouTube'; +$a->strings['Set your location'] = 'Imposta la tua posizione'; +$a->strings['Clear browser location'] = 'Cancella la tua posizione data dal browser'; +$a->strings['Permission settings'] = 'Impostazione permessi'; $a->strings[' Cannot change to that email.'] = 'Non puoi cambiare a quella email.'; $a->strings['Birthday:'] = 'Compleanno:'; $a->strings['Update now'] = 'Aggiorna adesso'; diff --git a/view/en/jot.tpl b/view/jot.tpl similarity index 63% rename from view/en/jot.tpl rename to view/jot.tpl index 7c6a857e8..68139ddc0 100644 --- a/view/en/jot.tpl +++ b/view/jot.tpl @@ -6,41 +6,42 @@
-
+ + - +
- +
-
Upload Photo
+
$upload
- Insert YouTube video + $youtube
- Set your location + $setloc
$jotplugins
- +
-
Permission Settings$bang
+
$permset$bang