Commit graph

2530 commits

Author SHA1 Message Date
Lubomir I. Ivanov
17191f17ce Translate the units in the 'Weight System' dialog
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 14:49:14 -07:00
Dirk Hohndel
834825f406 Find translation files on Linux after Subsurface was installed
So far we only looked in the a local subdirectory, but once Subsurface has
been installed, we don't need to change the search path for translation
files anymore.

Fixes #2

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 14:30:45 -07:00
Lubomir I. Ivanov
c78bf18998 French translation update
there is a missing % in one of the lines i think:

po/fr_FR.po:62: 'msgstr' is not a valid C format string, unlike 'msgid'. Reason:
 The string refers to argument number 4 but ignores argument number 3.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 14:29:15 -07:00
Pierre-Yves Chibon
f7b5737c71 Update French translation
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-18 20:51:58 +02:00
Dirk Hohndel
e2eba2ad21 Update .po files for recent changes
After Lubomir submitted the last set of localization fixes (ec1e1bf30c4f
"info.c: set units for translation in the depth box" and 5e463168d2bb
"dive.c: set some of units for localization") I apparently forgot to
update all the .po files. This should NOT require any extra translation
work unless in your target language the units are indeed replaced with
something else. Otherwise the empty string "" simply triggers gettext to
go with the original text.

But after reading through the diff (boy do I know how to have fun) it
appears that this caught and (I think) correctly fixed a mistake in the
Finnish translation where an incorrect msgid had been used.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 09:40:16 -07:00
Ivan Habunek
4fff64967f Croatian translation update
This update contains the required fixes for the croatian translation
file. It also contains improved translation strings, after seeing the
localized version in action.

Signed-off-by: Ivan Habunek <ivan.habunek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 09:26:24 -07:00
Pierre-Yves Chibon
ce525bcbdd Update french translation
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 09:24:23 -07:00
Filippo Moser
12f049c168 Add Italian translation
Signed-off-by: Filippo Moser <filippom@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 07:01:40 -07:00
Lubomir I. Ivanov
0ef73b977b Updates to the Bulgarian translation
- Added the new date / time format strings
- Added the missing translation for units in dive.c

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 15:08:47 -07:00
Lubomir I. Ivanov
6ff784113e Translate the SAC value in 'Dive Info'
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 15:08:42 -07:00
Lubomir I. Ivanov
88a321c983 Allocate memory for and truncate strings that go into the title bar
info.c:show_dive_info() uses buffers of 80 char, which might not be enough
for all unicode strings to fit. The function snprintf() can be used to
truncate a string to the maximum buffer length, however this should
not be used with unicode strings, since it can split the bytes of a
wide char, causing some corruption.

Instead of a fixed buffer we now allocate/free memory for the title text and
attempt to more safely truncate user entered text by using g_utf8_strlen()
and g_utf8_strncpy(). Long unicode filenames still remain a responsibility
of the user, but they should be now safe as well. On the other hand the string
formed by the function divename() and the variable maxlen should be
monitored by developers to accommodate all translations.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 15:08:33 -07:00
Lubomir I. Ivanov
557a835765 Increase various stack buffer sizes to accommodate for locale strings
Example:
For some strings such as the "Trip title" the buffer of 60 bytes was not
enought for certain languages.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 15:08:23 -07:00
Lubomir I. Ivanov
9e0a9884b8 info.c: set units for translation in the "depth box"
[Dirk Hohndel: fixed to use the correct macro]

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 14:13:36 -07:00
Lubomir I. Ivanov
90c9b0e311 dive.c: set some of units for localization
get_pressure_units() and get_volume_units() should
return localized strings.

[Dirk Hohndel: updated to use the correct macro]

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 14:13:18 -07:00
Miika Turkia
777c27d675 Finnish translation update
Updated the Finnish translation to include the latest changes

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 11:26:32 -07:00
Linus Torvalds
83ab839368 Another Swedish translation update
This updates the Swedish translation for the new message strings, and
the date ordering in particular. It also fixes an incorrect
translation (it incorrectly had translated dive-time as if it was the
starting time of the dive, not the duration of the dive).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 10:12:51 -07:00
Henrik Brautaset Aronsen
9e4a9f6926 Updated Norwegian translation.
Update with new date formats and lowercase temperatures.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 08:16:22 -07:00
Dirk Hohndel
dbae888abc Handle dates and a "calculated plural" in translations
This looks like a massive commit mainly because of the line number changes
in the .po files. That sadly hides what really happened here:

- the places where we manually build dates have now been localized
- the one place where we did the English "calculated plural" has been
  modified so that it now can be correctly translated (in English this
  just adds an 's' to the noun if the number is != 1 - in other languages
  this tends to be much more complicated)

I then updated the two German translations to take advantage of the new
constructs. And while I was at it, I changed the translation Trip->Gruppe
to Trip->Reise as that seemed much more appropriate.
I also fixed another error in the German translation where I translated
"dive time" as "Startzeit" - but in the context it was "Dauer".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 01:25:49 -07:00
Henrik Brautaset Aronsen
9c62e223d3 Install all .mo files on all targets
Linux didn't have a locale install target, and Windows didn't install
aliased locale files.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-17 00:04:18 -07:00
Dirk Hohndel
40ae90920a Fix typo and make variable name more logical
[the macos/macosx typo was also found and a patch submitted by
 Henrik Brautaset Aronsen <subsurface@henrik.synth.no>]

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 23:55:35 -07:00
Dirk Hohndel
04c5e65b8c Redoing the Mac bundling
With the right tools in place you can now create a bundle from the
Makefile by calling "make create-macos-bundle"

In the process of this I also moved the locale directory where we stage
our .mo files to share/locale (which is much more logical).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 21:37:43 -07:00
Henrik Brautaset Aronsen
0d89d511bb Adjust locale path for install-macosx target
gtk-mac-bundler uses Contents/Resources/share/locale, and
the install-macosx target should do the same.

Also quiet down the make process a bit

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 13:11:12 -07:00
Linus Torvalds
8bda0c5047 Minimal Swedish translation update
This doesn't really improve any of the horrible Swedish texts, but
updates it for the message text fuzziness due to the text changes

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:43:34 -07:00
Dirk Hohndel
bb7a11e638 Update Dutch translation
The best translations are those maintained by people that don't speak the
language. As I don't speak Dutch I make no promises on the correctness of
this.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:15:56 -07:00
jnoel
66276882b9 Update po/fr_FR.po
Update of the french translation file.
Fuzzy mark update with single line.

[Dirk Hohndel: removed Jacco and myself - we didn't do French]

Signed-off-by: Jean-Noël Rouchon <jnoel@sissiou.net>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 11:00:16 -07:00
Henrik Brautaset Aronsen
13cc5afb7f Avoid zero degrees Kelvin in yearly statistics
Maximum and minimum degrees in the yearly statistics were displayed
as -273.1°C if no temperature info was present.

H

From 7d9aad01133bc03980f66a2d109c9ef909e518ad Mon Sep 17 00:00:00 2001
From: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Date: Tue, 16 Oct 2012 18:13:16 +0200
Subject: [PATCH] Avoid zero degrees Kelvin in yearly statistics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Maximum and minimum degrees in the yearly statistics were displayed
as -273.1°C if no temperature info was present.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 09:19:48 -07:00
Dirk Hohndel
faff4d29dd Update version to 2.1-rc1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 09:15:03 -07:00
Dirk Hohndel
0e7246b0b4 Fix another bug where we make assumptions about the length of a string
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 09:01:04 -07:00
Dirk Hohndel
bfd6ce0f1f Localization prevents us from from making assumptions about string length
Restructure some code to work around that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 08:33:03 -07:00
Henrik Brautaset Aronsen
f45285d461 Support for language aliases.
Some languages have identifiers that gettext can't determine
automatically in all OS'es.  An example is Norwegian (no_NO, deprecated)
with its Bokmål (nb_NO) and Nynorsk (nn_NO) form.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 07:30:59 -07:00
Dirk Hohndel
9dc667e883 Renamed the Norwegian .po file
At least on Windows this now will make things work correctly, as the gtk
localization is named nb - so nb_NO.UTF-8 is consistent with that.

MacOS still appears to need some special handling.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 04:30:07 -07:00
Henrik Brautaset Aronsen
f03d29b48b Added a terrible spanish translation.
I don't know any Spanish at all. This translation was made with
Google Translate, perl and sed, and will annoy anyone who knows
Spanish.  Hopefully enough so that they will fix it.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 04:09:22 -07:00
Dirk Hohndel
a9f3655d1a Improved packaging for Windows
This commit adds an install-cross-windows target to the Makefile that
creates a staging directory for us under packaging/windows that contains
the required .mo files. This currently fails for the Norwegian translation
because of the no_NO.UTF-8 vs nb issue - right now we just use the first
component of our own localization filename to find the matching Windows
localization and that fails.

The subsurface.nsi file is updated accordingly and this now appears to
create working installers with sane paths for the localization files.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 04:08:33 -07:00
Lubomir I. Ivanov
5bf6723d26 More fixes in the Bulgarian translation
- Added the missing statistics translations
- Clearer translation in the Dive->View submenu

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 02:25:16 -07:00
Henrik Brautaset Aronsen
ea48829ba5 Updated Norwegian translation
Dirk had some changes in commit f1569a206e

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 02:17:52 -07:00
Lubomir I. Ivanov
cc08e03678 subsurface.nsi: call RMDir for the 'share' and 'locale' subfolders
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-16 02:16:42 -07:00
Dirk Hohndel
fada2f6bc6 Better Windows installer .nsi file
This still requires on carefully staged files in the packaging/windows
directory. Specifically:

- the dll directory (or symlink) points to the installed gtk Windows DLLs
- the mydll directory (or symlink) contains six other DLLs (where the
  cross built DLLs from Fedora for some reason file, but can be
  transparently replaced with the ones from the upstream binary
  package
- the share directory contains the Windows gtk locale files (but only for
  the locales that we support, anyway)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 21:27:16 -07:00
Jozef Ivanecký
ac3124b8d0 Update Slovak translation
Signed-Off-By: Jozef Ivanecký (dodo.sk@gmail.com)
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 16:34:28 -07:00
Dirk Hohndel
f97f75f961 Set locale under Windows
This is mostly a quick hack to be able to test localization under Windows.
It seems to work fine under Windows 7

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 16:32:11 -07:00
Dirk Hohndel
72c7d7c9c4 Small adjustments to the German translation
Consistently use "Ø" for average.

Use Tauchgruppenleiter and Leiter instead of Tauchgruppenführer and
Führer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 15:23:16 -07:00
Dirk Hohndel
9b9e36886c Forgot to localize names of months and weekdays
We marked the strings for translation, but then didn't actually call the
translation function on them.

Our dates are still not truely localized as we have hand written code for
the date / time handling that constructs the dates according to US fashion
as [Weekday], [Month] [Day of Month], [Year] [hh:mm]

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 14:37:59 -07:00
Tommi Saviranta
0cee29121d Updated Finnish translation
- Use message context for better translation
- Fixed some strings to form proper sentences

Signed-off-by: Tommi Saviranta <wnd@iki.fi>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 13:34:37 -07:00
Dirk Hohndel
7e703b7a1d Fix incorrect localization of dialog name
The existing code passed a localized copy of a text buffer initialized by
a static string to a function that ended up wanting to modify the buffer.
Unsurprisingly, that doesn't work. This commit restructures the code so
that we initialize the buffer at run time with a localized version of the
default string and then just pass the buffer around.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 13:29:37 -07:00
Lubomir I. Ivanov
dc7a831cde Improved Bulgarian translation
- Shortened long phrases
- Better lowercase/uppercase consistency
- Fixed a couple of typos

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 11:15:10 -07:00
Ivan Habunek
00eb9bde56 Initial Croatian translation.
Signed-off-by: Ivan Habunek <ivan.habunek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 10:02:44 -07:00
Martin Gysel
da2a0562ab Swiss-High-German translation
Here's the Swiss-(High-)German translation which is mostly based on the
German translation.

Most notable differences are:
- in Switzerland, 'ß' doesn't exist (fortunately)
- keep some English words where the German translation sounds strange or
  unfamiliar (nobody in Switzerland would ever use the word
  Tauchgruppenführer)

Signed-off-by: Martin Gysel <me@bearsh.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 09:42:55 -07:00
Dirk Hohndel
4b9a59a154 Merge branch 'gettext'
Bring all the localization changes into master in preparation for
Subsurface 2.1
2012-10-15 09:37:09 -07:00
Henrik Brautaset Aronsen
ef039c9d32 Support for gettext in MacOSX application bundle
The MacOSX applications bundle needs to be told where to bind the
text domain from.

Also copy the gettext .mo files in the install-macosx target.

[Dirk Hohndel: minor change in main(): move the path declaration to
               the beginning of the function]

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-15 09:36:30 -07:00
jnoel
5c432d3c8a Update po/fr_FR.po
Just a few spelling corrections for fr_FR translation file

Signed-off-by: Jean-Noël Rouchon <jnoel@sissiou.net>
2012-10-15 09:34:37 -07:00
Dirk Hohndel
f1569a206e Improve translations
- fix two missing strings in equipment.c (thanks to Tommi Saviranta for
  pointing this out)

- add context for the translations of the Yearly/monthly statistics. The code
  for this ended up being incredibly ugly, but the gettext infrastructure
  really clashed with the way this is implemented. What I have now at least
  works (tested with the German translation)

- merge the new strings into all the po files. The non-German translations need
  to be updated. Make sure you remove the "# , fuzzy" lines or the current
  Makefile will ignore those additions.

- some minor cleanup of the po files (many listed the wrong language, all of
  them copied my incorrect use of PACKAGE (instead of saying "Subsurface").

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-14 20:47:00 -07:00