diff --git a/Info.plist b/Info.plist index dee34fd4..5e15093b 100644 --- a/Info.plist +++ b/Info.plist @@ -134,7 +134,7 @@ SUFeedURL https://wired.read-write.fr/wiredclient_appcast.xml SUPublicEDKey - SUPublicEDKey.pem + dsa_pub.pem UTExportedTypeDeclarations diff --git a/SUPublicEDKey.pem b/SUPublicEDKey.pem deleted file mode 100644 index 084da727..00000000 --- a/SUPublicEDKey.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQCMEqucyqRvLTAw0iEA326dpyBMJMtb -j38RdbJZ3Futf2FssUYCDbcPdHDYyx3RGZxgwv6l/96rgfrHWdruOnnEAzjQ/sS3 -blZHVZ4R214aTEsbFnOKsGJ9UprZYrAXYiF5gSGmnnzXqJvA5anPqEK1mS62WB4c -phjuiRoOjRK8x5TJNiLYosmaxY3Ym+Dgqf1SAqycaci8VoTzD5SNMaM1qc16WI5c -yQFXnhXmcS01CEGi0DN1OHBzkZp/aNawQi3GaUR8dNAwMARF3luNxtoiyJ5Jvhqt -wC0f7YoRKilL2QjHC1NHCkFl+qhfFQ/Yj17YTa4U4bND8MU8q7IeGxHvAhUAmZLs -FZRWNozb2zy80KfNJ25ojlcCggEAWNy2dcjPupMD0zLZgNDoZ7YBDxQdF+aokpw+ -GiZ07nDTvhB9txum2m6Lqk/YPs+Nxfr9mAnnLCVumafgNsNgpZQwgmNqaz+AH8wR -2Dj9XjPL59Za4kN2TZITut0LPopRf0CHaICLd1DimciDAVtD7nNKnCdThSppOVSc -6TlsVNexlSsuyJZayfaaNrtj0dk25BbRBfNumXUh9PlAbKqntz0d8W5w3OThNwaf -xWZrEEYPXp/0F8bCTIosgRSlfRqCUxItBMc48XeWM1pHrKs6u8lJAWLfsIdyC3NI -5atF6txmJPkXRjFBXVKsfD6Obbof5wEhxm6u91fgPMAB0JBHhwOCAQUAAoIBAHz7 -b6m7miV/tTL44MqsaEy3GoPo11NNdg5tRvUUStUqcqW0IcpiSmVgdWf1r/FvY0wI -lCN72uDKv4rN0+rQTav0fReU9stJr+8wbVz/OeP8c16ROTlYQBBzPemuxrG79LRR -jRcxalV6ElOl9rc/+GsBkhw29buOzIfDkQNVJPxGz/dlRi98kptvD09Ei6pPGWKK -1CtXeW277B505qa3+Xzx1gCLk0/wBsp4I+RMMMk5JI+o7sIOtBTJCjSxH88Pl5bd -MDs+7/qifX7ME3FMJDSmLmpxJADFTNk+SaQePU8Gdcp3rlVrgD4YPxFoGiT9LMxQ -xQc0F2L3As8kXF8mk2w= ------END PUBLIC KEY----- diff --git a/Sources/WCApplicationController.m b/Sources/WCApplicationController.m index bff27b2c..66c0936a 100644 --- a/Sources/WCApplicationController.m +++ b/Sources/WCApplicationController.m @@ -704,9 +704,9 @@ - (void)awakeFromNib { // set the auto-update feed URL regarding to the selected configuration (Debug or Release) #ifdef WCConfigurationRelease - [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/wiredclientcast.xml"]]; + [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/sparkle/wiredclient_cast.xml"]]; #else - [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/wiredclient_debugcast.xml"]]; + [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/sparkle/wiredclient_debugcast.xml"]]; #endif [_updater setSendsSystemProfile:YES]; diff --git a/Sparkle/generate_keys.rb b/Sparkle/generate_keys.rb deleted file mode 100755 index 1d527195..00000000 --- a/Sparkle/generate_keys.rb +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/ruby -["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| - if File.exist? file - puts "There's already a #{file} here! Move it aside or be more careful!" - exit - end -end -openssl = "/usr/bin/openssl" -`#{openssl} dsaparam 1024 < /dev/urandom > dsaparam.pem` -`#{openssl} gendsa dsaparam.pem -out dsa_priv.pem` -`#{openssl} dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` -`rm dsaparam.pem` -puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n -BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n -If you lose it, your users will be unable to upgrade!\n" diff --git a/Sparkle/sign_update.rb b/Sparkle/sign_update.rb deleted file mode 100755 index 199ea40c..00000000 --- a/Sparkle/sign_update.rb +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/ruby -if ARGV.length < 2 - puts "Usage: ruby sign_update.rb update_archive private_key" - exit -end -openssl = "/usr/bin/openssl" -puts `#{openssl} dgst -sha1 -binary < "#{ARGV[0]}" | #{openssl} dgst -dss1 -sign "#{ARGV[1]}" | #{openssl} enc -base64` \ No newline at end of file diff --git a/Wired Client.entitlements b/Wired Client.entitlements new file mode 100644 index 00000000..0c67376e --- /dev/null +++ b/Wired Client.entitlements @@ -0,0 +1,5 @@ + + + + + diff --git a/WiredClient.xcodeproj/project.pbxproj b/WiredClient.xcodeproj/project.pbxproj index a9cc8ac0..06471c0f 100644 --- a/WiredClient.xcodeproj/project.pbxproj +++ b/WiredClient.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ isa = PBXAggregateTarget; buildConfigurationList = 4C06678515DEC69800E8D810 /* Build configuration list for PBXAggregateTarget "Wired Client (Distribute Debug)" */; buildPhases = ( - 4C5BB6942445E6A20089D6D2 /* Run Bump Version */, 4C06678915DEC69F00E8D810 /* Run Distribute Script */, ); dependencies = ( @@ -102,6 +101,7 @@ 4C4FDEB21779B8EB00FADB95 /* WCTrackerBookmarkController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FDEB11779B8EB00FADB95 /* WCTrackerBookmarkController.m */; }; 4C4FDEC4177A4B2400FADB95 /* WCBookmarkController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FDEC3177A4B2400FADB95 /* WCBookmarkController.m */; }; 4C57B644154E185700C9BAA5 /* WCConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C57B643154E185700C9BAA5 /* WCConnection.m */; }; + 4C5BB6BB244624390089D6D2 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 4C5BB6BA244624390089D6D2 /* dsa_pub.pem */; }; 4C5D66681FE3C93000552E9E /* WiredServer.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C5D66571FE3C92F00552E9E /* WiredServer.icns */; }; 4C5D66691FE3C93000552E9E /* WiredTemplate.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C5D66621FE3C92F00552E9E /* WiredTemplate.icns */; }; 4C5D666A1FE3C93000552E9E /* WiredBookmarks.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C5D66631FE3C92F00552E9E /* WiredBookmarks.icns */; }; @@ -138,7 +138,6 @@ 4CD51D5B181556CC002ADC1C /* WCThreadWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD51D5A181556CC002ADC1C /* WCThreadWindow.m */; }; 4CD7B71518157B0900FA3846 /* WCThreadTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7B71418157B0900FA3846 /* WCThreadTableCellView.m */; }; 4CD7B71F18157B9D00FA3846 /* WCBadgedTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7B71E18157B9D00FA3846 /* WCBadgedTableCellView.m */; }; - 4CDBF1FF14BC5501007142D3 /* SUPublicEDKey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 4CDBF1FE14BC5501007142D3 /* SUPublicEDKey.pem */; }; 4CDD88CD15F76F8000283005 /* wiredclientrnote.html in Resources */ = {isa = PBXBuildFile; fileRef = 4CDD88CC15F76F8000283005 /* wiredclientrnote.html */; }; 4CE1531E1800D64F004DA093 /* MMTabBarView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE152EE1800D5DA004DA093 /* MMTabBarView.framework */; }; 4CE153221800D64F004DA093 /* WiredAppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CE1530D1800D5E7004DA093 /* WiredAppKit.framework */; }; @@ -475,6 +474,8 @@ 4C57B642154E185700C9BAA5 /* WCConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WCConnection.h; path = Sources/WCConnection.h; sourceTree = ""; }; 4C57B643154E185700C9BAA5 /* WCConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WCConnection.m; path = Sources/WCConnection.m; sourceTree = ""; }; 4C5BB63E2445ABCA0089D6D2 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Pods/Sparkle/Sparkle.framework; sourceTree = ""; }; + 4C5BB6B9244618050089D6D2 /* Wired Client.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Wired Client.entitlements"; sourceTree = ""; }; + 4C5BB6BA244624390089D6D2 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = ""; }; 4C5D66571FE3C92F00552E9E /* WiredServer.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WiredServer.icns; path = Images/WiredServer.icns; sourceTree = ""; }; 4C5D66621FE3C92F00552E9E /* WiredTemplate.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WiredTemplate.icns; path = Images/WiredTemplate.icns; sourceTree = ""; }; 4C5D66631FE3C92F00552E9E /* WiredBookmarks.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = WiredBookmarks.icns; path = Images/WiredBookmarks.icns; sourceTree = ""; }; @@ -533,7 +534,6 @@ 4CD7B71418157B0900FA3846 /* WCThreadTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCThreadTableCellView.m; sourceTree = ""; }; 4CD7B71D18157B9D00FA3846 /* WCBadgedTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WCBadgedTableCellView.h; sourceTree = ""; }; 4CD7B71E18157B9D00FA3846 /* WCBadgedTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WCBadgedTableCellView.m; sourceTree = ""; }; - 4CDBF1FE14BC5501007142D3 /* SUPublicEDKey.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SUPublicEDKey.pem; sourceTree = ""; }; 4CDD88CC15F76F8000283005 /* wiredclientrnote.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = wiredclientrnote.html; sourceTree = ""; }; 4CE1533E1800D94A004DA093 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = vendor/Growl.framework; sourceTree = ""; }; 4CEFF6BC180C3FA600AD7AD9 /* WCThemesPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WCThemesPreferences.h; path = Sources/WCThemesPreferences.h; sourceTree = ""; }; @@ -816,7 +816,7 @@ 4C0667AA15DED4B400E8D810 /* Localizable.strings */, A565B4FF0D5DA94000AF91BA /* wired.xml */, 4CDD88CC15F76F8000283005 /* wiredclientrnote.html */, - 4CDBF1FE14BC5501007142D3 /* SUPublicEDKey.pem */, + 4C5BB6BA244624390089D6D2 /* dsa_pub.pem */, ); name = Resources; sourceTree = ""; @@ -1325,6 +1325,7 @@ A52B1C4706C408210033D317 /* Wired Client */ = { isa = PBXGroup; children = ( + 4C5BB6B9244618050089D6D2 /* Wired Client.entitlements */, A5E8BABF08748D6D0010F2A4 /* Config */, 4CF094B51559D669005D77BB /* Templates */, 29B97317FDCFA39411CA2CEA /* Resources */, @@ -1525,6 +1526,7 @@ LastUpgradeCheck = 1010; TargetAttributes = { 8D1107260486CEB800E47090 = { + DevelopmentTeam = 7KTXA5Y36K; ProvisioningStyle = Manual; }; }; @@ -1626,7 +1628,6 @@ A565B5000D5DA94000AF91BA /* wired.xml in Resources */, 4C5D666E1FE3C93000552E9E /* WiredTheme.icns in Resources */, 4C2602621FE096B7007E5A6C /* Assets.xcassets in Resources */, - 4CDBF1FF14BC5501007142D3 /* SUPublicEDKey.pem in Resources */, 4C5D666A1FE3C93000552E9E /* WiredBookmarks.icns in Resources */, 4CD51D5018155582002ADC1C /* ThreadView.xib in Resources */, 4C5D66681FE3C93000552E9E /* WiredServer.icns in Resources */, @@ -1654,6 +1655,7 @@ 4C0667F015DED67800E8D810 /* Files.xib in Resources */, 4C0667F615DED69900E8D810 /* Boards.xib in Resources */, 4C0667F915DED6A300E8D810 /* Transfers.xib in Resources */, + 4C5BB6BB244624390089D6D2 /* dsa_pub.pem in Resources */, 4C0667FC15DED6AE00E8D810 /* Administration.xib in Resources */, 4C06680215DED6D400E8D810 /* History.xib in Resources */, 4C06680515DED6E400E8D810 /* Console.xib in Resources */, @@ -1702,25 +1704,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#sh \"$SRCROOT/../wired_client_distribute_debug.sh\" >> \"$BUILT_PRODUCTS_DIR/wired_client_distribute_debug.log\"\n\nAPP_NAME=\"Wired Client\"\nDEBUG=\"Debug\"\nARCHIVE_BASE_NAME=\"WiredClient$DEBUG\"\nGITHUB_OWNER=\"nark\"\nGITHUB_REPO=\"WiredClient\"\nGITHUB_TOKEN=\"1778feed013536fac983528b0164f9c199349cf8\"\n\n# get verions\nMARKETING_VERSION=$(xcrun agvtool mvers -terse1)\nCURRENT_PROJECT_VERSION=$(xcrun agvtool vers -terse)\nTAG=\"$MARKETING_VERSION-$CURRENT_PROJECT_VERSION\"\n\n# prepare data for signing and archiving\nSIGN_TOOLS=\"$SRCROOT/../Sparkle-2.x/bin/\"\nPRIV_KEY=\"$SRCROOT/../dsa_priv.pem\"\nDATE=$(date +\"%a, %d %b %G %T\")\nARCHIVE_NAME=\"$ARCHIVE_BASE_NAME-$TAG.zip\"\nARCHIVE_PATH=\"$BUILT_PRODUCTS_DIR/$ARCHIVE_NAME\"\n# RELEASE_NOTE=\"$SRCROOT/wiredclientrnote.html\"\n\n # archive as zip with ditto\ncd \"$BUILT_PRODUCTS_DIR\"\nditto -c -k --sequesterRsrc --keepParent \"$APP_NAME.app\" \"$ARCHIVE_NAME\"\n\n# sign update for Sparkle\nLENGTH=$(stat -f %z $ARCHIVE_PATH)\n\n# sign update for Sparkle\nED_SIGN=$($SIGN_TOOLS/sign_update $ARCHIVE_PATH $PRIV_KEY)\necho $ED_SIGN > \"$BUILT_PRODUCTS_DIR/sign.txt\" # keep track of signature for manual check\n\n# auto-tag git/github\ncd \"$SRCROOT\"\n/usr/bin/git add --all\n/usr/bin/git commit -m \"Publish $ARCHIVE_NAME\"\n/usr/bin/git tag -a $TAG -m \"$ARCHIVE_BASE_NAME-$TAG\"\n/usr/bin/git push --follow-tags\n\n# update to GitHub release\n$SRCROOT/../release $GITHUB_OWNER/$GITHUB_REPO $TAG $DEBUG $TAG -- $ARCHIVE_PATH\n\nGITHUB_SCRIPT=\"$SRCROOT/../upload-github-release-asset.sh\"\n$GITHUB_SCRIPT github_api_token=$GITHUB_TOKEN owner=$GITHUB_OWNER repo=$GITHUB_REPO tag=$TAG filename=$ARCHIVE_PATH\n"; - }; - 4C5BB6942445E6A20089D6D2 /* Run Bump Version */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Bump Version"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#xcrun agvtool next-version -all\n"; + shellScript = "sh \"$SRCROOT/../wired_client_distribute.sh\" Debug >> \"$BUILT_PRODUCTS_DIR/wired_client_distribute_debug.log\"\n"; }; 4C8243FB17DE37C90065CEEE /* Generate Core Data Model */ = { isa = PBXShellScriptBuildPhase; @@ -1761,7 +1745,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "sh \"$SRCROOT/../../wired_client_distribute.sh\" || exit 1\n"; + shellScript = "sh \"$SRCROOT/../wired_client_distribute.sh\" >> \"$BUILT_PRODUCTS_DIR/wired_client_distribute.log\"\n"; }; 4CE1792E244078A0004EFD52 /* Code Sign */ = { isa = PBXShellScriptBuildPhase; @@ -2356,11 +2340,13 @@ ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_ENTITLEMENTS = "Wired Client.entitlements"; CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 42; + CURRENT_PROJECT_VERSION = 45; DEVELOPMENT_TEAM = 7KTXA5Y36K; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2608,11 +2594,13 @@ ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_WEAK = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = "Wired Client.entitlements"; + CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 42; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 45; + DEVELOPMENT_TEAM = 7KTXA5Y36K; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2710,8 +2698,10 @@ baseConfigurationReference = F7D369A6437514269AF02479 /* Pods-Wired Client.test.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_ENTITLEMENTS = "Wired Client.entitlements"; CODE_SIGN_IDENTITY = "-"; - CURRENT_PROJECT_VERSION = 42; + CURRENT_PROJECT_VERSION = 45; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Pods/Sparkle", diff --git a/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute Debug).xcscheme b/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute Debug).xcscheme new file mode 100644 index 00000000..80d14486 --- /dev/null +++ b/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute Debug).xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute).xcscheme b/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute).xcscheme new file mode 100644 index 00000000..124564df --- /dev/null +++ b/WiredClient.xcodeproj/xcshareddata/xcschemes/Wired Client (Distribute).xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WiredClient.xcodeproj/xcuserdata/nark.xcuserdatad/xcschemes/xcschememanagement.plist b/WiredClient.xcodeproj/xcuserdata/nark.xcuserdatad/xcschemes/xcschememanagement.plist index 25400c0a..8f3314ae 100644 --- a/WiredClient.xcodeproj/xcuserdata/nark.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/WiredClient.xcodeproj/xcuserdata/nark.xcuserdatad/xcschemes/xcschememanagement.plist @@ -47,6 +47,16 @@ SuppressBuildableAutocreation + 4C06678415DEC69800E8D810 + + primary + + + 4CDBF1EA14BC4CAF007142D3 + + primary + + 8D1107260486CEB800E47090 primary diff --git a/de.lproj/Boards.xib b/de.lproj/Boards.xib index 917e8a38..f2ef95c6 100755 --- a/de.lproj/Boards.xib +++ b/de.lproj/Boards.xib @@ -336,18 +336,18 @@ Gw - + - + - + - + @@ -363,9 +363,9 @@ Gw - + - + @@ -381,18 +381,18 @@ Gw - + - + - + - + @@ -452,7 +452,7 @@ Gw - + @@ -501,9 +501,9 @@ Gw - + - + @@ -519,18 +519,18 @@ Gw - + - + - + - + @@ -586,7 +586,7 @@ Gw - + @@ -879,7 +879,7 @@ Gw - + @@ -904,7 +904,7 @@ Gw - + @@ -922,7 +922,7 @@ Gw - + @@ -949,7 +949,7 @@ Gw - + @@ -975,7 +975,7 @@ Gw - + @@ -984,7 +984,7 @@ Gw - + @@ -997,7 +997,7 @@ Gw - + @@ -1031,6 +1031,7 @@ Gw + diff --git a/de.lproj/FileInfo.xib b/de.lproj/FileInfo.xib old mode 100644 new mode 100755 index 44abc2d9..37d50f0c --- a/de.lproj/FileInfo.xib +++ b/de.lproj/FileInfo.xib @@ -1,9 +1,8 @@ - + - - + @@ -43,18 +42,18 @@ - + - + - - + + @@ -62,8 +61,8 @@ - - + + @@ -71,8 +70,8 @@ - - + + @@ -80,7 +79,7 @@ - + @@ -93,8 +92,8 @@ - - + + @@ -102,7 +101,7 @@ - + @@ -111,7 +110,7 @@ - + @@ -120,7 +119,7 @@ - + @@ -129,7 +128,7 @@ - + @@ -138,7 +137,7 @@ - + @@ -150,16 +149,16 @@ - - + + - + - + @@ -174,7 +173,7 @@ - + @@ -183,16 +182,16 @@ - - + + - + - + @@ -228,8 +227,8 @@ - - + + @@ -237,7 +236,7 @@ - + @@ -246,7 +245,7 @@ - + @@ -255,8 +254,8 @@ - - + + @@ -264,7 +263,7 @@ - + @@ -280,7 +279,7 @@ - + @@ -296,7 +295,7 @@ - + @@ -312,7 +311,7 @@ - + @@ -321,8 +320,8 @@ - - + + @@ -336,6 +335,7 @@ + diff --git a/de.lproj/Files.xib b/de.lproj/Files.xib index ba644cf3..ec57d8c8 100755 --- a/de.lproj/Files.xib +++ b/de.lproj/Files.xib @@ -235,16 +235,16 @@ - + - - - + + + - + - + @@ -420,15 +420,6 @@ Gw - - - - - - - - - @@ -439,7 +430,7 @@ Gw - + @@ -448,7 +439,7 @@ Gw - + @@ -508,9 +499,18 @@ Gw + + + + + + + + + - + diff --git a/de.lproj/History.xib b/de.lproj/History.xib old mode 100644 new mode 100755 index ba453aae..79fbfa27 --- a/de.lproj/History.xib +++ b/de.lproj/History.xib @@ -1,10 +1,9 @@ - + - - - + + @@ -21,27 +20,27 @@ - + - + - + - + - + - + - + @@ -85,22 +84,22 @@ - + - + - + - + - + @@ -174,11 +173,11 @@ - + - + @@ -236,7 +235,7 @@ - + @@ -253,6 +252,7 @@ + diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings old mode 100644 new mode 100755 index c6a5e882..645c66e6 Binary files a/de.lproj/Localizable.strings and b/de.lproj/Localizable.strings differ diff --git a/de.lproj/Messages.xib b/de.lproj/Messages.xib index 5478adab..f60b919c 100755 --- a/de.lproj/Messages.xib +++ b/de.lproj/Messages.xib @@ -356,7 +356,7 @@ Gw - + diff --git a/de.lproj/Preferences.xib b/de.lproj/Preferences.xib index 70fc1b14..9fc74de6 100755 --- a/de.lproj/Preferences.xib +++ b/de.lproj/Preferences.xib @@ -1225,7 +1225,7 @@ - + @@ -1274,7 +1274,7 @@ - + - + @@ -1310,9 +1310,9 @@ - + diff --git a/dsa_pub.pem b/dsa_pub.pem index 003fdf65..62b03062 100644 --- a/dsa_pub.pem +++ b/dsa_pub.pem @@ -1,20 +1,20 @@ -----BEGIN PUBLIC KEY----- -MIIDOzCCAi4GByqGSM44BAEwggIhAoIBAQDernUgRplu4V8Iez8smomXhr6Ft6ek -zE+Ki5sqhh8Knr3gw0DYpRGwchDFp19RMrYsg4dRpOiEybtEjahWRz0nSL9wAwQw -DGgD6FIQ7y1Djs/0JgylQGYqjn1mjhMMwD34pqn6WK/fiEOnXakh/BYkT0bJ658S -Q/8bqSRDGaInlQShUyuFbz5FUH4wq8oJ1w89rIriqk8MHfRFb5RksOde+UaZRp7W -qz5kXoUP2SrSUfdiHuQAnPA8wzzdWNtY5zQ18SqYFUhwXb3/6xwlLk4qbno/EbpI -V58nReHRB5RZRJANK5DvJ4u5WX1aJ8xijKiVH/NXOPym5xbPMmXn14sRAhUAzob1 -w8cTRwLto4GvkvRGjF44K+UCggEBAMxkN1fRNy5xGSCL/P1I0jOyUqNeTNrrKIMW -Vf3QOjSfS29/yXUNzcv0LWaN6PtKurmwsrFhX4rLl1EmB5gL/CnEpzSZ5a1upCNA -wJVZyd8pjez2h7msiRU93dfdwwLRdsvUIMg6IF6oiab2k8a0Crvdo3xDVaXaYkby -5eu6P+RRwAWKwGE2GlkoGQhO0Nn1KhtcMDGIw0H5C/Mj+wN2Iei7CjAcLaN7lF54 -tjAXkm6xsHetdk61wKQ76yfXpYIK38Xyz1RuLjg06g76jtggSvbcACwu8auOhWo5 -HG6oNU4Xypd4Dh+h0j42SceygRI6HaRXSt98mFMTcDrLVm0cqmgDggEFAAKCAQBU -hLu29BsjjcK+0v/FGcZN+xs7qDuurPp0oWMZjI5D8JmJBiAYd1AHqcPf4GE2wqUS -WsPkqCOp6UeTjdCv0L1kBMTCQV1FOz3mdYDyr2qkFq0X2CxD5gAxrkaunTYNuOHU -Pf8dDNtP8lRz2AVLPnF3GeXsH+K6r9wI48IQuorF8jILpajWcDqJeKHTtMSJZftQ -1WMAXeayxeRiXpnUAnNkm3qBje7IjZ1i36kHJ/xyiwl0xLTUUYY3Thuexm5Zrhuw -gJ/+Y1Xs/TsibytA7CdoUYyWkdkta3NJh9NmEr+RnvKLUpW6P/6pfaDQ6aHcWnhn -rsLTR6iyqOW8AfE/CAgB +MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQCRkPwKmM00VGB3zmrsnJsjYbyDocGb ++0q9h+03xNYD4B5QdVlsQXaUu6XBtutVjTTSxn81g75mz/IpDPoOaKnbpfAoZuwx +00Q61qMD+m2PLmUDsEmxAnwoZJ6yeJEPw+NzZaNZkR4eMB6orkJn5CejBA7wo88V +2m6lJbSqwJmsnZPTM2I5WRJqO+63/xLySQTc/Puc+JAc3yKN7dBHzuwrtQd8wCxR +zCpDcXys3jYJadFy2698n2tQ3bl6Pe0etMl9FQ3q5RJXiNBqnvmV0clNlMXkRkVe +bBHxSHbAfydhHO2q9YyEM3NXJOxourM1WVfyVejVM+erucJO5X3I7gBPAhUAxFH9 +UV8ONqb4c9Cq+Wx5jphaN8cCggEAfJp3eKjfeKq0Wylkmu3P1JWNrHOw0FPAxpGu +4RM/3lUSdMXK2bjidVCp0dPEkkIKrkBjCyB1J3o8gC5cN1fV7amHPMap41SjhR+o +kPKV7RWP04VVrMob3cr7opJPe1CXY5VwXb53bCOPCsx1GOZiq3mS3Y/blyWjTo6V +mCJUDlGVYXmztfNNMubGuMwW7t787fOfpXP91AduCKQwayHlkV/O1rh7a/r6JnnV +ZYAK4Z8NC2PYJ3M6fj+PKS4d+DJP4/wfECgNK5VbmU567lKpTjQTw8iuhpauCzA+ +ytGPF+5cYhFXDqCNIn7iN1YB58zXjzfzuxeGToF1MHT4xjyX3QOCAQYAAoIBAQCG +YHDeTL/C20WyYlDXUDayZVwPYKqjj+Dy0bSfB3L2tM+c1udyUc6wdkhkirsXXJ/s +rJE3RTEP1kAC8DqtCyiSkq2AS6f+jYPeqBnOqAAviywFaYNGbk0zu41ytdu60TZm +N0Se4HqyvOB8DGhCNU7KszZPfVHGQM5QE9ap6XUdH+mX0Ws3dPFIqdRBYKleSoh2 +DGWTQlk0/yeV9Bd/0pnmgwYhlEwXOdud+nD/+GOF/o10wnGBaQEL54KCaR+t+RTd +6nvZ9+dmdPsVOxqo04rVg9/1JH5r8naqCEznHz64cNNjdGRs6LEZZomxHaXMcwms +AMZcSK2rWPpreypQqHTQ -----END PUBLIC KEY----- diff --git a/en.lproj/FileInfo.xib b/en.lproj/FileInfo.xib old mode 100644 new mode 100755 index dd3ed971..693be21e --- a/en.lproj/FileInfo.xib +++ b/en.lproj/FileInfo.xib @@ -1,9 +1,8 @@ - + - - + @@ -43,17 +42,17 @@ - + - + - + @@ -62,7 +61,7 @@ - + @@ -71,7 +70,7 @@ - + @@ -80,7 +79,7 @@ - + @@ -93,7 +92,7 @@ - + @@ -102,7 +101,7 @@ - + @@ -111,7 +110,7 @@ - + @@ -120,7 +119,7 @@ - + @@ -129,7 +128,7 @@ - + @@ -138,7 +137,7 @@ - + @@ -150,7 +149,7 @@ - + @@ -159,7 +158,7 @@ - + @@ -174,7 +173,7 @@ - + @@ -183,7 +182,7 @@ - + @@ -192,7 +191,7 @@ - + @@ -228,7 +227,7 @@ - + @@ -237,7 +236,7 @@ - + @@ -246,7 +245,7 @@ - + @@ -255,7 +254,7 @@ - + @@ -264,7 +263,7 @@ - + @@ -280,7 +279,7 @@ - + @@ -296,7 +295,7 @@ - + @@ -312,7 +311,7 @@ - + @@ -321,7 +320,7 @@ - + @@ -336,6 +335,7 @@ + diff --git a/en.lproj/Files.xib b/en.lproj/Files.xib index 434d7542..95245501 100755 --- a/en.lproj/Files.xib +++ b/en.lproj/Files.xib @@ -1,8 +1,8 @@ - + - + @@ -52,7 +52,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -74,25 +74,24 @@ - + - + - - + @@ -106,11 +105,11 @@ -