Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master

This commit is contained in:
Friendika 2011-01-27 13:09:58 -08:00
commit 1d9f677438
4 changed files with 336 additions and 337 deletions

View File

@ -11,7 +11,7 @@
<script type="text/javascript" src="$baseurl/include/main.js" ></script> <script type="text/javascript" src="$baseurl/include/main.js" ></script>
<script> <script>
function confirmDelete() { return confirm("Delete this item?"); } function confirmDelete() { return confirm("Effacer cet élément?"); }
function commentOpen(obj,id) { function commentOpen(obj,id) {
if(obj.value == 'Comment') { if(obj.value == 'Comment') {
obj.value = ''; obj.value = '';

View File

@ -1,8 +1,8 @@
<h1>Profiles</h1> <h1>Profiles</h1>
<p id="profile-listing-desc" > <p id="profile-listing-desc" >
<a href="profile_photo" >Change profile photo</a> <a href="profile_photo" >Changer la photo du profil</a>
</p> </p>
<div id="profile-listing-new-link-wrapper" > <div id="profile-listing-new-link-wrapper" >
<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a> <a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Créer un nouveau profil</a>
</div> </div>

View File

@ -1 +1 @@
<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li> <li>$fullname ($email) : <a href="$approvelink">Approuver</a> - <a href="$denylink">Refuser</a></li>

File diff suppressed because it is too large Load Diff