From: Frederic Marchal Date: Fri, 25 Jan 2013 21:31:45 +0000 (+0100) Subject: Remove merge tags from the po files X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=831481b5671b542070a9903cfb097d9ba0a02b2b;p=thirdparty%2Fsarg.git Remove merge tags from the po files A merge conflict in the po files must have gone unnoticed and the conflict tags were committed. They have now been removed. --- diff --git a/po/bg.po b/po/bg.po index e10cdfe..50dc688 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index 31bacb8..829dd76 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index fd10776..a2dc80c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/de.po b/po/de.po index 615932c..32cb927 100644 --- a/po/de.po +++ b/po/de.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/el.po b/po/el.po index e142cfb..eb7ae18 100644 --- a/po/el.po +++ b/po/el.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/es.po b/po/es.po index 0bc44a5..98bfad0 100644 --- a/po/es.po +++ b/po/es.po @@ -1537,11 +1537,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index fb11fa8..82ef54a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/id.po b/po/id.po index 77afa13..68db3ae 100644 --- a/po/id.po +++ b/po/id.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/it.po b/po/it.po index c335d92..07f5006 100644 --- a/po/it.po +++ b/po/it.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 3422fd3..87a37ef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/lv.po b/po/lv.po index 2822e26..5e2ac0c 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1540,11 +1540,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/nl.po b/po/nl.po index 43c3f96..ce123a7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1538,11 +1538,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 6f44aaa..925152b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1547,15 +1547,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:752 ->>>>>>> origin/v2.3 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 382c99b..eebf30e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index 8188822..a3d651e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index b1ccff3..e8f7640 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1509,11 +1509,7 @@ msgstr "Версия sarg: %s\n" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index f9c7298..78a9f37 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/sr.po b/po/sr.po index f790d0c..0a445dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index b90bd87..ee8961f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1536,11 +1536,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index 9257eaa..3f03cb0 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1535,11 +1535,7 @@ msgstr "" msgid "Sarg compiled to report warnings if the output is inconsistent\n" msgstr "" -<<<<<<< HEAD #: log.c:740 -======= -#: log.c:761 ->>>>>>> origin/v2.3 #, c-format msgid "setrlimit error - %s\n" msgstr ""