[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    l10n/scripts
From:       Stephan Kulow <coolo () kde ! org>
Date:       2007-06-11 15:42:55
Message-ID: 1181576575.068317.9965.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 674029 by coolo:

prepare orphans handling, but wait for new pot file


 M  +10 -4     process_orphans.sh  
 M  +12 -0     process_orphans.txt  


--- trunk/l10n/scripts/process_orphans.sh #674028:674029
@@ -40,7 +40,7 @@
     if test -z "$command"; then
         echo "ERROR: rule without command. Skipping!"
         continue
-    elif test "$command" != "delete" -a ! -d `dirname ./templates/$dest`; then
+    elif test "$command" != "delete" -a "$command" != "merge" -a ! -d `dirname \
                ./templates/$dest`; then
         echo "ERROR: unknown destination directory for path: $dest Skipping!"
         continue
     fi
@@ -48,9 +48,6 @@
         poorig=./$lang/$orig
         podest=./$lang/$dest
         podestdir=`dirname $podest`
-        if test ! -d $podestdir; then
-            svn mkdir $podestdir
-        fi
 
         # Does the rule need to be done manually?
         manual=
@@ -100,6 +97,15 @@
                         manual=yes
                     fi
                 fi
+            elif test $command = "merge" -a -f $poorig; then
+                # without dest it's a move
+                potfile="templates/$dest"t
+                if ! test -f "$podest"; then
+                    svn mv $poorig $podest
+                    msgmerge -o $podest $podest $potfile
+                else
+                    msgmerge -C $poorig -o $podest $podest $potfile && svn remove \
$poorig +                fi
             else
                 manual=yes
             fi
--- trunk/l10n/scripts/process_orphans.txt #674028:674029
@@ -86,3 +86,15 @@
 move messages/extragear-graphics/kimbada.po \
messages/extragear-graphics/kphotoalbum.po r501651 2006-01-23  move \
messages/extragear-graphics/desktop_extragear-graphics_kimbada.po \
messages/extragear-graphics/desktop_extragear-graphics_kphotoalbum.po r501651 \
2006-01-23  
+merge messages/extragear-pim/kbluetoothd.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/btpaired.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbluelock.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbluepin.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbluetoothdcm.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbthandsfree.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbtobexclient.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbtsearch.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kbtserialchat.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/kcm_btpaired.po messages/extragear-pim/kdebluetooth.po
+merge messages/extragear-pim/libkbluetooth.po messages/extragear-pim/kdebluetooth.po
+


[prev in list] [next in list] [prev in thread] [next in thread]