diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9a3f252
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+zanata.xml merge=ours
diff --git a/.gitignore b/.gitignore
index 76db50a..21e8bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ themes/default/templates/data.html.ep
 themes/default/templates/raw.html.ep
 themes/default/templates/stats.json.ep
 tmp/*
+.zanata-cache/*
diff --git a/Makefile b/Makefile
index 0d57155..5e85bda 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,5 @@
 EXTRACTDIR=-D lib -D themes/default/templates
 POT=themes/default/lib/Lutim/I18N/lutim.pot
-EN=themes/default/lib/Lutim/I18N/en.po
-FR=themes/default/lib/Lutim/I18N/fr.po
-DE=themes/default/lib/Lutim/I18N/de.po
-ES=themes/default/lib/Lutim/I18N/es.po
-OC=themes/default/lib/Lutim/I18N/oc.po
-AR=themes/default/lib/Lutim/I18N/ar.po
 XGETTEXT=carton exec local/bin/xgettext.pl -u
 CARTON=carton exec
 LUTIM=script/lutim
@@ -13,12 +7,15 @@ REAL_LUTIM=script/application
 
 locales:
 	$(XGETTEXT) $(EXTRACTDIR) -o $(POT) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(EN) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(FR) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(DE) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(ES) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(OC) 2>/dev/null
-	$(XGETTEXT) $(EXTRACTDIR) -o $(AR) 2>/dev/null
+
+push-locales: locales
+	zanata-cli -q -B push
+
+pull-locales:
+	zanata-cli -q -B pull
+
+stats-locales:
+	zanata-cli -q stats
 
 podcheck:
 	podchecker lib/Lutim/DB/Image.pm
diff --git a/themes/default/lib/Lutim/I18N/lutim.pot b/themes/default/lib/Lutim/I18N/lutim.pot
index 2617e6b..957cbb3 100644
--- a/themes/default/lib/Lutim/I18N/lutim.pot
+++ b/themes/default/lib/Lutim/I18N/lutim.pot
@@ -19,7 +19,7 @@ msgstr ""
 #. (30)
 #. ($delay)
 #. (config('max_delay')
-#: lib/Lutim/Command/cron/stats.pm:149 lib/Lutim/Command/cron/stats.pm:150 lib/Lutim/Command/cron/stats.pm:160 lib/Lutim/Command/cron/stats.pm:161 lib/Lutim/Command/cron/stats.pm:177 lib/Lutim/Command/cron/stats.pm:178 themes/default/templates/partial/for_my_delay.html.ep:12 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/for_my_delay.html.ep:3 themes/default/templates/partial/lutim.js.ep:138 themes/default/templates/partial/lutim.js.ep:147 themes/default/templates/partial/lutim.js.ep:148
+#: lib/Lutim/Command/cron/stats.pm:149 lib/Lutim/Command/cron/stats.pm:150 lib/Lutim/Command/cron/stats.pm:160 lib/Lutim/Command/cron/stats.pm:161 lib/Lutim/Command/cron/stats.pm:177 lib/Lutim/Command/cron/stats.pm:178 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/for_my_delay.html.ep:14 themes/default/templates/partial/for_my_delay.html.ep:4 themes/default/templates/partial/lutim.js.ep:139 themes/default/templates/partial/lutim.js.ep:148 themes/default/templates/partial/lutim.js.ep:149 themes/default/templates/raw.html.ep:19 themes/default/templates/raw.html.ep:20 themes/default/templates/raw.html.ep:36 themes/default/templates/raw.html.ep:37 themes/default/templates/raw.html.ep:8 themes/default/templates/raw.html.ep:9
 msgid "%1 days"
 msgstr ""
 
@@ -32,11 +32,11 @@ msgstr ""
 msgid "-or-"
 msgstr ""
 
-#: lib/Lutim.pm:185 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:5
+#: lib/Lutim.pm:186 lib/Lutim/Command/cron/stats.pm:151 lib/Lutim/Command/cron/stats.pm:162 lib/Lutim/Command/cron/stats.pm:179 themes/default/templates/index.html.ep:5 themes/default/templates/raw.html.ep:10 themes/default/templates/raw.html.ep:21 themes/default/templates/raw.html.ep:38
 msgid "1 year"
 msgstr ""
 
-#: lib/Lutim.pm:184 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:159 lib/Lutim/Command/cron/stats.pm:176 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:12 themes/default/templates/partial/lutim.js.ep:147
+#: lib/Lutim.pm:185 lib/Lutim/Command/cron/stats.pm:148 lib/Lutim/Command/cron/stats.pm:159 lib/Lutim/Command/cron/stats.pm:176 themes/default/templates/index.html.ep:4 themes/default/templates/partial/for_my_delay.html.ep:13 themes/default/templates/partial/lutim.js.ep:148 themes/default/templates/raw.html.ep:18 themes/default/templates/raw.html.ep:35 themes/default/templates/raw.html.ep:7
 msgid "24 hours"
 msgstr ""
 
@@ -48,7 +48,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: lib/Lutim/Command/cron/stats.pm:144
+#: lib/Lutim/Command/cron/stats.pm:144 themes/default/templates/raw.html.ep:3
 msgid "Active images"
 msgstr ""
 
@@ -76,7 +76,7 @@ msgstr ""
 msgid "Contributors"
 msgstr ""
 
-#: themes/default/templates/partial/lutim.js.ep:214 themes/default/templates/partial/lutim.js.ep:268 themes/default/templates/partial/lutim.js.ep:346
+#: themes/default/templates/partial/lutim.js.ep:215 themes/default/templates/partial/lutim.js.ep:269 themes/default/templates/partial/lutim.js.ep:347
 msgid "Copy all view links to clipboard"
 msgstr ""
 
@@ -96,15 +96,15 @@ msgstr ""
 msgid "Delay repartition chart for enabled images"
 msgstr ""
 
-#: themes/default/templates/index.html.ep:115 themes/default/templates/index.html.ep:147 themes/default/templates/index.html.ep:178 themes/default/templates/myfiles.html.ep:53 themes/default/templates/partial/lutim.js.ep:159
+#: themes/default/templates/index.html.ep:115 themes/default/templates/index.html.ep:147 themes/default/templates/index.html.ep:178 themes/default/templates/myfiles.html.ep:53 themes/default/templates/partial/lutim.js.ep:160
 msgid "Delete at first view?"
 msgstr ""
 
-#: lib/Lutim/Command/cron/stats.pm:145
+#: lib/Lutim/Command/cron/stats.pm:145 themes/default/templates/raw.html.ep:4
 msgid "Deleted images"
 msgstr ""
 
-#: lib/Lutim/Command/cron/stats.pm:146
+#: lib/Lutim/Command/cron/stats.pm:146 themes/default/templates/raw.html.ep:5
 msgid "Deleted images in 30 days"
 msgstr ""
 
@@ -192,7 +192,7 @@ msgstr ""
 msgid "Image URL"
 msgstr ""
 
-#: lib/Lutim/Command/cron/stats.pm:143
+#: lib/Lutim/Command/cron/stats.pm:143 themes/default/templates/raw.html.ep:2
 msgid "Image delay"
 msgstr ""
 
@@ -232,7 +232,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: themes/default/templates/index.html.ep:118 themes/default/templates/index.html.ep:166 themes/default/templates/index.html.ep:206 themes/default/templates/partial/lutim.js.ep:163
+#: themes/default/templates/index.html.ep:118 themes/default/templates/index.html.ep:166 themes/default/templates/index.html.ep:206 themes/default/templates/partial/lutim.js.ep:164
 msgid "Let's go!"
 msgstr ""
 
@@ -309,7 +309,7 @@ msgstr ""
 msgid "Share it!"
 msgstr ""
 
-#: themes/default/templates/index.html.ep:133 themes/default/templates/partial/lutim.js.ep:174
+#: themes/default/templates/index.html.ep:133 themes/default/templates/partial/lutim.js.ep:175
 msgid "Something bad happened"
 msgstr ""
 
@@ -362,7 +362,7 @@ msgstr ""
 #. ($tx->res->max_message_size)
 #. ($c->req->max_message_size)
 #. (config('max_file_size')
-#: lib/Lutim/Controller.pm:309 lib/Lutim/Controller.pm:378 themes/default/templates/partial/lutim.js.ep:240
+#: lib/Lutim/Controller.pm:309 lib/Lutim/Controller.pm:378 themes/default/templates/partial/lutim.js.ep:241
 msgid "The file exceed the size limit (%1)"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""
 
-#: lib/Lutim/Command/cron/stats.pm:152
+#: lib/Lutim/Command/cron/stats.pm:152 themes/default/templates/raw.html.ep:11
 msgid "Total"
 msgstr ""
 
@@ -495,7 +495,7 @@ msgstr ""
 msgid "core developer"
 msgstr ""
 
-#: lib/Lutim.pm:183 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:158 lib/Lutim/Command/cron/stats.pm:175 themes/default/templates/index.html.ep:3
+#: lib/Lutim.pm:184 lib/Lutim/Command/cron/stats.pm:147 lib/Lutim/Command/cron/stats.pm:158 lib/Lutim/Command/cron/stats.pm:175 themes/default/templates/index.html.ep:3 themes/default/templates/raw.html.ep:17 themes/default/templates/raw.html.ep:34 themes/default/templates/raw.html.ep:6
 msgid "no time limit"
 msgstr ""
 
diff --git a/zanata.xml b/zanata.xml
new file mode 100644
index 0000000..1745500
--- /dev/null
+++ b/zanata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns="http://zanata.org/namespace/config/">
+  <url>https://trad.framasoft.org/zanata/</url>
+  <project>lutim</project>
+  <project-version>development</project-version>
+  <project-type>gettext</project-type>
+  <src-dir>themes/default/lib/Lutim/I18N/</src-dir>
+  <trans-dir>themes/default/lib/Lutim/I18N/</trans-dir>
+</config>