diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2010-08-12 20:49:35 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2010-08-12 20:49:35 +0200 |
| commit | 0a8dadf87e660e9bf205581f12f7af87bfabf6ca (patch) | |
| tree | a1218f869401a1ffff764a58c28a0be674ba5362 | |
| parent | b25290cef48251a31cb0f693a53677b566c1b1a4 (diff) | |
| parent | 31570df64ce6543de407e7b9d751ba9033d930de (diff) | |
| download | semanticscuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.tar.gz semanticscuttle-0a8dadf87e660e9bf205581f12f7af87bfabf6ca.tar.bz2 | |
Merge branch 'master' into pearpkg
57 files changed, 3304 insertions, 473 deletions
@@ -8,8 +8,8 @@ --> <property file="build.properties" /> - <property name="version-m" value="0.96" /> - <property name="version" value="0.96.1" /> + <property name="version-m" value="0.97" /> + <property name="version" value="0.97.0" /> <property name="zipfile" value="${phing.project.name}-${version}.zip" /> <property name="distfile" value="dist/${zipfile}" /> <property name="sfproject" value="SemanticScuttle" /> diff --git a/data/config.default.php b/data/config.default.php index 1b040c0..4f45eac 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -180,6 +180,15 @@ $dbname = 'scuttle'; */ $tableprefix = 'sc_'; +/* + * If the database needs to be switched to UTF8 + * manually or not. If true, a "SET NAMES UTF8" query + * will be sent at the beginning. If you need performance, + * save this query and set it in your mysql server options. + * + * @var boolean + */ +$dbneedssetnames = true; /*************************************************** @@ -714,4 +723,16 @@ $authDebug = false; * @var string */ $authEmailSuffix = null; + + + + +/** + * URL unittests are being run against + * Has to have a trailing slash + * + * @var string + */ +$unittestUrl = null; + ?> diff --git a/data/locales/en_GB/LC_MESSAGES/messages.po b/data/locales/en_GB/LC_MESSAGES/messages.po index 1bac385..0deecb3 100644 --- a/data/locales/en_GB/LC_MESSAGES/messages.po +++ b/data/locales/en_GB/LC_MESSAGES/messages.po @@ -1,4 +1,4 @@ -# Scuttle en-GB Translation +# SemanticScuttle en-GB Translation # Copyright (C) 2005 - 2009 SemanticScuttle project # This file is distributed under the same license as the SemanticScuttle package. # Ogee <ogee@ogee.de> diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.mo b/data/locales/fr_FR/LC_MESSAGES/messages.mo Binary files differindex afc69dc..392adf5 100644 --- a/data/locales/fr_FR/LC_MESSAGES/messages.mo +++ b/data/locales/fr_FR/LC_MESSAGES/messages.mo diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po index 114521e..396c85e 100644 --- a/data/locales/fr_FR/LC_MESSAGES/messages.po +++ b/data/locales/fr_FR/LC_MESSAGES/messages.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Scuttle\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-11-16 20:55+0100\n" -"PO-Revision-Date: 2009-11-18 15:42+0100\n" -"Last-Translator: Nguyen Thi Hong Thai <thaichv@yahoo.com>\n" +"PO-Revision-Date: 2009-11-16 21:14+0100\n" +"Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n" "Language-Team: fr-FR <toony.sf@chezouam.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,71 +21,71 @@ msgstr "" #: src/SemanticScuttle/functions.php:163 msgid "message_die() was called multiple times." -msgstr "message_die() bị gọi nhiều lần." +msgstr "message_die() was called multiple times. ?" #: src/SemanticScuttle/functions.php:175 msgid "SQL Error" -msgstr "Lỗi cấu trúc truy vấn" +msgstr "Erreur SQL" #: src/SemanticScuttle/functions.php:181 msgid "Line" -msgstr "mạng" +msgstr "Ligne" #: src/SemanticScuttle/functions.php:181 #: data/templates/importDelicious.tpl.php:8 #: data/templates/importNetscape.tpl.php:9 #: data/templates/importStructure.tpl.php:10 msgid "File" -msgstr "File" +msgstr "Fichier" #: src/SemanticScuttle/functions.php:189 msgid "Information" -msgstr "Thông tin" +msgstr "Information" #: src/SemanticScuttle/functions.php:194 msgid "Critical Information" -msgstr "Thông tin nguy cấp" +msgstr "Information critique." #: src/SemanticScuttle/functions.php:199 msgid "An error occured" -msgstr "Một lỗi đã xảy ra" +msgstr "Une erreur s'est produite." #: src/SemanticScuttle/functions.php:202 msgid "General Error" -msgstr "Lỗi thông thường" +msgstr "Erreur générale." #: src/SemanticScuttle/functions.php:210 msgid "An critical error occured" -msgstr "Một lỗi nguy cấp đã xảy ra" +msgstr "Une erreur critique s'est produite." #: src/SemanticScuttle/functions.php:213 msgid "Critical Error" -msgstr "Lỗi nguy cấp" +msgstr "Erreur critique." #: src/SemanticScuttle/functions.php:222 msgid "DEBUG MODE" -msgstr "Chế độ gỡ rối" +msgstr "Mode de débogage." #: data/templates/about.tpl.php:6 msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere." -msgstr "<strong>Lưu trữ</strong>tất cả các đường links ở một nơi, có thể truy cập tại mọi nơi" +msgstr "<strong>Conservez</strong> tous vos signets au même endroit, accessibles de partout. " #: data/templates/about.tpl.php:7 msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private." -msgstr "<strong>Chia xẻ</strong> các trang ghi nhớ của bạn với tất cả mọi ngườii, bạn có thể chia xẻ với bạn bè trong danh sách hoặc giữ cá nhân." +msgstr "<strong>Partagez</strong> vos signets avec tout le monde, avec vos contacts ou gardez-les pour vous." #: data/templates/about.tpl.php:8 msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders." -msgstr "<strong>Gắn từ khoá/strong> những trang ghi nhớ của bạn với bất kì tên nào mà bạn muốn mà không phải làm việc với các thư mục" +msgstr "<strong>Taggez</strong> vos signets avec autant de labels que vous le souhaitez au lieu de les hiérarchiser avec des dossiers." #: data/templates/about.tpl.php:9 msgid "Register now" -msgstr "Đăng kí ngay bây giờ" +msgstr "S'enregistrer maintenant" #: data/templates/about.tpl.php:9 #, php-format msgid " to start using %s!" -msgstr "Bắt đầu sử dụng %s !" +msgstr "pour commencer à employer %s !" #: data/templates/about.tpl.php:12 msgid "Geek Stuff" @@ -93,45 +93,45 @@ msgstr "Pour les Geeks" #: data/templates/about.tpl.php:14 msgid "is licensed under the " -msgstr "phân dưới quyền" +msgstr "est sous licence" #: data/templates/about.tpl.php:14 msgid "you can freely host it on your own web server." -msgstr "Bạn có thể thoải mái cài đặt nó trên Web server của bạn" +msgstr "vous pouvez librement l'installer sur votre serveur Web" #: data/templates/about.tpl.php:15 #, php-format msgid "%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it." -msgstr "%1$s hỗ trợ phần lớn từ'<a href=\"http://del.icio.us/doc/api\"><abbr title=\"Ứng dụng lập trình giao diện\">API</abbr> del.icio.us</a>." +msgstr "%1$s supporte la plupart de l'<a href=\"http://del.icio.us/doc/api\"><abbr title=\"Application Programming Interface\">API</abbr> del.icio.us</a>." #: data/templates/about.tpl.php:24 msgid "Tips" -msgstr "Mẹo" +msgstr "Astuces" #: data/templates/about.tpl.php:26 msgid "Add search plugin into your browser:" -msgstr "Thêm một nút tìm kiếm vào trong trình duyệt của bạn:" +msgstr "Ajouter un plugin de recherche à votre navigateur :" #: data/templates/about.tpl.php:27 msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags." -msgstr "Thẻ bí mật \"system:unfiled\" cho phép bạn tìm thấy những trang ghi nhớ không có thẻ." +msgstr "Le tag secret \"system:unfiled\" vous permet de trouver les signets sans tags." #: data/templates/about.tpl.php:28 msgid "The secret tag \"system:imported\" allows you to find imported bookmarks." -msgstr "Từ khoá bí mật \"system:imported\" cho phép bạn tìm thấy những trang ghi nhớ quan trọng." +msgstr "Le tag secret \"system:imported\" vous permet de trouver les signets importés." #: data/templates/admin.tpl.php:5 msgid "Users management" -msgstr "Quản lí những người dùng" +msgstr "Gestion des utilisateurs" #: data/templates/admin.tpl.php:14 msgid "Public/Shared/Private" -msgstr "Công cộng/Chia xẻ/Cá nhân" +msgstr "Publique/Partagé/Privé" #: data/templates/admin.tpl.php:14 #: data/templates/bookmarks.tpl.php:93 msgid "bookmark(s)" -msgstr "Những trang ghi nhớ" +msgstr "signet(s)" #: data/templates/admin.tpl.php:19 #: data/templates/tag2tagadd.tpl.php:21 @@ -141,30 +141,30 @@ msgstr "Những trang ghi nhớ" #: data/templates/tagdelete.tpl.php:6 #: www/jsScuttle.php:23 msgid "Are you sure?" -msgstr "Bạn có chắc chắn không ?" +msgstr "Etes-vous sûr ?" #: data/templates/admin.tpl.php:19 #: data/templates/bookmarks.tpl.php:251 msgid "Delete" -msgstr "Xoá" +msgstr "Supprimer" #: data/templates/admin.tpl.php:27 msgid "Other actions" -msgstr "Những hành động khác" +msgstr "Autres actions" #: data/templates/admin.tpl.php:29 msgid "Check all URLs (May take some time)" -msgstr "Kiểm tra tất cả đường link (Có thể mất ít thời gian)" +msgstr "Vérifier toutes les URLs (Peut prendre du temps)" #: data/templates/bookmarkcommondescriptionedit.tpl.php:16 msgid "Collaborative description: these fields can be viewed and modified by every users" -msgstr "Sự mô tả cộng tác : những trường này có thể được nhìn thấy và được sửa đổi bởi tất cả những người dùng." +msgstr "Description collaborative : ces champs peuvent être vus et modifiés par tous les utilisateurs." #: data/templates/bookmarkcommondescriptionedit.tpl.php:18 #: data/templates/bookmarks.tpl.php:137 #: data/templates/editbookmark.tpl.php:38 msgid "Title" -msgstr "Tiêu đề" +msgstr "Titre" #: data/templates/bookmarkcommondescriptionedit.tpl.php:23 #: data/templates/editbookmark.tpl.php:44 @@ -173,18 +173,18 @@ msgstr "Tiêu đề" #: data/templates/tagcommondescriptionedit.tpl.php:13 #: data/templates/tagedit.tpl.php:12 msgid "Description" -msgstr "Mô tả" +msgstr "Description" #: data/templates/bookmarkcommondescriptionedit.tpl.php:31 #: data/templates/tagcommondescriptionedit.tpl.php:21 msgid "Last modification:" -msgstr "Những thay đổi cuối:" +msgstr "Dernière modification :" #: data/templates/bookmarkcommondescriptionedit.tpl.php:42 #: data/templates/tagcommondescriptionedit.tpl.php:32 #: data/templates/tagedit.tpl.php:18 msgid "Update" -msgstr "Cập nhật" +msgstr "Mettre à jour" #: data/templates/bookmarkcommondescriptionedit.tpl.php:43 #: data/templates/editbookmark.tpl.php:98 @@ -194,146 +194,146 @@ msgstr "Cập nhật" #: data/templates/tagedit.tpl.php:19 #: data/templates/tagrename.tpl.php:25 msgid "Cancel" -msgstr "Huỷ bỏ" +msgstr "Annuler" #: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24 #, php-format msgid "Voting <span class=\"voting\">%d</span>" -msgstr "Sự ủng hộ <span class=\"voting\">%d</span>" +msgstr "Vote <span class=\"voting\">%d</span>" #: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32 #: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35 msgid "Vote for" -msgstr "Ủng hộ cho" +msgstr "Vote pour" #: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43 #: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46 msgid "Vote against" -msgstr "Không ủng hộ" +msgstr "Vote contre" #: data/templates/bookmarks.tpl.php:26 msgid "Bookmarks on this page are managed by an admin user." -msgstr "Những trang ghi nhớ trên trang này được quản lí bởi một người quản trị." +msgstr "Les signets de cette page sont gérés par un administrateur." #: data/templates/bookmarks.tpl.php:51 #: data/templates/bookmarks.tpl.php:52 msgid "Edit the common description of this tag" -msgstr "Sửa mô tả chung của từ khoá này" +msgstr "Editer la description commune de ce tag" #: data/templates/bookmarks.tpl.php:55 #: data/templates/bookmarks.tpl.php:56 msgid "Edit the common description of this bookmark" -msgstr "Sửa mô tả chung của trang ghi nhớ này" +msgstr "Editer la description commune de ce signet" #: data/templates/bookmarks.tpl.php:76 #: data/templates/bookmarks.tpl.php:77 msgid "Edit your personal description of this tag" -msgstr "Sửa mô tả cá nhân của bạn của thẻ này" +msgstr "Editer votre description personnelle de ce tag" #: data/templates/bookmarks.tpl.php:93 #: data/templates/tags.tpl.php:10 #: data/templates/users.tpl.php:8 msgid "Sort by:" -msgstr "Sắp xếp bởi :" +msgstr "Classer par :" #: data/templates/bookmarks.tpl.php:135 msgid "Date" -msgstr "Ngày" +msgstr "Date" #: data/templates/bookmarks.tpl.php:140 msgid "Voting" -msgstr "Sự bầu cử" +msgstr "Vote" #: data/templates/bookmarks.tpl.php:149 msgid "Bookmarks from other users for this tag" -msgstr "Ghi nhớ trang từ những người dùng khác cho thẻ này" +msgstr "Signets des autres utilisateurs pour ce tag" #: data/templates/bookmarks.tpl.php:154 msgid "Only your bookmarks for this tag" -msgstr "Chỉ có những trang ghi nhớ của bạn" +msgstr "Uniquement vos signets pour ce tag" #: data/templates/bookmarks.tpl.php:177 #: data/templates/bookmarks.tpl.php:183 msgid "First" -msgstr "Đầu tiên" +msgstr "Première" #: data/templates/bookmarks.tpl.php:178 #: data/templates/bookmarks.tpl.php:184 msgid "Previous" -msgstr "Trước" +msgstr "Précédent" #: data/templates/bookmarks.tpl.php:191 #: data/templates/bookmarks.tpl.php:194 msgid "Next" -msgstr "Sau" +msgstr "Suivant" #: data/templates/bookmarks.tpl.php:192 #: data/templates/bookmarks.tpl.php:195 msgid "Last" -msgstr "Cuối cùng" +msgstr "Dernière" #: data/templates/bookmarks.tpl.php:205 #, php-format msgid "Page %d of %d" -msgstr "Trang %d của %d" +msgstr "Page %d de %d" #: data/templates/bookmarks.tpl.php:245 msgid "Tags:" -msgstr "Những từ khoá:" +msgstr "Tags:" #: data/templates/bookmarks.tpl.php:251 msgid "Edit" -msgstr "Sửa" +msgstr "Editer" #: data/templates/bookmarks.tpl.php:255 msgid "Last update" -msgstr "Lần cập nhật cuối" +msgstr "Date de dernière mise à jour" #: data/templates/bookmarks.tpl.php:258 msgid "by" -msgstr "bởi" +msgstr "par" #: data/templates/bookmarks.tpl.php:260 msgid "you" -msgstr "bạn" +msgstr "vous" #: data/templates/bookmarks.tpl.php:274 #, php-format msgid " and %s1 other%s" -msgstr "và %s1 khác%s" +msgstr " et %s1 autre%s" #: data/templates/bookmarks.tpl.php:277 #, php-format msgid " and %2$s%1$s others%3$s" -msgstr " và %2$s%1$s những cái khác%3$s" +msgstr " et %2$s%1$s autres%3$s" #: data/templates/bookmarks.tpl.php:288 msgid "Copy this bookmark to YOUR bookmarks." -msgstr "Copy trang ghi nhớ này vào những trang ghi nhớ của bạn." +msgstr "Copier ce signet dans VOS signets." #: data/templates/bookmarks.tpl.php:289 msgid "Copy" -msgstr "Copy" +msgstr "Copier" #: data/templates/bookmarks.tpl.php:309 msgid "This bookmark is certified by an admin user." -msgstr "Trang ghi nhớ này được bảo đảm bởi một người quản trị." +msgstr "Ce signet est certifié par un administrateur." #: data/templates/bookmarks.tpl.php:351 msgid "Private Note on this bookmark" -msgstr "Ghi chú cá nhân trên trang ghi nhớ này" +msgstr "Note privée sur ce signet" #: data/templates/bookmarks.tpl.php:363 msgid "Come back to the top of this page." -msgstr "Quay trở lại đầu trang này." +msgstr "Revenir en haut de cette page." #: data/templates/bookmarks.tpl.php:363 msgid "Top of the page" -msgstr "Đầu trang" +msgstr "Haut de page" #: data/templates/bookmarks.tpl.php:369 msgid "No bookmarks available" -msgstr "Không có trang ghi nhớ nào có sẵn." +msgstr "Pas de signets disponibles." #: data/templates/bottom.inc.php:5 #: data/templates/toolbar.inc.php:15 @@ -341,11 +341,11 @@ msgstr "Không có trang ghi nhớ nào có sẵn." #: www/about.php:23 #: www/about.php:24 msgid "About" -msgstr "Về" +msgstr "À propos" #: data/templates/bottom.inc.php:7 msgid "Propulsed by " -msgstr "Đã đẩy bởi" +msgstr "Propulsé par " #: data/templates/dynamictags.inc.php:47 #: data/templates/sidebar.block.common.php:19 @@ -354,7 +354,7 @@ msgstr "Đã đẩy bởi" #: data/templates/tags.tpl.php:19 msgid "bookmark" msgid_plural "bookmarks" -msgstr[0] "Trang ghi nhớ" +msgstr[0] "signet" msgstr[1] "Signets" #: data/templates/dynamictags.inc.php:128 @@ -365,15 +365,15 @@ msgstr[1] "Signets" #: data/templates/toolbar.inc.php:27 #: www/populartags.php:46 msgid "Popular Tags" -msgstr "Những thẻ phổ biến" +msgstr "Tags populaires" #: data/templates/dynamictags.inc.php:131 msgid "Popular Tags From All Users" -msgstr "Những thẻ phổ biến cho tất cả những người dùng" +msgstr "Tags populaires pour tous les utilisateurs" #: data/templates/editbookmark.tpl.php:33 msgid "Address" -msgstr "Địa chỉ" +msgstr "Adresse" #: data/templates/editbookmark.tpl.php:35 #: data/templates/editbookmark.tpl.php:40 @@ -381,78 +381,78 @@ msgstr "Địa chỉ" #: data/templates/tagrename.tpl.php:14 #: data/templates/tagrename.tpl.php:19 msgid "Required" -msgstr "Yêu cầu" +msgstr "Requis" #: data/templates/editbookmark.tpl.php:45 msgid "Add Note" -msgstr "Thêm vào ghi chú" +msgstr "Ajouter une note" #: data/templates/editbookmark.tpl.php:48 msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] " -msgstr "Bạn có thể sử dụng những nguồn tin cậy để xác định phạm vi những thuộc tính. Ví dụ : [publisher]blah[/publisher]" +msgstr "Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : [publisher]blah[/publisher]" #: data/templates/editbookmark.tpl.php:51 msgid "Suggested anchors: " -msgstr "Những gợi ý tin cậy : " +msgstr "Balises suggérées : " #: data/templates/editbookmark.tpl.php:63 msgid "Private Note" -msgstr "Ghi chú cá nhân" +msgstr "Note privée" #: data/templates/editbookmark.tpl.php:65 msgid "Just visible by you and your contacts." -msgstr "Chỉ được xem bới bạn và danh sách liên lạc của bạn" +msgstr "Visible uniquement par vous et vos contacts." #: data/templates/editbookmark.tpl.php:69 #: data/templates/toolbar.inc.php:10 #: www/tags.php:45 #: www/tags.php:67 msgid "Tags" -msgstr "Thẻ" +msgstr "Tags" #: data/templates/editbookmark.tpl.php:73 msgid "Comma-separated" -msgstr "Phân tách bởi những dấu phẩy" +msgstr "Séparés par des virgules" #: data/templates/editbookmark.tpl.php:77 #: data/templates/tag2tagadd.tpl.php:9 msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" -msgstr "Chú ý: sử dụng \">\" để cho một mô tả mối liên hệ giữa các thẻ. Ví dụ: Chau_Au>Phap>paris" +msgstr "Note: utiliser \">\" pour inclure un tag dans un autre. ex: europe>france>paris" #: data/templates/editbookmark.tpl.php:81 #: data/templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" -msgstr "Chú ý : sử dụng \"=\" để diễn tả hai thẻ tương đương nhau. Ví dụ: europe=eu" +msgstr "Note : utiliser \"=\" pour rendre deux tags synonymes ex: europe=eu" #: data/templates/editbookmark.tpl.php:84 #: data/templates/importDelicious.tpl.php:15 #: data/templates/importNetscape.tpl.php:16 msgid "Privacy" -msgstr "Riêng tư" +msgstr "Accès" #: data/templates/editbookmark.tpl.php:87 #: data/templates/importDelicious.tpl.php:18 #: data/templates/importNetscape.tpl.php:19 msgid "Public" -msgstr "Công cộng" +msgstr "Publique" #: data/templates/editbookmark.tpl.php:88 msgid "Shared with Watch List" -msgstr "Chia xẻ với danh sách liên hệ của tôi" +msgstr "Partagé avec mes contacts" #: data/templates/editbookmark.tpl.php:89 #: data/templates/importDelicious.tpl.php:20 #: data/templates/importNetscape.tpl.php:21 msgid "Private" -msgstr "cá nhân" +msgstr "Privée" #: data/templates/editbookmark.tpl.php:102 msgid "Delete Bookmark" -msgstr "Xoá trang ghi nhớ này" +msgstr "Supprimer le signet" #: data/templates/editbookmark.tpl.php:107 msgid "edit common description" -msgstr "Sửa mô tả chung" +msgstr "éditer la description commune" #: data/templates/editbookmark.tpl.php:134 msgid "Bookmarklet" @@ -461,35 +461,35 @@ msgstr "Bookmarklet" #: data/templates/editbookmark.tpl.php:140 #, php-format msgid "Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s" -msgstr "Click theo một trong những bookmarklets để thêm một nút, bạn có thể click bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s " +msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s " #: data/templates/editbookmark.tpl.php:144 #, php-format msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s" -msgstr "Click theo một trong những bookmarklets vào trình duyệt bookmark của bạn và click nó bất cứ khi nào bạn muốn thêm một trang cho trang hiện tại %s " +msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s " #: data/templates/editbookmark.tpl.php:157 #: data/templates/editbookmark.tpl.php:162 #, php-format msgid "Post to %s" -msgstr "Thêm vào %s" +msgstr "Ajouter à %s" #: data/templates/editbookmark.tpl.php:158 #: data/templates/editbookmark.tpl.php:163 #, php-format msgid "Post to %s (Pop-up)" -msgstr "Thêm vào %s (Pop-up)" +msgstr "Ajouter à %s (Pop-up)" #: data/templates/editbookmark.tpl.php:168 #: data/templates/importDelicious.tpl.php:26 #: data/templates/importNetscape.tpl.php:27 #: data/templates/importStructure.tpl.php:16 msgid "Import" -msgstr "Nhập " +msgstr "Importer" #: data/templates/editbookmark.tpl.php:170 msgid "Import bookmarks from bookmark file" -msgstr "Nạp những trang ghi nhớ từ một file " +msgstr "Importer les signets depuis un fichier" #: data/templates/editbookmark.tpl.php:170 msgid "Internet Explorer, Mozilla Firefox and Netscape" @@ -497,11 +497,11 @@ msgstr "Internet Explorer, Mozilla Firefox et Netscape" #: data/templates/editbookmark.tpl.php:171 msgid "Import bookmarks from del.icio.us" -msgstr "Nạp những trang ghi nhớ từ del.icio.us" +msgstr "Importer les signets depuis del.icio.us" #: data/templates/editprofile.tpl.php:10 msgid "Account Details" -msgstr "Tài khoản cụ thể" +msgstr "Détail du compte" #: data/templates/editprofile.tpl.php:14 #: data/templates/login.tpl.php:21 @@ -509,15 +509,15 @@ msgstr "Tài khoản cụ thể" #: data/templates/profile.tpl.php:6 #: data/templates/register.tpl.php:16 msgid "Username" -msgstr "Tên người dùng" +msgstr "Nom d'utilisateur" #: data/templates/editprofile.tpl.php:19 msgid "New Password" -msgstr "Mật khẩu mới" +msgstr "Nouveau mot de passe" #: data/templates/editprofile.tpl.php:24 msgid "Confirm Password" -msgstr "Xác nhận mật khẩu" +msgstr "Confirmer le mot de passe" #: data/templates/editprofile.tpl.php:29 #: data/templates/password.tpl.php:14 @@ -527,153 +527,153 @@ msgstr "E-mail" #: data/templates/editprofile.tpl.php:35 msgid "Personal Details" -msgstr "Chi tiết cá nhân" +msgstr "Détails personnels" #: data/templates/editprofile.tpl.php:39 #: data/templates/profile.tpl.php:17 msgid "Name" -msgstr "Tên" +msgstr "Nom" #: data/templates/editprofile.tpl.php:43 #: data/templates/profile.tpl.php:23 msgid "Homepage" -msgstr "Trang chủ" +msgstr "Page personnelle" #: data/templates/editprofile.tpl.php:52 #: www/edit.php:113 msgid "Save Changes" -msgstr "Lưu lại sự thay đổi" +msgstr "Enregistrer les modifications" #: data/templates/editprofile.tpl.php:55 #: data/templates/sidebar.block.tagactions.php:17 #: data/templates/sidebar.block.watchstatus.php:18 msgid "Actions" -msgstr "Những thao tác" +msgstr "Actions" #: data/templates/editprofile.tpl.php:58 msgid "Export bookmarks" -msgstr "Xuất những trang ghi nhớ" +msgstr "Exporter les signets" #: data/templates/editprofile.tpl.php:60 msgid "HTML file (for browsers)" -msgstr "file HTML (để duyệt)" +msgstr "Fichier HTML (pour navigateurs)" #: data/templates/editprofile.tpl.php:61 msgid "XML file (like del.icio.us)" -msgstr "file XML (như del.icio.us)" +msgstr "Fichier XML (comme del.icio.us)" #: data/templates/editprofile.tpl.php:62 msgid "CSV file (for spreadsheet tools)" -msgstr "file CSV (cho những công cụ lan truyền)" +msgstr "Fichier CSV (pour tableurs)" #: data/templates/error.404.tpl.php:5 msgid "Not Found" -msgstr "Không tìm thấy" +msgstr "Non trouvé" #: data/templates/error.404.tpl.php:6 msgid "The requested URL was not found on this server" -msgstr "Yêu cầu đường link đã không được tìm thấy trên server này." +msgstr "L'URL demandée n'a pas été trouvée sur ce serveur." #: data/templates/error.500.tpl.php:5 msgid "General server error" -msgstr "Lỗi tác độgn từ serveur." +msgstr "Erreur généralisée du serveur." #: data/templates/error.500.tpl.php:6 msgid "The requested URL could not be processed" -msgstr "Yêu cầu đường link không thể tìm thấy trên server này" +msgstr "L'URL demandée n'a pas été trouvée." #: data/templates/importDelicious.tpl.php:19 #: data/templates/importNetscape.tpl.php:20 msgid "Shared with Watchlist" -msgstr "Chia xẻ với danh sách liên lạc" +msgstr "Partagé avec mes contacts" #: data/templates/importDelicious.tpl.php:31 #: data/templates/importNetscape.tpl.php:32 #: data/templates/importStructure.tpl.php:21 msgid "Instructions" -msgstr "Giới thiệu" +msgstr "Instructions" #: data/templates/importDelicious.tpl.php:33 msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>" -msgstr "Đăng nhập vào <a href=\"http://del.icio.us/api/posts/all\">trang trích xuất từ del.icio.us</a>" +msgstr "Se connecter à la <a href=\"http://del.icio.us/api/posts/all\">page d'export de del.icio.us</a>" #: data/templates/importDelicious.tpl.php:34 msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer" -msgstr "Lưu file kết quả <abbr title=\"Extensible Markup Language\">XML</abbr> trên máy tính của bạn" +msgstr "Enregistrer le fichier <abbr title=\"Extensible Markup Language\">XML</abbr> résultant sur votre ordinateur" #: data/templates/importDelicious.tpl.php:35 msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB" -msgstr "Click <kbd>Browse...</kbd> để tìm thấy file trên máy tính của bạn. Kích cỡ tối đa của file không được vượt quá 1 MB" +msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" #: data/templates/importDelicious.tpl.php:36 #: data/templates/importNetscape.tpl.php:43 msgid "Select the default privacy setting for your imported bookmarks" -msgstr "Lựa chọn cài đặt mặc định cho những trang ghi nhớ được nạp vào" +msgstr "Selectionnez la vision par défaut à appliquer à vos signets importés" #: data/templates/importDelicious.tpl.php:37 #: data/templates/importNetscape.tpl.php:44 msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute" -msgstr "Click vào <kbd>Importer</kbd> để bắt đầu nạp những trang ghi nhớ; thao tác này có thể mất vài phút" +msgstr "Cliquez sur <kbd>Importer</kbd> pour débuter l'import des signets; cette opération peut prendre quelques minutes" #: data/templates/importNetscape.tpl.php:35 msgid "Export your bookmarks from your browser to a file" -msgstr "Xuất những trang ghi nhớ ra một file từ danh sách duyệt của bạn" +msgstr "Exporter vos signets dans un fichier depuis votre navigateur" #: data/templates/importNetscape.tpl.php:37 msgid "Internet Explorer: <kbd>File > Import and Export... > Export Favorites" -msgstr "Internet Explorer: <kbd>File > Nạp và Đưa ra... > Đưa ra những cái được ưa chuộng" +msgstr "Internet Explorer: <kbd>Ficher > Importer et Exporter... > Exporter les favoris" #: data/templates/importNetscape.tpl.php:38 msgid "Mozilla Firefox: <kbd>Bookmarks > Manage Bookmarks... > File > Export..." -msgstr "Mozilla Firefox: <kbd>Những trang đánh dấu >Quản lí những trang được đánh dấu... >File > Đưa rar..." +msgstr "Mozilla Firefox: <kbd>Marques-pages > Gérer les marques-pages... > Fichier > Exporter..." #: data/templates/importNetscape.tpl.php:39 msgid "Netscape: <kbd>Bookmarks > Manage Bookmarks... > Tools > Export..." -msgstr "Netscape: <kbd>Những trang đánh dấu > Quản lí những trang đánh dấu... > Những công cụ > Đưa ra..." +msgstr "Netscape: <kbd>Marques-pages > Gérer les marques-pages... > Outils > Exporter..." #: data/templates/importNetscape.tpl.php:42 msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB" -msgstr "Click <kbd>Browse...</kbd> để tìm thấy file chứa những trang ghi nhớ đã được lưu trên máy tính của bạn. Kích thước tối đa của file không vượt quá 1MB" +msgstr "Cliquez sur <kbd>Parcourir...</kbd> pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" #: data/templates/importStructure.tpl.php:24 msgid "Create your structure into a simple text file and following this model:" -msgstr "Tạo cấu trúc của bạn vào một file văn bản đơn giản theo mô hình sau" +msgstr "" #: data/templates/importStructure.tpl.php:35 msgid "Then import the file. The tags and their relations will be added to your profile." -msgstr "Sau khi nạp vào file này. Những thẻ này và mối liên hệ giữa chúng sẽ được thêm vào thông tin của bạn" +msgstr "" #: data/templates/login.tpl.php:13 msgid "Please activate cookies" -msgstr "Hãy kích hoạt việc xác nhận sử dụng dịch vụ" +msgstr "SVP activez les cookies" #: data/templates/login.tpl.php:26 #: data/templates/register.tpl.php:21 msgid "Password" -msgstr "Mật khẩu" +msgstr "Mot de passe" #: data/templates/login.tpl.php:28 msgid "Don't ask for my password for 2 weeks" -msgstr "Đừng hỏi mật khẩu của tôi trong 2 tuần" +msgstr "Ne pas demander mon mot de passe pendant 2 semaines" #: data/templates/login.tpl.php:32 #: data/templates/toolbar.inc.php:29 #: www/login.php:57 msgid "Log In" -msgstr "Đăng nhập" +msgstr "Se connecter" #: data/templates/login.tpl.php:36 msgid "Forgotten your password?" -msgstr "Có phải bạn đã quên mật khẩu ?" +msgstr "Avez-vous oublié votre mot de passe ?" #: data/templates/password.tpl.php:5 #, php-format msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you." -msgstr "Nếu bạn đã quên mật khẩu, %s có thể tạo ra một mật khẩu mới. Nhập vào tên đăng nhập và địa chỉ email của bạn trong mẫu dưới đây và chúng tôi sẽ gửi cho bạn một mật khẩu mới." +msgstr "Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. Entrez le nom d'utilisateur et l'adresse email de votre compte dans le formulaire ci-dessous et nous vous enverrons un nouveau mot de passe." #: data/templates/password.tpl.php:19 msgid "Generate Password" -msgstr "Phát sinh một mật khẩu" +msgstr "Générer un mot de passe" #: data/templates/profile.tpl.php:11 msgid "Email" @@ -681,359 +681,359 @@ msgstr "E-mail" #: data/templates/profile.tpl.php:28 msgid "Member Since" -msgstr "Thành viên trước đây" +msgstr "Membre depuis" #: data/templates/profile.tpl.php:40 #: data/templates/sidebar.block.watchlist.php:30 msgid "Watching" -msgstr "Những danh sách liên lạc của tôi" +msgstr "Mes contacts" #: data/templates/profile.tpl.php:55 #: data/templates/sidebar.block.watchlist.php:52 msgid "Watched By" -msgstr "Được xem bởi" +msgstr "Dans les contacts de" #: data/templates/profile.tpl.php:68 #: data/templates/toolbar.inc.php:9 msgid "Bookmarks" -msgstr "Những trang ghi nhớ" +msgstr "Signets" #: data/templates/profile.tpl.php:69 msgid "Go to bookmarks" -msgstr "Vào những trang ghi nhớ" +msgstr "Aller aux signets" #: data/templates/register.tpl.php:11 #, php-format msgid "Sign up here to create a free %s account. All the information requested below is required" -msgstr "Bạn đăng kí ở đây để tạo ra một tài khoản miến phí %s. Tất cả những thông tin yêu cầu dưới đây là cần thiết." +msgstr "Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les informations requises ci-dessous sont nécessaires." #: data/templates/register.tpl.php:18 msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)" -msgstr " ít nhất 5 kí tự, chứa chữ và số (không khoảng trống, không dấu chấm hoặc kí tự đặc biệt khác)" +msgstr " au moins 5 caractères, alphanumériques (pas d'espaces, pas de points ou autre caractère spécial)" #: data/templates/register.tpl.php:28 msgid " to send you your password if you forget it" -msgstr "để gửi cho bạn mật khẩu của bạn nếu bạn quên nó" +msgstr " pour vous envoyer votre mot de passe en cas de perte" #: data/templates/register.tpl.php:33 msgid "Antispam question" -msgstr "Câu hỏi chống thư rác" +msgstr "Question antispam" #: data/templates/register.tpl.php:41 #: data/templates/toolbar.inc.php:31 #: www/register.php:83 msgid "Register" -msgstr "Đăng kí" +msgstr "S'enregistrer" #: data/templates/search.menu.php:27 msgid "Search..." -msgstr "Tìm kiếm..." +msgstr "Chercher..." #: data/templates/search.menu.php:28 msgid "in" -msgstr "trong" +msgstr "dans" #: data/templates/search.menu.php:34 msgid "this user's bookmarks" -msgstr "những trang ghi nhớ của người dùng" +msgstr "les signets de cet utilisateur" #: data/templates/search.menu.php:39 msgid "my bookmarks" -msgstr "những trang ghi nhớ của tôi" +msgstr "mes signets" #: data/templates/search.menu.php:40 msgid "my watchlist" -msgstr "danh sách liên lạc của tôi" +msgstr "mes contacts" #: data/templates/search.menu.php:44 msgid "all bookmarks" -msgstr "tất cả những trang được ghi nhớ " +msgstr "tous les signets" #: data/templates/search.menu.php:54 msgid "Search" -msgstr "Tìm kiếm" +msgstr "Chercher" #: data/templates/sidebar.block.linked.php:51 msgid "Linked Tags" -msgstr "Liên kết những từ khoá" +msgstr "Tags structurés" #: data/templates/sidebar.block.linked.php:62 #: data/templates/sidebar.block.menu.php:46 msgid "Add new link" -msgstr "Tạo một liên kết" +msgstr "Créer un lien" #: data/templates/sidebar.block.linked.php:63 #: data/templates/sidebar.block.menu.php:47 msgid "Delete link" -msgstr "Xoá một liên kết" +msgstr "Supprimer un lien" #: data/templates/sidebar.block.menu.php:35 #, php-format msgid "Tags included into the tag '%s'" -msgstr "Những từ khoá chứa trong từ khoá '%s'" +msgstr "Tags inclus dans le tag '%s'" #: data/templates/sidebar.block.menu.php:35 msgid "Menu Tags" -msgstr "Danh sách từ khoá" +msgstr "Tags Menu" #: data/templates/sidebar.block.menu.php:68 msgid "See all your tags" -msgstr "Nhìn thấy tất cả thẻ của bạn" +msgstr "Voir tous vos tags" #: data/templates/sidebar.block.menu.php:68 msgid "all your tags" -msgstr "Tất cả thẻ của bạn" +msgstr "Tous vos tags" #: data/templates/sidebar.block.menu.php:70 msgid "See all tags from this user" -msgstr "Nhìn thấy tất cả từ khoá của người dùng này" +msgstr "Voir tous les tags de cet utilisateur" #: data/templates/sidebar.block.menu.php:70 msgid "all tags from this user" -msgstr "tất cả từ khoá từ người dùng này" +msgstr "tous les tags de cet utilisateur" #: data/templates/sidebar.block.menu.php:74 msgid "See popular tags" -msgstr "Nhìn thấy những từ khoá thông thường" +msgstr "Voir les tags populaires" #: data/templates/sidebar.block.menu2.php:25 msgid "Featured Menu Tags" -msgstr "Danh sách những từ khoá chính" +msgstr "Tags Principaux" #: data/templates/sidebar.block.menu2.php:29 msgid "This menu is composed of keywords (tags) organized by admins." -msgstr "Danh mục này đã được tạo từ các từ khoá (thẻ) và được sắp xếp bởi những người quản trị." +msgstr "Ce menu est composé de mots-clefs (tags) organisés par les administrateurs." #: data/templates/sidebar.block.recent.php:18 msgid "Recent Tags" -msgstr "Những từ khoá gần đây" +msgstr "Tags récents" #: data/templates/sidebar.block.related.php:26 msgid "Related Tags" -msgstr "Quan hệ các từ khoá" +msgstr "Tags en relation" #: data/templates/sidebar.block.search.php:15 msgid "Last Searches" -msgstr "Những tìm kiếm trước" +msgstr "Dernières recherches" #: data/templates/sidebar.block.search.php:24 msgid "Number of bookmarks for this query" -msgstr "Tổng số trang ghi nhớ tìm thấy cho truy vấn này" +msgstr "Nombre de signets pour cette recherche" #: data/templates/sidebar.block.tagactions.php:9 #: www/tagrename.php:72 msgid "Rename Tag" msgid_plural "Rename Tags" -msgstr[0] "Thay đổi tên từ khoá" +msgstr[0] "Renommer le tag" msgstr[1] "Renommer les tags" #: data/templates/sidebar.block.tagactions.php:22 #: www/tagdelete.php:54 msgid "Delete Tag" -msgstr "Xoá từ khoá" +msgstr "Supprimer le tag" #: data/templates/sidebar.block.tagactions.php:24 #: www/tagedit.php:61 msgid "Edit Tag Description" -msgstr "Sửa mô tả của từ khoá" +msgstr "Editer la description du tag" #: data/templates/sidebar.block.tagactions.php:26 #: www/tagcommondescriptionedit.php:64 msgid "Edit Tag Common Description" -msgstr "Sửa mô tả chung của từ khoá" +msgstr "Editer la description commune du tag" #: data/templates/sidebar.block.tagactions.php:28 msgid "Create a link to another tag" -msgstr "Tạo một liên kết với một từ khoá khác" +msgstr "Créer un lien vers un autre tag" #: data/templates/sidebar.block.users.php:14 msgid "New Users" -msgstr "Những người dùng mới" +msgstr "Nouveaux Utilisateurs" #: data/templates/sidebar.block.users.php:23 #: data/templates/users.tpl.php:17 msgid "bookmarks" -msgstr "Danh mục những trang ghi nhớ" +msgstr "signets" #: data/templates/sidebar.block.users.php:30 msgid "See all users" -msgstr "Nhìn thấy tất cả người dùng" +msgstr "Voir tous les utilisateurs" #: data/templates/sidebar.block.users.php:30 msgid "All users" -msgstr "Tất cả người dùng" +msgstr "Tous les utilisateurs" #: data/templates/sidebar.block.watchlist.php:19 msgid "Close contacts are mutual contacts" -msgstr "Những danh sách liên lạc gần nhau là những danh sách liên lạc tương hỗ với nhau" +msgstr "Les contacts proches sont des contacts mutuels" #: data/templates/sidebar.block.watchlist.php:19 msgid "Close contacts" -msgstr "Danh sách liên lạc gần nhau" +msgstr "Contacts proches" #: data/templates/sidebar.block.watchlist.php:36 msgid "Add a contact..." -msgstr "Thêm một liên lạc..." +msgstr "Ajouter un contact..." #: data/templates/sidebar.block.watchlist.php:36 msgid "Type a username to add it to your contacts." -msgstr "Nhập vào tên truy cập để thêm vào danh sách liên lạc của bạn." +msgstr "Entrer un nom d'utilisateur pour l'ajouter à vos contacts." #: data/templates/sidebar.block.watchlist.php:44 msgid "Remove this contact" -msgstr "Bỏ liên lạc này" +msgstr "Enlever ce contact" #: data/templates/sidebar.block.watchstatus.php:11 msgid "Remove from Watchlist" -msgstr "Rời bỏ từ danh sách liên lạc" +msgstr "Enlever des contacts" #: data/templates/sidebar.block.watchstatus.php:13 msgid "Add to Watchlist" -msgstr "Thêm vào danh sách liên lạc" +msgstr "Ajouter aux contacts" #: data/templates/sidebar.linkedtags.inc.php:18 msgid "Edit link" -msgstr "Sửa một liên kết" +msgstr "Editer un lien" #: data/templates/sidebar.linkedtags.inc.php:47 msgid "Synonyms:" -msgstr "Đồng nghĩa :" +msgstr "Synonymes :" #: data/templates/tag2tagadd.tpl.php:12 msgid "Create new link:" -msgstr "Tạo một mối liên kết mới" +msgstr "Créer un nouveau lien" #: data/templates/tag2tagadd.tpl.php:19 #, php-format msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" -msgstr "Chú ý : gồm có một từ khoá chứa trong trong từ khoá'%s' (e.g. %s>Những lĩnh vực) để hiển thị từ khoá này trong hộp danh mục" +msgstr "Note : inclure un tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu" #: data/templates/tag2tagadd.tpl.php:23 #: data/templates/tag2tagedit.tpl.php:37 msgid "Create" -msgstr "Tạo " +msgstr "Créer" #: data/templates/tag2tagadd.tpl.php:35 #: data/templates/tag2tagdelete.tpl.php:27 #: data/templates/tag2tagedit.tpl.php:51 msgid "Existing links:" -msgstr "Những liên kết hiện có :" +msgstr "Liens existants :" #: data/templates/tag2tagadd.tpl.php:53 #: data/templates/tag2tagdelete.tpl.php:45 #: data/templates/tag2tagedit.tpl.php:69 msgid "No links" -msgstr "Không có liên kết nào" +msgstr "Pas de liens" #: data/templates/tag2tagdelete.tpl.php:15 #: data/templates/tag2tagedit.tpl.php:16 #: data/templates/tagdelete.tpl.php:8 #: www/jsScuttle.php:23 msgid "Yes" -msgstr "Đúng" +msgstr "Oui" #: data/templates/tag2tagdelete.tpl.php:16 #: data/templates/tag2tagedit.tpl.php:17 #: data/templates/tagdelete.tpl.php:9 #: www/jsScuttle.php:23 msgid "No" -msgstr "Không" +msgstr "Non" #: data/templates/tag2tagedit.tpl.php:6 msgid "Delete the link" -msgstr "Xoá liên kết này" +msgstr "Supprimer le lien" #: data/templates/tag2tagedit.tpl.php:29 msgid "Create new link" -msgstr "Tạo một liên kết mới" +msgstr "Créer un nouveau lien" #: data/templates/tagrename.tpl.php:12 msgid "Old" -msgstr "Cũ" +msgstr "Ancien" #: data/templates/tagrename.tpl.php:17 msgid "New" -msgstr "Mới" +msgstr "Nouveau" #: data/templates/tagrename.tpl.php:24 msgid "Rename" -msgstr "Đổi tên" +msgstr "Renommer" #: data/templates/tags.tpl.php:11 #: data/templates/users.tpl.php:9 msgid "Alphabet" -msgstr "Bảng chữ cái" +msgstr "Alphabet" #: data/templates/tags.tpl.php:12 #: data/templates/users.tpl.php:10 msgid "Popularity" -msgstr "Phổ biến" +msgstr "Popularité" #: data/templates/toolbar.inc.php:8 #: data/templates/toolbar.inc.php:26 msgid "Home" -msgstr "Chủ" +msgstr "Accueil" #: data/templates/toolbar.inc.php:11 #: www/watchlist.php:106 msgid "Watchlist" -msgstr "Danh mục liên lạc" +msgstr "Contacts" #: data/templates/toolbar.inc.php:12 #: www/profile.php:67 msgid "Profile" -msgstr "Mô tả cá nhân" +msgstr "Profil" #: data/templates/toolbar.inc.php:13 #: www/bookmarks.php:209 msgid "Add a Bookmark" -msgstr "Thêm một trang ghi nhớ" +msgstr "Ajouter un signet" #: data/templates/toolbar.inc.php:14 msgid "Log Out" -msgstr "Thoát" +msgstr "Quitter" #: data/templates/toolbar.inc.php:17 msgid "Admin" -msgstr "Quản trị" +msgstr "Admin" #: data/templates/top.inc.php:49 msgid "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in \"Normal Mode\" and hide debugging messages, change $debugMode to false into config.php." -msgstr "Quản trị, sự cài đặt của bạn o trong \"Mode Debug\" ($debugMode = true). Để đến \"Mode Normal\" và ẩn những thông báo gỡ rối, thay đổi $debugMode thành false ở trong config.inc.php." +msgstr "Admins, votre installation est en \"Mode Debug\" ($debugMode = true). Pour passer en \"Mode Normal\" et cacher les messages de debuggage, changez $debugMode à false dans config.inc.php." #: data/templates/users.tpl.php:17 msgid "profile" -msgstr "thông tin cá nhân" +msgstr "Profil" #: data/templates/users.tpl.php:17 msgid "created in" -msgstr "Tạo trong" +msgstr "Créé en " #: www/admin.php:32 msgid "Manage users" -msgstr "Quản lí những người dùng" +msgstr "Gérer les utilisateurs" #: www/admin.php:68 #, php-format msgid "%s and all his bookmarks and tags were deleted." -msgstr "%s, tất cả những trang ghi nhớ và những thẻ bị xoá." +msgstr "%s, ses signets et ses tags ont été effacés." #: www/admin.php:75 msgid "Problem with " -msgstr "Có vấn đề với " +msgstr "Problème avec " #: www/ajaxDelete.php:37 msgid "You are not allowed to delete this bookmark" -msgstr "Bạn đã không cho phép xoá trang ghi nhớ này" +msgstr "Vous n'êtes pas autorisés à supprimer ce signet" #: www/ajaxDelete.php:41 #: www/edit.php:103 msgid "Failed to delete bookmark" -msgstr "Có lỗi trong việc xoá trang ghi nhớ này" +msgstr "Erreur dans la suppression du signet" #: www/alltags.php:49 msgid "All Tags" -msgstr "Tất cả từ khoá" +msgstr "Tous les tags" #: www/alltags.php:55 #: www/bookmarks.php:96 @@ -1045,7 +1045,7 @@ msgstr "Tất cả từ khoá" #: www/watchlist.php:61 #, php-format msgid "User with username %s was not found" -msgstr "Tên đăng nhập %s đã không tìm thấy." +msgstr "L'utilisateur %s n'a pas été trouvé." #: www/bookmarkcommondescriptionedit.php:51 #: www/tag2tagadd.php:37 @@ -1054,389 +1054,389 @@ msgstr "Tên đăng nhập %s đã không tìm thấy." #: www/tagcommondescriptionedit.php:43 #: www/tagedit.php:43 msgid "Permission denied." -msgstr "Cho phép từ chối." +msgstr "Permission non accordée." #: www/bookmarkcommondescriptionedit.php:60 msgid "Bookmark common description updated" -msgstr "Cập nhật mô tả trang ghi nhớ." +msgstr "Description commune du signet mise à jour." #: www/bookmarkcommondescriptionedit.php:63 msgid "Failed to update the bookmark common description" -msgstr "Có lỗi trong việc cập nhật mô tả trang ghi nhớ" +msgstr "Erreur dans la mise à jour de la description du signet" #: www/bookmarkcommondescriptionedit.php:71 msgid "Edit Bookmark Common Description" -msgstr "Sửa mô tả trang ghi nhớ" +msgstr "Editer la description commune du signet" #: www/bookmarks.php:111 #: www/tags.php:47 msgid "Remove the tag from the selection" -msgstr "Huỷ bỏ từ khoá đã chọn" +msgstr "Retirer le tag de la sélection" #: www/bookmarks.php:131 #: www/edit.php:65 msgid "Your bookmark must have a title and an address" -msgstr "Trang ghi nhớ của bạn phải có một tiêu đề tóm tắt và một địa chỉ của trang đó." +msgstr "Votre signet doit avoir un titre et une adresse." #: www/bookmarks.php:152 #: www/edit.php:83 #: www/edit.php:86 msgid "Bookmark saved" -msgstr "Lưu lại trang ghi nhớ này." +msgstr "Signet enregistré." #: www/bookmarks.php:152 msgid "(Come back to previous page.)" -msgstr "(Quay lại trang trước đó.)" +msgstr "(Revenir à la page précédente.)" #: www/bookmarks.php:159 #: www/import.php:106 #: www/importNetscape.php:108 msgid "There was an error saving your bookmark. Please try again or contact the administrator." -msgstr "Có lỗi trong việc lưu lại trang ghi nhớ này. Hãy thử lại hoặc liên lạc với người quản trị." +msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." #: www/bookmarks.php:216 msgid "Add Bookmark" -msgstr "Thêm một trang ghi nhớ" +msgstr "Ajouter signet" #: www/bookmarks.php:219 msgid "You must be logged in before you can add bookmarks." -msgstr "Để thêm một trang ghi nhớ bạn phải đăng nhập." +msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets." #: www/bookmarks.php:274 #: www/bookmarks.php:275 msgid "My Bookmarks" -msgstr "Những trang ghi nhớ của tôi" +msgstr "Mes signets" #: www/edit.php:44 #: www/edit.php:45 msgid "Edit Bookmark" -msgstr "Sửa trang ghi nhớ" +msgstr "Editer le signet" #: www/edit.php:51 #, php-format msgid "Bookmark with id %s not was not found" -msgstr "Trang ghi nhớ với tên %s đã không tìm thấy" +msgstr "Signet %s non trouvé" #: www/edit.php:57 msgid "You are not allowed to edit this bookmark" -msgstr "Bạn đã không cho phép sửa trang ghi nhớ này." +msgstr "Vous n'êtes pas autorisé à éditer ce signet." #: www/edit.php:77 msgid "Error while saving your bookmark" -msgstr "Có lỗi trong khi lưu lại trang ghi nhớ của bạn." +msgstr "Erreur pendant l'enregistrement de votre signet." #: www/history.php:61 msgid "History" -msgstr "Lưu vết quá trình" +msgstr "Historique" #: www/history.php:62 #, php-format msgid "History for %s" -msgstr "Lưu vết quá trình cho %s" +msgstr "Historique de %s" #: www/history.php:84 msgid "Address was not found" -msgstr "Địa chỉ này đã không tìm thấy." +msgstr "L'adresse n'a pas été trouvée." #: www/import.php:47 msgid "Could not open XML input" -msgstr "Không thể mở dữ liệu XML." +msgstr "Impossible d'ouvrir le flux XML." #: www/import.php:51 #, php-format msgid "XML error: %s at line %d" -msgstr "Lỗi XML: %s tại đường truyền %d" +msgstr "Erreur XML: %s à la ligne %d" #: www/import.php:60 msgid "Import Bookmarks from del.icio.us" -msgstr "Nạp vào những trang ghi nhớ từ del.icio.us" +msgstr "Importer les signet depuis del.icio.us" #: www/import.php:93 msgid "You have already submitted this bookmark." -msgstr "Bạn vừa nhập trang ghi nhớ này." +msgstr "Vous avez déjà enregistré ce signet." #: www/import.php:104 msgid "Bookmark imported." -msgstr "Trang ghi nhớ này đã nạp." +msgstr "Signet importé." #: www/importNetscape.php:95 msgid "You have already submitted some of these bookmarks." -msgstr "Bạn vừa nhập một trong số những trang ghi nhớ này." +msgstr "Vous avez déjà enregistré certains de ces signets." #: www/importNetscape.php:115 msgid "Bookmarks found: " -msgstr "Trang ghi nhớ này đã được tìm thấy :" +msgstr "Signets trouvés :" #: www/importNetscape.php:116 msgid "Bookmarks imported: " -msgstr "Những trang ghi nhớ đã nạp :" +msgstr "Signets importés :" #: www/importNetscape.php:117 #: www/importNetscape.php:122 msgid "Import Bookmarks from Browser File" -msgstr "Nạp những trang ghi nhớ này từ một file trong danh sách duyệt" +msgstr "Importer les signets depuis un fichier" #: www/importStructure.php:61 msgid "Bad indentation" -msgstr "Xác định kém" +msgstr "Mauvaise indentation" #: www/importStructure.php:67 msgid "New links between tags: " -msgstr "Liên kết mới giữa các từ khoá :" +msgstr "Nouveau lien entre tags :" #: www/importStructure.php:72 msgid "Import Structure" -msgstr "Nạp một cấu trúc" +msgstr "Importer une structure" #: www/index.php:38 msgid "You have now logged out" -msgstr "Bạn vừa thoátt khỏi" +msgstr "Vous êtes maintenant déconnecté." #: www/index.php:45 #, php-format msgid "%s: Recent bookmarks" -msgstr "%s: Những trang ghi nhớ gần đây" +msgstr "%s: Signets récents" #: www/index.php:78 msgid "Store, share and tag your favourite links" -msgstr "Lưu trữ, chia xẻ và gán từ khoá cho những liên kết yêu thích của bạn" +msgstr "Conservez, partagez et taggez vos liens favoris" #: www/index.php:79 msgid "All Bookmarks" -msgstr "Tất cả các trang ghi nhớ" +msgstr "Tous les signets" #: www/jsScuttle.php:70 msgid "Available" -msgstr "Có giá trị" +msgstr "Disponible" #: www/jsScuttle.php:73 msgid "Not Available" -msgstr "Không có giá trị" +msgstr "Non Disponible" #: www/login.php:48 msgid "The details you have entered are incorrect. Please try again." -msgstr "Những thông tin bạn đã nhập không chính xác. Hãy thử lại." +msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recommencer." #: www/password.php:36 msgid "You must enter your username." -msgstr "Bạn phải nhập vào tên truy cập." +msgstr "Vous devez entrer votre nom d'utilisateur." #: www/password.php:40 msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address." -msgstr "Bạn <em>phải</em> đưa ra một <abbr title=\"địa chỉ \">E-mail</abbr>." +msgstr "Vous <em>devez</em> saisir une <abbr title=\"adresse électronique\">E-mail</abbr>." #: www/password.php:48 msgid "No matches found for that username." -msgstr "Không có tên truy cập này." +msgstr "Rien de trouvé pour ce nom d'utilisateur." #: www/password.php:51 msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address." -msgstr "Không phù hợp giữa tên người dùng này và <abbr title=\"địachỉ email nàyl\">e-mail</abbr>." +msgstr "Pas d'entrée pour ce nom d'utilisateur et cet <abbr title=\"adresse mail\">e-mail</abbr>." #: www/password.php:59 msgid "There was an error while generating your new password. Please try again." -msgstr "Đã có lỗi trong khi nhập trang ghi nhớ này. Hãy thử lại hoặc liên lạc với người quản trị." +msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." #: www/password.php:63 msgid "Your new password is:" -msgstr "Mật khẩu mới của bạn là:" +msgstr "Votre nouveau mot de passe est:" #: www/password.php:63 msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in." -msgstr "Để giữ an toàn và bảo mật cho những trang ghi nhớ của bạn, bạn nên thay đổi mật khẩu trong mô tả cá nhân cho lần đăng nhập sau." +msgstr "Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans votre profil lors de votre prochaine authentification." #: www/password.php:66 #, php-format msgid "%s Account Information" -msgstr "Thông tin tài khoản %s" +msgstr "Informations du compte de %s" #: www/password.php:68 #, php-format msgid "New password generated and sent to %s" -msgstr "Mật khẩu mới sẽ được gửi đến địa chỉ email %s" +msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s" #: www/password.php:75 msgid "Forgotten Password" -msgstr "Quên mật khẩu" +msgstr "Mot de passe oublié" #: www/profile.php:59 #: www/watchlist.php:119 msgid "Username was not specified" -msgstr "Tên truy cập đã không chỉ rõ ." +msgstr "Le nom d'utilisateur n'a pas été spécifié." #: www/profile.php:65 msgid "My Profile" -msgstr "Hồ sơ cá nhân" +msgstr "Mon Profil" #: www/profile.php:89 msgid "Invalid Token" -msgstr "Token không có hiệu lực" +msgstr "Token invalide" #: www/profile.php:94 msgid "Password and confirmation do not match." -msgstr "Mật khẩu không tương thích với tên truy cập." +msgstr "Le mot de passe et sa vérification ne correspondent pas." #: www/profile.php:98 msgid "Password must be at least 6 characters long." -msgstr "Mật khẩu phải chứa ít nhất 6 kí tự." +msgstr "Le mot de passe doit avoir au moins 6 caractères." #: www/profile.php:102 msgid "E-mail address is not valid." -msgstr "Địa chỉ email không có giá trị." +msgstr "Adresse de courrier électronique invalide." #: www/profile.php:106 msgid "An error occurred while saving your changes." -msgstr "Có một lỗi xuất hiện trong khi lưu lại những sửa đổi của bạn." +msgstr "Une erreur s'est produite pendant l'enregistrement de vos modifications." #: www/profile.php:108 msgid "Changes saved." -msgstr "Lưu lại những thay đổi." +msgstr "Modifications enregistrées." #: www/register.php:46 msgid "You <em>must</em> enter a username, password and e-mail address." -msgstr "Bạn <em>phải</em> đưa ra một tên truy cập, một mật khẩu, một <abbr title=\"điạ chỉ email\">e-mail</abbr>" +msgstr "Vous <em>devez</em> saisir un nom d'utilisateur, un mot de passe, un nom et un <abbr title=\"adresse électronique\">e-mail</abbr>" #: www/register.php:50 msgid "This username has been reserved, please make another choice." -msgstr "Tên truy cập này đã được đăng kí, hãy chọn tên khác." +msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." #: www/register.php:54 msgid "This username already exists, please make another choice." -msgstr "Tên truy cập này đã tồn tại, hãy chọn một tên khác." +msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." #: www/register.php:58 msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice." -msgstr "Tên truy cập này không được xác nhận (quá ngắn, quá dài, kí tự cấm...), hãy tạo tên khác." +msgstr "Ce nom d'utilisateur n'est pas valide (trop court, trop long, caractères interdits...), Merci de faire un autre choix." #: www/register.php:62 msgid "E-mail address is not valid. Please try again." -msgstr "Địa chỉ email không được xác nhận. Hãy thử lại." +msgstr "Adresse de courrier électronique invalide. Veuillez réessayer." #: www/register.php:66 msgid "Antispam answer is not valid. Please try again." -msgstr "Câu trả lời chống thư rác không được xác nhận. hãy thử lại." +msgstr "La réponse antispam n'est pas valide. Veuillez réessayer." #: www/register.php:75 msgid "You have successfully registered. Enjoy!" -msgstr "Bạn đã đăng kí thành công!" +msgstr "Votre inscription a bien été prise en compte !" #: www/register.php:77 msgid "Registration failed. Please try again." -msgstr "Đăng kí thất bại. hãy thử làm lại." +msgstr "Enregistrement raté. Veuillez rééssayer." #: www/rss.php:84 #, php-format msgid "Recent bookmarks posted to %s" -msgstr "Những trang ghi nhớ gần đây %s" +msgstr "Signets ajoutés récemment à %s" #: www/search.php:81 #: www/search.php:145 msgid "Search Bookmarks" -msgstr "Tìm kiếm trang ghi nhớ" +msgstr "Recherche de signets" #: www/search.php:87 msgid "Search Results" -msgstr "Kêt quả tìm kiếm" +msgstr "Résultats de recherche" #: www/search.php:135 msgid "Unsatisfied? You can also try our " -msgstr "Có phải bạn không vừa lòng? Bạn có thể thử của chúng tôi " +msgstr "Insatisfait ? Vous pouvez aussi essayer notre " #: www/tag2tagadd.php:50 msgid "Tag link created" -msgstr "Liên kết giữa các từ khoá được tạo." +msgstr "Lien entre tags créé." #: www/tag2tagadd.php:53 msgid "Failed to create the link" -msgstr "Không thể tạo liên kết này" +msgstr "Impossible de créer le lien" #: www/tag2tagadd.php:65 msgid "Add Tag Link" -msgstr "Thêm một liên kết giữa các từ khoá" +msgstr "Ajout d'un lien entre tags" #: www/tag2tagdelete.php:66 msgid "Tag link deleted" -msgstr "Xoá một liên kết từ khoá" +msgstr "Effacement d'un lien entre tags" #: www/tag2tagdelete.php:69 msgid "Failed to delete the link" -msgstr "Không thể xoá liên kết này" +msgstr "Impossible d'effacer le lien" #: www/tag2tagdelete.php:81 msgid "Delete Link Between Tags" -msgstr "Xoá một liên kết giữa các từ khoá" +msgstr "Effacer un lien entre tags" #: www/tag2tagedit.php:55 msgid "Edit Link Between Tags" -msgstr "Sửa một liên kết giữa các từ khoá" +msgstr "Editer un lien entre tags" #: www/tagcommondescriptionedit.php:55 msgid "Tag common description updated" -msgstr "Sửa mô tả chung của từ khoá" +msgstr "Editer la description commune du tag" #: www/tagcommondescriptionedit.php:58 msgid "Failed to update the tag common description" -msgstr "Không thể cập nhật mô tả chung của từ khoá" +msgstr "Impossible de mettre à jour la description commune du tag" #: www/tagdelete.php:43 msgid "Tag deleted" -msgstr "Từ khoá đã được xoá" +msgstr "Tag effacé" #: www/tagdelete.php:46 msgid "Failed to delete the tag" -msgstr "Không thể xoá từ khoá này" +msgstr "Impossible d'effacer le tag" #: www/tagedit.php:52 msgid "Tag description updated" -msgstr "Mô tả của từ khoá đã được cập nhật" +msgstr "Description du tag mise à jour" #: www/tagedit.php:55 msgid "Failed to update the tag description" -msgstr "Không thể cập nhật mô tả của từ khoá" +msgstr "Impossible de mettre à jour la description du tag" #: www/tagrename.php:63 msgid "Tag renamed" -msgstr "Từ khoá đã được đổi tên" +msgstr "Tag renommé" #: www/tagrename.php:66 msgid "Failed to rename the tag" -msgstr "Lỗi trong việc đổi tên từ khoá" +msgstr "Erreur dans le renommage du tag" #: www/users.php:31 msgid "Users" -msgstr "Những người tham gia" +msgstr "Utilisateurs" #: www/watch.php:54 msgid "User removed from your watchlist" -msgstr "Tên truy cập đã dời khỏi danh sách liên lạc của bạn" +msgstr "Utilisateur enlevé de vos contacts" #: www/watch.php:56 msgid "User added to your watchlist" -msgstr "Tên truy cập đã được thêm vào danh sách liên lạc của bạn" +msgstr "Utilisateur ajouté à vos contacts" #: www/watchlist.php:104 msgid "My Watchlist" -msgstr "Danh sách liên lạc của tôi" +msgstr "Mes Contacts" #: www/api/httpauth.inc.php:11 msgid "Use of the API calls requires authentication." -msgstr "Sử dụng API để gọi yêu cầu chính thức." +msgstr "L'utilisation de l'API requiert une authentification." #: www/gsearch/index.php:27 msgid "Come back to " -msgstr "Quay lại" +msgstr "Revenir à" #: www/gsearch/index.php:32 msgid "Admin tips: " -msgstr "Lời khuyên của quản trị:" +msgstr "Conseil pour admin:" #: www/gsearch/index.php:33 msgid "To refresh manually Google Custom Search Engine, goes to: " -msgstr "Để khởi động lại điều khiển bằng tay của máy tìm kiếm Google, hãy đến :" +msgstr "Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :" #: www/gsearch/index.php:35 msgid "If no result appears, check that all the urls are valid in the admin section." -msgstr "Nếu không có kết quả nào xuất hiệnt, hãy kiểm tra lại tất cả các đường link được xác nhận trong phần quản lí." +msgstr "Si aucun résultat apparaît, vérifier que toutes les urls sont valides dans la section admin." #~ msgid "Add this tag to the query" #~ msgstr "Ajouter ce tag à la requête" diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.mo b/data/locales/ru_RU/LC_MESSAGES/messages.mo Binary files differnew file mode 100644 index 0000000..7a68b6c --- /dev/null +++ b/data/locales/ru_RU/LC_MESSAGES/messages.mo diff --git a/data/locales/ru_RU/LC_MESSAGES/messages.po b/data/locales/ru_RU/LC_MESSAGES/messages.po new file mode 100644 index 0000000..4bf666e --- /dev/null +++ b/data/locales/ru_RU/LC_MESSAGES/messages.po @@ -0,0 +1,1416 @@ +# SemanticScuttle ru_RU Translation +# Copyright (C) 2005 - 2009 SemanticScuttle project +# This file is distributed under the same license as the SemanticScuttle package. +# Sergey Ulitin <serge.ulitin@gmail.com> +# +msgid "" +msgstr "" +"Project-Id-Version: Semantic Scuttle\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-06-04 11:33+0200\n" +"PO-Revision-Date: 2010-04-30 02:35+0400\n" +"Last-Translator: Sergey Ulitin <serge.ulitin@gmail.com>\n" +"Language-Team: Sergey Ulitin <serge.ulitin@gmail.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Russian\n" +"X-Poedit-Country: Russia\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../../../about.php:23 +#: ../../../about.php:24 +#: ../../../templates/bottom.inc.php:5 +#: ../../../templates/toolbar.inc.php:15 +#: ../../../templates/toolbar.inc.php:28 +msgid "About" +msgstr "О сайте" + +#: ../../../admin.php:32 +msgid "Manage users" +msgstr "Управление пользователями" + +#: ../../../admin.php:68 +#, php-format +msgid "%s and all his bookmarks and tags were deleted." +msgstr "%s и всего закладки и тэги удалены." + +#: ../../../admin.php:75 +msgid "Problem with " +msgstr "Возникла проблема с" + +#: ../../../ajaxDelete.php:37 +msgid "You are not allowed to delete this bookmark" +msgstr "У Вас нет прав на удаление этой закладки" + +#: ../../../ajaxDelete.php:41 +#: ../../../edit.php:103 +msgid "Failed to delete bookmark" +msgstr "Ошибка при удалении закладки" + +#: ../../../alltags.php:49 +msgid "All Tags" +msgstr "Все тэги" + +#: ../../../alltags.php:55 +#: ../../../bookmarks.php:96 +#: ../../../populartags.php:52 +#: ../../../profile.php:51 +#: ../../../rss.php:67 +#: ../../../search.php:101 +#: ../../../watch.php:45 +#: ../../../watchlist.php:61 +#, php-format +msgid "User with username %s was not found" +msgstr "Пользователь с именем %s не найден" + +#: ../../../bookmarkcommondescriptionedit.php:51 +#: ../../../tag2tagadd.php:37 +#: ../../../tag2tagdelete.php:41 +#: ../../../tag2tagedit.php:33 +#: ../../../tagcommondescriptionedit.php:43 +#: ../../../tagedit.php:43 +msgid "Permission denied." +msgstr "Доступ запрещен." + +#: ../../../bookmarkcommondescriptionedit.php:60 +msgid "Bookmark common description updated" +msgstr "Описание закладки обновлено" + +#: ../../../bookmarkcommondescriptionedit.php:63 +msgid "Failed to update the bookmark common description" +msgstr "Ошибка при изменении описания закладки" + +#: ../../../bookmarkcommondescriptionedit.php:71 +msgid "Edit Bookmark Common Description" +msgstr "Изменить описание закладки" + +#: ../../../bookmarks.php:111 +#: ../../../tags.php:47 +msgid "Remove the tag from the selection" +msgstr "Remove the tag from the selection" + +#: ../../../bookmarks.php:131 +#: ../../../edit.php:65 +msgid "Your bookmark must have a title and an address" +msgstr "Закладка должна иметь название и адрес" + +#: ../../../bookmarks.php:152 +#: ../../../edit.php:83 +#: ../../../edit.php:86 +msgid "Bookmark saved" +msgstr "Закладка сохранена" + +#: ../../../bookmarks.php:152 +msgid "(Come back to previous page.)" +msgstr "(Вернуться на предыдущую страницу.)" + +#: ../../../bookmarks.php:159 +#: ../../../import.php:106 +#: ../../../importNetscape.php:108 +msgid "There was an error saving your bookmark. Please try again or contact the administrator." +msgstr "Произошла ошибка при сохранении закладки. Попробуйте еще раз или свяжитесь с администрацией." + +#: ../../../bookmarks.php:209 +#: ../../../templates/toolbar.inc.php:13 +msgid "Add a Bookmark" +msgstr "Добавить закладку" + +#: ../../../bookmarks.php:213 +msgid "Add Bookmark" +msgstr "Добавить закладку" + +#: ../../../bookmarks.php:216 +msgid "You must be logged in before you can add bookmarks." +msgstr "Вы должны войти в систему, прежде чем добавлять закладки." + +#: ../../../bookmarks.php:270 +#: ../../../bookmarks.php:271 +msgid "My Bookmarks" +msgstr "Мои закладки" + +#: ../../../edit.php:44 +#: ../../../edit.php:45 +msgid "Edit Bookmark" +msgstr "Изменить закладку" + +#: ../../../edit.php:51 +#, php-format +msgid "Bookmark with id %s not was not found" +msgstr "Закладка # %s не найдена" + +#: ../../../edit.php:57 +msgid "You are not allowed to edit this bookmark" +msgstr "У Вас нет доступа для редактирования этой закладки" + +#: ../../../edit.php:77 +msgid "Error while saving your bookmark" +msgstr "Ошибка во время сохранения Вашей закладки" + +#: ../../../edit.php:113 +#: ../../../templates/editprofile.tpl.php:52 +msgid "Save Changes" +msgstr "Сохранить изменения" + +#: ../../../functions.inc.php:144 +msgid "message_die() was called multiple times." +msgstr "message_die() было вызвано несколько раз." + +#: ../../../functions.inc.php:156 +msgid "SQL Error" +msgstr "Ошибка SQL" + +#: ../../../functions.inc.php:162 +msgid "Line" +msgstr "Line" + +#: ../../../functions.inc.php:162 +#: ../../../templates/importDelicious.tpl.php:8 +#: ../../../templates/importNetscape.tpl.php:9 +#: ../../../templates/importStructure.tpl.php:10 +msgid "File" +msgstr "Файл" + +#: ../../../functions.inc.php:168 +msgid "Information" +msgstr "Информация" + +#: ../../../functions.inc.php:173 +msgid "Critical Information" +msgstr "Важная информация" + +#: ../../../functions.inc.php:178 +msgid "An error occured" +msgstr "Произошла ошибка" + +#: ../../../functions.inc.php:181 +msgid "General Error" +msgstr "Общая ошибка" + +#: ../../../functions.inc.php:189 +msgid "An critical error occured" +msgstr "Произошла критическая ошибка" + +#: ../../../functions.inc.php:192 +msgid "Critical Error" +msgstr "Критическая ошибка" + +#: ../../../functions.inc.php:201 +msgid "DEBUG MODE" +msgstr "Режим DEBUG" + +#: ../../../history.php:61 +msgid "History" +msgstr "История" + +#: ../../../history.php:62 +#, php-format +msgid "History for %s" +msgstr "История для %s" + +#: ../../../history.php:84 +msgid "Address was not found" +msgstr "Адрес не найден" + +#: ../../../import.php:47 +msgid "Could not open XML input" +msgstr "Невозможно открыть XML" + +#: ../../../import.php:51 +#, php-format +msgid "XML error: %s at line %d" +msgstr "Ошибка XML: %s в строке %d" + +#: ../../../import.php:60 +msgid "Import Bookmarks from del.icio.us" +msgstr "Импортировать закладки из del.icio.us" + +#: ../../../import.php:93 +msgid "You have already submitted this bookmark." +msgstr "Вы уже добавили эту закладку." + +#: ../../../import.php:104 +msgid "Bookmark imported." +msgstr "Закладка импортирована." + +#: ../../../importNetscape.php:95 +msgid "You have already submitted some of these bookmarks." +msgstr "Вы уже сохранили некоторые из этих закладок." + +#: ../../../importNetscape.php:115 +msgid "Bookmarks found: " +msgstr "Найденные закладки: " + +#: ../../../importNetscape.php:116 +msgid "Bookmarks imported: " +msgstr "Закладки загружены: " + +#: ../../../importNetscape.php:117 +#: ../../../importNetscape.php:122 +msgid "Import Bookmarks from Browser File" +msgstr "Импортировать закладки из файла" + +#: ../../../importStructure.php:61 +msgid "Bad indentation" +msgstr "Ошибка в отступе" + +#: ../../../importStructure.php:67 +msgid "New links between tags: " +msgstr "Новые ссылки между тэгов: " + +#: ../../../importStructure.php:72 +msgid "Import Structure" +msgstr "Импорт структуры" + +#: ../../../index.php:38 +msgid "You have now logged out" +msgstr "Вы вышли" + +#: ../../../index.php:45 +#, php-format +msgid "%s: Recent bookmarks" +msgstr "%s: Недавно добавленные закладки" + +#: ../../../index.php:78 +msgid "Store, share and tag your favourite links" +msgstr "Сохраняйте, делитесь и отмечайте Ваши любимые ссылки" + +#: ../../../index.php:79 +msgid "All Bookmarks" +msgstr "Все закладки" + +#: ../../../jsScuttle.php:22 +#: ../../../templates/admin.tpl.php:19 +#: ../../../templates/tag2tagadd.tpl.php:21 +#: ../../../templates/tag2tagdelete.tpl.php:13 +#: ../../../templates/tag2tagedit.tpl.php:14 +#: ../../../templates/tag2tagedit.tpl.php:35 +#: ../../../templates/tagdelete.tpl.php:6 +msgid "Are you sure?" +msgstr "Вы уверены?" + +#: ../../../jsScuttle.php:22 +#: ../../../templates/tag2tagdelete.tpl.php:15 +#: ../../../templates/tag2tagedit.tpl.php:16 +#: ../../../templates/tagdelete.tpl.php:8 +msgid "Yes" +msgstr "Да" + +#: ../../../jsScuttle.php:22 +#: ../../../templates/tag2tagdelete.tpl.php:16 +#: ../../../templates/tag2tagedit.tpl.php:17 +#: ../../../templates/tagdelete.tpl.php:9 +msgid "No" +msgstr "Нет" + +#: ../../../jsScuttle.php:69 +msgid "Available" +msgstr "Доступно" + +#: ../../../jsScuttle.php:72 +msgid "Not Available" +msgstr "Недоступно" + +#: ../../../login.php:48 +msgid "The details you have entered are incorrect. Please try again." +msgstr "Вы ввели некорректные данные. Попробуйте еще раз." + +#: ../../../login.php:57 +#: ../../../templates/login.tpl.php:26 +#: ../../../templates/toolbar.inc.php:29 +msgid "Log In" +msgstr "Вход" + +#: ../../../password.php:36 +msgid "You must enter your username." +msgstr "Вы должны ввести имя пользователя." + +#: ../../../password.php:40 +msgid "You must enter your <abbr title=\"electronic mail\">e-mail</abbr> address." +msgstr "Вы должны ввести <abbr title=\"electronic mail\">e-mail</abbr>." + +#: ../../../password.php:48 +msgid "No matches found for that username." +msgstr "Для этого пользователя ничего не найдено." + +#: ../../../password.php:51 +msgid "No matches found for that combination of username and <abbr title=\"electronic mail\">e-mail</abbr> address." +msgstr "Ничего не найдено для этого имени пользователя и адреса <abbr title=\"electronic mail\">e-mail</abbr>." + +#: ../../../password.php:59 +msgid "There was an error while generating your new password. Please try again." +msgstr "Произошла ошибка во время генерации имени пользователя. Попробуйте еще раз." + +#: ../../../password.php:63 +msgid "Your new password is:" +msgstr "Ваш новый пароль:" + +#: ../../../password.php:63 +msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in." +msgstr "Для обеспечения безопасности, Вы должны изменить пароль в профиле, следующий раз когда войдете в систему." + +#: ../../../password.php:66 +#, php-format +msgid "%s Account Information" +msgstr "%s просмотр информации об аккаунте" + +#: ../../../password.php:68 +#, php-format +msgid "New password generated and sent to %s" +msgstr "Новый пароль отправлен по адресу %s" + +#: ../../../password.php:75 +msgid "Forgotten Password" +msgstr "Забытый пароль" + +#: ../../../populartags.php:46 +#: ../../../templates/dynamictags.inc.php:128 +#: ../../../templates/sidebar.block.common.php:9 +#: ../../../templates/sidebar.block.menu.php:74 +#: ../../../templates/sidebar.block.popular.php:23 +#: ../../../templates/sidebar.block.recent.php:34 +#: ../../../templates/toolbar.inc.php:27 +msgid "Popular Tags" +msgstr "Популярные тэги" + +#: ../../../profile.php:59 +#: ../../../watchlist.php:119 +msgid "Username was not specified" +msgstr "Имя пользователя не введено" + +#: ../../../profile.php:65 +msgid "My Profile" +msgstr "Мой профиль" + +#: ../../../profile.php:67 +#: ../../../templates/toolbar.inc.php:12 +msgid "Profile" +msgstr "Профиль" + +#: ../../../profile.php:89 +msgid "Invalid Token" +msgstr "Неверный символ" + +#: ../../../profile.php:94 +msgid "Password and confirmation do not match." +msgstr "Пароль и подтверждение пароля не совпадают." + +#: ../../../profile.php:98 +msgid "Password must be at least 6 characters long." +msgstr "Пароль должен быть минимум 6 символов длиной." + +#: ../../../profile.php:102 +msgid "E-mail address is not valid." +msgstr "Некорректный адрес E-mail." + +#: ../../../profile.php:106 +msgid "An error occurred while saving your changes." +msgstr "Ошибка при сохранении изменений." + +#: ../../../profile.php:108 +msgid "Changes saved." +msgstr "Изменения сохранены." + +#: ../../../register.php:40 +msgid "You <em>must</em> enter a username, password and e-mail address." +msgstr "Вы <em>должны</em> ввести имя пользователя, пароль и адрес e-mail." + +#: ../../../register.php:44 +msgid "This username has been reserved, please make another choice." +msgstr "Это имя пользователя занято, пожалуйста выберете другое." + +#: ../../../register.php:48 +msgid "This username already exists, please make another choice." +msgstr "Это имя пользоватея уже существует, пожалуйста выберете другое." + +#: ../../../register.php:52 +msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice." +msgstr "Некорректное имя пользователя (слишком короткое, слишком длинное или запрещенные символы...), пожалуйста выберете другое." + +#: ../../../register.php:56 +msgid "E-mail address is not valid. Please try again." +msgstr "Некорректный адрес e-mail. Попробуйте еще раз." + +#: ../../../register.php:60 +msgid "Antispam answer is not valid. Please try again." +msgstr "Ответ на вопрос спам-фильтра не верен. Попробуйте еще раз." + +#: ../../../register.php:69 +msgid "You have successfully registered. Enjoy!" +msgstr "Поздравляем! Вы успешно зарегистрировались!" + +#: ../../../register.php:71 +msgid "Registration failed. Please try again." +msgstr "Ошибка регистрации. Пожалуйста попробуйте еще раз." + +#: ../../../register.php:77 +#: ../../../templates/register.tpl.php:41 +#: ../../../templates/toolbar.inc.php:30 +msgid "Register" +msgstr "Регистрация" + +#: ../../../rss.php:84 +#, php-format +msgid "Recent bookmarks posted to %s" +msgstr "Последние закладки добавленные в %s" + +#: ../../../search.inc.php:23 +msgid "Search..." +msgstr "Поиск..." + +#: ../../../search.inc.php:24 +msgid "in" +msgstr "в" + +#: ../../../search.inc.php:30 +msgid "this user's bookmarks" +msgstr "закладки этого пользователя" + +#: ../../../search.inc.php:35 +msgid "my bookmarks" +msgstr "мои закладки" + +#: ../../../search.inc.php:36 +msgid "my watchlist" +msgstr "мой лист наблюдения" + +#: ../../../search.inc.php:40 +msgid "all bookmarks" +msgstr "все закладки" + +#: ../../../search.inc.php:50 +msgid "Search" +msgstr "Поиск" + +#: ../../../search.php:73 +#: ../../../search.php:123 +msgid "Search Bookmarks" +msgstr "Поиск закладок" + +#: ../../../search.php:79 +msgid "Search Results" +msgstr "Результаты поиска" + +#: ../../../search.php:114 +msgid "Unsatisfied? You can also try our " +msgstr "Неудовлетворены? Вы еще можете поробовать наш " + +#: ../../../tag2tagadd.php:50 +msgid "Tag link created" +msgstr "Tag link created" + +#: ../../../tag2tagadd.php:53 +msgid "Failed to create the link" +msgstr "Ошибка создания ссылки" + +#: ../../../tag2tagadd.php:65 +msgid "Add Tag Link" +msgstr "Добавить тэг к ссылке" + +#: ../../../tag2tagdelete.php:66 +msgid "Tag link deleted" +msgstr "Тэг ссылки удален" + +#: ../../../tag2tagdelete.php:69 +msgid "Failed to delete the link" +msgstr "Ошибка удаления ссылки" + +#: ../../../tag2tagdelete.php:81 +msgid "Delete Link Between Tags" +msgstr "Delete Link between Tags" + +#: ../../../tag2tagedit.php:55 +msgid "Edit Link Between Tags" +msgstr "Edit Link between Tags" + +#: ../../../tagcommondescriptionedit.php:55 +msgid "Tag common description updated" +msgstr "Tag common description updated" + +#: ../../../tagcommondescriptionedit.php:58 +msgid "Failed to update the tag common description" +msgstr "Failed to update the tag common description" + +#: ../../../tagcommondescriptionedit.php:64 +#: ../../../templates/sidebar.block.tagactions.php:26 +msgid "Edit Tag Common Description" +msgstr "Edit Tag common description" + +#: ../../../tagdelete.php:43 +msgid "Tag deleted" +msgstr "Тэг удален" + +#: ../../../tagdelete.php:46 +msgid "Failed to delete the tag" +msgstr "Ошибка удаления тэга" + +#: ../../../tagdelete.php:54 +#: ../../../templates/sidebar.block.tagactions.php:22 +msgid "Delete Tag" +msgstr "Удалить тэг" + +#: ../../../tagedit.php:52 +msgid "Tag description updated" +msgstr "Описание тэга обновлено" + +#: ../../../tagedit.php:55 +msgid "Failed to update the tag description" +msgstr "Ошибка обновления описания тэга" + +#: ../../../tagedit.php:61 +#: ../../../templates/sidebar.block.tagactions.php:24 +msgid "Edit Tag Description" +msgstr "Изменить описание тэга" + +#: ../../../tagrename.php:63 +msgid "Tag renamed" +msgstr "Тэг переименован" + +#: ../../../tagrename.php:66 +msgid "Failed to rename the tag" +msgstr "Ошибка переименования тэга" + +#: ../../../tagrename.php:72 +#: ../../../templates/sidebar.block.tagactions.php:9 +msgid "Rename Tag" +msgid_plural "Rename Tags" +msgstr[0] "Переименовать тэг" +msgstr[1] "Переименовать тэги" + +#: ../../../tags.php:45 +#: ../../../tags.php:67 +#: ../../../templates/editbookmark.tpl.php:69 +#: ../../../templates/toolbar.inc.php:10 +msgid "Tags" +msgstr "Тэги" + +#: ../../../users.php:35 +msgid "Users" +msgstr "Пользователи" + +#: ../../../watch.php:54 +msgid "User removed from your watchlist" +msgstr "Пользователь удален из списка наблюдения" + +#: ../../../watch.php:56 +msgid "User added to your watchlist" +msgstr "Пользователь добавлен в список наблюдения" + +#: ../../../watchlist.php:104 +msgid "My Watchlist" +msgstr "Мой список наблюдения" + +#: ../../../watchlist.php:106 +#: ../../../templates/toolbar.inc.php:11 +msgid "Watchlist" +msgstr "Список наблюдения" + +#: ../../../templates/about.tpl.php:6 +msgid "<strong>Store</strong> all your favourite links in one place, accessible from anywhere." +msgstr "<strong>Храните</strong> Ваши любимые ссылки в одной месте, доступном отовсюду." + +#: ../../../templates/about.tpl.php:7 +msgid "<strong>Share</strong> your bookmarks with everyone, with friends on your watchlist or just keep them private." +msgstr "<strong>Делитесь</strong> ссылками со всем миром, с Вашими друзьями или оставьте их приватными." + +#: ../../../templates/about.tpl.php:8 +msgid "<strong>Tag</strong> your bookmarks with as many labels as you want, instead of wrestling with folders." +msgstr "<strong>Помечайте тэгами</strong> Ваши ссылки с таким количеством меток сколько хотите, вместо того чтобы бороться со свалкой ссылок." + +#: ../../../templates/about.tpl.php:9 +msgid "Register now" +msgstr "Зарегистрируйтесь сейчас" + +#: ../../../templates/about.tpl.php:9 +#, php-format +msgid " to start using %s!" +msgstr " чтобы начать пользоваться %s!" + +#: ../../../templates/about.tpl.php:12 +msgid "Geek Stuff" +msgstr "Geek Stuff" + +#: ../../../templates/about.tpl.php:14 +msgid "is licensed under the " +msgstr "лицензировано по" + +#: ../../../templates/about.tpl.php:14 +msgid "you can freely host it on your own web server." +msgstr "Вы можете свободно устанавливать его на свой веб-сервер." + +#: ../../../templates/about.tpl.php:15 +#, php-format +msgid "%1$s supports most of the <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it." +msgstr "%1$s поддерживает большинство <a href=\"http://del.icio.us/doc/api\">del.icio.us <abbr title=\"Application Programming Interface\">API</abbr></a>. Большинство инструментов сделаных для этой системы, могут быть изменены для работы с %1$s. Если Вы нашли инструмент, который не позволяет изменить адрес API, попросите авторов добавить эту настройку. Возможно они это сделают." + +#: ../../../templates/about.tpl.php:24 +msgid "Tips" +msgstr "Подсказки" + +#: ../../../templates/about.tpl.php:26 +msgid "Add search plugin into your browser:" +msgstr "Добавить плагин поиска в браузер:" + +#: ../../../templates/about.tpl.php:27 +msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags." +msgstr "Секретный тэг \"system:unfiled\" позволяет Вам находить закладки без тэгов." + +#: ../../../templates/about.tpl.php:28 +msgid "The secret tag \"system:imported\" allows you to find imported bookmarks." +msgstr "Секретный тэг \"system:imported\" позволяет Вам находить импортированные закладки." + +#: ../../../templates/admin.tpl.php:5 +msgid "Users management" +msgstr "Управление пользователем" + +#: ../../../templates/admin.tpl.php:14 +#, fuzzy +msgid "Public/Shared/Private" +msgstr "Публичный/Общий/Приватный" + +#: ../../../templates/admin.tpl.php:14 +#: ../../../templates/bookmarks.tpl.php:93 +msgid "bookmark(s)" +msgstr "закладка(и)" + +#: ../../../templates/admin.tpl.php:19 +#: ../../../templates/bookmarks.tpl.php:231 +msgid "Delete" +msgstr "Удалить" + +#: ../../../templates/admin.tpl.php:27 +msgid "Other actions" +msgstr "Другие действия" + +#: ../../../templates/admin.tpl.php:29 +msgid "Check all URLs (May take some time)" +msgstr "Проверить все ссылки (может занять некоторое время)" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:16 +#, fuzzy +msgid "Collaborative description: these fields can be viewed and modified by every users" +msgstr "Совместное описание: эти поля могут быть просмотрены и изменены любым пользователем" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:18 +#: ../../../templates/bookmarks.tpl.php:123 +#: ../../../templates/editbookmark.tpl.php:38 +msgid "Title" +msgstr "Название" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:23 +#: ../../../templates/editbookmark.tpl.php:44 +#: ../../../templates/editprofile.tpl.php:47 +#: ../../../templates/profile.tpl.php:33 +#: ../../../templates/tagcommondescriptionedit.tpl.php:13 +#: ../../../templates/tagedit.tpl.php:12 +msgid "Description" +msgstr "Описание" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:31 +#: ../../../templates/tagcommondescriptionedit.tpl.php:21 +msgid "Last modification:" +msgstr "Последнее изменение:" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:42 +#: ../../../templates/tagcommondescriptionedit.tpl.php:32 +#: ../../../templates/tagedit.tpl.php:18 +msgid "Update" +msgstr "Имзенить" + +#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:43 +#: ../../../templates/editbookmark.tpl.php:98 +#: ../../../templates/tag2tagadd.tpl.php:24 +#: ../../../templates/tag2tagedit.tpl.php:38 +#: ../../../templates/tagcommondescriptionedit.tpl.php:33 +#: ../../../templates/tagedit.tpl.php:19 +#: ../../../templates/tagrename.tpl.php:25 +msgid "Cancel" +msgstr "Отмена" + +#: ../../../templates/bookmarks.tpl.php:26 +#, fuzzy +msgid "Bookmarks on this page are managed by an admin user." +msgstr "Закладки на этой странице управляются администратором." + +#: ../../../templates/bookmarks.tpl.php:51 +#: ../../../templates/bookmarks.tpl.php:52 +#, fuzzy +msgid "Edit the common description of this tag" +msgstr "Изменить описание этого тэга" + +#: ../../../templates/bookmarks.tpl.php:55 +#: ../../../templates/bookmarks.tpl.php:56 +msgid "Edit the common description of this bookmark" +msgstr "Изменить описание этой закладки" + +#: ../../../templates/bookmarks.tpl.php:76 +#: ../../../templates/bookmarks.tpl.php:77 +msgid "Edit your personal description of this tag" +msgstr "Изменить личное описание этой закладки" + +#: ../../../templates/bookmarks.tpl.php:93 +#: ../../../templates/tags.tpl.php:10 +#: ../../../templates/users.tpl.php:8 +msgid "Sort by:" +msgstr "Сортировать по:" + +#: ../../../templates/bookmarks.tpl.php:122 +msgid "Date" +msgstr "Дате" + +#: ../../../templates/bookmarks.tpl.php:129 +msgid "Bookmarks from other users for this tag" +msgstr "Ссылки других пользователей с этим тэгом" + +#: ../../../templates/bookmarks.tpl.php:134 +msgid "Only your bookmarks for this tag" +msgstr "Только Ваши ссылки с этим тэгом" + +#: ../../../templates/bookmarks.tpl.php:157 +#: ../../../templates/bookmarks.tpl.php:163 +msgid "First" +msgstr "Первая" + +#: ../../../templates/bookmarks.tpl.php:158 +#: ../../../templates/bookmarks.tpl.php:164 +msgid "Previous" +msgstr "Предыдущая" + +#: ../../../templates/bookmarks.tpl.php:171 +#: ../../../templates/bookmarks.tpl.php:174 +msgid "Next" +msgstr "Следующая" + +#: ../../../templates/bookmarks.tpl.php:172 +#: ../../../templates/bookmarks.tpl.php:175 +msgid "Last" +msgstr "Последняя" + +#: ../../../templates/bookmarks.tpl.php:185 +#, php-format +msgid "Page %d of %d" +msgstr "Страница%d из %d" + +#: ../../../templates/bookmarks.tpl.php:225 +msgid "Tags:" +msgstr "Тэги:" + +#: ../../../templates/bookmarks.tpl.php:231 +msgid "Edit" +msgstr "Изменить" + +#: ../../../templates/bookmarks.tpl.php:235 +msgid "Last update" +msgstr "Последнее изменение" + +#: ../../../templates/bookmarks.tpl.php:238 +msgid "by" +msgstr " добавлено" + +#: ../../../templates/bookmarks.tpl.php:240 +msgid "you" +msgstr "Вами" + +#: ../../../templates/bookmarks.tpl.php:254 +#, fuzzy, php-format +msgid " and %s1 other%s" +msgstr " и %s1 другие%s" + +#: ../../../templates/bookmarks.tpl.php:257 +#, fuzzy, php-format +msgid " and %2$s%1$s others%3$s" +msgstr " и %2$s%1$s другими%3$s" + +#: ../../../templates/bookmarks.tpl.php:265 +msgid "Copy this bookmark to YOUR bookmarks." +msgstr "Скопировать эту ссылку закладку в ВАШИ закладки" + +#: ../../../templates/bookmarks.tpl.php:265 +msgid "Copy" +msgstr "Копировать" + +#: ../../../templates/bookmarks.tpl.php:284 +msgid "This bookmark is certified by an admin user." +msgstr "Эта закладка заверена администрацией." + +#: ../../../templates/bookmarks.tpl.php:323 +msgid "Private Note on this bookmark" +msgstr "Личная заметка к этой закладке" + +#: ../../../templates/bookmarks.tpl.php:334 +#, fuzzy +msgid "Come back to the top of this page." +msgstr "Вернуться наверх этой страницы." + +#: ../../../templates/bookmarks.tpl.php:334 +#, fuzzy +msgid "Top of the page" +msgstr "Верх страницы" + +#: ../../../templates/bookmarks.tpl.php:340 +msgid "No bookmarks available" +msgstr "Ни одной закладки недоступно" + +#: ../../../templates/bottom.inc.php:7 +msgid "Propulsed by " +msgstr "Propulsed by " + +#: ../../../templates/dynamictags.inc.php:47 +#: ../../../templates/sidebar.block.common.php:19 +#: ../../../templates/sidebar.block.popular.php:34 +#: ../../../templates/sidebar.block.recent.php:29 +#: ../../../templates/tags.tpl.php:19 +msgid "bookmark" +msgid_plural "bookmarks" +msgstr[0] "закладка" +msgstr[1] "закладки" + +#: ../../../templates/dynamictags.inc.php:131 +msgid "Popular Tags From All Users" +msgstr "Популярные тэги всех пользователей" + +#: ../../../templates/editbookmark.tpl.php:33 +msgid "Address" +msgstr "Адрес" + +#: ../../../templates/editbookmark.tpl.php:35 +#: ../../../templates/editbookmark.tpl.php:40 +#: ../../../templates/editprofile.tpl.php:31 +#: ../../../templates/tagrename.tpl.php:14 +#: ../../../templates/tagrename.tpl.php:19 +#, fuzzy +msgid "Required" +msgstr "Обязательно" + +#: ../../../templates/editbookmark.tpl.php:45 +msgid "Add Note" +msgstr "Добавить заметку" + +#: ../../../templates/editbookmark.tpl.php:48 +#, fuzzy +msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] " +msgstr "Вы можете использовать \"анкоры\" чтобы разделать атрибуты, например: [publisher]blah[/publisher] " + +#: ../../../templates/editbookmark.tpl.php:51 +#, fuzzy +msgid "Suggested anchors: " +msgstr "Предлагаемые анкоры: " + +#: ../../../templates/editbookmark.tpl.php:63 +msgid "Private Note" +msgstr "Личная заметка" + +#: ../../../templates/editbookmark.tpl.php:65 +msgid "Just visible by you and your contacts." +msgstr "Видимо только для Вас и Ваших контактов." + +#: ../../../templates/editbookmark.tpl.php:73 +msgid "Comma-separated" +msgstr "Разделенный запятыми" + +#: ../../../templates/editbookmark.tpl.php:77 +#: ../../../templates/tag2tagadd.tpl.php:9 +msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" +msgstr "Внимание: используйте \">\" чтобы включить один тэг в другой. например: европа>россия>москва" + +#: ../../../templates/editbookmark.tpl.php:81 +#: ../../../templates/tag2tagadd.tpl.php:8 +msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" +msgstr "Внимание: используйте \"=\" чтобы сделать два тэга синонимами. например: россия=рф" + +#: ../../../templates/editbookmark.tpl.php:84 +#: ../../../templates/importDelicious.tpl.php:15 +#: ../../../templates/importNetscape.tpl.php:16 +msgid "Privacy" +msgstr "Конфиденциальность" + +#: ../../../templates/editbookmark.tpl.php:87 +#: ../../../templates/importDelicious.tpl.php:18 +#: ../../../templates/importNetscape.tpl.php:19 +msgid "Public" +msgstr "Публичный" + +#: ../../../templates/editbookmark.tpl.php:88 +msgid "Shared with Watch List" +msgstr "Shared with Watchlist" + +#: ../../../templates/editbookmark.tpl.php:89 +#: ../../../templates/importDelicious.tpl.php:20 +#: ../../../templates/importNetscape.tpl.php:21 +msgid "Private" +msgstr "Личный" + +#: ../../../templates/editbookmark.tpl.php:102 +msgid "Delete Bookmark" +msgstr "Удалить закладку" + +#: ../../../templates/editbookmark.tpl.php:107 +msgid "edit common description" +msgstr "изменит описание" + +#: ../../../templates/editbookmark.tpl.php:134 +#, fuzzy +msgid "Bookmarklet" +msgstr "Закладочник" + +#: ../../../templates/editbookmark.tpl.php:140 +#, php-format +msgid "Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s" +msgstr "Кликните на один из букмарклетов чтобы добавить кнопку, на которую Вы можете нажать в любой момент когда захотите добавить страницу на которой находитесь в %s" + +#: ../../../templates/editbookmark.tpl.php:144 +#, fuzzy, php-format +msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s" +msgstr "Перетяните мышкой bookmarklets в закладки Вашего браузера и нажмите на него, в любой момент когда захотите добавить страницу на которой находитесь в %s" + +#: ../../../templates/editbookmark.tpl.php:157 +#: ../../../templates/editbookmark.tpl.php:162 +#, php-format +msgid "Post to %s" +msgstr "Добавить в %s" + +#: ../../../templates/editbookmark.tpl.php:158 +#: ../../../templates/editbookmark.tpl.php:163 +#, php-format +msgid "Post to %s (Pop-up)" +msgstr "Добавить в %s (pop-up)" + +#: ../../../templates/editbookmark.tpl.php:168 +#: ../../../templates/importDelicious.tpl.php:26 +#: ../../../templates/importNetscape.tpl.php:27 +#: ../../../templates/importStructure.tpl.php:16 +msgid "Import" +msgstr "Импорт" + +#: ../../../templates/editbookmark.tpl.php:170 +msgid "Import bookmarks from bookmark file" +msgstr "Импортировать закладки из файла закладок" + +#: ../../../templates/editbookmark.tpl.php:170 +msgid "Internet Explorer, Mozilla Firefox and Netscape" +msgstr "Internet Explorer, Mozilla Firefox и Netscape" + +#: ../../../templates/editbookmark.tpl.php:171 +msgid "Import bookmarks from del.icio.us" +msgstr "Импортировать закладки из del.icio.us" + +#: ../../../templates/editprofile.tpl.php:10 +msgid "Account Details" +msgstr "Данные аккаунта" + +#: ../../../templates/editprofile.tpl.php:14 +#: ../../../templates/login.tpl.php:15 +#: ../../../templates/password.tpl.php:10 +#: ../../../templates/profile.tpl.php:6 +#: ../../../templates/register.tpl.php:16 +msgid "Username" +msgstr "Имя пользователя" + +#: ../../../templates/editprofile.tpl.php:19 +msgid "New Password" +msgstr "Новый пароль" + +#: ../../../templates/editprofile.tpl.php:24 +msgid "Confirm Password" +msgstr "Подтвердите пароль" + +#: ../../../templates/editprofile.tpl.php:29 +#: ../../../templates/password.tpl.php:14 +#: ../../../templates/register.tpl.php:26 +msgid "E-mail" +msgstr "E-mail" + +#: ../../../templates/editprofile.tpl.php:35 +msgid "Personal Details" +msgstr "Личные данные" + +#: ../../../templates/editprofile.tpl.php:39 +#: ../../../templates/profile.tpl.php:17 +msgid "Name" +msgstr "Имя" + +#: ../../../templates/editprofile.tpl.php:43 +#: ../../../templates/profile.tpl.php:23 +msgid "Homepage" +msgstr "Домашняя страница" + +#: ../../../templates/editprofile.tpl.php:55 +#: ../../../templates/sidebar.block.tagactions.php:17 +#: ../../../templates/sidebar.block.watchstatus.php:18 +msgid "Actions" +msgstr "Действия" + +#: ../../../templates/editprofile.tpl.php:58 +msgid "Export bookmarks" +msgstr "Экспорт закладок" + +#: ../../../templates/editprofile.tpl.php:60 +msgid "HTML file (for browsers)" +msgstr "HTML файл (для браузеров)" + +#: ../../../templates/editprofile.tpl.php:61 +msgid "XML file (like del.icio.us)" +msgstr "XML файл (как del.icio.us)" + +#: ../../../templates/editprofile.tpl.php:62 +#, fuzzy +msgid "CSV file (for spreadsheet tools)" +msgstr "CSV файл (для табличных процессоров)" + +#: ../../../templates/error.404.tpl.php:5 +msgid "Not Found" +msgstr "Не найдено" + +#: ../../../templates/error.404.tpl.php:6 +msgid "The requested URL was not found on this server" +msgstr "Запрашиваемый адрес не найден на сервере" + +#: ../../../templates/error.500.tpl.php:5 +msgid "General server error" +msgstr "Ошибка сервера" + +#: ../../../templates/error.500.tpl.php:6 +msgid "The requested URL could not be processed" +msgstr "Запрашиваемый адрес не может быть обработан" + +#: ../../../templates/importDelicious.tpl.php:19 +#: ../../../templates/importNetscape.tpl.php:20 +msgid "Shared with Watchlist" +msgstr "Открыть для листа наблюдения" + +#: ../../../templates/importDelicious.tpl.php:31 +#: ../../../templates/importNetscape.tpl.php:32 +#: ../../../templates/importStructure.tpl.php:21 +msgid "Instructions" +msgstr "Инструкции" + +#: ../../../templates/importDelicious.tpl.php:33 +msgid "Log in to the <a href=\"http://del.icio.us/api/posts/all\">export page at del.icio.us</a>" +msgstr "Войдите на <a href=\"http://del.icio.us/api/posts/all\">страницу экспорта на del.icio.us</a>" + +#: ../../../templates/importDelicious.tpl.php:34 +msgid "Save the resulting <abbr title=\"Extensible Markup Language\">XML</abbr> file to your computer" +msgstr "Сохраните полученный<abbr title=\"Extensible Markup Language\">XML</abbr> файл на Ваш компьютер" + +#: ../../../templates/importDelicious.tpl.php:35 +msgid "Click <kbd>Browse...</kbd> to find this file on your computer. The maximum size the file can be is 1MB" +msgstr "Yf;vbnt <kbd>Просмотр...</kbd> чтобы выбрать файл на Вашем компьютере. Максимальный размер файла - 1MB" + +#: ../../../templates/importDelicious.tpl.php:36 +#: ../../../templates/importNetscape.tpl.php:43 +msgid "Select the default privacy setting for your imported bookmarks" +msgstr "Выберете уровень доступа, который будет применяться по умолчанию к импортируемый закладкам" + +#: ../../../templates/importDelicious.tpl.php:37 +#: ../../../templates/importNetscape.tpl.php:44 +msgid "Click <kbd>Import</kbd> to start importing the bookmarks; it may take a minute" +msgstr "Нажмите <kbd>Импорт</kbd> для начала импорта закладок; это может занять минуту" + +#: ../../../templates/importNetscape.tpl.php:35 +msgid "Export your bookmarks from your browser to a file" +msgstr "Экспортировать Ваши закладки из браузера в файл" + +#: ../../../templates/importNetscape.tpl.php:37 +msgid "Internet Explorer: <kbd>File > Import and Export... > Export Favorites" +msgstr "Internet Explorer: <kbd>File > Import and Export... > Export Favorites" + +#: ../../../templates/importNetscape.tpl.php:38 +msgid "Mozilla Firefox: <kbd>Bookmarks > Manage Bookmarks... > File > Export..." +msgstr "Mozilla Firefox: <kbd>Bookmarks > Manage Bookmarks... > File > Export..." + +#: ../../../templates/importNetscape.tpl.php:39 +msgid "Netscape: <kbd>Bookmarks > Manage Bookmarks... > Tools > Export..." +msgstr "Netscape: <kbd>Bookmarks > Manage Bookmarks... > Tools > Export..." + +#: ../../../templates/importNetscape.tpl.php:42 +msgid "Click <kbd>Browse...</kbd> to find the saved bookmark file on your computer. The maximum size the file can be is 1MB" +msgstr "Нажмите <kbd>Просмотр...</kbd> чтобы выбрать сохраненный файл закладок на Вашем компьютере. Максимальный размер файла - 1MB" + +#: ../../../templates/importStructure.tpl.php:24 +#, fuzzy +msgid "Create your structure into a simple text file and following this model:" +msgstr "Создайте структуру в простом текстовом файле используя эту модель:" + +#: ../../../templates/importStructure.tpl.php:35 +#, fuzzy +msgid "Then import the file. The tags and their relations will be added to your profile." +msgstr "Затем импортируйте файл. Тэги и их отношения будут добавлены в Ваш профиль." + +#: ../../../templates/login.tpl.php:20 +#: ../../../templates/register.tpl.php:21 +msgid "Password" +msgstr "Пароль" + +#: ../../../templates/login.tpl.php:22 +msgid "Don't ask for my password for 2 weeks" +msgstr "Не запрашивать мой пароль 2 недели" + +#: ../../../templates/login.tpl.php:30 +msgid "Forgotten your password?" +msgstr "Забыли пароль?" + +#: ../../../templates/password.tpl.php:5 +#, php-format +msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you." +msgstr "Если Вы забыли пароль, %s может создать новый. Введите имя пользователя и адрес e-mail Вашего аккаунта в форме ниже и мы вышлем Вам новый пароль." + +#: ../../../templates/password.tpl.php:19 +msgid "Generate Password" +msgstr "Сгенерировать пароль" + +#: ../../../templates/profile.tpl.php:11 +msgid "Email" +msgstr "Email" + +#: ../../../templates/profile.tpl.php:28 +msgid "Member Since" +msgstr "Участник с" + +#: ../../../templates/profile.tpl.php:40 +#: ../../../templates/sidebar.block.watchlist.php:30 +msgid "Watching" +msgstr "Watching" + +#: ../../../templates/profile.tpl.php:55 +#: ../../../templates/sidebar.block.watchlist.php:52 +msgid "Watched By" +msgstr "Наблюдается" + +#: ../../../templates/profile.tpl.php:68 +#: ../../../templates/toolbar.inc.php:9 +msgid "Bookmarks" +msgstr "Закладки" + +#: ../../../templates/profile.tpl.php:69 +msgid "Go to bookmarks" +msgstr "Перейти к закладкам" + +#: ../../../templates/register.tpl.php:11 +#, fuzzy, php-format +msgid "Sign up here to create a free %s account. All the information requested below is required" +msgstr "Зарегистрируйтесь здесь, чтобы создать бесплатный %s аккаунт. Вся поля обязательны для заполнения" + +#: ../../../templates/register.tpl.php:18 +msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)" +msgstr " как минимум 5 символов, буквенно-цифровой (без пробелов, без точек или других спецсимволов)" + +#: ../../../templates/register.tpl.php:28 +msgid " to send you your password if you forget it" +msgstr " чтобы выслать Вам Вамш пароль, если Вы его забудете" + +#: ../../../templates/register.tpl.php:33 +#, fuzzy +msgid "Antispam question" +msgstr "Антиспам вопрос" + +#: ../../../templates/sidebar.block.linked.php:51 +#, fuzzy +msgid "Linked Tags" +msgstr "Связанные тэги" + +#: ../../../templates/sidebar.block.linked.php:62 +#: ../../../templates/sidebar.block.menu.php:46 +msgid "Add new link" +msgstr "Добавить новую ссылку" + +#: ../../../templates/sidebar.block.linked.php:63 +#: ../../../templates/sidebar.block.menu.php:47 +msgid "Delete link" +msgstr "Удалить ссылку" + +#: ../../../templates/sidebar.block.menu.php:35 +#, php-format +msgid "Tags included into the tag '%s'" +msgstr "Тэги включенные в тэг '%s'" + +#: ../../../templates/sidebar.block.menu.php:35 +msgid "Menu Tags" +msgstr "Меню тэгов" + +#: ../../../templates/sidebar.block.menu.php:68 +msgid "See all your tags" +msgstr "Просмотреть все свои тэги" + +#: ../../../templates/sidebar.block.menu.php:68 +msgid "all your tags" +msgstr "все Ваши тэги" + +#: ../../../templates/sidebar.block.menu.php:70 +msgid "See all tags from this user" +msgstr "Просмотреть все тэги этого пользователя" + +#: ../../../templates/sidebar.block.menu.php:70 +msgid "all tags from this user" +msgstr "все тэги этого пользователя" + +#: ../../../templates/sidebar.block.menu.php:74 +msgid "See popular tags" +msgstr "Просмотреть популярные тэги" + +#: ../../../templates/sidebar.block.menu2.php:25 +#, fuzzy +msgid "Featured Menu Tags" +msgstr "Рекомендуемые Тэги" + +#: ../../../templates/sidebar.block.menu2.php:29 +#, fuzzy +msgid "This menu is composed of keywords (tags) organized by admins." +msgstr "Это меню состоит из ключевых слов (тэгов) управляемых администраицей." + +#: ../../../templates/sidebar.block.recent.php:18 +msgid "Recent Tags" +msgstr "Последние Тэги" + +#: ../../../templates/sidebar.block.related.php:26 +msgid "Related Tags" +msgstr "Связанные Тэги" + +#: ../../../templates/sidebar.block.search.php:15 +#, fuzzy +msgid "Last Searches" +msgstr "Что искали недавно" + +#: ../../../templates/sidebar.block.search.php:24 +msgid "Number of bookmarks for this query" +msgstr "Количество закладок для этого запроса" + +#: ../../../templates/sidebar.block.tagactions.php:28 +msgid "Create a link to another tag" +msgstr "Создать ссылку на другой тэг" + +#: ../../../templates/sidebar.block.users.php:14 +msgid "New Users" +msgstr "Новые Пользователи" + +#: ../../../templates/sidebar.block.users.php:23 +#: ../../../templates/users.tpl.php:17 +msgid "bookmarks" +msgstr "закладки" + +#: ../../../templates/sidebar.block.users.php:30 +msgid "See all users" +msgstr "Просмотреть всех пользователей" + +#: ../../../templates/sidebar.block.users.php:30 +msgid "All users" +msgstr "Все пользователи" + +#: ../../../templates/sidebar.block.watchlist.php:19 +#, fuzzy +msgid "Close contacts are mutual contacts" +msgstr "Близкие контакты взаимных контактов" + +#: ../../../templates/sidebar.block.watchlist.php:19 +msgid "Close contacts" +msgstr "Близкие контакты" + +#: ../../../templates/sidebar.block.watchlist.php:36 +msgid "Add a contact..." +msgstr "Добавить контакт..." + +#: ../../../templates/sidebar.block.watchlist.php:36 +msgid "Type a username to add it to your contacts." +msgstr "Введите имя пользователя чтобы добавить его в контакты." + +#: ../../../templates/sidebar.block.watchlist.php:44 +msgid "Remove this contact" +msgstr "Удалить этот контакт" + +#: ../../../templates/sidebar.block.watchstatus.php:11 +msgid "Remove from Watchlist" +msgstr "Удалить из списка наблюдения" + +#: ../../../templates/sidebar.block.watchstatus.php:13 +msgid "Add to Watchlist" +msgstr "Добавить в список наблюдения" + +#: ../../../templates/sidebar.linkedtags.inc.php:18 +msgid "Edit link" +msgstr "Изменить ссылку" + +#: ../../../templates/sidebar.linkedtags.inc.php:47 +msgid "Synonyms:" +msgstr "Синонимы:" + +#: ../../../templates/tag2tagadd.tpl.php:12 +msgid "Create new link:" +msgstr "Создать новую ссылку:" + +#: ../../../templates/tag2tagadd.tpl.php:19 +#, php-format +msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" +msgstr "Внимание: включение тэга в '%s' тэг (например: %s>страны) выведет тэг в списке меню" + +#: ../../../templates/tag2tagadd.tpl.php:23 +#: ../../../templates/tag2tagedit.tpl.php:37 +msgid "Create" +msgstr "Создать" + +#: ../../../templates/tag2tagadd.tpl.php:35 +#: ../../../templates/tag2tagdelete.tpl.php:27 +#: ../../../templates/tag2tagedit.tpl.php:51 +msgid "Existing links:" +msgstr "Существующие ссылки:" + +#: ../../../templates/tag2tagadd.tpl.php:53 +#: ../../../templates/tag2tagdelete.tpl.php:45 +#: ../../../templates/tag2tagedit.tpl.php:69 +msgid "No links" +msgstr "Ссылок нет" + +#: ../../../templates/tag2tagedit.tpl.php:6 +msgid "Delete the link" +msgstr "Удалить ссылку" + +#: ../../../templates/tag2tagedit.tpl.php:29 +msgid "Create new link" +msgstr "Создать новую ссылку" + +#: ../../../templates/tagrename.tpl.php:12 +msgid "Old" +msgstr "Старый" + +#: ../../../templates/tagrename.tpl.php:17 +msgid "New" +msgstr "Новый" + +#: ../../../templates/tagrename.tpl.php:24 +msgid "Rename" +msgstr "Переименовать" + +#: ../../../templates/tags.tpl.php:11 +#: ../../../templates/users.tpl.php:9 +msgid "Alphabet" +msgstr "Алфавиту" + +#: ../../../templates/tags.tpl.php:12 +#: ../../../templates/users.tpl.php:10 +msgid "Popularity" +msgstr "Популярности" + +#: ../../../templates/toolbar.inc.php:8 +#: ../../../templates/toolbar.inc.php:26 +msgid "Home" +msgstr "Домой" + +#: ../../../templates/toolbar.inc.php:14 +msgid "Log Out" +msgstr "Выйти" + +#: ../../../templates/toolbar.inc.php:17 +msgid "Admin" +msgstr "Админ" + +#: ../../../templates/top.inc.php:51 +msgid "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in \"Normal Mode\" and hide debugging messages, change $debugMode to false into config.inc.php." +msgstr "" + +#: ../../../templates/users.tpl.php:17 +msgid "profile" +msgstr "Профиль" + +#: ../../../templates/users.tpl.php:17 +msgid "created in" +msgstr "создано в" + diff --git a/data/templates/about.tpl.php b/data/templates/about.tpl.php index af5c6e7..7bff98d 100644 --- a/data/templates/about.tpl.php +++ b/data/templates/about.tpl.php @@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']); <?php if(!is_null($currentUser) && $currentUser->isAdmin()): ?> -<li>SemanticScuttle v0.96.1</li> +<li>SemanticScuttle v0.97.0</li> <?php endif ?> </ul> diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index 0e9ac95..a8299fd 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -216,9 +216,27 @@ if($currenttag!= '') { <ol <?php echo ($start > 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks"> - <?php - foreach(array_keys($bookmarks) as $key) { - $row =& $bookmarks[$key]; + <?php + $addresses = array(); + foreach ($bookmarks as $key => &$row) { + $addresses[$row['bId']] = $row['bAddress']; + } + $otherCounts = $bookmarkservice->countOthers($addresses); + if ($userservice->isLoggedOn()) { + $existence = $bookmarkservice->bookmarksExist( + $addresses, $currentUser->getId() + ); + } + + if ($userservice->isLoggedOn()) { + $watchedNames = $userservice->getWatchNames( + $currentUser->getId(), true + ); + } else { + $watchedNames = null; + } + + foreach ($bookmarks as $key => &$row) { switch ($row['bStatus']) { case 0: $access = ''; @@ -234,9 +252,7 @@ if($currenttag!= '') { $cats = ''; $tagsForCopy = ''; $tags = $row['tags']; - foreach(array_keys($tags) as $key) { - - $tag =& $tags[$key]; + foreach ($tags as $tkey => &$tag) { $cats .= '<a href="'. sprintf($cat_url, filter($row['username'], 'url'), filter($tag, 'url')) .'" rel="tag">'. filter($tag) .'</a>, '; $tagsForCopy.= $tag.','; } @@ -264,7 +280,7 @@ if($currenttag!= '') { // Udders! if (!isset($hash)) { - $others = $bookmarkservice->countOthers($row['bAddress']); + $others = $otherCounts[$row['bAddress']]; $ostart = '<a href="'. createURL('history', $row['bHash']) .'">'; $oend = '</a>'; switch ($others) { @@ -281,7 +297,7 @@ if($currenttag!= '') { // Copy link if ($userservice->isLoggedOn() && ($currentUser->getId() != $row['uId']) - && !$bookmarkservice->bookmarkExists($row['bAddress'], $currentUser->getId()) + && !$existence[$row['bAddress']] ) { $copy .= ' - <a href="' . createURL('bookmarks', $currentUser->getUsername() .'?action=add&copyOf='. $row['bId']) @@ -304,7 +320,7 @@ if($currenttag!= '') { } // Admin specific design - if($userservice->isAdmin($row['uId'])) { + if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) { $adminBgClass = 'class="adminBackground"'; $adminStar = ' <img src="'. ROOT .'images/logo_24.gif" width="12px" title="'. T_('This bookmark is certified by an admin user.') .'" />'; } else { @@ -313,7 +329,11 @@ if($currenttag!= '') { } // Private Note (just visible by the owner and his/her contacts) - if($userservice->isLoggedOn() && ($currentUser->getId() == $row['uId'] || in_array($row['username'], $userservice->getWatchNames($currentUser->getId(), true)))) { + if ($watchedNames !== null + && ($currentUser->getId() == $row['uId'] + || in_array($row['username'], $watchedNames) + ) + ) { $privateNoteField = $row['bPrivateNote']; } else { $privateNoteField = ''; diff --git a/doc/ChangeLog b/doc/ChangeLog index c797f56..5e24f07 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,10 +1,28 @@ ChangeLog for SemantiScuttle ============================ +0.9X.X - 2010-XX-XX +------------------- +- Fix bug getTagsForBookmarks() that fetched all tags + + +0.97.0 - 2010-06-09 +------------------- +- Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now +- New config option to skip "SET NAMES UTF8" call: $dbneedssetnames +- Do not highlight admin bookmarks when $enableAdminColors is disabled +- Add russian translation +- Make HTML export follow the specifications a bit better +- Fix bug #2953732: faulty error message for duplicate bookmarks +- Fix bug #2960663: do not send content-type headers twice for ajax/api scripts +- Fix bug #2976593: fr_FR locale is vietnamese + + 0.96.1 - 2010-02-09 ------------------- - Fix bug #2948410: API is broken in 0.96.0 + 0.96.0 - 2010-02-08 ------------------- - Fix bug #2843523: ArtViper thumbnail license change diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt index 371c302..c4470f9 100644 --- a/doc/UPGRADE.txt +++ b/doc/UPGRADE.txt @@ -1,6 +1,12 @@ Upgrading SemanticScuttle from a previous version ================================================= + +From version 0.96 to 0.97 +------------------------- +No database changes necessary. + + From version 0.95 to 0.96 ------------------------- Update your database: diff --git a/doc/developers/release-new-version b/doc/developers/release-new-version index 33a3ef6..69530df 100644 --- a/doc/developers/release-new-version +++ b/doc/developers/release-new-version @@ -3,19 +3,20 @@ How to release a new version of SemanticScuttle 0. Run unit tests and verify that all of them pass 1. Update doc/ChangeLog -2. Update version in data/templates/about.tpl.php +2. Update doc/UPGRADE.txt +3. Update version in data/templates/about.tpl.php and build.xml -3. Create a release zip file via the build script: +4. Create a release zip file via the build script: Just type "phing". -4. Make a test installation from your zip file with a fresh +5. Make a test installation from your zip file with a fresh database. Register a user, add bookmarks etc. -5. When all is fine, it's time to release. +6. When all is fine, it's time to release. The build script takes care for most of the tasks. Run "phing release", and it will upload the release to sourceforge and create a svn tag. -6. Write announcement mail to the SemanticScuttle mailing list +7. Write announcement mail to the SemanticScuttle mailing list semanticscuttle-devel@lists.sourceforge.net -7. Announce the new release in the sourceforge project news +8. Announce the new release in the sourceforge project news https://sourceforge.net/apps/trac/sourceforge/wiki/News diff --git a/src/SemanticScuttle/Model/User.php b/src/SemanticScuttle/Model/User.php index 03af5c7..ed9f454 100644 --- a/src/SemanticScuttle/Model/User.php +++ b/src/SemanticScuttle/Model/User.php @@ -158,7 +158,7 @@ class SemanticScuttle_Model_User // Look for value only if not already set if(!isset($this->isAdmin)) { $us = SemanticScuttle_Service_Factory::get('User'); - $this->isAdmin = $us->isAdmin($this->id); + $this->isAdmin = $us->isAdmin($this->username); } return $this->isAdmin; } diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 0ac1855..364b1a0 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -178,8 +178,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService */ public function getBookmarkByAddress($address) { - $hash = md5($address); - return $this->getBookmarkByHash($hash); + return $this->getBookmarkByHash($this->getHash($address)); } @@ -188,10 +187,12 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * Retrieves a bookmark with the given hash. * DOES NOT RESPECT PRIVACY SETTINGS! * - * @param string $hash URL hash (MD5) + * @param string $hash URL hash * * @return mixed Array with bookmark data or false in case * of an error (i.e. not found). + * + * @see getHash() */ public function getBookmarkByHash($hash) { @@ -201,6 +202,25 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService /** + * Returns the hash value of a given address. + * + * @param string $address URL to hash + * @param boolean $bNormalize If the address shall be normalized before + * being hashed + * + * @return string Hash value + */ + public function getHash($address, $bNormalize = true) + { + if ($bNormalize) { + $address = $this->normalize($address); + } + return md5($address); + } + + + + /** * Retrieves a bookmark that has a given short * name. * @@ -284,15 +304,18 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService } $userservice = SemanticScuttle_Service_Factory::get('User'); - $user = $userservice->getCurrentUser(); + $user = $userservice->getCurrentObjectUser(); + if ($user === null) { + return false; + } //user has to be either admin, or owner if ($GLOBALS['adminsCanModifyBookmarksFromOtherUsers'] - && $userservice->isAdmin($user) + && $userservice->isAdmin($user->username) ) { return true; } else { - return ($bookmark['uId'] == $user['uId']); + return ($bookmark['uId'] == $user->id); } } @@ -309,20 +332,20 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * @return boolean True when the bookmark with the given URL * exists for the user, false if not. */ - function bookmarkExists($address = false, $uid = null) + public function bookmarkExists($address = false, $uid = null) { if (!$address) { return false; } - $address = $this->normalize($address); - - $crit = array('bHash' => md5($address)); + $crit = array('bHash' => $this->getHash($address)); if (isset ($uid)) { $crit['uId'] = $uid; } - $sql = 'SELECT COUNT(*) as "0" FROM '. $GLOBALS['tableprefix'] .'bookmarks WHERE '. $this->db->sql_build_array('SELECT', $crit); + $sql = 'SELECT COUNT(*) as "0" FROM ' + . $GLOBALS['tableprefix'] . 'bookmarks' + . ' WHERE '. $this->db->sql_build_array('SELECT', $crit); if (!($dbresult = $this->db->sql_query($sql))) { message_die( @@ -342,6 +365,60 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService /** + * Checks if the given addresses exist + * + * @param array $addresses Array of addresses + * @param integer $uid User ID the addresses shall belong to + * + * @return array Array with addresses as keys, true/false for existence + * as value + */ + public function bookmarksExist($addresses, $uid = null) + { + if (count($addresses) == 0) { + return array(); + } + + $hashes = array(); + $sql = '(0'; + foreach ($addresses as $key => $address) { + $hash = $this->getHash($address); + $hashes[$hash] = $address; + $sql .= ' OR bHash = "' + . $this->db->sql_escape($hash) + . '"'; + } + $sql .= ')'; + if ($uid !== null) { + $sql .= ' AND uId = ' . intval($uid); + } + + $sql = 'SELECT bHash, COUNT(*) as "count" FROM ' + . $this->getTableName() + . ' WHERE ' . $sql + . ' GROUP BY bHash'; + + if (!($dbresult = $this->db->sql_query($sql))) { + message_die( + GENERAL_ERROR, 'Could not get bookmark counts', '', + __LINE__, __FILE__, $sql, $this->db + ); + } + + $existence = array_combine( + $addresses, + array_fill(0, count($addresses), false) + ); + while ($row = $this->db->sql_fetchrow($dbresult)) { + $existence[$hashes[$row['bHash']]] = $row['count'] > 0; + } + + return $existence; + } + + + + /** * Adds a bookmark to the database. * * @param string $address Full URL of the bookmark @@ -402,17 +479,17 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService // Set up the SQL insert statement and execute it. $values = array( - 'uId' => intval($sId), - 'bIp' => $ip, - 'bDatetime' => $datetime, - 'bModified' => $datetime, - 'bTitle' => $title, - 'bAddress' => $address, + 'uId' => intval($sId), + 'bIp' => $ip, + 'bDatetime' => $datetime, + 'bModified' => $datetime, + 'bTitle' => $title, + 'bAddress' => $address, 'bDescription' => $description, 'bPrivateNote' => $privateNote, - 'bStatus' => intval($status), - 'bHash' => md5($address), - 'bShort' => $short + 'bStatus' => intval($status), + 'bHash' => $this->getHash($address), + 'bShort' => $short ); $sql = 'INSERT INTO '. $this->getTableName() @@ -522,14 +599,14 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService // Set up the SQL update statement and execute it. $updates = array( - 'bModified' => $moddatetime, - 'bTitle' => $title, - 'bAddress' => $address, + 'bModified' => $moddatetime, + 'bTitle' => $title, + 'bAddress' => $address, 'bDescription' => $description, 'bPrivateNote' => $privateNote, - 'bStatus' => $status, - 'bHash' => md5($address), - 'bShort' => $short + 'bStatus' => $status, + 'bHash' => $this->getHash($address, false), + 'bShort' => $short ); if (!is_null($date)) { @@ -804,10 +881,17 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $total = $row['total']; $this->db->sql_freeresult($totalresult); - $bookmarks = array(); - while ($row = & $this->db->sql_fetchrow($dbresult)) { - $row['tags'] = $b2tservice->getTagsForBookmark(intval($row['bId'])); - $bookmarks[] = $row; + $bookmarks = array(); + $bookmarkids = array(); + while ($row = $this->db->sql_fetchrow($dbresult)) { + $bookmarks[] = $row; + $bookmarkids[] = $row['bId']; + } + if (count($bookmarkids)) { + $tags = $b2tservice->getTagsForBookmarks($bookmarkids); + foreach ($bookmarks as &$bookmark) { + $bookmark['tags'] = $tags[$bookmark['bId']]; + } } $this->db->sql_freeresult($dbresult); @@ -889,36 +973,88 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService - function countOthers($address) + /** + * Counts the number of bookmarks that have the same address + * as the given address. + * + * @internal + * We do support fetching counts for multiple addresses at once + * because that allows us to reduce the number of queries + * we need in the web interface when displaying i.e. + * 10 bookmarks - only one SQL query is needed then. + * + * @param string|array $addresses Address/URL to look for, string + * of one address or array with + * multiple ones + * + * @return integer Number of bookmarks minus one that have the address. + * In case $addresses was an array, key-value array + * with key being the address, value said number of + * bookmarks + */ + public function countOthers($addresses) { - if (!$address) { + if (!$addresses) { return false; } + $bArray = is_array($addresses); - $userservice = SemanticScuttle_Service_Factory :: get('User'); - $sId = $userservice->getCurrentUserId(); + $us = SemanticScuttle_Service_Factory::get('User'); + $sId = (int)$us->getCurrentUserId(); - if ($userservice->isLoggedOn()) { - // All public bookmarks, user's own bookmarks and any shared with user - $privacy = ' AND ((B.bStatus = 0) OR (B.uId = '. $sId .')'; - $watchnames = $userservice->getWatchNames($sId, true); - foreach($watchnames as $watchuser) { - $privacy .= ' OR (U.username = "'. $watchuser .'" AND B.bStatus = 1)'; + if ($us->isLoggedOn()) { + //All public bookmarks, user's own bookmarks + // and any shared with our user + $privacy = ' AND ((B.bStatus = 0) OR (B.uId = ' . $sId . ')'; + $watchnames = $us->getWatchNames($sId, true); + foreach ($watchnames as $watchuser) { + $privacy .= ' OR (U.username = "' + . $this->db->sql_escape($watchuser) + . '" AND B.bStatus = 1)'; } $privacy .= ')'; } else { - // Just public bookmarks + //Just public bookmarks $privacy = ' AND B.bStatus = 0'; } - $sql = 'SELECT COUNT(*) FROM '. $userservice->getTableName() .' AS U, '. $GLOBALS['tableprefix'] .'bookmarks AS B WHERE U.'. $userservice->getFieldName('primary') .' = B.uId AND B.bHash = "'. md5($address) .'"'. $privacy; - if (!($dbresult = & $this->db->sql_query($sql))) { - message_die(GENERAL_ERROR, 'Could not get vars', '', __LINE__, __FILE__, $sql, $this->db); + $addressesSql = ' AND (0'; + foreach ((array)$addresses as $address) { + $addressesSql .= ' OR B.bHash = "' + . $this->db->sql_escape($this->getHash($address)) + . '"'; + } + $addressesSql .= ')'; + + + $sql = 'SELECT B.bAddress, COUNT(*) as count FROM ' + . $us->getTableName() . ' AS U' + . ', '. $GLOBALS['tableprefix'] . 'bookmarks AS B' + . ' WHERE U.'. $us->getFieldName('primary') .' = B.uId' + . $addressesSql + . $privacy + . ' GROUP BY B.bHash'; + + if (!($dbresult = $this->db->sql_query($sql))) { + message_die( + GENERAL_ERROR, 'Could not get other count', + '', __LINE__, __FILE__, $sql, $this->db + ); } - $output = $this->db->sql_fetchfield(0, 0) - 1; + //be sure we also list urls in our array + // that are not found in the database + $counts = array_combine( + (array)$addresses, + array_fill(0, count((array)$addresses), 0) + ); + while ($row = $this->db->sql_fetchrow($dbresult)) { + $counts[$row['bAddress']] + = $row['count'] > 0 ? $row['count'] - 1 : 0; + } $this->db->sql_freeresult($dbresult); - return $output; + + return $bArray ? $counts : reset($counts); } diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 8e5cb22..4d2c969 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -266,27 +266,90 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return true; } - function &getTagsForBookmark($bookmarkid) { + + /** + * Retrieves all tags for a given bookmark except system tags. + * + * @param integer $bookmarkid ID of the bookmark + * + * @return array Array of tags + */ + public function getTagsForBookmark($bookmarkid) + { if (!is_numeric($bookmarkid)) { - message_die(GENERAL_ERROR, 'Could not get tags (invalid bookmarkid)', '', __LINE__, __FILE__, $query); + message_die( + GENERAL_ERROR, 'Could not get tags (invalid bookmarkid)', + '', __LINE__, __FILE__, $query + ); return false; } - $query = 'SELECT tag FROM '. $this->getTableName() .' WHERE bId = '. intval($bookmarkid) .' AND LEFT(tag, 7) <> "system:" ORDER BY id ASC'; + $query = 'SELECT tag FROM ' . $this->getTableName() + . ' WHERE bId = ' . intval($bookmarkid) + . ' AND LEFT(tag, 7) <> "system:"' + . ' ORDER BY id ASC'; - if (!($dbresult =& $this->db->sql_query($query))) { - message_die(GENERAL_ERROR, 'Could not get tags', '', __LINE__, __FILE__, $query, $this->db); + if (!($dbresult = $this->db->sql_query($query))) { + message_die( + GENERAL_ERROR, 'Could not get tags', + '', __LINE__, __FILE__, $query, $this->db + ); return false; } $tags = array(); - while ($row =& $this->db->sql_fetchrow($dbresult)) { + while ($row = $this->db->sql_fetchrow($dbresult)) { $tags[] = $row['tag']; } $this->db->sql_freeresult($dbresult); return $tags; } + + /** + * Retrieves all tags for an array of bookmark IDs + * + * @param array $bookmarkids Array of bookmark IDs + * + * @return array Array of tag arrays. Key is bookmark ID. + */ + public function getTagsForBookmarks($bookmarkids) + { + if (!is_array($bookmarkids)) { + message_die( + GENERAL_ERROR, 'Could not get tags (invalid bookmarkids)', + '', __LINE__, __FILE__, $query + ); + return false; + } else if (count($bookmarkids) == 0) { + return array(); + } + + $query = 'SELECT tag, bId FROM ' . $this->getTableName() + . ' WHERE bId IN (' . implode(',', $bookmarkids) . ')' + . ' AND LEFT(tag, 7) <> "system:"' + . ' ORDER BY id, bId ASC'; + + if (!($dbresult = $this->db->sql_query($query))) { + message_die( + GENERAL_ERROR, 'Could not get tags', + '', __LINE__, __FILE__, $query, $this->db + ); + return false; + } + + $tags = array_combine( + $bookmarkids, + array_fill(0, count($bookmarkids), array()) + ); + while ($row = $this->db->sql_fetchrow($dbresult)) { + $tags[$row['bId']][] = $row['tag']; + } + $this->db->sql_freeresult($dbresult); + return $tags; + } + + function &getTags($userid = NULL) { $userservice =SemanticScuttle_Service_Factory::get('User'); $logged_on_user = $userservice->getCurrentUserId(); diff --git a/src/SemanticScuttle/Service/Factory.php b/src/SemanticScuttle/Service/Factory.php index 9b79e6c..d7ff1d4 100644 --- a/src/SemanticScuttle/Service/Factory.php +++ b/src/SemanticScuttle/Service/Factory.php @@ -113,7 +113,7 @@ class SemanticScuttle_Service_Factory protected static function loadDb() { global $dbhost, $dbuser, $dbpass, $dbname, - $dbport, $dbpersist, $dbtype; + $dbport, $dbpersist, $dbtype, $dbneedssetnames; if (self::$db !== null) { return; @@ -130,7 +130,9 @@ class SemanticScuttle_Service_Factory self::$db ); } - $db->sql_query('SET NAMES UTF8'); + + $dbneedssetnames && $db->sql_query('SET NAMES UTF8'); + self::$db = $db; } diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index cedde92..281c18c 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -76,15 +76,28 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService $this->updateSessionStability(); } - function _getuser($fieldname, $value) { - $query = 'SELECT * FROM '. $this->getTableName() .' WHERE '. $fieldname .' = "'. $this->db->sql_escape($value) .'"'; + /** + * Fetches the desired user row from database, specified by column and value + * + * @param string $fieldname Name of database column to identify user + * @param string $value Value of $fieldname + * + * @return array Database row or boolean false + */ + protected function _getuser($fieldname, $value) + { + $query = 'SELECT * FROM '. $this->getTableName() + . ' WHERE ' . $fieldname . ' = "' . $this->db->sql_escape($value) . '"'; - if (! ($dbresult =& $this->db->sql_query($query)) ) { - message_die(GENERAL_ERROR, 'Could not get user', '', __LINE__, __FILE__, $query, $this->db); + if (!($dbresult = $this->db->sql_query($query)) ) { + message_die( + GENERAL_ERROR, 'Could not get user', + '', __LINE__, __FILE__, $query, $this->db + ); return false; } - $row =& $this->db->sql_fetchrow($dbresult); + $row = $this->db->sql_fetchrow($dbresult); $this->db->sql_freeresult($dbresult); if ($row) { return $row; @@ -305,9 +318,14 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService /** * Checks if the given user is an administrator. * Uses global admin_users property containing admin - * user names + * user names. + * + * Passing the user id makes this function load the user + * from database. For efficiency reasons, try to pass + * the user name or database row. * - * @param integer|array $user User ID or user row from DB + * @param integer|array|string $user User ID or user row from DB + * or user name * * @return boolean True if the user is admin */ @@ -315,10 +333,13 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService { if (is_numeric($user)) { $user = $this->getUser($user); + $user = $user['username']; + } else if (is_array($user)) { + $user = $user['username']; } if (isset($GLOBALS['admin_users']) - && in_array($user['username'], $GLOBALS['admin_users']) + && in_array($user, $GLOBALS['admin_users']) ) { return true; } else { @@ -386,6 +407,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService } //reload user object $this->getCurrentUser(true); + $this->getCurrentObjectUser(true); } diff --git a/src/SemanticScuttle/db/mysqli.php b/src/SemanticScuttle/db/mysqli.php index 27814a7..03b36ea 100644 --- a/src/SemanticScuttle/db/mysqli.php +++ b/src/SemanticScuttle/db/mysqli.php @@ -440,7 +440,7 @@ class sql_db echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; + echo '</style><title>DB query explanation</title></head><body>'; echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td height="40" align="center" valign="middle"><b>Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($cache_num_queries) ? " + $cache_num_queries " . (($cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '</b></td></tr><tr><td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td></tr></table><table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr><td>'; echo $sql_report; echo '</td></tr></table><br /></body></html>'; diff --git a/src/SemanticScuttle/functions.php b/src/SemanticScuttle/functions.php index d21a094..84e9c5f 100644 --- a/src/SemanticScuttle/functions.php +++ b/src/SemanticScuttle/functions.php @@ -1,6 +1,19 @@ <?php -/* Define functions used into the application */ - +/** + * Defines some commonly used functions. + * + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ // Converts tags: // - direction = out: convert spaces to underscores; @@ -35,10 +48,23 @@ function filter($data, $type = NULL) { return $data; } -function getPerPageCount($userObject = null) { +/** + * Returns the number of bookmarks that shall be displayed on one page. + * + * @param SemanticScuttle_Model_User $userObject Object of the current user + * + * @return integer Number of bookmarks per page + * + * @uses $defaultPerPage + * @uses $defaultPerPageForAdmins + */ +function getPerPageCount($userObject = null) +{ global $defaultPerPage, $defaultPerPageForAdmins; - - if(isset($defaultPerPageForAdmins) && $userObject != null && $userObject->isAdmin()) { + + if (isset($defaultPerPageForAdmins) + && $userObject != null && $userObject->isAdmin() + ) { return $defaultPerPageForAdmins; } else { return $defaultPerPage; diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 12c1f72..ef36e83 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -107,6 +107,12 @@ $tplVars['userservice'] = $userservice; // 6 // Force UTF-8 behaviour for server (cannot be moved into top.inc.php which is not included into every file) if (!defined('UNIT_TEST_MODE')) { - header('Content-Type: text/html; charset=utf-8'); + //API files define that, so we need a way to support both of them + if (!isset($httpContentType)) { + $httpContentType = 'text/html'; + } + if ($httpContentType !== false) { + header('Content-Type: ' . $httpContentType . '; charset=utf-8'); + } } ?> diff --git a/tests/AllTests.php b/tests/AllTests.php index 23ad25e..d29de7f 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -56,6 +56,7 @@ class AllTests extends PHPUnit_Framework_TestSuite $suite = new AllTests(); $tdir = dirname(__FILE__); $suite->addTestFile($tdir . '/BookmarkTest.php'); + $suite->addTestFile($tdir . '/Bookmark2TagTest.php'); $suite->addTestFile($tdir . '/Tag2TagTest.php'); $suite->addTestFile($tdir . '/TagsCacheTest.php'); $suite->addTestFile($tdir . '/CommonDescriptionTest.php'); diff --git a/tests/Api/ExportCsvTest.php b/tests/Api/ExportCsvTest.php new file mode 100644 index 0000000..2bff8a5 --- /dev/null +++ b/tests/Api/ExportCsvTest.php @@ -0,0 +1,287 @@ +<?php +/** + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Api_ExportCsvTest::main'); +} + +/** + * Unit tests for the SemanticScuttle csv export API + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class Api_ExportCsvTest extends TestBaseApi +{ + protected $us; + protected $bs; + protected $urlPart = 'api/export_csv.php'; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + /** + * Test if authentication is required when sending no auth data + */ + public function testAuthWithoutAuthData() + { + $req = $this->getRequest(null, false); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if authentication is required when sending wrong user data + + */ + public function testAuthWrongCredentials() + { + $req = $this->getRequest(null, false); + $req->setAuth('user', 'password', HTTP_Request2::AUTH_BASIC); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test MIME content type and filename header fields + */ + public function testMimeTypeFilename() + { + $res = reset($this->getAuthRequest())->send(); + + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'application/csv-tab-delimited-table; charset=utf-8', + $res->getHeader('content-type') + ); + //we need a file name + $this->assertNotNull($res->getHeader('content-disposition')); + } + + + + /** + * Test CSV export without bookmarks + */ + public function testNoBookmarks() + { + list($req, $uid) = $this->getAuthRequest(); + $body = $req->send()->getBody(); + $csv = $this->getCsvArray($body); + + $this->assertEquals(1, count($csv)); + $this->assertCsvHeader($csv); + } + + + + /** + * Test CSV export with some bookmarks + */ + public function testBookmarks() + { + list($req, $uid) = $this->getAuthRequest(); + //public + $this->addBookmark( + $uid, 'http://example.org/testBookmarks', 0, + array('unittest', 'testBookmarks'), 'mytitle' + ); + //shared + $this->addBookmark( + $uid, 'http://example.org/testBookmarks-shared', 1, + array('unittest', 'testBookmarks'), 'mytitle-shared' + ); + //private + $this->addBookmark( + $uid, 'http://example.org/testBookmarks-private', 2, + array('unittest', 'testBookmarks'), 'mytitle-private' + ); + + //private other that should not in the export + $this->addBookmark( + null, 'http://example.org/testBookmarks-private2', 2 + ); + //public bookmark from other people that should not be + // exported, too + $this->addBookmark( + null, 'http://example.org/testBookmarks-other', 0 + ); + + $body = $req->send()->getBody(); + $csv = $this->getCsvArray($body); + + $this->assertEquals(4, count($csv)); + $this->assertCsvHeader($csv); + + $this->assertEquals('http://example.org/testBookmarks', $csv[1][0]); + $this->assertEquals('mytitle', $csv[1][1]); + $this->assertEquals('unittest,testbookmarks', $csv[1][2]); + + $this->assertEquals('http://example.org/testBookmarks-shared', $csv[2][0]); + $this->assertEquals('mytitle-shared', $csv[2][1]); + $this->assertEquals('unittest,testbookmarks', $csv[2][2]); + + $this->assertEquals('http://example.org/testBookmarks-private', $csv[3][0]); + $this->assertEquals('mytitle-private', $csv[3][1]); + $this->assertEquals('unittest,testbookmarks', $csv[3][2]); + } + + + + /** + * Test CSV export with tag filter + */ + public function testTagFilter() + { + list($req, $uid) = $this->getAuthRequest('?tag=tag1'); + $this->addBookmark( + $uid, 'http://example.org/tag-1', 0, + array('unittest', 'tag1') + ); + $this->addBookmark( + $uid, 'http://example.org/tag-2', 0, + array('unittest', 'tag2') + ); + $this->addBookmark( + $uid, 'http://example.org/tag-3', 0, + array('unittest', 'tag1', 'tag2') + ); + + $body = $req->send()->getBody(); + $csv = $this->getCsvArray($body); + + $this->assertEquals(3, count($csv)); + $this->assertCsvHeader($csv); + + $this->assertEquals('http://example.org/tag-1', $csv[1][0]); + $this->assertEquals('http://example.org/tag-3', $csv[2][0]); + } + + + + /** + * Test CSV export with tag filter for multiple tags + */ + public function testTagFilterMultiple() + { + list($req, $uid) = $this->getAuthRequest('?tag=tag1+tag2'); + $this->addBookmark( + $uid, 'http://example.org/tag-1', 0, + array('unittest', 'tag1') + ); + $this->addBookmark( + $uid, 'http://example.org/tag-2', 0, + array('unittest', 'tag2') + ); + $this->addBookmark( + $uid, 'http://example.org/tag-3', 0, + array('unittest', 'tag1', 'tag2') + ); + + $body = $req->send()->getBody(); + $csv = $this->getCsvArray($body); + + $this->assertEquals(2, count($csv)); + $this->assertCsvHeader($csv); + + $this->assertEquals('http://example.org/tag-3', $csv[1][0]); + } + + + + /** + * Asserts that the CSV array contains the correct header + * + * @param array $csv CSV array from getCsvArray() + * + * @return void + */ + protected function assertCsvHeader($csv) + { + $this->assertEquals( + array('url', 'title', 'tags', 'description'), + $csv[0] + ); + } + + + + /** + * Converts a string of CSV data to an array + * + * @param string $body String containing the full CSV file + * + * @return array Array of CSV data + */ + protected function getCsvArray($body) + { + $v53 = (version_compare(PHP_VERSION, '5.3.0') === 1); + + //dead simple implementation that does not work with + // advanced CSV files + $ar = array(); + foreach (explode("\n", $body) as $line) { + if ($v53) { + $ar[] = str_getcsv($line, ';'); + } else { + $arl = explode(';', $line); + foreach ($arl as &$str) { + if (substr($str, 0, 1) == '"' + && substr($str, -1) == '"' + ) { + $str = substr($str, 1, -1); + } + } + $ar[] = $arl; + } + } + if (count(end($ar)) == 1 && reset(end($ar)) == '') { + unset($ar[key($ar)]); + } + return $ar; + } +} + +if (PHPUnit_MAIN_METHOD == 'Api_ExportCsvTest::main') { + Api_ExportCsvTest::main(); +} +?>
\ No newline at end of file diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php new file mode 100644 index 0000000..14b71cc --- /dev/null +++ b/tests/Bookmark2TagTest.php @@ -0,0 +1,213 @@ +<?php +/** + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once 'prepare.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Bookmark2TagTest::main'); +} + +/** + * Unit tests for the SemanticScuttle bookmark-tag combination service. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class Bookmark2TagTest extends TestBase +{ + protected $us; + protected $bs; + protected $ts; + protected $tts; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + protected function setUp() + { + $this->us = SemanticScuttle_Service_Factory::get('User'); + $this->bs = SemanticScuttle_Service_Factory::get('Bookmark'); + $this->bs->deleteAll(); + $this->b2ts= SemanticScuttle_Service_Factory::get('Bookmark2Tag'); + $this->b2ts->deleteAll(); + $this->tts = SemanticScuttle_Service_Factory::get('Tag2Tag'); + $this->tts->deleteAll(); + $this->tsts = SemanticScuttle_Service_Factory::get('TagStat'); + $this->tsts->deleteAll(); + $this->vs = SemanticScuttle_Service_Factory::get('Vote'); + $this->vs->deleteAll(); + } + + + + /** + * Test getTagsForBookmark() when the bookmark has no tags + * + * @return void + */ + public function testGetTagsForBookmarkNone() + { + $this->addBookmark(null, null, 0, array('forz', 'barz')); + + $bid = $this->addBookmark(null, null, 0, array()); + $this->assertEquals( + array(), + $this->b2ts->getTagsForBookmark($bid) + ); + } + + + + /** + * Test getTagsForBookmark() when the bookmark has one tag + * + * @return void + */ + public function testGetTagsForBookmarkOne() + { + $this->addBookmark(null, null, 0, array('forz', 'barz')); + + $bid = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid, array('foo')); + $this->assertEquals( + array('foo'), + $this->b2ts->getTagsForBookmark($bid) + ); + } + + + + /** + * Test getTagsForBookmark() when the bookmark has three tags + * + * @return void + */ + public function testGetTagsForBookmarkThree() + { + $this->addBookmark(null, null, 0, array('forz', 'barz')); + + $bid = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid, array('foo', 'bar', 'fuu')); + + $tags = $this->b2ts->getTagsForBookmark($bid); + $this->assertType('array', $tags); + $this->assertContains('foo', $tags); + $this->assertContains('bar', $tags); + $this->assertContains('fuu', $tags); + } + + + + /** + * Test getTagsForBookmarks() when no bookmarks have tags. + * + * @return void + */ + public function testGetTagsForBookmarksNone() + { + $bid1 = $this->addBookmark(null, null, 0, array()); + $bid2 = $this->addBookmark(null, null, 0, array()); + + $alltags = $this->b2ts->getTagsForBookmarks( + array($bid1, $bid2) + ); + $this->assertType('array', $alltags); + $this->assertEquals(2, count($alltags)); + $this->assertType('array', $alltags[$bid1]); + $this->assertType('array', $alltags[$bid2]); + $this->assertEquals(0, count($alltags[$bid1])); + $this->assertEquals(0, count($alltags[$bid2])); + } + + + + /** + * Test getTagsForBookmarks() when most bookmarks have tags. + * + * @return void + */ + public function testGetTagsForBookmarksMost() + { + $bid1 = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid1, array('foo', 'bar', 'fuu')); + + $bid2 = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid2, array('foo', 'bar2', 'fuu2')); + + $bid3 = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid3, array('foo', 'bar2', 'fuu3')); + + $bid4 = $this->addBookmark(null, null, 0, array()); + //no tags + + //bookmark that does not get queried + //http://sourceforge.net/projects/semanticscuttle/forums/forum/759510/topic/3752670 + $bid5 = $this->addBookmark(null, null, 0, array()); + $this->b2ts->attachTags($bid5, array('foo', 'bar2', 'fuu5')); + + + $alltags = $this->b2ts->getTagsForBookmarks( + array($bid1, $bid2, $bid3, $bid4) + ); + $this->assertType('array', $alltags); + foreach ($alltags as $bid => $btags) { + $this->assertType('array', $btags); + if ($bid == $bid1) { + $this->assertEquals(3, count($btags)); + $this->assertContains('foo', $btags); + $this->assertContains('bar', $btags); + $this->assertContains('fuu', $btags); + } else if ($bid == $bid2) { + $this->assertEquals(3, count($btags)); + $this->assertContains('foo', $btags); + $this->assertContains('bar2', $btags); + $this->assertContains('fuu2', $btags); + } else if ($bid == $bid3) { + $this->assertEquals(3, count($btags)); + $this->assertContains('foo', $btags); + $this->assertContains('bar2', $btags); + $this->assertContains('fuu3', $btags); + } else if ($bid == $bid4) { + $this->assertEquals(0, count($btags)); + } else { + $this->assertTrue(false, 'Unknown bookmark id'); + } + } + } +} + +if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { + Bookmark2TagTest::main(); +} +?>
\ No newline at end of file diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php index 741b6bf..40869b2 100644 --- a/tests/BookmarkTest.php +++ b/tests/BookmarkTest.php @@ -253,6 +253,132 @@ class BookmarkTest extends TestBase /** + * Tests if bookmarksExist() returns true when a bookmark + * exists + * + * @return void + */ + public function testBookmarksExistTrueSingle() + { + $bid = $this->addBookmark(); + $bookmark = $this->bs->getBookmark($bid); + + $ret = $this->bs->bookmarksExist(array($bookmark['bAddress'])); + $this->assertType('array', $ret); + $this->assertEquals(1, count($ret)); + $this->assertTrue($ret[$bookmark['bAddress']]); + } + + + + /** + * Tests if bookmarksExist() returns true when all bookmarks + * exist + * + * @return void + */ + public function testBookmarksExistTrueMultiple() + { + $bid = $this->addBookmark(); + $bookmark = $this->bs->getBookmark($bid); + + $bid2 = $this->addBookmark(); + $bookmark2 = $this->bs->getBookmark($bid2); + + + $ret = $this->bs->bookmarksExist( + array( + $bookmark['bAddress'], + $bookmark2['bAddress'] + ) + ); + $this->assertType('array', $ret); + $this->assertEquals(2, count($ret)); + $this->assertTrue($ret[$bookmark['bAddress']]); + $this->assertTrue($ret[$bookmark2['bAddress']]); + } + + + + /** + * Tests if bookmarksExist() returns false when a bookmark + * does not exist + * + * @return void + */ + public function testBookmarksExistFalseSingle() + { + $ret = $this->bs->bookmarksExist(array('does-not-exist')); + $this->assertType('array', $ret); + $this->assertEquals(1, count($ret)); + $this->assertFalse($ret['does-not-exist']); + } + + + + /** + * Tests if bookmarksExist() returns false when all bookmarks + * do not exist + * + * @return void + */ + public function testBookmarksExistFalseMultiple() + { + $bms = array( + 'does-not-exist', + 'does-not-exist-2', + 'does-not-exist-3', + ); + $ret = $this->bs->bookmarksExist($bms); + $this->assertType('array', $ret); + $this->assertEquals(3, count($ret)); + $this->assertFalse($ret['does-not-exist']); + $this->assertFalse($ret['does-not-exist-2']); + $this->assertFalse($ret['does-not-exist-3']); + } + + + + /** + * Tests if bookmarksExist() returns true when some bookmarks + * exist. + * + * @return void + */ + public function testBookmarksExistSome() + { + $bid = $this->addBookmark(); + $bookmark = $this->bs->getBookmark($bid); + + $bid2 = $this->addBookmark(); + $bookmark2 = $this->bs->getBookmark($bid2); + + //do not search for this one + $bid3 = $this->addBookmark(); + $bookmark3 = $this->bs->getBookmark($bid3); + + + $ret = $this->bs->bookmarksExist( + array( + $bookmark['bAddress'], + 'does-not-exist', + $bookmark2['bAddress'], + 'does-not-exist-2', + 'does-not-exist-3' + ) + ); + $this->assertType('array', $ret); + $this->assertEquals(5, count($ret)); + $this->assertTrue($ret[$bookmark['bAddress']]); + $this->assertTrue($ret[$bookmark2['bAddress']]); + $this->assertFalse($ret['does-not-exist']); + $this->assertFalse($ret['does-not-exist-2']); + $this->assertFalse($ret['does-not-exist-3']); + } + + + + /** * Test if countBookmarks() works with no bookmarks * * @return void @@ -332,6 +458,40 @@ class BookmarkTest extends TestBase /** + * Check tag loading functionality of getBookmarks() + * + * @return void + */ + public function testGetBookmarksIncludeTags() + { + $uid = $this->addUser(); + $bid = $this->addBookmark($uid); + $this->b2ts->attachTags($bid, array('foo', 'bar')); + $bid2 = $this->addBookmark($uid); + $this->b2ts->attachTags($bid2, array('fuu', 'baz')); + + $bms = $this->bs->getBookmarks(); + $this->assertEquals(2, count($bms['bookmarks'])); + $this->assertEquals(2, $bms['total']); + + foreach ($bms['bookmarks'] as $bm) { + $this->assertArrayHasKey('tags', $bm); + $this->assertType('array', $bm['tags']); + if ($bm['bId'] == $bid) { + $this->assertContains('foo', $bm['tags']); + $this->assertContains('bar', $bm['tags']); + } else if ($bm['bId'] == $bid2) { + $this->assertContains('fuu', $bm['tags']); + $this->assertContains('baz', $bm['tags']); + } else { + $this->assertTrue(false, 'Unknown bookmark id'); + } + } + } + + + + /** * Test if deleting a bookmark works. * * @return void @@ -703,6 +863,50 @@ class BookmarkTest extends TestBase + /** + * Tests if getBookmarkByAddress() works correctly. + * + * @return void + */ + public function testGetBookmarkByAddress() + { + $url = 'http://example.org'; + $uid = $this->addUser(); + $bid = $this->addBookmark($uid, $url); + + $bm = $this->bs->getBookmarkByAddress($url); + $this->assertType('array', $bm); + $this->assertEquals($url, $bm['bAddress']); + } + + + + /** + * Tests if getBookmarkByAddress() works correctly with aliases. + * When passing an incomplete address i.e. without protocol, + * the full URL needs to be searched for. + * + * The failure of this test lead to #2953732. + * + * @return void + * + * @link https://sourceforge.net/tracker/?func=detail&atid=1017430&aid=2953732&group_id=211356 + */ + public function testGetBookmarkByAddressAlias() + { + $url = 'http://example.org'; + $incomplete = 'example.org'; + + $uid = $this->addUser(); + $bid = $this->addBookmark($uid, $url); + + $bm = $this->bs->getBookmarkByAddress($incomplete); + $this->assertType('array', $bm); + $this->assertEquals($url, $bm['bAddress']); + } + + + public function testNormalize() { $this->assertEquals( @@ -778,6 +982,251 @@ class BookmarkTest extends TestBase $this->assertEquals('newShortNambb', $bm['bShort']); } + + + /** + * Test what countOther() returns when the address does not exist + * + * @return void + */ + public function testCountOthersAddressDoesNotExist() + { + $this->assertEquals(0, $this->bs->countOthers('http://example.org')); + } + + + + /** + * Test what countOther() returns when nobody else has the same bookmark + * + * @return void + */ + public function testCountOthersNone() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + $this->addBookmark($uid, $address); + $this->assertEquals(0, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the address exists only once + * and multiple bookmarks are in the database. + * + * @return void + */ + public function testCountOthersMultipleNone() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + $this->addBookmark($uid, $address); + $this->addBookmark($uid); + $this->addBookmark($uid); + $this->assertEquals(0, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the address exists only once + * and the same user and other users have other bookmarks + * + * @return void + */ + public function testCountOthersMultipleUsersNone() + { + $uid = $this->addUser(); + $uid2 = $this->addUser(); + $address = 'http://example.org'; + $this->addBookmark($uid, $address); + $this->addBookmark($uid); + $this->addBookmark($uid2); + $this->assertEquals(0, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the address exists two + * times in the database. + * + * @return void + */ + public function testCountOthersOne() + { + $uid = $this->addUser(); + $uid2 = $this->addUser(); + $address = 'http://example.org'; + $this->addBookmark($uid, $address); + $this->addBookmark($uid2, $address); + $this->assertEquals(1, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the address exists four + * times in the database. + * + * @return void + */ + public function testCountOthersThree() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + $this->addBookmark($uid, $address); + $this->addBookmark(null, $address); + $this->addBookmark(null, $address); + $this->addBookmark(null, $address); + $this->assertEquals(3, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the user is logged in + * and friends (people on the watchlist) have bookmarked + * and shared the same address. + * + * @return void + */ + public function testCountOthersWatchlist() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + //log user in + $this->us->setCurrentUserId($uid); + + //setup users + $otherPublic1 = $this->addUser(); + $otherPublic2 = $this->addUser(); + $otherShared1 = $this->addUser(); + $otherPrivate1 = $this->addUser(); + $friendPublic1 = $this->addUser(); + $friendShared1 = $this->addUser(); + $friendShared2 = $this->addUser(); + $friendPrivate1 = $this->addUser(); + $friendSharing1 = $this->addUser(); + + //setup watchlists + $us = SemanticScuttle_Service_Factory::get('User'); + $this->us->setCurrentUserId($friendPublic1); + $us->setWatchStatus($uid); + $this->us->setCurrentUserId($friendShared1); + $us->setWatchStatus($uid); + $this->us->setCurrentUserId($friendShared2); + $us->setWatchStatus($uid); + $this->us->setCurrentUserId($friendPrivate1); + $us->setWatchStatus($uid); + + //back to login of main user + $this->us->setCurrentUserId($uid); + $us->setWatchStatus($friendSharing1); + + //add bookmarks + $this->addBookmark($uid, $address, 0); + $this->addBookmark($otherPublic1, $address, 0); + $this->addBookmark($otherPublic2, $address, 0); + $this->addBookmark($otherShared1, $address, 1); + $this->addBookmark($otherPrivate1, $address, 2); + $this->addBookmark($friendPublic1, $address, 0); + $this->addBookmark($friendShared1, $address, 1); + $this->addBookmark($friendShared2, $address, 1); + $this->addBookmark($friendPrivate1, $address, 2); + //this user is on our watchlist, but we not on his + $this->addBookmark($friendSharing1, $address, 1); + + //2 public + //1 public (friend) + //2 shared + //-> 5 + $this->assertEquals(5, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when multiple addresses are + * passed to it and none of them exists. + * + * @return void + */ + public function testCountOthersArrayNone() + { + $this->assertEquals( + array('1' => 0, '2' => 0, '3' => 0), + $this->bs->countOthers(array('1', '2', '3')) + ); + } + + + + /** + * Test what countOther() returns when multiple addresses are + * passed to it and only one of them exists. + * + * @return void + */ + public function testCountOthersArrayOneNone() + { + $uid = $this->addUser(); + $uid2 = $this->addUser(); + $address1 = 'http://example.org/1'; + $address2 = 'http://example.org/2'; + $this->addBookmark($uid, $address1); + $this->addBookmark($uid, $address2); + $this->addBookmark($uid2, $address1); + $this->assertEquals( + array( + $address1 => 1, + $address2 => 0 + ), + $this->bs->countOthers( + array($address1, $address2) + ) + ); + } + + + + /** + * Test what countOther() returns when multiple addresses are passed + * to it and both of them exist with different numbers for each. + * + * @return void + */ + public function testCountOthersArrayTwoOne() + { + $uid = $this->addUser(); + $uid2 = $this->addUser(); + $uid3 = $this->addUser(); + + $address1 = 'http://example.org/1'; + $address2 = 'http://example.org/2'; + + $this->addBookmark($uid, $address1); + $this->addBookmark($uid, $address2); + + $this->addBookmark($uid2, $address1); + $this->addBookmark($uid2, $address2); + + $this->addBookmark($uid3, $address1); + + $this->assertEquals( + array( + $address1 => 2, + $address2 => 1 + ), + $this->bs->countOthers( + array($address1, $address2) + ) + ); + } + + + } diff --git a/tests/LAUNCH_TESTS b/tests/LAUNCH_TESTS index 7d6ddc0..7ee9227 100644 --- a/tests/LAUNCH_TESTS +++ b/tests/LAUNCH_TESTS @@ -12,7 +12,7 @@ Warning The unit tests are DESTRUCTIBLE! Never ever run them on your normal SemanticScuttle database! Always use a different database for testing - whole tables are emptied and re-filled during the -tests, and you will definitely loose all data in there. +tests, and you will definitely lose all data in there. Running the tests diff --git a/tests/TestBase.php b/tests/TestBase.php index 05988a5..402330b 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -29,25 +29,45 @@ class TestBase extends PHPUnit_Framework_TestCase /** * Create a new bookmark. * - * @param integer $user User ID the bookmark shall belong + * @param integer $user User ID the bookmark shall belong + * @param string $address Bookmark address to use + * @param integer $status Bookmark visibility + * @param array $tags Array of tags to attach. If "null" is given, + * it will automatically be "unittest" + * @param string $title Bookmark title * * @return integer ID of bookmark + * + * @see SemanticScuttle_Service_Bookmark::addBookmark() */ - protected function addBookmark($user = null) - { + protected function addBookmark( + $user = null, $address = null, $status = 0, + $tags = null, $title = null + ) { if ($user === null) { $user = $this->addUser(); } + if ($tags === null) { + $tags = array('unittest'); + } $bs = SemanticScuttle_Service_Factory::get('Bookmark'); $rand = rand(); + + if ($address === null) { + $address = 'http://example.org/' . $rand; + } + if ($title === null) { + $title = 'unittest bookmark #' . $rand; + } + $bid = $bs->addBookmark( - 'http://example.org/' . $rand, - 'unittest bookmark #' . $rand, + $address, + $title, 'description', null, - 0, - array('unittest'), + $status, + $tags, null, null, false, false, $user ); @@ -59,15 +79,26 @@ class TestBase extends PHPUnit_Framework_TestCase /** * Creates a new user in the database. * + * @param string $username Username + * @param string $password Password + * * @return integer ID of user */ - protected function addUser() + protected function addUser($username = null, $password = null) { $us = SemanticScuttle_Service_Factory::get('User'); $rand = rand(); + + if ($username === null) { + $username = 'unittestuser-' . $rand; + } + if ($password === null) { + $password = $rand; + } + $uid = $us->addUser( - 'unittestuser-' . $rand, - $rand, + $username, + $password, 'unittest-' . $rand . '@example.org' ); return $uid; diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php new file mode 100644 index 0000000..645ead9 --- /dev/null +++ b/tests/TestBaseApi.php @@ -0,0 +1,100 @@ +<?php +/** + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske <cweiske@cweiske.de> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once 'PHPUnit/Framework.php'; + +PHPUnit_Util_Filter::addFileToFilter(__FILE__); + +/** + * Base unittest class for web API tests. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske <cweiske@cweiske.de> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class TestBaseApi extends TestBase +{ + protected $url; + protected $urlPart = null; + + + + protected function setUp() + { + if ($GLOBALS['unittestUrl'] === null) { + $this->assertTrue(false, 'Unittest URL not set in config'); + } + if ($this->urlPart === null) { + $this->assertTrue(false, 'Set the urlPart variable'); + } + $this->url = $GLOBALS['unittestUrl'] . $this->urlPart; + + $this->us = SemanticScuttle_Service_Factory::get('User'); + $this->us->deleteAll(); + $this->bs = SemanticScuttle_Service_Factory::get('Bookmark'); + $this->bs->deleteAll(); + $this->b2t = SemanticScuttle_Service_Factory::get('Bookmark2Tag'); + $this->b2t->deleteAll(); + } + + + + /** + * Gets a HTTP request object + * + * @param string $urlSuffix Suffix for the URL + * + * @return HTTP_Request2 HTTP request object + */ + protected function getRequest($urlSuffix = null) + { + $req = new HTTP_Request2( + $this->url . $urlSuffix, + HTTP_Request2::METHOD_GET + ); + + return $req; + } + + + + /** + * Gets a HTTP request object + * + * @param string $urlSuffix Suffix for the URL + * @param mixed $auth If user authentication is needed (true/false) + * or array with username and password + * + * @return array(HTTP_Request2, integer) HTTP request object and user id + */ + protected function getAuthRequest($urlSuffix = null, $auth = true) + { + $req = $this->getRequest($urlSuffix); + if (is_array($auth)) { + list($username, $password) = $auth; + } else { + $username = 'testuser'; + $password = 'testpassword'; + } + $uid = $this->addUser($username, $password); + $req->setAuth( + $username, $password, + HTTP_Request2::AUTH_BASIC + ); + return array($req, $uid); + } + +} +?>
\ No newline at end of file diff --git a/tests/prepare.php b/tests/prepare.php index 835810e..ce9cd1c 100644 --- a/tests/prepare.php +++ b/tests/prepare.php @@ -21,6 +21,7 @@ define('UNIT_TEST_MODE', true); require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; require_once dirname(__FILE__) . '/TestBase.php'; +require_once dirname(__FILE__) . '/TestBaseApi.php'; if ($GLOBALS['debugMode'] == true && $GLOBALS['dbtype'] == 'mysql4' diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php index 6abc067..6646c50 100644 --- a/www/ajax/getadminlinkedtags.php +++ b/www/ajax/getadminlinkedtags.php @@ -20,7 +20,7 @@ ***************************************************************************/ /* Return a json file with list of linked tags */ - +$httpContentType = 'application/json'; require_once '../www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajax/getadmintags.php b/www/ajax/getadmintags.php index db62fc7..ffd20bb 100644 --- a/www/ajax/getadmintags.php +++ b/www/ajax/getadmintags.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ /* Return a json file with list of tags according to current user and sort by popularity*/ - +$httpContentType = 'application/json'; require_once '../www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php index 85ef1ae..89d6a3a 100644 --- a/www/ajax/getcontacttags.php +++ b/www/ajax/getcontacttags.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ /* Return a json file with list of tags according to current user and sort by popularity*/ - +$httpContentType = 'application/json'; require_once '../www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php index 6de272b..f412998 100644 --- a/www/ajax/getlinkedtags.php +++ b/www/ajax/getlinkedtags.php @@ -20,7 +20,7 @@ ***************************************************************************/ /* Return a json file with list of linked tags */ - +$httpContentType = 'application/json'; require_once '../www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajax/gettags.php b/www/ajax/gettags.php index 3672832..cb73720 100644 --- a/www/ajax/gettags.php +++ b/www/ajax/gettags.php @@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ /* Return a json file with list of tags according to current user and sort by popularity*/ - +$httpContentType = 'application/json'; require_once '../www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajaxDelete.php b/www/ajaxDelete.php index 467e20e..2812612 100644 --- a/www/ajaxDelete.php +++ b/www/ajaxDelete.php @@ -19,9 +19,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -header('Content-Type: text/xml; charset=UTF-8'); header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT'); header('Cache-Control: no-cache, must-revalidate'); +$httpContentType = 'text/xml'; require_once 'www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php index 6caa742..b4f44ca 100644 --- a/www/ajaxGetTitle.php +++ b/www/ajaxGetTitle.php @@ -19,10 +19,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -header('Content-Type: text/xml; charset=UTF-8'); header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT"); header("Cache-Control: no-cache, must-revalidate"); +$httpContentType = 'text/xml'; require_once 'www-header.php'; /* Managing all possible inputs */ diff --git a/www/ajaxIsAvailable.php b/www/ajaxIsAvailable.php index 3390569..41e825e 100644 --- a/www/ajaxIsAvailable.php +++ b/www/ajaxIsAvailable.php @@ -19,10 +19,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ***************************************************************************/ -header('Content-Type: text/xml; charset=UTF-8'); header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT"); header("Cache-Control: no-cache, must-revalidate"); +$httpContentType = 'text/xml'; require_once 'www-header.php'; /* Service creation: only useful services are created */ diff --git a/www/ajaxVote.php b/www/ajaxVote.php index 3e603da..f2572fb 100644 --- a/www/ajaxVote.php +++ b/www/ajaxVote.php @@ -2,6 +2,7 @@ /** * We re-use vote.php but set the ajax flag */ +$httpContentType = 'text/xml'; $GLOBALS['ajaxRequest'] = true; require 'vote.php'; @@ -17,7 +18,6 @@ default: $template = 'bookmarks-vote.inc.tpl.php'; } -header('Content-Type: text/xml; charset=utf-8'); echo '<voteresult><bookmark>' . $bookmark . '</bookmark>' . '<html xmlns="http://www.w3.org/1999/xhtml">'; $ts->loadTemplate( diff --git a/www/api/export_csv.php b/www/api/export_csv.php index 3f63692..bb469b1 100644 --- a/www/api/export_csv.php +++ b/www/api/export_csv.php @@ -1,24 +1,40 @@ <?php -// Export in CSV format in order to allow the import into a spreadsheet tool like Excel +/** + * Export own bookmarks in CSV format in order to allow the import + * into a spreadsheet tool like Excel + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang <mensonge@users.sourceforge.net> + * @author Christian Weiske <cweiske@cweiske.de> + * @author Eric Dane <ericdane@users.sourceforge.net> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'application/csv-tab-delimited-table'; +require_once 'httpauth.inc.php'; +header("Content-disposition: filename=exportBookmarks.csv"); /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); // Check to see if a tag was specified. -if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != '')) - $tag = trim($_REQUEST['tag']); -else - $tag = NULL; +if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != '')) { + //$_GET vars have + replaced to " " automatically + $tag = str_replace(' ', '+', trim($_REQUEST['tag'])); +} else { + $tag = null; +} // Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder()); - -header("Content-Type: application/csv-tab-delimited-table;charset=UTF-8"); -header("Content-disposition: filename=exportBookmarks.csv"); +$bookmarks = $bookmarkservice->getBookmarks( + 0, null, $userservice->getCurrentUserId(), + $tag, null, getSortOrder() +); //columns titles echo 'url;title;tags;description'; diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php index 07bc726..9c0d85c 100644 --- a/www/api/export_gcs.php +++ b/www/api/export_gcs.php @@ -5,6 +5,7 @@ // Force HTTP authentication first! //require_once('httpauth.inc.php'); +$httpContentType = false; require_once '../www-header.php'; if($GLOBALS['enableGoogleCustomSearch'] == false) { @@ -39,7 +40,7 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortO // Set up the plain file and output all the posts. -header('Content-Type: text/plain'); +header('Content-Type: text/plain; charset=utf-8'); if(!$xml) { header('Content-Type: text/plain'); foreach($bookmarks['bookmarks'] as $row) { @@ -48,7 +49,7 @@ if(!$xml) { } } } else { - header('Content-Type: application/xml'); + header('Content-Type: text/xml'); echo '<GoogleCustomizations>'."\n"; echo ' <Annotations>'."\n"; foreach($bookmarks['bookmarks'] as $row) { diff --git a/www/api/export_html.php b/www/api/export_html.php index 8d70927..c7c8cf4 100644 --- a/www/api/export_html.php +++ b/www/api/export_html.php @@ -3,6 +3,9 @@ * Implements the del.icio.us API request for all a user's posts, * optionally filtered by tag. * + * Netscape bookmark file format is documented at + * http://msdn.microsoft.com/en-us/library/aa753582(VS.85).aspx + * * SemanticScuttle - your social bookmark manager. * * PHP version 5. @@ -27,7 +30,8 @@ $bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); // Check to see if a tag was specified. if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != '')) { - $tag = trim($_REQUEST['tag']); + //$_GET vars have + replaced to " " automatically + $tag = str_replace(' ', '+', trim($_REQUEST['tag'])); } else { $tag = null; } @@ -45,7 +49,7 @@ echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8" />'; echo '<!-- This is an automatically generated file. -->'."\r\n"; echo '<TITLE>Bookmarks</TITLE>'."\r\n"; echo '<H1 LAST_MODIFIED="'. date('U') .'">Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."</H1>\r\n"; -echo '<DL><p>'."\r\n"; +echo '<DL>'."\r\n"; @@ -67,9 +71,9 @@ foreach ($bookmarks['bookmarks'] as $row) { $taglist = 'system:unfiled'; } - echo "\t<dt><a href=\"". filter($row['bAddress'], 'xml') .'" '. $description .' hash="'. md5($row['bAddress']) .'" tags="'. filter($taglist, 'xml') .'" ADD_DATE="'. date('U', strtotime($row['bDatetime'])) ."\" >" . filter($row['bTitle'], 'xml') ."</a>\r\n"; + echo "\t<DT><A HREF=\"". filter($row['bAddress'], 'xml') .'" '. $description .' hash="'. md5($row['bAddress']) .'" tags="'. filter($taglist, 'xml') .'" ADD_DATE="'. date('U', strtotime($row['bDatetime'])) ."\" >" . filter($row['bTitle'], 'xml') ."</a>\r\n"; } -echo '</DL><p>'; +echo '</DL>'; ?> diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php index ff1d1c0..8bdfd70 100644 --- a/www/api/export_sioc.php +++ b/www/api/export_sioc.php @@ -1,8 +1,8 @@ <?php /* Export data with semantic format (SIOC: http://sioc-project.org/, FOAF, SKOS, Annotea Ontology) */ +$httpContentType = 'text/xml'; require_once '../www-header.php'; -header('Content-Type: text/xml; charset=utf-8'); //we change headers html defined in headers.inc.php /* Service creation: only useful services are created */ $userservice =SemanticScuttle_Service_Factory::get('User'); diff --git a/www/api/opensearch.php b/www/api/opensearch.php index 68d094c..db95639 100644 --- a/www/api/opensearch.php +++ b/www/api/opensearch.php @@ -1,6 +1,6 @@ <?php +$httpContentType = 'text/xml'; require_once '../www-header.php'; -header("Content-type: text/xml"); ?> <?xml version="1.0" encoding="utf-8" ?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> diff --git a/www/api/posts_add.php b/www/api/posts_add.php index c919ee7..59f7dce 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -11,8 +11,8 @@ // - No support for 'replace' variable // Force HTTP authentication -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); @@ -82,7 +82,6 @@ if (is_null($url) || is_null($description)) { } // Set up the XML file and output the result. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<result code="'. ($added ? 'done' : 'something went wrong') .'" />'; ?>
\ No newline at end of file diff --git a/www/api/posts_all.php b/www/api/posts_all.php index f53f363..2d274f4 100644 --- a/www/api/posts_all.php +++ b/www/api/posts_all.php @@ -5,8 +5,8 @@ // - doesn't include the filtered tag as an attribute on the root element (we do) // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); @@ -22,7 +22,6 @@ else $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag); // Set up the XML file and output all the posts. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<posts update="'. gmdate('Y-m-d\TH:i:s\Z') .'" user="'. htmlspecialchars($currentUser->getUsername()) .'"'. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') .">\r\n"; diff --git a/www/api/posts_dates.php b/www/api/posts_dates.php index 7b1240f..508c46a 100644 --- a/www/api/posts_dates.php +++ b/www/api/posts_dates.php @@ -17,6 +17,7 @@ */ // Force HTTP authentication first! +$httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ @@ -36,7 +37,6 @@ $bookmarks = $bookmarkservice->getBookmarks( ); // Set up the XML file and output all the tags. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<dates tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentUser->getUsername(), 'xml') ."\">\r\n"; diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php index 88e2584..a63cc62 100644 --- a/www/api/posts_delete.php +++ b/www/api/posts_delete.php @@ -7,8 +7,8 @@ // - doesn't set the Content-Type to text/xml (we do). // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); @@ -28,7 +28,6 @@ if (is_null($_REQUEST['url'])) { } // Set up the XML file and output the result. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<result code="'. ($deleted ? 'done' : 'something went wrong') .'" />'; ?>
\ No newline at end of file diff --git a/www/api/posts_get.php b/www/api/posts_get.php index b020f51..c20f904 100644 --- a/www/api/posts_get.php +++ b/www/api/posts_get.php @@ -25,6 +25,7 @@ */ // Force HTTP authentication first! +$httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ @@ -54,7 +55,6 @@ $bookmarks = $bookmarkservice->getBookmarks( // Set up the XML file and output all the tags. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<posts'. (is_null($dtstart) ? '' : ' dt="'. $dtstart .'"') .' tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentUser->getUsername(), 'xml') ."\">\r\n"; diff --git a/www/api/posts_public.php b/www/api/posts_public.php index 0c93ca2..4258550 100644 --- a/www/api/posts_public.php +++ b/www/api/posts_public.php @@ -6,6 +6,7 @@ // Force HTTP authentication first! //require_once('httpauth.inc.php'); +$httpContentType = 'text/xml'; require_once '../www-header.php'; /* Service creation: only useful services are created */ @@ -22,7 +23,6 @@ else $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag); // Set up the XML file and output all the posts. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<posts update="'. gmdate('Y-m-d\TH:i:s\Z') .'" '. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') .">\r\n"; diff --git a/www/api/posts_recent.php b/www/api/posts_recent.php index 46e46f1..6c71e22 100644 --- a/www/api/posts_recent.php +++ b/www/api/posts_recent.php @@ -22,6 +22,7 @@ $countDefault = 15; $countMax = 100; // Force HTTP authentication first! +$httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ @@ -54,7 +55,6 @@ $bookmarks = $bookmarkservice->getBookmarks( // Set up the XML file and output all the tags. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<posts tag="'. (is_null($tag) ? '' : filter($tag, 'xml')) .'" user="'. filter($currentUser->getUsername(), 'xml') ."\">\r\n"; diff --git a/www/api/posts_update.php b/www/api/posts_update.php index 9152f26..4aeedc3 100644 --- a/www/api/posts_update.php +++ b/www/api/posts_update.php @@ -5,8 +5,8 @@ // - doesn't set the Content-Type to text/xml (we do). // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); @@ -17,7 +17,6 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, 1, $userservice->getCurrentUserI // Set up the XML file and output all the tags. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; foreach($bookmarks['bookmarks'] as $row) { echo '<update time="'. gmdate('Y-m-d\TH:i:s\Z', strtotime($row['bDatetime'])) .'" />'; diff --git a/www/api/tags_get.php b/www/api/tags_get.php index 85684d4..06a40d9 100644 --- a/www/api/tags_get.php +++ b/www/api/tags_get.php @@ -5,8 +5,8 @@ // - tags can't have spaces // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); @@ -16,7 +16,6 @@ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); $tags =& $b2tservice->getTags($userservice->getCurrentUserId()); // Set up the XML file and output all the tags. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo "<tags>\r\n"; foreach($tags as $row) { diff --git a/www/api/tags_rename.php b/www/api/tags_rename.php index 59ba8a4..cf56c83 100644 --- a/www/api/tags_rename.php +++ b/www/api/tags_rename.php @@ -5,8 +5,8 @@ // - oddly, returns an entirely different result (<result></result>) than the other API calls. // Force HTTP authentication first! -require_once('httpauth.inc.php'); -require_once '../www-header.php'; +$httpContentType = 'text/xml'; +require_once 'httpauth.inc.php'; /* Service creation: only useful services are created */ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); @@ -31,7 +31,6 @@ if (is_null($old) || is_null($new)) { } // Set up the XML file and output the result. -header('Content-Type: text/xml'); echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<result>'. ($renamed ? 'done' : 'something went wrong') .'</result>'; ?> diff --git a/www/bookmarks.php b/www/bookmarks.php index e356750..5241481 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -134,7 +134,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { $address = trim(POST_ADDRESS); // If the bookmark exists already, edit the original if ($bookmarkservice->bookmarkExists($address, $currentUserID)) { - $bookmark =& $bookmarkservice->getBookmarkByAddress($address); + $bookmark = $bookmarkservice->getBookmarkByAddress($address); header('Location: '. createURL('edit', $bookmark['bId'])); exit(); // If it's new, save it @@ -167,7 +167,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { if (GET_ACTION == "add") { // If the bookmark exists already, edit the original if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) { - $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, md5($bookmarkservice->normalize(stripslashes(GET_ADDRESS)))); + $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS))); $popup = (GET_POPUP!='') ? '?popup=1' : ''; header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup)); exit(); @@ -15,6 +15,7 @@ * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle */ +$httpContentType = false; require_once 'www-header.php'; if (!$GLOBALS['shorturl']) { diff --git a/www/index.php b/www/index.php index 0ba4afa..f6704ae 100644 --- a/www/index.php +++ b/www/index.php @@ -67,19 +67,16 @@ if (intval(GET_PAGE) > 1) { $start = 0; } -$dtend = date('Y-m-d H:i:s', strtotime('tomorrow')); -/*$dtstart = date('Y-m-d H:i:s', strtotime($dtend .' -'. $defaultRecentDays .' days'));*/ - -$tplVars['page'] = $page; -$tplVars['start'] = $start; +$tplVars['page'] = $page; +$tplVars['start'] = $start; $tplVars['popCount'] = 30; $tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"]; -$tplVars['range'] = 'all'; +$tplVars['range'] = 'all'; $tplVars['pagetitle'] = T_('Store, share and tag your favourite links'); -$tplVars['subtitle'] = T_('All Bookmarks'); +$tplVars['subtitle'] = T_('All Bookmarks'); $tplVars['bookmarkCount'] = $start + 1; -$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, $dtend); +$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); $tplVars['total'] = $bookmarks['total']; $tplVars['bookmarks'] =& $bookmarks['bookmarks']; diff --git a/www/jsScuttle.php b/www/jsScuttle.php index cc4e16d..f37da78 100644 --- a/www/jsScuttle.php +++ b/www/jsScuttle.php @@ -1,6 +1,6 @@ <?php -header('Content-Type: text/javascript'); $GLOBALS['saveInLastUrl'] = false; +$httpContentType = 'text/javascript'; require_once 'www-header.php'; require_once 'SemanticScuttle/functions.php'; $player_root = ROOT .'includes/player/'; diff --git a/www/rss.php b/www/rss.php index 7f706d5..6dcfb4c 100644 --- a/www/rss.php +++ b/www/rss.php @@ -19,14 +19,13 @@ * @link http://sourceforge.net/projects/semanticscuttle */ +$httpContentType = 'application/rss+xml'; require_once 'www-header.php'; /* Service creation: only useful services are created */ $bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); $cacheservice = SemanticScuttle_Service_Factory::get('Cache'); -header('Content-Type: application/rss+xml; charset=utf-8'); - if (isset($_SERVER['PATH_INFO']) && strlen($_SERVER['PATH_INFO']) >1) { list($url, $user, $cat) = explode('/', $_SERVER['PATH_INFO']); } else { |