aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--boot.php2
-rw-r--r--mod/profile.php5
-rw-r--r--util/strings.php3
-rw-r--r--view/de/strings.php3
-rw-r--r--view/en/profile_tabs.tpl7
-rw-r--r--view/fr/profile_tabs.tpl7
-rw-r--r--view/it/profile_tabs.tpl7
-rw-r--r--view/it/strings.php3
-rw-r--r--view/profile_tabs.tpl (renamed from view/de/profile_tabs.tpl)6
-rw-r--r--view/sv/profile_tabs.tpl7
10 files changed, 17 insertions, 33 deletions
diff --git a/boot.php b/boot.php
index 6c8fb9d15..50b4fd887 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
set_time_limit(0);
-define ( 'FRIENDIKA_VERSION', '2.1.924' );
+define ( 'FRIENDIKA_VERSION', '2.1.925' );
define ( 'DFRN_PROTOCOL_VERSION', '2.1' );
define ( 'DB_UPDATE_VERSION', 1044 );
diff --git a/mod/profile.php b/mod/profile.php
index 82a84c39e..fad8bc79b 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -98,7 +98,10 @@ function profile_content(&$a, $update = 0) {
$o .= replace_macros($tpl,array(
'$url' => $a->get_baseurl() . '/' . $a->cmd,
- '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname']
+ '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
+ '$status' => t('Status')
+ '$profile' => t('Profile'),
+ '$photos' => t('Photos')
));
diff --git a/util/strings.php b/util/strings.php
index 31dffd162..907bfb6df 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -350,6 +350,9 @@ $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
$a->strings['Recent Photos'] = 'Recent Photos';
$a->strings['Upload New Photos'] = 'Upload New Photos';
$a->strings['View Album'] = 'View Album';
+$a->strings['Status'] = 'Status';
+$a->strings['Profile'] = 'Profile';
+$a->strings['Photos'] = 'Photos';
$a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
$a->strings['Unable to process image'] = 'Unable to process image';
$a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
diff --git a/view/de/strings.php b/view/de/strings.php
index c18069f19..2d8fe7006 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -331,6 +331,9 @@ $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
$a->strings['Recent Photos'] = 'Neuste Fotos';
$a->strings['Upload New Photos'] = 'Weitere Fotos hochladen';
$a->strings['View Album'] = 'Album betrachten';
+$a->strings['Status'] = 'Status';
+$a->strings['Profile'] = 'Profil';
+$a->strings['Photos'] = 'Fotos';
$a->strings['Image uploaded but image cropping failed.'] = 'Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen.';
$a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
$a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';
diff --git a/view/en/profile_tabs.tpl b/view/en/profile_tabs.tpl
deleted file mode 100644
index 9c6c54a1c..000000000
--- a/view/en/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
-<div id="profile-tabs-end"></div>
-</div> \ No newline at end of file
diff --git a/view/fr/profile_tabs.tpl b/view/fr/profile_tabs.tpl
deleted file mode 100644
index 9c6c54a1c..000000000
--- a/view/fr/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
-<div id="profile-tabs-end"></div>
-</div> \ No newline at end of file
diff --git a/view/it/profile_tabs.tpl b/view/it/profile_tabs.tpl
deleted file mode 100644
index 9c0f27d62..000000000
--- a/view/it/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Stato</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profilo</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Foto</a>
-<div id="profile-tabs-end"></div>
-</div>
diff --git a/view/it/strings.php b/view/it/strings.php
index f27d8a1b0..a771f933d 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -165,6 +165,9 @@ $a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #cam
$a->strings["Recent Photos"] = "Foto recenti";
$a->strings["Upload New Photos"] = "Carica nuova foto";
$a->strings["View Album"] = "Vedi album";
+$a->strings['Status'] = 'Stato';
+$a->strings['Profile'] = 'Profilo';
+$a->strings['Photos'] = 'Foto';
$a->strings["Item not found."] = "Elemento non trovato.";
$a->strings["View \$owner_name's profile"] = "Guarda il profilo di \$owner_name";
$a->strings["to"] = "a";
diff --git a/view/de/profile_tabs.tpl b/view/profile_tabs.tpl
index 56e7d626f..975d069a6 100644
--- a/view/de/profile_tabs.tpl
+++ b/view/profile_tabs.tpl
@@ -1,7 +1,7 @@
<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profil</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Fotos</a>
+ <a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
+ <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
+ <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
<div id="profile-tabs-end"></div>
</div> \ No newline at end of file
diff --git a/view/sv/profile_tabs.tpl b/view/sv/profile_tabs.tpl
deleted file mode 100644
index 9c6c54a1c..000000000
--- a/view/sv/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
- <a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
- <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
- <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
-<div id="profile-tabs-end"></div>
-</div> \ No newline at end of file