diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 74adc0af..a2b61027 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -350,7 +350,7 @@ public class MainActivity extends AppCompatActivity
takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
} catch (IOException ex) {
// Error occurred while creating the File
- Snackbar.make(swipeRefreshLayout, R.string.image, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(swipeRefreshLayout, R.string.unable_to_load_image, Snackbar.LENGTH_LONG).show();
return false;
}
@@ -556,27 +556,27 @@ public class MainActivity extends AppCompatActivity
if (url != null && url.startsWith("https://" + podDomain)) {
String subUrl = url.substring(("https://" + podDomain).length());
if (subUrl.startsWith("/stream")) {
- setTitle(R.string.title_stream);
+ setTitle(R.string.nav_stream);
} else if (subUrl.startsWith("/posts/")) {
setTitle(R.string.diaspora); //TODO: Extract posts title somehow?
} else if (subUrl.startsWith("/notifications")) {
- setTitle(R.string.title_notifications);
+ setTitle(R.string.notifications);
} else if (subUrl.startsWith("/conversations")) {
- setTitle(R.string.title_conversations);
+ setTitle(R.string.conversations);
} else if (subUrl.startsWith("/status_messages/new")) {
setTitle(R.string.new_post);
} else if (subUrl.startsWith("/people/" + appSettings.getProfileId())) {
- setTitle(R.string.title_profil);
+ setTitle(R.string.nav_profile);
} else if (subUrl.startsWith("/activity")) {
- setTitle(R.string.title_activities);
+ setTitle(R.string.nav_activities);
} else if (subUrl.startsWith("/liked")) {
- setTitle(R.string.title_liked);
+ setTitle(R.string.nav_liked);
} else if (subUrl.startsWith("/commented")) {
- setTitle(R.string.title_commented);
+ setTitle(R.string.nav_commented);
} else if (subUrl.startsWith("/mentions")) {
- setTitle(R.string.title_mentions);
+ setTitle(R.string.nav_mentions);
} else if (subUrl.startsWith("/public")) {
- setTitle(R.string.title_public);
+ setTitle(R.string.public_);
}
}
}
@@ -790,7 +790,7 @@ public class MainActivity extends AppCompatActivity
}
if (!hasToShareScreenshot) {
- Snackbar.make(swipeRefreshLayout, getString(R.string.toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
+ Snackbar.make(swipeRefreshLayout, getString(R.string.share__toast_screenshot) + " " + fileSaveName, Snackbar.LENGTH_LONG).show();
}
Bitmap bitmap;
@@ -822,7 +822,7 @@ public class MainActivity extends AppCompatActivity
sharingIntent.putExtra(Intent.EXTRA_TEXT, webView.getUrl());
Uri bmpUri = Uri.fromFile(new File(fileSaveDirectory, fileSaveName));
sharingIntent.putExtra(Intent.EXTRA_STREAM, bmpUri);
- startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_dotdotdot)));
+ startActivity(Intent.createChooser(sharingIntent, getString(R.string.action_share_dotdotdot)));
} else {
// Broadcast that this file is indexable
File file = new File(fileSaveDirectory, fileSaveName);
@@ -1016,7 +1016,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
// webView.loadUrl("https://" + podDomain + "/followed_tags");
Helpers.showFollowedTagsList(webView, app);
- setTitle(R.string.jb_followed_tags);
+ setTitle(R.string.nav_followed_tags);
} else {
snackbarNoInternet.show();
}
@@ -1027,7 +1027,7 @@ public class MainActivity extends AppCompatActivity
if (Helpers.isOnline(MainActivity.this)) {
// webView.loadUrl("https://" + podDomain + "/aspects");
Helpers.showAspectList(webView, app);
- setTitle(R.string.title_aspects);
+ setTitle(R.string.aspects);
} else {
snackbarNoInternet.show();
}
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
index de07cfdd..cdac20b5 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
@@ -113,7 +113,7 @@ public class ContextMenuWebView extends NestedWebView {
+ System.currentTimeMillis()+".png");
request.setDestinationUri(Uri.fromFile(destinationFile));
((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request);
- Toast.makeText(context, context.getText(R.string.toast_saved_image_to_location) + " " +
+ Toast.makeText(context, context.getText(R.string.share__toast_saved_image_to_location) + " " +
destinationFile.getAbsolutePath(), Toast.LENGTH_LONG).show();
}
}
@@ -152,7 +152,7 @@ public class ContextMenuWebView extends NestedWebView {
if (url != null) {
ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setPrimaryClip(ClipData.newPlainText("text", url));
- Toast.makeText(context, R.string.toast_link_address_copied, Toast.LENGTH_SHORT).show();
+ Toast.makeText(context, R.string.share__toast_link_address_copied, Toast.LENGTH_SHORT).show();
}
break;
diff --git a/app/src/main/res/layout/splash__activity.xml b/app/src/main/res/layout/splash__activity.xml
index 87fdc060..6dfb9121 100644
--- a/app/src/main/res/layout/splash__activity.xml
+++ b/app/src/main/res/layout/splash__activity.xml
@@ -10,7 +10,6 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
- android:contentDescription="@string/splash_screen_description"
android:scaleType="centerCrop"
android:src="@drawable/splashscreen1" />
diff --git a/app/src/main/res/menu/main__menu_bottom.xml b/app/src/main/res/menu/main__menu_bottom.xml
index a7eb0213..f4e8fd53 100644
--- a/app/src/main/res/menu/main__menu_bottom.xml
+++ b/app/src/main/res/menu/main__menu_bottom.xml
@@ -8,23 +8,23 @@
android:id="@+id/action_search"
android:icon="@drawable/fab_search"
app:showAsAction="always"
- android:title="@string/search_by_tags_or_persons" />
+ android:title="@string/action_search_by_tags_or_persons" />
-
@@ -32,7 +32,7 @@
-
+
-
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 54ccc6d1..eca0dbdd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,7 +3,7 @@
Neu laden
Pod auswählen
Pod-Domain eingeben
- App beenden
+ App beenden
Pod-Adresse bestätigen
Anmerkung: Die Podliste wird aus den sicheren Pods, die bei https://podupti.me gelistet sind generiert.
Bitte einen gültigen Domain-Namen (URL) eingeben
@@ -27,35 +27,33 @@
Berechtigung erteilt. Bitte versuche es erneut.
-
- Benachrichtigungen
- Unterhaltungen
- Stream
- Profil
- Aspekte
- Aktivitäten
- Gelikte Beiträge
- Kommentiert
- Erwähnungen
- Öffentliche Aktivitäten
+ Unterhaltungen
+ Stream
+ Profil
+ Aspekte
+ Aktivitäten
+ Gelikte Beiträge
+ Kommentiert
+ Erwähnungen
+ Öffentliche Aktivitäten
- Einstellungen
- Stream
- Gelikte Beiträge
- Kommentierte Beiträge
- Erwähnungen
- Aktivitäten
- Verfolgte Tags
- Aspekte
- Öffentliche Aktivitäten
+ Einstellungen
+ Stream
+ Gelikte Beiträge
+ Kommentierte Beiträge
+ Erwähnungen
+ Aktivitäten
+ Verfolgte Tags
+ Aspekte
+ Öffentliche Aktivitäten
- Nach oben scrollen
- Suche nach Tags oder Personen …
- Neuer Beitrag
+ Nach oben scrollen
+ Suche nach Tags oder Personen …
+ Neuer Beitrag
Suche
nach Tags
@@ -67,16 +65,15 @@
Unterhaltungen
Neuer Beitrag
Benachrichtigungen
- Konnte Bild nicht laden …
- Inhalt Teilen
- Link als Text teilen
- Bildschirmfoto teilen
- Bildschirmfoto speichern
- Bildschirmfoto wird gespeichert unter:
- App Einstellungen
+ Konnte Bild nicht laden …
+ Link als Text teilen
+ Bildschirmfoto teilen
+ Bildschirmfoto speichern
+ Bildschirmfoto wird gespeichert unter:
+ App Einstellungen
Markdown Formatierung
Lizenz
- Über die App | Hilfe
+ Über die App | Hilfe
<i>"Auf Diaspora* ist es möglich, dass du deinen Text in Nachrichten, Kommentaren und
Unterhaltungen formatierst, indem du ein vereinfachtes Mark-Up-System namens Markdown verwendest. Diese Seite stellt
eine kurze Einleitung dar, um grundlegende Formatierungen anwenden zu können.</i><br> <br>
@@ -142,21 +139,19 @@ along with this program. If not, see http://www.gnu.org/licenses.<br> <br
<i>Die Bilder des Startbildschirms können auf Flickr gefunden werden:
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
Sie wurden von \"Lydia\" veröffentlicht und stehen unter der cc by-nc-sa Lizenz.</i>
- Startbildschirm
Ungelesene Benachrichtigung. Lesen?
- Profil
*[geteilt durch #DiasporaForAndroid]*
Bild speichern
Bild teilen
Linkadresse kopieren
Linkadresse teilen
In externem Browser öffnen…
- Speichere Bild als
- Linkadresse kopiert …
- Teilen…
+ Speichere Bild als
+ Linkadresse kopiert …
+ Teilen…
Warnung: Proxy konnte nicht aktiviert werden…
- Mobil-/Desktopansicht umschalten
+ Mobil-/Desktopansicht umschalten
Alle Tags
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fb98d44e..51c6d19d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,17 +12,15 @@
-
- Notifications
- Discussions
- Flux
- Profil
- Aspects
- Activités
- Aimés
- Commentés
- Mentions
- Public
+ Discussions
+ Flux
+ Profil
+ Aspects
+ Activités
+ Aimés
+ Commentés
+ Mentions
+ Public
@@ -45,34 +43,33 @@
- Paramètres
- A propos de l\'application | Aide
- Flux
- Aimés
- Commentés
- Mentions
- Activités
- Hashtags suivis
- Aspects
- Activités publiques
- Paramètres de l\'application
- Partager du contenu
+ Paramètres
+ A propos de l\'application | Aide
+ Flux
+ Aimés
+ Commentés
+ Mentions
+ Activités
+ Hashtags suivis
+ Aspects
+ Activités publiques
+ Paramètres de l\'application
- Partager le lien comme texte
- Partager la capture d\'écran d\'un site web
- Prendre une capture d\'écran d\'un site web
+ Partager le lien comme texte
+ Partager la capture d\'écran d\'un site web
+ Prendre une capture d\'écran d\'un site web
Licence
Mise en page Markdown
- Enregistrer la capture d\'écran sous :
+ Enregistrer la capture d\'écran sous :
- Retour en haut
- Recherche par tags ou par personnes
- Nouveau message
+ Retour en haut
+ Recherche par tags ou par personnes
+ Nouveau message
Recherche
@@ -138,22 +135,20 @@
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
They were published by \"Lydia\" and are licensed under cc by-nc-sa.</i>
- Splash screen
- Impossible de récupérer l\'image
- Profile
+ Impossible de récupérer l\'image
- Quitter l\'application
- Toggle mobile/desktop view
+ Quitter l\'application
+ Toggle mobile/desktop view
*[partagé via #DiasporaForAndroid]*
- Lien copié…
+ Lien copié…
Partager un lien
Enregistrer l\'image
Partager l\'image
Ouvrir dans un navigateur externe…
Copier le lien dans le presse-papier
- Enregistrer l\'image sous
+ Enregistrer l\'image sous
Attention: connexion au proxy impossible…
- Partager…
+ Partager…
Tout Tags
diff --git a/app/src/main/res/values/strings-preferences.xml b/app/src/main/res/values/strings-preferences.xml
index 5fec052d..d3afc808 100644
--- a/app/src/main/res/values/strings-preferences.xml
+++ b/app/src/main/res/values/strings-preferences.xml
@@ -1,6 +1,6 @@
-
+
podDomain
previousPodlist
pref_key_font_size
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 343a6a10..2031d782 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,98 @@
+
+ Diaspora
+ @string/diaspora
+ #DiasporaForAndroid
+ The community-run distributed social network
+ *[shared by #DiasporaForAndroid]*
+
-
- Open navigation drawer
- Close navigation drawer
- Diaspora
+ https://
+ Open navigation drawer
+ Close navigation drawer
Reload
Unread notification. Want to read it?
+
+
+ Settings
+ Notifications
+ Conversations
+ Stream
+ Profile
+ Aspects
+ Activities
+ Liked
+ Commented
+ Mentions
+ Public
+ Search
+
+
+
+ Select Pod
+ Enter pod domain
+ Confirm pod url
+ Note: The podlist is populated by secure pods listed on https://podupti.me. You can enter in the edit field any pod not listed.
+ Please enter a valid domain name
+ Error: Could not retrieve list of pods!
+
+ Sorry, you must be connected to the Internet to proceed
+ Confirmation
+ Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?
+ Do you want to exit?
+
+
+
+ @string/stream
+ @string/liked
+ @string/commented
+ @string/mentions
+ @string/activities
+ @string/aspects
+ @string/profile
+ @string/settings
+ About the app | Help
+ Followed Tags
+ Public activities
+ App settings
+
+ Share link as text
+ Share screenshot of webpage
+ Take screenshot of webpage
+ Saving image to
+ Saving screenshot as:
+ Link address copied …
+
+
+ Go to top
+ Search by tags or persons
+ New message
+ Exit app
+ Toggle mobile/desktop view
+ Share…
+ New message
+ Conversations
+
+
+ @string/search
+ by tags
+ by people
+ Please add a name
+
+ Share link address
+ Save image
+ Share image
+ Open in external browser …
+ Copy link address to clipboard
+
+
+
+ Warning: Could not set network proxy…
+ Unable to load image
+ All tags
+
+
You must grant \"Access Storage Permission\" to save screenshots. After that you should
completely close the app or restart the phone. If you don\'t permit the storage access but want to use the
screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps -
@@ -19,77 +105,10 @@
Permission granted. Please try again.
-
-
- Notifications
- Conversations
- Stream
- Profil
- Aspects
- Activities
- Liked
- Commented
- Mentions
- Public
-
-
-
-
- Select Pod
- Enter pod domain
- Confirm pod url
- Note: The podlist is populated by secure pods listed on https://podupti.me. You can enter in the edit field any pod not listed.
- Please enter a valid domain name
- Error: Could not retrieve list of pods!
-
-
- Sorry, you must be connected to the Internet to proceed
- Confirmation
- Do you really want to use\nhttps://%1$s\nas your Diaspora Pod?
- Do you want to exit?
- New message
- Notifications
- Conversations
-
-
-
- The community-run distributed social network
- Settings
- About the app | Help
- Stream
- Liked
- Commented
- Mentions
- Activities
- Followed Hashtags
- Aspects
- Public activities
- App settings
- Share content
-
- Share link as text
- Share screenshot of webpage
- Take screenshot of webpage
-
+
License
Markdown formating
-
- Saving screenshot as:
-
-
-
-
- Go to top
- Search by tags or persons
- New message
-
-
- Search
- by tags
- by people
- Please add a name
-
-
+ Copyright © 2015–2016
<i>"On diaspora* it's possible to format your text in status messages, comments
and conversations using a simplified mark-up system called Markdown. This page gives an introduction to the
@@ -130,7 +149,6 @@
You can create the following symbols and other special characters using a combination of characters:<br>
(c) = © ; (r) = ® ; x^2 = x²"
- Copyright © 2015–2016
<b>Maintainers:</b><br>
• gsantner https://gsantner.github.io<br>
@@ -153,26 +171,6 @@
https://www.flickr.com/photos/129581906@N06/sets/72157651933980136/with/16594947123.
They were published by \"Lydia\" and are licensed under cc by-nc-sa.</i>
- Splash screen
- Unable to get image
- Profile
+
- Exit app
- Toggle mobile/desktop view
- Diaspora
- *[shared by #DiasporaForAndroid]*
- Link address copied …
- Share link address
- Save image
- Share image
- Open in external browser …
- Copy link address to clipboard
- Saving image to
- https://
- Share…
- #DiasporaForAndroid
-
- Warning: Could not set network proxy…
-
- All tags
diff --git a/crowdin.yaml b/crowdin.yaml
new file mode 100644
index 00000000..05210466
--- /dev/null
+++ b/crowdin.yaml
@@ -0,0 +1,4 @@
+files:
+ -
+ source: '/app/src/main/res/values/strings*.xml'
+ translation: '/app/src/main/res/values-%two_letters_code%/%original_file_name%'