From 3e3e311a6271ffc39b9658659ca0d97f0a5006fe Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 14 Mar 2016 17:02:23 +0100
Subject: [PATCH] sl locale specialized to sl_SI

---
 ZRCola/MSIBuild/Makefile                    | 4 ++--
 ZRCola/ZRCola.vcxproj                       | 2 +-
 ZRCola/ZRCola.vcxproj.filters               | 2 +-
 ZRCola/locale/{sl.po => sl_SI.po}           | 0
 ZRColaCompile/ZRColaCompile.vcxproj         | 2 +-
 ZRColaCompile/ZRColaCompile.vcxproj.filters | 2 +-
 ZRColaCompile/locale/{sl.po => sl_SI.po}    | 0
 lib/wxExtend                                | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename ZRCola/locale/{sl.po => sl_SI.po} (100%)
 rename ZRColaCompile/locale/{sl.po => sl_SI.po} (100%)

diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 6bea13a..fdad9f1 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -100,7 +100,7 @@ featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
 "It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl.po"
+"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -194,7 +194,7 @@ shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input sys
 "It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl.po"
+"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj
index 6a976ac..a4921ec 100644
--- a/ZRCola/ZRCola.vcxproj
+++ b/ZRCola/ZRCola.vcxproj
@@ -113,7 +113,7 @@
     <ResourceCompile Include="ZRCola.rc" />
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po" />
+    <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ZRCola/ZRCola.vcxproj.filters b/ZRCola/ZRCola.vcxproj.filters
index ade3712..d0b7859 100644
--- a/ZRCola/ZRCola.vcxproj.filters
+++ b/ZRCola/ZRCola.vcxproj.filters
@@ -72,7 +72,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po">
+    <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>
diff --git a/ZRCola/locale/sl.po b/ZRCola/locale/sl_SI.po
similarity index 100%
rename from ZRCola/locale/sl.po
rename to ZRCola/locale/sl_SI.po
diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj
index 8db53c7..924fda5 100644
--- a/ZRColaCompile/ZRColaCompile.vcxproj
+++ b/ZRColaCompile/ZRColaCompile.vcxproj
@@ -71,7 +71,7 @@
     <ResourceCompile Include="ZRColaCompile.rc" />
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po" />
+    <POCompile Include="locale\sl_SI.po" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ZRColaCompile/ZRColaCompile.vcxproj.filters b/ZRColaCompile/ZRColaCompile.vcxproj.filters
index cd879ff..e2c02d4 100644
--- a/ZRColaCompile/ZRColaCompile.vcxproj.filters
+++ b/ZRColaCompile/ZRColaCompile.vcxproj.filters
@@ -43,7 +43,7 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <POCompile Include="locale\sl.po">
+    <POCompile Include="locale\sl_SI.po">
       <Filter>Resource Files\Localization</Filter>
     </POCompile>
   </ItemGroup>
diff --git a/ZRColaCompile/locale/sl.po b/ZRColaCompile/locale/sl_SI.po
similarity index 100%
rename from ZRColaCompile/locale/sl.po
rename to ZRColaCompile/locale/sl_SI.po
diff --git a/lib/wxExtend b/lib/wxExtend
index 42d133f..f1004c1 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit 42d133fec4916a700f9d49d1a36592631c4c9a14
+Subproject commit f1004c1e37abb2ae9c8b39a337f5f51e59715613