Index: openacs-4/packages/acs-lang/lib/conflict-link.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/conflict-link.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-lang/lib/conflict-link.adp 11 Dec 2003 21:39:52 -0000 1.2 +++ openacs-4/packages/acs-lang/lib/conflict-link.adp 30 Jan 2004 14:53:05 -0000 1.3 @@ -1,5 +1,5 @@ -

- » Resolve message conflicts -

+
Index: openacs-4/packages/acs-lang/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-lang/www/index.adp 11 Jan 2004 20:58:53 -0000 1.6 +++ openacs-4/packages/acs-lang/www/index.adp 30 Jan 2004 14:53:05 -0000 1.7 @@ -8,6 +8,4 @@ -
-
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp 15 Aug 2003 08:37:08 -0000 1.10 +++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp 30 Jan 2004 14:53:06 -0000 1.11 @@ -24,7 +24,7 @@ -

- » Delete this message -

+
Index: openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp 22 Oct 2003 13:30:31 -0000 1.1 +++ openacs-4/packages/acs-lang/www/admin/export-locale-to-files.adp 30 Jan 2004 14:53:06 -0000 1.2 @@ -6,6 +6,6 @@ Export finished.

-

- » Return to the locale page -

+ Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/export-messages.adp 11 Dec 2003 21:39:53 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/export-messages.adp 30 Jan 2004 14:53:06 -0000 1.3 @@ -26,6 +26,7 @@

-

- » Return -

+ + Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp 22 Oct 2003 11:17:50 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp 30 Jan 2004 14:53:06 -0000 1.3 @@ -6,6 +6,6 @@ Import finished.

-

- » Return to the locale page -

+ Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/import-messages.adp 11 Dec 2003 21:39:53 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/import-messages.adp 30 Jan 2004 14:53:06 -0000 1.3 @@ -24,14 +24,14 @@ There are @conflict_count@ message conflicts in the database. -

- » Proceed to resolve conflicts -

+
There are currently no conflicts in the database. -

- » Return -

+ Index: openacs-4/packages/acs-lang/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/acs-lang/www/admin/index.adp 14 Dec 2003 13:05:09 -0000 1.16 +++ openacs-4/packages/acs-lang/www/admin/index.adp 30 Jan 2004 14:53:06 -0000 1.17 @@ -4,36 +4,27 @@ -

- » - Toggle translator mode: - On | Off - On | Off -

+ +

Installed Locales

@@ -61,10 +52,10 @@
@locales.num_untranslated_pretty@ - + - + @@ -88,10 +79,6 @@
-

- » Create New Locale -

- - - - + Index: openacs-4/packages/acs-lang/www/admin/lookup.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookup.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-lang/www/admin/lookup.adp 24 Sep 2003 17:20:54 -0000 1.1 +++ openacs-4/packages/acs-lang/www/admin/lookup.adp 30 Jan 2004 14:53:06 -0000 1.2 @@ -12,8 +12,8 @@ -

- » Edit this message -

+
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-lang/www/admin/message-list.adp 11 Dec 2003 21:39:53 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/message-list.adp 30 Jan 2004 14:53:06 -0000 1.7 @@ -13,29 +13,24 @@ - -

- » Create new message -

-
+ +
@@ -77,4 +72,4 @@
- +
Index: openacs-4/packages/acs-lang/www/admin/message-search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/message-search.adp 15 Aug 2003 07:50:44 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/message-search.adp 30 Jan 2004 14:53:06 -0000 1.4 @@ -11,9 +11,9 @@

Search Results

-

- » Search for '@q@' in @other_locale@ -

+
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-lang/www/admin/package-list.adp 11 Dec 2003 21:39:53 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/package-list.adp 30 Jan 2004 14:53:06 -0000 1.6 @@ -9,12 +9,10 @@ -

- » Import all messages for this locale -

-

- » Export all messages for this locale -

+