247797 - Ein paar Strings in den Kalender DTDs fehlen

Status: RESOLVED FIXED

(Mozilla Localizations :: de / German, defect)

Description

[Peter Weilbacher]

User-Agent:       Mozilla/5.0 (OS/2; U; Warp 4.5; en-US; rv:1.8a2) Gecko/20040618
Build Identifier: Mozilla/5.0 (OS/2; U; Warp 4.5; de-AT; rv:1.7) Gecko/20040618

Ein paar Strings in den Kalender dtds, die im 1.7 Branch für 1.7 final vorhanden
sind, fehlen im de-AT Language-Pack. Mein Patch für das Problem sieht so aus
(einen Teil davon habe ich schon per Email geschickt, bevor ich die richtige
Vorgehensweise auf mozilla.kairo.at gelesen habe):

--- locale/de-AT/calendar/prefs.dtd.orig	2004-06-16 16:14:50.000000000 +0100
+++ locale/de-AT/calendar/prefs.dtd	2004-06-20 12:50:56.000000000 +0100
@@ -50,6 +50,8 @@
 <!ENTITY pref.weekstarts.label "Erster Tag der Woche:">
 <!ENTITY pref.dateformat.short "Kurz">
 <!ENTITY pref.publish.path.label "Standardname f&#9500;&#9565;r entfernte Datei">
+<!ENTITY pref.publish.username.label "Benutzername">
+<!ENTITY pref.publish.password.label "Passwort">
 <!ENTITY pref.weekstarts.friday "Freitag">
 <!ENTITY pref.reloadonlaunch "Entfernte Kalender beim Start neu laden">
 <!ENTITY calendar.publish.label "Publizieren">
---
F:\TCPIP\Warpzilla\stable-1.7\chrome\de-AT\locale\de-AT\calendar\calendar.dtd.orig
2004-06-16 16:14:50.000000000 +0100
+++
F:\TCPIP\Warpzilla\stable-1.7\chrome\de-AT\locale\de-AT\calendar\calendar.dtd
2004-06-20 14:45:36.000000000 +0100
@@ -245,6 +245,8 @@
 <!ENTITY menuBar.tooltip "Men&#9500;&#9565;leiste">
 <!ENTITY allDayEvents.label "Ganzt&#9500;ñgige Ereignisse">
 <!ENTITY calendar.server.dialog.name.label "Name">
+<!ENTITY calendar.server.dialog.username.label      "Benutzername">
+<!ENTITY calendar.server.dialog.password.label      "Passwort">
 <!ENTITY newevent.status.needsaction.label "Ben&#9500;Âtigt Eingriff">
 <!ENTITY calendar.context.modifyevent.accesskey "B">
 <!ENTITY calendar.newtask.button.tooltip "Neue Aufgabe erstellen">
@@ -257,7 +259,7 @@
 <!ENTITY calendar.server.dialog.publish.label "&#9500;änderungen automatisch
publizieren? Bei entfernten Kalendern l&#9500;ñdt dies eine neue Version herunter,
bevor Sie ein Ereignis hinzuf&#9500;&#9565;gen, bearbeiten oder l&#9500;Âschen. Dann wird Ihre
Aktion ausgef&#9500;&#9565;hrt und die neue Datei auf den Server geladen.">
 <!ENTITY newevent.numberoftimes.label "Wie oft">
 <!ENTITY calendar.onlyworkday.checkbox.label "Nur Montag-Freitag">
-<!ENTITY calendar.server.dialog.local.location.label "Loake Datei-Adresse">
+<!ENTITY calendar.server.dialog.local.location.label "Lokale Datei-Adresse">
 <!ENTITY calendar.local.calendar.dialog.help.label "Sie k&#9500;Ânnen optional eine
Datei-Adresse angeben, auf der der Kalender erstellt werden soll.">
 <!ENTITY newevent.advanced.repeat.dayofmonth.label "Am x-ten Tag des Monats">
 <!ENTITY newevent.removeselectedfile.label "Gew&#9500;ñhlte Datei entfernen">
@@ -359,3 +361,7 @@
 <!ENTITY calendar.importoutlook.outlookallday.label "Ganztagsereignis">
 <!ENTITY calendar.importoutlook.outlookalarmdate.label "Alarmdatum">
 <!ENTITY event.title.heading "Kalender-Alarm">
+<!ENTITY calendar.publish.username.label            "Benutzername">
+<!ENTITY calendar.publish.password.label            "Passwort">
+<!ENTITY calendar.publish.username.description      "(Optional) Der
Benutzername zum Hochladen auf diesen Server.">
+<!ENTITY calendar.publish.password.description      "(Optional) Das Passwort
zum Hochladen auf diesen Server.">


Reproducible: Always
Steps to Reproduce:

Comment 1

[Mike Kaply [:mkaply]]

Not OS/2 specific - belongs in calendar.

Comment 2

[Robert Kaiser]

mkaply:
no, it's a bug that belongs in the German localization component, and that's why
it was filed there against me.

Comment 3

[Robert Kaiser]

FIXED im XPI Nightly Pack 2004-07-02-05.

Comment 4

[Peter Weilbacher]

Hmm, heißt das, daß dies nicht im 1.7.2 Language Pack gefixt ist/wird? Damit
sehe ich nämlich noch denselben Fehler...

Comment 5

[Robert Kaiser]

Peter, I was told that if you install the 1.7.2 lanuage pack after the calendar
package, it should work. The Calendar package overwrites the definition for the
calendar language pack, and the translation from the calendar package might have
the error, it was reported that the one from the 1.7.2 language pack does work
correctly (see German Mozilla newsgroups).

[writing english because Mostafah, who might not speak German, is on the CC list
here]

Comment 6

[Peter Weilbacher]

Sorry for using German again, I only noticed after submitting that there are
several people getting bugmail for this whose names do not sound German...

Every language pack is installed after the calendar here, because the build I
have is done with --enable-calendar (the now OS/2 default).

But perhaps I got the wrong language pack then, or a one different from that
Michael Kunz used. Neither
http://www.unet.univie.ac.at/~a9805220/mozilla/mozilla-1.7.2-lang-de-AT.xpi
nor
http://ftp.mozilla.org/pub/mozilla.org/mozilla/l10n/lang/moz1.72/langdeat.xpi
contain e.g. pref.publish.username.label (I unpacked and grepped through all the
files). Is there another one?

Comment 7

[Robert Kaiser]

Hmm, several people reported that current calendar release works, and I included
all strings that my Linux CVS build process (with --enable-calendar) build into
the current trunk calendar.jar pack...

Comment 8

[Mostafa Hosseini]

(In reply to comment #5)
> The Calendar package overwrites the definition for the calendar language pack 

Does this help at all with supporting other language packs? The intention was to
make sure a new calendar xpi won't break localized builds by adding new entities
(although untranslated) to other locales. If it is becoming more of a hassle
than help, we can remove the support ( at least for de-AT )

Comment 9

[Robert Kaiser]

Mostafa:
As long as all strings are represented in the Calendar pack, I think there's no
problem...

BTW, are those localizations in calendar CVS? If yes, would it be appreciated if
I check in the changes that I'm making in German localization? If again yes, any
r/sr needed?

Comment 10

[Mostafa Hosseini]

It's in CVS:
http://lxr.mozilla.org/mozilla/source/calendar/resources/locale/de-AT/

No r/sr needed for the locales but please make sure the files are kept as close
to the en-US version as possible, (white spaces, entity names and order, etc )
so that the comparison is easy.

Comment 11

[Peter Weilbacher]

I am getting more and more confused about what we are talking about. I am only
talking about the 1.7 branch. 

Robert: It is strange that I should get e.g. pref.publish.username.label in the
final calendar.jar for a checkout from the tags MOZILLA_1_7_2_RELEASE or
MOZILLA_1_7_BRANCH that and you don't. Especially, since I can see it in the 1.7
branch in LXR:
<http://lxr.mozilla.org/mozilla1.7/search?string=pref.publish.username.label>

The current calendar release (I presume the ones from
<http://ftp.mozilla.org/pub/mozilla.org/calendar/xpi/>) are not built from the
1.7 branch, and so the people in the newsgroup probably get different results.

Comment 12

[Robert Kaiser]

Peter:

It seems that's the solution: I'm using trunk as well, and not the 1.7 branch.
And I used branch for the 1.7.2 release as well.

Comment 13

[Robert Kaiser]

Er, sorry, I wanted to say "I used trunk for the 1.7.2 release as well"

Comment 14

[Peter Weilbacher]

What do you suggest I should do when making a 1.7.x build available that
includes the calendar? The only way I see is to edit your German language pack
(and maybe others that do the same) so that it works and ship it with my
distribution.

But that's not really ideal. Instead I would have thought that you would use the
1.7 branch for all the content in the 1.7.x language packs. Of course, the
problem then is with the Calendar XPIs from the trunk that people install on top
of 1.7.x releases that come without Calendar...

Comment 15

[Peter Weilbacher]

*** Bug 292177 has been marked as a duplicate of this bug. ***