From 3f50f5a34f9fccf1a57b0b409b8aba9644bb4624 Mon Sep 17 00:00:00 2001
From: pkgsrc fixup <pkgsrc@dragonflybsd.org>
Date: Sat, 13 Apr 2013 14:58:47 -0700
Subject: [PATCH] Fixup fromcvs/togit conversion

---
 doc/CHANGES-2013                                   |  5 +-
 emulators/Cygne-SDL/Makefile                       | 14 ++--
 emulators/Cygne-SDL/distinfo                       | 11 +--
 emulators/Cygne-SDL/patches/patch-aa               | 23 +++---
 emulators/Cygne-SDL/patches/patch-ab               |  5 +-
 emulators/Cygne-SDL/patches/patch-ac               | 57 +++++++++++++--
 emulators/Cygne-SDL/patches/patch-ad               |  4 +-
 emulators/Cygne-SDL/patches/patch-src_mainsdl.cpp  | 31 ++++++++
 emulators/palmosemulator/Makefile                  |  4 +-
 graphics/gle/Makefile                              | 13 +++-
 graphics/gle/distinfo                              |  3 +-
 graphics/gle/patches/patch-configure               | 15 ++++
 sysutils/ansible/Makefile                          |  5 +-
 sysutils/ansible/PLIST                             | 73 ++++++++++++++++++-
 sysutils/ansible/distinfo                          | 37 +++++-----
 sysutils/ansible/patches/patch-Makefile            | 30 --------
 .../patches/patch-docs_man_man1_ansible-playbook.1 |  6 +-
 .../ansible/patches/patch-docs_man_man1_ansible.1  | 18 ++---
 .../ansible/patches/patch-lib_ansible_callbacks.py | 12 ++--
 .../ansible/patches/patch-lib_ansible_constants.py |  8 +--
 sysutils/ansible/patches/patch-library_lineinfile  | 12 ----
 sysutils/ansible/patches/patch-library_mysql_db    | 40 +++++------
 sysutils/ansible/patches/patch-library_pkgin       | 26 +++----
 sysutils/ansible/patches/patch-library_service     | 70 ------------------
 sysutils/ansible/patches/patch-library_setup       | 30 ++++----
 sysutils/ansible/patches/patch-library_virt        | 29 ++++----
 x11/kde4-l10n-wa/PLIST                             | 17 +----
 x11/kde4-l10n-wa/distinfo                          |  8 +--
 x11/kde4-l10n-zh_CN/PLIST                          | 79 ++++++++++++--------
 x11/kde4-l10n-zh_CN/distinfo                       |  8 +--
 x11/kde4-l10n-zh_TW/PLIST                          | 83 ++++++++++++++--------
 x11/kde4-l10n-zh_TW/distinfo                       |  8 +--
 32 files changed, 440 insertions(+), 344 deletions(-)
 create mode 100644 emulators/Cygne-SDL/patches/patch-src_mainsdl.cpp
 create mode 100644 graphics/gle/patches/patch-configure
 rewrite sysutils/ansible/distinfo (78%)
 delete mode 100644 sysutils/ansible/patches/patch-Makefile
 delete mode 100644 sysutils/ansible/patches/patch-library_lineinfile
 rewrite sysutils/ansible/patches/patch-library_mysql_db (74%)
 rewrite sysutils/ansible/patches/patch-library_pkgin (94%)
 delete mode 100644 sysutils/ansible/patches/patch-library_service
 rewrite sysutils/ansible/patches/patch-library_virt (63%)

diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013
index 34219946dd5..be7571aedca 100644
--- a/doc/CHANGES-2013
+++ b/doc/CHANGES-2013
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2013,v 1.1333 2013/04/13 14:42:57 wen Exp $
+$NetBSD: CHANGES-2013,v 1.1336 2013/04/13 19:06:44 rodent Exp $
 
 Changes to the packages collection and infrastructure in 2013:
 
@@ -2115,3 +2115,6 @@ Changes to the packages collection and infrastructure in 2013:
 	Updated devel/p5-Moo to 1.001000 [wen 2013-04-13]
 	Updated devel/py-pip to 1.3.1 [wen 2013-04-13]
 	Added audio/vcf version 0.0.5 [rodent 2013-04-13]
+	Updated x11/kde4-l10n-zh_TW to 4.10.2 [rodent 2013-04-13]
+	Updated x11/kde4-l10n-zh_CN to 4.10.2 [rodent 2013-04-13]
+	Updated x11/kde4-l10n-wa to 4.10.2 [rodent 2013-04-13]
diff --git a/emulators/Cygne-SDL/Makefile b/emulators/Cygne-SDL/Makefile
index 433a5aed06e..1c6f62ef125 100644
--- a/emulators/Cygne-SDL/Makefile
+++ b/emulators/Cygne-SDL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2012/04/14 03:47:37 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2012/10/03 12:55:08 asau Exp $
 #
 
 DISTNAME=		Cygne-SDL-0.1-src
 PKGNAME=		${DISTNAME:S/-src//}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		emulators
 MASTER_SITES=		http://sdlemu.ngemu.com/OpenProjects/
 
@@ -11,7 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://icculus.org/Cygne-SDL/
 COMMENT=		Bandai Wonderswan Color handheld emulator
 
-BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
+# The makefile mentions nasm but does not actually use it.
+#BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 
 WRKSRC=			${WRKDIR}/Cygne-SDL-0.1
 MAKE_FILE=		Makefiles/Makefile.unix
@@ -20,10 +21,7 @@ BUILD_DIRS=		src
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		zip
 
-# Uses i386 assembly code
-ONLY_FOR_PLATFORM=	*-*-i386
-
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/Cygne-SDL share/doc/Cygne-SDL
 
 post-build:
 	cd ${WRKSRC}/WonderSnake && \
@@ -31,9 +29,7 @@ post-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cygne ${DESTDIR}${PREFIX}/bin/Cygne-SDL
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/Cygne-SDL
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/Cygne-SDL
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/Cygne-SDL
 	${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.txt \
 		${DESTDIR}${PREFIX}/share/Cygne-SDL
 	${INSTALL_DATA} ${WRKSRC}/WonderSnake/Wondersnake.zip \
diff --git a/emulators/Cygne-SDL/distinfo b/emulators/Cygne-SDL/distinfo
index 472a1693e10..cca5a3b614a 100644
--- a/emulators/Cygne-SDL/distinfo
+++ b/emulators/Cygne-SDL/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:17 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/11/03 21:38:04 rillig Exp $
 
 SHA1 (Cygne-SDL-0.1-src.tar.gz) = f9c50702d1911d0ff1728e5aa089e67cfdfd0030
 RMD160 (Cygne-SDL-0.1-src.tar.gz) = 6d9fd7195a936f17fc3984a66722272c7e30991a
 Size (Cygne-SDL-0.1-src.tar.gz) = 106448 bytes
-SHA1 (patch-aa) = ee9dd0b364d278a45f2ac8d038b43aaf8f0c5c96
-SHA1 (patch-ab) = faff74d577fb243635a3aed7e6c17132bc43fe07
-SHA1 (patch-ac) = b8037825c79bd36aa65bf18745a3b09470b34ec0
-SHA1 (patch-ad) = 1bf79e577e70d13fb3032d331235dcd6e2d611f2
+SHA1 (patch-aa) = 65f8a9b50150dbbb65f20999e457ef31ff196c9b
+SHA1 (patch-ab) = 775f303626193bec32d2964ad7c63e528bc831b3
+SHA1 (patch-ac) = 5d73fc40a43a83aff312a86e077f28b1d52955c9
+SHA1 (patch-ad) = 0869496464d90d3b6db932d0279e4ac1328a3332
+SHA1 (patch-src_mainsdl.cpp) = 53cceb4a6b2b9c36b64414e8be621b0baa9470d1
diff --git a/emulators/Cygne-SDL/patches/patch-aa b/emulators/Cygne-SDL/patches/patch-aa
index fa29bea635b..bb14d91a6a0 100644
--- a/emulators/Cygne-SDL/patches/patch-aa
+++ b/emulators/Cygne-SDL/patches/patch-aa
@@ -1,26 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2004/11/02 02:22:22 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/03 21:38:04 rillig Exp $
 
---- src/Makefiles/Makefile.unix.orig	2002-03-26 17:50:55.000000000 +0100
+- configure for pkgsrc
+- avoid unnecessary gmake syntax
+
+--- src/Makefiles/Makefile.unix.orig	2002-03-26 16:50:55.000000000 +0000
 +++ src/Makefiles/Makefile.unix
-@@ -1,5 +1,4 @@
+@@ -1,24 +1,15 @@
 -CC = gcc
 -LD = gcc 
 +#LD = g++
  NASM = nasm
  
  ### Include and lib stuff ####
-@@ -8,17 +7,13 @@ STDLIB     = /usr/lib 
- SDLINCLUDE = /usr/local/include/SDL
- SDLLIB	   = /usr/local/lib
- 
+-STDINCLUDE = /usr/include
+-STDLIB     = /usr/lib 
+-SDLINCLUDE = /usr/local/include/SDL
+-SDLLIB	   = /usr/local/lib
+-
 -CFLAGS = -O1 -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ -fomit-frame-pointer -march=pentium \
 -         -mpentium -finline-functions -fexpensive-optimizations -funroll-loops -funroll-all-loops -pipe \
 -         -fschedule-insns2 -fstrength-reduce -malign-double -mfancy-math-387 -ffast-math -fforce-addr \
 -         -fforce-mem `sdl-config --cflags` \
 -         -L$(STDLIB) -L$(SDLLIB) -I$(STDINCLUDE) -I$(SDLINCLUDE)
-+CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__
  
 -LDFLAGS = $(CFLAGS)
++CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__
++
 +LDFLAGS += `sdl-config --libs`
  
  TARGET = cygne
@@ -30,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2004/11/02 02:22:22 dillo Exp $
  
  LIBS = `sdl-config --libs` -lz
  
-@@ -28,17 +23,22 @@ INCS = -I. `sdl-config --cflags`
+@@ -28,17 +19,22 @@ INCS = -I. `sdl-config --cflags`
  
  THECC = $(CC) $(CFLAGS) $(INCS)
  
diff --git a/emulators/Cygne-SDL/patches/patch-ab b/emulators/Cygne-SDL/patches/patch-ab
index e3cb9093d31..4bd60d7a203 100644
--- a/emulators/Cygne-SDL/patches/patch-ab
+++ b/emulators/Cygne-SDL/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/11/03 21:38:04 rillig Exp $
+
+- Fix C syntax (string constants continued onto the next line must
+have a backslash)
 
 --- src/Usage.h.orig	2002-03-26 16:55:20.000000000 +0100
 +++ src/Usage.h
diff --git a/emulators/Cygne-SDL/patches/patch-ac b/emulators/Cygne-SDL/patches/patch-ac
index f34fd2f4080..1e964745bc7 100644
--- a/emulators/Cygne-SDL/patches/patch-ac
+++ b/emulators/Cygne-SDL/patches/patch-ac
@@ -1,20 +1,39 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2005/11/03 21:38:04 rillig Exp $
 
---- src/ddrawsdl.cpp.orig	2002-03-26 16:02:25.000000000 +0100
+- Fix C syntax (string constants continued onto the next line must
+have a backslash)
+
+- Use the asm blocks only on platforms where they're understood.
+Disable the more elaborate blitter modes on other platforms
+until/unless someone wants to write non-asm equivalents.
+
+--- src/ddrawsdl.cpp.orig	2002-03-26 15:02:25.000000000 +0000
 +++ src/ddrawsdl.cpp
-@@ -174,66 +174,66 @@ void UpdateFrame_h()
+@@ -12,6 +12,7 @@
+ */
+ 
+ #include <SDL.h>
++#include <assert.h>
+ #include "globals.h"
+ #include "gfx.h"
+ 
+@@ -174,69 +175,83 @@ void UpdateFrame_h()
  {
  	switch(fBlitterMode) {
  		case 1:
 -			__asm__ __volatile__(".align 32
 -							 cld
 -							 rep
++#if defined(__i386__) || defined(__x86_64__)
 +			__asm__ __volatile__(".align 32\n\
 +							 cld\n\
 +							 rep\n\
  							 movsw"
  							 :
  							 :"S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"((g_pDDSPrimary->h * g_pDDSPrimary->pitch)>>1));
++#else
++			memcpy(g_pDDSPrimary->pixels, dx_buffer, g_pDDSPrimary->h * g_pDDSPrimary->pitch);
++#endif
  		break;
  		case 2:
 -			__asm__ __volatile__("pusha
@@ -40,6 +59,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
 -								 leal (%1, %2, 4), %1
 -								 jnz sum
 -								 emms
++#if defined(__i386__)
 +			__asm__ __volatile__("pusha\n\
 +								 xorl %%eax, %%eax\n\
 +								 movl $448, %%ebx \n\
@@ -66,6 +86,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
  								 popa"
  			:
  			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(144));
++#else
++			/* If you put real code here, enable the corresponding option in main() */
++			assert(0);
++#endif
  		break;
  		
  		case 3:
@@ -92,6 +116,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
 -								 leal (%1, %2, 4), %1
 -								 jnz sum3
 -								 emms
++#if defined(__i386__)
 +			__asm__ __volatile__("pusha\n\
 +								 xorl %%eax, %%eax\n\
 +								 movl $896, %%ebx \n\
@@ -118,19 +143,30 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
  								 popa"
  			:
  			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(144));
-@@ -418,65 +418,65 @@ void UpdateFrame_v()
++#else
++			/* If you put real code here, enable the corresponding option in main() */
++			assert(0);
++#endif
+ 		break;
+ 	}
+ 	//Niels(adjust to suit) use the asm below, or use standard memcpy/fast_memcpy etc, updateframe_v is not implemented
+@@ -418,68 +433,82 @@ void UpdateFrame_v()
  {
  	switch(fBlitterMode) {
  		case 1:
 -			__asm__ __volatile__(".align 32
 -							 cld
 -							 rep
++#if defined(__i386__) || defined(__x86_64__)
 +			__asm__ __volatile__(".align 32\n\
 +							 cld\n\
 +							 rep\n\
  							 movsw"
  							 :
  							 :"S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"((g_pDDSPrimary->h * g_pDDSPrimary->pitch)>>1));
++#else
++			memcpy(g_pDDSPrimary->pixels, dx_buffer, g_pDDSPrimary->h * g_pDDSPrimary->pitch);
++#endif
  		break;
  		case 2: // double scanlines
 -			__asm__ __volatile__("pusha
@@ -156,6 +192,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
 -								 leal (%1, %2, 4), %1
 -								 jnz sumb
 -								 emms
++#if defined(__i386__)
 +			__asm__ __volatile__("pusha\n\
 +								 xorl %%eax, %%eax\n\
 +								 movl $288, %%ebx \n\
@@ -182,6 +219,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
  								 popa"
  			:
  			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(224));
++#else
++			/* If you put real code here, enable the corresponding option in main() */
++			assert(0);
++#endif
  		break;
  		case 3: // double stretch mode
 -			__asm__ __volatile__("pusha
@@ -207,6 +248,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
 -								 leal (%1, %2, 4), %1
 -								 jnz sumc
 -								 emms
++#if defined(__i386__)
 +			__asm__ __volatile__("pusha\n\
 +								 xorl %%eax, %%eax\n\
 +								 movl $576, %%ebx \n\
@@ -233,3 +275,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
  								 popa"
  			:
  			: "S"(dx_buffer), "D"(g_pDDSPrimary->pixels), "c"(g_pDDSPrimary->pitch>>1), "d"(224));
++#else
++			/* If you put real code here, enable the corresponding option in main() */
++			assert(0);
++#endif
+ 		break;
+ 	}
+ 	SDL_Flip(g_pDDSPrimary);
diff --git a/emulators/Cygne-SDL/patches/patch-ad b/emulators/Cygne-SDL/patches/patch-ad
index 7b1ded190a0..a7676d53500 100644
--- a/emulators/Cygne-SDL/patches/patch-ad
+++ b/emulators/Cygne-SDL/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/23 19:01:41 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2005/11/03 21:38:04 rillig Exp $
+
+- Fix build.
 
 --- src/zlib/unzip.h.orig	2002-03-21 19:42:46.000000000 +0100
 +++ src/zlib/unzip.h
diff --git a/emulators/Cygne-SDL/patches/patch-src_mainsdl.cpp b/emulators/Cygne-SDL/patches/patch-src_mainsdl.cpp
new file mode 100644
index 00000000000..ef0c3fe4970
--- /dev/null
+++ b/emulators/Cygne-SDL/patches/patch-src_mainsdl.cpp
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Disable blitter modes 2 and 3 on non-i386 unless/until someone provides
+non-asm code for them (see ddrawsdl.cpp / patch-ac)
+
+--- src/mainsdl.cpp~	2002-03-26 16:12:36.000000000 +0000
++++ src/mainsdl.cpp
+@@ -322,13 +322,23 @@ int main(int argc, char *argv[])
+ 	for (i=0; (i < argc || argv[i] != NULL); i++) {
+ 		
+ 		if(strcmp(argv[i], "-double") == 0) {
++#if defined(__i386__)
+ 			fScreenSize = 2;
+ 			fBlitterMode = 3;
++#else
++			fprintf(stderr, "-double is not supported on this platform\n");
++			exit(1);
++#endif
+ 		}
+ 		
+ 		if(strcmp(argv[i], "-scanline") == 0) {
++#if defined(__i386__)
+ 			fScreenSize = 2;
+ 			fBlitterMode = 2;
++#else
++			fprintf(stderr, "-scanline is not supported on this platform\n");
++			exit(1);
++#endif
+ 		}
+ 		
+ 		if (strncmp(argv[i], "-h", 2) == 0) {
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index e36f9dff8f2..291ca763188 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2013/01/26 21:37:31 adam Exp $
+# $NetBSD: Makefile,v 1.39 2013/02/16 11:21:06 wiz Exp $
 #
 
 DISTNAME=	emulator_src_${POSE_VERSION}
@@ -10,7 +10,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		emulator-skins-19.tar.gz
 
 MAINTAINER=	dsainty@NetBSD.org
-HOMEPAGE=	http://www.palmos.com/dev/tools/emulator/
+#HOMEPAGE=	http://www.palmos.com/dev/tools/emulator/
 COMMENT=	Palm OS Emulator
 #LICENSE=       GPL
 
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 98680062686..d48e2137249 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2009/08/09 22:25:07 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/10/06 14:10:55 asau Exp $
 #
 
 DISTNAME=	gle-3.1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gle/}		\
 		http://www.linas.org/gle/pub/
@@ -17,6 +17,13 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBS+=			-lXext
 
-.include "../../graphics/Mesa/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=      build
+
+# GLUT is used only by the examples, which aren't built or installed.
+#.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gle/distinfo b/graphics/gle/distinfo
index 2919e798977..416fae6ce78 100644
--- a/graphics/gle/distinfo
+++ b/graphics/gle/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/05/11 12:28:34 danw Exp $
+$NetBSD: distinfo,v 1.8 2005/02/24 08:45:06 agc Exp $
 
 SHA1 (gle-3.1.0.tar.gz) = ed6d7332df85357430b249854d4f2753f1228074
 RMD160 (gle-3.1.0.tar.gz) = 49f217cf79ccc3c7e2802ae4347c15498f43db59
@@ -6,3 +6,4 @@ Size (gle-3.1.0.tar.gz) = 806861 bytes
 SHA1 (patch-aa) = 27606906d948c17fb1b40ebe23f8b5f08f3399b4
 SHA1 (patch-ab) = 499d1aed0ec9e9fb40cbde712d1b019cdb7c0fb2
 SHA1 (patch-ac) = 68e29a74fcb082938a0f26e02794574e2663d2b9
+SHA1 (patch-configure) = c1258c83d7a8196f703188400f0f2dc465f1016d
diff --git a/graphics/gle/patches/patch-configure b/graphics/gle/patches/patch-configure
new file mode 100644
index 00000000000..ce28b1bc3c6
--- /dev/null
+++ b/graphics/gle/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- configure~	2013-04-13 20:22:22.000000000 +0000
++++ configure
+@@ -9532,9 +9532,7 @@ echo "${ECHO_T}$ac_cv_lib_glut_glutSwapB
+ if test $ac_cv_lib_glut_glutSwapBuffers = yes; then
+   X_LIBS="-lglut $X_LIBS"
+ else
+-  { { echo "$as_me:$LINENO: error: Cannot find required glut library" >&5
+-echo "$as_me: error: Cannot find required glut library" >&2;}
+-   { (exit 1); exit 1; }; }
++  :
+ fi
+ 
+ 
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index dcc1a01f67a..db38cd9fd84 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2013/04/06 03:45:23 rodent Exp $
+# $NetBSD: Makefile,v 1.6 2013/04/06 11:39:26 rodent Exp $
 #
 
-DISTNAME=	ansible-1.0
-PKGREVISION=	1
+DISTNAME=	ansible-1.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ansible.cc/releases/
 
diff --git a/sysutils/ansible/PLIST b/sysutils/ansible/PLIST
index ee16f59b36c..3ee8b6005f2 100644
--- a/sysutils/ansible/PLIST
+++ b/sysutils/ansible/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/02/26 17:42:59 riz Exp $
+@comment $NetBSD$
 bin/ansible
 bin/ansible-doc
 bin/ansible-playbook
@@ -28,6 +28,9 @@ ${PYSITELIB}/ansible/errors.pyo
 ${PYSITELIB}/ansible/inventory/__init__.py
 ${PYSITELIB}/ansible/inventory/__init__.pyc
 ${PYSITELIB}/ansible/inventory/__init__.pyo
+${PYSITELIB}/ansible/inventory/dir.py
+${PYSITELIB}/ansible/inventory/dir.pyc
+${PYSITELIB}/ansible/inventory/dir.pyo
 ${PYSITELIB}/ansible/inventory/expand_hosts.py
 ${PYSITELIB}/ansible/inventory/expand_hosts.pyc
 ${PYSITELIB}/ansible/inventory/expand_hosts.pyo
@@ -109,6 +112,9 @@ ${PYSITELIB}/ansible/runner/connection.pyo
 ${PYSITELIB}/ansible/runner/connection_plugins/__init__.py
 ${PYSITELIB}/ansible/runner/connection_plugins/__init__.pyc
 ${PYSITELIB}/ansible/runner/connection_plugins/__init__.pyo
+${PYSITELIB}/ansible/runner/connection_plugins/chroot.py
+${PYSITELIB}/ansible/runner/connection_plugins/chroot.pyc
+${PYSITELIB}/ansible/runner/connection_plugins/chroot.pyo
 ${PYSITELIB}/ansible/runner/connection_plugins/fireball.py
 ${PYSITELIB}/ansible/runner/connection_plugins/fireball.pyc
 ${PYSITELIB}/ansible/runner/connection_plugins/fireball.pyo
@@ -142,15 +148,27 @@ ${PYSITELIB}/ansible/runner/lookup_plugins/file.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/fileglob.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/fileglob.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/fileglob.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/first_found.py
+${PYSITELIB}/ansible/runner/lookup_plugins/first_found.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/first_found.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/items.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/items.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/items.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/lines.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/lines.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/lines.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/nested.py
+${PYSITELIB}/ansible/runner/lookup_plugins/nested.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/nested.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/password.py
+${PYSITELIB}/ansible/runner/lookup_plugins/password.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/password.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/pipe.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/pipe.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/pipe.pyo
+${PYSITELIB}/ansible/runner/lookup_plugins/random_choice.py
+${PYSITELIB}/ansible/runner/lookup_plugins/random_choice.pyc
+${PYSITELIB}/ansible/runner/lookup_plugins/random_choice.pyo
 ${PYSITELIB}/ansible/runner/lookup_plugins/redis_kv.py
 ${PYSITELIB}/ansible/runner/lookup_plugins/redis_kv.pyc
 ${PYSITELIB}/ansible/runner/lookup_plugins/redis_kv.pyo
@@ -178,10 +196,10 @@ ${PYSITELIB}/ansible/utils/plugins.pyo
 ${PYSITELIB}/ansible/utils/template.py
 ${PYSITELIB}/ansible/utils/template.pyc
 ${PYSITELIB}/ansible/utils/template.pyo
-man/man1/ansible.1
 man/man1/ansible-doc.1
 man/man1/ansible-playbook.1
 man/man1/ansible-pull.1
+man/man1/ansible.1
 man/man3/ansible.add_host.3
 man/man3/ansible.apt.3
 man/man3/ansible.apt_key.3
@@ -189,31 +207,44 @@ man/man3/ansible.apt_repository.3
 man/man3/ansible.assemble.3
 man/man3/ansible.async_status.3
 man/man3/ansible.authorized_key.3
+man/man3/ansible.bzr.3
+man/man3/ansible.cloudformation.3
 man/man3/ansible.command.3
 man/man3/ansible.copy.3
 man/man3/ansible.cron.3
 man/man3/ansible.debug.3
+man/man3/ansible.django_manage.3
 man/man3/ansible.easy_install.3
 man/man3/ansible.ec2.3
 man/man3/ansible.ec2_facts.3
+man/man3/ansible.ec2_vol.3
 man/man3/ansible.facter.3
 man/man3/ansible.fail.3
 man/man3/ansible.fetch.3
 man/man3/ansible.file.3
 man/man3/ansible.fireball.3
+man/man3/ansible.gem.3
 man/man3/ansible.get_url.3
 man/man3/ansible.git.3
 man/man3/ansible.group.3
 man/man3/ansible.group_by.3
 man/man3/ansible.hg.3
+man/man3/ansible.homebrew.3
 man/man3/ansible.ini_file.3
 man/man3/ansible.lineinfile.3
+man/man3/ansible.lvg.3
+man/man3/ansible.lvol.3
+man/man3/ansible.macports.3
 man/man3/ansible.mail.3
+man/man3/ansible.mongodb_user.3
 man/man3/ansible.mount.3
 man/man3/ansible.mysql_db.3
 man/man3/ansible.mysql_user.3
 man/man3/ansible.nagios.3
+man/man3/ansible.netscaler.3
 man/man3/ansible.ohai.3
+man/man3/ansible.openbsd_pkg.3
+man/man3/ansible.opkg.3
 man/man3/ansible.pacman.3
 man/man3/ansible.pause.3
 man/man3/ansible.ping.3
@@ -221,7 +252,13 @@ man/man3/ansible.pip.3
 man/man3/ansible.pkgin.3
 man/man3/ansible.postgresql_db.3
 man/man3/ansible.postgresql_user.3
+man/man3/ansible.rabbitmq_parameter.3
+man/man3/ansible.rabbitmq_plugin.3
+man/man3/ansible.rabbitmq_user.3
+man/man3/ansible.rabbitmq_vhost.3
 man/man3/ansible.raw.3
+man/man3/ansible.rhn_channel.3
+man/man3/ansible.s3.3
 man/man3/ansible.script.3
 man/man3/ansible.seboolean.3
 man/man3/ansible.selinux.3
@@ -234,10 +271,13 @@ man/man3/ansible.supervisorctl.3
 man/man3/ansible.svr4pkg.3
 man/man3/ansible.sysctl.3
 man/man3/ansible.template.3
+man/man3/ansible.uri.3
 man/man3/ansible.user.3
+man/man3/ansible.vagrant.3
 man/man3/ansible.virt.3
 man/man3/ansible.wait_for.3
 man/man3/ansible.yum.3
+man/man3/ansible.zfs.3
 share/ansible/add_host
 share/ansible/apt
 share/ansible/apt_key
@@ -246,31 +286,44 @@ share/ansible/assemble
 share/ansible/async_status
 share/ansible/async_wrapper
 share/ansible/authorized_key
+share/ansible/bzr
+share/ansible/cloudformation
 share/ansible/command
 share/ansible/copy
 share/ansible/cron
 share/ansible/debug
+share/ansible/django_manage
 share/ansible/easy_install
 share/ansible/ec2
 share/ansible/ec2_facts
+share/ansible/ec2_vol
 share/ansible/facter
 share/ansible/fail
 share/ansible/fetch
 share/ansible/file
 share/ansible/fireball
+share/ansible/gem
 share/ansible/get_url
 share/ansible/git
 share/ansible/group
 share/ansible/group_by
 share/ansible/hg
+share/ansible/homebrew
 share/ansible/ini_file
 share/ansible/lineinfile
+share/ansible/lvg
+share/ansible/lvol
+share/ansible/macports
 share/ansible/mail
+share/ansible/mongodb_user
 share/ansible/mount
 share/ansible/mysql_db
 share/ansible/mysql_user
 share/ansible/nagios
+share/ansible/netscaler
 share/ansible/ohai
+share/ansible/openbsd_pkg
+share/ansible/opkg
 share/ansible/pacman
 share/ansible/pause
 share/ansible/ping
@@ -278,7 +331,13 @@ share/ansible/pip
 share/ansible/pkgin
 share/ansible/postgresql_db
 share/ansible/postgresql_user
+share/ansible/rabbitmq_parameter
+share/ansible/rabbitmq_plugin
+share/ansible/rabbitmq_user
+share/ansible/rabbitmq_vhost
 share/ansible/raw
+share/ansible/rhn_channel
+share/ansible/s3
 share/ansible/script
 share/ansible/seboolean
 share/ansible/selinux
@@ -291,19 +350,25 @@ share/ansible/supervisorctl
 share/ansible/svr4pkg
 share/ansible/sysctl
 share/ansible/template
+share/ansible/uri
 share/ansible/user
+share/ansible/vagrant
 share/ansible/virt
 share/ansible/wait_for
 share/ansible/yum
+share/ansible/zfs
 share/examples/ansible/ansible.cfg
 share/examples/ansible/hosts
 share/examples/ansible/playbooks/ansible_pull.yml
 share/examples/ansible/playbooks/batch_size_control.yml
+share/examples/ansible/playbooks/complex_args.yml
 share/examples/ansible/playbooks/conditionals_part1.yml
 share/examples/ansible/playbooks/conditionals_part2.yml
 share/examples/ansible/playbooks/conditionals_part3.yml
 share/examples/ansible/playbooks/custom_filters.yml
 share/examples/ansible/playbooks/delegation.yml
+share/examples/ansible/playbooks/environment.yml
+share/examples/ansible/playbooks/eucalyptus-ec2.yml
 share/examples/ansible/playbooks/file_secontext.yml
 share/examples/ansible/playbooks/filter_plugins/custom_plugins.py
 share/examples/ansible/playbooks/get_url.yml
@@ -312,12 +377,15 @@ share/examples/ansible/playbooks/group_commands.yml
 share/examples/ansible/playbooks/handlers/handlers.yml
 share/examples/ansible/playbooks/intermediate_example.yml
 share/examples/ansible/playbooks/intro_example.yml
+share/examples/ansible/playbooks/loop_nested.yml
 share/examples/ansible/playbooks/loop_plugins.yml
 share/examples/ansible/playbooks/loop_with_items.yml
 share/examples/ansible/playbooks/mysql.yml
 share/examples/ansible/playbooks/nested_playbooks.yml
+share/examples/ansible/playbooks/netscaler.yml
 share/examples/ansible/playbooks/postgresql.yml
 share/examples/ansible/playbooks/prompts.yml
+share/examples/ansible/playbooks/rabbitmq.yml
 share/examples/ansible/playbooks/register_logic.yml
 share/examples/ansible/playbooks/selective_file_sources.yml
 share/examples/ansible/playbooks/tags.yml
@@ -331,4 +399,5 @@ share/examples/ansible/playbooks/user_commands.yml
 share/examples/ansible/playbooks/vars/CentOS.yml
 share/examples/ansible/playbooks/vars/defaults.yml
 share/examples/ansible/playbooks/vars/external_vars.yml
+share/examples/ansible/playbooks/zfs.yml
 @pkgdir etc/ansible
diff --git a/sysutils/ansible/distinfo b/sysutils/ansible/distinfo
dissimilarity index 78%
index f789bc42617..b114613c6e1 100644
--- a/sysutils/ansible/distinfo
+++ b/sysutils/ansible/distinfo
@@ -1,20 +1,17 @@
-$NetBSD: distinfo,v 1.2 2013/02/26 17:42:59 riz Exp $
-
-SHA1 (ansible-1.0.tar.gz) = 05c28bf696968ae8ef7779f8757b089ef4da6270
-RMD160 (ansible-1.0.tar.gz) = 6526c7588ccf53250601f76e6c3b4d5afcc1beeb
-Size (ansible-1.0.tar.gz) = 222956 bytes
-SHA1 (patch-Makefile) = c7e66169fcfdd130e04e6f6b4fcd9cf16828e27d
-SHA1 (patch-docs_man_man1_ansible-playbook.1) = a7c4a1af3038615922e54f8c683daa0f9d920e0f
-SHA1 (patch-docs_man_man1_ansible.1) = 41fa78147cfa7be140742f1fe781d9f5652f4d8a
-SHA1 (patch-examples_ansible.cfg) = 631236fadaadfd28d71b7bc7cce33e62691ee407
-SHA1 (patch-lib_ansible_callbacks.py) = e75a660e0f89f5a29ab69bea71c50d4e146cd55a
-SHA1 (patch-lib_ansible_constants.py) = 0e6102658553a833b98c79be12340dfccda3e87d
-SHA1 (patch-library_lineinfile) = 36a0cffd048380247644306ac08626869249c770
-SHA1 (patch-library_mysql_db) = ba034677a5f0e4727c37a1e0bbc9cd0314f4c4de
-SHA1 (patch-library_ping) = 6bb9b946df3a44ac938eee7e752bf2149936b8e6
-SHA1 (patch-library_pkgin) = 60f5350fbdb61b859bc562599e1e12636b3f98a9
-SHA1 (patch-library_raw) = 897aa5b8e5abadd23adc6de178cbec417c43e540
-SHA1 (patch-library_service) = 7fd6392b5f283ba5d511182ba9611f589b8a3d28
-SHA1 (patch-library_setup) = a1f396477f60d4e9cb6c2f6b12d1b438f0724392
-SHA1 (patch-library_slurp) = 54a021519554c3eb95daf9396c32d6ec559ddab8
-SHA1 (patch-library_virt) = c53ef028ab29ff9aafe02946e85249e3421a7ab7
+$NetBSD: distinfo,v 1.3 2013/02/27 12:32:06 hubertf Exp $
+
+SHA1 (ansible-1.1.tar.gz) = fa1009e80b624945675bbaba690b895a1ff050fd
+RMD160 (ansible-1.1.tar.gz) = 220dd91db3ab0d6df5dec456448e22d436077f3d
+Size (ansible-1.1.tar.gz) = 302115 bytes
+SHA1 (patch-docs_man_man1_ansible-playbook.1) = 33ce57bccb6cb29e978871a868bf26ca17d87660
+SHA1 (patch-docs_man_man1_ansible.1) = 266a520f8f227686cc84b8a3e9b6fac8e20e1247
+SHA1 (patch-examples_ansible.cfg) = 631236fadaadfd28d71b7bc7cce33e62691ee407
+SHA1 (patch-lib_ansible_callbacks.py) = 607809cf64a676ef91a70b915e97ac87b8ddd31b
+SHA1 (patch-lib_ansible_constants.py) = 51171c84680b18a2d1ff2401cc1fd08e009aa83c
+SHA1 (patch-library_mysql_db) = 45e782d41c3e2bc9e462441205f894e7089d798a
+SHA1 (patch-library_ping) = 6bb9b946df3a44ac938eee7e752bf2149936b8e6
+SHA1 (patch-library_pkgin) = 4b57890efa9145c0b2b68c2c75c990618488d824
+SHA1 (patch-library_raw) = 897aa5b8e5abadd23adc6de178cbec417c43e540
+SHA1 (patch-library_setup) = 7489a5c905916cc1559db15b730a1a93cb782971
+SHA1 (patch-library_slurp) = 54a021519554c3eb95daf9396c32d6ec559ddab8
+SHA1 (patch-library_virt) = b01c7b2d7cd49ad7720d3a1430d7bba41673d2a6
diff --git a/sysutils/ansible/patches/patch-Makefile b/sysutils/ansible/patches/patch-Makefile
deleted file mode 100644
index b32ec997c49..00000000000
--- a/sysutils/ansible/patches/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- Makefile.orig	2012-12-01 02:57:25.000000000 +0000
-+++ Makefile
-@@ -24,7 +24,7 @@ ASCII2MAN = a2x -D $(dir $@) -d manpage 
- ASCII2HTMLMAN = a2x -D docs/html/man/ -d manpage -f xhtml
- MANPAGES := docs/man/man1/ansible.1 docs/man/man1/ansible-playbook.1 docs/man/man1/ansible-pull.1 docs/man/man1/ansible-doc.1
- 
--SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-+SITELIB = $(shell @PYTHONBIN@ -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
- 
- # VERSION file provides one place to update the software version
- VERSION := $(shell cat VERSION)
-@@ -111,13 +111,13 @@ clean:
- 	rm -rf docs/js
- 
- python:
--	python setup.py build
-+	@PYTHONBIN@ setup.py build
- 
- install:
--	python setup.py install
-+	@PYTHONBIN@ setup.py install
- 
- sdist: clean docs
--	python setup.py sdist -t MANIFEST.in
-+	@PYTHONBIN@ setup.py sdist -t MANIFEST.in
- 
- rpmcommon: sdist
- 	@mkdir -p rpm-build
diff --git a/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1 b/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1
index aa78fb56568..6b390191743 100644
--- a/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1
+++ b/sysutils/ansible/patches/patch-docs_man_man1_ansible-playbook.1
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- docs/man/man1/ansible-playbook.1.orig	2013-02-01 19:15:13.000000000 -0800
-+++ docs/man/man1/ansible-playbook.1	2013-02-25 11:45:48.000000000 -0800
+--- docs/man/man1/ansible-playbook.1.orig	2013-04-13 08:48:00.000000000 -0700
++++ docs/man/man1/ansible-playbook.1	2013-04-13 08:50:25.000000000 -0700
 @@ -44,7 +44,7 @@
  The
  \fIPATH\fR
@@ -20,7 +20,7 @@ $NetBSD$
  .RE
  .PP
  \fB\-e\fR \fIVARS\fR, \fB\-\-extra\-vars=\fR\fIVARS\fR
-@@ -122,11 +122,11 @@
+@@ -142,11 +142,11 @@
  ANSIBLE_LIBRARY \(em Override the default ansible module library path
  .SH "FILES"
  .sp
diff --git a/sysutils/ansible/patches/patch-docs_man_man1_ansible.1 b/sysutils/ansible/patches/patch-docs_man_man1_ansible.1
index cd611b80eeb..548884a0eaf 100644
--- a/sysutils/ansible/patches/patch-docs_man_man1_ansible.1
+++ b/sysutils/ansible/patches/patch-docs_man_man1_ansible.1
@@ -1,17 +1,17 @@
 $NetBSD$
 
---- docs/man/man1/ansible.1.orig	2013-02-25 11:49:52.000000000 -0800
-+++ docs/man/man1/ansible.1	2013-02-25 11:50:30.000000000 -0800
-@@ -53,7 +53,7 @@
+--- docs/man/man1/ansible.1.orig	2013-04-13 08:53:23.000000000 -0700
++++ docs/man/man1/ansible.1	2013-04-13 08:55:50.000000000 -0700
+@@ -44,7 +44,7 @@
  The
  \fIPATH\fR
  to the inventory hosts file, which defaults to
 -\fI/etc/ansible/hosts\fR\&.
-+\fI@PKG_SYSCONFDIR@/ansible/hosts\fR\&.
++\fI@PREFIX@/ansible/hosts\fR\&.
  .RE
  .PP
  \fB\-f\fR \fINUM\fR, \fB\-\-forks=\fR\fINUM\fR
-@@ -79,7 +79,7 @@
+@@ -70,7 +70,7 @@
  The
  \fIDIRECTORY\fR
  to load modules from\&. The default is
@@ -19,19 +19,19 @@ $NetBSD$
 +\fI@PREFIX@/share/ansible\fR\&.
  .RE
  .PP
- \fB\-a\fR \*(Aq\fIARGUMENTS\fR\*(Aq, \fB\-\-args=\fR\*(Aq\fIARGUMENTS\fR\*(Aq
-@@ -177,11 +177,11 @@
+ \fB\-a\fR \'\fIARGUMENTS\fR\', \fB\-\-args=\fR\'\fIARGUMENTS\fR\'
+@@ -168,11 +168,11 @@
  Ranges of hosts are also supported\&. For more information and additional options, see the documentation on http://ansible\&.github\&.com/\&.
  .SH "FILES"
  .sp
 -/etc/ansible/hosts \(em Default inventory file
-+@PKG_SYSCONFDIR@/ansible/hosts \(em Default inventory file
++@PREFIX@/ansible/hosts \(em Default inventory file
  .sp
 -/usr/share/ansible/ \(em Default module library
 +@PREFIX@/share/ansible/ \(em Default module library
  .sp
 -/etc/ansible/ansible\&.cfg \(em Config file, used if present
-+@PKG_SYSCONFDIR@/ansible/ansible\&.cfg \(em Config file, used if present
++@PREFIX@/ansible/ansible\&.cfg \(em Config file, used if present
  .sp
  ~/\&.ansible\&.cfg \(em User config file, overrides the default config if present
  .SH "ENVIRONMENT"
diff --git a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
index c0e97117cf8..0e13924b2ff 100644
--- a/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
+++ b/sysutils/ansible/patches/patch-lib_ansible_callbacks.py
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/ansible/callbacks.py.orig	2013-01-26 16:50:21.000000000 +0000
-+++ lib/ansible/callbacks.py
-@@ -31,9 +31,9 @@ elif os.path.exists("/usr/bin/cowsay"):
+--- lib/ansible/callbacks.py.orig	2013-03-30 16:29:28.000000000 -0700
++++ lib/ansible/callbacks.py	2013-04-13 09:05:36.000000000 -0700
+@@ -30,9 +30,9 @@
      cowsay = "/usr/bin/cowsay"
  elif os.path.exists("/usr/games/cowsay"):
      cowsay = "/usr/games/cowsay"
@@ -11,6 +11,6 @@ $NetBSD$
      # BSD path for cowsay
 -    cowsay = "/usr/local/bin/cowsay"
 +    cowsay = "@LOCALBASE@/bin/cowsay"
- 
- def call_callback_module(method_name, *args, **kwargs):
- 
+ elif os.path.exists("/opt/local/bin/cowsay"):
+     # MacPorts path for cowsay
+     cowsay = "/opt/local/bin/cowsay"
diff --git a/sysutils/ansible/patches/patch-lib_ansible_constants.py b/sysutils/ansible/patches/patch-lib_ansible_constants.py
index 63fd7dbfa00..2f4d59cfc26 100644
--- a/sysutils/ansible/patches/patch-lib_ansible_constants.py
+++ b/sysutils/ansible/patches/patch-lib_ansible_constants.py
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- lib/ansible/constants.py.orig	2013-02-01 18:15:55.000000000 -0800
-+++ lib/ansible/constants.py	2013-02-25 11:58:52.000000000 -0800
+--- lib/ansible/constants.py.orig	2013-03-04 13:18:12.000000000 -0800
++++ lib/ansible/constants.py	2013-04-13 09:48:31.000000000 -0700
 @@ -36,7 +36,7 @@
      p = ConfigParser.ConfigParser()
      path1 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg"))
@@ -27,9 +27,9 @@ $NetBSD$
  DEFAULT_MODULE_PATH       = shell_expand_path(get_config(p, DEFAULTS, 'library',          'ANSIBLE_LIBRARY',          DIST_MODULE_PATH))
  DEFAULT_REMOTE_TMP        = shell_expand_path(get_config(p, DEFAULTS, 'remote_tmp',       'ANSIBLE_REMOTE_TEMP',      '$HOME/.ansible/tmp'))
  DEFAULT_MODULE_NAME       = get_config(p, DEFAULTS, 'module_name',      None,                       'command')
-@@ -95,12 +95,12 @@
- DEFAULT_SUDO_FLAGS        = get_config(p, DEFAULTS, 'sudo_flags', 'ANSIBLE_SUDO_FLAGS', '-H')
+@@ -96,12 +96,12 @@
  DEFAULT_HASH_BEHAVIOUR    = get_config(p, DEFAULTS, 'hash_behaviour', 'ANSIBLE_HASH_BEHAVIOUR', 'replace')
+ DEFAULT_JINJA2_EXTENSIONS = get_config(p, DEFAULTS, 'jinja2_extensions', 'ANSIBLE_JINJA2_EXTENSIONS', None)
  
 -DEFAULT_ACTION_PLUGIN_PATH     = shell_expand_path(get_config(p, DEFAULTS, 'action_plugins',     'ANSIBLE_ACTION_PLUGINS', '/usr/share/ansible_plugins/action_plugins'))
 -DEFAULT_CALLBACK_PLUGIN_PATH   = shell_expand_path(get_config(p, DEFAULTS, 'callback_plugins',   'ANSIBLE_CALLBACK_PLUGINS', '/usr/share/ansible_plugins/callback_plugins'))
diff --git a/sysutils/ansible/patches/patch-library_lineinfile b/sysutils/ansible/patches/patch-library_lineinfile
deleted file mode 100644
index 88b00f3c6a2..00000000000
--- a/sysutils/ansible/patches/patch-library_lineinfile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- library/lineinfile.orig	2012-12-23 14:25:38.000000000 +0000
-+++ library/lineinfile
-@@ -82,6 +82,7 @@ options:
-          get the original file back if you somehow clobbered it incorrectly.
- examples:
-    - code: "lineinfile: dest=/etc/selinux/config regexp=^SELINUX= line=SELINUX=disabled"
-+   - code: "lineinfile: \\\"dest=/usr/pkg/etc/sudoers state=present regexp='^%wheel' line ='%wheel ALL=(ALL) NOPASSWD: ALL'\\\""
-    - code: 'lineinfile: dest=/etc/sudoers state=absent regexp="^%wheel"'
- '''
- 
diff --git a/sysutils/ansible/patches/patch-library_mysql_db b/sysutils/ansible/patches/patch-library_mysql_db
dissimilarity index 74%
index 9d5d468b1e2..f58f6da647f 100644
--- a/sysutils/ansible/patches/patch-library_mysql_db
+++ b/sysutils/ansible/patches/patch-library_mysql_db
@@ -1,20 +1,20 @@
-$NetBSD$
-
---- library/mysql_db.orig	2013-01-20 14:03:36.000000000 +0000
-+++ library/mysql_db
-@@ -104,13 +104,13 @@ def db_delete(cursor, db):
-     return True
- 
- def db_dump(user, password, db_name, target):
--    res = os.system("/usr/bin/mysqldump -q -u "+user+ " -p"+password+" "
-+    res = os.system("@LOCALBASE@/bin/mysqldump -q -u "+user+ " -p"+password+" "
-             +db_name+" > "
-             +target)
-     return (res == 0)
- 
- def db_import(user, password, db_name, target):
--    res = os.system("/usr/bin/mysql -u "+user+ " -p"+password+" "
-+    res = os.system("@LOCALBASE@/bin/mysql -u "+user+ " -p"+password+" "
-             +db_name+" < "
-             +target)
-     return (res == 0)
+$NetBSD$
+
+--- library/mysql_db.orig	2013-03-30 16:29:28.000000000 -0700
++++ library/mysql_db	2013-04-13 09:13:23.000000000 -0700
+@@ -109,13 +109,13 @@
+     return True
+ 
+ def db_dump(host, user, password, db_name, target):
+-    res = os.system("/usr/bin/mysqldump -q -h "+host+"-u "+user+ " -p"+password+" "
++    res = os.system("@LOCALBASE@/bin/mysqldump -q -h "+host+"-u "+user+ " -p"+password+" "
+             +db_name+" > "
+             +target)
+     return (res == 0)
+ 
+ def db_import(host, user, password, db_name, target):
+-    res = os.system("/usr/bin/mysql -h "+host+" -u "+user+ " -p"+password+" "
++    res = os.system("@LOCALBASE@/bin/mysql -h "+host+" -u "+user+ " -p"+password+" "
+             +db_name+" < "
+             +target)
+     return (res == 0)
diff --git a/sysutils/ansible/patches/patch-library_pkgin b/sysutils/ansible/patches/patch-library_pkgin
dissimilarity index 94%
index b473f0a643b..4d3e4d0883a 100644
--- a/sysutils/ansible/patches/patch-library_pkgin
+++ b/sysutils/ansible/patches/patch-library_pkgin
@@ -1,13 +1,13 @@
-$NetBSD$
-
---- library/pkgin.orig	2013-02-01 21:29:56.000000000 +0000
-+++ library/pkgin
-@@ -55,7 +55,7 @@ import shlex
- import os
- import sys
- 
--PKGIN_PATH = "/opt/local/bin/pkgin"
-+PKGIN_PATH = "@LOCALBASE@/bin/pkgin"
- 
- def query_package(module, name, state="present"):
- 
+$NetBSD$
+
+--- library/pkgin.orig	2013-03-30 16:29:28.000000000 -0700
++++ library/pkgin	2013-04-13 09:36:29.000000000 -0700
+@@ -118,7 +118,7 @@
+                 state        = dict(default="present", choices=["present","absent"]),
+                 name         = dict(aliases=["pkg"], required=True)))
+ 
+-    pkgin_path = module.get_bin_path('pkgin', True, ['/opt/local/bin'])
++    pkgin_path = module.get_bin_path('pkgin', True, ['@LOCALBASE@/bin'])
+ 
+     p = module.params
+ 
diff --git a/sysutils/ansible/patches/patch-library_service b/sysutils/ansible/patches/patch-library_service
deleted file mode 100644
index 6d2f9e9c2f0..00000000000
--- a/sysutils/ansible/patches/patch-library_service
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-library_service,v 1.1 2013/02/26 00:13:00 hubertf Exp $
-
---- library/service.orig	2013-02-09 19:55:06.000000000 +0000
-+++ library/service
-@@ -551,6 +551,65 @@ class OpenBsdService(Service):
-         return self.execute_command("%s %s" % (self.svc_cmd, self.action))
- 
- # ===========================================
-+# Subclass: NetBSD
-+
-+class NetBsdService(Service):
-+    """
-+    This is the NetBSD Service manipulation class - it uses the /etc/rc.conf
-+    file for controlling services started at boot, check status and perform
-+    direct service manipulation. Init scripts in /etc/rcd are used for
-+    controlling services (start/stop) as well as for controlling the current
-+    state.
-+    """
-+
-+    platform = 'NetBSD'
-+    distribution = None
-+
-+    def get_service_tools(self):
-+        initpaths = [ '/etc/rc.d' ]		# better: $rc_directories - how to get in here? Run: sh -c '. /etc/rc.conf ; echo $rc_directories'
-+
-+        for initdir in initpaths:
-+	    initscript = "%s/%s" % (initdir,self.name)
-+	    if os.path.isfile(initscript):
-+	        self.svc_initscript = initscript
-+
-+        if not self.svc_initscript:
-+            self.module.fail_json(msg='unable to find rc.d script')
-+
-+    def service_enable(self):
-+        if self.enable:
-+            self.rcconf_value = "YES"
-+        else:
-+            self.rcconf_value = "NO"
-+
-+        rcfiles = [ '/etc/rc.conf' ]		# Overkill?
-+        for rcfile in rcfiles:
-+            if os.path.isfile(rcfile):
-+                self.rcconf_file = rcfile
-+        
-+        self.rcconf_key = "%s" % self.name
-+
-+        return self.service_enable_rcconf()
-+
-+    def get_service_status(self):
-+        self.svc_cmd = "%s" % self.svc_initscript
-+        rc, stdout, stderr = self.execute_command("%s %s" % (self.svc_cmd, 'onestatus'))
-+        if rc == 1:
-+            self.running = False
-+        elif rc == 0:
-+            self.running = True
-+
-+    def service_control(self):
-+        if self.action is "start":
-+            self.action = "onestart"
-+        if self.action is "stop":
-+            self.action = "onestop"
-+
-+        self.svc_cmd = "%s" % self.svc_initscript
-+        return self.execute_command("%s %s" % (self.svc_cmd, self.action), daemonize=True)
-+
-+
-+# ===========================================
- # Main control flow
- 
- def main():
diff --git a/sysutils/ansible/patches/patch-library_setup b/sysutils/ansible/patches/patch-library_setup
index 0318694c5cf..1af0b4ffaa9 100644
--- a/sysutils/ansible/patches/patch-library_setup
+++ b/sysutils/ansible/patches/patch-library_setup
@@ -1,26 +1,26 @@
 $NetBSD$
 
---- library/setup.orig	2013-01-26 17:20:45.000000000 +0000
-+++ library/setup
-@@ -34,7 +34,7 @@ options: {}
- description: 
+--- library/setup.orig	2013-04-02 17:33:54.000000000 -0700
++++ library/setup	2013-04-13 09:39:00.000000000 -0700
+@@ -43,7 +43,7 @@
+ description:
       - This module is automatically called by playbooks to gather useful
         variables about remote hosts that can be used in playbooks. It can also be
 -       executed directly by C(/usr/bin/ansible) to check what variables are
 +       executed directly by C(@LOCALBASE@/bin/ansible) to check what variables are
         available to a host. Ansible provides many I(facts) about the system,
         automatically.
- notes: 
-@@ -86,7 +86,7 @@ class Facts(object):
-                  { 'path' : '/usr/bin/apt-get',     'name' : 'apt' },
+ notes:
+@@ -111,7 +111,7 @@
                   { 'path' : '/usr/bin/zypper',      'name' : 'zypper' },
-                  { 'path' : '/usr/bin/pacman',      'name' : 'pacman' }, 
--                 { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' } ]
-+                 { 'path' : '@LOCALBASE@/bin/pkgin', 'name' : 'pkgin' } ]
- 
-     def __init__(self):
-         self.facts = {}
-@@ -875,8 +875,8 @@ def run_setup(module):
+                  { 'path' : '/usr/bin/pacman',      'name' : 'pacman' },
+                  { 'path' : '/bin/opkg',            'name' : 'opkg' },
+-                 { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' },
++                 { 'path' : '@LOCALBASE@/bin/pkgin', 'name' : 'pkgin' },
+                  { 'path' : '/opt/local/bin/port',  'name' : 'macports' },
+                  { 'path' : '/sbin/apk',            'name' : 'apk' }, 
+     ]
+@@ -1531,8 +1531,8 @@
      # if facter is installed, and we can use --json because
      # ruby-json is ALSO installed, include facter data in the JSON
  
@@ -31,7 +31,7 @@ $NetBSD$
          facter = True
          try:
              facter_ds = json.loads(out)
-@@ -890,8 +890,8 @@ def run_setup(module):
+@@ -1546,8 +1546,8 @@
      # because it contains a lot of nested stuff we can't use for
      # templating w/o making a nicer key for it (TODO)
  
diff --git a/sysutils/ansible/patches/patch-library_virt b/sysutils/ansible/patches/patch-library_virt
dissimilarity index 63%
index 766a16c4efa..92b1e4b21f8 100644
--- a/sysutils/ansible/patches/patch-library_virt
+++ b/sysutils/ansible/patches/patch-library_virt
@@ -1,13 +1,16 @@
-$NetBSD$
-
---- library/virt.orig	2012-11-20 02:15:41.000000000 +0000
-+++ library/virt
-@@ -45,7 +45,7 @@ examples:
-    - code: "virt: guest=alpha state=running"
-      description: "Example from Ansible Playbooks"
-    - code: ansible host -m virt -a "guest=alpha command=status"
--     description: "Example guest management with C(/usr/bin/ansible)"
-+     description: "Example guest management with C(@LOCALBASE@/bin/ansible)"
- notes:
-    - "Other non-idempotent commands are: C(status), C(pause), C(unpause),
-      C(get_xml), C(autostart), C(freemem), C(list_vms), C(info), C(nodeinfo),
+$NetBSD$
+
+--- library/virt.orig	2013-04-02 17:33:54.000000000 -0700
++++ library/virt	2013-04-13 09:41:16.000000000 -0700
+@@ -48,9 +48,9 @@
+    - code: "virt: name=alpha state=running"
+      description: "Example from Ansible Playbooks"
+    - code: ansible host -m virt -a "name=alpha command=status"
+-     description: "Example guest management with C(/usr/bin/ansible)"
++     description: "Example guest management with C(@LOCALBASE@/bin/ansible)"
+    - code: ansible host -m virt -a "name=alpha command=get_xml"
+-     description: "Use C(/usr/bin/ansible) to get the xml of the guest machine alpha"
++     description: "Use C(@LOCALBASE@/bin/ansible) to get the xml of the guest machine alpha"
+ requirements: [ "libvirt" ]
+ author: Michael DeHaan, Seth Vidal
+ '''
diff --git a/x11/kde4-l10n-wa/PLIST b/x11/kde4-l10n-wa/PLIST
index 3f1dc120c5e..a5a8676a79b 100644
--- a/x11/kde4-l10n-wa/PLIST
+++ b/x11/kde4-l10n-wa/PLIST
@@ -97,6 +97,7 @@ share/locale/wa/LC_MESSAGES/fsview.mo
 share/locale/wa/LC_MESSAGES/gwenview.mo
 share/locale/wa/LC_MESSAGES/htmlsearch.mo
 share/locale/wa/LC_MESSAGES/imagerename_plugin.mo
+share/locale/wa/LC_MESSAGES/imgalleryplugin.mo
 share/locale/wa/LC_MESSAGES/joystick.mo
 share/locale/wa/LC_MESSAGES/kaccess.mo
 share/locale/wa/LC_MESSAGES/kactivitymanagerd.mo
@@ -105,7 +106,6 @@ share/locale/wa/LC_MESSAGES/kate.mo
 share/locale/wa/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/wa/LC_MESSAGES/kateopenheader.mo
 share/locale/wa/LC_MESSAGES/katepart4.mo
-share/locale/wa/LC_MESSAGES/katequickdocumentswitcherplugin.mo
 share/locale/wa/LC_MESSAGES/kblankscrn.mo
 share/locale/wa/LC_MESSAGES/kbreakout.mo
 share/locale/wa/LC_MESSAGES/kcalc.mo
@@ -124,7 +124,6 @@ share/locale/wa/LC_MESSAGES/kcm_memory.mo
 share/locale/wa/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/wa/LC_MESSAGES/kcm_pci.mo
 share/locale/wa/LC_MESSAGES/kcm_phonon.mo
-share/locale/wa/LC_MESSAGES/kcm_phononxine.mo
 share/locale/wa/LC_MESSAGES/kcm_platform.mo
 share/locale/wa/LC_MESSAGES/kcm_solid.mo
 share/locale/wa/LC_MESSAGES/kcm_solid_actions.mo
@@ -172,7 +171,6 @@ share/locale/wa/LC_MESSAGES/kcmstyle.mo
 share/locale/wa/LC_MESSAGES/kcmusb.mo
 share/locale/wa/LC_MESSAGES/kcmview1394.mo
 share/locale/wa/LC_MESSAGES/kcmworkspaceoptions.mo
-share/locale/wa/LC_MESSAGES/kcmxinerama.mo
 share/locale/wa/LC_MESSAGES/kcolorchooser.mo
 share/locale/wa/LC_MESSAGES/kcron.mo
 share/locale/wa/LC_MESSAGES/kde-menu.mo
@@ -189,18 +187,10 @@ share/locale/wa/LC_MESSAGES/kdmgreet.mo
 share/locale/wa/LC_MESSAGES/kdontchangethehostname.mo
 share/locale/wa/LC_MESSAGES/keditbookmarks.mo
 share/locale/wa/LC_MESSAGES/kfile.mo
-share/locale/wa/LC_MESSAGES/kfile_avi.mo
-share/locale/wa/LC_MESSAGES/kfile_flac.mo
-share/locale/wa/LC_MESSAGES/kfile_mp3.mo
-share/locale/wa/LC_MESSAGES/kfile_mpc.mo
-share/locale/wa/LC_MESSAGES/kfile_ogg.mo
 share/locale/wa/LC_MESSAGES/kfile_pnm.mo
 share/locale/wa/LC_MESSAGES/kfile_raw.mo
 share/locale/wa/LC_MESSAGES/kfile_rgb.mo
 share/locale/wa/LC_MESSAGES/kfile_rpm.mo
-share/locale/wa/LC_MESSAGES/kfile_sid.mo
-share/locale/wa/LC_MESSAGES/kfile_theora.mo
-share/locale/wa/LC_MESSAGES/kfile_wav.mo
 share/locale/wa/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/wa/LC_MESSAGES/kfindpart.mo
 share/locale/wa/LC_MESSAGES/kfloppy.mo
@@ -374,9 +364,9 @@ share/locale/wa/LC_MESSAGES/plasma_applet_netpanel.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_news.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_newspaper.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_notes.mo
-share/locale/wa/LC_MESSAGES/plasma_applet_notifications.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_notifier.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_nowplaying.mo
+share/locale/wa/LC_MESSAGES/plasma_applet_org.kde.notifications.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_pager.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_panel.mo
 share/locale/wa/LC_MESSAGES/plasma_applet_panelspacer_internal.mo
@@ -440,11 +430,8 @@ share/locale/wa/LC_MESSAGES/plasma_toolbox_desktoptoolbox.mo
 share/locale/wa/LC_MESSAGES/plasma_toolbox_paneltoolbox.mo
 share/locale/wa/LC_MESSAGES/plasma_wallpaper_color.mo
 share/locale/wa/LC_MESSAGES/plasma_wallpaper_image.mo
-share/locale/wa/LC_MESSAGES/plasmaengineexplorer.mo
 share/locale/wa/LC_MESSAGES/plasmagenericshell.mo
 share/locale/wa/LC_MESSAGES/plasmapkg.mo
-share/locale/wa/LC_MESSAGES/plasmawallpaperviewer.mo
-share/locale/wa/LC_MESSAGES/plasmoidviewer.mo
 share/locale/wa/LC_MESSAGES/powerdevil.mo
 share/locale/wa/LC_MESSAGES/powerdevilglobalconfig.mo
 share/locale/wa/LC_MESSAGES/powerdevilprofilesconfig.mo
diff --git a/x11/kde4-l10n-wa/distinfo b/x11/kde4-l10n-wa/distinfo
index 238028e3992..a156b6da9f6 100644
--- a/x11/kde4-l10n-wa/distinfo
+++ b/x11/kde4-l10n-wa/distinfo
@@ -1,5 +1,5 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1 2013/04/02 01:01:26 rodent Exp $
 
-SHA1 (kde-l10n-wa-4.8.4.tar.xz) = a7cb53c18329e9514a5c8222fda8a902b5b496ec
-RMD160 (kde-l10n-wa-4.8.4.tar.xz) = e2358edfab72c849ea47d76a069036541254a8d0
-Size (kde-l10n-wa-4.8.4.tar.xz) = 1752044 bytes
+SHA1 (kde-l10n-wa-4.10.2.tar.xz) = c57b66992f86478adcef57fb9be45350b7f3df2e
+RMD160 (kde-l10n-wa-4.10.2.tar.xz) = d63ef0435afa10d8d5ad77c73a265acbbbf1838b
+Size (kde-l10n-wa-4.10.2.tar.xz) = 1743852 bytes
diff --git a/x11/kde4-l10n-zh_CN/PLIST b/x11/kde4-l10n-zh_CN/PLIST
index 25e2b59d205..268ad1f5508 100644
--- a/x11/kde4-l10n-zh_CN/PLIST
+++ b/x11/kde4-l10n-zh_CN/PLIST
@@ -46,12 +46,18 @@ share/locale/zh_CN/LC_MESSAGES/accountwizard_kolab.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_mailbox.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_maildir.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_pop3.mo
+share/locale/zh_CN/LC_MESSAGES/accountwizard_tine20.mo
+share/locale/zh_CN/LC_MESSAGES/activitymanager_plugin_globalshortcuts.mo
+share/locale/zh_CN/LC_MESSAGES/activitymanager_uihandler_declarative.mo
 share/locale/zh_CN/LC_MESSAGES/adblock.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi-filestore.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_ical_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_invitations_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_kabc_resource.mo
@@ -64,11 +70,12 @@ share/locale/zh_CN/LC_MESSAGES/akonadi_kresourceassistant.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_localbookmarks_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_maildir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_maildispatcher_agent.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_mailtransport_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_mbox_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_microblog_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_mixedmaildir_resource.mo
-share/locale/zh_CN/LC_MESSAGES/akonadi_nepomukfeeder.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_nepomuk_feeder.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nepomuktag_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_next.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nntp_resource.mo
@@ -121,6 +128,7 @@ share/locale/zh_CN/LC_MESSAGES/gwenview.mo
 share/locale/zh_CN/LC_MESSAGES/htmlsearch.mo
 share/locale/zh_CN/LC_MESSAGES/imagerename_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/imgalleryplugin.mo
+share/locale/zh_CN/LC_MESSAGES/importwizard.mo
 share/locale/zh_CN/LC_MESSAGES/jovie.mo
 share/locale/zh_CN/LC_MESSAGES/joystick.mo
 share/locale/zh_CN/LC_MESSAGES/juk.mo
@@ -135,6 +143,7 @@ share/locale/zh_CN/LC_MESSAGES/kabcformat_binary.mo
 share/locale/zh_CN/LC_MESSAGES/kaccess.mo
 share/locale/zh_CN/LC_MESSAGES/kaccessibleapp.mo
 share/locale/zh_CN/LC_MESSAGES/kactivitymanagerd.mo
+share/locale/zh_CN/LC_MESSAGES/kactivitymanagerd_fileitem_linking_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/kaddressbook-mobile.mo
 share/locale/zh_CN/LC_MESSAGES/kaddressbook.mo
 share/locale/zh_CN/LC_MESSAGES/kaddressbookmigrator.mo
@@ -150,7 +159,6 @@ share/locale/zh_CN/LC_MESSAGES/kate.mo
 share/locale/zh_CN/LC_MESSAGES/kate_kttsd.mo
 share/locale/zh_CN/LC_MESSAGES/katebacktracebrowserplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katebuild-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/kateexternaltoolsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katefilebrowserplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_CN/LC_MESSAGES/kategdbplugin.mo
@@ -159,9 +167,10 @@ share/locale/zh_CN/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_CN/LC_MESSAGES/katepart4.mo
-share/locale/zh_CN/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+share/locale/zh_CN/LC_MESSAGES/kateproject.mo
 share/locale/zh_CN/LC_MESSAGES/katesearch.mo
 share/locale/zh_CN/LC_MESSAGES/katesnippets_tng.mo
+share/locale/zh_CN/LC_MESSAGES/katesnippetsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katesql.mo
 share/locale/zh_CN/LC_MESSAGES/katesymbolviewer.mo
 share/locale/zh_CN/LC_MESSAGES/katetabbarextension.mo
@@ -183,6 +192,8 @@ share/locale/zh_CN/LC_MESSAGES/kcal_akonadi.mo
 share/locale/zh_CN/LC_MESSAGES/kcalc.mo
 share/locale/zh_CN/LC_MESSAGES/kcertpart.mo
 share/locale/zh_CN/LC_MESSAGES/kcharselect.mo
+share/locale/zh_CN/LC_MESSAGES/kcm-kwin-scripts.mo
+share/locale/zh_CN/LC_MESSAGES/kcm_activities.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_akonadi.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_akonadicontact_actions.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_attica.mo
@@ -200,7 +211,6 @@ share/locale/zh_CN/LC_MESSAGES/kcm_memory.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_pci.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_phonon.mo
-share/locale/zh_CN/LC_MESSAGES/kcm_phononxine.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_platform.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_remotecontrol.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_solid.mo
@@ -254,7 +264,6 @@ share/locale/zh_CN/LC_MESSAGES/kcmstyle.mo
 share/locale/zh_CN/LC_MESSAGES/kcmusb.mo
 share/locale/zh_CN/LC_MESSAGES/kcmview1394.mo
 share/locale/zh_CN/LC_MESSAGES/kcmworkspaceoptions.mo
-share/locale/zh_CN/LC_MESSAGES/kcmxinerama.mo
 share/locale/zh_CN/LC_MESSAGES/kcolorchooser.mo
 share/locale/zh_CN/LC_MESSAGES/kcron.mo
 share/locale/zh_CN/LC_MESSAGES/kde-menu.mo
@@ -277,24 +286,16 @@ share/locale/zh_CN/LC_MESSAGES/kdmgreet.mo
 share/locale/zh_CN/LC_MESSAGES/kdontchangethehostname.mo
 share/locale/zh_CN/LC_MESSAGES/keditbookmarks.mo
 share/locale/zh_CN/LC_MESSAGES/kfile.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_avi.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_dds.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_drgeo.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_exr.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_flac.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_kig.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_mail.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_mp3.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_mpc.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_ogg.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_pnm.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_raw.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_rgb.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_rpm.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_sid.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_theora.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_tiff.mo
-share/locale/zh_CN/LC_MESSAGES/kfile_wav.mo
 share/locale/zh_CN/LC_MESSAGES/kfile_xps.mo
 share/locale/zh_CN/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/zh_CN/LC_MESSAGES/kfilereplace.mo
@@ -327,6 +328,7 @@ share/locale/zh_CN/LC_MESSAGES/kimagemapeditor.mo
 share/locale/zh_CN/LC_MESSAGES/kinetd.mo
 share/locale/zh_CN/LC_MESSAGES/kinfocenter.mo
 share/locale/zh_CN/LC_MESSAGES/kio4.mo
+share/locale/zh_CN/LC_MESSAGES/kio_activities.mo
 share/locale/zh_CN/LC_MESSAGES/kio_akonadi.mo
 share/locale/zh_CN/LC_MESSAGES/kio_applications.mo
 share/locale/zh_CN/LC_MESSAGES/kio_archive.mo
@@ -348,18 +350,21 @@ share/locale/zh_CN/LC_MESSAGES/kio_nfs.mo
 share/locale/zh_CN/LC_MESSAGES/kio_nntp.mo
 share/locale/zh_CN/LC_MESSAGES/kio_perldoc.mo
 share/locale/zh_CN/LC_MESSAGES/kio_pop3.mo
+share/locale/zh_CN/LC_MESSAGES/kio_recentdocuments.mo
 share/locale/zh_CN/LC_MESSAGES/kio_remote.mo
 share/locale/zh_CN/LC_MESSAGES/kio_sftp.mo
 share/locale/zh_CN/LC_MESSAGES/kio_sieve.mo
 share/locale/zh_CN/LC_MESSAGES/kio_smb.mo
 share/locale/zh_CN/LC_MESSAGES/kio_smtp.mo
 share/locale/zh_CN/LC_MESSAGES/kio_svn.mo
+share/locale/zh_CN/LC_MESSAGES/kio_tags.mo
 share/locale/zh_CN/LC_MESSAGES/kio_thumbnail.mo
 share/locale/zh_CN/LC_MESSAGES/kio_timeline.mo
 share/locale/zh_CN/LC_MESSAGES/kio_trash.mo
 share/locale/zh_CN/LC_MESSAGES/kio_zeroconf.mo
 share/locale/zh_CN/LC_MESSAGES/kioclient.mo
 share/locale/zh_CN/LC_MESSAGES/kioexec.mo
+share/locale/zh_CN/LC_MESSAGES/kipiplugin_kxmlhelloworld.mo
 share/locale/zh_CN/LC_MESSAGES/kiriki.mo
 share/locale/zh_CN/LC_MESSAGES/kiten.mo
 share/locale/zh_CN/LC_MESSAGES/kjots.mo
@@ -395,10 +400,12 @@ share/locale/zh_CN/LC_MESSAGES/kollision.mo
 share/locale/zh_CN/LC_MESSAGES/kolourpaint.mo
 share/locale/zh_CN/LC_MESSAGES/kommander.mo
 share/locale/zh_CN/LC_MESSAGES/kompare.mo
+share/locale/zh_CN/LC_MESSAGES/konqprofiles.mo
 share/locale/zh_CN/LC_MESSAGES/konqueror.mo
 share/locale/zh_CN/LC_MESSAGES/konquest.mo
 share/locale/zh_CN/LC_MESSAGES/konsole.mo
 share/locale/zh_CN/LC_MESSAGES/konsolekalendar.mo
+share/locale/zh_CN/LC_MESSAGES/konsoleprofiles.mo
 share/locale/zh_CN/LC_MESSAGES/kontact.mo
 share/locale/zh_CN/LC_MESSAGES/kontactinterfaces.mo
 share/locale/zh_CN/LC_MESSAGES/kopete.mo
@@ -427,12 +434,9 @@ share/locale/zh_CN/LC_MESSAGES/kruler.mo
 share/locale/zh_CN/LC_MESSAGES/krunner.mo
 share/locale/zh_CN/LC_MESSAGES/ksaneplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kscd.mo
+share/locale/zh_CN/LC_MESSAGES/kscreenlocker.mo
+share/locale/zh_CN/LC_MESSAGES/kscreenlocker_greet.mo
 share/locale/zh_CN/LC_MESSAGES/kscreensaver.mo
-share/locale/zh_CN/LC_MESSAGES/ksecrets_kio.mo
-share/locale/zh_CN/LC_MESSAGES/ksecrets_ksecrets.mo
-share/locale/zh_CN/LC_MESSAGES/ksecretsservice_api.mo
-share/locale/zh_CN/LC_MESSAGES/ksecretsserviced.mo
-share/locale/zh_CN/LC_MESSAGES/ksecretsync.mo
 share/locale/zh_CN/LC_MESSAGES/ksendemail.mo
 share/locale/zh_CN/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kshisen.mo
@@ -454,7 +458,6 @@ share/locale/zh_CN/LC_MESSAGES/ksysguard.mo
 share/locale/zh_CN/LC_MESSAGES/ksysguardlsofwidgets.mo
 share/locale/zh_CN/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_CN/LC_MESSAGES/ksystraycmd.mo
-share/locale/zh_CN/LC_MESSAGES/kte_acomment.mo
 share/locale/zh_CN/LC_MESSAGES/kteatime.mo
 share/locale/zh_CN/LC_MESSAGES/ktesnippets_editor.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditor_codesnippets_core.mo
@@ -462,7 +465,9 @@ share/locale/zh_CN/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/ktimer.mo
 share/locale/zh_CN/LC_MESSAGES/ktimetracker.mo
+share/locale/zh_CN/LC_MESSAGES/ktnef.mo
 share/locale/zh_CN/LC_MESSAGES/ktouch.mo
+share/locale/zh_CN/LC_MESSAGES/ktouchpadenabler.mo
 share/locale/zh_CN/LC_MESSAGES/ktraderclient.mo
 share/locale/zh_CN/LC_MESSAGES/ktron.mo
 share/locale/zh_CN/LC_MESSAGES/ktuberling.mo
@@ -482,7 +487,6 @@ share/locale/zh_CN/LC_MESSAGES/kwin_clients.mo
 share/locale/zh_CN/LC_MESSAGES/kwin_effects.mo
 share/locale/zh_CN/LC_MESSAGES/kwinshutdown.mo
 share/locale/zh_CN/LC_MESSAGES/kwinstartmenu.mo
-share/locale/zh_CN/LC_MESSAGES/kwl2kss.mo
 share/locale/zh_CN/LC_MESSAGES/kwordquiz.mo
 share/locale/zh_CN/LC_MESSAGES/kwrite.mo
 share/locale/zh_CN/LC_MESSAGES/kwriteconfig.mo
@@ -510,6 +514,7 @@ share/locale/zh_CN/LC_MESSAGES/libkdepimmobileui.mo
 share/locale/zh_CN/LC_MESSAGES/libkexiv2.mo
 share/locale/zh_CN/LC_MESSAGES/libkholidays.mo
 share/locale/zh_CN/LC_MESSAGES/libkimap.mo
+share/locale/zh_CN/LC_MESSAGES/libkipi.mo
 share/locale/zh_CN/LC_MESSAGES/libkldap.mo
 share/locale/zh_CN/LC_MESSAGES/libkleopatra.mo
 share/locale/zh_CN/LC_MESSAGES/libkmahjongg.mo
@@ -530,6 +535,7 @@ share/locale/zh_CN/LC_MESSAGES/libkworkspace.mo
 share/locale/zh_CN/LC_MESSAGES/libkxmlrpcclient.mo
 share/locale/zh_CN/LC_MESSAGES/liblancelot-datamodels.mo
 share/locale/zh_CN/LC_MESSAGES/libmailcommon.mo
+share/locale/zh_CN/LC_MESSAGES/libmailimporter.mo
 share/locale/zh_CN/LC_MESSAGES/libmailtransport.mo
 share/locale/zh_CN/LC_MESSAGES/libmessagecomposer.mo
 share/locale/zh_CN/LC_MESSAGES/libmessagecore.mo
@@ -538,12 +544,13 @@ share/locale/zh_CN/LC_MESSAGES/libmessageviewer.mo
 share/locale/zh_CN/LC_MESSAGES/liboktetacore.mo
 share/locale/zh_CN/LC_MESSAGES/liboktetagui.mo
 share/locale/zh_CN/LC_MESSAGES/liboktetakasten.mo
+share/locale/zh_CN/LC_MESSAGES/liboxygenstyleconfig.mo
 share/locale/zh_CN/LC_MESSAGES/libphonon.mo
+share/locale/zh_CN/LC_MESSAGES/libpimcommon.mo
 share/locale/zh_CN/LC_MESSAGES/libplasma.mo
 share/locale/zh_CN/LC_MESSAGES/libplasma_groupingcontainment.mo
 share/locale/zh_CN/LC_MESSAGES/libplasmaclock.mo
 share/locale/zh_CN/LC_MESSAGES/libplasmaweather.mo
-share/locale/zh_CN/LC_MESSAGES/librtm.mo
 share/locale/zh_CN/LC_MESSAGES/libtaskmanager.mo
 share/locale/zh_CN/LC_MESSAGES/libtemplateparser.mo
 share/locale/zh_CN/LC_MESSAGES/lokalize.mo
@@ -551,6 +558,7 @@ share/locale/zh_CN/LC_MESSAGES/lskat.mo
 share/locale/zh_CN/LC_MESSAGES/mailreader.mo
 share/locale/zh_CN/LC_MESSAGES/marble.mo
 share/locale/zh_CN/LC_MESSAGES/marble_qt.mo
+share/locale/zh_CN/LC_MESSAGES/messageviewer_application_mstnef_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/messageviewer_text_calendar_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/messageviewer_text_vcard_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/messageviewer_text_xdiff_plugin.mo
@@ -559,12 +567,14 @@ share/locale/zh_CN/LC_MESSAGES/minitoolsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukbackup.mo
+share/locale/zh_CN/LC_MESSAGES/nepomukcleaner.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukfileindexer.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukservicestub.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukstorage.mo
+share/locale/zh_CN/LC_MESSAGES/nepomukwidgets.mo
 share/locale/zh_CN/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/zh_CN/LC_MESSAGES/notes-mobile.mo
 share/locale/zh_CN/LC_MESSAGES/nsplugin.mo
@@ -587,12 +597,17 @@ share/locale/zh_CN/LC_MESSAGES/okular_plucker.mo
 share/locale/zh_CN/LC_MESSAGES/okular_poppler.mo
 share/locale/zh_CN/LC_MESSAGES/okular_tiff.mo
 share/locale/zh_CN/LC_MESSAGES/okular_xps.mo
+share/locale/zh_CN/LC_MESSAGES/org.kde.active.documentviewer.mo
+share/locale/zh_CN/LC_MESSAGES/pairs.mo
+share/locale/zh_CN/LC_MESSAGES/pairseditor.mo
 share/locale/zh_CN/LC_MESSAGES/palapeli.mo
 share/locale/zh_CN/LC_MESSAGES/parley.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_kde.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_vlc.mo
 share/locale/zh_CN/LC_MESSAGES/phononserver.mo
+share/locale/zh_CN/LC_MESSAGES/picmi.mo
+share/locale/zh_CN/LC_MESSAGES/pimsettingexporter.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-desktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-netbook.mo
 share/locale/zh_CN/LC_MESSAGES/plasma-overlay.mo
@@ -642,12 +657,13 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_netpanel.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_news.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_newspaper.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_notes.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_applet_notifications.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_notifier.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_nowplaying.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_nuclearCalculator.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_opendesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_opendesktop_activities.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.notifications.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.showActivityManager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_pager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_panel.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_panelspacer_internal.mo
@@ -655,6 +671,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_paste.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_pastebin.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_plasmaboard.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_previewer.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_printmanager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_qalculate.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_qstardict.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_quicklaunch.mo
@@ -663,7 +680,6 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_rtm.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_sal.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_saverdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_searchbox.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_applet_showactivitymanager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_showdashboard.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_showdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_skapplet.mo
@@ -691,6 +707,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_engine_kdeobservatory.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_keystate.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_metadata.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_engine_mpris2.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_network.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_notifications.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_nowplaying.mo
@@ -698,6 +715,8 @@ share/locale/zh_CN/LC_MESSAGES/plasma_engine_rss.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_share.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_soliddevice.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_weather.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_package_org.kde.desktop.activitymanager.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_package_org.kde.desktop.widgetexplorer.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_packagestructure_comic.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_CharacterRunner.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_activities.mo
@@ -715,6 +734,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_runner_kill.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_konquerorsessions.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_konsolesessions.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_kopete.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_runner_krunner_dictionary.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_locations.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_marblerunner.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_mediawiki.mo
@@ -731,6 +751,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_runner_spellcheckrunner.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_webshortcuts.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_windowedwidgets.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_windows.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_runner_youtube.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_scriptengine_qscript.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_toolbox_desktoptoolbox.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_toolbox_paneltoolbox.mo
@@ -741,37 +762,35 @@ share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_marble.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_pattern.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_potd.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_virus.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_wallpaper-qml.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_weather.mo
-share/locale/zh_CN/LC_MESSAGES/plasmaengineexplorer.mo
 share/locale/zh_CN/LC_MESSAGES/plasmagenericshell.mo
 share/locale/zh_CN/LC_MESSAGES/plasmapkg.mo
-share/locale/zh_CN/LC_MESSAGES/plasmawallpaperviewer.mo
-share/locale/zh_CN/LC_MESSAGES/plasmoidviewer.mo
+share/locale/zh_CN/LC_MESSAGES/pothumbnail.mo
 share/locale/zh_CN/LC_MESSAGES/powerdevil.mo
 share/locale/zh_CN/LC_MESSAGES/powerdevilactivitiesconfig.mo
 share/locale/zh_CN/LC_MESSAGES/powerdevilglobalconfig.mo
 share/locale/zh_CN/LC_MESSAGES/powerdevilprofilesconfig.mo
-share/locale/zh_CN/LC_MESSAGES/printer-applet.mo
+share/locale/zh_CN/LC_MESSAGES/print-manager.mo
 share/locale/zh_CN/LC_MESSAGES/processcore.mo
 share/locale/zh_CN/LC_MESSAGES/processui.mo
 share/locale/zh_CN/LC_MESSAGES/randrmonitor.mo
 share/locale/zh_CN/LC_MESSAGES/rellinks.mo
-share/locale/zh_CN/LC_MESSAGES/remote-widgets-browser.mo
 share/locale/zh_CN/LC_MESSAGES/rocs.mo
+share/locale/zh_CN/LC_MESSAGES/rocscore.mo
+share/locale/zh_CN/LC_MESSAGES/rocsvisualeditor.mo
 share/locale/zh_CN/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_CN/LC_MESSAGES/solid-hardware.mo
 share/locale/zh_CN/LC_MESSAGES/solid-network.mo
 share/locale/zh_CN/LC_MESSAGES/solid_qt.mo
 share/locale/zh_CN/LC_MESSAGES/solidcontrol.mo
 share/locale/zh_CN/LC_MESSAGES/soliduiserver.mo
-share/locale/zh_CN/LC_MESSAGES/spy.mo
 share/locale/zh_CN/LC_MESSAGES/step.mo
 share/locale/zh_CN/LC_MESSAGES/step_qt.mo
 share/locale/zh_CN/LC_MESSAGES/strigila_diff.mo
 share/locale/zh_CN/LC_MESSAGES/superkaramba.mo
 share/locale/zh_CN/LC_MESSAGES/svgpart.mo
 share/locale/zh_CN/LC_MESSAGES/sweeper.mo
-share/locale/zh_CN/LC_MESSAGES/system-config-printer-kde.mo
 share/locale/zh_CN/LC_MESSAGES/systemsettings.mo
 share/locale/zh_CN/LC_MESSAGES/tasks-mobile.mo
 share/locale/zh_CN/LC_MESSAGES/timezones4.mo
diff --git a/x11/kde4-l10n-zh_CN/distinfo b/x11/kde4-l10n-zh_CN/distinfo
index 58ef34c1432..74c82e4e252 100644
--- a/x11/kde4-l10n-zh_CN/distinfo
+++ b/x11/kde4-l10n-zh_CN/distinfo
@@ -1,5 +1,5 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1 2013/04/02 01:01:50 rodent Exp $
 
-SHA1 (kde-l10n-zh_CN-4.8.4.tar.xz) = 90fe7eec87774dfdd4c37a8aa204d8f83651d307
-RMD160 (kde-l10n-zh_CN-4.8.4.tar.xz) = d41ade9cbf8cec99238e09eec561dc583ee743a1
-Size (kde-l10n-zh_CN-4.8.4.tar.xz) = 3559260 bytes
+SHA1 (kde-l10n-zh_CN-4.10.2.tar.xz) = 77a601392efc52deab08c756c0b8249357d77527
+RMD160 (kde-l10n-zh_CN-4.10.2.tar.xz) = 71b45f289a0c234065686a359bb25b4b90d1ac24
+Size (kde-l10n-zh_CN-4.10.2.tar.xz) = 3577892 bytes
diff --git a/x11/kde4-l10n-zh_TW/PLIST b/x11/kde4-l10n-zh_TW/PLIST
index edc29232822..31d75e564c1 100644
--- a/x11/kde4-l10n-zh_TW/PLIST
+++ b/x11/kde4-l10n-zh_TW/PLIST
@@ -10,12 +10,18 @@ share/locale/zh_TW/LC_MESSAGES/accountwizard_kolab.mo
 share/locale/zh_TW/LC_MESSAGES/accountwizard_mailbox.mo
 share/locale/zh_TW/LC_MESSAGES/accountwizard_maildir.mo
 share/locale/zh_TW/LC_MESSAGES/accountwizard_pop3.mo
+share/locale/zh_TW/LC_MESSAGES/accountwizard_tine20.mo
+share/locale/zh_TW/LC_MESSAGES/activitymanager_plugin_globalshortcuts.mo
+share/locale/zh_TW/LC_MESSAGES/activitymanager_uihandler_declarative.mo
 share/locale/zh_TW/LC_MESSAGES/adblock.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi-filestore.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_davgroupware_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_google_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_ical_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_imap_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_invitations_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_kabc_resource.mo
@@ -28,11 +34,12 @@ share/locale/zh_TW/LC_MESSAGES/akonadi_kresourceassistant.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_localbookmarks_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_maildir_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_maildispatcher_agent.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mailtransport_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mbox_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_microblog_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mixedmaildir_resource.mo
-share/locale/zh_TW/LC_MESSAGES/akonadi_nepomukfeeder.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_nepomuk_feeder.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_nepomuktag_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_next.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_nntp_resource.mo
@@ -85,6 +92,7 @@ share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zh_TW/LC_MESSAGES/htmlsearch.mo
 share/locale/zh_TW/LC_MESSAGES/imagerename_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/imgalleryplugin.mo
+share/locale/zh_TW/LC_MESSAGES/importwizard.mo
 share/locale/zh_TW/LC_MESSAGES/jovie.mo
 share/locale/zh_TW/LC_MESSAGES/joystick.mo
 share/locale/zh_TW/LC_MESSAGES/juk.mo
@@ -99,6 +107,7 @@ share/locale/zh_TW/LC_MESSAGES/kabcformat_binary.mo
 share/locale/zh_TW/LC_MESSAGES/kaccess.mo
 share/locale/zh_TW/LC_MESSAGES/kaccessibleapp.mo
 share/locale/zh_TW/LC_MESSAGES/kactivitymanagerd.mo
+share/locale/zh_TW/LC_MESSAGES/kactivitymanagerd_fileitem_linking_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/kaddressbook-mobile.mo
 share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo
 share/locale/zh_TW/LC_MESSAGES/kaddressbookmigrator.mo
@@ -106,6 +115,7 @@ share/locale/zh_TW/LC_MESSAGES/kajongg.mo
 share/locale/zh_TW/LC_MESSAGES/kalarm.mo
 share/locale/zh_TW/LC_MESSAGES/kalgebra.mo
 share/locale/zh_TW/LC_MESSAGES/kalzium.mo
+share/locale/zh_TW/LC_MESSAGES/kanagram-harmattan.mo
 share/locale/zh_TW/LC_MESSAGES/kanagram.mo
 share/locale/zh_TW/LC_MESSAGES/kapman.mo
 share/locale/zh_TW/LC_MESSAGES/kapptemplate.mo
@@ -114,7 +124,6 @@ share/locale/zh_TW/LC_MESSAGES/kate.mo
 share/locale/zh_TW/LC_MESSAGES/kate_kttsd.mo
 share/locale/zh_TW/LC_MESSAGES/katebacktracebrowserplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katebuild-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/kateexternaltoolsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katefilebrowserplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_TW/LC_MESSAGES/kategdbplugin.mo
@@ -123,9 +132,10 @@ share/locale/zh_TW/LC_MESSAGES/katekonsoleplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katemailfilesplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_TW/LC_MESSAGES/katepart4.mo
-share/locale/zh_TW/LC_MESSAGES/katequickdocumentswitcherplugin.mo
+share/locale/zh_TW/LC_MESSAGES/kateproject.mo
 share/locale/zh_TW/LC_MESSAGES/katesearch.mo
 share/locale/zh_TW/LC_MESSAGES/katesnippets_tng.mo
+share/locale/zh_TW/LC_MESSAGES/katesnippetsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katesql.mo
 share/locale/zh_TW/LC_MESSAGES/katesymbolviewer.mo
 share/locale/zh_TW/LC_MESSAGES/katetabbarextension.mo
@@ -147,6 +157,8 @@ share/locale/zh_TW/LC_MESSAGES/kcal_akonadi.mo
 share/locale/zh_TW/LC_MESSAGES/kcalc.mo
 share/locale/zh_TW/LC_MESSAGES/kcertpart.mo
 share/locale/zh_TW/LC_MESSAGES/kcharselect.mo
+share/locale/zh_TW/LC_MESSAGES/kcm-kwin-scripts.mo
+share/locale/zh_TW/LC_MESSAGES/kcm_activities.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_akonadi.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_akonadicontact_actions.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_attica.mo
@@ -164,7 +176,6 @@ share/locale/zh_TW/LC_MESSAGES/kcm_memory.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_pci.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_phonon.mo
-share/locale/zh_TW/LC_MESSAGES/kcm_phononxine.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_platform.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_remotecontrol.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_solid.mo
@@ -218,7 +229,6 @@ share/locale/zh_TW/LC_MESSAGES/kcmstyle.mo
 share/locale/zh_TW/LC_MESSAGES/kcmusb.mo
 share/locale/zh_TW/LC_MESSAGES/kcmview1394.mo
 share/locale/zh_TW/LC_MESSAGES/kcmworkspaceoptions.mo
-share/locale/zh_TW/LC_MESSAGES/kcmxinerama.mo
 share/locale/zh_TW/LC_MESSAGES/kcolorchooser.mo
 share/locale/zh_TW/LC_MESSAGES/kcron.mo
 share/locale/zh_TW/LC_MESSAGES/kde-menu.mo
@@ -241,24 +251,16 @@ share/locale/zh_TW/LC_MESSAGES/kdmgreet.mo
 share/locale/zh_TW/LC_MESSAGES/kdontchangethehostname.mo
 share/locale/zh_TW/LC_MESSAGES/keditbookmarks.mo
 share/locale/zh_TW/LC_MESSAGES/kfile.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_avi.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_dds.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_drgeo.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_exr.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_flac.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_kig.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_mail.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_mp3.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_mpc.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_ogg.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_pnm.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_raw.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_rgb.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_rpm.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_sid.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_theora.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_tiff.mo
-share/locale/zh_TW/LC_MESSAGES/kfile_wav.mo
 share/locale/zh_TW/LC_MESSAGES/kfile_xps.mo
 share/locale/zh_TW/LC_MESSAGES/kfileaudiopreview4.mo
 share/locale/zh_TW/LC_MESSAGES/kfilereplace.mo
@@ -291,6 +293,7 @@ share/locale/zh_TW/LC_MESSAGES/kimagemapeditor.mo
 share/locale/zh_TW/LC_MESSAGES/kinetd.mo
 share/locale/zh_TW/LC_MESSAGES/kinfocenter.mo
 share/locale/zh_TW/LC_MESSAGES/kio4.mo
+share/locale/zh_TW/LC_MESSAGES/kio_activities.mo
 share/locale/zh_TW/LC_MESSAGES/kio_akonadi.mo
 share/locale/zh_TW/LC_MESSAGES/kio_applications.mo
 share/locale/zh_TW/LC_MESSAGES/kio_archive.mo
@@ -312,18 +315,21 @@ share/locale/zh_TW/LC_MESSAGES/kio_nfs.mo
 share/locale/zh_TW/LC_MESSAGES/kio_nntp.mo
 share/locale/zh_TW/LC_MESSAGES/kio_perldoc.mo
 share/locale/zh_TW/LC_MESSAGES/kio_pop3.mo
+share/locale/zh_TW/LC_MESSAGES/kio_recentdocuments.mo
 share/locale/zh_TW/LC_MESSAGES/kio_remote.mo
 share/locale/zh_TW/LC_MESSAGES/kio_sftp.mo
 share/locale/zh_TW/LC_MESSAGES/kio_sieve.mo
 share/locale/zh_TW/LC_MESSAGES/kio_smb.mo
 share/locale/zh_TW/LC_MESSAGES/kio_smtp.mo
 share/locale/zh_TW/LC_MESSAGES/kio_svn.mo
+share/locale/zh_TW/LC_MESSAGES/kio_tags.mo
 share/locale/zh_TW/LC_MESSAGES/kio_thumbnail.mo
 share/locale/zh_TW/LC_MESSAGES/kio_timeline.mo
 share/locale/zh_TW/LC_MESSAGES/kio_trash.mo
 share/locale/zh_TW/LC_MESSAGES/kio_zeroconf.mo
 share/locale/zh_TW/LC_MESSAGES/kioclient.mo
 share/locale/zh_TW/LC_MESSAGES/kioexec.mo
+share/locale/zh_TW/LC_MESSAGES/kipiplugin_kxmlhelloworld.mo
 share/locale/zh_TW/LC_MESSAGES/kiriki.mo
 share/locale/zh_TW/LC_MESSAGES/kiten.mo
 share/locale/zh_TW/LC_MESSAGES/kjots.mo
@@ -359,10 +365,12 @@ share/locale/zh_TW/LC_MESSAGES/kollision.mo
 share/locale/zh_TW/LC_MESSAGES/kolourpaint.mo
 share/locale/zh_TW/LC_MESSAGES/kommander.mo
 share/locale/zh_TW/LC_MESSAGES/kompare.mo
+share/locale/zh_TW/LC_MESSAGES/konqprofiles.mo
 share/locale/zh_TW/LC_MESSAGES/konqueror.mo
 share/locale/zh_TW/LC_MESSAGES/konquest.mo
 share/locale/zh_TW/LC_MESSAGES/konsole.mo
 share/locale/zh_TW/LC_MESSAGES/konsolekalendar.mo
+share/locale/zh_TW/LC_MESSAGES/konsoleprofiles.mo
 share/locale/zh_TW/LC_MESSAGES/kontact.mo
 share/locale/zh_TW/LC_MESSAGES/kontactinterfaces.mo
 share/locale/zh_TW/LC_MESSAGES/kopete.mo
@@ -391,13 +399,11 @@ share/locale/zh_TW/LC_MESSAGES/kruler.mo
 share/locale/zh_TW/LC_MESSAGES/krunner.mo
 share/locale/zh_TW/LC_MESSAGES/ksaneplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kscd.mo
+share/locale/zh_TW/LC_MESSAGES/kscreenlocker.mo
+share/locale/zh_TW/LC_MESSAGES/kscreenlocker_greet.mo
 share/locale/zh_TW/LC_MESSAGES/kscreensaver.mo
-share/locale/zh_TW/LC_MESSAGES/ksecrets_kio.mo
-share/locale/zh_TW/LC_MESSAGES/ksecrets_ksecrets.mo
-share/locale/zh_TW/LC_MESSAGES/ksecretsservice_api.mo
-share/locale/zh_TW/LC_MESSAGES/ksecretsserviced.mo
-share/locale/zh_TW/LC_MESSAGES/ksecretsync.mo
 share/locale/zh_TW/LC_MESSAGES/ksendemail.mo
+share/locale/zh_TW/LC_MESSAGES/ksgrd.mo
 share/locale/zh_TW/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/zh_TW/LC_MESSAGES/kshisen.mo
 share/locale/zh_TW/LC_MESSAGES/kshorturifilter.mo
@@ -418,7 +424,6 @@ share/locale/zh_TW/LC_MESSAGES/ksysguard.mo
 share/locale/zh_TW/LC_MESSAGES/ksysguardlsofwidgets.mo
 share/locale/zh_TW/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_TW/LC_MESSAGES/ksystraycmd.mo
-share/locale/zh_TW/LC_MESSAGES/kte_acomment.mo
 share/locale/zh_TW/LC_MESSAGES/kteatime.mo
 share/locale/zh_TW/LC_MESSAGES/ktesnippets_editor.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditor_codesnippets_core.mo
@@ -426,7 +431,9 @@ share/locale/zh_TW/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/ktimer.mo
 share/locale/zh_TW/LC_MESSAGES/ktimetracker.mo
+share/locale/zh_TW/LC_MESSAGES/ktnef.mo
 share/locale/zh_TW/LC_MESSAGES/ktouch.mo
+share/locale/zh_TW/LC_MESSAGES/ktouchpadenabler.mo
 share/locale/zh_TW/LC_MESSAGES/ktraderclient.mo
 share/locale/zh_TW/LC_MESSAGES/ktron.mo
 share/locale/zh_TW/LC_MESSAGES/ktuberling.mo
@@ -446,7 +453,6 @@ share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_effects.mo
 share/locale/zh_TW/LC_MESSAGES/kwinshutdown.mo
 share/locale/zh_TW/LC_MESSAGES/kwinstartmenu.mo
-share/locale/zh_TW/LC_MESSAGES/kwl2kss.mo
 share/locale/zh_TW/LC_MESSAGES/kwordquiz.mo
 share/locale/zh_TW/LC_MESSAGES/kwrite.mo
 share/locale/zh_TW/LC_MESSAGES/kwriteconfig.mo
@@ -474,6 +480,7 @@ share/locale/zh_TW/LC_MESSAGES/libkdepimmobileui.mo
 share/locale/zh_TW/LC_MESSAGES/libkexiv2.mo
 share/locale/zh_TW/LC_MESSAGES/libkholidays.mo
 share/locale/zh_TW/LC_MESSAGES/libkimap.mo
+share/locale/zh_TW/LC_MESSAGES/libkipi.mo
 share/locale/zh_TW/LC_MESSAGES/libkldap.mo
 share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo
 share/locale/zh_TW/LC_MESSAGES/libkmahjongg.mo
@@ -494,6 +501,7 @@ share/locale/zh_TW/LC_MESSAGES/libkworkspace.mo
 share/locale/zh_TW/LC_MESSAGES/libkxmlrpcclient.mo
 share/locale/zh_TW/LC_MESSAGES/liblancelot-datamodels.mo
 share/locale/zh_TW/LC_MESSAGES/libmailcommon.mo
+share/locale/zh_TW/LC_MESSAGES/libmailimporter.mo
 share/locale/zh_TW/LC_MESSAGES/libmailtransport.mo
 share/locale/zh_TW/LC_MESSAGES/libmessagecomposer.mo
 share/locale/zh_TW/LC_MESSAGES/libmessagecore.mo
@@ -502,20 +510,21 @@ share/locale/zh_TW/LC_MESSAGES/libmessageviewer.mo
 share/locale/zh_TW/LC_MESSAGES/liboktetacore.mo
 share/locale/zh_TW/LC_MESSAGES/liboktetagui.mo
 share/locale/zh_TW/LC_MESSAGES/liboktetakasten.mo
+share/locale/zh_TW/LC_MESSAGES/liboxygenstyleconfig.mo
 share/locale/zh_TW/LC_MESSAGES/libphonon.mo
+share/locale/zh_TW/LC_MESSAGES/libpimcommon.mo
 share/locale/zh_TW/LC_MESSAGES/libplasma.mo
 share/locale/zh_TW/LC_MESSAGES/libplasma_groupingcontainment.mo
 share/locale/zh_TW/LC_MESSAGES/libplasmaclock.mo
 share/locale/zh_TW/LC_MESSAGES/libplasmaweather.mo
-share/locale/zh_TW/LC_MESSAGES/librtm.mo
 share/locale/zh_TW/LC_MESSAGES/libtaskmanager.mo
 share/locale/zh_TW/LC_MESSAGES/libtemplateparser.mo
 share/locale/zh_TW/LC_MESSAGES/lokalize.mo
 share/locale/zh_TW/LC_MESSAGES/lskat.mo
-share/locale/zh_TW/LC_MESSAGES/mailfilteragent.mo
 share/locale/zh_TW/LC_MESSAGES/mailreader.mo
 share/locale/zh_TW/LC_MESSAGES/marble.mo
 share/locale/zh_TW/LC_MESSAGES/marble_qt.mo
+share/locale/zh_TW/LC_MESSAGES/marble_xml_mimetypes.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_application_mstnef_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_text_calendar_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_text_vcard_plugin.mo
@@ -525,12 +534,15 @@ share/locale/zh_TW/LC_MESSAGES/minitoolsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_TW/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukbackup.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukcleaner.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukfileindexer.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukpimindexerutility.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukservicestub.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukstorage.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukwidgets.mo
 share/locale/zh_TW/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/zh_TW/LC_MESSAGES/notes-mobile.mo
 share/locale/zh_TW/LC_MESSAGES/nsplugin.mo
@@ -553,12 +565,17 @@ share/locale/zh_TW/LC_MESSAGES/okular_plucker.mo
 share/locale/zh_TW/LC_MESSAGES/okular_poppler.mo
 share/locale/zh_TW/LC_MESSAGES/okular_tiff.mo
 share/locale/zh_TW/LC_MESSAGES/okular_xps.mo
+share/locale/zh_TW/LC_MESSAGES/org.kde.active.documentviewer.mo
+share/locale/zh_TW/LC_MESSAGES/pairs.mo
+share/locale/zh_TW/LC_MESSAGES/pairseditor.mo
 share/locale/zh_TW/LC_MESSAGES/palapeli.mo
 share/locale/zh_TW/LC_MESSAGES/parley.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_kde.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_vlc.mo
 share/locale/zh_TW/LC_MESSAGES/phononserver.mo
+share/locale/zh_TW/LC_MESSAGES/picmi.mo
+share/locale/zh_TW/LC_MESSAGES/pimsettingexporter.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-desktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-netbook.mo
 share/locale/zh_TW/LC_MESSAGES/plasma-overlay.mo
@@ -608,12 +625,13 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_netpanel.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_news.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_newspaper.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_notes.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_applet_notifications.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_notifier.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_nowplaying.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_nuclearCalculator.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_opendesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_opendesktop_activities.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.notifications.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.showActivityManager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_pager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_panel.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_panelspacer_internal.mo
@@ -621,6 +639,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_paste.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_pastebin.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_plasmaboard.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_previewer.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_printmanager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_qalculate.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_qstardict.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_quicklaunch.mo
@@ -629,7 +648,6 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_rtm.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_sal.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_saverdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_searchbox.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_applet_showactivitymanager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_showdashboard.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_showdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_skapplet.mo
@@ -657,6 +675,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_engine_kdeobservatory.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_keystate.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_metadata.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_engine_mpris2.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_network.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_notifications.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_nowplaying.mo
@@ -664,6 +683,8 @@ share/locale/zh_TW/LC_MESSAGES/plasma_engine_rss.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_share.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_soliddevice.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_weather.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_package_org.kde.desktop.activitymanager.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_package_org.kde.desktop.widgetexplorer.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_packagestructure_comic.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_CharacterRunner.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_activities.mo
@@ -681,6 +702,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_runner_kill.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_konquerorsessions.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_konsolesessions.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_kopete.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_runner_krunner_dictionary.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_locations.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_marblerunner.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_mediawiki.mo
@@ -697,6 +719,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_runner_spellcheckrunner.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_webshortcuts.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_windowedwidgets.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_windows.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_runner_youtube.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_scriptengine_qscript.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_toolbox_desktoptoolbox.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_toolbox_paneltoolbox.mo
@@ -707,37 +730,35 @@ share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_marble.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_pattern.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_potd.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_virus.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_wallpaper-qml.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_weather.mo
-share/locale/zh_TW/LC_MESSAGES/plasmaengineexplorer.mo
 share/locale/zh_TW/LC_MESSAGES/plasmagenericshell.mo
 share/locale/zh_TW/LC_MESSAGES/plasmapkg.mo
-share/locale/zh_TW/LC_MESSAGES/plasmawallpaperviewer.mo
-share/locale/zh_TW/LC_MESSAGES/plasmoidviewer.mo
+share/locale/zh_TW/LC_MESSAGES/pothumbnail.mo
 share/locale/zh_TW/LC_MESSAGES/powerdevil.mo
 share/locale/zh_TW/LC_MESSAGES/powerdevilactivitiesconfig.mo
 share/locale/zh_TW/LC_MESSAGES/powerdevilglobalconfig.mo
 share/locale/zh_TW/LC_MESSAGES/powerdevilprofilesconfig.mo
-share/locale/zh_TW/LC_MESSAGES/printer-applet.mo
+share/locale/zh_TW/LC_MESSAGES/print-manager.mo
 share/locale/zh_TW/LC_MESSAGES/processcore.mo
 share/locale/zh_TW/LC_MESSAGES/processui.mo
 share/locale/zh_TW/LC_MESSAGES/randrmonitor.mo
 share/locale/zh_TW/LC_MESSAGES/rellinks.mo
-share/locale/zh_TW/LC_MESSAGES/remote-widgets-browser.mo
 share/locale/zh_TW/LC_MESSAGES/rocs.mo
+share/locale/zh_TW/LC_MESSAGES/rocscore.mo
+share/locale/zh_TW/LC_MESSAGES/rocsvisualeditor.mo
 share/locale/zh_TW/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_TW/LC_MESSAGES/solid-hardware.mo
 share/locale/zh_TW/LC_MESSAGES/solid-network.mo
 share/locale/zh_TW/LC_MESSAGES/solid_qt.mo
 share/locale/zh_TW/LC_MESSAGES/solidcontrol.mo
 share/locale/zh_TW/LC_MESSAGES/soliduiserver.mo
-share/locale/zh_TW/LC_MESSAGES/spy.mo
 share/locale/zh_TW/LC_MESSAGES/step.mo
 share/locale/zh_TW/LC_MESSAGES/step_qt.mo
 share/locale/zh_TW/LC_MESSAGES/strigila_diff.mo
 share/locale/zh_TW/LC_MESSAGES/superkaramba.mo
 share/locale/zh_TW/LC_MESSAGES/svgpart.mo
 share/locale/zh_TW/LC_MESSAGES/sweeper.mo
-share/locale/zh_TW/LC_MESSAGES/system-config-printer-kde.mo
 share/locale/zh_TW/LC_MESSAGES/systemsettings.mo
 share/locale/zh_TW/LC_MESSAGES/tasks-mobile.mo
 share/locale/zh_TW/LC_MESSAGES/timezones4.mo
diff --git a/x11/kde4-l10n-zh_TW/distinfo b/x11/kde4-l10n-zh_TW/distinfo
index 6596773bce7..2484e202cd7 100644
--- a/x11/kde4-l10n-zh_TW/distinfo
+++ b/x11/kde4-l10n-zh_TW/distinfo
@@ -1,5 +1,5 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1 2013/04/02 01:02:17 rodent Exp $
 
-SHA1 (kde-l10n-zh_TW-4.8.4.tar.xz) = 8b6969239a1c8abcd4946223568d0af88140929f
-RMD160 (kde-l10n-zh_TW-4.8.4.tar.xz) = 0aaae4998125ce1c4aacaf940d9b69c1ecc14639
-Size (kde-l10n-zh_TW-4.8.4.tar.xz) = 2564856 bytes
+SHA1 (kde-l10n-zh_TW-4.10.2.tar.xz) = 2247859f09e3f0b1a99961c5fcdf0fcb4afc84a2
+RMD160 (kde-l10n-zh_TW-4.10.2.tar.xz) = bccd48a995c3cf661bef0a4f1b4c869f9863fc28
+Size (kde-l10n-zh_TW-4.10.2.tar.xz) = 2580548 bytes
-- 
2.11.4.GIT