From: Andrew Dolgov Date: Mon, 20 Aug 2007 11:27:19 +0000 (+0100) Subject: ajaxify prefs save/reset; update translations X-Git-Tag: 1.2.14~12 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=b652c1b7c4bebf85fbad6d892d8e7ea36e9b2905;p=tt-rss.git ajaxify prefs save/reset; update translations --- diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo index d1a9bfea..c6d68000 100644 Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po index 3554edc4..06696245 100644 --- a/locale/fr_FR/LC_MESSAGES/messages.po +++ b/locale/fr_FR/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-19 16:10+0400\n" +"POT-Creation-Date: 2007-08-20 19:27+0400\n" "PO-Revision-Date: 2007-08-14 16:43+0200\n" "Last-Translator: Thibaut Cousin \n" "Language-Team: Français \n" @@ -160,7 +160,7 @@ msgid "All feeds" msgstr "Tous les flux" #: functions.php:2291 functions.php:2330 functions.php:2657 functions.php:3519 -#: functions.php:3549 modules/pref-feeds.php:890 +#: functions.php:3549 modules/pref-feeds.php:845 msgid "Uncategorized" msgstr "Sans catégorie" @@ -200,14 +200,14 @@ msgstr "" "l'administrateur de votre TIny Tiny RSS.\n" #: functions.php:3174 functions.php:3217 functions.php:4190 -#: modules/pref-feeds.php:615 modules/pref-feeds.php:852 +#: modules/pref-feeds.php:620 modules/pref-feeds.php:807 #: modules/pref-filters.php:255 modules/pref-labels.php:234 #: modules/pref-users.php:208 msgid "Select:" msgstr "Sélectionner :" -#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:616 -#: modules/pref-feeds.php:853 modules/pref-filters.php:256 +#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:621 +#: modules/pref-feeds.php:808 modules/pref-filters.php:256 #: modules/pref-labels.php:235 modules/pref-users.php:209 msgid "All" msgstr "Tout" @@ -217,8 +217,8 @@ msgstr "Tout" msgid "Unread" msgstr "Non lus" -#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:617 -#: modules/pref-feeds.php:854 modules/pref-filters.php:257 +#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:622 +#: modules/pref-feeds.php:809 modules/pref-filters.php:257 #: modules/pref-labels.php:236 modules/pref-users.php:210 msgid "None" msgstr "Aucun" @@ -581,8 +581,13 @@ msgstr "Marquage de tous les flux comme lus..." msgid "Please enter label title:" msgstr "" +#: localized_js.php:115 +#, fuzzy +msgid "Save current configuration?" +msgstr "Enregistrer la configuration" + #: localized_schema.php:9 modules/popup-dialog.php:172 -#: modules/pref-feeds.php:865 modules/pref-feeds.php:926 +#: modules/pref-feeds.php:820 modules/pref-feeds.php:881 msgid "Title" msgstr "Titre" @@ -805,16 +810,16 @@ msgstr "" msgid "Use more accessible date/time format for headlines" msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes" -#: login_form.php:61 modules/popup-dialog.php:90 modules/pref-feeds.php:264 +#: login_form.php:83 modules/popup-dialog.php:90 modules/pref-feeds.php:264 #: modules/pref-users.php:29 msgid "Login:" msgstr "Nom :" -#: login_form.php:63 modules/popup-dialog.php:91 modules/pref-feeds.php:270 +#: login_form.php:85 modules/popup-dialog.php:91 modules/pref-feeds.php:270 msgid "Password:" msgstr "Mot de passe :" -#: login_form.php:65 +#: login_form.php:87 msgid "Language:" msgstr "" @@ -985,7 +990,7 @@ msgid "Actions..." msgstr "Actions..." #: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186 -#: modules/pref-feeds.php:759 +#: modules/pref-feeds.php:714 msgid "Search" msgstr "Rechercher" @@ -1127,7 +1132,7 @@ msgstr "Terminé. Le schéma est passé de la version %d à %d." msgid "Help topic not found." msgstr "Sujet non trouvé dans l'aide." -#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:706 +#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:671 msgid "Close this window" msgstr "Fermer cette fenêtre" @@ -1197,7 +1202,7 @@ msgstr "" "\t\t\t\t\tVeuillez vérifier son état ou bien contacter l'administrateur de " "votre Tiny Tiny RSS." -#: modules/popup-dialog.php:51 modules/pref-feeds.php:772 +#: modules/popup-dialog.php:51 modules/pref-feeds.php:727 msgid "Subscribe to feed" msgstr "S'inscrire à un flux" @@ -1217,8 +1222,8 @@ msgstr "S'inscrire" #: modules/popup-dialog.php:104 modules/popup-dialog.php:189 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120 -#: modules/pref-feeds.php:331 modules/pref-feeds.php:714 -#: modules/pref-filters.php:118 modules/pref-users.php:58 +#: modules/pref-feeds.php:331 modules/pref-filters.php:118 +#: modules/pref-users.php:58 msgid "Cancel" msgstr "Annuler" @@ -1321,8 +1326,7 @@ msgid "Tags for this article (separated by commas):" msgstr "Étiquettes pour cet article (séparées par des virgules) :" #: modules/popup-dialog.php:420 modules/pref-feeds.php:329 -#: modules/pref-feeds.php:712 modules/pref-filters.php:114 -#: modules/pref-users.php:55 +#: modules/pref-filters.php:114 modules/pref-users.php:55 msgid "Save" msgstr "Enregistrer" @@ -1433,85 +1437,84 @@ msgstr "Inscrit à %s." msgid "Already subscribed to %s." msgstr "Déjà inscrit à %s." -#: modules/pref-feeds.php:522 +#: modules/pref-feeds.php:538 msgid "Category editor" msgstr "Éditeur de catégorie" -#: modules/pref-feeds.php:556 +#: modules/pref-feeds.php:561 #, php-format msgid "Category $%s already exists in the database." msgstr "La catégorie %s existe déjà dans la base de données." -#: modules/pref-feeds.php:584 +#: modules/pref-feeds.php:589 msgid "Unable to delete non empty feed categories." msgstr "Impossible de supprimer une catégorie de flux non vide." -#: modules/pref-feeds.php:601 +#: modules/pref-feeds.php:606 msgid "Create category" msgstr "Créer la catégorie" -#: modules/pref-feeds.php:701 +#: modules/pref-feeds.php:666 msgid "No feed categories defined." msgstr "Aucune catégorie de flux définie." -#: modules/pref-feeds.php:719 modules/pref-feeds.php:998 -#: modules/pref-filters.php:340 modules/pref-labels.php:292 -#: modules/pref-users.php:317 -msgid "Edit" -msgstr "Modifier" - -#: modules/pref-feeds.php:721 modules/pref-filters.php:342 +#: modules/pref-feeds.php:677 modules/pref-filters.php:342 #: modules/pref-labels.php:294 modules/pref-users.php:319 msgid "Remove" msgstr "Supprimer" -#: modules/pref-feeds.php:744 +#: modules/pref-feeds.php:699 msgid "Some feeds have update errors (click for details)" msgstr "" "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquez " "ici pour les détails)" -#: modules/pref-feeds.php:777 +#: modules/pref-feeds.php:732 msgid "Top 25" msgstr "Top 25" -#: modules/pref-feeds.php:851 +#: modules/pref-feeds.php:806 msgid "Show last article times" msgstr "Afficher l'heure du dernier article" -#: modules/pref-feeds.php:868 modules/pref-feeds.php:930 +#: modules/pref-feeds.php:823 modules/pref-feeds.php:885 msgid "Last Article" msgstr "Dernier article" -#: modules/pref-feeds.php:871 modules/pref-feeds.php:934 +#: modules/pref-feeds.php:826 modules/pref-feeds.php:889 msgid "Updated" msgstr "Mis à jour" -#: modules/pref-feeds.php:1001 +#: modules/pref-feeds.php:953 modules/pref-filters.php:340 +#: modules/pref-labels.php:292 modules/pref-users.php:317 +msgid "Edit" +msgstr "Modifier" + +#: modules/pref-feeds.php:956 msgid "Unsubscribe" msgstr "Se désinscrire" -#: modules/pref-feeds.php:1011 +#: modules/pref-feeds.php:966 msgid "Recategorize" msgstr "Changer de catégorie" -#: modules/pref-feeds.php:1020 +#: modules/pref-feeds.php:975 msgid "Edit categories" msgstr "Modifier les catégories" -#: modules/pref-feeds.php:1031 +#: modules/pref-feeds.php:986 msgid "OPML" msgstr "OPML" -#: modules/pref-feeds.php:1037 +#: modules/pref-feeds.php:992 msgid "Import" msgstr "Importer" -#: modules/pref-feeds.php:1044 +#: modules/pref-feeds.php:999 msgid "Export OPML" msgstr "Exporter en OPML" -#: modules/pref-feeds.php:1053 +#: modules/pref-feeds.php:1008 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the address specified below." @@ -1519,7 +1522,7 @@ msgstr "" "Les articles publiés sont exportés comme un flux RSS public et toute " "personne qui connaît l'adresse indiquée ci-dessous peut s'y inscrire." -#: modules/pref-feeds.php:1060 +#: modules/pref-feeds.php:1015 msgid "Generate another address" msgstr "Générer une autre adresse" @@ -1607,19 +1610,24 @@ msgstr "Le mot de passe a été modifié." msgid "Old password is incorrect." msgstr "L'ancien mot de passe n'est pas correct." -#: modules/pref-prefs.php:59 modules/pref-prefs.php:383 -msgid "Save configuration" -msgstr "Enregistrer la configuration" +#: modules/pref-prefs.php:103 +msgid "The configuration was saved." +msgstr "La configuration a été enregistrée." -#: modules/pref-prefs.php:129 modules/pref-prefs.php:387 -msgid "Reset to defaults" -msgstr "Revenir aux valeurs par défaut" +#: modules/pref-prefs.php:129 +#, fuzzy +msgid "E-mail has been changed." +msgstr "Le mot de passe a été modifié." + +#: modules/pref-prefs.php:141 modules/pref-prefs.php:201 +msgid "The configuration was reset to defaults." +msgstr "La configuration a été réinitialisée à ses valeurs par défaut." -#: modules/pref-prefs.php:139 modules/pref-prefs.php:296 +#: modules/pref-prefs.php:145 modules/pref-prefs.php:302 msgid "Change theme" msgstr "Modifier le thème" -#: modules/pref-prefs.php:180 +#: modules/pref-prefs.php:186 msgid "" "Your password is at default value, \n" "\t\t\t\t\t\tplease change it." @@ -1627,66 +1635,66 @@ msgstr "" "Le mot de passe actuel est celui par défaut.\n" "\t\t\t\t\t\tVeuillez le modifier." -#: modules/pref-prefs.php:195 -msgid "The configuration was reset to defaults." -msgstr "La configuration a été réinitialisée à ses valeurs par défaut." - -#: modules/pref-prefs.php:199 -msgid "The configuration was saved." -msgstr "La configuration a été enregistrée." - -#: modules/pref-prefs.php:207 +#: modules/pref-prefs.php:213 msgid "Personal data" msgstr "Données personnelles" -#: modules/pref-prefs.php:227 +#: modules/pref-prefs.php:233 msgid "Change e-mail" msgstr "Modifier l'adresse électronique" -#: modules/pref-prefs.php:233 +#: modules/pref-prefs.php:239 msgid "Authentication" msgstr "Identification" -#: modules/pref-prefs.php:235 +#: modules/pref-prefs.php:241 msgid "Old password" msgstr "Ancien mot de passe" -#: modules/pref-prefs.php:240 +#: modules/pref-prefs.php:246 msgid "New password" msgstr "Nouveau mot de passe" -#: modules/pref-prefs.php:246 +#: modules/pref-prefs.php:252 msgid "Confirm password" msgstr "Confirmation du mot de passe" -#: modules/pref-prefs.php:261 +#: modules/pref-prefs.php:267 msgid "Change password" msgstr "Modifier le mot de passe" -#: modules/pref-prefs.php:277 +#: modules/pref-prefs.php:283 msgid "Themes" msgstr "Thèmes" -#: modules/pref-prefs.php:278 +#: modules/pref-prefs.php:284 msgid "Select theme" msgstr "Sélectionner un thème" -#: modules/pref-prefs.php:280 +#: modules/pref-prefs.php:286 msgid "Default" msgstr "Utiliser la valeur par défaut" -#: modules/pref-prefs.php:348 +#: modules/pref-prefs.php:354 msgid "short_desc" msgstr "" -#: modules/pref-prefs.php:360 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:366 modules/pref-prefs.php:371 msgid "Yes" msgstr "Oui" -#: modules/pref-prefs.php:362 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:368 modules/pref-prefs.php:371 msgid "No" msgstr "Non" +#: modules/pref-prefs.php:390 +msgid "Save configuration" +msgstr "Enregistrer la configuration" + +#: modules/pref-prefs.php:394 +msgid "Reset to defaults" +msgstr "Revenir aux valeurs par défaut" + #: modules/pref-users.php:12 msgid "User editor" msgstr "Éditeur d'utilisateur" diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index fe6935a4..b5a963ef 100644 Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 9c796aaf..19993946 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-19 16:10+0400\n" +"POT-Creation-Date: 2007-08-20 19:27+0400\n" "PO-Revision-Date: 2007-08-18 15:14+0400\n" "Last-Translator: Andrew Dolgov \n" "Language-Team: Русский \n" @@ -154,7 +154,7 @@ msgid "All feeds" msgstr "Все каналы" #: functions.php:2291 functions.php:2330 functions.php:2657 functions.php:3519 -#: functions.php:3549 modules/pref-feeds.php:890 +#: functions.php:3549 modules/pref-feeds.php:845 msgid "Uncategorized" msgstr "Нет категории" @@ -190,14 +190,14 @@ msgid "" msgstr "" #: functions.php:3174 functions.php:3217 functions.php:4190 -#: modules/pref-feeds.php:615 modules/pref-feeds.php:852 +#: modules/pref-feeds.php:620 modules/pref-feeds.php:807 #: modules/pref-filters.php:255 modules/pref-labels.php:234 #: modules/pref-users.php:208 msgid "Select:" msgstr "Выбрать:" -#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:616 -#: modules/pref-feeds.php:853 modules/pref-filters.php:256 +#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:621 +#: modules/pref-feeds.php:808 modules/pref-filters.php:256 #: modules/pref-labels.php:235 modules/pref-users.php:209 msgid "All" msgstr "Все" @@ -207,8 +207,8 @@ msgstr "Все" msgid "Unread" msgstr "Новые" -#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:617 -#: modules/pref-feeds.php:854 modules/pref-filters.php:257 +#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:622 +#: modules/pref-feeds.php:809 modules/pref-filters.php:257 #: modules/pref-labels.php:236 modules/pref-users.php:210 msgid "None" msgstr "Ничего" @@ -569,8 +569,13 @@ msgstr "Помечаю все каналы как прочитанные..." msgid "Please enter label title:" msgstr "" +#: localized_js.php:115 +#, fuzzy +msgid "Save current configuration?" +msgstr "Сохранить конфигурацию" + #: localized_schema.php:9 modules/popup-dialog.php:172 -#: modules/pref-feeds.php:865 modules/pref-feeds.php:926 +#: modules/pref-feeds.php:820 modules/pref-feeds.php:881 msgid "Title" msgstr "Заголовок" @@ -770,16 +775,16 @@ msgstr "Вырезать все, кроме основных HTML тегов п msgid "Use more accessible date/time format for headlines" msgstr "Использовать более удобный формат отображения даты/времени" -#: login_form.php:61 modules/popup-dialog.php:90 modules/pref-feeds.php:264 +#: login_form.php:83 modules/popup-dialog.php:90 modules/pref-feeds.php:264 #: modules/pref-users.php:29 msgid "Login:" msgstr "Пользователь:" -#: login_form.php:63 modules/popup-dialog.php:91 modules/pref-feeds.php:270 +#: login_form.php:85 modules/popup-dialog.php:91 modules/pref-feeds.php:270 msgid "Password:" msgstr "Пароль:" -#: login_form.php:65 +#: login_form.php:87 msgid "Language:" msgstr "Язык:" @@ -923,7 +928,7 @@ msgid "Actions..." msgstr "Действия..." #: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186 -#: modules/pref-feeds.php:759 +#: modules/pref-feeds.php:714 msgid "Search" msgstr "Поиск" @@ -1062,7 +1067,7 @@ msgstr "" msgid "Help topic not found." msgstr "Раздел помощи не найден." -#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:706 +#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:671 msgid "Close this window" msgstr "Закрыть это окно" @@ -1122,7 +1127,7 @@ msgid "" "\t\t\t\t\towner." msgstr "" -#: modules/popup-dialog.php:51 modules/pref-feeds.php:772 +#: modules/popup-dialog.php:51 modules/pref-feeds.php:727 msgid "Subscribe to feed" msgstr "Подписаться на канал" @@ -1142,8 +1147,8 @@ msgstr "Подписаться" #: modules/popup-dialog.php:104 modules/popup-dialog.php:189 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120 -#: modules/pref-feeds.php:331 modules/pref-feeds.php:714 -#: modules/pref-filters.php:118 modules/pref-users.php:58 +#: modules/pref-feeds.php:331 modules/pref-filters.php:118 +#: modules/pref-users.php:58 msgid "Cancel" msgstr "Отмена" @@ -1245,8 +1250,7 @@ msgid "Tags for this article (separated by commas):" msgstr "Теги для этой статьи (разделенные запятыми):" #: modules/popup-dialog.php:420 modules/pref-feeds.php:329 -#: modules/pref-feeds.php:712 modules/pref-filters.php:114 -#: modules/pref-users.php:55 +#: modules/pref-filters.php:114 modules/pref-users.php:55 msgid "Save" msgstr "Сохранить" @@ -1354,89 +1358,88 @@ msgstr "Добавлена подписка на %s." msgid "Already subscribed to %s." msgstr "Канал %s уже подписан." -#: modules/pref-feeds.php:522 +#: modules/pref-feeds.php:538 msgid "Category editor" msgstr "Редактор категорий" -#: modules/pref-feeds.php:556 +#: modules/pref-feeds.php:561 #, php-format msgid "Category $%s already exists in the database." msgstr "Категория $%s уже существует." -#: modules/pref-feeds.php:584 +#: modules/pref-feeds.php:589 msgid "Unable to delete non empty feed categories." msgstr "Не могу удалить не пустую категорию" -#: modules/pref-feeds.php:601 +#: modules/pref-feeds.php:606 msgid "Create category" msgstr "Создать категорию" -#: modules/pref-feeds.php:701 +#: modules/pref-feeds.php:666 msgid "No feed categories defined." msgstr "Категории отсутствуют." -#: modules/pref-feeds.php:719 modules/pref-feeds.php:998 -#: modules/pref-filters.php:340 modules/pref-labels.php:292 -#: modules/pref-users.php:317 -msgid "Edit" -msgstr "Редактировать" - -#: modules/pref-feeds.php:721 modules/pref-filters.php:342 +#: modules/pref-feeds.php:677 modules/pref-filters.php:342 #: modules/pref-labels.php:294 modules/pref-users.php:319 msgid "Remove" msgstr "Удалить" -#: modules/pref-feeds.php:744 +#: modules/pref-feeds.php:699 msgid "Some feeds have update errors (click for details)" msgstr "Некоторые каналы не могли быть обновлены (щелкните для подробностей)" -#: modules/pref-feeds.php:777 +#: modules/pref-feeds.php:732 msgid "Top 25" msgstr "Топ 25" -#: modules/pref-feeds.php:851 +#: modules/pref-feeds.php:806 msgid "Show last article times" msgstr "Показать дату последней статьи" -#: modules/pref-feeds.php:868 modules/pref-feeds.php:930 +#: modules/pref-feeds.php:823 modules/pref-feeds.php:885 msgid "Last Article" msgstr "Последняя ÑÑ‚атья" -#: modules/pref-feeds.php:871 modules/pref-feeds.php:934 +#: modules/pref-feeds.php:826 modules/pref-feeds.php:889 msgid "Updated" msgstr "Обновлено" -#: modules/pref-feeds.php:1001 +#: modules/pref-feeds.php:953 modules/pref-filters.php:340 +#: modules/pref-labels.php:292 modules/pref-users.php:317 +msgid "Edit" +msgstr "Редактировать" + +#: modules/pref-feeds.php:956 msgid "Unsubscribe" msgstr "Отписаться" -#: modules/pref-feeds.php:1011 +#: modules/pref-feeds.php:966 msgid "Recategorize" msgstr "Изменить категорию" -#: modules/pref-feeds.php:1020 +#: modules/pref-feeds.php:975 msgid "Edit categories" msgstr "Редактировать категории" -#: modules/pref-feeds.php:1031 +#: modules/pref-feeds.php:986 msgid "OPML" msgstr "" -#: modules/pref-feeds.php:1037 +#: modules/pref-feeds.php:992 msgid "Import" msgstr "Импортировать" -#: modules/pref-feeds.php:1044 +#: modules/pref-feeds.php:999 msgid "Export OPML" msgstr "Экспортировать OPML" -#: modules/pref-feeds.php:1053 +#: modules/pref-feeds.php:1008 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the address specified below." msgstr "" -#: modules/pref-feeds.php:1060 +#: modules/pref-feeds.php:1015 msgid "Generate another address" msgstr "Создать другой адрес" @@ -1524,84 +1527,89 @@ msgstr "Пароль был изменен." msgid "Old password is incorrect." msgstr "Старый пароль неправилен." -#: modules/pref-prefs.php:59 modules/pref-prefs.php:383 -msgid "Save configuration" -msgstr "Сохранить конфигурацию" +#: modules/pref-prefs.php:103 +msgid "The configuration was saved." +msgstr "Конфигурация сохранена." -#: modules/pref-prefs.php:129 modules/pref-prefs.php:387 -msgid "Reset to defaults" -msgstr "Сбросить настройки" +#: modules/pref-prefs.php:129 +#, fuzzy +msgid "E-mail has been changed." +msgstr "Пароль был изменен." + +#: modules/pref-prefs.php:141 modules/pref-prefs.php:201 +msgid "The configuration was reset to defaults." +msgstr "Настройки были сброшены по-умолчанию." -#: modules/pref-prefs.php:139 modules/pref-prefs.php:296 +#: modules/pref-prefs.php:145 modules/pref-prefs.php:302 msgid "Change theme" msgstr "Изменить тему" -#: modules/pref-prefs.php:180 +#: modules/pref-prefs.php:186 msgid "" "Your password is at default value, \n" "\t\t\t\t\t\tplease change it." msgstr "" -#: modules/pref-prefs.php:195 -msgid "The configuration was reset to defaults." -msgstr "Настройки были сброшены по-умолчанию." - -#: modules/pref-prefs.php:199 -msgid "The configuration was saved." -msgstr "Конфигурация сохранена." - -#: modules/pref-prefs.php:207 +#: modules/pref-prefs.php:213 msgid "Personal data" msgstr "Личные данные" -#: modules/pref-prefs.php:227 +#: modules/pref-prefs.php:233 msgid "Change e-mail" msgstr "Изменить e-mail" -#: modules/pref-prefs.php:233 +#: modules/pref-prefs.php:239 msgid "Authentication" msgstr "Авторизация" -#: modules/pref-prefs.php:235 +#: modules/pref-prefs.php:241 msgid "Old password" msgstr "Старый пароль" -#: modules/pref-prefs.php:240 +#: modules/pref-prefs.php:246 msgid "New password" msgstr "Новый пароль" -#: modules/pref-prefs.php:246 +#: modules/pref-prefs.php:252 msgid "Confirm password" msgstr "Подтверждение пароля" -#: modules/pref-prefs.php:261 +#: modules/pref-prefs.php:267 msgid "Change password" msgstr "Изменить пароль" -#: modules/pref-prefs.php:277 +#: modules/pref-prefs.php:283 msgid "Themes" msgstr "Темы" -#: modules/pref-prefs.php:278 +#: modules/pref-prefs.php:284 msgid "Select theme" msgstr "Выбор темы" -#: modules/pref-prefs.php:280 +#: modules/pref-prefs.php:286 msgid "Default" msgstr "По умолчанию" -#: modules/pref-prefs.php:348 +#: modules/pref-prefs.php:354 msgid "short_desc" msgstr "" -#: modules/pref-prefs.php:360 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:366 modules/pref-prefs.php:371 msgid "Yes" msgstr "Да" -#: modules/pref-prefs.php:362 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:368 modules/pref-prefs.php:371 msgid "No" msgstr "Нет" +#: modules/pref-prefs.php:390 +msgid "Save configuration" +msgstr "Сохранить конфигурацию" + +#: modules/pref-prefs.php:394 +msgid "Reset to defaults" +msgstr "Сбросить настройки" + #: modules/pref-users.php:12 msgid "User editor" msgstr "Редактор пользователей" diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo index 5080b35a..4f439002 100644 Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po index eb30c153..761d7335 100644 --- a/locale/zh_CN/LC_MESSAGES/messages.po +++ b/locale/zh_CN/LC_MESSAGES/messages.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Tiny Tiny RSS1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-19 16:10+0400\n" +"POT-Creation-Date: 2007-08-20 19:27+0400\n" "PO-Revision-Date: 2007-08-19 19:03+0800\n" "Last-Translator: sluke \n" "Language-Team: hicode.org \n" @@ -150,7 +150,7 @@ msgid "All feeds" msgstr "所有feed" #: functions.php:2291 functions.php:2330 functions.php:2657 functions.php:3519 -#: functions.php:3549 modules/pref-feeds.php:890 +#: functions.php:3549 modules/pref-feeds.php:845 msgid "Uncategorized" msgstr "未分类" @@ -186,14 +186,14 @@ msgid "" msgstr "若要退订,访问你的配置选项或联络管理员。\n" #: functions.php:3174 functions.php:3217 functions.php:4190 -#: modules/pref-feeds.php:615 modules/pref-feeds.php:852 +#: modules/pref-feeds.php:620 modules/pref-feeds.php:807 #: modules/pref-filters.php:255 modules/pref-labels.php:234 #: modules/pref-users.php:208 msgid "Select:" msgstr "选择:" -#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:616 -#: modules/pref-feeds.php:853 modules/pref-filters.php:256 +#: functions.php:3175 functions.php:3218 modules/pref-feeds.php:621 +#: modules/pref-feeds.php:808 modules/pref-filters.php:256 #: modules/pref-labels.php:235 modules/pref-users.php:209 msgid "All" msgstr "所有" @@ -203,8 +203,8 @@ msgstr "所有" msgid "Unread" msgstr "未读" -#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:617 -#: modules/pref-feeds.php:854 modules/pref-filters.php:257 +#: functions.php:3177 functions.php:3220 modules/pref-feeds.php:622 +#: modules/pref-feeds.php:809 modules/pref-filters.php:257 #: modules/pref-labels.php:236 modules/pref-users.php:210 msgid "None" msgstr "无" @@ -564,8 +564,13 @@ msgstr "标记 %s 中所有所选Feed为已读..." msgid "Please enter label title:" msgstr "请输入标签主题" +#: localized_js.php:115 +#, fuzzy +msgid "Save current configuration?" +msgstr "保存设置" + #: localized_schema.php:9 modules/popup-dialog.php:172 -#: modules/pref-feeds.php:865 modules/pref-feeds.php:926 +#: modules/pref-feeds.php:820 modules/pref-feeds.php:881 msgid "Title" msgstr "标题" @@ -768,16 +773,16 @@ msgstr "阅读文章时过滤所有常见html标签" msgid "Use more accessible date/time format for headlines" msgstr "提要使用更方便的 日期/时间 格式" -#: login_form.php:61 modules/popup-dialog.php:90 modules/pref-feeds.php:264 +#: login_form.php:83 modules/popup-dialog.php:90 modules/pref-feeds.php:264 #: modules/pref-users.php:29 msgid "Login:" msgstr "登陆:" -#: login_form.php:63 modules/popup-dialog.php:91 modules/pref-feeds.php:270 +#: login_form.php:85 modules/popup-dialog.php:91 modules/pref-feeds.php:270 msgid "Password:" msgstr "密码:" -#: login_form.php:65 +#: login_form.php:87 msgid "Language:" msgstr "语言:" @@ -930,7 +935,7 @@ msgid "Actions..." msgstr "激活..." #: tt-rss.php:135 modules/popup-dialog.php:117 modules/popup-dialog.php:186 -#: modules/pref-feeds.php:759 +#: modules/pref-feeds.php:714 msgid "Search" msgstr "搜索" @@ -1071,7 +1076,7 @@ msgstr "" msgid "Help topic not found." msgstr "未找到帮助主题。" -#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:706 +#: modules/help.php:22 modules/popup-dialog.php:42 modules/pref-feeds.php:671 msgid "Close this window" msgstr "关闭此窗口" @@ -1136,7 +1141,7 @@ msgid "" "\t\t\t\t\towner." msgstr "TT-RSS检测到更新时间过长,请刷新或者检查RSS源地址。" -#: modules/popup-dialog.php:51 modules/pref-feeds.php:772 +#: modules/popup-dialog.php:51 modules/pref-feeds.php:727 msgid "Subscribe to feed" msgstr "订阅feed" @@ -1156,8 +1161,8 @@ msgstr "订阅" #: modules/popup-dialog.php:104 modules/popup-dialog.php:189 #: modules/popup-dialog.php:241 modules/popup-dialog.php:328 #: modules/popup-dialog.php:424 modules/pref-feeds.php:120 -#: modules/pref-feeds.php:331 modules/pref-feeds.php:714 -#: modules/pref-filters.php:118 modules/pref-users.php:58 +#: modules/pref-feeds.php:331 modules/pref-filters.php:118 +#: modules/pref-users.php:58 msgid "Cancel" msgstr "取消" @@ -1259,8 +1264,7 @@ msgid "Tags for this article (separated by commas):" msgstr "本文的标签,请用逗号分开:" #: modules/popup-dialog.php:420 modules/pref-feeds.php:329 -#: modules/pref-feeds.php:712 modules/pref-filters.php:114 -#: modules/pref-users.php:55 +#: modules/pref-filters.php:114 modules/pref-users.php:55 msgid "Save" msgstr "保存" @@ -1368,89 +1372,88 @@ msgstr "订阅到 %s." msgid "Already subscribed to %s." msgstr "已经订阅到 %s." -#: modules/pref-feeds.php:522 +#: modules/pref-feeds.php:538 msgid "Category editor" msgstr "分类编辑" -#: modules/pref-feeds.php:556 +#: modules/pref-feeds.php:561 #, php-format msgid "Category $%s already exists in the database." msgstr "分类 $%s已经存在." -#: modules/pref-feeds.php:584 +#: modules/pref-feeds.php:589 msgid "Unable to delete non empty feed categories." msgstr "不能删除非空分类。" -#: modules/pref-feeds.php:601 +#: modules/pref-feeds.php:606 msgid "Create category" msgstr "创建分类" -#: modules/pref-feeds.php:701 +#: modules/pref-feeds.php:666 msgid "No feed categories defined." msgstr "未定义feed分类" -#: modules/pref-feeds.php:719 modules/pref-feeds.php:998 -#: modules/pref-filters.php:340 modules/pref-labels.php:292 -#: modules/pref-users.php:317 -msgid "Edit" -msgstr "编辑" - -#: modules/pref-feeds.php:721 modules/pref-filters.php:342 +#: modules/pref-feeds.php:677 modules/pref-filters.php:342 #: modules/pref-labels.php:294 modules/pref-users.php:319 msgid "Remove" msgstr "移除" -#: modules/pref-feeds.php:744 +#: modules/pref-feeds.php:699 msgid "Some feeds have update errors (click for details)" msgstr "有些feed更新错误(点击了解详情) " -#: modules/pref-feeds.php:777 +#: modules/pref-feeds.php:732 msgid "Top 25" msgstr "Top 25" -#: modules/pref-feeds.php:851 +#: modules/pref-feeds.php:806 msgid "Show last article times" msgstr "显示最近文章时间" -#: modules/pref-feeds.php:868 modules/pref-feeds.php:930 +#: modules/pref-feeds.php:823 modules/pref-feeds.php:885 msgid "Last Article" msgstr "最后 æ–‡ç« " -#: modules/pref-feeds.php:871 modules/pref-feeds.php:934 +#: modules/pref-feeds.php:826 modules/pref-feeds.php:889 msgid "Updated" msgstr "已更新" -#: modules/pref-feeds.php:1001 +#: modules/pref-feeds.php:953 modules/pref-filters.php:340 +#: modules/pref-labels.php:292 modules/pref-users.php:317 +msgid "Edit" +msgstr "编辑" + +#: modules/pref-feeds.php:956 msgid "Unsubscribe" msgstr "退订" -#: modules/pref-feeds.php:1011 +#: modules/pref-feeds.php:966 msgid "Recategorize" msgstr "再分类" -#: modules/pref-feeds.php:1020 +#: modules/pref-feeds.php:975 msgid "Edit categories" msgstr "编辑分类" -#: modules/pref-feeds.php:1031 +#: modules/pref-feeds.php:986 msgid "OPML" msgstr "OPML" -#: modules/pref-feeds.php:1037 +#: modules/pref-feeds.php:992 msgid "Import" msgstr "导入" -#: modules/pref-feeds.php:1044 +#: modules/pref-feeds.php:999 msgid "Export OPML" msgstr "导出OPML" -#: modules/pref-feeds.php:1053 +#: modules/pref-feeds.php:1008 msgid "" "Published articles are exported as a public RSS feed and can be subscribed " "by anyone who knows the address specified below." msgstr "本站文章作为一个公开的RSS源,可以被大众订阅。" -#: modules/pref-feeds.php:1060 +#: modules/pref-feeds.php:1015 msgid "Generate another address" msgstr "生成另一个地址" @@ -1538,84 +1541,89 @@ msgstr "密码已更改." msgid "Old password is incorrect." msgstr "原密码错误." -#: modules/pref-prefs.php:59 modules/pref-prefs.php:383 -msgid "Save configuration" -msgstr "保存设置" +#: modules/pref-prefs.php:103 +msgid "The configuration was saved." +msgstr "设置已保存." -#: modules/pref-prefs.php:129 modules/pref-prefs.php:387 -msgid "Reset to defaults" -msgstr "恢复到默认?" +#: modules/pref-prefs.php:129 +#, fuzzy +msgid "E-mail has been changed." +msgstr "密码已更改." + +#: modules/pref-prefs.php:141 modules/pref-prefs.php:201 +msgid "The configuration was reset to defaults." +msgstr "设置重置为默认" -#: modules/pref-prefs.php:139 modules/pref-prefs.php:296 +#: modules/pref-prefs.php:145 modules/pref-prefs.php:302 msgid "Change theme" msgstr "更改模板" -#: modules/pref-prefs.php:180 +#: modules/pref-prefs.php:186 msgid "" "Your password is at default value, \n" "\t\t\t\t\t\tplease change it." msgstr "您的密码是默认的,请修改。" -#: modules/pref-prefs.php:195 -msgid "The configuration was reset to defaults." -msgstr "设置重置为默认" - -#: modules/pref-prefs.php:199 -msgid "The configuration was saved." -msgstr "设置已保存." - -#: modules/pref-prefs.php:207 +#: modules/pref-prefs.php:213 msgid "Personal data" msgstr "个人数据" -#: modules/pref-prefs.php:227 +#: modules/pref-prefs.php:233 msgid "Change e-mail" msgstr "更改 e-mail" -#: modules/pref-prefs.php:233 +#: modules/pref-prefs.php:239 msgid "Authentication" msgstr "认证" -#: modules/pref-prefs.php:235 +#: modules/pref-prefs.php:241 msgid "Old password" msgstr "原密码" -#: modules/pref-prefs.php:240 +#: modules/pref-prefs.php:246 msgid "New password" msgstr "新密码" -#: modules/pref-prefs.php:246 +#: modules/pref-prefs.php:252 msgid "Confirm password" msgstr "验证密码" -#: modules/pref-prefs.php:261 +#: modules/pref-prefs.php:267 msgid "Change password" msgstr "更改密码" -#: modules/pref-prefs.php:277 +#: modules/pref-prefs.php:283 msgid "Themes" msgstr "模板" -#: modules/pref-prefs.php:278 +#: modules/pref-prefs.php:284 msgid "Select theme" msgstr "选择模板" -#: modules/pref-prefs.php:280 +#: modules/pref-prefs.php:286 msgid "Default" msgstr "默认" -#: modules/pref-prefs.php:348 +#: modules/pref-prefs.php:354 msgid "short_desc" msgstr "short_desc" -#: modules/pref-prefs.php:360 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:366 modules/pref-prefs.php:371 msgid "Yes" msgstr "是" -#: modules/pref-prefs.php:362 modules/pref-prefs.php:365 +#: modules/pref-prefs.php:368 modules/pref-prefs.php:371 msgid "No" msgstr "否" +#: modules/pref-prefs.php:390 +msgid "Save configuration" +msgstr "保存设置" + +#: modules/pref-prefs.php:394 +msgid "Reset to defaults" +msgstr "恢复到默认?" + #: modules/pref-users.php:12 msgid "User editor" msgstr "用户编辑" diff --git a/localized_js.php b/localized_js.php index 3ce87548..424b050c 100644 --- a/localized_js.php +++ b/localized_js.php @@ -112,7 +112,7 @@ print T_js_decl("Unsubscribe from %s?"); print T_js_decl("Mark all visible articles in %s as read?"); print T_js_decl("Mark all selected articles in %s as read?"); print T_js_decl("Please enter label title:"); -#print T_js_decl( +print T_js_decl("Save current configuration?"); #print T_js_decl( #print T_js_decl( #print T_js_decl( diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php index 3584c622..2564f30e 100644 --- a/modules/pref-prefs.php +++ b/modules/pref-prefs.php @@ -56,9 +56,9 @@ return; - } else if ($subop == __("Save configuration")) { + } else if ($subop == "save-config") { - $_SESSION["prefs_op_result"] = "save-config"; +# $_SESSION["prefs_op_result"] = "save-config"; $_SESSION["prefs_cache"] = false; @@ -98,7 +98,11 @@ } - return prefs_js_redirect(); + #return prefs_js_redirect(); + + print __("The configuration was saved."); + + return; } else if ($subop == "getHelp") { @@ -122,11 +126,11 @@ db_query($link, "UPDATE ttrss_users SET email = '$email' WHERE id = '$active_uid'"); - print "E-mail has been changed."; + print __("E-mail has been changed."); return; - } else if ($subop == __("Reset to defaults")) { + } else if ($subop == "reset-config") { $_SESSION["prefs_op_result"] = "reset-to-defaults"; @@ -134,7 +138,9 @@ WHERE owner_uid = ".$_SESSION["uid"]); initialize_user_prefs($link, $_SESSION["uid"]); - return prefs_js_redirect(); + print __("The configuration was reset to defaults."); + + return; } else if ($subop == __("Change theme")) { @@ -195,9 +201,9 @@ print format_notice(__("The configuration was reset to defaults.")); } - if ($_SESSION["prefs_op_result"] == "save-config") { - print format_notice(__("The configuration was saved.")); - } +# if ($_SESSION["prefs_op_result"] == "save-config") { +# print format_notice(__("The configuration was saved.")); +# } $_SESSION["prefs_op_result"] = ""; @@ -310,7 +316,7 @@ owner_uid = ".$_SESSION["uid"]." ORDER BY section_id,short_desc"); - print "
"; + print ""; $lnum = 0; @@ -380,10 +386,11 @@ print ""; print "

"; + onclick=\"return validatePrefsSave()\" + value=\"".__('Save configuration')."\">"; print " 

"; print "
"; diff --git a/prefs.js b/prefs.js index edd1627d..b233d8a1 100644 --- a/prefs.js +++ b/prefs.js @@ -186,6 +186,13 @@ function notify_callback() { } } +function prefs_reset_callback() { + if (xmlhttp.readyState == 4) { + notify_info(xmlhttp.responseText); + selectTab(); + } +} + function changepass_callback() { try { @@ -1413,7 +1420,27 @@ function categorizeSelectedFeeds() { } function validatePrefsReset() { - return confirm(__("Reset to defaults?")); + try { + var ok = confirm(__("Reset to defaults?")); + + if (ok) { + + var query = Form.serialize("pref_prefs_form"); + query = query + "&subop=reset-config"; + debug(query); + + xmlhttp.open("POST", "backend.php", true); + xmlhttp.onreadystatechange=prefs_reset_callback; + xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xmlhttp.send(query); + } + + } catch (e) { + exception_error("validatePrefsSave", e); + } + + return false; + } function browseFeeds(limit) { @@ -1724,3 +1751,27 @@ function pubRegenKey() { return false; } + +function validatePrefsSave() { + try { + + var ok = confirm(__("Save current configuration?")); + + if (ok) { + + var query = Form.serialize("pref_prefs_form"); + query = query + "&subop=save-config"; + debug(query); + + xmlhttp.open("POST", "backend.php", true); + xmlhttp.onreadystatechange=notify_callback; + xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); + xmlhttp.send(query); + } + + } catch (e) { + exception_error("validatePrefsSave", e); + } + + return false; +}