Merge branch 'csharp-translation' into csharp-translation-force

Conflicts:
	Tween/Tween.vbproj
	TweenCS/TweenCS.csproj

diff --cc Tween/Tween.vbproj
index 8591223,314cfb5..1c105ac
--- 1/Tween/Tween.vbproj
--- 2/Tween/Tween.vbproj
+++ b/Tween/Tween.vbproj
@@@ -115,13 -115,19 +115,7 @@@
      <Import Include="System.Windows.Forms" />
    </ItemGroup>
    <ItemGroup>
 -    <Compile Include="AppendSettingDialog.Designer.vb">
 -      <DependentUpon>AppendSettingDialog.vb</DependentUpon>
 -    </Compile>
 -    <Compile Include="AppendSettingDialog.vb">
 -      <SubType>Form</SubType>
 -    </Compile>
      <Compile Include="ApplicationEvents.vb" />
-     <Compile Include="AtIdSupplement.Designer.vb">
-       <DependentUpon>AtIdSupplement.vb</DependentUpon>
-     </Compile>
-     <Compile Include="AtIdSupplement.vb">
-       <SubType>Form</SubType>
-     </Compile>
 -    <Compile Include="Connection\Plixi.vb" />
 -    <Compile Include="Connection\TwitPic.vb" />
 -    <Compile Include="Connection\imgly.vb" />
 -    <Compile Include="Connection\TwitterPhoto.vb" />
 -    <Compile Include="Connection\TwitVideo.vb" />
 -    <Compile Include="Connection\yfrog.vb" />
      <Compile Include="Dynamic.vb" />
      <Compile Include="EventViewerDialog.Designer.vb">
        <DependentUpon>EventViewerDialog.vb</DependentUpon>
@@@ -135,25 -141,16 +129,13 @@@
      <Compile Include="DialogAsShieldIcon.vb">
        <SubType>Form</SubType>
      </Compile>
-     <Compile Include="FormInfo.Designer.vb">
-       <DependentUpon>FormInfo.vb</DependentUpon>
-     </Compile>
-     <Compile Include="FormInfo.vb">
-       <SubType>Form</SubType>
-     </Compile>
      <Compile Include="Foursquare.vb" />
 -    <Compile Include="Google.vb" />
      <Compile Include="HashtagManage.Designer.vb">
        <DependentUpon>HashtagManage.vb</DependentUpon>
      </Compile>
      <Compile Include="HashtagManage.vb">
        <SubType>Form</SubType>
      </Compile>
-     <Compile Include="InputTabName.Designer.vb">
-       <DependentUpon>InputTabName.vb</DependentUpon>
-     </Compile>
-     <Compile Include="InputTabName.vb">
-       <SubType>Form</SubType>
-     </Compile>
 -    <Compile Include="ImageDictionary.vb" />
 -    <Compile Include="ImageListViewItem.vb" />
      <Compile Include="ListAvailable.Designer.vb">
        <DependentUpon>ListAvailable.vb</DependentUpon>
      </Compile>
@@@ -223,20 -219,20 +202,8 @@@
        <SubType>Form</SubType>
      </Compile>
      <Compile Include="FavoriteQueue.vb" />
 -    <Compile Include="Twitter.vb" />
    </ItemGroup>
    <ItemGroup>
-     <EmbeddedResource Include="AtIdSupplement.en.resx">
 -    <EmbeddedResource Include="AppendSettingDialog.en.resx">
 -      <DependentUpon>AppendSettingDialog.vb</DependentUpon>
--      <SubType>Designer</SubType>
-       <DependentUpon>AtIdSupplement.vb</DependentUpon>
--    </EmbeddedResource>
-     <EmbeddedResource Include="AtIdSupplement.resx">
 -    <EmbeddedResource Include="AppendSettingDialog.resx">
 -      <DependentUpon>AppendSettingDialog.vb</DependentUpon>
--      <SubType>Designer</SubType>
-       <DependentUpon>AtIdSupplement.vb</DependentUpon>
--    </EmbeddedResource>
-     <EmbeddedResource Include="AtIdSupplement.zh-CHS.resx">
-       <DependentUpon>AtIdSupplement.vb</DependentUpon>
-       <SubType>Designer</SubType>
 -    <EmbeddedResource Include="AppendSettingDialog.zh-CHS.resx">
 -      <DependentUpon>AppendSettingDialog.vb</DependentUpon>
--    </EmbeddedResource>
      <EmbeddedResource Include="EventViewerDialog.en.resx">
        <DependentUpon>EventViewerDialog.vb</DependentUpon>
      </EmbeddedResource>

diff --cc TweenCS/TweenCS.csproj
index 9a39393,3cb8ae8..0fe4fe7
--- 1/TweenCS/TweenCS.csproj
--- 2/TweenCS/TweenCS.csproj
+++ b/TweenCS/TweenCS.csproj
@@@ -50,12 -49,12 +50,18 @@@
        <SubType>Component</SubType>
      </Compile>
      <Compile Include="ApiInformation.cs" />
+     <Compile Include="AtIdSupplement.cs">
+       <SubType>Form</SubType>
+     </Compile>
+     <Compile Include="AtIdSupplement.Designer.cs">
+       <DependentUpon>AtIdSupplement.cs</DependentUpon>
+     </Compile>
 +    <Compile Include="AppendSettingDialog.cs">
 +      <SubType>Form</SubType>
 +    </Compile>
 +    <Compile Include="AppendSettingDialog.Designer.cs">
 +      <DependentUpon>AppendSettingDialog.cs</DependentUpon>
 +    </Compile>
      <Compile Include="AuthBrowser.cs">
        <SubType>Form</SubType>
      </Compile>
@@@ -83,12 -76,20 +89,24 @@@
        <SubType>Component</SubType>
      </Compile>
      <Compile Include="DoubleClickCopyCanceller.cs" />
 +    <Compile Include="Google.cs" />
+     <Compile Include="FormInfo.cs">
+       <SubType>Form</SubType>
+     </Compile>
+     <Compile Include="FormInfo.Designer.cs">
+       <DependentUpon>FormInfo.cs</DependentUpon>
+     </Compile>
      <Compile Include="Growl.cs" />
      <Compile Include="HookGlobalHotkey.cs" />
+     <Compile Include="InputTabName.cs">
+       <SubType>Form</SubType>
+     </Compile>
+     <Compile Include="InputTabName.Designer.cs">
+       <DependentUpon>InputTabName.cs</DependentUpon>
+     </Compile>
 +    <Compile Include="ListElement.cs" />
 +    <Compile Include="ImageDictionary.cs" />
 +    <Compile Include="ImageListViewItem.cs" />
      <Compile Include="MyCommon.cs" />
      <Compile Include="MySpecialPath.cs" />
      <Compile Include="nicoms.cs" />
@@@ -115,11 -116,13 +133,14 @@@
      <Compile Include="SearchWord.Designer.cs">
        <DependentUpon>SearchWord.cs</DependentUpon>
      </Compile>
+     <Compile Include="Setting\SettingAtIdList.cs" />
      <Compile Include="Setting\SettingBase.cs" />
      <Compile Include="Setting\SettingCommon.cs" />
+     <Compile Include="Setting\SettingFollower.cs" />
+     <Compile Include="Setting\SettingLocal.cs" />
      <Compile Include="ShieldIcon.cs" />
      <Compile Include="ShortUrl.cs" />
 +    <Compile Include="StatusDictionary.cs" />
      <Compile Include="ToolStripAPIGauge.cs">
        <SubType>Component</SubType>
      </Compile>
@@@ -142,15 -143,15 +163,24 @@@
      <Compile Include="Connection\HttpConnection.cs" />
    </ItemGroup>
    <ItemGroup>
+     <EmbeddedResource Include="AtIdSupplement.en.resx">
+       <DependentUpon>AtIdSupplement.cs</DependentUpon>
+     </EmbeddedResource>
+     <EmbeddedResource Include="AtIdSupplement.resx">
+       <DependentUpon>AtIdSupplement.cs</DependentUpon>
+     </EmbeddedResource>
+     <EmbeddedResource Include="AtIdSupplement.zh-CHS.resx">
+       <DependentUpon>AtIdSupplement.cs</DependentUpon>
+     </EmbeddedResource>
 +    <EmbeddedResource Include="AppendSettingDialog.en.resx">
 +      <DependentUpon>AppendSettingDialog.cs</DependentUpon>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="AppendSettingDialog.resx">
 +      <DependentUpon>AppendSettingDialog.cs</DependentUpon>
 +    </EmbeddedResource>
 +    <EmbeddedResource Include="AppendSettingDialog.zh-CHS.resx">
 +      <DependentUpon>AppendSettingDialog.cs</DependentUpon>
 +    </EmbeddedResource>
      <EmbeddedResource Include="AuthBrowser.resx">
        <DependentUpon>AuthBrowser.cs</DependentUpon>
      </EmbeddedResource>