r87296 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r87295‎ | r87296 | r87297 >
Date:21:10, 2 May 2011
Author:hartman
Status:deferred (Comments)
Tags:
Comment:
* Impove localization.
* Add Dutch localization
Modified paths:
  • /trunk/tools/WikiSnaps/Classes/ImageDetailsViewController.h (modified) (history)
  • /trunk/tools/WikiSnaps/Classes/ImageDetailsViewController.m (modified) (history)
  • /trunk/tools/WikiSnaps/Classes/SettingsViewController.m (modified) (history)
  • /trunk/tools/WikiSnaps/Dutch.lproj (added) (history)
  • /trunk/tools/WikiSnaps/Dutch.lproj/Localizable.strings (added) (history)
  • /trunk/tools/WikiSnaps/English.lproj (added) (history)
  • /trunk/tools/WikiSnaps/English.lproj/Licenses.plist (added) (history)
  • /trunk/tools/WikiSnaps/English.lproj/Localizable.strings (added) (history)
  • /trunk/tools/WikiSnaps/ImageDetailsViewController.xib (modified) (history)
  • /trunk/tools/WikiSnaps/Licenses.plist (deleted) (history)
  • /trunk/tools/WikiSnaps/WikiSnaps.xcodeproj/project.pbxproj (modified) (history)

Diff [purge]

Index: trunk/tools/WikiSnaps/Licenses.plist
@@ -1,113 +0,0 @@
2 -<?xml version="1.0" encoding="UTF-8"?>
3 -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4 -<plist version="1.0">
5 -<array>
6 - <dict>
7 - <key>name</key>
8 - <string>Creative Commons Attribution Share-Alike 3.0</string>
9 - <key>short</key>
10 - <string>CC-BY-SA-3.0</string>
11 - <key>template</key>
12 - <string>{{self|1=cc-by-sa-3.0|author=$author|attribution=$attribution}}</string>
13 - <key>description</key>
14 - <string>&lt;html&gt;
15 -&lt;head&gt;
16 -&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
17 -&lt;/head&gt;
18 -&lt;body&gt;
19 -&lt;h4&gt;You are free:&lt;/h4&gt;
20 -&lt;ul&gt;
21 -&lt;li&gt;&lt;b&gt;to Share&lt;/b&gt; — to copy, distribute and transmit the work&lt;/li&gt;
22 -&lt;li&gt;&lt;b&gt;to Remix&lt;/b&gt; — to adapt the work&lt;/li&gt;
23 -&lt;/ul&gt;
24 -&lt;h4&gt;Under the following conditions:&lt;/h4&gt;
25 -&lt;ul&gt;
26 -&lt;li&gt;&lt;b&gt;Attribution&lt;/b&gt; — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).&lt;/li&gt;
27 -&lt;li&gt;&lt;b&gt;Share Alike&lt;/b&gt; — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.&lt;/li&gt;
28 -&lt;/ul&gt;
29 -&lt;h4&gt;With the understanding that:&lt;/h4&gt;
30 -&lt;ul&gt;
31 -&lt;li&gt;&lt;b&gt;Waiver&lt;/b&gt; — Any of the above conditions can be &lt;b&gt;&lt;u&gt;waived&lt;/u&gt;&lt;/b&gt; if you get permission from the copyright holder.&lt;/li&gt;
32 -&lt;li&gt;&lt;b&gt;Public Domain&lt;/b&gt; — Where the work or any of its elements is in the &lt;b&gt;&lt;u&gt;public domain&lt;/u&gt;&lt;/b&gt; under applicable law, that status is in no way affected by the license.&lt;/li&gt;
33 -&lt;li&gt;&lt;b&gt;Other Rights&lt;/b&gt; — In no way are any of the following rights affected by the license:
34 -&lt;ul&gt;
35 -&lt;li&gt;Your fair dealing or &lt;b&gt;&lt;u&gt;fair use&lt;/u&gt;&lt;/b&gt; rights, or other applicable copyright exceptions and limitations;
36 -&lt;li&gt;The author&apos;s &lt;b&gt;&lt;u&gt;moral&lt;/u&gt;&lt;/b&gt; rights;
37 -&lt;li&gt;Rights other persons may have either in the work itself or in how the work is used, such as &lt;b&gt;&lt;u&gt;publicity&lt;/u&gt;&lt;/b&gt; or privacy rights.
38 -&lt;/ul&gt;&lt;/li&gt;
39 -&lt;li&gt;&lt;b&gt;Notice&lt;/b&gt; — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.&lt;/li&gt;
40 -&lt;/ul&gt;
41 -&lt;p&gt;
42 -This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/licenses/by-sa/3.0/legalcode&quot;&gt;Legal Code (the full license)&lt;/a&gt;.
43 -&lt;/body&gt;
44 -&lt;/html&gt;</string>
45 - </dict>
46 - <dict>
47 - <key>name</key>
48 - <string>Creative Commons Attribution 3.0</string>
49 - <key>short</key>
50 - <string>CC-BY-3.0</string>
51 - <key>template</key>
52 - <string>{{self|1=cc-by-3.0|author=$author|attribution=$attribution}}</string>
53 - <key>description</key>
54 - <string>&lt;html&gt;
55 -&lt;head&gt;
56 -&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
57 -&lt;/head&gt;
58 -&lt;body&gt;
59 -&lt;h4&gt;You are free:&lt;/h4&gt;
60 -&lt;ul&gt;
61 -&lt;li&gt;&lt;b&gt;to Share&lt;/b&gt; — to copy, distribute and transmit the work&lt;/li&gt;
62 -&lt;li&gt;&lt;b&gt;to Remix&lt;/b&gt; — to adapt the work&lt;/li&gt;
63 -&lt;/ul&gt;
64 -&lt;h4&gt;Under the following conditions:&lt;/h4&gt;
65 -&lt;ul&gt;
66 -&lt;li&gt;&lt;b&gt;Attribution&lt;/b&gt; — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).&lt;/li&gt;
67 -&lt;/ul&gt;
68 -&lt;h4&gt;With the understanding that:&lt;/h4&gt;
69 -&lt;ul&gt;
70 -&lt;li&gt;&lt;b&gt;Waiver&lt;/b&gt; — Any of the above conditions can be &lt;b&gt;&lt;u&gt;waived&lt;/u&gt;&lt;/b&gt; if you get permission from the copyright holder.&lt;/li&gt;
71 -&lt;li&gt;&lt;b&gt;Public Domain&lt;/b&gt; — Where the work or any of its elements is in the &lt;b&gt;&lt;u&gt;public domain&lt;/u&gt;&lt;/b&gt; under applicable law, that status is in no way affected by the license.&lt;/li&gt;
72 -&lt;li&gt;&lt;b&gt;Other Rights&lt;/b&gt; — In no way are any of the following rights affected by the license:
73 -&lt;ul&gt;
74 -&lt;li&gt;Your fair dealing or &lt;b&gt;&lt;u&gt;fair use&lt;/u&gt;&lt;/b&gt; rights, or other applicable copyright exceptions and limitations;
75 -&lt;li&gt;The author&apos;s &lt;b&gt;&lt;u&gt;moral&lt;/u&gt;&lt;/b&gt; rights;
76 -&lt;li&gt;Rights other persons may have either in the work itself or in how the work is used, such as &lt;b&gt;&lt;u&gt;publicity&lt;/u&gt;&lt;/b&gt; or privacy rights.
77 -&lt;/ul&gt;&lt;/li&gt;
78 -&lt;li&gt;&lt;b&gt;Notice&lt;/b&gt; — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.&lt;/li&gt;
79 -&lt;/ul&gt;
80 -&lt;p&gt;
81 -This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/licenses/by/3.0/legalcode&quot;&gt;Legal Code (the full license)&lt;/a&gt;.
82 -&lt;/body&gt;
83 -&lt;/html&gt;</string>
84 - </dict>
85 - <dict>
86 - <key>name</key>
87 - <string>Universal Public Domain Dedication</string>
88 - <key>short</key>
89 - <string>CC-Zero</string>
90 - <key>template</key>
91 - <string>{{self|1=cc-zero|author=$author|attribution=$attribution}}</string>
92 - <key>description</key>
93 - <string>&lt;html&gt;
94 -&lt;head&gt;
95 -&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
96 -&lt;/head&gt;
97 -&lt;body&gt;
98 -&lt;h4&gt;No Copyright&lt;/h4&gt;
99 -The person who associated a work with this deed has &lt;b&gt;dedicated&lt;/b&gt; the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.&lt;/p&gt;
100 -&lt;p&gt;You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See &lt;b&gt;Other Information&lt;/b&gt; below.
101 -
102 -&lt;h4&gt;Other Information&lt;/h4&gt;
103 -&lt;ul&gt;
104 -&lt;li&gt;In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
105 -&lt;li&gt;Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.
106 -&lt;/li&gt;When using or citing the work, you should not imply endorsement by the author or the affirmer.
107 -&lt;/ul&gt;
108 -
109 -&lt;p&gt;This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/publicdomain/zero/1.0/legalcode&quot;&gt;Legal Code (read the full text)&lt;/a&gt;.&lt;/p&gt;
110 -&lt;/body&gt;
111 -&lt;/html&gt;</string>
112 - </dict>
113 -</array>
114 -</plist>
Index: trunk/tools/WikiSnaps/Dutch.lproj/Localizable.strings
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/tools/WikiSnaps/Dutch.lproj/Localizable.strings
___________________________________________________________________
Added: svn:mime-type
1151 + application/octet-stream
Index: trunk/tools/WikiSnaps/Classes/ImageDetailsViewController.m
@@ -15,6 +15,7 @@
1616
1717 @synthesize titleField;
1818 @synthesize descriptionText;
 19+@synthesize descriptionLabel;
1920 @synthesize upload;
2021
2122 // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
@@ -32,7 +33,9 @@
3334 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
3435 - (void)viewDidLoad {
3536 [super viewDidLoad];
36 - self.title = NSLocalizedString( @"Image details", "Title of the Image Details view" );
 37+ self.title = NSLocalizedString( @"Image details", @"Title of the Image Details view" );
 38+ self.titleField.placeholder = NSLocalizedString( @"File title", @"Placeholder text for the title field in imagedetails window" );
 39+ self.descriptionLabel.text = NSLocalizedString( @"Description", @"Label for the Description field of the upload" );
3740 self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle: NSLocalizedString( @"Upload", @"Title for upload buton on image details view" )
3841 style: UIBarButtonItemStyleDone
3942 target: self
Index: trunk/tools/WikiSnaps/Classes/SettingsViewController.m
@@ -40,6 +40,9 @@
4141 passwordLabel.text = NSLocalizedString( @"Password", @"Label of the password textfield" );
4242 licenseLabel.text = NSLocalizedString( @"LicenseLabel", @"Label of the license textfield" );
4343 gpsLabel.text = NSLocalizedString( @"Add GPS coordinates", @"Label of the gps coordinates settings switch" );
 44+ username.placeholder = NSLocalizedString( @"Username", nil);
 45+ password.placeholder = NSLocalizedString( @"Password", nil);
 46+ save.titleLabel.text = NSLocalizedString( @"Save", @"Label of save button" );
4447
4548 PhotoPickerAppDelegate *appDelegate =
4649 (PhotoPickerAppDelegate *) [UIApplication sharedApplication].delegate;
Index: trunk/tools/WikiSnaps/Classes/ImageDetailsViewController.h
@@ -16,12 +16,14 @@
1717 UITextViewDelegate,
1818 UIAlertViewDelegate> {
1919 IBOutlet UITextField *titleField;
20 - IBOutlet UITextView *descriptionText;
 20+ IBOutlet UITextView *descriptionText;
 21+ IBOutlet UILabel *descriptionLabel;
2122 CommonsUpload *upload;
2223 }
2324
2425 @property (nonatomic, retain) UITextField *titleField;
2526 @property (nonatomic, retain) UITextView *descriptionText;
 27+@property (nonatomic, retain) UILabel *descriptionLabel;
2628 @property (nonatomic, retain) CommonsUpload *upload;
2729
2830 - (IBAction)textFieldDidEnd:(id)sender;
Index: trunk/tools/WikiSnaps/WikiSnaps.xcodeproj/project.pbxproj
@@ -22,9 +22,10 @@
2323 494C82C812ECBEB6000931F2 /* ImageUploadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 494C82C612ECBEB6000931F2 /* ImageUploadViewController.m */; };
2424 494C82C912ECBEB6000931F2 /* ImageUploadViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 494C82C712ECBEB6000931F2 /* ImageUploadViewController.xib */; };
2525 494C834E12ECEAB3000931F2 /* XMLReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 494C834D12ECEAB3000931F2 /* XMLReader.m */; };
26 - 4971EC87133E77FD0043DD67 /* Licenses.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4971EC86133E77FD0043DD67 /* Licenses.plist */; };
2726 4971ED31133E9DD90043DD67 /* LicensePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4971ED2F133E9DD90043DD67 /* LicensePickerViewController.m */; };
2827 4971ED32133E9DD90043DD67 /* LicensePickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4971ED30133E9DD90043DD67 /* LicensePickerViewController.xib */; };
 28+ 49A4F126136DE7170067DAE7 /* Licenses.plist in Resources */ = {isa = PBXBuildFile; fileRef = 49A4F125136DE7170067DAE7 /* Licenses.plist */; };
 29+ 49A4F12B136DE9B50067DAE7 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 49A4F129136DE9B50067DAE7 /* Localizable.strings */; };
2930 49E03406133F6C1300BFE247 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49E03405133F6C1300BFE247 /* CoreLocation.framework */; };
3031 49E0340A133F72A100BFE247 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49E03409133F72A100BFE247 /* AssetsLibrary.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
3132 49E03463133F814D00BFE247 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 49E03462133F814D00BFE247 /* ImageIO.framework */; };
@@ -48,7 +49,6 @@
4950 A1FECB2D12E10DCA007CF08C /* ImageDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A1FECB2B12E10DCA007CF08C /* ImageDetailsViewController.xib */; };
5051 A1FECB3E12E1105B007CF08C /* CommonsUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = A1FECB3D12E1105B007CF08C /* CommonsUpload.m */; };
5152 F130561C10CEDA5C00271CD6 /* home-background.png in Resources */ = {isa = PBXBuildFile; fileRef = F130561B10CEDA5C00271CD6 /* home-background.png */; };
52 - F130561F10CEDBAC00271CD6 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = F130561E10CEDBAC00271CD6 /* Configuration.m */; };
5353 F13056EF10CEEB3100271CD6 /* cancel-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = F13056ED10CEEB3100271CD6 /* cancel-button-pressed.png */; };
5454 F13056F010CEEB3100271CD6 /* cancel-button.png in Resources */ = {isa = PBXBuildFile; fileRef = F13056EE10CEEB3100271CD6 /* cancel-button.png */; };
5555 F1A2673110C9C04A0044762E /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = F1A2672F10C9C04A0044762E /* icon.png */; };
@@ -79,10 +79,12 @@
8080 494C82C712ECBEB6000931F2 /* ImageUploadViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageUploadViewController.xib; sourceTree = "<group>"; };
8181 494C834C12ECEAB3000931F2 /* XMLReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMLReader.h; path = XMLtoDict/XMLReader.h; sourceTree = "<group>"; };
8282 494C834D12ECEAB3000931F2 /* XMLReader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XMLReader.m; path = XMLtoDict/XMLReader.m; sourceTree = "<group>"; };
83 - 4971EC86133E77FD0043DD67 /* Licenses.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Licenses.plist; sourceTree = "<group>"; };
 83+ 4971EC86133E77FD0043DD67 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/Licenses.plist; sourceTree = "<group>"; };
8484 4971ED2E133E9DD90043DD67 /* LicensePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LicensePickerViewController.h; sourceTree = "<group>"; };
8585 4971ED2F133E9DD90043DD67 /* LicensePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LicensePickerViewController.m; sourceTree = "<group>"; };
8686 4971ED30133E9DD90043DD67 /* LicensePickerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = LicensePickerViewController.xib; path = Classes/LicensePickerViewController.xib; sourceTree = "<group>"; };
 87+ 49A4F12A136DE9B50067DAE7 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
 88+ 49A4F169136F46DD0067DAE7 /* Dutch */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = Dutch; path = Dutch.lproj/Localizable.strings; sourceTree = "<group>"; };
8789 49E03405133F6C1300BFE247 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
8890 49E03409133F72A100BFE247 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
8991 49E03462133F814D00BFE247 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
@@ -124,7 +126,6 @@
125127 A1FECB3D12E1105B007CF08C /* CommonsUpload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommonsUpload.m; sourceTree = "<group>"; };
126128 F130561B10CEDA5C00271CD6 /* home-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "home-background.png"; sourceTree = "<group>"; };
127129 F130561D10CEDBAC00271CD6 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Configuration.h; sourceTree = "<group>"; };
128 - F130561E10CEDBAC00271CD6 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Configuration.m; sourceTree = "<group>"; };
129130 F13056ED10CEEB3100271CD6 /* cancel-button-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel-button-pressed.png"; sourceTree = "<group>"; };
130131 F13056EE10CEEB3100271CD6 /* cancel-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "cancel-button.png"; sourceTree = "<group>"; };
131132 F1A2672F10C9C04A0044762E /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
@@ -164,7 +165,6 @@
165166 A1338B7112E0EFFF00662B28 /* ASI */,
166167 494C833E12ECE900000931F2 /* XMLtoDict */,
167168 F130561D10CEDBAC00271CD6 /* Configuration.h */,
168 - F130561E10CEDBAC00271CD6 /* Configuration.m */,
169169 F1A2691010C9D8EE0044762E /* NSData+PhotoPicker.h */,
170170 F1A2691110C9D8EE0044762E /* NSData+PhotoPicker.m */,
171171 F1A269AF10C9EA8A0044762E /* UIImage+PhotoPicker.h */,
@@ -221,10 +221,11 @@
222222 29B97317FDCFA39411CA2CEA /* Resources */ = {
223223 isa = PBXGroup;
224224 children = (
 225+ 49A4F129136DE9B50067DAE7 /* Localizable.strings */,
225226 494C82FA12ECDE94000931F2 /* Images */,
226227 494C82FB12ECDEA6000931F2 /* Xibs */,
227228 8D1107310486CEB800E47090 /* WikiSnaps-Info.plist */,
228 - 4971EC86133E77FD0043DD67 /* Licenses.plist */,
 229+ 49A4F125136DE7170067DAE7 /* Licenses.plist */,
229230 );
230231 name = Resources;
231232 sourceTree = "<group>";
@@ -357,6 +358,7 @@
358359 Japanese,
359360 French,
360361 German,
 362+ Dutch,
361363 );
362364 mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
363365 projectDirPath = "";
@@ -384,8 +386,9 @@
385387 494C81E212E8DBAD000931F2 /* Default.png in Resources */,
386388 494C821312E8E385000931F2 /* SourcePickerViewController.xib in Resources */,
387389 494C82C912ECBEB6000931F2 /* ImageUploadViewController.xib in Resources */,
388 - 4971EC87133E77FD0043DD67 /* Licenses.plist in Resources */,
 390+ 49A4F126136DE7170067DAE7 /* Licenses.plist in Resources */,
389391 4971ED32133E9DD90043DD67 /* LicensePickerViewController.xib in Resources */,
 392+ 49A4F12B136DE9B50067DAE7 /* Localizable.strings in Resources */,
390393 );
391394 runOnlyForDeploymentPostprocessing = 0;
392395 };
@@ -400,7 +403,6 @@
401404 1D3623260D0F684500981E51 /* PhotoPickerAppDelegate.m in Sources */,
402405 F1A2691210C9D8EE0044762E /* NSData+PhotoPicker.m in Sources */,
403406 F1A269B110C9EA8A0044762E /* UIImage+PhotoPicker.m in Sources */,
404 - F130561F10CEDBAC00271CD6 /* Configuration.m in Sources */,
405407 A127DA4012E0DF9700149FC9 /* SettingsViewController.m in Sources */,
406408 A1338B8612E0F01700662B28 /* ASIAuthenticationDialog.m in Sources */,
407409 A1338B8712E0F01700662B28 /* ASIDataCompressor.m in Sources */,
@@ -423,6 +425,26 @@
424426 };
425427 /* End PBXSourcesBuildPhase section */
426428
 429+/* Begin PBXVariantGroup section */
 430+ 49A4F125136DE7170067DAE7 /* Licenses.plist */ = {
 431+ isa = PBXVariantGroup;
 432+ children = (
 433+ 4971EC86133E77FD0043DD67 /* English */,
 434+ );
 435+ name = Licenses.plist;
 436+ sourceTree = "<group>";
 437+ };
 438+ 49A4F129136DE9B50067DAE7 /* Localizable.strings */ = {
 439+ isa = PBXVariantGroup;
 440+ children = (
 441+ 49A4F12A136DE9B50067DAE7 /* English */,
 442+ 49A4F169136F46DD0067DAE7 /* Dutch */,
 443+ );
 444+ name = Localizable.strings;
 445+ sourceTree = "<group>";
 446+ };
 447+/* End PBXVariantGroup section */
 448+
427449 /* Begin XCBuildConfiguration section */
428450 1D6058940D05DD3E006BFB54 /* Debug */ = {
429451 isa = XCBuildConfiguration;
Index: trunk/tools/WikiSnaps/ImageDetailsViewController.xib
@@ -2,10 +2,10 @@
33 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
44 <data>
55 <int key="IBDocument.SystemTarget">1056</int>
6 - <string key="IBDocument.SystemVersion">10J567</string>
 6+ <string key="IBDocument.SystemVersion">10J869</string>
77 <string key="IBDocument.InterfaceBuilderVersion">823</string>
88 <string key="IBDocument.AppKitVersion">1038.35</string>
9 - <string key="IBDocument.HIToolboxVersion">462.00</string>
 9+ <string key="IBDocument.HIToolboxVersion">461.00</string>
1010 <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1111 <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
1212 <string key="NS.object.0">132</string>
@@ -202,6 +202,14 @@
203203 </object>
204204 <int key="connectionID">17</int>
205205 </object>
 206+ <object class="IBConnectionRecord">
 207+ <object class="IBCocoaTouchOutletConnection" key="connection">
 208+ <string key="label">descriptionLabel</string>
 209+ <reference key="source" ref="372490531"/>
 210+ <reference key="destination" ref="995657542"/>
 211+ </object>
 212+ <int key="connectionID">18</int>
 213+ </object>
206214 </object>
207215 <object class="IBMutableOrderedSet" key="objectRecords">
208216 <object class="NSArray" key="orderedObjects">
@@ -298,7 +306,7 @@
299307 </object>
300308 </object>
301309 <nil key="sourceID"/>
302 - <int key="maxID">17</int>
 310+ <int key="maxID">18</int>
303311 </object>
304312 <object class="IBClassDescriber" key="IBDocument.Classes">
305313 <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -342,11 +350,13 @@
343351 <bool key="EncodedWithXMLCoder">YES</bool>
344352 <object class="NSArray" key="dict.sortedKeys">
345353 <bool key="EncodedWithXMLCoder">YES</bool>
 354+ <string>descriptionLabel</string>
346355 <string>descriptionText</string>
347356 <string>titleField</string>
348357 </object>
349358 <object class="NSMutableArray" key="dict.values">
350359 <bool key="EncodedWithXMLCoder">YES</bool>
 360+ <string>UILabel</string>
351361 <string>UITextView</string>
352362 <string>UITextField</string>
353363 </object>
@@ -355,12 +365,17 @@
356366 <bool key="EncodedWithXMLCoder">YES</bool>
357367 <object class="NSArray" key="dict.sortedKeys">
358368 <bool key="EncodedWithXMLCoder">YES</bool>
 369+ <string>descriptionLabel</string>
359370 <string>descriptionText</string>
360371 <string>titleField</string>
361372 </object>
362373 <object class="NSMutableArray" key="dict.values">
363374 <bool key="EncodedWithXMLCoder">YES</bool>
364375 <object class="IBToOneOutletInfo">
 376+ <string key="name">descriptionLabel</string>
 377+ <string key="candidateClassName">UILabel</string>
 378+ </object>
 379+ <object class="IBToOneOutletInfo">
365380 <string key="name">descriptionText</string>
366381 <string key="candidateClassName">UITextView</string>
367382 </object>
Index: trunk/tools/WikiSnaps/English.lproj/Licenses.plist
@@ -0,0 +1,113 @@
 2+<?xml version="1.0" encoding="UTF-8"?>
 3+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 4+<plist version="1.0">
 5+<array>
 6+ <dict>
 7+ <key>name</key>
 8+ <string>Creative Commons Attribution Share-Alike 3.0</string>
 9+ <key>short</key>
 10+ <string>CC-BY-SA-3.0</string>
 11+ <key>template</key>
 12+ <string>{{self|1=cc-by-sa-3.0|author=$author|attribution=$attribution}}</string>
 13+ <key>description</key>
 14+ <string>&lt;html&gt;
 15+&lt;head&gt;
 16+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
 17+&lt;/head&gt;
 18+&lt;body&gt;
 19+&lt;h4&gt;You are free:&lt;/h4&gt;
 20+&lt;ul&gt;
 21+&lt;li&gt;&lt;b&gt;to Share&lt;/b&gt; — to copy, distribute and transmit the work&lt;/li&gt;
 22+&lt;li&gt;&lt;b&gt;to Remix&lt;/b&gt; — to adapt the work&lt;/li&gt;
 23+&lt;/ul&gt;
 24+&lt;h4&gt;Under the following conditions:&lt;/h4&gt;
 25+&lt;ul&gt;
 26+&lt;li&gt;&lt;b&gt;Attribution&lt;/b&gt; — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).&lt;/li&gt;
 27+&lt;li&gt;&lt;b&gt;Share Alike&lt;/b&gt; — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.&lt;/li&gt;
 28+&lt;/ul&gt;
 29+&lt;h4&gt;With the understanding that:&lt;/h4&gt;
 30+&lt;ul&gt;
 31+&lt;li&gt;&lt;b&gt;Waiver&lt;/b&gt; — Any of the above conditions can be &lt;b&gt;&lt;u&gt;waived&lt;/u&gt;&lt;/b&gt; if you get permission from the copyright holder.&lt;/li&gt;
 32+&lt;li&gt;&lt;b&gt;Public Domain&lt;/b&gt; — Where the work or any of its elements is in the &lt;b&gt;&lt;u&gt;public domain&lt;/u&gt;&lt;/b&gt; under applicable law, that status is in no way affected by the license.&lt;/li&gt;
 33+&lt;li&gt;&lt;b&gt;Other Rights&lt;/b&gt; — In no way are any of the following rights affected by the license:
 34+&lt;ul&gt;
 35+&lt;li&gt;Your fair dealing or &lt;b&gt;&lt;u&gt;fair use&lt;/u&gt;&lt;/b&gt; rights, or other applicable copyright exceptions and limitations;
 36+&lt;li&gt;The author&apos;s &lt;b&gt;&lt;u&gt;moral&lt;/u&gt;&lt;/b&gt; rights;
 37+&lt;li&gt;Rights other persons may have either in the work itself or in how the work is used, such as &lt;b&gt;&lt;u&gt;publicity&lt;/u&gt;&lt;/b&gt; or privacy rights.
 38+&lt;/ul&gt;&lt;/li&gt;
 39+&lt;li&gt;&lt;b&gt;Notice&lt;/b&gt; — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.&lt;/li&gt;
 40+&lt;/ul&gt;
 41+&lt;p&gt;
 42+This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/licenses/by-sa/3.0/legalcode&quot;&gt;Legal Code (the full license)&lt;/a&gt;.
 43+&lt;/body&gt;
 44+&lt;/html&gt;</string>
 45+ </dict>
 46+ <dict>
 47+ <key>name</key>
 48+ <string>Creative Commons Attribution 3.0</string>
 49+ <key>short</key>
 50+ <string>CC-BY-3.0</string>
 51+ <key>template</key>
 52+ <string>{{self|1=cc-by-3.0|author=$author|attribution=$attribution}}</string>
 53+ <key>description</key>
 54+ <string>&lt;html&gt;
 55+&lt;head&gt;
 56+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
 57+&lt;/head&gt;
 58+&lt;body&gt;
 59+&lt;h4&gt;You are free:&lt;/h4&gt;
 60+&lt;ul&gt;
 61+&lt;li&gt;&lt;b&gt;to Share&lt;/b&gt; — to copy, distribute and transmit the work&lt;/li&gt;
 62+&lt;li&gt;&lt;b&gt;to Remix&lt;/b&gt; — to adapt the work&lt;/li&gt;
 63+&lt;/ul&gt;
 64+&lt;h4&gt;Under the following conditions:&lt;/h4&gt;
 65+&lt;ul&gt;
 66+&lt;li&gt;&lt;b&gt;Attribution&lt;/b&gt; — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).&lt;/li&gt;
 67+&lt;/ul&gt;
 68+&lt;h4&gt;With the understanding that:&lt;/h4&gt;
 69+&lt;ul&gt;
 70+&lt;li&gt;&lt;b&gt;Waiver&lt;/b&gt; — Any of the above conditions can be &lt;b&gt;&lt;u&gt;waived&lt;/u&gt;&lt;/b&gt; if you get permission from the copyright holder.&lt;/li&gt;
 71+&lt;li&gt;&lt;b&gt;Public Domain&lt;/b&gt; — Where the work or any of its elements is in the &lt;b&gt;&lt;u&gt;public domain&lt;/u&gt;&lt;/b&gt; under applicable law, that status is in no way affected by the license.&lt;/li&gt;
 72+&lt;li&gt;&lt;b&gt;Other Rights&lt;/b&gt; — In no way are any of the following rights affected by the license:
 73+&lt;ul&gt;
 74+&lt;li&gt;Your fair dealing or &lt;b&gt;&lt;u&gt;fair use&lt;/u&gt;&lt;/b&gt; rights, or other applicable copyright exceptions and limitations;
 75+&lt;li&gt;The author&apos;s &lt;b&gt;&lt;u&gt;moral&lt;/u&gt;&lt;/b&gt; rights;
 76+&lt;li&gt;Rights other persons may have either in the work itself or in how the work is used, such as &lt;b&gt;&lt;u&gt;publicity&lt;/u&gt;&lt;/b&gt; or privacy rights.
 77+&lt;/ul&gt;&lt;/li&gt;
 78+&lt;li&gt;&lt;b&gt;Notice&lt;/b&gt; — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.&lt;/li&gt;
 79+&lt;/ul&gt;
 80+&lt;p&gt;
 81+This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/licenses/by/3.0/legalcode&quot;&gt;Legal Code (the full license)&lt;/a&gt;.
 82+&lt;/body&gt;
 83+&lt;/html&gt;</string>
 84+ </dict>
 85+ <dict>
 86+ <key>name</key>
 87+ <string>Universal Public Domain Dedication</string>
 88+ <key>short</key>
 89+ <string>CC-Zero</string>
 90+ <key>template</key>
 91+ <string>{{self|1=cc-zero|author=$author|attribution=$attribution}}</string>
 92+ <key>description</key>
 93+ <string>&lt;html&gt;
 94+&lt;head&gt;
 95+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot; /&gt;
 96+&lt;/head&gt;
 97+&lt;body&gt;
 98+&lt;h4&gt;No Copyright&lt;/h4&gt;
 99+The person who associated a work with this deed has &lt;b&gt;dedicated&lt;/b&gt; the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.&lt;/p&gt;
 100+&lt;p&gt;You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission. See &lt;b&gt;Other Information&lt;/b&gt; below.
 101+
 102+&lt;h4&gt;Other Information&lt;/h4&gt;
 103+&lt;ul&gt;
 104+&lt;li&gt;In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.
 105+&lt;li&gt;Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law.
 106+&lt;/li&gt;When using or citing the work, you should not imply endorsement by the author or the affirmer.
 107+&lt;/ul&gt;
 108+
 109+&lt;p&gt;This is a human-readable summary of the &lt;a href=&quot;http://creativecommons.org/publicdomain/zero/1.0/legalcode&quot;&gt;Legal Code (read the full text)&lt;/a&gt;.&lt;/p&gt;
 110+&lt;/body&gt;
 111+&lt;/html&gt;</string>
 112+ </dict>
 113+</array>
 114+</plist>
Index: trunk/tools/WikiSnaps/English.lproj/Localizable.strings
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: trunk/tools/WikiSnaps/English.lproj/Localizable.strings
___________________________________________________________________
Added: svn:mime-type
1115 + application/octet-stream

Comments

#Comment by Nikerabbit (talk | contribs)   05:29, 3 May 2011

Localisation in binary files??

#Comment by TheDJ (talk | contribs)   06:58, 3 May 2011

UTF-16 text files actually, but apparently SVN isn't smart enough for that.