update translations

localized_schema.php

@@ -1,4 +1,4 @@
-<?php # This file has been generated at:  Mon Nov 29 13:07:29 MSK 2010
+<?php # This file has been generated at:  Thu Mar 10 11:57:12 MSK 2011
 
 __("Title");
 __("Title or Content");
@@ -6,7 +6,7 @@ __("Link");
 __("Content");
 __("Article Date");
 
-__("Filter article");
+__("Delete article");
 __("Mark as read");
 __("Set starred");
 __("Publish article");
@@ -17,7 +17,7 @@ __('This option is useful when you are reading several planet-type aggregators w
 __('Display expanded list of feed articles, instead of separate displays for headlines and article content');
 __('When "Mark as read" button is clicked in toolbar, automatically open next feed with unread articles.');
 __('This option enables sending daily digest of new (and unread) headlines on your configured e-mail address');
-__('This option enables marking articles as read automatically in combined mode (except for Fresh articles feed) while you scroll article list.');
+__('This option enables marking articles as read automatically while you scroll article list.');
 __('Strip all but most common HTML tags when reading articles.');
 __('When auto-detecting tags in articles these tags will not be applied (comma-separated list).');
 __('When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
@@ -41,7 +41,7 @@ __('Set articles as unread on update');
 __('Reverse headline order (oldest first)');
 __('Enable e-mail digest');
 __('Confirm marking feed as read');
-__('Mark articles as read automatically');
+__('Automatically mark articles as read');
 __('Strip unsafe tags from articles');
 __('Blacklisted tags');
 __('Maximum age of fresh articles (in hours)');

utils/localized_schema.txt

@@ -4,7 +4,7 @@ __("Link");
 __("Content");
 __("Article Date");
 
-__("Filter article");
+__("Delete article");
 __("Mark as read");
 __("Set starred");
 __("Publish article");

utils/update-js-translations.sh

@@ -1,52 +0,0 @@
-#!/bin/sh
-
-if [ ! -f localized_js.php ]; then
-	echo "please run this script from tt-rss directory"
-	exit 1
-fi
-
-echo "This script is not used anymore."
-
-exit 0 # disabled
-
-cat >localized_js.php <<HEADER
-<?php 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-define('DISABLE_SESSIONS', true);
-
-require "functions.php";
-header("Content-Type: text/plain; charset=UTF-8");
-
-function T_js_decl(\$s1) {
-
-	if (!\$s1) return;
-
-//	\$T_s1 = __(\$s1);
-
-//	if (\$T_s1 != \$s1) {
-		return "T_messages[\"\$s1\"] = \"".__(\$s1)."\";\n";
-//	} else {
-//		return "";
-//	}
-}
-?>
-
-var T_messages = new Object();
-
-function __(msg) {
-	if (T_messages[msg]) {
-		return T_messages[msg];
-	} else {
-		debug('[gettext] not found: ' + msg);
-		return msg;
-	}
-}
-
-<?php
-HEADER
-
-cat *js | ./utils/extract-i18n-js.pl | sort | uniq >> localized_js.php
-
-cat >>localized_js.php <<FOOTER
-?>
-FOOTER

utils/update-translations.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 TEMPLATE=messages.pot
 
+./utils/update-schema-translations.sh
+
 xgettext -kT_js_decl -kT_sprintf -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php modules/*.php help/*.php mobile/*.php
 
 xgettext --from-code utf-8 -k__ -L Java -j -o $TEMPLATE *.js