[simutrans] 03/03: update translations
Jörg Frings-Fürst
jff-guest at moszumanska.debian.org
Tue Nov 10 05:24:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
jff-guest pushed a commit to branch master
in repository simutrans.
commit cf396c66edbaf41c12aebbbec15f16953412f872
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date: Mon Nov 9 16:38:02 2015 +0100
update translations
---
debian/translations/be.tab | 4 ----
debian/translations/bg.tab | 4 ----
debian/translations/ca.tab | 4 ----
debian/translations/ce.tab | 2 +-
debian/translations/cn.tab | 4 ----
debian/translations/cz.tab | 4 ----
debian/translations/de.tab | 4 ----
debian/translations/dk.tab | 4 ----
debian/translations/en.tab | 4 ----
debian/translations/es.tab | 4 ----
debian/translations/et.tab | 4 ----
debian/translations/fi.tab | 4 ----
debian/translations/fr.tab | 4 ----
debian/translations/gr.tab | 4 ----
debian/translations/hr.tab | 4 ----
debian/translations/hu.tab | 4 ----
debian/translations/id.tab | 4 ----
debian/translations/it.tab | 4 ----
debian/translations/ja.tab | 4 ----
debian/translations/ko.tab | 4 ----
debian/translations/lt.tab | 4 ----
debian/translations/nl.tab | 4 ----
debian/translations/no.tab | 4 ----
debian/translations/pl.tab | 4 ----
debian/translations/pt.tab | 4 ----
debian/translations/ro.tab | 4 ----
debian/translations/ru.tab | 4 ----
debian/translations/sk.tab | 4 ----
debian/translations/sq.tab | 4 ----
debian/translations/sv.tab | 4 ----
debian/translations/th.tab | 4 ----
debian/translations/tr.tab | 4 ----
debian/translations/uk.tab | 4 ----
debian/translations/zh.tab | 4 ----
34 files changed, 1 insertion(+), 133 deletions(-)
diff --git a/debian/translations/be.tab b/debian/translations/be.tab
index 6c6c52d..eba2b37 100644
--- a/debian/translations/be.tab
+++ b/debian/translations/be.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: be Belaruskaja #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/be.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/be.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/bg.tab b/debian/translations/bg.tab
index cc8682d..cf51037 100644
--- a/debian/translations/bg.tab
+++ b/debian/translations/bg.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: bg Bulgarian #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/bg.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/bg.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/ca.tab b/debian/translations/ca.tab
index 2ba9dfb..1725a06 100644
--- a/debian/translations/ca.tab
+++ b/debian/translations/ca.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: ca Catala #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/ca.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/ca.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/ce.tab b/debian/translations/ce.tab
index 2008135..e2c2ece 100644
--- a/debian/translations/ce.tab
+++ b/debian/translations/ce.tab
@@ -8,7 +8,7 @@ Prop-Latin1.bdf
# Language: ce C-English #
# Encoding: ASCII #
# Font : Prop-Latin1.bdf #
-# Date Created: 3.10 2015 #
+# Date Created: 25.10 2015 #
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/cn.tab b/debian/translations/cn.tab
index 7f3be44..07be3cd 100644
--- a/debian/translations/cn.tab
+++ b/debian/translations/cn.tab
@@ -8,11 +8,7 @@ wenquanyi_9pt.bdf
# Language: cn Sim. Chinese #
# Encoding: UTF-8 #
# Font : wenquanyi_9pt.bdf #
-<<<<<<< HEAD:debian/translations/cn.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/cn.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/cz.tab b/debian/translations/cz.tab
index 63a9050..6e4683d 100644
--- a/debian/translations/cz.tab
+++ b/debian/translations/cz.tab
@@ -8,11 +8,7 @@ prop-latin2.fnt
# Language: cz Cestina #
# Encoding: ISO-8859-2 #
# Font : prop-latin2.fnt #
-<<<<<<< HEAD:debian/translations/cz.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/cz.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/de.tab b/debian/translations/de.tab
index efdb26a..0bf7515 100644
--- a/debian/translations/de.tab
+++ b/debian/translations/de.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: de Deutsch #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/de.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 27.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/de.tab
# #
# authors: #
# Alexander Brose - AlexB #
diff --git a/debian/translations/dk.tab b/debian/translations/dk.tab
index db15ebe..4b2e616 100644
--- a/debian/translations/dk.tab
+++ b/debian/translations/dk.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: dk Dansk #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/dk.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/dk.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/en.tab b/debian/translations/en.tab
index 7303ebd..6418e91 100644
--- a/debian/translations/en.tab
+++ b/debian/translations/en.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: en English #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/en.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 27.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/en.tab
# #
# authors: #
# Alexander Brose - AlexB #
diff --git a/debian/translations/es.tab b/debian/translations/es.tab
index 8831e7a..3be0b42 100644
--- a/debian/translations/es.tab
+++ b/debian/translations/es.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: es Espanol #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/es.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/es.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/et.tab b/debian/translations/et.tab
index f6a0010..875d9fa 100644
--- a/debian/translations/et.tab
+++ b/debian/translations/et.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: et Eesti #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/et.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/et.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/fi.tab b/debian/translations/fi.tab
index 9e3bc49..c6e5446 100644
--- a/debian/translations/fi.tab
+++ b/debian/translations/fi.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: fi Suomi #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/fi.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/fi.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/fr.tab b/debian/translations/fr.tab
index 6346a8a..a3bd64d 100644
--- a/debian/translations/fr.tab
+++ b/debian/translations/fr.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: fr Francais #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/fr.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 27.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/fr.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/gr.tab b/debian/translations/gr.tab
index a9164f0..8663cc4 100644
--- a/debian/translations/gr.tab
+++ b/debian/translations/gr.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: gr Ellinika #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/gr.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/gr.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/hr.tab b/debian/translations/hr.tab
index 849ff13..b7a08c0 100644
--- a/debian/translations/hr.tab
+++ b/debian/translations/hr.tab
@@ -8,11 +8,7 @@ prop-latin2.fnt
# Language: hr Hrvatski #
# Encoding: ISO-8859-2 #
# Font : prop-latin2.fnt #
-<<<<<<< HEAD:debian/translations/hr.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/hr.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/hu.tab b/debian/translations/hu.tab
index 5c0deb6..3c3c1e8 100644
--- a/debian/translations/hu.tab
+++ b/debian/translations/hu.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: hu Magyar #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/hu.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/hu.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/id.tab b/debian/translations/id.tab
index d03061b..3958b4b 100644
--- a/debian/translations/id.tab
+++ b/debian/translations/id.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: id Indonesia #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/id.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/id.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/it.tab b/debian/translations/it.tab
index 7ae456a..d3f33bf 100644
--- a/debian/translations/it.tab
+++ b/debian/translations/it.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: it Italiano #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/it.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/it.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/ja.tab b/debian/translations/ja.tab
index a99563a..700283a 100644
--- a/debian/translations/ja.tab
+++ b/debian/translations/ja.tab
@@ -8,11 +8,7 @@ m+10r.bdf
# Language: ja Japanese #
# Encoding: UTF-8 #
# Font : m+10r.bdf #
-<<<<<<< HEAD:debian/translations/ja.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 27.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/ja.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/ko.tab b/debian/translations/ko.tab
index a8b96d7..0092e88 100644
--- a/debian/translations/ko.tab
+++ b/debian/translations/ko.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: ko Korean #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/ko.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/ko.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/lt.tab b/debian/translations/lt.tab
index 7624463..3c13728 100644
--- a/debian/translations/lt.tab
+++ b/debian/translations/lt.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: lt Lithuanian #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/lt.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/lt.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/nl.tab b/debian/translations/nl.tab
index c9cb5d8..7487df0 100644
--- a/debian/translations/nl.tab
+++ b/debian/translations/nl.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: nl Nederlands #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/nl.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/nl.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/no.tab b/debian/translations/no.tab
index 94e3924..5c22fc8 100644
--- a/debian/translations/no.tab
+++ b/debian/translations/no.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: no Norsk #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/no.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/no.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/pl.tab b/debian/translations/pl.tab
index a2aa05d..1ee1f2d 100644
--- a/debian/translations/pl.tab
+++ b/debian/translations/pl.tab
@@ -8,11 +8,7 @@ prop-latin2.fnt
# Language: pl Polski #
# Encoding: ISO-8859-2 #
# Font : prop-latin2.fnt #
-<<<<<<< HEAD:debian/translations/pl.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/pl.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/pt.tab b/debian/translations/pt.tab
index 4c78f25..90804a1 100644
--- a/debian/translations/pt.tab
+++ b/debian/translations/pt.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: pt Portugues #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/pt.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/pt.tab
# #
# authors: #
# Adilson - Adilson #
diff --git a/debian/translations/ro.tab b/debian/translations/ro.tab
index 92a8a20..fa44a90 100644
--- a/debian/translations/ro.tab
+++ b/debian/translations/ro.tab
@@ -8,11 +8,7 @@ prop-latin2.fnt
# Language: ro Romana #
# Encoding: ISO-8859-2 #
# Font : prop-latin2.fnt #
-<<<<<<< HEAD:debian/translations/ro.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/ro.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/ru.tab b/debian/translations/ru.tab
index 14e63db..0db28d2 100644
--- a/debian/translations/ru.tab
+++ b/debian/translations/ru.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: ru Russian #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/ru.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/ru.tab
# #
# authors: #
# Semichenkov Alexander - AleksRevo #
diff --git a/debian/translations/sk.tab b/debian/translations/sk.tab
index 0839eb6..a687914 100644
--- a/debian/translations/sk.tab
+++ b/debian/translations/sk.tab
@@ -8,11 +8,7 @@ prop-latin2.fnt
# Language: sk Slovencina #
# Encoding: ISO-8859-2 #
# Font : prop-latin2.fnt #
-<<<<<<< HEAD:debian/translations/sk.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/sk.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/sq.tab b/debian/translations/sq.tab
index 01efbc9..46051c5 100644
--- a/debian/translations/sq.tab
+++ b/debian/translations/sq.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: sq Albanian #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/sq.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/sq.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/sv.tab b/debian/translations/sv.tab
index 41bef92..8de636f 100644
--- a/debian/translations/sv.tab
+++ b/debian/translations/sv.tab
@@ -8,11 +8,7 @@ Prop-Latin1.bdf
# Language: sv Svenska #
# Encoding: ISO-8859-1 #
# Font : Prop-Latin1.bdf #
-<<<<<<< HEAD:debian/translations/sv.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/sv.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/th.tab b/debian/translations/th.tab
index 7d5a530..2e32ef4 100644
--- a/debian/translations/th.tab
+++ b/debian/translations/th.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: th Thai #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/th.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/th.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/tr.tab b/debian/translations/tr.tab
index 1ff9b95..c900f34 100644
--- a/debian/translations/tr.tab
+++ b/debian/translations/tr.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: tr Turkish #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/tr.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/tr.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/uk.tab b/debian/translations/uk.tab
index 0c555ba..8719baa 100644
--- a/debian/translations/uk.tab
+++ b/debian/translations/uk.tab
@@ -8,11 +8,7 @@ cyr.bdf
# Language: uk Ukrainian #
# Encoding: UTF-8 #
# Font : cyr.bdf #
-<<<<<<< HEAD:debian/translations/uk.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/uk.tab
# #
# authors: #
# - An_dz #
diff --git a/debian/translations/zh.tab b/debian/translations/zh.tab
index 9944b97..2d31f4d 100644
--- a/debian/translations/zh.tab
+++ b/debian/translations/zh.tab
@@ -8,11 +8,7 @@ wenquanyi_9pt.bdf
# Language: zh T. Chinese #
# Encoding: UTF-8 #
# Font : wenquanyi_9pt.bdf #
-<<<<<<< HEAD:debian/translations/zh.tab
-# Date Created: 3.10 2015 #
-=======
# Date Created: 25.10 2015 #
->>>>>>> upstream/120.1.1:simutrans/text/zh.tab
# #
# authors: #
# - An_dz #
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git
More information about the Pkg-games-commits
mailing list