Mailinglist Archive: opensuse-translation (108 mails)

< Previous Next >
Re: [opensuse-translation] Have I done something silly?
  • From: Karl Eichwalder <ke@xxxxxxx>
  • Date: Fri, 03 Nov 2006 14:31:30 +0100
  • Message-id: <shu01g4pxp.fsf@xxxxxxxxxxxxxxx>
Olav Pettershagen <olav.pet@xxxxxxxxx> 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@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-translation+help@xxxxxxxxxxxx

< Previous Next >
References