Commit graph

1077 commits

Author SHA1 Message Date
Miika Turkia
25ddf1caee Map JDiveLog alarms to Subsurface events
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:46:50 -07:00
Dirk Hohndel
dbafd6cec6 Merge branch 'master' of http://ambre.pingoured.fr/cgit/subsurface
Get Pierre's latest French translation updates
2012-10-21 20:46:02 -07:00
Dirk Hohndel
315225afb4 Fix annoying whitespace damage that I just introduced
Remember: don't push before doing a git log -p

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:44:29 -07:00
Dirk Hohndel
c9226758d4 Small updates to the README
Mention the specific libdivecomputer version needed (0.2).
References to additional documentation.
Remove distracting info from the flow of the text and add a Credits section at
the end.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:37:43 -07:00
Dirk Hohndel
79d204dde8 Add quick script to automate Mac dmg creation
This basically automates what is documented in the README

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 13:40:35 -07:00
Pierre-Yves Chibon
cff31db134 Update French translation
Harmonize the translations on the stats tab, let's be consistent on
where we use abbreviations and which one we use.


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-21 21:39:04 +02:00
Dirk Hohndel
b1dbdf6322 Fixed French translation
One message had the wrong number of format strings.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:52:30 -07:00
Dirk Hohndel
75d0aee907 Merge branch 'translation' of http://ambre.pingoured.fr/cgit/subsurface into translation 2012-10-21 11:51:45 -07:00
Miika Turkia
0f6eb9f12b Updated Finnish translation
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:45:21 -07:00
Dirk Hohndel
016365c5f1 Fix the way we handle translated event names
Here is what Linus reported:

 I think you have made a mistake in trying to translate some of
 libdivecomputer.c

 Translating some of those things based on locale is *wrong*, because
 they are saved in the XML file.

 That covers at least the warnings: they'll get translated when you
 import them, and then saved to the XML file as that translation, but
 now if you start subsurface in another locale, they will not get
 translated back.

 So translating XML file contents is fundamentally buggy. It just
 shouldn't be done.

 So all the "translations" for the event handling are buggy, and
 generate crap. Please don't do that. Leave them as English.

And of course he is absolutely right. However, instead of not translating
them at all, this commit fixes things a better way - we now mark the
strings for translation but store the original English strings everywhere
(in the in-memory data structure as well as in the XML file). Only when we
actually display something on the screen (in a tooltip or in the filter
dialog) do we actually translate the strings into the native language.

This should address both Linus' issue and the desire to have localized
event texts.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:40:30 -07:00
Pierre-Yves Chibon
2b00e6ae00 Update french translation
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-21 15:33:14 +02:00
Dirk Hohndel
e47b52ecdb Bump version to 2.1-rc3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 01:27:49 -07:00
Dirk Hohndel
882c4ab5e7 Feeble attempt to deal with the last translation change
In all languages. Including the one I can't even read. It should be
trivial,  but the translators really should check.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 01:20:00 -07:00
Dirk Hohndel
19a743dec7 Yet again, new .po files with no other changes
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 00:50:45 -07:00
Dirk Hohndel
44eb54ea77 Mark menu entries that open another dialog with "..."
This is a very common standard in desktop programs - if a menu entry
immediately causes an action (like Close or New or Toggle Autogroup) then
it doesn't have the "..."; others that open a secondary dialog (like Open
or Import / Download) are marked with "...".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 00:48:38 -07:00
Dirk Hohndel
ef3b557297 Quick attempt to update the documentation for 2.1
This needs a lot more work, but it's a start.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 00:43:03 -07:00
Dirk Hohndel
c36da74989 Updates for the two German translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 22:46:15 -07:00
Dirk Hohndel
828a8ef902 Update the po files
NO other changes

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 22:41:41 -07:00
Dirk Hohndel
c6d713bb4d Improved About dialog
Add a link to the GPL, a link to the homepage, an opportunity for the
translator to be listed (this requires the translations to translate the
phrase "translator-credits" with the names of the translators - kinda
nifty).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 22:39:40 -07:00
Dirk Hohndel
e6454f1773 Finally a fully working Mac dmg
The Makefile change simply gets us the same setup with make install-macosx
that we are getting from the gtk-mac-bundler - with the launcher script
and subsurface installed as subsurface-bin.

The changes in the README are what make the difference for getting a
working dmg - there are a bunch of .so files that are part of gtk that
didn't have their dependency load paths updated - and those made the
application either crash or at least not display its own icon correctly.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 21:06:35 -07:00
Dirk Hohndel
3afa7c4651 Update Swiss-German translations
This just tracks the changes I made to the German translations

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 14:47:28 -07:00
Dirk Hohndel
bd279054b5 Update German translations
This adds all the new terms from libdivecomputer.c

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 14:46:47 -07:00
Dirk Hohndel
05632c0eae Updated po files based on the previous commit
NO changes beyond running xgettext and msgmerge

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 14:46:47 -07:00
Dirk Hohndel
f01bfc11a9 Added missing localization macros to libdivecomputer.c
Somehow no one noticed that this file had been skipped in the localization
effort.

Fixes #6

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 14:46:30 -07:00
Filippo Moser
6e0878292c Italian translation update
Some fixes for the Italian translation.
It also contains improved translation strings, after seeing the localized
version in action

[Dirk Hohndel: cleaned up the .po file to turn into a readable diff]

Signed-off-by: Filippo Moser <filippom@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-20 14:08:27 -07:00
Dirk Hohndel
1b3caa7c70 Updated the README file for 2.1
This clearly hadn't been edited in more than a year and was way outdated. I
tried to make it useful and informative :-)

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 21:22:59 -07:00
Lubomir I. Ivanov
55f08bfeab Use subsurface_os_feature_available() to check for unicode stars support
Mainly affecting older Windows (such as XP), which do not have a more
fully featured unicode fonts installed, such as Arial Unicode MS.

With this patch we do a runtime check of the OS version in a couple of
places and if the OS is old, we use the asterix character and spaces instead
of the unicode star characters.

Linux and OSX should be unaffected by this change unless
subsurface_os_feature_available() returns FALSE for UTF8_FONT_WITH_STARS
at some point.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 21:14:15 -07:00
Lubomir I. Ivanov
5b3e480be3 Added a function to check if specific OS features are available
linux.c, macos.c, windows.c now contain
subsurface_os_feature_available() that can accept an enum type
os_feature_t defined in dive.h.

The function can be useful to check if a specific global feature
is available on a certain OS version.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 21:14:00 -07:00
Dirk Hohndel
a75b04473f Add aliases file for the two letter country code for all languages
I forgot those in the last commit

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 13:12:13 -07:00
Dirk Hohndel
f481622156 Yet more changes to create localized builds for Mac
It turns out that we need aliases for all the languages. And more fiddling
when creating the dmg. And a specialized MacPorts build with the install
path as prefix. What this basically means is that our app will be
correctly localized iff run as /Applications/Subsurface.app
Otherwise the gtk default texts (on buttons for example) may or may not be
translated.

One remaining issue is that apparently Gtk's Mac integration triggers on
the untranslated name Help the Menu tree in order to work. Yet we can't
easily tell the app not to translate that word as the translations are
done internally in gtk - we'd basicall have to build special subsurface.mo
files for Mac that don't contain a translation of the word "Help" for this
to work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 12:58:59 -07:00
Henrik Brautaset Aronsen
caccbfb6e9 And another Norwegian update.
With nifty ³'s and everything.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 11:32:50 -07:00
Lubomir I. Ivanov
2c60354c5c added Bulgarian translation for 'air'
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 10:52:23 -07:00
Tommi Saviranta
8c617a03e3 Updated Finnish translation
Translated newly localised units, backplate weight and fixed dive list
time format.

Signed-off-by: Tommi Saviranta <wnd@iki.fi>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 10:08:31 -07:00
Dirk Hohndel
1037f60cb3 Update German and Finnish translations
Translate air in the German locales and remove a fuzzy comment next to a
correct translation in the Finnish one

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 08:44:12 -07:00
Dirk Hohndel
57bbf0a68a Update po files
NO other changes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 08:42:18 -07:00
Henrik Brautaset Aronsen
48ea072317 Another Norwegian .po update.
No rest for the wicked.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 08:39:07 -07:00
Dirk Hohndel
b6cad0ed0f Merge branch 'translation' of http://ambre.pingoured.fr/cgit/subsurface 2012-10-19 08:33:05 -07:00
Henrik Brautaset Aronsen
021544c19f Translate "air"
Translate the "air" text in the divelist.

Suggested-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 08:29:42 -07:00
Lubomir I. Ivanov
ef602c5663 Updated Bulgarian translation
- we translate "backplate weight" as "on the back" or
"back weight".

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 07:21:05 -07:00
Henrik Brautaset Aronsen
228259ead6 Add temporary locate files to the "clean" target.
The update-po-files target creates backup files.  Let's add them
to the "clean" target.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-19 07:19:59 -07:00
Pierre-Yves Chibon
f0305f92eb Update french translation
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-19 10:48:46 +02:00
Dirk Hohndel
4d649151b5 Bumped version to 2.1-rc2
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 22:33:36 -07:00
Dirk Hohndel
0fc3a446e9 Don't enable equipment notebook buttons if there is no dive
The buttons didn't actually do anything when clicked, but this still
was inconsistent behavior.

Reported-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 20:45:26 -07:00
Dirk Hohndel
f4b6e53c4e Changed the term used for one of the default weight systems
Originally I used the colloquial term "bar" for the weight bar that you
can attach to a backplate (usually when diving twins in a tec
environment). This of course causes an odditity for translations as this
word "bar" is a homonym for the weight system and the pressure unit -
which throws off translations.

Instead of switching to a context-based translation I instead went with a
better term: "backplate weight". This of course now needs to be
translated, so I updated the .po files (and added German translations for
the two flavors of German).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 19:53:16 -07:00
Dirk Hohndel
7c9cd15b2b More improvements for German translation
Based on feedback by German divers (Flasche instead of Tank) and Wikipedia for
the official abbreviations of the various units.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 19:34:28 -07:00
Johnny Karlsson
d358ebb8bf Swedish translation update
Fixing some minor grammatical and translation issues
(e.g. alert, warning = varning, alarm = alarm, dykning/ar = dyk).

Signed-off-by: Johnny Karlsson <yggdrasil@gmx.co.uk>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 19:06:46 -07:00
Dirk Hohndel
049f4aa8ac Add Makefile target to update po files
This is a bit of a hack to make my life easier.

make update-po-files

will extract the translation strings and merge them with the existing
translations - for all existing translations.

For good measure this commit includes the latest update of the po files
(but no new translations should be needed).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-18 14:53:27 -07:00
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