|
From: <ge...@us...> - 2010-09-21 13:48:51
|
Revision: 7268
http://winmerge.svn.sourceforge.net/winmerge/?rev=7268&view=rev
Author: gerundt
Date: 2010-09-21 13:48:45 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
PATCH: [ 3070136 ] Backport Slovenian shell extension to R2_12
Modified Paths:
--------------
branches/R2_12/Docs/Users/ChangeLog.txt
branches/R2_12/ShellExtension/ShellExtension.dsp
branches/R2_12/ShellExtension/ShellExtension.rc
branches/R2_12/ShellExtension/ShellExtension.vcproj
branches/R2_12/ShellExtension/ShellExtensionX64.vcproj
Added Paths:
-----------
branches/R2_12/ShellExtension/Languages/ShellExtensionSlovenian.rc
Modified: branches/R2_12/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_12/Docs/Users/ChangeLog.txt 2010-09-20 20:00:37 UTC (rev 7267)
+++ branches/R2_12/Docs/Users/ChangeLog.txt 2010-09-21 13:48:45 UTC (rev 7268)
@@ -14,7 +14,7 @@
- Chinese (#3033324)
- Dutch (#2804979)
- French (#2850842, #2968200)
- - Slovenian (#2917796, #2932094, #2934354)
+ - Slovenian (#2917796, #2932094, #2934354, #3070136)
- Spanish (#2930734)
- Turkish (#2825132, #2827817)
- Ukrainian (#2817835)
Added: branches/R2_12/ShellExtension/Languages/ShellExtensionSlovenian.rc
===================================================================
--- branches/R2_12/ShellExtension/Languages/ShellExtensionSlovenian.rc (rev 0)
+++ branches/R2_12/ShellExtension/Languages/ShellExtensionSlovenian.rc 2010-09-21 13:48:45 UTC (rev 7268)
@@ -0,0 +1,50 @@
+//Microsoft Developer Studio generated resource script.
+//
+// $Id$
+
+#include "../resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV)
+#ifdef _WIN32
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+//
+// *** TRANSLATED STRINGS ***
+// Translate strings below
+//
+STRINGTABLE
+BEGIN
+ IDS_PROJNAME "Raz\x9Airitev integracije v lupino"
+ IDS_CONTEXT_MENU "WinMerge"
+ IDS_CONTEXT_HELP "Odpri z WinMerge"
+ IDS_CONTEXT_HELP_MANYITEMS "Prosimo izberite najve\xE8 2 predmeta"
+ IDS_COMPARE "Primerjaj"
+ IDS_COMPARE_ELLIPSIS "Primerjaj ..."
+ IDS_COMPARE_TO "Primerjaj z"
+ IDS_HELP_SAVETHIS "Shrani tole pot. Izberite \x9Ae drugo pot za primerjavo s tole."
+ IDS_HELP_COMPARESAVED "Primerjaj s shranjeno potjo (%1)"
+ IDS_RESELECT_FIRST "Ponovno izberite prvega"
+END
+
+#endif // Resources
+/////////////////////////////////////////////////////////////////////////////
Property changes on: branches/R2_12/ShellExtension/Languages/ShellExtensionSlovenian.rc
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/R2_12/ShellExtension/ShellExtension.dsp
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.dsp 2010-09-20 20:00:37 UTC (rev 7267)
+++ branches/R2_12/ShellExtension/ShellExtension.dsp 2010-09-21 13:48:45 UTC (rev 7268)
@@ -492,6 +492,11 @@
# End Source File
# Begin Source File
+SOURCE=.\Languages\ShellExtensionSlovenian.rc
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
SOURCE=.\Languages\ShellExtensionSpanish.rc
# PROP Exclude_From_Build 1
# End Source File
Modified: branches/R2_12/ShellExtension/ShellExtension.rc
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.rc 2010-09-20 20:00:37 UTC (rev 7267)
+++ branches/R2_12/ShellExtension/ShellExtension.rc 2010-09-21 13:48:45 UTC (rev 7268)
@@ -244,6 +244,14 @@
"#endif //_WIN32\r\n"
"#endif\r\n"
"\r\n"
+ "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV)\r\n"
+ "#ifdef _WIN32\r\n"
+ "LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT\r\n"
+ "#pragma code_page(1250)\r\n"
+ "#include ""Languages\\ShellExtensionSlovenian.rc""\r\n"
+ "#endif //_WIN32\r\n"
+ "#endif\r\n"
+ "\r\n"
"#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)\r\n"
"#ifdef _WIN32\r\n"
"LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN\r\n"
@@ -565,6 +573,14 @@
#endif //_WIN32
#endif
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV)
+#ifdef _WIN32
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#include "Languages\ShellExtensionSlovenian.rc"
+#endif //_WIN32
+#endif
+
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
#ifdef _WIN32
LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN
Modified: branches/R2_12/ShellExtension/ShellExtension.vcproj
===================================================================
--- branches/R2_12/ShellExtension/ShellExtension.vcproj 2010-09-20 20:00:37 UTC (rev 7267)
+++ branches/R2_12/ShellExtension/ShellExtension.vcproj 2010-09-21 13:48:45 UTC (rev 7268)
@@ -2180,6 +2180,57 @@
</FileConfiguration>
</File>
<File
+ RelativePath="Languages\ShellExtensionSlovenian.rc">
+ <FileConfiguration
+ Name="Unicode Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinSize|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Unicode Release MinDependency|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;$(NoInherit)"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinSize|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Languages\ShellExtensionSpanish.rc">
<FileConfiguration
Name="Unicode Debug|Win32"
Modified: branches/R2_12/ShellExtension/ShellExtensionX64.vcproj
===================================================================
--- branches/R2_12/ShellExtension/ShellExtensionX64.vcproj 2010-09-20 20:00:37 UTC (rev 7267)
+++ branches/R2_12/ShellExtension/ShellExtensionX64.vcproj 2010-09-21 13:48:45 UTC (rev 7268)
@@ -817,6 +817,25 @@
</FileConfiguration>
</File>
<File
+ RelativePath="Languages\ShellExtensionSlovenian.rc">
+ <FileConfiguration
+ Name="Debug X64|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG;_AFXDLL"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release X64|Win32"
+ ExcludedFromBuild="TRUE">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG;_AFXDLL"
+ AdditionalIncludeDirectories="Languages;$(OUTDIR)"/>
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="Languages\ShellExtensionSpanish.rc">
<FileConfiguration
Name="Debug X64|Win32"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
