Created attachment 121585 [details] [review]
Use C_() instead of Q_() with context

+++ src/ephy-toolbar-editor.c

-	{ /* Translators: The text before the "|" is context to help you decide on
-	   * the correct translation. You MUST OMIT it in the translated string. */
-	  N_("toolbar style|Default"), 0, FALSE },
+	{ NC_("toolbar style", "Default"), 0, FALSE },

You also need to changed from Q_() to C_() in ephy_toolbar_editor_constructor below then.

+++ lib/ephy-langs.c	(working copy)
@@ -35,84 +35,32 @@
  */
 static const EphyFontsLanguageInfo font_languages [] =
 {

These are unused in ephy/webkit, so they can just be removed instead of creating translator work changing from Q to C. Might involve some prefs-dialog.c work to remove them completely.

+++ embed/ephy-encodings.c	(working copy)

Same here; I don't think webkit supports character set detectors. (Alp?)

+++ embed/mozilla/EphyAboutModule.cpp

This is removed on trunk.

-----

If you want to commit this to ephy/gecko, we need to create a branch first since 2-24 is string frozen.

Created attachment 121634 [details] [review]
Use C_() instead of Q_() with context (updated)

This fixes all the issues above, but doesn't remove any code to do with languages or encodings. Re. that, do you mean to just remove the "Add Language" dialogue in prefs-dialog.c, and any trace of it from the code? Sorry, I haven't touched Epiphany code before, and I know even less about WebKit. :-)

Don't know why I had ephy/gecko files left over in my local tree, since I made sure it was updated to trunk first. Fixed now.

Note that I also pushed Epiphany's dependency on GLib up to 2.18.0, which is a change I forgot in the first patch. It's necessary for the calls to g_dpgettext2, C_() and NC_().

Is there any reason to commit this fix ?

Thanks a lot

Mostly ok, except this:

lib/ephy-langs.c should remove all the fonts_languages, they're unused on ephy/webkit.

Same for the strings in embed/ephy-encodings.c that are changed by this patch.

So I guess let's first commit the patch minus the changes to these 2 files.

Committed without the changes to those two files as revision #8705.

I removed the autodetectors and fonts language strings from svn trunk. Are there any strings left to fix here?

Andre: I'm not sure we should change those strings on 2-26 and thus create unnecessary work for the existing translations.

(In reply to comment #7)
> I removed the autodetectors and fonts language strings from svn trunk. Are
> there any strings left to fix here?

Looks like we've got them all.

So is this fixed and can be closed, or why is it still open?

Andre: it was you who set the Gnome target to 2.26; this is only fixed on trunk. I don't think it should be done on gnome-2-26 branch; if you agree please close this bug.

Yupp.