aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--main/project/eclipse installation/readme.txt4
-rw-r--r--main/res/values-ja/strings.xml2
-rw-r--r--main/res/values/strings_not_translatable.xml2
4 files changed, 8 insertions, 8 deletions
diff --git a/README.md b/README.md
index 9533a93..80950d4 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
You want to contribute?
-----------------------
-Perfect! Please **tell us in the [issue tracker](https://github.com/cgeo/c-geo-opensource/issues) before hacking** on your great new feature. It would be bad if you have implemented something great, but we can't include it because it doesn't fit the remaining architecture and code. You might also want to chat with the developers on channel #cgeo on the freenode IRC network.
+Perfect! Please **tell us in the [issue tracker](https://github.com/cgeo/cgeo/issues) before hacking** on your great new feature. It would be bad if you have implemented something great, but we can't include it because it doesn't fit the remaining architecture and code. You might also want to chat with the developers on channel #cgeo on the freenode IRC network.
[![Build Status](http://ci.cgeo.org/job/c-geo/badge/icon)](http://ci.cgeo.org/job/c-geo/)
Get the source
--------------
-Fork the [project source code](https://github.com/cgeo/c-geo-opensource), make changes to your clone and [create a pull request](https://help.github.com/articles/using-pull-requests) afterwards.
+Fork the [project source code](https://github.com/cgeo/cgeo), make changes to your clone and [create a pull request](https://help.github.com/articles/using-pull-requests) afterwards.
### Branches ###
@@ -17,14 +17,14 @@ Fork the [project source code](https://github.com/cgeo/c-geo-opensource), make c
- **release** is for all bug fixes of already existing features. So if a bug is reported in released version, it should be fixed on this branch (and merged to master afterwards).
A more complex bugfix can be first tested against the `master` branch and integrated in the nightly builds, while kept compatible with the `release` branch for a later integration.
-Such a procedure is [described in the wiki](https://github.com/cgeo/c-geo-opensource/wiki/How-to-get-a-bug-fix-into-the-release).
+Such a procedure is [described in the wiki](https://github.com/cgeo/cgeo/wiki/How-to-get-a-bug-fix-into-the-release).
Set up Eclipse
--------------
- Install an Eclipse distribution for your OS from http://eclipse.org/downloads/ (you may choose the Java developers distribution).
- Start Eclipse, choose any directory as workspace. Close the welcome screen, if it appears.
-- After the workbench has started, select File | Import | Install | Install Software Items From File and select a locally downloaded copy of https://github.com/cgeo/c-geo-opensource/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f. This way you can easily install all necessary plugins.
+- After the workbench has started, select File | Import | Install | Install Software Items From File and select a locally downloaded copy of https://github.com/cgeo/cgeo/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f. This way you can easily install all necessary plugins.
- After forking the project you should import the Eclipse projects in your workspace with File | Import | Projects from Git.
Build
diff --git a/main/project/eclipse installation/readme.txt b/main/project/eclipse installation/readme.txt
index 102799e..ac64c1e 100644
--- a/main/project/eclipse installation/readme.txt
+++ b/main/project/eclipse installation/readme.txt
@@ -1,4 +1,4 @@
Select File | Import | Install | Install Software Items From File and select a locally downloaded copy of
-https://github.com/cgeo/c-geo-opensource/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f.
+https://github.com/cgeo/cgeo/tree/master/main/project/eclipse%20installation/cgeo%20eclipse%20components.p2f.
-This way you can easily install all necessary plugins for c:geo development. \ No newline at end of file
+This way you can easily install all necessary plugins for c:geo development.
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index c0c7974..e21d2bf 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -236,7 +236,7 @@
<string name="menu_settings">設定</string>
<string name="menu_history">履歴</string>
<string name="menu_filter">フィルター</string>
- <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/c-geo-opensource/issues/794 -->
+ <string name="menu_scan_geo">QRコードスキャン</string> <!-- It is more suitable "QRcode" than "Geocode" in Japanese, because "Geocode" is not commonly known. Issue #794 https://github.com/cgeo/cgeo/issues/794 -->
<!-- main screen -->
<string name="live_map_button">地図</string>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index 2ac3c5d..0fb6179 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -158,7 +158,7 @@
· Corrections for light scheme on Adnroid 2.x devices\n
· Avoid crash if logging page is opened while not connected correctly\n
\n
- <a href="https://github.com/cgeo/c-geo-opensource/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\n
+ <a href="https://github.com/cgeo/cgeo/issues?milestone=9&amp;state=closed">Detailed list of all changes</a>\n
\n
<b>Known Limitations/Bugs:</b>\n
· Live map:\n