[Pkg-mozext-commits] [sage-extension] 09/20: localization, clean up
David Prévot
taffit at moszumanska.debian.org
Fri May 1 03:10:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag sage_1_2
in repository sage-extension.
commit 2e7743061a3b31097ba183553d5c31bb282eac3d
Author: Peter Andrews <petea at jhu.edu>
Date: Tue Jul 13 03:12:49 2004 +0000
localization, clean up
---
src/install.rdf | 2 +-
src/sage/content/commonfunc.js | 2 +
src/sage/content/discover_feeds.js | 121 ++++++++++++++++++++++++++++-----
src/sage/content/discover_feeds.xul | 36 ++++++----
src/sage/content/feedlib.js | 14 ++--
src/sage/content/res/template-item.txt | 2 +-
src/sage/content/sage-Overlay.xul | 4 ++
src/sage/content/sage.js | 2 +-
src/sage/content/settings/settings.js | 10 +++
src/sage/content/settings/settings.xul | 14 ++--
src/sage/content/updatechecker.js | 4 +-
src/sage/locale/en-US/sage.dtd | 17 ++++-
src/sage/locale/en-US/sage.properties | 12 ++++
src/sage/locale/fr-FR/sage.dtd | 28 ++++++--
src/sage/locale/fr-FR/sage.properties | 12 ++++
src/sage/locale/hu-HU/sage.dtd | 17 ++++-
src/sage/locale/hu-HU/sage.properties | 12 ++++
src/sage/locale/ja-JP/sage.dtd | 28 ++++++--
src/sage/locale/ja-JP/sage.properties | 12 ++++
19 files changed, 288 insertions(+), 61 deletions(-)
diff --git a/src/install.rdf b/src/install.rdf
index c69d5f4..b2f4816 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -30,7 +30,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>0.7</em:minVersion>
-<em:maxVersion>0.9.9+</em:maxVersion>
+<em:maxVersion>1.0+</em:maxVersion>
</Description>
</em:targetApplication>
diff --git a/src/sage/content/commonfunc.js b/src/sage/content/commonfunc.js
index a52c613..269552e 100755
--- a/src/sage/content/commonfunc.js
+++ b/src/sage/content/commonfunc.js
@@ -78,6 +78,8 @@ var CommonFunc = {
AUTO_FEED_TITLE: "sage.auto_feed_title",
RENDER_FEEDS: "sage.render_feeds",
TWELVE_HOUR_CLOCK: "sage.twelve_hour_clock",
+ FEED_ITEM_ORDER: "sage.feed_item_order",
+ FEED_DISCOVERY_MODE: "sage.feed_discovery_mode",
// ++++++++++ ++++++++++ Bookmark RDF ++++++++++ ++++++++++
diff --git a/src/sage/content/discover_feeds.js b/src/sage/content/discover_feeds.js
index bbb386c..b18e9d4 100644
--- a/src/sage/content/discover_feeds.js
+++ b/src/sage/content/discover_feeds.js
@@ -8,9 +8,23 @@ var ds;
var rdfService;
var schema;
var document_host;
+var bookmarksTree;
+var progressMeter;
+var fetch_total;
+var fetch_done;
+var statusDeck;
+var statusMessage;
+var feeds_found_local;
+var feeds_found_external;
function init() {
+ initServices();
+ initBMService();
+
strRes = document.getElementById("strRes");
+ statusDeck = document.getElementById("statusDeck");
+ statusMessage = document.getElementById("statusMessage");
+ progressMeter = document.getElementById("progress");
feedTree = document.getElementById("feedTree");
dataSource = Components.classes["@mozilla.org/rdf/datasource;1?name=in-memory-datasource"];
@@ -27,14 +41,12 @@ function init() {
ds = ( ds.getNext(), ds.getNext() );
ds = ds.QueryInterface(Components.interfaces.nsIRDFDataSource);
- ds.Assert(rdfService.GetResource(schema + "Feeds"), rdfService.GetResource(schema + "child"), rdfService.GetResource(schema + "LocalFeeds"), true);
- ds.Assert(rdfService.GetResource(schema + "LocalFeeds"), rdfService.GetResource(schema + "Title"), rdfService.GetLiteral("Site Feeds"), true);
- ds.Assert(rdfService.GetResource(schema + "Feeds"), rdfService.GetResource(schema + "child"), rdfService.GetResource(schema + "ExternalFeeds"), true);
- ds.Assert(rdfService.GetResource(schema + "ExternalFeeds"), rdfService.GetResource(schema + "Title"), rdfService.GetLiteral("External Feeds"), true);
-
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator);
- var window = windowManager.getMostRecentWindow("navigator:browser").document.getElementById("content");
- var current_document = window.contentDocument;
+ var browserWindow = windowManager.getMostRecentWindow("navigator:browser").document.getElementById("content");
+
+ bookmarksTree = window.arguments[0];
+
+ var current_document = browserWindow.contentDocument;
document_host = current_document.location.host;
logMessage("host: " + document_host);
@@ -51,67 +63,142 @@ function init() {
links = current_document.getElementsByTagName("a");
for(c = 0; c < links.length; c++) {
- if(links[c].href.match(/xml$|rss$|rdf$/i)) {
+ if(links[c].href.match(/xml$|rss|rdf|atom/i)) {
possible_feeds[links[c].href] = links[c].href;
logMessage("Found: " + links[c].href);
}
}
+ fetch_total = 0;
+ fetch_done = 0;
+ feeds_found_local = 0;
+ feeds_found_external = 0;
+
+ for(url in possible_feeds) {
+ fetch_total++;
+ }
+
+ if(fetch_total == 0) {
+ progressUpdate();
+ }
+
+ logMessage("found " + fetch_total + " potential feed URI(s) in " + current_document.location);
+
feeds = new Array();
var httpReq;
for(url in possible_feeds) {
httpReq = new XMLHttpRequest();
httpReq.onload = httpLoaded;
+ httpReq.onerror = httpError;
httpReq.open("GET", url, true);
httpReq.setRequestHeader("User-Agent", CommonFunc.USER_AGENT);
httpReq.overrideMimeType("application/xml");
try {
httpReq.send(null);
} catch(e) {
- // FAILURE
httpReq.abort();
+ progressUpdate();
}
}
+}
+function progressUpdate() {
+ fetch_done++;
+ progressMeter.value = Math.round((fetch_done/fetch_total) * 100);
+ if(fetch_done >= fetch_total) {
+ if((feeds_found_local + feeds_found_external) == 0) {
+ statusMessage.value = strRes.getString("discovery_status_none_found") + ".";
+ } else {
+ var message = "";
+ if(feeds_found_local > 1) message += feeds_found_local + " " + strRes.getString("discovery_status_site_feeds");
+ if(feeds_found_local == 1) message += feeds_found_local + " " + strRes.getString("discovery_status_site_feed");
+ if(feeds_found_local > 0 && feeds_found_external > 0) message += " " + strRes.getString("discovery_status_and") + " ";
+ if(feeds_found_external > 1) message += feeds_found_external + " " + strRes.getString("discovery_status_external_feeds");
+ if(feeds_found_external == 1) message += feeds_found_external + " " + strRes.getString("discovery_status_external_feed");
+ statusMessage.value = strRes.getString("discovery_status_discovered") + " " + message + ":";
+ }
+ statusDeck.selectedIndex = 1;
+ }
}
-function doOK() {
+function doAddFeed() {
+ var index = feedTree.view.selection.currentIndex;
+ if(index != -1) {
+ var url = feedTree.view.getCellText(index, "url");
+ var title = feedTree.view.getCellText(index, "title");
+ if(url) {
+ if(title == "") {
+ title = "No Title";
+ }
+ var sage_folder = rdfService.GetResource(CommonFunc.getPrefValue(CommonFunc.RSS_READER_FOLDER_ID, "str", "NC:BookmarksRoot"));
+ BMSVC.createBookmarkInContainer(title, url, null, "updated", null, null, sage_folder, null);
+ logMessage("added feed: '" + title + "' " + url);
+ }
+ }
+ var bm_index = bookmarksTree.treeBoxObject.view.rowCount - 1;
+ bookmarksTree.treeBoxObject.ensureRowIsVisible(bm_index);
+ bookmarksTree.treeBoxObject.selection.select(bm_index);
return true;
}
-function doCancel() {
+function doClose() {
return true;
}
+function httpError() {
+ progressUpdate();
+}
+
function httpLoaded(e) {
var httpReq = e.target;
var uri = httpReq.channel.originalURI;
try {
var feed = new Feed(httpReq.responseXML);
- addFeed(uri, feed);
+ addDiscoveredFeed(uri, feed);
} catch(e) { }
+ progressUpdate();
}
-function addFeed(uri, feed) {
+function addDiscoveredFeed(uri, feed) {
var feedClass, lastPubDate, itemCount;
if(uri.host == document_host) { // feed is local
- feedClass = "LocalFeeds";
+ if(feeds_found_local == 0) {
+ //ds.Assert(rdfService.GetResource(schema + "Feeds"), rdfService.GetResource(schema + "child"), rdfService.GetResource(schema + "LocalFeeds"), true);
+ //ds.Assert(rdfService.GetResource(schema + "LocalFeeds"), rdfService.GetResource(schema + "Title"), rdfService.GetLiteral("Site Feeds"), true);
+ //ds.Assert(rdfService.GetResource(schema + "LocalFeeds"), rdfService.GetResource(schema + "Valuation"), rdfService.GetIntLiteral(1), true);
+ }
+ feedClass = "Feeds";
+ feeds_found_local++;
} else { // feed is external
+ if(feeds_found_external == 0) {
+ ds.Assert(rdfService.GetResource(schema + "Feeds"), rdfService.GetResource(schema + "child"), rdfService.GetResource(schema + "ExternalFeeds"), true);
+ ds.Assert(rdfService.GetResource(schema + "ExternalFeeds"), rdfService.GetResource(schema + "Title"), rdfService.GetLiteral(strRes.getString("discovery_external_feeds_category")), true);
+ ds.Assert(rdfService.GetResource(schema + "ExternalFeeds"), rdfService.GetResource(schema + "Valuation"), rdfService.GetIntLiteral(0), true);
+ }
feedClass = "ExternalFeeds";
+ feeds_found_external++;
}
+
var twelveHourClock = CommonFunc.getPrefValue(CommonFunc.TWELVE_HOUR_CLOCK, "bool", false);
lastPubDate = "N/A";
if(feed.hasLastPubDate()) {
lastPubDate = dateFormat(feed.getLastPubDate(), twelveHourClock, 1);
}
- itemCount = feed.getItemCount()
+ itemCount = feed.getItemCount();
+
+ // feed valuation
+ var valuation = 0;
+ if(feedClass == "Feeds") valuation += 1000;
+ if(feed.hasLastPubDate()) valuation += 100;
ds.Assert(rdfService.GetResource(schema + feedClass), rdfService.GetResource(schema + "child"), rdfService.GetResource(schema + uri.spec), true);
+
ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "Title"), rdfService.GetLiteral(feed.getTitle()), true);
ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "Format"), rdfService.GetLiteral(feed.getFormat()), true);
ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "URL"), rdfService.GetLiteral(uri.spec), true);
ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "LastPubDate"), rdfService.GetLiteral(lastPubDate), true);
ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "ItemCount"), rdfService.GetLiteral(itemCount), true);
-
- logMessage("Parsed and added: " + uri.spec);
+ ds.Assert(rdfService.GetResource(schema + uri.spec), rdfService.GetResource(schema + "Valuation"), rdfService.GetIntLiteral(valuation), true);
+
+ logMessage("discovered feed: " + uri.spec);
}
\ No newline at end of file
diff --git a/src/sage/content/discover_feeds.xul b/src/sage/content/discover_feeds.xul
index af3b221..26417ac 100644
--- a/src/sage/content/discover_feeds.xul
+++ b/src/sage/content/discover_feeds.xul
@@ -7,7 +7,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="cancel"
onload="init();"
- ondialogcancel="return doCancel();">
+ ondialogcancel="return doClose();">
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
@@ -23,8 +23,14 @@
</stringbundleset>
<vbox>
- <description value="The following feeds were discovered"/>
-
+ <deck id="statusDeck" selectedIndex="0">
+ <hbox align="center" flex="1">
+ <label value="&discovery.status.searching;:" style="font-weight: bold !important;"/>
+ <progressmeter id="progress" flex="1" mode="determined" value="0"/>
+ </hbox>
+ <label id="statusMessage" style="font-weight: bold !important;"/>
+ </deck>
+ <spacer height="10"/>
<tree id="feedTree"
datasources="rdf:null"
ref="http://sage.mozdev.org/FeedData#Feeds"
@@ -32,19 +38,22 @@
flex="1"
enableColumnDrag="true"
seltype="single"
- minheight="120"
- minwidth="350">
+ minheight="150"
+ minwidth="400"
+ flags="dont-build-content">
<treecols>
- <treecol id="title" label="Title" flex="2" persist="width ordinal hidden" primary="true"/>
+ <treecol id="title" label="&discovery.header.title;" flex="2" persist="width ordinal hidden" primary="true"/>
+ <splitter class="tree-splitter"/>
+ <treecol id="format" label="&discovery.header.format;" flex="1" persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="format" label="Format" flex="1" persist="width ordinal hidden"/>
+ <treecol id="lastPubDate" label="&discovery.header.lastPubDate;" flex="1" persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="url" label="URL" flex="1" hidden="true" persist="width ordinal hidden"/>
+ <treecol id="itemCount" label="&discovery.header.itemCount;" flex="1" hidden="true" persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="lastPubDate" label="Last Update" flex="1" hidden="true" persist="width ordinal hidden"/>
+ <treecol id="url" label="&discovery.header.url;" flex="1" hidden="true" persist="width ordinal hidden"/>
<splitter class="tree-splitter"/>
- <treecol id="itemCount" label="Items" flex="1" hidden="true" persist="width ordinal hidden"/>
+ <treecol id="valuation" label="Value" flex="1" hidden="true" persist="width ordinal hidden" sort="rdf:http://sage.mozdev.org/FeedData#Valuation" sortDirection="descending" sortActive="true" class="sortDirectionIndicator"/>
</treecols>
<template>
@@ -54,9 +63,10 @@
<treerow>
<treecell label="rdf:http://sage.mozdev.org/FeedData#Title"/>
<treecell label="rdf:http://sage.mozdev.org/FeedData#Format"/>
- <treecell label="rdf:http://sage.mozdev.org/FeedData#URL"/>
<treecell label="rdf:http://sage.mozdev.org/FeedData#LastPubDate"/>
<treecell label="rdf:http://sage.mozdev.org/FeedData#ItemCount"/>
+ <treecell label="rdf:http://sage.mozdev.org/FeedData#URL"/>
+ <treecell label="rdf:http://sage.mozdev.org/FeedData#Valuation"/>
</treerow>
</treeitem>
</treechildren>
@@ -67,9 +77,9 @@
<hbox align="center" flex="1">
<spacer flex="1"/>
- <button label="Add Feed"/>
+ <button label="&discovery.button.addFeed;" oncommand="doAddFeed()"/>
<spacer flex="1"/>
- <button dlgtype="cancel" label="Close"/>
+ <button label="&discovery.button.close;" default="true" dlgtype="cancel"/>
<spacer flex="1"/>
</hbox>
diff --git a/src/sage/content/feedlib.js b/src/sage/content/feedlib.js
index 5a680f4..6201209 100644
--- a/src/sage/content/feedlib.js
+++ b/src/sage/content/feedlib.js
@@ -72,7 +72,9 @@ Feed.prototype.parseRSS = function() {
item.title = CommonFunc.getInnerText(j);
break;
case "link":
- item.link = CommonFunc.getInnerText(j);
+ if(!item.link) {
+ item.link = CommonFunc.getInnerText(j);
+ }
break;
case "guid":
if(!item.link) {
@@ -88,7 +90,7 @@ Feed.prototype.parseRSS = function() {
if(tmp_date != "Invalid Date") {
item.pubDate = tmp_date;
} else {
- logMessage("unable to parse date string: " + tmp_str);
+ logMessage("unable to parse date string: " + tmp_str + " feed: " + this.title);
}
break;
case "date":
@@ -97,7 +99,7 @@ Feed.prototype.parseRSS = function() {
if(tmp_date) {
item.pubDate = tmp_date;
} else {
- logMessage("unable to parse date string: " + tmp_str);
+ logMessage("unable to parse date string: " + tmp_str + " feed: " + this.title);
}
break;
}
@@ -174,7 +176,7 @@ Feed.prototype.parseATOM = function() {
if(tmp_date) {
item.pubDate = tmp_date;
} else {
- logMessage("unable to parse date string: " + tmp_str);
+ logMessage("unable to parse date string: " + tmp_str + " feed: " + this.title);
}
}
@@ -212,7 +214,7 @@ Feed.prototype.parseATOM = function() {
}
Feed.prototype.getTitle = function() {
- return this.title;
+ return this.title.replace(/<.*?>/g,'');
}
Feed.prototype.hasDescription = function() {
@@ -293,7 +295,7 @@ FeedItem.prototype.hasTitle = function() {
FeedItem.prototype.getTitle = function() {
var title;
if(this.hasTitle()) {
- title = this.title.replace(/<.*?>/g,'');;
+ title = this.title.replace(/<.*?>/g,'');
} else {
if(this.hasContent()) {
temp = this.getContent();
diff --git a/src/sage/content/res/template-item.txt b/src/sage/content/res/template-item.txt
index 6ce5745..3c9cdfd 100755
--- a/src/sage/content/res/template-item.txt
+++ b/src/sage/content/res/template-item.txt
@@ -5,5 +5,5 @@
</h2>
**DESCRIPTION**
**PUBDATE**
- <div class="item-technorati"><a href="http://www.technorati.com/cosmos/search.html?url=**TECHNORATI**"><img src="chrome://sage/skin/technorati.gif" border="0"></a></div>
+ <div class="item-technorati"><a href="http://www.technorati.com/cosmos/search.html?url=**TECHNORATI**" title="Technorati Trackback"><img src="chrome://sage/skin/technorati.gif" border="0"></a></div>
</div>
diff --git a/src/sage/content/sage-Overlay.xul b/src/sage/content/sage-Overlay.xul
index 62a9069..db8c3c5 100755
--- a/src/sage/content/sage-Overlay.xul
+++ b/src/sage/content/sage-Overlay.xul
@@ -8,6 +8,10 @@
<menuitem key="key_openSageSidebar" observes="viewSageSidebar"/>
</menupopup>
+ <menupopup id="menu_ToolsPopup">
+ <menuitem key="key_openSageSidebar" observes="viewSageSidebar"/>
+ </menupopup>
+
<keyset id="mainKeyset">
<key id="key_openSageSidebar" command="viewSageSidebar"
key="&openSageSidebar.commandkey;"
diff --git a/src/sage/content/sage.js b/src/sage/content/sage.js
index d44592d..b5894c4 100755
--- a/src/sage/content/sage.js
+++ b/src/sage/content/sage.js
@@ -73,7 +73,7 @@ function init() {
}
function discoverFeeds() {
- window.openDialog("chrome://sage/contents/discover_feeds.xul", "sage_discover_feeds", "chrome,modal,close");
+ window.openDialog("chrome://sage/contents/discover_feeds.xul", "sage_discover_feeds", "chrome,modal,close", bookmarksTree);
}
// �X�V���ꂽRSS�̂ݕ\��
diff --git a/src/sage/content/settings/settings.js b/src/sage/content/settings/settings.js
index a8262b7..db735c0 100755
--- a/src/sage/content/settings/settings.js
+++ b/src/sage/content/settings/settings.js
@@ -7,6 +7,8 @@ var chkAllowEContent;
var chkAutoFeedTitle;
var chkRenderFeeds;
var chkTwelveHourClock;
+var feedItemOrder;
+var feedDiscoveryMode;
var gList;
var gNameArc;
@@ -40,6 +42,12 @@ function init() {
chkTwelveHourClock = document.getElementById("chkTwelveHourClock");
chkTwelveHourClock.checked = CommonFunc.getPrefValue(CommonFunc.TWELVE_HOUR_CLOCK, "bool", false);
+ feedItemOrder = document.getElementById("feedItemOrder");
+ feedItemOrder.value = CommonFunc.getPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", "chrono");
+
+ feedDiscoveryMode = document.getElementById("feedDiscoveryMode");
+ feedDiscoveryMode.value = CommonFunc.getPrefValue(CommonFunc.FEED_DISCOVERY_MODE, "str", "exhaustive");
+
setDisabled();
setTimeout(fillSelectFolderMenupopup, 0);
@@ -53,6 +61,8 @@ function accept() {
CommonFunc.setPrefValue(CommonFunc.AUTO_FEED_TITLE, "bool", chkAutoFeedTitle.checked);
CommonFunc.setPrefValue(CommonFunc.RENDER_FEEDS, "bool", chkRenderFeeds.checked);
CommonFunc.setPrefValue(CommonFunc.TWELVE_HOUR_CLOCK, "bool", chkTwelveHourClock.checked);
+ CommonFunc.setPrefValue(CommonFunc.FEED_ITEM_ORDER, "str", feedItemOrder.value);
+ CommonFunc.setPrefValue(CommonFunc.FEED_DISCOVERY_MODE, "str", feedDiscoveryMode.value);
}
function selectFolder(aEvent){
diff --git a/src/sage/content/settings/settings.xul b/src/sage/content/settings/settings.xul
index c0f0dc4..ead6a6c 100755
--- a/src/sage/content/settings/settings.xul
+++ b/src/sage/content/settings/settings.xul
@@ -40,20 +40,20 @@
</columns>
<rows>
<row align="center">
- <label value="Feed item order:"/>
- <menulist id="itemOrder">
+ <label value="&settings.feedItemOrder.label;:"/>
+ <menulist id="feedItemOrder">
<menupopup>
- <menuitem label="Cronological" value="chrono"/>
- <menuitem label="Source" value="source"/>
+ <menuitem label="&settings.feedItemOrder.chrono;" value="chrono"/>
+ <menuitem label="&settings.feedItemOrder.source;" value="source"/>
</menupopup>
</menulist>
</row>
<row align="center">
- <label value="Feed discovery mode:"/>
+ <label value="&settings.feedDiscoveryMode.label;:"/>
<menulist id="feedDiscoveryMode">
<menupopup>
- <menuitem label="Exhaustive" value="exhaustive"/>
- <menuitem label="Conservative" value="conservative"/>
+ <menuitem label="&settings.feedDiscoveryMode.exhaustive;" value="exhaustive"/>
+ <menuitem label="&settings.feedDiscoveryMode.conservative;" value="conservative"/>
</menupopup>
</menulist>
</row>
diff --git a/src/sage/content/updatechecker.js b/src/sage/content/updatechecker.js
index e60cac7..59e5a85 100755
--- a/src/sage/content/updatechecker.js
+++ b/src/sage/content/updatechecker.js
@@ -19,6 +19,8 @@ var UpdateChecker = {
this.checkList.push(resourceList[i]);
}
}
+
+ logMessage("checking " + this.checkList.length + " feed(s)");
this.checking = true;
this.check();
@@ -119,7 +121,7 @@ var UpdateChecker = {
} else {
var sig = CommonFunc.getBMDSProperty(this.lastResource, CommonFunc.BM_DESCRIPTION).match(/\[.*\]/);
if(sig != feed.getSignature()) {
- logMessage("signature mismatch: " + feed.getTitle() + "; old sig: " + sig + " new sig: " + feed.getSignature());
+ //logMessage("signature mismatch: " + feed.getTitle() + "; old sig: " + sig + " new sig: " + feed.getSignature());
status = CommonFunc.STATUS_UPDATE;
} else {
status = CommonFunc.STATUS_NO_UPDATE;
diff --git a/src/sage/locale/en-US/sage.dtd b/src/sage/locale/en-US/sage.dtd
index 8fb08e7..bd0d131 100755
--- a/src/sage/locale/en-US/sage.dtd
+++ b/src/sage/locale/en-US/sage.dtd
@@ -19,12 +19,27 @@
<!ENTITY menu.sageProjectFeed "Sage Project News">
<!ENTITY menu.discoverFeeds "Discover Feeds">
+<!-- Feed Discovery -->
+<!ENTITY discovery.status.searching "Searching current page">
+<!ENTITY discovery.button.addFeed "Add Feed">
+<!ENTITY discovery.button.close "Close">
+<!ENTITY discovery.header.title "Title">
+<!ENTITY discovery.header.format "Format">
+<!ENTITY discovery.header.lastPubDate "Last Update">
+<!ENTITY discovery.header.itemCount "Items">
+<!ENTITY discovery.header.url "URL">
-<!-- Setting Dialog -->
+<!-- Settings Dialog -->
<!ENTITY settings.general.caption "General">
<!ENTITY settings.autoFeedTitle.label "Automatically update feed titles">
<!ENTITY settings.renderFeeds.label "Render feeds in contents area">
<!ENTITY settings.twelveHourClock.label "Use 12 hour clock">
+<!ENTITY settings.feedItemOrder.label "Feed Item Order">
+<!ENTITY settings.feedItemOrder.chrono "Chronological">
+<!ENTITY settings.feedItemOrder.source "Source">
+<!ENTITY settings.feedDiscoveryMode.label "Feed discovery mode">
+<!ENTITY settings.feedDiscoveryMode.exhaustive "Exhaustive">
+<!ENTITY settings.feedDiscoveryMode.conservative "Conservative">
<!ENTITY settingWindow.title "Sage Settings">
<!ENTITY selectFolder.label "Select Feed Folder">
<!ENTITY openInContentsArea.caption "Feed Rendering">
diff --git a/src/sage/locale/en-US/sage.properties b/src/sage/locale/en-US/sage.properties
index 986b847..49256f9 100755
--- a/src/sage/locale/en-US/sage.properties
+++ b/src/sage/locale/en-US/sage.properties
@@ -9,6 +9,18 @@ CHECK_UPDATE = Check Feeds
GET_RSS_TITLE= Get Feed Title
+# feed discovery messages
+
+discovery_external_feeds_category = External Feeds
+discovery_status_discovered = Discovered
+discovery_status_site_feed = site feed
+discovery_status_site_feeds = site feeds
+discovery_status_and = and
+discovery_status_external_feed = external feed
+discovery_status_external_feeds = external feeds
+discovery_status_none_found = No feeds were discovered
+
+
# get feed title dialog
get_feed_title = New Feed Title
diff --git a/src/sage/locale/fr-FR/sage.dtd b/src/sage/locale/fr-FR/sage.dtd
index d9c7eed..c1c0cc6 100644
--- a/src/sage/locale/fr-FR/sage.dtd
+++ b/src/sage/locale/fr-FR/sage.dtd
@@ -18,16 +18,32 @@
<!ENTITY menu.manageRSSList "Gérer la liste des fils...">
<!ENTITY menu.opmlImportExport "Import/Export OPML...">
<!ENTITY menu.setting "Configuration...">
-<!ENTITY menu.sageProjectFeed "">
-<!ENTITY menu.discoverFeeds "">
+<!ENTITY menu.sageProjectFeed "Sage Project News">
+<!ENTITY menu.discoverFeeds "Discover Feeds">
+
+<!-- Feed Discovery -->
+<!ENTITY discovery.status.searching "Searching current page">
+<!ENTITY discovery.button.addFeed "Add Feed">
+<!ENTITY discovery.button.close "Close">
+<!ENTITY discovery.header.title "Title">
+<!ENTITY discovery.header.format "Format">
+<!ENTITY discovery.header.lastPubDate "Last Update">
+<!ENTITY discovery.header.itemCount "Items">
+<!ENTITY discovery.header.url "URL">
<!-- Setting Dialog -->
-<!ENTITY settings.general.caption "">
-<!ENTITY settings.autoFeedTitle.label "">
-<!ENTITY settings.renderFeeds.label "">
-<!ENTITY settings.twelveHourClock.label "">
+<!ENTITY settings.general.caption "General">
+<!ENTITY settings.autoFeedTitle.label "Automatically update feed titles">
+<!ENTITY settings.renderFeeds.label "Render feeds in contents area">
+<!ENTITY settings.twelveHourClock.label "Use 12 hour clock">
<!ENTITY settingWindow.title "Configration de Sage">
<!ENTITY selectFolder.label "Sélection du dossier des fils">
+<!ENTITY settings.feedItemOrder.label "Feed Item Order">
+<!ENTITY settings.feedItemOrder.chrono "Chronological">
+<!ENTITY settings.feedItemOrder.source "Source">
+<!ENTITY settings.feedDiscoveryMode.label "Feed discovery mode">
+<!ENTITY settings.feedDiscoveryMode.exhaustive "Exhaustive">
+<!ENTITY settings.feedDiscoveryMode.conservative "Conservative">
<!ENTITY openInContentsArea.caption "Ouverture dans le zone de contenu">
<!ENTITY enableUserCss.label "Utiliser une feuille de style CSS personnalisée">
<!ENTITY browseCss.label "Sélectionner...">
diff --git a/src/sage/locale/fr-FR/sage.properties b/src/sage/locale/fr-FR/sage.properties
index 7e44d59..5520b5f 100644
--- a/src/sage/locale/fr-FR/sage.properties
+++ b/src/sage/locale/fr-FR/sage.properties
@@ -9,6 +9,18 @@ CHECK_UPDATE = V\u00e9rification des fils
GET_RSS_TITLE= Trouver le nom du fil
+# feed discovery messages
+
+discovery_external_feeds_category = External Feeds
+discovery_status_discovered = Discovered
+discovery_status_site_feed = site feed
+discovery_status_site_feeds = site feeds
+discovery_status_and = and
+discovery_status_external_feed = external feed
+discovery_status_external_feeds = external feeds
+discovery_status_none_found = No feeds were discovered
+
+
# get feed title dialog
get_feed_title = New Feed Title
diff --git a/src/sage/locale/hu-HU/sage.dtd b/src/sage/locale/hu-HU/sage.dtd
index 8de2b44..caaeb1c 100755
--- a/src/sage/locale/hu-HU/sage.dtd
+++ b/src/sage/locale/hu-HU/sage.dtd
@@ -19,8 +19,17 @@
<!ENTITY menu.opmlImportExport "OPML import/export...">
<!ENTITY menu.setting "Be�ll�t�sok...">
<!ENTITY menu.sageProjectFeed "A Sage projekt h�rei">
-<!ENTITY menu.discoverFeeds "">
+<!ENTITY menu.discoverFeeds "Discover Feeds">
+<!-- Feed Discovery -->
+<!ENTITY discovery.status.searching "Searching current page">
+<!ENTITY discovery.button.addFeed "Add Feed">
+<!ENTITY discovery.button.close "Close">
+<!ENTITY discovery.header.title "Title">
+<!ENTITY discovery.header.format "Format">
+<!ENTITY discovery.header.lastPubDate "Last Update">
+<!ENTITY discovery.header.itemCount "Items">
+<!ENTITY discovery.header.url "URL">
<!-- Setting Dialog -->
<!ENTITY settings.general.caption "�ltal�nos">
@@ -28,6 +37,12 @@
<!ENTITY settings.renderFeeds.label "Megnyit�s a tartalmi r�szben">
<!ENTITY settings.twelveHourClock.label "">
<!ENTITY settingWindow.title "Az RSS olvas�panel be�ll�t�sai">
+<!ENTITY settings.feedItemOrder.label "Feed Item Order">
+<!ENTITY settings.feedItemOrder.chrono "Chronological">
+<!ENTITY settings.feedItemOrder.source "Source">
+<!ENTITY settings.feedDiscoveryMode.label "Feed discovery mode">
+<!ENTITY settings.feedDiscoveryMode.exhaustive "Exhaustive">
+<!ENTITY settings.feedDiscoveryMode.conservative "Conservative">
<!ENTITY selectFolder.label "V�lassza ki az RSS listamapp�t">
<!ENTITY openInContentsArea.caption "Let�lt�ttek megjelen�t�se">
<!ENTITY enableUserCss.label "Egy�ni st�luslap enged�lyez�se">
diff --git a/src/sage/locale/hu-HU/sage.properties b/src/sage/locale/hu-HU/sage.properties
index 48493ba..e3e21f1 100755
--- a/src/sage/locale/hu-HU/sage.properties
+++ b/src/sage/locale/hu-HU/sage.properties
@@ -9,6 +9,18 @@ CHECK_UPDATE = Friss
GET_RSS_TITLE= RSS c�m let�lt�se
+# feed discovery messages
+
+discovery_external_feeds_category = External Feeds
+discovery_status_discovered = Discovered
+discovery_status_site_feed = site feed
+discovery_status_site_feeds = site feeds
+discovery_status_and = and
+discovery_status_external_feed = external feed
+discovery_status_external_feeds = external feeds
+discovery_status_none_found = No feeds were discovered
+
+
# get feed title dialog
get_feed_title = New Feed Title
diff --git a/src/sage/locale/ja-JP/sage.dtd b/src/sage/locale/ja-JP/sage.dtd
index c4d0b34..2baedf8 100755
--- a/src/sage/locale/ja-JP/sage.dtd
+++ b/src/sage/locale/ja-JP/sage.dtd
@@ -17,16 +17,32 @@
<!ENTITY menu.manageRSSList "RSS リストの管理">
<!ENTITY menu.opmlImportExport "OPML インポート/エクスポート...">
<!ENTITY menu.setting "設定...">
-<!ENTITY menu.sageProjectFeed "">
-<!ENTITY menu.discoverFeeds "">
+<!ENTITY menu.sageProjectFeed "Sage Project News">
+<!ENTITY menu.discoverFeeds "Discover Feeds">
+
+<!-- Feed Discovery -->
+<!ENTITY discovery.status.searching "Searching current page">
+<!ENTITY discovery.button.addFeed "Add Feed">
+<!ENTITY discovery.button.close "Close">
+<!ENTITY discovery.header.title "Title">
+<!ENTITY discovery.header.format "Format">
+<!ENTITY discovery.header.lastPubDate "Last Update">
+<!ENTITY discovery.header.itemCount "Items">
+<!ENTITY discovery.header.url "URL">
<!-- Setting Dialog -->
-<!ENTITY settings.general.caption "">
-<!ENTITY settings.autoFeedTitle.label "">
-<!ENTITY settings.renderFeeds.label "">
-<!ENTITY settings.twelveHourClock.label "">
+<!ENTITY settings.general.caption "General">
+<!ENTITY settings.autoFeedTitle.label "Automatically update feed titles">
+<!ENTITY settings.renderFeeds.label "Render feeds in contents area">
+<!ENTITY settings.twelveHourClock.label "Use 12 hour clock">
<!ENTITY settingWindow.title "設定: RSS リーダパネル">
<!ENTITY selectFolder.label "RSS リストフォルダの選択">
+<!ENTITY settings.feedItemOrder.label "Feed Item Order">
+<!ENTITY settings.feedItemOrder.chrono "Chronological">
+<!ENTITY settings.feedItemOrder.source "Source">
+<!ENTITY settings.feedDiscoveryMode.label "Feed discovery mode">
+<!ENTITY settings.feedDiscoveryMode.exhaustive "Exhaustive">
+<!ENTITY settings.feedDiscoveryMode.conservative "Conservative">
<!ENTITY openInContentsArea.caption "コンテンツエリアで開く">
<!ENTITY enableUserCss.label "ユーザー CSS を使う">
<!ENTITY browseCss.label "参照...">
diff --git a/src/sage/locale/ja-JP/sage.properties b/src/sage/locale/ja-JP/sage.properties
index bf6179e..0f1459f 100755
--- a/src/sage/locale/ja-JP/sage.properties
+++ b/src/sage/locale/ja-JP/sage.properties
@@ -9,6 +9,18 @@ CHECK_UPDATE = \u66f4\u65b0\u30c1\u30a7\u30c3\u30af
GET_RSS_TITLE= RSS \u30bf\u30a4\u30c8\u30eb\u306e\u53d6\u5f97
+# feed discovery messages
+
+discovery_external_feeds_category = External Feeds
+discovery_status_discovered = Discovered
+discovery_status_site_feed = site feed
+discovery_status_site_feeds = site feeds
+discovery_status_and = and
+discovery_status_external_feed = external feed
+discovery_status_external_feeds = external feeds
+discovery_status_none_found = No feeds were discovered
+
+
# get feed title dialog
get_feed_title = New Feed Title
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git
More information about the Pkg-mozext-commits
mailing list