[or-cvs] r22661: {} moved the script and converted a few translated files (in projects/android/trunk/Orbot/res: . values-sv values-zh)

Runa Sandvik runa.sandvik at gmail.com
Mon Jul 19 14:40:08 UTC 2010


Author: runa
Date: 2010-07-19 14:40:08 +0000 (Mon, 19 Jul 2010)
New Revision: 22661

Added:
   projects/android/trunk/Orbot/res/values-sv/
   projects/android/trunk/Orbot/res/values-sv/strings.xml
   projects/android/trunk/Orbot/res/values-zh/
   projects/android/trunk/Orbot/res/values-zh/strings.xml
Removed:
   projects/android/trunk/Orbot/res/po2xml.sh
   projects/android/trunk/Orbot/res/values-zh_CN/
Log:
moved the script and converted a few translated files

Deleted: projects/android/trunk/Orbot/res/po2xml.sh
===================================================================
--- projects/android/trunk/Orbot/res/po2xml.sh	2010-07-19 13:46:52 UTC (rev 22660)
+++ projects/android/trunk/Orbot/res/po2xml.sh	2010-07-19 14:40:08 UTC (rev 22661)
@@ -1,57 +0,0 @@
-#!/bin/bash
-#
-# Author: Runa A. Sandvik, <runa.sandvik at gmail.com>
-# For The Tor Project, Inc.
-#
-# This is Free Software (GPLv3)
-# http://www.gnu.org/licenses/gpl-3.0.txt
-#
-# This script will convert translated po files back to xml. Before
-# running the script, checkout the translation directory from
-# https://svn.torproject.org.
-#	
-
-### Start config ###
-
-# Location of the translated files, i.e. the path to the orbot
-# directory in the translation module. Do not add the trailing slash. 
-translated=""
-
-# Location of the orbot directory, i.e. the original English xml file.
-# Do not add the trailing slash.
-xml=""
-
-### End config ###
-
-# Find po files to convert.
-po=`find $translated -type f -name \*.po`
-
-# For every po found, create and/or update the translated manpage.
-for file in $po ; do
-
-	# Get the basename of the file we are dealing with.
-	pofile=`basename $file`
-
-	# Strip the file for its original extension and add .xml.
-	xmlfile="${pofile%.*}.xml"
-
-	# Figure out which language we are dealing with.
-	lang=`dirname $file | sed "s#$translated/##"`
-
-	# The translated document is written if 80% or more of the po
-	# file has been translated. Also, po4a-translate will only write
-	# the translated document if 80% or more has been translated.
-	# However, it will delete the translated txt if less than 80%
-	# has been translated. To avoid having our current, translated
-	# xml files deleted, convert the po to a temp xml first. If this
-	# file was actually written, rename it to xml.
-
-	# Convert translated po to xml.
-	po4a-translate -f xml -m "$xml/values/$xmlfile" -p "$file"  -l "$xml/values-$lang/tmp-$xmlfile" --master-charset utf-8 -L utf-8
-
-	# Check to see if the file was written. If yes, rename it.
-	if [ -e "$xml/values-$lang/tmp-$xmlfile" ]
-	then
-		mv "$xml/values-$lang/tmp-$xmlfile" "$xml/values-$lang/$xmlfile"
-	fi
-done

Added: projects/android/trunk/Orbot/res/values-sv/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-sv/strings.xml	                        (rev 0)
+++ projects/android/trunk/Orbot/res/values-sv/strings.xml	2010-07-19 14:40:08 UTC (rev 22661)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+    <string name="app_version">0.0.8</string>
+    <string name="internal_web_url">http://orbot/</string>
+    <string name="default_web_url">http://check.torproject.org</string>
+    <string name="secure_default_web_url">https://check.torproject.org</string>
+    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+    <string name="control_permission_label">start and stop Tor</string>
+    <string name="tor_proxy_service_process">torproxyservice</string>
+   
+<string name="status_starting_up">Orbot startar...</string>
+<string name="status_activated">Uppkopplad till Tor nätverket</string>
+<string name="status_disabled">"Orbot är inaktiverad</string>
+<string name="status_shutting_down">Orbot avslutas</string>
+
+<string name="tor_process_connecting">Startar Tor...</string>
+<string name="tor_process_connecting_step2">verifierar kontroll uppkopplingen...</string>
+<string name="tor_process_connecting_step3">klar.</string>
+<string name="tor_process_connecting_step4">väntar.</string>
+
+<string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
+<string name="menu_home">Hem</string>
+<string name="menu_browse">Browse</string>
+<string name="menu_settings">Inställningar</string>
+<string name="menu_log">Logg</string>
+<string name="menu_info">Hjälp</string>
+<string name="menu_apps">Apps</string>
+<string name="menu_start">Start</string>
+<string name="menu_stop">Stopp</string>
+
+
+
+<string name="button_help">Hjälp</string>
+<string name="button_close">Stäng</string>
+<string name="button_about">Om</string>
+
+<string name="help_text_1">Orbot behöver olika inställningar beroende på vilken Android utgåva det körs på.
+ Besök https://www.torproject.org/docs/android.html för den senaste informationen.</string>
+
+<string name="help_text_2">For non-rooted Android 1.x devices (G1, MyTouch3G, Hero): Please use the "ProxySurf" browser available in the Android Market, and set 
+the HTTP Proxy to 127.0.0.1 and port 8118, for HTTP traffic only (HTTP/S will not work).</string>
+
+<string name="help_text_3">För chatt/IM, pröva "Beem" från Android Market, och ställ in SOCKS5 proxy till 127.0.0.1 / port 9050.</string>
+
+<string name="help_text_4">For Android 2.x devices, you MUST ROOT your device in order for Orbot to work transparently, as there is no browser that will work for non-root devices. Otherwise, the "Beem" app will allow
+you to set the SOCKS5 proxy to 127.0.0.1 and port 9050. You should also enable SSL to protect your username and password.</string>
+
+<string name="help_text_5">If you root your device, whether it is 1.x or 2.x based, Orbot can transparently proxy any applicatons you select
+and all DNS requests. This includes the built-in Browser, Gmail, YouTube and Maps, as well as any third-party app.</string>
+
+</resources>

Added: projects/android/trunk/Orbot/res/values-zh/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values-zh/strings.xml	                        (rev 0)
+++ projects/android/trunk/Orbot/res/values-zh/strings.xml	2010-07-19 14:40:08 UTC (rev 22661)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Orbot</string>
+    <string name="app_version">0.0.8</string>
+    <string name="internal_web_url">http://orbot/</string>
+    <string name="default_web_url">http://check.torproject.org</string>
+    <string name="secure_default_web_url">https://check.torproject.org</string>
+    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+    <string name="control_permission_label">启动和停止Tor</string>
+    <string name="tor_proxy_service_process">Tor代理服务</string>
+   
+<string name="status_starting_up">Orbot正在启动</string>
+<string name="status_activated">已经连接上了Tor网络</string>
+<string name="status_disabled">Orbot已停用</string>
+<string name="status_shutting_down">Orbot正在关闭</string>
+
+<string name="tor_process_connecting">正在启动Tor....</string>
+<string name="tor_process_connecting_step2">验证控制连接....</string>
+<string name="tor_process_connecting_step3">完毕.</string>
+<string name="tor_process_connecting_step4">请等待...</string>
+
+<string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器127.0.0.1:8118或者SOCKS4A或者SOCKS5代理服务器127.0.0.1:9050</string>
+<string name="menu_home">首页</string>
+<string name="menu_browse">浏览</string>
+<string name="menu_settings">设置</string>
+<string name="menu_log">日志</string>
+<string name="menu_info">帮助</string>
+<string name="menu_apps">应用</string>
+<string name="menu_start">启动</string>
+<string name="menu_stop">停止</string>
+
+
+
+<string name="button_help">帮助</string>
+<string name="button_close">关闭</string>
+<string name="button_about">关于</string>
+
+<string name="help_text_1">Orbot 的设置因 Android 系统版本的不同而异。
+详情参见:https://www.torproject.org/docs/android.html </string>
+
+<string name="help_text_2">对于缺乏ROOT权限的Android 1.x 设备(G1, MyTouch3G, Hero): 推荐使用 Android Market 中的 “ProxySurf” 浏览器,
+并设置HTTP Proxy地址127.0.0.1端口8118进行HTTP浏览(对HTTP/S无效)。</string>
+
+<string name="help_text_3">即时聊天工具,可以尝试 Android Market 内的 “Beem”,并设置SOCKS5代理为127.0.0.1,端口9050。</string>
+
+<string name="help_text_4">对于 Android 2.x 设备,您必须获得设备的 ROOT 权限才能使 Orbot 以透明代理的方式工作,因为非ROOT设备上浏览器都无法成功代理(除非浏览器本身支持代理设置)。
+如果无法获得 ROOT 权限,至少\"Beem\" 程序可以设置SOCKS5(127.0.0.1端口9050),您还可以开启SSL支持来保护用户名与密码。</string>
+
+<string name="help_text_5">无论是基于1.x还是2.x的设备,如果您曾破解过ROOT权限,Orbot 都能通过透明代理的方式代理您选择的任何程序及所有DNS请求。
+包括内置的浏览器,Gmail,YouTube,地图及各种三方程序。</string>
+
+</resources>



More information about the tor-commits mailing list