[Commits] ChangeLog 1.396.2.3397.2.11 1.396.2.3397.2.12 PATCHSETS 1.1.2.4232.2.11 1.1.2.4232.2.12 configure.ac 1.654.2.4297.2.11 1.654.2.4297.2.12
miras at claws-mail.org
miras at claws-mail.org
Fri Dec 16 17:14:34 CET 2011
Update of /home/claws-mail/claws
In directory claws-mail:/tmp/cvs-serv3146
Modified Files:
Tag: new-contacts
ChangeLog PATCHSETS configure.ac
Log Message:
2011-12-16 [mir] 3.7.10cvs16.13-new-contacts
* po/bg.po
* po/ca.po
* po/cs.po
* po/de.po
* po/en_GB.po
* po/es.po
* po/fi.po
* po/fr.po
* po/hu.po
* po/id_ID.po
* po/it.po
* po/ja.po
* po/lt.po
* po/nl.po
* po/pl.po
* po/pt_BR.po
* po/pt_PT.po
* po/ru.po
* po/sk.po
* po/sv.po
* po/uk.po
* po/zh_CN.po
Fix string conflicts between HEAD and BRANCH
Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4297.2.11
retrieving revision 1.654.2.4297.2.12
diff -u -d -r1.654.2.4297.2.11 -r1.654.2.4297.2.12
--- configure.ac 16 Dec 2011 15:49:06 -0000 1.654.2.4297.2.11
+++ configure.ac 16 Dec 2011 16:14:32 -0000 1.654.2.4297.2.12
@@ -12,7 +12,7 @@
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=16.12
+EXTRA_VERSION=16.13
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=-new-contacts
Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4232.2.11
retrieving revision 1.1.2.4232.2.12
diff -u -d -r1.1.2.4232.2.11 -r1.1.2.4232.2.12
--- PATCHSETS 16 Dec 2011 15:49:06 -0000 1.1.2.4232.2.11
+++ PATCHSETS 16 Dec 2011 16:14:32 -0000 1.1.2.4232.2.12
@@ -4231,3 +4231,4 @@
( cvs diff -u -r 1.1.2.103.2.1 -r 1.1.2.103.2.2 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/gtk/quicksearch.h; ) > 3.7.10cvs16.10-new-contacts.patchset
( cvs diff -u -r 1.21.2.9.6.1 -r 1.21.2.9.6.2 po/bg.po; cvs diff -u -r 1.1.2.19.2.1 -r 1.1.2.19.2.2 po/ca.po; cvs diff -u -r 1.9.2.23.2.1 -r 1.9.2.23.2.2 po/cs.po; cvs diff -u -r 1.58.2.49.2.1 -r 1.58.2.49.2.2 po/de.po; cvs diff -u -r 1.12.2.18.6.1 -r 1.12.2.18.6.2 po/en_GB.po; cvs diff -u -r 1.60.2.63.2.1 -r 1.60.2.63.2.2 po/es.po; cvs diff -u -r 1.1.2.27.2.1 -r 1.1.2.27.2.2 po/fi.po; cvs diff -u -r 1.42.2.55.2.1 -r 1.42.2.55.2.2 po/fr.po; cvs diff -u -r 1.5.2.20.2.1 -r 1.5.2.20.2.2 po/hu.po; cvs diff -u -r -1.1.2.5.2.1 -r -1.1.2.5.2.2 po/id.po; diff -u /dev/null po/id_ID.po; cvs diff -u -r 1.34.2.30.2.1 -r 1.34.2.30.2.2 po/it.po; cvs diff -u -r 1.16.2.12.2.1 -r 1.16.2.12.2.2 po/ja.po; cvs diff -u -r 1.1.2.4.2.1 -r 1.1.2.4.2.2 po/lt.po; cvs diff -u -r 1.28.2.15.2.1 -r 1.28.2.15.2.2 po/nl.po; cvs diff -u -r 1.10.2.18.6.1 -r 1.10.2.18.6.2 po/pl.po; cvs diff -u -r 1.50.2.42.2.1 -r 1.50.2.42.2.2 po/pt_BR.po; cvs diff -u -r 1.1.2.4.2.1 -r 1.1.2.4.2.2 po/pt_PT.po; cvs diff -u -r 1.17.2.21.6.1 -r 1.17.2.21.6.2 po/ru.po; cvs diff -u -r 1.2.2.34.2.1 -r 1.2.2.34.2.2 po/sk.po; cvs diff -u -r 1.4.2.11.6.1 -r 1.4.2.11.6.2 po/sv.po; cvs diff -u -r 1.1.2.4.2.1 -r 1.1.2.4.2.2 po/uk.po; cvs diff -u -r 1.5.2.30.2.1 -r 1.5.2.30.2.2 po/zh_CN.po; ) > 3.7.10cvs16.11-new-contacts.patchset
( cvs diff -u -r 1.150.2.117.2.1 -r 1.150.2.117.2.2 src/procmsg.c; cvs diff -u -r 1.25.2.68.2.1 -r 1.25.2.68.2.2 src/stock_pixmap.c; cvs diff -u -r 1.18.2.42 -r 1.18.2.43 src/stock_pixmap.h; cvs diff -u -r 1.395.2.430.2.2 -r 1.395.2.430.2.3 src/summaryview.c; cvs diff -u -r 1.1.2.19.2.1 -r 1.1.2.19.2.2 src/gtk/icon_legend.c; diff -u /dev/null src/pixmaps/replied_and_forwarded.xpm; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 tools/claws.i18n.status.pl; ) > 3.7.10cvs16.12-new-contacts.patchset
+( cvs diff -u -r 1.21.2.9.6.2 -r 1.21.2.9.6.3 po/bg.po; cvs diff -u -r 1.1.2.19.2.2 -r 1.1.2.19.2.3 po/ca.po; cvs diff -u -r 1.9.2.23.2.2 -r 1.9.2.23.2.3 po/cs.po; cvs diff -u -r 1.58.2.49.2.2 -r 1.58.2.49.2.3 po/de.po; cvs diff -u -r 1.12.2.18.6.2 -r 1.12.2.18.6.3 po/en_GB.po; cvs diff -u -r 1.60.2.63.2.2 -r 1.60.2.63.2.3 po/es.po; cvs diff -u -r 1.1.2.27.2.2 -r 1.1.2.27.2.3 po/fi.po; cvs diff -u -r 1.42.2.55.2.2 -r 1.42.2.55.2.3 po/fr.po; cvs diff -u -r 1.5.2.20.2.2 -r 1.5.2.20.2.3 po/hu.po; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 po/id_ID.po; cvs diff -u -r 1.34.2.30.2.2 -r 1.34.2.30.2.3 po/it.po; cvs diff -u -r 1.16.2.12.2.2 -r 1.16.2.12.2.3 po/ja.po; cvs diff -u -r 1.1.2.4.2.2 -r 1.1.2.4.2.3 po/lt.po; cvs diff -u -r 1.28.2.15.2.2 -r 1.28.2.15.2.3 po/nl.po; cvs diff -u -r 1.10.2.18.6.2 -r 1.10.2.18.6.3 po/pl.po; cvs diff -u -r 1.50.2.42.2.2 -r 1.50.2.42.2.3 po/pt_BR.po; cvs diff -u -r 1.1.2.4.2.2 -r 1.1.2.4.2.3 po/pt_PT.po; cvs diff -u -r 1.17.2.21.6.2 -r 1.17.2.21.6.3 po/ru.po; cvs diff -u -r 1.2.2.34.2.2 -r 1.2.2.34.2.3 po/sk.po; cvs diff -u -r 1.4.2.11.6.2 -r 1.4.2.11.6.3 po/sv.po; cvs diff -u -r 1.1.2.4.2.2 -r 1.1.2.4.2.3 po/uk.po; cvs diff -u -r 1.5.2.30.2.2 -r 1.5.2.30.2.3 po/zh_CN.po; ) > 3.7.10cvs16.13-new-contacts.patchset
Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3397.2.11
retrieving revision 1.396.2.3397.2.12
diff -u -d -r1.396.2.3397.2.11 -r1.396.2.3397.2.12
--- ChangeLog 16 Dec 2011 15:49:05 -0000 1.396.2.3397.2.11
+++ ChangeLog 16 Dec 2011 16:14:31 -0000 1.396.2.3397.2.12
@@ -1,3 +1,29 @@
+2011-12-16 [mir] 3.7.10cvs16.13-new-contacts
+
+ * po/bg.po
+ * po/ca.po
+ * po/cs.po
+ * po/de.po
+ * po/en_GB.po
+ * po/es.po
+ * po/fi.po
+ * po/fr.po
+ * po/hu.po
+ * po/id_ID.po
+ * po/it.po
+ * po/ja.po
+ * po/lt.po
+ * po/nl.po
+ * po/pl.po
+ * po/pt_BR.po
+ * po/pt_PT.po
+ * po/ru.po
+ * po/sk.po
+ * po/sv.po
+ * po/uk.po
+ * po/zh_CN.po
+ Fix string conflicts between HEAD and BRANCH
+
2011-12-16 [mir] 3.7.10cvs16.12-new-contacts
* src/procmsg.c
More information about the Commits
mailing list