using plural forms in a place where duganov reported, all devs, patchers have a look; also updating pot/po to match plural forms usage and some new strings changes from greek po [as I go on]; we now also have make gajim.pot to produce the pot with the help of intltool

po/Makefile

@@ -1,3 +1,5 @@
+top_srcdir = ../src/
+NAME = gajim
 LANGS   := fr pt el pl es ru bg de
 LANGDIR := $(foreach lang, $(LANGS), $(subst ,/LC_MESSAGES/gajim.mo, $(lang)))
 
@@ -6,5 +8,8 @@ all: $(LANGDIR)
 %.mo: %.po
 	msgfmt $< -o $@
 
+gajim.pot: ../src/*py ../src/common/*py
+	 intltool-update --pot --gettext-package=$(NAME)
+
 clean:
 	find . -name '*.mo' -exec rm {} \;

po/POTFILES.in

@@ -0,0 +1,30 @@
+[encoding: UTF-8]
+src/common/GnuPG.py
+src/common/GnuPGInterface.py
+src/common/config.py
+src/common/connection.py
+src/common/gajim.py
+src/common/helpers.py
+src/common/i18n.py
+src/common/logger.py
+src/common/optparser.py
+src/common/sleepy.py
+src/common/socks5.py
+src/advanced.py
+src/cell_renderer_image.py
+src/chat.py
+src/check_for_new_version.py
+src/config.py
+src/dialogs.py
+src/gajim.py
+src/gajim_themes_window.py
+src/groupchat_window.py
+src/gtkgui_helpers.py
+src/history_window.py
+src/remote_control.py
+src/roster_window.py
+src/systray.py
+src/tabbed_chat_window.py
+src/vcard.py
+src/gtkgui.glade.h
+scripts/gajim-remote.py

po/POTFILES.skip

@@ -0,0 +1 @@
+

scripts/translations.py

@@ -18,8 +18,8 @@ def visit(arg, dirname, names):
 			path_to_po = os.path.join(dirname, 'gajim.po')
 			pos = path_to_po.find('po/') + 3 #3 = len('po/')
 			name = path_to_po[pos:pos+2]
-			if update:
-				os.system('msgmerge -q -U ../po/'+name+'/LC_MESSAGES/gajim.po ../gajim.pot')
+			if update: # update an existing po file)
+				os.system('msgmerge -q -U ../po/'+name+'/LC_MESSAGES/gajim.po ../po/gajim.pot')
 			if stats:
 				print name, 'has now:'
 				os.system('msgfmt --statistics ' + path_to_po)
@@ -29,9 +29,10 @@ def show_help():
 	sys.exit(0)
 
 def update_pot():
+	# create header for glade strings
 	os.system('intltool-extract --type=gettext/glade ../src/gtkgui.glade')
-	os.system('xgettext -k_ -kN_ -o ../gajim.pot ../src/*.py ../src/common/*.py \
-		../src/gtkgui.glade.h gajim-remote.py')
+	# update the pot
+	os.system('make -C ../po/ all')
 	print 'gajim.pot was updated successfully'
 
 if __name__ == '__main__':