diff --git a/.gitattributes b/.gitattributes index 8a60237c..1e7c7619 100644 --- a/.gitattributes +++ b/.gitattributes @@ -387,20 +387,25 @@ bureau/class/variables.php -text bureau/index.php -text bureau/locales/Makefile -text bureau/locales/README -text +bureau/locales/de_DE/LC_MESSAGES/.svnignore -text bureau/locales/de_DE/LC_MESSAGES/alternc -text bureau/locales/de_DE/LC_MESSAGES/manual.po -text bureau/locales/de_DE/LC_MESSAGES/messages.po -text +bureau/locales/en_US/LC_MESSAGES/.svnignore -text bureau/locales/en_US/LC_MESSAGES/alternc -text bureau/locales/en_US/LC_MESSAGES/manual.po -text bureau/locales/en_US/LC_MESSAGES/messages.po -text +bureau/locales/es_ES/LC_MESSAGES/.svnignore -text bureau/locales/es_ES/LC_MESSAGES/alternc -text bureau/locales/es_ES/LC_MESSAGES/manual.po -text bureau/locales/es_ES/LC_MESSAGES/messages.po -text +bureau/locales/fr_FR/LC_MESSAGES/.svnignore -text bureau/locales/fr_FR/LC_MESSAGES/alternc -text bureau/locales/fr_FR/LC_MESSAGES/manual.po -text bureau/locales/fr_FR/LC_MESSAGES/messages.po -text bureau/locales/manual.pot -text bureau/locales/messages.pot -text +bureau/locales/pt_BR/LC_MESSAGES/.svnignore -text bureau/locales/pt_BR/LC_MESSAGES/alternc -text bureau/locales/pt_BR/LC_MESSAGES/manual.po -text bureau/locales/pt_BR/LC_MESSAGES/messages.po -text @@ -523,6 +528,7 @@ install/upgrades/1.1.php -text install/upgrades/1.1.sh -text install/upgrades/1.1.sql -text install/upgrades/README -text +lang/.svnignore -text lang/README -text lang/en_US.po -text man/alternc-admintools.8 -text diff --git a/.gitignore b/.gitignore index ca46492a..af0f9183 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,33 @@ /build-stamp -debian/.svnignore +bureau/locales/de_DE/LC_MESSAGES/alternc.mo +bureau/locales/en_US/LC_MESSAGES/alternc.mo +bureau/locales/es_ES/LC_MESSAGES/alternc.mo +bureau/locales/fr_FR/LC_MESSAGES/alternc.mo +bureau/locales/pt_BR/LC_MESSAGES/alternc.mo debian/alternc +debian/alternc-awstats +debian/alternc-awstats.debhelper.log +debian/alternc-awstats.postrm.debhelper +debian/alternc-awstats.substvars +debian/alternc-roundcube +debian/alternc-roundcube.debhelper.log +debian/alternc-roundcube.substvars debian/alternc-slave debian/alternc-slave.debhelper.log debian/alternc-slave.postrm.debhelper debian/alternc-slave.substvars +debian/alternc-squirrelmail +debian/alternc-squirrelmail.debhelper.log +debian/alternc-squirrelmail.substvars +debian/alternc-upnp +debian/alternc-upnp.debhelper.log +debian/alternc-upnp.substvars debian/alternc.debhelper.log debian/alternc.postrm.debhelper debian/alternc.substvars debian/files +lang/de_DE.po +lang/es_ES.po +lang/fr_FR.po +lang/pt_BR.po po/fr/LC_MESSAGES/alternc-admintools.mo diff --git a/.svnignore b/.svnignore index 8a00e727..15055494 100644 --- a/.svnignore +++ b/.svnignore @@ -1,23 +1 @@ build-stamp -lang/pt_BR.po -lang/fr_FR.po -lang/es_ES.po -lang/de_DE.po -debian/alternc-upnp.substvars -debian/alternc-awstats.debhelper.log -debian/alternc-squirrelmail.substvars -debian/alternc-awstats -debian/alternc-roundcube.debhelper.log -debian/alternc-squirrelmail -debian/alternc-awstats.substvars -debian/alternc-roundcube -debian/alternc-upnp.debhelper.log -debian/alternc-awstats.postrm.debhelper -debian/alternc-roundcube.substvars -debian/alternc-upnp -debian/alternc-squirrelmail.debhelper.log -bureau/locales/de_DE/LC_MESSAGES/alternc.mo -bureau/locales/pt_BR/LC_MESSAGES/alternc.mo -bureau/locales/en_US/LC_MESSAGES/alternc.mo -bureau/locales/es_ES/LC_MESSAGES/alternc.mo -bureau/locales/fr_FR/LC_MESSAGES/alternc.mo diff --git a/bureau/locales/de_DE/LC_MESSAGES/.svnignore b/bureau/locales/de_DE/LC_MESSAGES/.svnignore new file mode 100644 index 00000000..11cdc847 --- /dev/null +++ b/bureau/locales/de_DE/LC_MESSAGES/.svnignore @@ -0,0 +1 @@ +alternc.mo diff --git a/bureau/locales/en_US/LC_MESSAGES/.svnignore b/bureau/locales/en_US/LC_MESSAGES/.svnignore new file mode 100644 index 00000000..11cdc847 --- /dev/null +++ b/bureau/locales/en_US/LC_MESSAGES/.svnignore @@ -0,0 +1 @@ +alternc.mo diff --git a/bureau/locales/es_ES/LC_MESSAGES/.svnignore b/bureau/locales/es_ES/LC_MESSAGES/.svnignore new file mode 100644 index 00000000..11cdc847 --- /dev/null +++ b/bureau/locales/es_ES/LC_MESSAGES/.svnignore @@ -0,0 +1 @@ +alternc.mo diff --git a/bureau/locales/fr_FR/LC_MESSAGES/.svnignore b/bureau/locales/fr_FR/LC_MESSAGES/.svnignore new file mode 100644 index 00000000..11cdc847 --- /dev/null +++ b/bureau/locales/fr_FR/LC_MESSAGES/.svnignore @@ -0,0 +1 @@ +alternc.mo diff --git a/bureau/locales/pt_BR/LC_MESSAGES/.svnignore b/bureau/locales/pt_BR/LC_MESSAGES/.svnignore new file mode 100644 index 00000000..11cdc847 --- /dev/null +++ b/bureau/locales/pt_BR/LC_MESSAGES/.svnignore @@ -0,0 +1 @@ +alternc.mo diff --git a/debian/.svnignore b/debian/.svnignore index 32b97042..d3939440 100644 --- a/debian/.svnignore +++ b/debian/.svnignore @@ -1,10 +1,22 @@ alternc -alternc-slave.substvars -files +alternc-awstats +alternc-awstats.debhelper.log +alternc-awstats.postrm.debhelper +alternc-awstats.substvars +alternc-roundcube +alternc-roundcube.debhelper.log +alternc-roundcube.substvars +alternc-slave alternc-slave.debhelper.log alternc-slave.postrm.debhelper -alternc.substvars -.svnignore -alternc-slave +alternc-slave.substvars +alternc-squirrelmail +alternc-squirrelmail.debhelper.log +alternc-squirrelmail.substvars +alternc-upnp +alternc-upnp.debhelper.log +alternc-upnp.substvars alternc.debhelper.log alternc.postrm.debhelper +alternc.substvars +files diff --git a/lang/.svnignore b/lang/.svnignore new file mode 100644 index 00000000..133678e5 --- /dev/null +++ b/lang/.svnignore @@ -0,0 +1,4 @@ +pt_BR.po +fr_FR.po +es_ES.po +de_DE.po diff --git a/tx-to-repos.sh b/tx-to-repos.sh index 2a9068bd..8d89881b 100755 --- a/tx-to-repos.sh +++ b/tx-to-repos.sh @@ -28,8 +28,6 @@ do then msgcat --use-first --less-than=3 --more-than=1 -o tmp.po "lang/${lang}.po" "debian/po/${sublang}.po" mv -f tmp.po "debian/po/${sublang}.po" - msgcat --use-first --less-than=3 --more-than=1 -o tmp.po "lang/${lang}.po" "../../alternc-awstats/trunk/debian/po/${sublang}.po" - mv -f tmp.po "../../alternc-awstats/trunk/debian/po/${sublang}.po" msgcat --use-first --less-than=3 --more-than=1 -o tmp.po "lang/${lang}.po" "../../alternc-mailman/trunk/debian/po/${sublang}.po" mv -f tmp.po "../../alternc-mailman/trunk/debian/po/${sublang}.po" fi @@ -40,7 +38,5 @@ done svn commit -m "Updating language files from Transifex" pushd ../../alternc-mailman/trunk svn commit -m "Updating language files from Transifex" -cd ../../alternc-awstats/trunk -svn commit -m "Updating language files from Transifex" popd