[Zaf-commit] SF.net SVN: zaf:[10668] trunk/po/fftb/en_ZA

[<dwa...@us...>]

Revision: 10668
          http://zaf.svn.sourceforge.net/zaf/?rev=10668&view=rev
Author:   dwaynebailey
Date:     2012-03-25 22:54:24 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
Remove compendium conflicts

Modified Paths:
--------------
    trunk/po/fftb/en_ZA/browser/branding/official/brand.dtd.po
    trunk/po/fftb/en_ZA/mobile/android/chrome/browser.properties.po
    trunk/po/fftb/en_ZA/mobile/chrome/region.properties.po
    trunk/po/fftb/en_ZA/mobile/xul/chrome/browser.properties.po

Modified: trunk/po/fftb/en_ZA/browser/branding/official/brand.dtd.po
===================================================================
--- trunk/po/fftb/en_ZA/browser/branding/official/brand.dtd.po	2012-03-25 22:50:28 UTC (rev 10667)
+++ trunk/po/fftb/en_ZA/browser/branding/official/brand.dtd.po	2012-03-25 22:54:24 UTC (rev 10668)
@@ -1,4 +1,3 @@
-# #-#-#-#-#  brand.dtd.po (PACKAGE VERSION)  #-#-#-#-#
 # Dwayne Bailey <dw...@tr...>, 2011.
 #. extracted from en-US/browser/branding/official/brand.dtd
 #, fuzzy

Modified: trunk/po/fftb/en_ZA/mobile/android/chrome/browser.properties.po
===================================================================
--- trunk/po/fftb/en_ZA/mobile/android/chrome/browser.properties.po	2012-03-25 22:50:28 UTC (rev 10667)
+++ trunk/po/fftb/en_ZA/mobile/android/chrome/browser.properties.po	2012-03-25 22:54:24 UTC (rev 10668)
@@ -1,8 +1,4 @@
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
 # Dwayne Bailey <dw...@tr...>, 2011.
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
-# Dwayne Bailey <dw...@tr...>, 2011.
 #. extracted from en-US/mobile/android/chrome/browser.properties
 msgid ""
 msgstr ""

Modified: trunk/po/fftb/en_ZA/mobile/chrome/region.properties.po
===================================================================
--- trunk/po/fftb/en_ZA/mobile/chrome/region.properties.po	2012-03-25 22:50:28 UTC (rev 10667)
+++ trunk/po/fftb/en_ZA/mobile/chrome/region.properties.po	2012-03-25 22:54:24 UTC (rev 10668)
@@ -1,4 +1,3 @@
-# #-#-#-#-#  region.properties.po (PACKAGE VERSION)  #-#-#-#-#
 # Dwayne Bailey <dw...@tr...>, 2011.
 #. extracted from en-US/mobile/chrome/region.properties
 msgid ""
@@ -185,13 +184,6 @@
 #~ msgid "Google Reader"
 #~ msgstr "Google Reader"
 
-#~ msgid "US"
-#~ msgstr ""
-#~ "#-#-#-#-#  region.properties.po (PACKAGE VERSION)  #-#-#-#-#\n"
-#~ "ZA\n"
-#~ "#-#-#-#-#  region.properties.po (PACKAGE VERSION)  #-#-#-#-#\n"
-#~ "US"
-
 #~ msgid ""
 #~ "_: homePageDefault\n"
 #~ "http://start.mozilla.org/firefox"

Modified: trunk/po/fftb/en_ZA/mobile/xul/chrome/browser.properties.po
===================================================================
--- trunk/po/fftb/en_ZA/mobile/xul/chrome/browser.properties.po	2012-03-25 22:50:28 UTC (rev 10667)
+++ trunk/po/fftb/en_ZA/mobile/xul/chrome/browser.properties.po	2012-03-25 22:54:24 UTC (rev 10668)
@@ -1,8 +1,4 @@
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
 # Dwayne Bailey <dw...@tr...>, 2011.
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  browser.properties.po (PACKAGE VERSION)  #-#-#-#-#
-# Dwayne Bailey <dw...@tr...>, 2011.
 #. extracted from en-US/mobile/xul/chrome/browser.properties
 msgid ""
 msgstr ""

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.