[Commits] r22554 - in /branches/eglibc-2_17: ./ libc/ libc/po/ libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/ libc/po...

[joseph@xxxxxxxxxx]

Author: joseph
Date: Sun Mar  3 17:21:28 2013
New Revision: 22554

Log:
Merge changes between r22242 and r22553 from /fsf/glibc-2_17-branch.

Modified:
    branches/eglibc-2_17/   (props changed)
    branches/eglibc-2_17/libc/ChangeLog
    branches/eglibc-2_17/libc/po/de.po
    branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data   (props changed)
    branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data   (props changed)
    branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data   (props changed)
    branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data   (props changed)

Propchange: branches/eglibc-2_17/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  3 17:21:28 2013
@@ -1,2 +1,2 @@
-/fsf/glibc-2_17-branch:22054-22242
+/fsf/glibc-2_17-branch:22054-22553
 /fsf/trunk:15224-22029

Modified: branches/eglibc-2_17/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_17/libc/ChangeLog (original)
+++ branches/eglibc-2_17/libc/ChangeLog Sun Mar  3 17:21:28 2013
@@ -1,3 +1,7 @@
+2013-01-31  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* po/de.po: Update from translation team.
+
 2013-01-11  Andreas Jaeger  <aj@xxxxxxx>
 
 	[BZ #15003]

Modified: branches/eglibc-2_17/libc/po/de.po
==============================================================================
--- branches/eglibc-2_17/libc/po/de.po (original)
+++ branches/eglibc-2_17/libc/po/de.po Sun Mar  3 17:21:28 2013
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNU libc 2.17-pre1\n"
 "POT-Creation-Date: 2012-12-07 15:10-0500\n"
-"PO-Revision-Date: 2012-12-08 15:07+0100\n"
+"PO-Revision-Date: 2013-01-31 07:16+0100\n"
 "Last-Translator: Jochen Hein <jochen@xxxxxxxxxx>\n"
 "Language-Team: German <translation-team-de@xxxxxxxxxxxxxxxxxxxxx>\n"
 "Language: de\n"
@@ -791,7 +791,7 @@
 #: elf/ldconfig.c:409
 #, c-format
 msgid "Can't stat %s"
-msgstr "Kann ÃÂstat()ÃÂ fÃÂr ÃÂ%sÃÂ nicht aufrufenen"
+msgstr "Kann ÃÂstat()ÃÂ fÃÂr ÃÂ%sÃÂ nicht aufrufen"
 
 #: elf/ldconfig.c:483
 #, c-format

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  3 17:21:28 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-22242
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:22054-22553
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v2-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:19921-22029

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  3 17:21:28 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-22242
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:22054-22553
 /fsf/trunk/libc/ports/data/localplt-powerpce500v2-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:19921-22029

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  3 17:21:28 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-22242
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:22054-22553
 /fsf/trunk/libc/ports/data/c++-types-powerpce500v1-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:19921-22029

Propchange: branches/eglibc-2_17/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar  3 17:21:28 2013
@@ -1,3 +1,3 @@
-/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-22242
+/fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:22054-22553
 /fsf/trunk/libc/ports/data/localplt-powerpce500v1-linux-gnu.data:15224-19464
 /fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:19921-22029

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits