[opensuse-translation] Have I done something silly?
Situation: When the svn server was down I downloaded the yast tarball and translated the files. I discovered that the server was up again one night in the beginning of the week so I updated my local copy, overwrote with my translated files and committed. Today I checked the stats, and everything was 100% except that printer and storage had a couple of missing translations. I updated my local copy again (there were lots of updates) and committed my previously translated files once again. There are no updates after that. However, I started to worry. svn is still a bit of black magic to me :) so I wonder if I have screwed something up in connection with printer.po and storage.po, i.e. have I replaced the correct copy of these files with wrong files on the svn server? Olav -- Olav Pettershagen Grøndalen NO-2429 Tørberget Tel. +47 62454707 Mob. +47 48141781 http://home.online.no/~olav.pet/current_view.jpg --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org
Olav Pettershagen <olav.pet@online.no> writes:
However, I started to worry. svn is still a bit of black magic to me :) so I wonder if I have screwed something up in connection with printer.po and storage.po, i.e. have I replaced the correct copy of these files with wrong files on the svn server?
If the server does not accept your files, they are the same on both sides (or there are conflicts resp. your local copy is not up-to-date--in this case, the server would complain loudly). I always recommend to move your local copy apart, freshly check out what's on the server now and run diffs locally. I just noticed that your software seems to remove the "#, ycp-format" flags--those are essential. The merge process I'm starting often once a day resp. after new submissions, will put these flags if possible or render your translations as fuzzy if the formatting specifications do not match. In any case expects diffs as follows: suse-i18n/trunk/yast/nb/po> svn diff -r3570:3600|less Index: firewall.nb.po =================================================================== --- firewall.nb.po (revision 3570) +++ firewall.nb.po (revision 3600) @@ -22,7 +22,6 @@ #. TRANSLATORS: CommandLine error, %1 is a firewall zone shortcut #: src/SuSEFirewallCMDLine.ycp:45 -#, ycp-format msgid "Unknown zone %1." msgstr "Ukjent sone %1." @@ -32,7 +31,6 @@ #: src/SuSEFirewallCMDLine.ycp:242 src/SuSEFirewallCMDLine.ycp:429 #: src/SuSEFirewallCMDLine.ycp:441 src/SuSEFirewallCMDLine.ycp:806 #: src/SuSEFirewallCMDLine.ycp:855 -#, ycp-format msgid "Parameter %1 must be set." msgstr "Parameteren %1 må spesifiseres." @@ -117,25 +115,21 @@ #. TRANSLATORS: CommandLine progress information, %1 is the special string, %2 is the zone n ame #: src/SuSEFirewallCMDLine.ycp:226 -#, ycp-format msgid "Adding special string %1 into zone %2..." msgstr "Legger til spesialkommandoen %1 for sonen %2..." -- Karl Eichwalder R&D / Documentation SUSE Linux Products GmbH GPG: 1024D/06EB882E B2A3 AF2F CFC8 40B1 67EA 475A 5903 A21B 06EB 882E --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-translation+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-translation+help@opensuse.org
participants (2)
-
Karl Eichwalder -
Olav Pettershagen